#update upgrade

MirkoWu · Jul 22, 2021 · 85f939f · 85f939f
1 parent 6f9f120
commit 85f939f
Show file tree

Hide file tree

Showing 17 changed files with 329 additions and 263 deletions.
diff --git a/app/src/main/java/com/mirkowu/mvm/MVMApplication.java b/app/src/main/java/com/mirkowu/mvm/MVMApplication.java
@@ -2,7 +2,7 @@
 
 import android.app.Application;
 
-import com.mirkowu.lib_bugly.BuglyManager;
+import com.mirkowu.lib_bugly.UpgradeManager;
 import com.mirkowu.lib_screen.AutoSizeManager;
 import com.mirkowu.lib_stat.UmengManager;
 import com.mirkowu.lib_util.LogUtil;
@@ -28,7 +28,7 @@ public void onCreate() {
 
 
         //换成你自己的bugly账号
-        BuglyManager.init(this, "3e2cd9bf87", BuildConfig.DEBUG);
+        UpgradeManager.init(this, "3e2cd9bf87", BuildConfig.DEBUG);
 
         //umeng
         UmengManager.preInit(this, "60d310388a102159db787693", "umeng", BuildConfig.DEBUG);

diff --git a/app/src/main/java/com/mirkowu/mvm/MainActivity.kt b/app/src/main/java/com/mirkowu/mvm/MainActivity.kt
@@ -8,8 +8,8 @@ import android.view.View
 import com.mirkowu.lib_base.adapter.FragmentBasePagerAdapter
 import com.mirkowu.lib_base.mediator.EmptyMediator
 import com.mirkowu.lib_base.util.bindingView
-import com.mirkowu.lib_bugly.BuglyManager
 import com.mirkowu.lib_bugly.UpgradeDialog
+import com.mirkowu.lib_bugly.UpgradeManager
 import com.mirkowu.lib_util.utilcode.util.ToastUtils
 import com.mirkowu.mvm.base.BaseActivity
 import com.mirkowu.mvm.mvc.MVCActivity
@@ -56,7 +56,7 @@ class MainActivity : BaseActivity<EmptyMediator>() {
             Manifest.permission.READ_PHONE_STATE
         )
 
-        BuglyManager.setOnUpgradeListener { upgradeInfo, isManual ->
+        UpgradeManager.setOnUpgradeListener { upgradeInfo, isManual ->
             Log.e(DataBindingFragment.TAG, "setUpgradeListener:   upgradeInfo=$upgradeInfo")
 
             if (upgradeInfo != null) {
@@ -65,8 +65,7 @@ class MainActivity : BaseActivity<EmptyMediator>() {
                 ToastUtils.showShort("当前已是最新版本!")
             }
         }
-        // Beta.upgradeStateListener
-        // BuglyManager.checkUpgrade(false,false)
+        UpgradeManager.checkUpgrade(false, false)
     }
 
     fun webLocalClick(view: View?) {

diff --git a/app/src/main/java/com/mirkowu/mvm/ServicePrivacyDialog.java b/app/src/main/java/com/mirkowu/mvm/ServicePrivacyDialog.java
@@ -90,14 +90,14 @@
 //        if (listener != null) {
 //            int i = v.getId();
 //            if (i == R.id.tvPositive) {
-//                dismiss();
+//                dismissAllowingStateLoss();
 //                listener.onButtonClick(this, true);
 //            } else if (i == R.id.tvNegative) {
 //                if (!isRefuseOnce) {
 //                    isRefuseOnce = true;
 //                    updateUI();
 //                } else {
-//                    dismiss();
+//                    dismissAllowingStateLoss();
 //                    listener.onButtonClick(this, false);
 //                }
 //            }

diff --git a/app/src/main/java/com/mirkowu/mvm/viewbinding/DataBindingFragment.kt b/app/src/main/java/com/mirkowu/mvm/viewbinding/DataBindingFragment.kt
@@ -12,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mirkowu.lib_base.util.bindingView
+import com.mirkowu.lib_bugly.UpgradeManager
 import com.mirkowu.lib_qr.QRScanner
 import com.mirkowu.lib_qr.ScanConfig
 import com.mirkowu.lib_upgrade.IUpgradeInfo
@@ -129,11 +130,13 @@ class DataBindingFragment : BaseFragment<MVVMMediator>() {
                 ToastUtils.showShort("isExternalStorageLegacy = " + Environment.isExternalStorageLegacy())
             }
             startActivity(Intent(context, ImagePickerActivity::class.java))
-
         }
         binding.btnDown.click {
             startActivity(Intent(context, DownloadActivity::class.java))
         }
+        binding.btnBuglyUpgrade.click {
+            UpgradeManager.checkUpgrade(true, true)
+        }
         binding.btnUpgrade.click {
             // BuglyManager.checkUpgrade(true, false)
             val url =