arrange code

libcore/jni/Application.mk

-APP_ABI := arm64-v8a #armeabi-v7a x86
+APP_ABI := arm64-v8a armeabi-v7a x86
 APP_PLATFORM := android-21
 #APP_MODULES := YGOMobile
 #NDK_TOOLCHAIN_VERSION=4.8

libcore/src/main/java/cn/garymb/ygomobile/YGOMobileActivity.java

@@ -118,7 +118,7 @@ public class YGOMobileActivity extends NativeActivity implements
         mFullScreenUtils.fullscreen();
         mFullScreenUtils.onCreate();
         //argv
-        mArgV = getIntent().getStringArrayExtra(IrrlichtBridge.EXTRA_ARGV);
+        mArgV = IrrlichtBridge.getArgs(getIntent());
         //
         super.onCreate(savedInstanceState);
         Log.e("YGOStarter", "跳转完成" + System.currentTimeMillis());
@@ -418,6 +418,7 @@ public class YGOMobileActivity extends NativeActivity implements
         options.mArgvList.clear();
         if (mArgV != null) {
             options.mArgvList.addAll(Arrays.asList(mArgV));
+            mArgV = null;
         }
         return options.toNativeBuffer();
     }

libcore/src/main/java/cn/garymb/ygomobile/core/IrrlichtBridge.java

@@ -6,6 +6,7 @@
  */
 package cn.garymb.ygomobile.core;
 
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.util.Log;
@@ -27,11 +28,16 @@ public final class IrrlichtBridge {
     public static final String ACTION_STOP = "cn.garymb.ygomobile.game.stop";
     public static final String EXTRA_PID = "extras.mypid";
     public static final String EXTRA_ARGV = "extras.argv";
+    public static final String EXTRA_ARGV_TIME_OUT = "extras.argv_timeout";
+    private static final boolean DEBUG = false;
+    private static final String TAG = IrrlichtBridge.class.getSimpleName();
     public static int gPid;
+    public static long sNativeHandle;
+
     static {
         try {
             System.loadLibrary("YGOMobile");
-        }catch (Throwable e){
+        } catch (Throwable e) {
             //ignore
         }
     }
@@ -40,17 +46,21 @@ public final class IrrlichtBridge {
 
     }
 
-    public static long sNativeHandle;
     //显示卡图
     public static native byte[] nativeBpgImage(byte[] data);
+
     //插入文本（大概是发送消息）
     private static native void nativeInsertText(long handle, String text);
+
     //刷新文字
     private static native void nativeRefreshTexture(long handle);
+
     //忽略时点
     private static native void nativeIgnoreChain(long handle, boolean begin);
+
     //强制时点
     private static native void nativeReactChain(long handle, boolean begin);
+
     //取消连锁
     private static native void nativeCancelChain(long handle);
 
@@ -62,8 +72,18 @@ public final class IrrlichtBridge {
 
     private static native void nativeSetInputFix(long handle, int x, int y);
 
-    private static final boolean DEBUG = false;
-    private static final String TAG = IrrlichtBridge.class.getSimpleName();
+    public static void setArgs(Intent intent, String[] args) {
+        intent.putExtra(EXTRA_ARGV, args);
+        intent.putExtra(EXTRA_ARGV_TIME_OUT, (System.currentTimeMillis() + 15 * 1000));
+    }
+
+    public static String[] getArgs(Intent intent) {
+        long time = intent.getLongExtra(EXTRA_ARGV_TIME_OUT, 0);
+        if (time > System.currentTimeMillis()) {
+            return intent.getStringArrayExtra(EXTRA_ARGV);
+        }
+        return null;
+    }
 
     public static Bitmap getBpgImage(InputStream inputStream, Bitmap.Config config) {
         ByteArrayOutputStream outputStream = null;
@@ -121,7 +141,7 @@ public final class IrrlichtBridge {
         }
     }
 
-    public static void setInputFix(int x, int y){
+    public static void setInputFix(int x, int y) {
         nativeSetInputFix(sNativeHandle, x, y);
     }
 
@@ -166,9 +186,9 @@ public final class IrrlichtBridge {
 
         String getSetting(String key);
 
-        int getIntSetting(String key,int def);
+        int getIntSetting(String key, int def);
 
-        void saveIntSetting(String key,int value);
+        void saveIntSetting(String key, int value);
 
         float getScreenWidth();
 

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

@@ -124,6 +124,7 @@ public interface Constants {
     int REQUEST_CHOOSE_FILE = 0x1000 + 0x20;
     int REQUEST_CHOOSE_IMG = 0x1000 + 0x21;
     int REQUEST_CHOOSE_FOLDER = 0x1000 + 0x22;
+    int REQUEST_SETTINGS_CODE = 0x1000 + 0x23;
     int STRING_TYPE_START = 1050;
 
     int STRING_ATTRIBUTE_START = 1010;

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

@@ -176,9 +176,7 @@ public class YGOStarter {
             intent.putExtra(YGOGameOptions.YGO_GAME_OPTIONS_BUNDLE_KEY, options);
             intent.putExtra(YGOGameOptions.YGO_GAME_OPTIONS_BUNDLE_TIME, System.currentTimeMillis());
         }
-        if(args != null) {
-            intent.putExtra(IrrlichtBridge.EXTRA_ARGV,args);
-        }
+        IrrlichtBridge.setArgs(intent, args);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         Log.e("YGOStarter", "跳转前" + System.currentTimeMillis());
         activity.startActivity(intent);

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

@@ -2,7 +2,6 @@ package cn.garymb.ygomobile.ui.home;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
@@ -22,15 +21,12 @@ import java.io.IOException;
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.GameUriManager;
-import cn.garymb.ygomobile.YGOMobileActivity;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.core.IrrlichtBridge;
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.activities.PermissionsActivity;
 import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
-import cn.garymb.ygomobile.utils.ComponentUtils;
 import cn.garymb.ygomobile.utils.FileUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.NetUtils;
@@ -54,13 +50,12 @@ public class MainActivity extends HomeActivity {
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_EXTERNAL_STORAGE,
     };
+    public ConfigManager favConf = DataManager.openConfig(AppsSettings.get().getSystemConfig());
     ResCheckTask mResCheckTask;
     private GameUriManager mGameUriManager;
     private ImageUpdater mImageUpdater;
     private boolean enableStart;
 
-    public ConfigManager favConf = DataManager.openConfig(AppsSettings.get().getSystemConfig());
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -181,7 +176,7 @@ public class MainActivity extends HomeActivity {
     @Override
     protected void onPermission(boolean isOk) {
         super.onPermission(isOk);
-        if (isOk){
+        if (isOk) {
             try {
                 FileUtils.copyDir(ORI_DECK, AppsSettings.get().getDeckDir(), false);
             } catch (Throwable e) {
@@ -306,6 +301,15 @@ public class MainActivity extends HomeActivity {
         });
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == Constants.REQUEST_SETTINGS_CODE) {
+            //TODO
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     /*        checkResourceDownload((result, isNewVersion) -> {
                 Toast.makeText(this, R.string.tip_reset_game_res, Toast.LENGTH_SHORT).show();
             });*/

mobile/src/main/java/cn/garymb/ygomobile/utils/FileUtils.java

 package cn.garymb.ygomobile.utils;
 
+import android.util.Log;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -79,24 +81,21 @@ public class FileUtils {
         return true;
     }
 
-    public static void copyFile(InputStream in, File out) {
+    public static void copyFile(InputStream in, File out) throws IOException {
         FileOutputStream outputStream = null;
-        try {
         File dir = out.getParentFile();
         if (!dir.exists()) {
             dir.mkdirs();
         }
+        try {
             outputStream = new FileOutputStream(out);
             copy(in, outputStream);
-        } catch (Throwable e) {
-            e.printStackTrace();
         } finally {
             IOUtils.close(outputStream);
-            IOUtils.close(in);
         }
     }
 
-    public static void copyFile(File in, File out) {
+    public static boolean copyFile(File in, File out) {
         FileOutputStream outputStream = null;
         FileInputStream inputStream = null;
         try {
@@ -108,11 +107,13 @@ public class FileUtils {
             outputStream = new FileOutputStream(out);
             copy(inputStream, outputStream);
         } catch (Throwable e) {
-            e.printStackTrace();
+            Log.e("ygo", "copy file", e);
+            return false;
         } finally {
             IOUtils.close(outputStream);
             IOUtils.close(inputStream);
         }
+        return true;
     }
 
     public static void copyFile(String oldPath, String newPath, boolean isName) throws FileNotFoundException, IOException {