restart

mobile/build.gradle

@@ -113,6 +113,5 @@ dependencies {
     implementation 'com.google.android.material:material:1.0.0'
     //图片选择
     implementation 'com.yuyh.imgsel:library:2.0.6'
-
-    implementation 'com.jonathanfinerty.once:once:1.3.0'
+    implementation 'com.daimajia.numberprogressbar:library:1.4@aar'
 }

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

 package cn.garymb.ygomobile;
 
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.widget.ImageView;
 
 import androidx.appcompat.app.AppCompatDelegate;
@@ -13,7 +16,7 @@ import com.yuyh.library.imgsel.common.ImageLoader;
 import cn.garymb.ygomobile.interfaces.GameConfig;
 import cn.garymb.ygomobile.interfaces.GameHost;
 import cn.garymb.ygomobile.utils.CrashHandler;
-import jonathanfinerty.once.Once;
+import libwindbot.windbot.WindBot;
 
 public class App extends GameApplication {
     private GameHost gameHost;
@@ -22,7 +25,6 @@ public class App extends GameApplication {
     public void onCreate() {
         super.onCreate();
         if (!isGameProcess()) {
-            Once.initialise(this);
             AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
             //初始化图片选择器
             initImgsel();
@@ -33,6 +35,7 @@ public class App extends GameApplication {
         //初始化异常工具类
         CrashHandler crashHandler = CrashHandler.getInstance();
         crashHandler.init(getApplicationContext());
+
     }
 
     private void initImgsel() {

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

@@ -16,10 +16,15 @@ import cn.garymb.ygomobile.interfaces.GameConfig;
 import cn.garymb.ygomobile.interfaces.GameHost;
 import cn.garymb.ygomobile.interfaces.GameSize;
 import cn.garymb.ygomobile.lite.BuildConfig;
+import libwindbot.windbot.WindBot;
+
+import static cn.garymb.ygomobile.Constants.CORE_BOT_CONF_PATH;
+import static cn.garymb.ygomobile.Constants.DATABASE_NAME;
 
 class LocalGameHost extends GameHost {
     private Context context;
     private SharedPreferences settings;
+    private boolean mInitBot = false;
 
     LocalGameHost(Context context) {
         super(context);
@@ -64,12 +69,28 @@ class LocalGameHost extends GameHost {
         }
     }
 
+    private void initWindBot() {
+        synchronized (this){
+            if(mInitBot){
+                return;
+            }
+            mInitBot = true;
+        }
+        Log.i("路径", context.getFilesDir().getPath());
+        Log.i("路径2", AppsSettings.get().getDataBasePath() + "/" + DATABASE_NAME);
+        try {
+            WindBot.initAndroid(AppsSettings.get().getResourcePath(),
+                    AppsSettings.get().getDataBasePath() + "/" + DATABASE_NAME,
+                    AppsSettings.get().getResourcePath() + "/" + CORE_BOT_CONF_PATH);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void runWindbot(String cmd) {
-        Intent intent = new Intent();
-        intent.putExtra("args", cmd);
-        intent.setAction("RUN_WINDBOT");
-        context.sendBroadcast(intent);
+        initWindBot();
+        WindBot.runAndroid(cmd);
     }
 
     @Override

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

 package cn.garymb.ygomobile.ui.activities;
 
 import android.content.Intent;
+import android.content.res.AssetManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
 import android.view.View;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import com.daimajia.numberprogressbar.NumberProgressBar;
+
+import java.io.File;
+
 import cn.garymb.ygomobile.AppsSettings;
+import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.home.MainActivity;
+import cn.garymb.ygomobile.ui.home.ResCheckTask;
+import cn.garymb.ygomobile.ui.plus.VUiKit;
+import cn.garymb.ygomobile.utils.IOUtils;
+import cn.garymb.ygomobile.utils.SystemUtils;
+import ocgcore.CardManager;
+import ocgcore.ConfigManager;
+import ocgcore.DataManager;
 
 public class LogoActivity extends BaseActivity {
-    Handler handler;
-    Runnable runnable;
+    public static final String EXTRA_NEW_VERSION = "isNew";
+    public static final String EXTRA_ERROR = "error";
+    private View ly_loading;
+    private TextView tv_loading;
+    private NumberProgressBar number_progress_bar;
+    private static final String TAG = "ResCheckTask";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_logo);
         int windowsFlags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE/* 系统UI变化不触发relayout */
                 | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION/* 导航栏悬浮在布局上面 */
                 | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN/* 状态栏悬浮在布局上面 */
@@ -26,6 +44,11 @@ public class LogoActivity extends BaseActivity {
                 | View.SYSTEM_UI_FLAG_FULLSCREEN/* 隐藏状态栏 */
                 | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY/* 沉浸模式 */;
         getWindow().getDecorView().setSystemUiVisibility(windowsFlags);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_logo);
+        number_progress_bar = findViewById(R.id.number_progress_bar);
+        ly_loading = findViewById(R.id.ly_loading);
+        tv_loading = findViewById(R.id.tv_loading);
         if (AppsSettings.get().isOnlyGame()) {
             YGOStarter.startGame(this, null);
             finish();
@@ -33,9 +56,56 @@ public class LogoActivity extends BaseActivity {
         }
         if (!isTaskRoot()) {
             finish();
-            return;
         }
+    }
 
+    private void startLoad() {
+        ly_loading.setVisibility(View.VISIBLE);
+        int vercode = SystemUtils.getVersion(this);
+        boolean isNewVersion;
+        if (AppsSettings.get().getAppVersion() < vercode) {
+            AppsSettings.get().setAppVersion(vercode);
+            isNewVersion = true;
+        } else {
+            isNewVersion = false;
+        }
+        ResCheckTask resCheckTask = new ResCheckTask(this, isNewVersion, 1000);
+        number_progress_bar.setMax(100);
+        long time = System.currentTimeMillis();
+        VUiKit.defer()
+                .when(resCheckTask)
+                .progress((str) -> {
+                    tv_loading.setText(str);
+                    number_progress_bar.setProgress(resCheckTask.getProgress());
+                })
+                .fail((e) -> {
+                    Log.e(TAG, "check res", e);
+                    onCheckCompleted(isNewVersion, ResCheckTask.ERROR_CORE_OTHER);
+                })
+                .done((err) -> {
+                    tv_loading.setText(R.string.tip_load_ok);
+                    number_progress_bar.setProgress(100);
+                    onCheckCompleted(isNewVersion, err);
+                });
+    }
+
+    private void onCheckCompleted(boolean isNew, int err) {
+        Intent intent = new Intent(this, MainActivity.class);
+        intent.putExtra(EXTRA_NEW_VERSION, isNew);
+        intent.putExtra(EXTRA_ERROR, err);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+        finish();
+    }
+
+    @Override
+    public void finish() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            finishAndRemoveTask();
+        } else {
+            super.finish();
+        }
     }
 
     @Override
@@ -45,21 +115,7 @@ public class LogoActivity extends BaseActivity {
         if (requestCode == REQUEST_PERMISSIONS && resultCode == PermissionsActivity.PERMISSIONS_DENIED) {
             finish();
         } else {
-            //   if (BuildConfig.DEBUG) {
-            //       startActivity(new Intent(LogoActivity.this, MainActivity.class));
-            //       finish();
-            //   } else {
-            handler = new Handler();
-            runnable = new Runnable() {
-                @Override
-                public void run() {
-                    startActivity(new Intent(LogoActivity.this, MainActivity.class));
-                    finish();
-                }
-            };
-            handler.postDelayed(runnable, 1000);
-            Toast.makeText(LogoActivity.this, R.string.logo_text, Toast.LENGTH_SHORT).show();
-            //   }
+            startLoad();
         }
     }
 

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

@@ -2,16 +2,11 @@ package cn.garymb.ygomobile.ui.home;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.res.AssetManager;
 import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -20,15 +15,14 @@ import android.widget.Button;
 import androidx.annotation.NonNull;
 
 import java.io.File;
-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.YGOCore;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.activities.LogoActivity;
 import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
@@ -38,50 +32,26 @@ import cn.garymb.ygomobile.utils.NetUtils;
 import cn.garymb.ygomobile.utils.PermissionUtil;
 import libwindbot.windbot.WindBot;
 
-import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
 import static cn.garymb.ygomobile.Constants.CORE_BOT_CONF_PATH;
 import static cn.garymb.ygomobile.Constants.DATABASE_NAME;
 import static cn.garymb.ygomobile.Constants.NETWORK_IMAGE;
-import static cn.garymb.ygomobile.ui.home.ResCheckTask.OnCompletedListener;
 
 public class MainActivity extends HomeActivity {
     private static final String TAG = "ResCheckTask";
     private GameUriManager mGameUriManager;
     private ImageUpdater mImageUpdater;
     private boolean enableStart;
-    ResCheckTask mResCheckTask;
-    private final String[] PERMISSIONS = {
-//            Manifest.permission.RECORD_AUDIO,
-            Manifest.permission.READ_PHONE_STATE,
-            Manifest.permission.SYSTEM_ALERT_WINDOW,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         YGOStarter.onCreated(this);
         mImageUpdater = new ImageUpdater(this);
-        mResCheckTask = new ResCheckTask(this);
-        //动态权限
-//        ActivityCompat.requestPermissions(this, PERMISSIONS, 0);
+        Log.i("kk", "MainActivity:onCreate");
+        boolean isNew = getIntent().getBooleanExtra(LogoActivity.EXTRA_NEW_VERSION, false);
+        int err = getIntent().getIntExtra(LogoActivity.EXTRA_ERROR, ResCheckTask.ERROR_NONE);
         //资源复制
-        mResCheckTask.start(this::onCheckCompleted);
-        registerReceiver(mWindBotReceiver, new IntentFilter(Constants.WINDBOT_ACTION));
-    }
-
-    @SuppressLint({"StringFormatMatches", "StringFormatInvalid"})
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-//        for(int i=0;i<permissions.length;i++){
-//            if(grantResults[i] == PackageManager.PERMISSION_DENIED){
-//                showToast(getString(R.string.tip_no_permission,permissions[i]));
-//                break;
-//            }
-//        }
-
+        onCheckCompleted(err, isNew);
     }
 
     @Override
@@ -94,31 +64,8 @@ public class MainActivity extends HomeActivity {
         }
     }
 
-    public BroadcastReceiver mWindBotReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (Constants.WINDBOT_ACTION.equals(intent.getAction())) {
-                String args = intent.getStringExtra("args");
-                WindBot.runAndroid(args);
-            }
-        }
-    };
-
-    private void initWindBot() {
-        Log.i("路径", getFilesDir().getPath());
-        Log.i("路径2", AppsSettings.get().getDataBasePath() + "/" + DATABASE_NAME);
-        try {
-            WindBot.initAndroid(AppsSettings.get().getResourcePath(),
-                    AppsSettings.get().getDataBasePath() + "/" + DATABASE_NAME,
-                    AppsSettings.get().getResourcePath() + "/" + CORE_BOT_CONF_PATH);
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
     @Override
     protected void onDestroy() {
-        unregisterReceiver(mWindBotReceiver);
         YGOStarter.onDestroy(this);
         super.onDestroy();
     }
@@ -126,18 +73,8 @@ public class MainActivity extends HomeActivity {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        if (ACTION_RELOAD.equals(intent.getAction())) {
-            mResCheckTask.start((error, isNew) -> {
-                if (error < 0) {
-                    enableStart = false;
-                } else {
-                    enableStart = true;
-                }
-                getGameUriManager().doIntent(getIntent());
-            });
-        } else {
-            getGameUriManager().doIntent(intent);
-        }
+        Log.i("kk", "MainActivity:onNewIntent");
+        getGameUriManager().doIntent(intent);
     }
 
     private GameUriManager getGameUriManager() {
@@ -210,7 +147,6 @@ public class MainActivity extends HomeActivity {
         } else {
             enableStart = true;
         }
-        initWindBot();
         if (isNew) {
             if (!getGameUriManager().doIntent(getIntent())) {
                 final DialogPlus dialog = new DialogPlus(this);

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java

@@ -34,6 +34,7 @@ import cn.garymb.ygomobile.App;
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.activities.LogoActivity;
 import cn.garymb.ygomobile.ui.home.HomeActivity;
 import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
@@ -366,12 +367,18 @@ public class SettingFragment extends PreferenceFragmentPlus {
             super.onChooseFileOk(preference, file);
             onPreferenceClick(preference);
         } else if (PREF_GAME_PATH.equalsIgnoreCase(preference.getKey())) {
-            if (!TextUtils.equals(mSettings.getResourcePath(), file)) {
+            boolean needRestart = !TextUtils.equals(mSettings.getResourcePath(), file);
+            mSettings.setResourcePath(file);
+            if (needRestart) {
 //                Toast.makeText(getActivity(), R.string.restart_app, Toast.LENGTH_SHORT).show();
-                startActivity(new Intent(getActivity(), MainActivity.class).setAction(ACTION_RELOAD));
+                Log.i("kk", "need restart activity");
+                Intent home = new Intent(Intent.ACTION_MAIN);
+                home.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                home.addCategory(Intent.CATEGORY_HOME);
+                Intent my = new Intent(getActivity(), LogoActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                getActivity().startActivities(new Intent[]{home, my});
                 getActivity().finish();
             }
-            mSettings.setResourcePath(file);
             super.onChooseFileOk(preference, file);
         } else if (PREF_USE_EXTRA_CARD_CARDS.equals(key)) {
             ((CheckBoxPreference) preference).setChecked(true);

mobile/src/main/res/layout/activity_logo.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/activity_logo"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#38000000"
     android:gravity="center">
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="400dp"
         android:gravity="center">
@@ -14,8 +16,35 @@
             android:id="@+id/logo"
             android:layout_width="380dp"
             android:layout_height="380dp"
-            android:layout_centerInParent="true"
+            android:layout_gravity="top|center_horizontal"
             android:scaleType="fitXY"
             android:src="@drawable/ic_launcher3" />
-    </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ly_loading"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:visibility="gone"
+            android:layout_marginBottom="20dp"
+            tools:visibility="visible"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_loading"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/loading"
+                android:layout_marginBottom="5dp"
+                android:textSize="14sp"
+                android:textColor="@color/holo_yellow" />
+
+            <com.daimajia.numberprogressbar.NumberProgressBar
+                android:id="@+id/number_progress_bar"
+                android:layout_width="180dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal" />
+        </LinearLayout>
+    </FrameLayout>
 </LinearLayout>

mobile/src/main/res/values-ko/strings.xml

@@ -273,4 +273,5 @@
     <string name="about_pref_settings_keep_scale">원래 해상도 스케일 디스플레이</string>
     <string name="about_pref_key_hw_hide_notouch">Hide Hw notouch</string>
     <string name="about_pref_key_hw_hide_notouch_desc">If the click   has problem in your game, turn on this.</string>
+    <string name="tip_load_ok">load completed.</string>
 </resources>

mobile/src/main/res/values-zh/strings.xml

@@ -272,4 +272,5 @@
     <string name="about_pref_settings_keep_scale">开启原始比例的游戏画面</string>
     <string name="about_pref_key_hw_hide_notouch">隐藏HW刘海区域</string>
     <string name="about_pref_key_hw_hide_notouch_desc">如果你游戏点击不准，请启用这个功能</string>
+    <string name="tip_load_ok">加载完成</string>
 </resources>

mobile/src/main/res/values/colors.xml

@@ -26,4 +26,5 @@
     <color name="FallNavy">#11113d</color>
     <color name="colorMain">#2196F3</color>
     <color name="background">#ECEFF1</color>
+    <color name="holo_yellow">#ffdf3a</color>
 </resources>
\ No newline at end of file

mobile/src/main/res/values/strings.xml

@@ -275,4 +275,5 @@
     <string name="about_pref_settings_keep_scale">Original Resolution Scale Display</string>
     <string name="about_pref_key_hw_hide_notouch">Hide Hw notouch</string>
     <string name="about_pref_key_hw_hide_notouch_desc">If the click   has problem in your game, turn on this.</string>
+    <string name="tip_load_ok">load completed.</string>
 </resources>