#Update name

MirkoWu · Aug 6, 2021 · 6cd1c26 · 6cd1c26
1 parent 70eced8
commit 6cd1c26
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -97,8 +97,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.core:core-ktx:$ext.core_ktx_version"
     implementation "androidx.appcompat:appcompat:$ext.appcompat_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "com.google.android.material:material:$ext.material_version"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

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.UpgradeManager;
+import com.mirkowu.lib_bugly.BuglyManager;
 import com.mirkowu.lib_crash.CrashManager;
 import com.mirkowu.lib_screen.AutoSizeManager;
 import com.mirkowu.lib_stat.UmengManager;
@@ -24,7 +24,7 @@ public void onCreate() {
         WebViewUtil.initMultiProcess(this);
 
         //换成你自己的bugly账号
-        UpgradeManager.init(this, "3e2cd9bf87", BuildConfig.DEBUG);
+        BuglyManager.init(this, "3e2cd9bf87", BuildConfig.DEBUG);
 
         /**
          * 防止初始化多次，视项目情况设置

diff --git a/app/src/main/java/com/mirkowu/mvm/MainActivity.kt b/app/src/main/java/com/mirkowu/mvm/MainActivity.kt
@@ -10,7 +10,7 @@ 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.UpgradeDialog
-import com.mirkowu.lib_bugly.UpgradeManager
+import com.mirkowu.lib_bugly.BuglyManager
 import com.mirkowu.lib_util.utilcode.util.NetworkUtils
 import com.mirkowu.lib_util.utilcode.util.ToastUtils
 import com.mirkowu.mvm.base.BaseActivity
@@ -58,7 +58,7 @@ class MainActivity : BaseActivity<EmptyMediator>() {
             Manifest.permission.READ_PHONE_STATE
         )
 
-        UpgradeManager.setOnUpgradeListener { upgradeInfo, isManual ->
+        BuglyManager.setOnUpgradeListener { upgradeInfo, isManual ->
             Log.e(DataBindingFragment.TAG, "setUpgradeListener:   upgradeInfo=$upgradeInfo")
 
             if (upgradeInfo != null) {
@@ -67,7 +67,7 @@ class MainActivity : BaseActivity<EmptyMediator>() {
                 ToastUtils.showShort("当前已是最新版本!")
             }
         }
-        UpgradeManager.checkUpgrade(false, false)
+        BuglyManager.checkUpgrade(false, false)
 
         var time=System.currentTimeMillis();
         NetworkUtils.isAvailableByPingAsync("baidu.com") {

diff --git a/app/src/main/java/com/mirkowu/mvm/viewbinding/DataBindingFragment.kt b/app/src/main/java/com/mirkowu/mvm/viewbinding/DataBindingFragment.kt
@@ -1,25 +1,22 @@
 package com.mirkowu.mvm.viewbinding
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
-import android.provider.Settings
 import android.util.Log
 import android.view.LayoutInflater
 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_bugly.BuglyManager
 import com.mirkowu.lib_qr.QRScanner
 import com.mirkowu.lib_qr.ScanConfig
 import com.mirkowu.lib_upgrade.IUpgradeInfo
 import com.mirkowu.lib_upgrade.UpgradeDialog
 import com.mirkowu.lib_util.LogUtil
 import com.mirkowu.lib_util.PermissionsUtil
-import com.mirkowu.lib_util.PermissionsUtil.REQUEST_CODE
 import com.mirkowu.lib_util.ktxutil.click
 import com.mirkowu.lib_util.utilcode.util.LanguageUtils
 import com.mirkowu.lib_util.utilcode.util.ToastUtils
@@ -135,7 +132,7 @@ class DataBindingFragment : BaseFragment<MVVMMediator>() {
             startActivity(Intent(context, DownloadActivity::class.java))
         }
         binding.btnBuglyUpgrade.click {
-            UpgradeManager.checkUpgrade(true, true)
+            BuglyManager.checkUpgrade(true, true)
         }
         binding.btnUpgrade.click {
             // BuglyManager.checkUpgrade(true, false)

diff --git a/build.gradle b/build.gradle
@@ -50,7 +50,7 @@ ext {
     targetSdkVersion = 29
     minSdkVersion = 21
 
-    mvm_version = '1.0.22'
+    mvm_version = '1.0.40'
     appcompat_version = '1.3.0'
     material_version = '1.4.0'
     core_ktx_version = '1.5.0'

diff --git a/...com/mirkowu/lib_bugly/UpgradeManager.java → ...a/com/mirkowu/lib_bugly/BuglyManager.java b/...com/mirkowu/lib_bugly/UpgradeManager.java → ...a/com/mirkowu/lib_bugly/BuglyManager.java
@@ -16,9 +16,9 @@
 import java.io.File;
 import java.util.List;
 
-public class UpgradeManager {
+public class BuglyManager {
     public static final String CHANNEL = "bugly";
-    public static final String TAG = UpgradeManager.class.getSimpleName();
+    public static final String TAG = BuglyManager.class.getSimpleName();
     private static OnUpgradeListener sOnUpgradeListener;
     private static UpgradeStateListener sUpgradeStateListener;
 
@@ -34,7 +34,7 @@ public static void init(Context context, String appId, boolean isDebug) {
     }
 
     public static void init(Context context, String appId, String channel, boolean isDebug) {
-        UpgradeManager.setUpgradeListener(new UpgradeListener() {
+        BuglyManager.setUpgradeListener(new UpgradeListener() {
             @Override
             public void onUpgrade(int i, UpgradeInfo upgradeInfo, boolean isManual, boolean isSilence) {
                 LogUtil.e(TAG, "onUpgrade: 是否有新版本 =" + (upgradeInfo != null));

diff --git a/lib_bugly/src/main/java/com/mirkowu/lib_bugly/UpgradeDialog.java b/lib_bugly/src/main/java/com/mirkowu/lib_bugly/UpgradeDialog.java
@@ -81,8 +81,8 @@ protected void convertView(ViewHolder viewHolder, BaseDialog baseDialog) {
         initButtonText();
 
 
-        UpgradeManager.registerDownloadListener(this);
-        UpgradeManager.setUpgradeStateListener(this);
+        BuglyManager.registerDownloadListener(this);
+        BuglyManager.setUpgradeStateListener(this);
     }
 
     private void initButtonText() {
@@ -141,7 +141,7 @@ public void onClick(View v) {
             if (listener != null) {
                 listener.onButtonClick(this, true);
             }
-            UpgradeManager.cancelDownload();
+            BuglyManager.cancelDownload();
             dismissAllowingStateLoss();
         }
     }
@@ -160,7 +160,7 @@ private void startDownloadTask() {
             tvNegative.setEnabled(true);
         }
 
-        UpgradeManager.startDownloadTask();
+        BuglyManager.startDownloadTask();
     }
 
 
@@ -213,8 +213,8 @@ public void onFailed(DownloadTask downloadTask, int i, String s) {
 
     @Override
     public void onDestroyView() {
-        UpgradeManager.unregisterDownloadListener();
-        UpgradeManager.cancelDownload();
+        BuglyManager.unregisterDownloadListener();
+        BuglyManager.cancelDownload();
         super.onDestroyView();
     }
 

diff --git a/lib_bugly/src/main/java/com/mirkowu/lib_crash/CrashManager.java b/lib_bugly/src/main/java/com/mirkowu/lib_crash/CrashManager.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.text.TextUtils;
 
+import com.mirkowu.lib_bugly.BuglyManager;
 import com.mirkowu.lib_util.utilcode.util.ProcessUtils;
 import com.mirkowu.lib_util.utilcode.util.Utils;
 import com.tencent.bugly.crashreport.CrashReport;
@@ -13,7 +14,7 @@
 public class CrashManager {
     /**
      * 初始化
-     * 如果使用了 版本更新SDK 直接用 {@link com.mirkowu.lib_bugly.UpgradeManager} 初始化就行
+     * 如果使用了 版本更新SDK 直接用 {@link BuglyManager} 初始化就行
      *
      * @param context
      * @param appId   申请的应用ID
@@ -26,7 +27,7 @@ public static void init(Context context, String appId, boolean isDebug) {
 
     /**
      * 初始化
-     * 如果使用了 版本更新SDK 直接用 {@link com.mirkowu.lib_bugly.UpgradeManager} 初始化就行
+     * 如果使用了 版本更新SDK 直接用 {@link BuglyManager} 初始化就行
      *
      * @param context
      * @param appId   申请的应用ID