移除bugly的升级功能

app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java

@@ -2,8 +2,6 @@ package com.yizhuan.erban.application;
 
 import android.app.Activity;
 
-import com.tencent.bugly.beta.Beta;
-import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
 import com.yizhuan.erban.avroom.newuserchargegift.NewUserChargePrizeDialog;
 import com.yizhuan.erban.relation.cp.dialog.CpGlobalDialog;
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
@@ -22,7 +20,6 @@ import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent;
 import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo;
 import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent;
 import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.utils.ActivityUtil;
 import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
 import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent;
 
@@ -65,11 +62,7 @@ public class GlobalHandleManager {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onImPushUpdateAppEvent(ImPushUpdateAppEvent event) {
-        Activity activity = getActivity();
+
-        if (activity == null) return;
-        if (ActivityUtil.isCanShowAppCompatDialog(activity) && activity instanceof RxAppCompatActivity) {
-            Beta.checkUpgrade();
-        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

app/src/main/java/com/yizhuan/erban/application/XChatApplication.java

@@ -56,20 +56,16 @@ import com.orhanobut.logger.Logger;
 import com.scwang.smartrefresh.header.MaterialHeader;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
-import com.tencent.bugly.Bugly;
-import com.tencent.bugly.beta.Beta;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.vasdolly.helper.ChannelReaderUtil;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 import com.yizhuan.erban.BuildConfig;
-import com.yizhuan.erban.MainActivity;
 import com.yizhuan.erban.MiddleActivity;
 import com.yizhuan.erban.NimMiddleActivity;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.module_hall.HallDataManager;
 import com.yizhuan.erban.other.activity.SplashActivity;
-import com.yizhuan.erban.quick_pass.QuickPassLoginAct;
 import com.yizhuan.erban.radish.wallet.RadishWalletManager;
 import com.yizhuan.erban.utils.PushMessageHandler;
 import com.yizhuan.xchat_android_constants.XChatConstants;
@@ -278,9 +274,7 @@ public class XChatApplication extends Application {
             if (!TextUtils.isEmpty(channel)) {
                 CrashReport.setAppChannel(context, channel);
             }
-            initBuglyUpdate();
+            CrashReport.initCrashReport(context, BuildConfig.DEBUG ? XChatConstants.BUGLY_KEY_DEBUG : XChatConstants.BUGLY_KEY_RELEASE, BuildConfig.DEBUG);
-            Bugly.init(context, BuildConfig.DEBUG ? XChatConstants.BUGLY_KEY_DEBUG : XChatConstants.BUGLY_KEY_RELEASE, BuildConfig.DEBUG);
-
             //生命周期监听
             if (lifeManager == null) {
                 lifeManager = new ActivityLifeManager();
@@ -443,58 +437,6 @@ public class XChatApplication extends Application {
         return packageName.equals(processName);
     }
 
-    /**
-     * 初始化bugly版本升级
-     */
-    private static void initBuglyUpdate() {
-        /***** Beta高级设置 *****/
-        /**
-         * true表示app启动自动初始化升级模块;
-         * false不会自动初始化;
-         * 开发者如果担心sdk初始化影响app启动速度，可以设置为false，
-         * 在后面某个时刻手动调用Beta.init(getApplicationContext(),false);
-         */
-//        Beta.autoInit = true;
-        /**
-         * true表示初始化时自动检查升级;
-         * false表示不会自动检查升级,需要手动调用Beta.checkUpgrade()方法;
-         */
-//        Beta.autoCheckUpgrade = true;
-        /**
-         * 设置升级检查周期为60s(默认检查周期为0s)，60s内SDK不重复向后台请求策略);
-         */
-//        Beta.upgradeCheckPeriod = 60 * 1000;
-
-        /**
-         * 设置启动延时为1s（默认延时3s），APP启动1s后初始化SDK，避免影响APP启动速度;
-         */
-        Beta.initDelay = 6 * 1000;
-
-        /**
-         * 设置sd卡的Download为更新资源保存目录;
-         * 后续更新资源会保存在此目录，需要在manifest中添加WRITE_EXTERNAL_STORAGE权限;
-         */
-//        Beta.storageDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-
-        /**
-         * 点击过确认的弹窗在APP下次启动自动检查更新时会再次显示;
-         */
-        Beta.showInterruptedStrategy = true;
-
-        /**
-         * 只允许在MainActivity上显示更新弹窗，其他activity上不显示弹窗;
-         * 不设置会默认所有activity都可以显示弹窗;
-         * 2021/6/22 增加登录页面也可以弹出,万一域名挂了还可以用bugly更新!!
-         */
-        Beta.canShowUpgradeActs.add(MainActivity.class);
-        Beta.canShowUpgradeActs.add(QuickPassLoginAct.class);
-        /**
-         * 自定义布局
-         */
-        Beta.upgradeDialogLayoutId = R.layout.upgrade_dialog;//关键代码写这个布局添加自己想要的
-
-    }
-
     /**
      * 初始化RxNet
      *

app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java

@@ -2,18 +2,15 @@ package com.yizhuan.erban.ui.setting;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Environment;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.view.View;
 
-import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
 
 import com.netease.nim.uikit.StatusBarUtil;
-import com.tencent.bugly.beta.Beta;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.UIHelper;
@@ -173,10 +170,6 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             case R.id.rly_update://关于我们
                 startActivity(new Intent(getApplicationContext(), AboutActivity.class));
                 break;
-            case R.id.rly_check://检查更新
-//                AppUpgradeHelper.checkAppUpgrade(this, true);
-                Beta.checkUpgrade();
-                break;
             case R.id.rly_lab:
                 startActivity(new Intent(getApplicationContext(), LabActivity.class));
                 break;

app/src/main/res/layout/upgrade_dialog.xml

@@ -1,152 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/transparent_ban"
-    android:clipChildren="false"
-    android:gravity="center">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/dialog_background"
-        android:gravity="center"
-        android:orientation="vertical"
-        >
-
-        <!-- 通过id设置的控件 -->
-        <!--<ImageView-->
-        <!--android:id="@+id/imageview"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:src="@mipmap/ic_launcher" />-->
-
-        <!--&lt;!&ndash;通过tag设置的控件 &ndash;&gt;-->
-        <!--<TextView-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:tag="textview"-->
-        <!--android:text="customText" />-->
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-50dp"
-            >
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:tag="beta_upgrade_banner"
-                android:scaleType="centerCrop"
-                android:src="@drawable/update_banner"/>
-
-
-            <!-- 【必设】升级标题控件tag：beta_title-->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="42dp"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:paddingLeft="10dp"
-                android:tag="beta_title"
-                android:text="title"
-                android:visibility="gone"
-                android:layout_gravity="center"
-                android:textColor="#273238"
-                android:textSize="18sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="发现新版本"
-                android:textColor="#ff795eef"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="70dp"
-                />
-        </FrameLayout>
-
-
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="24.5dp"
-            android:paddingEnd="24.5dp"
-            android:paddingTop="@dimen/dp_10"
-            android:paddingBottom="@dimen/dp_6"
-            >
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingLeft="4dp">
-                <!-- 【必设】升级信息控件tag：beta_upgrade_info-->
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:tag="beta_upgrade_info"
-                    android:text="info"
-                    android:textColor="#757575"
-                    android:textSize="14sp"
-                    android:visibility="gone"/>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="8dp"
-                    android:text="@string/strUpgradeDialogFeatureLabel"
-                    android:textColor="#273238"
-                    android:textSize="14sp"
-                    android:visibility="gone"/>
-                <!-- 【必设】更新属性控件tag：beta_upgrade_feature-->
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:tag="beta_upgrade_feature"
-                    android:text="feature"
-                    android:lineSpacingExtra="5dp"
-                    android:textColor="#666666"
-                    android:textSize="12sp" />
-            </LinearLayout>
-        </ScrollView>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="15dp">
-            <!-- 【必设】取消按钮tag：beta_cancel_button-->
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="38dp"
-                android:layout_weight="1"
-                android:background="@drawable/bg_common_cancel"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:tag="beta_cancel_button"
-                android:text="下次再说"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:textColor="@color/color_7154EE"
-                android:textSize="@dimen/dp_14"/>
-            <!-- 【必设】确认按钮tag：beta_confirm_button-->
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="38dp"
-                android:layout_weight="1"
-                android:background="@drawable/bg_common_confirm_normal"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:tag="beta_confirm_button"
-                android:text="立刻升级"
-                android:layout_marginStart="10dp"
-                android:textColor="@color/white"
-                android:textSize="@dimen/dp_14" />
-        </LinearLayout>
-
-    </LinearLayout>
-</RelativeLayout>

core/build.gradle

@@ -93,8 +93,7 @@ dependencies {
     // RxJava support for Room
     api 'androidx.room:room-rxjava2:2.3.0'
 
-    api 'com.tencent.bugly:crashreport_upgrade:1.6.1'
+    api 'com.tencent.bugly:crashreport:4.1.9'
-    api 'com.tencent.bugly:nativecrashreport:3.9.2'
 
     api project(':nim_uikit')
     api project(':library')