From 09db03bdfd426a3beb6929e5d4b604ddc05f884f Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Mon, 6 Mar 2023 18:17:43 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E7=A7=BB=E9=99=A4=E8=85=BE=E8=AE=AFbug?=
 =?UTF-8?q?ly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/proguard-rules.pro                            | 12 ------------
 app/src/main/AndroidManifest.xml                  | 13 +------------
 .../java/com/jph/takephoto/app/TakePhotoImpl.java |  2 +-
 .../main/java/com/yizhuan/erban/MainActivity.java |  2 --
 .../erban/application/XChatApplication.java       |  6 ------
 .../erban/avroom/activity/AVRoomActivity.java     |  5 ++---
 .../erban/avroom/widget/FixRoomTitleTextView.java |  1 -
 .../yizhuan/erban/utils/BuglyFileProvider.java    | 12 ------------
 core/build.gradle                                 |  2 --
 .../xchat_android_constants/XChatConstants.java   | 15 ---------------
 .../manager/trtc/TRtcEngineEventHandler.java      |  3 +--
 .../manager/zego/ZegoEngineManager.java           |  3 +--
 12 files changed, 6 insertions(+), 70 deletions(-)
 delete mode 100644 app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 9297d56b2..333376b3b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -178,14 +178,6 @@
 -keep class com.soundcloud.android.crop.** { *; }
 -dontwarn com.soundcloud.android.crop.**
 
-#-------------TakePhoto的混淆配置------------
-
-
-
-#腾讯崩溃收集
--dontwarn com.tencent.bugly.**
--keep public class com.tencent.bugly.**{*;}
-
 # glide4.0
 -keep public class * implements com.bumptech.glide.module.GlideModule
 -keep public class * extends com.bumptech.glide.module.AppGlideModule
@@ -426,10 +418,6 @@
     public static ** valueOf(java.lang.String);
 }
 
-#腾讯崩溃收集
--dontwarn com.tencent.bugly.**
--keep public class com.tencent.bugly.**{*;}
-
 # 易盾
 -keep class com.netease.mobsec.**{*;}
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5fb6dc390..486ccfaa7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     package="com.yizhuan.erban">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
-    <!-- bugly所需权限 -->
+
     <permission
         android:name="${applicationId}.permission.RECEIVE_MSG"
         android:protectionLevel="signature" /> <!-- ShareSdk权限申请 -->
@@ -991,17 +991,6 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
-        <provider
-            android:name=".utils.BuglyFileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true"
-            tools:replace="name,authorities,exported,grantUriPermissions">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"
-                tools:replace="name,resource" />
-        </provider>
         <provider
             android:name="com.netease.nimlib.ipc.NIMContentProvider"
             android:authorities="${applicationId}.ipc.provider"
diff --git a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
index b2f4c9a75..bad379891 100644
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
@@ -303,7 +303,7 @@ public class TakePhotoImpl implements TakePhoto {
     }
 
     private void cropWithNonException(Uri imageUri, Uri outPutUri, CropOptions options) {
-        //bugly这里出现options为null的情况，具体原因待排查...
+        //这里出现options为null的情况，具体原因待排查...
         //猜测可能是takePhoneImpl 实例只有一个，options出现意外清空的情况
         if (options == null) {
             return;
diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java
index 9376c9270..ca07146ba 100644
--- a/app/src/main/java/com/yizhuan/erban/MainActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java
@@ -37,7 +37,6 @@ import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum;
 import com.netease.nimlib.sdk.team.model.Team;
 import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
 import com.orhanobut.logger.Logger;
-import com.tencent.bugly.crashreport.CrashReport;
 import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.application.IReportConstants;
@@ -509,7 +508,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     @SuppressLint("CheckResult")
     public void onLogin(long uid) {
         Logger.e(TAG, "onLogin Success ~~~~");
-        CrashReport.setUserId(this, uid + "");
 
         Log.i("checkLostUser", "onLogin");
 
diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
index 41acac172..55828abaf 100644
--- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
+++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
@@ -40,7 +40,6 @@ 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.crashreport.CrashReport;
 import com.tencent.vasdolly.helper.ChannelReaderUtil;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
@@ -255,10 +254,6 @@ public class XChatApplication extends BaseApp {
 
             init(channel);
 
-            if (!TextUtils.isEmpty(channel)) {
-                CrashReport.setAppChannel(context, channel);
-            }
-            CrashReport.initCrashReport(context, BuildConfig.DEBUG ? XChatConstants.BUGLY_KEY_DEBUG : XChatConstants.BUGLY_KEY_RELEASE, BuildConfig.DEBUG);
             //生命周期监听
             if (lifeCycleHelper == null) {
                 lifeCycleHelper = new AppLifeCycleHelper();
@@ -560,7 +555,6 @@ public class XChatApplication extends BaseApp {
     @Override
     public void onTerminate() {
         super.onTerminate();
-        CrashReport.closeBugly();
         GlobalHandleManager.get().unInit();
         if (lifeCycleHelper != null) {
             unregisterActivityLifecycleCallbacks(lifeCycleHelper);
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
index c5b673253..79ba72bfc 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
@@ -47,7 +47,6 @@ import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.orhanobut.logger.Logger;
-import com.tencent.bugly.crashreport.CrashReport;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.dialog.NewUserGiftDialog;
@@ -874,7 +873,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
 
     @Override
     protected void onDestroy() {
-        //fix bugly #147214 java.lang.IllegalArgumentException
         //关闭这么多弹窗,鬼知道哪个出问题了,简单的try catch下
         try {
             // 确保关闭 dialog，避免出现 leak window 异常
@@ -905,7 +903,8 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             }
             dismissLoadingDialog();
         } catch (Exception e) {
-            CrashReport.postCatchedException(e);
+            Logger.i("关闭弹窗失败" + e.getMessage());
+//            CrashReport.postCatchedException(e);
         }
         GiftModel.get().cancelCountDownTimer();
         EventBus.getDefault().unregister(this);
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java
index 97065a088..239ae56ae 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java
@@ -7,7 +7,6 @@ import android.view.MotionEvent;
 import androidx.appcompat.widget.AppCompatTextView;
 
 /**
- * 尝试修复  https://bugly.qq.com/v2/crash-reporting/crashes/52320483a6/29504?pid=1
  * <p>
  * 不一定可行...
  * <p>
diff --git a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java b/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java
deleted file mode 100644
index ac344efc3..000000000
--- a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.yizhuan.erban.utils;
-
-import androidx.core.content.FileProvider;
-
-/**
- * <p>使用的第三方库也配置了同样的FileProvider, 可以通过继承FileProvider类来解决合并冲突的问题  </p>
- *
- * @author Administrator
- * @date 2017/12/5
- */
-public class BuglyFileProvider extends FileProvider {
-}
diff --git a/core/build.gradle b/core/build.gradle
index 7892a9563..17c550daf 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,8 +91,6 @@ dependencies {
     // RxJava support for Room
     api 'androidx.room:room-rxjava2:2.3.0'
 
-    api 'com.tencent.bugly:crashreport:4.1.9'
-
     //firebase推送、统计
     implementation 'com.google.firebase:firebase-messaging:22.0.0'
     implementation 'com.google.android.gms:play-services-base:17.6.0'
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
index 9d1777c78..171a6643a 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
@@ -35,21 +35,6 @@ public class XChatConstants {
      */
     public static final String XCHAT_DATABASE_NAME = "accompany.db";
 
-    /**
-     * 微信支付 APP ID
-     */
-    public static final String WX_APP_ID = "";
-
-    /**
-     * bugly key (DEBUG)
-     */
-    public static final String BUGLY_KEY_DEBUG = "2a7521d23f";//已更改
-
-    /**
-     * bugly key (RELEASE)
-     */
-    public static final String BUGLY_KEY_RELEASE = "3655441f78";//已更改
-
     /**
      * 雲信 key (DEBUG)
      */
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java
index ae735b224..3bbacd6aa 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java
@@ -4,7 +4,6 @@ import android.graphics.Rect;
 import android.os.Message;
 
 import com.orhanobut.logger.Logger;
-import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.trtc.TRTCCloudDef;
 import com.yizhuan.xchat_android_core.R;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean;
@@ -35,7 +34,7 @@ public class TRtcEngineEventHandler implements IRTCEngineHandler {
     @Override
     public void onError(int err) {
         Logger.t(TAG).d("onError" + err);
-        CrashReport.postCatchedException(new Throwable(ResUtil.getString(R.string.manager_trtc_trtcengineeventhandler_01)+err+" roomId="+AvRoomDataManager.get().getRoomId()));
+//        CrashReport.postCatchedException(new Throwable(ResUtil.getString(R.string.manager_trtc_trtcengineeventhandler_01)+err+" roomId="+AvRoomDataManager.get().getRoomId()));
         switch (err) {
             case 1107: {
                 SingleToastUtil.showToast(ResUtil.getString(R.string.manager_trtc_trtcengineeventhandler_02));
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java
index 2a4e17ed5..afdd63698 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/zego/ZegoEngineManager.java
@@ -3,7 +3,6 @@ package com.yizhuan.xchat_android_core.manager.zego;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.tencent.bugly.crashreport.CrashReport;
 import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.yizhuan.xchat_android_core.BuildConfig;
 import com.yizhuan.xchat_android_library.common.application.Env;
@@ -86,7 +85,7 @@ public class ZegoEngineManager extends BaseEngine {
             } else {
                 // 登录失败
                 LogUtils.e("Zego onLoginCompletion: code: " + code);
-                CrashReport.postCatchedException(new Throwable("enterChannel failed zegoCode = " + code + "channelId = " + channelId));
+//                CrashReport.postCatchedException(new Throwable("enterChannel failed zegoCode = " + code + "channelId = " + channelId));
             }
         });
     }