优化代码

libcore/android/android_tools.cpp

@@ -818,7 +818,7 @@ void OnShareFile(ANDROID_APP app, char* title, char* path){
 											   "shareFile", "(Ljava/lang/String;Ljava/lang/String;)V");
 	jstring s_title = jni->NewStringUTF(title);
 	jstring s_path = jni->NewStringUTF(path);
-	jni->CallVoidMethod(lNativeActivity, MethodGetAddr, s_title, s_path;
+	jni->CallVoidMethod(lNativeActivity, MethodGetAddr, s_title, s_path);
 	jni->ReleaseStringUTFChars(s_title, title);
 	jni->ReleaseStringUTFChars(s_path, path);
 	jni->DeleteLocalRef(ClassNativeActivity);

mobile/src/main/java/cn/garymb/ygomobile/GameUriManager.java

@@ -57,7 +57,7 @@ public class GameUriManager {
                 options.mUserName = intent.getStringExtra(Constants.QUERY_USER);
                 options.mPort = intent.getIntExtra(Constants.QUERY_PORT, 0);
                 options.mRoomName = intent.getStringExtra(Constants.QUERY_ROOM);
-                YGOStarter.startGame(getActivity(), options, null);
+                YGOStarter.startGame(getActivity(), options);
             } catch (Exception e) {
                 Toast.makeText(getActivity(), R.string.start_game_error, Toast.LENGTH_SHORT).show();
                 activity.finish();
@@ -163,7 +163,7 @@ public class GameUriManager {
                     }
                 }
                 if (!ComponentUtils.isActivityRunning(getActivity(), new ComponentName(getActivity(), YGOMobileActivity.class))) {
-                    YGOStarter.startGame(getActivity(), null, "-r" + yrp.getName());
+                    YGOStarter.startGame(getActivity(), null, "-r", yrp.getName());
                     Toast.makeText(activity, ""+yrp.getName(), Toast.LENGTH_LONG).show();
                 }
             }
@@ -243,7 +243,7 @@ public class GameUriManager {
                     e.printStackTrace();
                 }
                 if (!ComponentUtils.isActivityRunning(activity, new ComponentName(activity, YGOMobileActivity.class))) {
-                    YGOStarter.startGame(getActivity(), null, "-r " + yrp.getName());
+                    YGOStarter.startGame(getActivity(), null, "-r ", yrp.getName());
                     Toast.makeText(activity, activity.getString(R.string.yrp_installed), Toast.LENGTH_LONG).show();
                 }
             }

mobile/src/main/java/cn/garymb/ygomobile/YGOStarter.java

@@ -158,7 +158,7 @@ public class YGOStarter {
      * @param args 例如(播放完退出游戏)：-r 1111.yrp
      *             或者(播放完不退出游戏)：-k -r 1111.yrp
      */
-    public static void startGame(Activity activity, YGOGameOptions options, String args) {
+    public static void startGame(Activity activity, YGOGameOptions options, String... args) {
         //如果距离上次加入游戏的时间大于1秒才处理
         if (System.currentTimeMillis() - lasttime >= 1000) {
             lasttime = System.currentTimeMillis();
@@ -173,7 +173,7 @@ public class YGOStarter {
             intent.putExtra(YGOGameOptions.YGO_GAME_OPTIONS_BUNDLE_TIME, System.currentTimeMillis());
         }
         if(args != null) {
-            intent.putExtra(IrrlichtBridge.EXTRA_ARGV, args.split(" "));
+            intent.putExtra(IrrlichtBridge.EXTRA_ARGV,args);
         }
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         Log.e("YGOStarter", "跳转前" + System.currentTimeMillis());

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/LogoActivity.java

@@ -23,7 +23,7 @@ public class LogoActivity extends Activity {
         hideBottomUIMenu();
         setContentView(R.layout.activity_logo);
         if (AppsSettings.get().isOnlyGame()) {
-            YGOStarter.startGame(this, null, null);
+            YGOStarter.startGame(this, null);
             finish();
             return;
         } else {
@@ -40,7 +40,6 @@ public class LogoActivity extends Activity {
         }
         if (!isTaskRoot()) {
             finish();
-            return;
         }
 
     }

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -473,7 +473,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
         options.mUserName = serverInfo.getPlayerName();
         options.mPort = serverInfo.getPort();
         options.mRoomName = name;
-        YGOStarter.startGame(this, options, null);
+        YGOStarter.startGame(this, options);
     }
 
     protected abstract void checkResourceDownload(ResCheckTask.ResCheckListener listener);

mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java

@@ -246,7 +246,7 @@ public class MainActivity extends HomeActivity {
     @Override
     protected void openGame() {
         if (enableStart) {
-            YGOStarter.startGame(this, null, null);
+            YGOStarter.startGame(this, null);
         } else {
             VUiKit.show(this, R.string.dont_start_game);
         }

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MyCard.java

@@ -257,7 +257,7 @@ public class MyCard {
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        YGOStarter.startGame(activity, options, null);
+                        YGOStarter.startGame(activity, options);
                     }
                 });
             } catch (Exception e) {