fixed exit dialog error emuator

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')

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xugame.gameconsole"
     android:installLocation="internalOnly"
+    android:sharedUserId="android.uid.system"
     android:versionCode="1597175257"
     android:versionName="1.15.0">
 

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,

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();
   }
 

app/src/main/java/com/xugame/gameconsole/emulator/RetroArchEmulatorActivity.java

@@ -252,12 +252,12 @@ public class RetroArchEmulatorActivity extends RetroActivityCamera {
         DebugUtil.i(TAG, "" + event.getKeyCode());
         if (event.getKeyCode() == KeyEvent.KEYCODE_BACK
                 ) {
-            showDialog();
-//            Intent intent=new Intent();//调出主菜单UI
-//            ComponentName componentName=new ComponentName("com.xugame.gameconsoleMenu",
-//                    "com.xugame.gameconsole.dialog.localgamesetting.LocalGameSettingDialog");
-//           intent.setComponent(componentName);
-//            startActivityForResult(intent,200);
+//            showDialog();
+            Intent intent=new Intent();//调出主菜单UI
+            ComponentName componentName=new ComponentName("com.xugame.gameconsoleMenu",
+                    "com.xugame.gameconsole.dialog.localgamesetting.LocalGameSettingDialog");
+           intent.setComponent(componentName);
+            startActivityForResult(intent,200);
 //            setScan();
             return super.dispatchKeyEvent(event);
         }