添加StringUtils依赖

检查更新功能更改
停用bugly

mobile/build.gradle

@@ -130,9 +130,7 @@ dependencies {
     implementation 'com.yuyh.imgsel:library:2.1.0'
     //跨进程SharedPreferencesPlus工具
     implementation 'com.github.zhangliangming:PreferencesProvider:v1.3'
-    //Tencent bugly
-    implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
-    implementation 'com.tencent.bugly:nativecrashreport:latest.release'
+    implementation 'org.apache.commons:commons-lang3:3.7'
     api 'com.tencent.tbs:tbssdk:44085'
     //http请求库
     implementation 'com.squareup.okhttp3:okhttp:3.12.0'

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

@@ -4,14 +4,10 @@ package cn.garymb.ygomobile;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.widget.ImageView;
 
 import androidx.appcompat.app.AppCompatDelegate;
 
-import com.tencent.bugly.Bugly;
-import com.tencent.bugly.beta.Beta;
 import com.tencent.smtt.export.external.TbsCoreSettings;
 import com.tencent.smtt.sdk.QbSdk;
 import com.yuyh.library.imgsel.ISNav;
@@ -19,9 +15,6 @@ import com.yuyh.library.imgsel.common.ImageLoader;
 
 import java.util.HashMap;
 
-import cn.garymb.ygomobile.lite.BuildConfig;
-import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.utils.CrashHandler;
 import cn.garymb.ygomobile.utils.ProcessUtils;
 import cn.garymb.ygomobile.utils.glide.GlideCompat;
@@ -37,7 +30,7 @@ public class App extends GameApplication {
         CrashHandler crashHandler = CrashHandler.getInstance();
         crashHandler.init(getApplicationContext());
         //初始化bugly
-        initBugly();
+        //initBugly();
         if(!ProcessUtils.getCurrentProcessName(this).endsWith(":game")){
             //初始化图片选择器
             initImgsel();
@@ -166,7 +159,7 @@ public class App extends GameApplication {
             }
         });
     }
-
+/*
     public void initBugly() {
         Beta.initDelay = 0;
         Beta.showInterruptedStrategy = true;
@@ -189,5 +182,5 @@ public class App extends GameApplication {
         }
         String msg = appInfo.metaData.getString("BUGLY_APPID");
         Bugly.init(this, msg, BuildConfig.DEBUG_MODE);
-    }
+    }*/
 }

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

@@ -151,7 +151,7 @@ public interface Constants {
     String URL_HELP = "https://www.wolai.com/hgRyrSXQuq4rzMwzXhHBqA";
     String URL_MASTER_RULE_CN = "https://ocg-rule.readthedocs.io/";
     String WIKI_SEARCH_URL = "https://ygocdb.com/card/";
-    String URL_YGO233_ComparisionTable = "https://ygocdb.com/api/v0/idChangelog.jsonp";
+    String URL_YGO233_DOWNLOAD_LINK = "https://ygo233.com/download/ygomobile";
     String URL_YGO233_ADVANCE = "https://ygo233.com/pre";
     String URL_YGO233_DATAVER = "https://ygo233.com/pre/dataver";
     String URL_YGO233_FILE = "https://ygo233.com/pre/download-ygomobile";

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

@@ -17,7 +17,6 @@ import com.ashokvarma.bottomnavigation.BottomNavigationBar;
 import com.ashokvarma.bottomnavigation.BottomNavigationItem;
 import com.ashokvarma.bottomnavigation.ShapeBadgeItem;
 import com.ashokvarma.bottomnavigation.TextBadgeItem;
-import com.tencent.bugly.beta.Beta;
 import com.tencent.smtt.sdk.QbSdk;
 
 import cn.garymb.ygomobile.AppsSettings;
@@ -228,7 +227,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
         if (!BuildConfig.BUILD_TYPE.equals("debug")) {
             //release才检查版本
             if (!Constants.ACTION_OPEN_GAME.equals(getIntent().getAction())) {
-                Beta.checkUpgrade(false, false);
+                //Beta.checkUpgrade(false, false);
             }
         }
     }

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

@@ -287,7 +287,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
         }
     };
 
-    private void showExNew() {
+    public void showExNew() {
         if (AppsSettings.get().isReadExpansions()) {
             OkhttpUtil.get(URL_YGO233_DATAVER, new Callback() {
                 @Override

mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java

@@ -33,16 +33,15 @@ import static cn.garymb.ygomobile.Constants.PREF_WINDOW_TOP_BOTTOM;
 import static cn.garymb.ygomobile.Constants.SETTINGS_AVATAR;
 import static cn.garymb.ygomobile.Constants.SETTINGS_CARD_BG;
 import static cn.garymb.ygomobile.Constants.SETTINGS_COVER;
+import static cn.garymb.ygomobile.Constants.URL_YGO233_DOWNLOAD_LINK;
 import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
 
-import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Message;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -60,9 +59,9 @@ import android.widget.Toast;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.MediaStoreSignature;
-import com.tencent.bugly.beta.Beta;
 
-import java.io.DataOutputStream;
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -70,23 +69,28 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.garymb.ygomobile.App;
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
+import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.adapters.SimpleListAdapter;
+import cn.garymb.ygomobile.ui.home.HomeFragment;
 import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
-import cn.garymb.ygomobile.ui.settings.PreferenceFragmentPlus;
 import cn.garymb.ygomobile.utils.FileUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
+import cn.garymb.ygomobile.utils.OkhttpUtil;
 import cn.garymb.ygomobile.utils.SystemUtils;
 import cn.garymb.ygomobile.utils.glide.GlideCompat;
 import ocgcore.DataManager;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Response;
 
 public class SettingFragment extends PreferenceFragmentPlus {
     private AppsSettings mSettings;
+    private HomeFragment mHomeFragment;
     private boolean isInit = true;
 
     public SettingFragment() {
@@ -103,6 +107,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(false);
         mSettings = AppsSettings.get();
+        mHomeFragment = new HomeFragment();
 
         addPreferencesFromResource(R.xml.preference_game);
         bind(PREF_GAME_PATH, mSettings.getResourcePath());
@@ -213,7 +218,19 @@ public class SettingFragment extends PreferenceFragmentPlus {
             joinQQGroup(groupkey);
         }
         if (PREF_CHECK_UPDATE.equals(key)) {
-            Beta.checkUpgrade();
+            OkhttpUtil.get(URL_YGO233_DOWNLOAD_LINK, new Callback() {
+                @Override
+                public void onFailure(Call call, IOException e) {
+                    Log.i(BuildConfig.VERSION_NAME, "error" + e);
+                }
+
+                @Override
+                public void onResponse(Call call, Response response) throws IOException {
+                    String json = response.body().string();
+                    Log.i(BuildConfig.VERSION_NAME, StringUtils.substringBetween(json,"https://netdisk.link/", "/links"));
+                }
+            });
+            //Beta.checkUpgrade();
         }
         if (PREF_DEL_EX.equals(key)) {
             File[] ypks = new File(AppsSettings.get().getExpansionsPath().getAbsolutePath()).listFiles();