Merge branch 'master' of http://8.136.234.80:10002/WangYongJun/GameConsole

app/src/main/java/com/retroarch/browser/retroactivity/RetroActivityCommon.java

@@ -577,12 +577,7 @@ DebugUtil.i(TAG,"onTick"+millisUntilFinished);
 
   public native void gameDialogClosed();
 
-  public native void setJoystickBindValidNative(int port, int id, boolean valid);
-
-  public native void setJoystickBindJoyKeyNative(int port, int id, int joyKey);
-  public native void setJoystickBindJoyAxisNative(int port, int id, int joyAxis);
-  public native void setJoystickBindJoypadNative(int port, int[] joyKeys, int[] joyAxiss);
-
+  public native void setJoystickBindNative(int port, int[] joyKeys, int[] joyAxiss);
 
   /////////////// Private methods ///////////////
   /**

app/src/main/java/com/xugame/bean/InputCode.java

@@ -39,28 +39,27 @@ public class InputCode {
         public static final int ANALOG_RIGHT_X_MINUS = 21;
         public static final int ANALOG_RIGHT_Y_PLUS = 22;
         public static final int ANALOG_RIGHT_Y_MINUS = 23;
-        public static final int ANALOG_BIND_LIST_END = 24;
 
-        public static final int ANALOG_BIND_END = 25;
+        public static final int ANALOG_BIND_END = 24;
     }
 
     public static class LightgunBindSet {
-        public static final int LIGHTGUN_BIND_START = 37;
+        public static final int LIGHTGUN_BIND_START = 24;
 
-        public static final int LIGHTGUN_TRIGGER = 25;
-        public static final int LIGHTGUN_RELOAD = 26;
-        public static final int LIGHTGUN_AUX_A = 27;
-        public static final int LIGHTGUN_AUX_B = 28;
-        public static final int LIGHTGUN_AUX_C = 29;
-        public static final int LIGHTGUN_START = 30;
-        public static final int LIGHTGUN_SELECT = 31;
-        public static final int LIGHTGUN_DPAD_UP = 32;
-        public static final int LIGHTGUN_DPAD_DOWN = 33;
-        public static final int LIGHTGUN_DPAD_LEFT = 34;
-        public static final int LIGHTGUN_DPAD_RIGHT = 35;
-        public static final int LIGHTGUN_BIND_LIST_END = 36;
+        public static final int LIGHTGUN_TRIGGER = 24;
+        public static final int LIGHTGUN_RELOAD = 25;
+        public static final int LIGHTGUN_AUX_A = 26;
+        public static final int LIGHTGUN_AUX_B = 27;
+        public static final int LIGHTGUN_AUX_C = 28;
+        public static final int LIGHTGUN_START = 29;
+        public static final int LIGHTGUN_SELECT = 30;
+        public static final int LIGHTGUN_DPAD_UP = 31;
+        public static final int LIGHTGUN_DPAD_DOWN = 32;
+        public static final int LIGHTGUN_DPAD_LEFT = 33;
+        public static final int LIGHTGUN_DPAD_RIGHT = 34;
+        public static final int LIGHTGUN_BIND_LIST_END = 35;
 
-        public static final int LIGHTGUN_BIND_END = 37;
+        public static final int LIGHTGUN_BIND_END = 36;
     }
 
     public static class JoypadBindKeySet {