3 次代码提交 b49a403f6c ... dd58fa199f

作者 SHA1 备注 提交日期
  wangyongj dd58fa199f fixed exit dialog error emuator 1 年之前
  wangyongj 5277a787e4 Merge branch 'master' of http://8.136.234.80:10002/WangYongJun/GameConsole 1 年之前
  wangyongj 50497bb91b sync 1 年之前

+ 2 - 2
app/build.gradle

@@ -41,8 +41,8 @@ android {
         debug {
             keyAlias 'system'
             keyPassword 'xugame888'
-//            storeFile file('../s905_system.jks')
-            storeFile file('../android_4.4_haisi_zou_system.jks')//android4.4
+            storeFile file('../s905_system.jks')
+//            storeFile file('../android_4.4_haisi_zou_system.jks')//android4.4
 //            storeFile file('../q5_t509_system.jks')
 //            storeFile file('../q5_t509_system.jks')
 //            storeFile file('../3399_systemkey.jks')

+ 11 - 5
app/src/main/AndroidManifest.xml

@@ -63,12 +63,18 @@
 
             android:launchMode="singleTop">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+<!--                <action android:name="android.intent.action.MAIN" />-->
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--                <data-->
+<!--                    android:host="com.xugame.gameconsole.TextCopyFileActivity"-->
+<!--                    android:scheme="com.xugame.gameconsole.TextCopyFileActivity"-->
+<!--                    tools:ignore="AppLinkUrlError" />-->
                 <category android:name="android.intent.category.LAUNCHER" />
-                <data
-                    android:host="com.xugame.gameconsole.TextCopyFileActivity"
-                    android:scheme="com.xugame.gameconsole.TextCopyFileActivity"
-                    tools:ignore="AppLinkUrlError" />
+
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.MONKEY" />
             </intent-filter>
         </activity>
         <activity

+ 9 - 1
app/src/main/cpp/frontend/drivers/platform_unix.c

@@ -574,7 +574,11 @@ Java_com_retroarch_browser_retroactivity_RetroActivityCommon_registerBeans(
     if (android_app == NULL)
         return;
 
-    FIND_CLASS(
+    if (android_app->beans.input_descriptor_bean.clazz)
+       (*env)->DeleteGlobalRef(env, android_app->beans.input_descriptor_bean.clazz);
+   android_app->beans.input_descriptor_bean.clazz= NULL;
+
+   FIND_CLASS(
             env,
             android_app->beans.input_descriptor_bean.clazz,
             "com/xugame/bean/InputDescriptorBean"
@@ -589,6 +593,10 @@ Java_com_retroarch_browser_retroactivity_RetroActivityCommon_registerBeans(
             "<init>", "(IIIILjava/lang/String;)V"
     );
 
+   if (android_app->beans.joypad_manager.clazz)
+      (*env)->DeleteGlobalRef(env, android_app->beans.joypad_manager.clazz);
+   android_app->beans.joypad_manager.clazz= NULL;
+
    FIND_CLASS(
            env,
            android_app->beans.joypad_manager.clazz,

+ 2 - 1
app/src/main/java/com/retroarch/browser/retroactivity/RetroActivityCommon.java

@@ -104,9 +104,9 @@ public abstract class RetroActivityCommon extends NativeActivity
   @Override
   protected void onStop() {
     super.onStop();
-    unregisterBeans();
   }
 
+
   private CountDownTimer mDownTimer;
   private void startCuntDown(){
     mDownTimer=new CountDownTimer(4000,1000) {
@@ -126,6 +126,7 @@ DebugUtil.i(TAG,"onTick"+millisUntilFinished);
   @Override
   protected void onDestroy() {
     PlayCoreManager.getInstance().onDestroy();
+    unregisterBeans();
     super.onDestroy();
   }
 

+ 1 - 1
app/src/main/java/com/xugame/gameconsole/emulator/RetroArchEmulatorActivity.java

@@ -251,7 +251,7 @@ public class RetroArchEmulatorActivity extends RetroActivityCamera {
     public boolean dispatchKeyEvent(KeyEvent event) {
         DebugUtil.i(TAG, "" + event.getKeyCode());
         if (event.getKeyCode() == KeyEvent.KEYCODE_BACK
-                && event.getAction() == KeyEvent.ACTION_DOWN) {
+                ) {
 //            showDialog();
             Intent intent=new Intent();//调出主菜单UI
             ComponentName componentName=new ComponentName("com.xugame.gameconsoleMenu",