1.优化日志打印

app/src/main/java/com/yingyangfly/AutoInstallService.java

@@ -1,7 +1,6 @@
 package com.yingyangfly;
 
 import android.accessibilityservice.AccessibilityService;
-import android.util.Log;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 
@@ -56,12 +55,10 @@ public class AutoInstallService extends AccessibilityService {
     @Override
     protected void onServiceConnected() {
         super.onServiceConnected();
-        Log.e("wpp", "onServiceConnected");
     }
 
     @Override
     public void onInterrupt() {
-        Log.e("wpp", "onInterrupt");
     }
 
 

app/src/main/java/com/yingyangfly/MyApplication.kt

@@ -1,7 +1,6 @@
 package com.yingyangfly
 
 import android.content.Context
-import android.util.Log
 import androidx.multidex.MultiDex
 import com.tencent.imsdk.v2.V2TIMManager
 import com.tencent.imsdk.v2.V2TIMSDKConfig
@@ -10,6 +9,9 @@ import com.tencent.rtmp.TXLiveBase
 import com.tencent.rtmp.TXLiveBaseListener
 import com.yingyangfly.baselib.BaseApplication
 import com.yingyangfly.baselib.config.AccountConfig
+import com.yingyangfly.baselib.ext.logd
+import com.yingyangfly.baselib.ext.loge
+import com.yingyangfly.baselib.ext.logi
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.User
@@ -28,7 +30,8 @@ class MyApplication : BaseApplication() {
             .setLicence(this, AccountConfig.TENCENT_LICENCEURL, AccountConfig.TENCENT_LICENCEKEY)
         TXLiveBase.setListener(object : TXLiveBaseListener() {
             override fun onLicenceLoaded(result: Int, reason: String) {
-                Log.i("wpp", "onLicenceLoaded: result:$result, reason:$reason")
+                val message = "onLicenceLoaded: result:$result, reason:$reason"
+                message.logi()
             }
         })
 
@@ -36,28 +39,27 @@ class MyApplication : BaseApplication() {
         config.logLevel = V2TIMSDKConfig.V2TIM_LOG_DEBUG
         V2TIMManager.getInstance().addIMSDKListener(object : V2TIMSDKListener() {
             override fun onConnecting() {
-                Log.e("wpp", "IM onConnecting")
+                "IM onConnecting".logd()
             }
 
             override fun onConnectSuccess() {
-                Log.e("wpp", "IM onConnectSuccess")
+                "IM onConnectSuccess".logd()
             }
 
             override fun onConnectFailed(code: Int, error: String?) {
+                val message = "IM onConnectFailed code is $code error is $error"
+                message.loge()
                 timer()
-                Log.e("wpp", "IM onConnectFailed")
-                Log.e("wpp", "IM onConnectFailed code------------------>         $code")
-                Log.e("wpp", "IM onConnectFailed code------------------>         $error")
             }
 
             override fun onKickedOffline() {
+                "IM onKickedOffline".loge()
                 timer()
-                Log.e("wpp", "IM onKickedOffline")
             }
 
             override fun onUserSigExpired() {
+                "IM onUserSigExpired".loge()
                 timer()
-                Log.e("wpp", "IM onUserSigExpired")
             }
         })
         V2TIMManager.getInstance().initSDK(this, AccountConfig.TENCENT_IM_APPID, config)

game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -7,7 +7,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.text.TextUtils
-import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewTreeObserver
@@ -21,12 +20,12 @@ import androidx.constraintlayout.widget.ConstraintSet
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.bumptech.glide.Glide
-import com.tencent.bugly.crashreport.CrashReport
 import com.yingyangfly.baselib.bean.GameDataBean
 import com.yingyangfly.baselib.bean.GetSaveGameRecordBean
 import com.yingyangfly.baselib.db.VoicePlayerBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.logd
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.player.VoicePlayer
@@ -36,9 +35,7 @@ import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
-import com.yingyangfly.baselib.utils.User
 import com.yingyangfly.baselib.utils.img.ImgUtil
-import com.yingyangfly.game.BuildConfig
 import com.yingyangfly.game.R
 import com.yingyangfly.game.databinding.ActivityPlayGameBinding
 import com.yingyangfly.game.dialog.CompletionTrainingDialog
@@ -187,7 +184,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
             binding.webView.evaluateJavascript(
                 "javascript:CallContinueGame()"
             ) {
-                Log.e("wpp", "----------------继续游戏")
+                "游戏介绍页面返回继续游戏".logd()
             }
         }
     }
@@ -285,18 +282,17 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                     R.id.imagePause -> {
                         runOnUiThread {
                             if (callQuitGame) {
-                                reportGameCrashInfo("游戏结束退出失败，通过返回键退出游戏")
                                 ActivityManagers.instance.finishActivity(GameIntroductionActivity::class.java)
                                 finish()
                             } else {
                                 if (TextUtils.equals("D", playClass)) {
                                     finish()
                                 } else {
-                                    Log.e("wpp", "游戏暂停")
+                                    "点击暂停游戏".logd()
                                     binding.webView.evaluateJavascript(
                                         "javascript:CallPauseGame()"
                                     ) {
-                                        Log.e("wpp", "游戏暂停成功跳转介绍")
+                                        "游戏暂停成功跳转介绍".logd()
                                         ARouter.getInstance()
                                             .build(RouterUrlCommon.gameIntroduction)
                                             .withString("gameCode", gameCode).withString("id", id)
@@ -480,7 +476,8 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         LiveEventBusUtil.observer<String>(this, RxBusCodes.SAVEDATA) {
             runOnUiThread {
                 if (TextUtils.isEmpty(it).not()) {
-                    Log.e("wpp", "游戏保存-----------$it")
+                    val message = "游戏进度保存$it"
+                    message.logd()
                     val gameDataBean = GsonUtil.GsonToBean(it, GameDataBean::class.java)
                     if (gameDataBean != null) {
                         val score: Int = gameTotalScore.toInt() + gameDataBean.curLevelScore.toInt()
@@ -503,11 +500,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                         } else {
                             parsingData(gameDataBean, isPass)
                         }
-                    } else {
-                        reportGameCrashInfo("h5返回信息解析失败")
                     }
-                } else {
-                    reportGameCrashInfo("h5返回游戏信息为空")
                 }
             }
         }
@@ -740,18 +733,4 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         val cn = am.getRunningTasks(1)[0].topActivity
         return cn!!.className == activity.javaClass.name
     }
-
-    /**
-     * 上报游戏异常
-     */
-    private fun reportGameCrashInfo(msg: String) {
-        if (BuildConfig.DEBUG) {
-            Log.e("wpp", "游戏页面日志上报----------------->$msg")
-            CrashReport.postCatchedException(
-                Throwable(
-                    msg + "\n用户信息:" + User.getName() + User.getUserId() + "\n游戏名称： " + gameName + "游戏code： " + gameCode
-                )
-            )
-        }
-    }
 }

healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentActivity.kt

@@ -3,7 +3,6 @@ package com.yingyang.healthconsultation.payment
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -54,7 +53,6 @@ class PaymentActivity : BaseMVVMActivity<ActivityPaymentBinding, PaymentViewMode
         purchaseConsultationBean =
             intent.getSerializableExtra("purchaseConsultationBean") as PurchaseConsultationBean
         super.onCreate(savedInstanceState)
-        Log.e("wpp", "患者信息--------------->  $patientInfo")
     }
 
     override fun initViews() {

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -23,6 +23,7 @@ import com.yingyangfly.baselib.dialog.MessageDialog
 import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.logd
 import com.yingyangfly.baselib.ext.loge
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
@@ -663,17 +664,17 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
      */
     private fun makeMessageAsRead(msg: V2TIMMessage) {
         runOnUiThread {
-            V2TIMManager.getConversationManager().cleanConversationUnreadMessageCount(
-                String.format("c2c_%s", msg.sender),
-                0,
-                0,
-                object : V2TIMCallback {
-                    override fun onSuccess() {
-                    }
+            V2TIMManager.getConversationManager()
+                .cleanConversationUnreadMessageCount(String.format("c2c_%s", msg.sender),
+                    0,
+                    0,
+                    object : V2TIMCallback {
+                        override fun onSuccess() {
+                        }
 
-                    override fun onError(p0: Int, p1: String?) {
-                    }
-                })
+                        override fun onError(p0: Int, p1: String?) {
+                        }
+                    })
         }
     }
 
@@ -782,15 +783,15 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                     null,
                     object : V2TIMSendCallback<V2TIMMessage> {
                         override fun onSuccess(p0: V2TIMMessage?) {
-                            Log.e("wpp", "患者信息发送成功")
+                            "患者信息发送成功".logd()
                         }
 
                         override fun onError(p0: Int, p1: String?) {
-                            Log.e("wpp", "患者信息发送失败，错误码：$p0  错误信息：$p1")
+                            val message = "患者信息发送失败，错误码：$p0  错误信息：$p1"
+                            message.loge()
                         }
 
                         override fun onProgress(p0: Int) {
-                            Log.e("wpp", "患者信息发送中$p0")
                         }
 
                     })

home/src/main/java/com/yingyangfly/home/evaluation/EvaluationHistoryActivity.kt

@@ -2,7 +2,6 @@ package com.yingyangfly.home.evaluation
 
 import android.annotation.SuppressLint
 import android.text.TextUtils
-import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -128,7 +127,6 @@ class EvaluationHistoryActivity :
      * 加载数据
      */
     private fun getReviewTaskHistoryList() {
-        Log.e("wpp", "获取专业测评历史记录")
         results.clear()
         viewModel.getReviewTaskHistoryList(fail = {
             it.toast()

home/src/main/java/com/yingyangfly/home/evaluation/detail/OtherReviewResultDetailViewModel.kt

@@ -1,6 +1,5 @@
 package com.yingyangfly.home.evaluation.detail
 
-import android.util.Log
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil
@@ -23,7 +22,6 @@ class OtherReviewResultDetailViewModel : BaseViewModel() {
             page = 0
             limit = 99999
         }
-        Log.e("wpp", GsonUtil.GsonString(requestBean))
         val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
         HOME_API.selectAnswerRecordDetail(body)
     }.runUI(

home/src/main/java/com/yingyangfly/home/updater/AutoInstallService.java

@@ -1,7 +1,6 @@
 package com.yingyangfly.home.updater;
 
 import android.accessibilityservice.AccessibilityService;
-import android.util.Log;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 
@@ -60,13 +59,9 @@ public class AutoInstallService extends AccessibilityService {
     @Override
     protected void onServiceConnected() {
         super.onServiceConnected();
-        Log.e("wpp", "onServiceConnected");
     }
 
     @Override
     public void onInterrupt() {
-        Log.e("wpp", "onInterrupt");
     }
-
-
 }

home/src/main/java/com/yingyangfly/home/updater/InstallAccessibilityService.java

@@ -16,22 +16,18 @@ import java.util.Map;
  */
 public class InstallAccessibilityService extends AccessibilityService {
 
-    private static final String TAG = "wpp";
-
     private Map<Integer, Boolean> handledMap = new HashMap<>();
 
     private Handler mHandler = new Handler(Looper.getMainLooper());
 
     @Override
     public void onAccessibilityEvent(AccessibilityEvent event) {
-        Log.d(TAG, "onAccessibilityEvent: " + event.toString());
         if (!String.valueOf(event.getPackageName()).contains("packageinstaller")) {
             //不写完整包名，是因为某些手机(如小米)安装器包名是自定义的
             return;
         }
         AccessibilityNodeInfo nodeInfo = event.getSource();
         if (nodeInfo == null) {
-            Log.i(TAG, "eventNode: null, 重新获取eventNode...");
             performGlobalAction(GLOBAL_ACTION_RECENTS); // 打开最近页面
             mHandler.postDelayed(() -> {
                 performGlobalAction(GLOBAL_ACTION_BACK); // 返回安装页面
@@ -40,8 +36,7 @@ public class InstallAccessibilityService extends AccessibilityService {
         }
 
         int eventType = event.getEventType();
-        if (eventType == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED ||
-                eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
+        if (eventType == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED || eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
             if (handledMap.get(event.getWindowId()) == null) {
                 boolean handled = iterateNodesAndHandle(nodeInfo);
                 if (handled) {
@@ -57,14 +52,7 @@ public class InstallAccessibilityService extends AccessibilityService {
             if ("android.widget.Button".equals(nodeInfo.getClassName())) {
                 String nodeContent = nodeInfo.getText().toString();
                 Log.d("TAG", "content is " + nodeContent);
-                if (!TextUtils.isEmpty(nodeContent)
-                        && ("安装".equals(nodeContent)
-                        || "install".equals(nodeContent.toLowerCase())
-                        || "done".equals(nodeContent.toLowerCase())
-                        || "完成".equals(nodeContent)
-                        || "更新".equals(nodeContent)
-                        || "确定".equals(nodeContent)
-                )) {
+                if (!TextUtils.isEmpty(nodeContent) && ("安装".equals(nodeContent) || "install".equals(nodeContent.toLowerCase()) || "done".equals(nodeContent.toLowerCase()) || "完成".equals(nodeContent) || "更新".equals(nodeContent) || "确定".equals(nodeContent))) {
                     nodeInfo.performAction(AccessibilityNodeInfo.ACTION_CLICK);
                     return true;
                 }

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -3,13 +3,11 @@ package com.yingyang.livebroadcast.activity.detail
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
-import com.tencent.bugly.crashreport.CrashReport
 import com.tencent.imsdk.v2.V2TIMAdvancedMsgListener
 import com.tencent.imsdk.v2.V2TIMCallback
 import com.tencent.imsdk.v2.V2TIMManager
@@ -27,13 +25,13 @@ import com.yingyangfly.baselib.dialog.MessageDialog
 import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.loge
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
-import com.yingyangfly.baselib.utils.User
 import java.util.*
 
 /**
@@ -107,26 +105,25 @@ class LiveBroadcastActivity :
             super.onError(player, code, msg, extraInfo)
             when (code) {
                 V2TXLiveCode.V2TXLIVE_ERROR_REQUEST_TIMEOUT -> {
-                    Log.e("wpp", "1----------------------------请求服务器超时")
+                    "直播间请求服务器超时".loge()
                     tipsDialog("请求服务器超时,请您退出直播间重试。")
                 }
 
                 V2TXLiveCode.V2TXLIVE_ERROR_DISCONNECTED -> {
-                    Log.e("wpp", "1----------------------------连接断开")
+                    "直播间连接断开".loge()
                     tipsDialog("直播连接断开,请您退出直播间重试。")
                 }
 
                 V2TXLiveCode.V2TXLIVE_WARNING_NETWORK_BUSY -> {
+                    "直播间网络状况不佳".loge()
                     "当前直播间网络状况不佳".toast()
-                    Log.e("wpp", "1----------------------------网络状况不佳")
                 }
 
                 V2TXLiveCode.V2TXLIVE_WARNING_VIDEO_BLOCK -> {
+                    "直播间当前视频播放出现卡顿".loge()
                     "当前视频播放出现卡顿".toast()
-                    Log.e("wpp", "1----------------------------当前视频播放出现卡顿")
                 }
             }
-            CrashReport.postCatchedException(Throwable("直播报错        ----->      [Player] onError: player-$player code-$code msg-$msg info-$extraInfo"))
         }
 
         override fun onWarning(
@@ -136,17 +133,17 @@ class LiveBroadcastActivity :
             when (code) {
                 V2TXLiveCode.V2TXLIVE_ERROR_REQUEST_TIMEOUT -> {
                     "请求服务器超时".toast()
-                    Log.e("wpp", "2----------------------------请求服务器超时")
+                    "直播间请求服务器超时".loge()
                 }
 
                 V2TXLiveCode.V2TXLIVE_ERROR_DISCONNECTED -> {
                     "连接断开".toast()
-                    Log.e("wpp", "2----------------------------连接断开")
+                    "直播间连接断开".loge()
                 }
 
                 V2TXLiveCode.V2TXLIVE_WARNING_NETWORK_BUSY -> {
                     "当前直播间网络状况不佳".toast()
-                    Log.e("wpp", "2----------------------------网络状况不佳")
+                    "直播间网络状况不佳".loge()
                 }
             }
         }
@@ -210,14 +207,7 @@ class LiveBroadcastActivity :
      */
     private fun liveIncr() {
         viewModel.liveIncr(liveId, fail = {
-            //直播间心跳上回传报错
-            CrashReport.postCatchedException(
-                Throwable(
-                    User.getName() + "直播间心跳上回传报错，直播间信息：" + liveId + " ,用户信息:" + User.getUserId() + "  \n" + User.getName() + " ,错误信息:" + it
-                )
-            )
         }, success = {
-
         })
     }
 
@@ -242,7 +232,6 @@ class LiveBroadcastActivity :
             super.onRecvNewMessage(msg)
             runOnUiThread {
                 if (msg != null) {
-                    Log.e("wpp", "6-------------------------------" + GsonUtil.GsonString(msg))
                     makeMessageAsRead(msg)
                     if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
                         val customElem = msg.customElem

login/src/main/java/com/yingyang/login/service/InitService.kt

@@ -8,10 +8,11 @@ import android.content.Intent
 import android.os.Build
 import android.os.IBinder
 import android.text.TextUtils
-import android.util.Log
 import com.tencent.bugly.crashreport.CrashReport
 import com.tencent.imsdk.v2.V2TIMCallback
 import com.tencent.imsdk.v2.V2TIMManager
+import com.yingyangfly.baselib.ext.logd
+import com.yingyangfly.baselib.ext.loge
 import com.yingyangfly.baselib.net.BaseObserver
 import com.yingyangfly.baselib.net.BaselibServiceFactory
 import com.yingyangfly.baselib.utils.NetWorkUtils
@@ -47,8 +48,7 @@ class InitService : Service() {
 
     //登录腾讯云
     private fun userSigTx() {
-        BaselibServiceFactory.getService()
-            .getUserSign(User.getUserId())
+        BaselibServiceFactory.getService().getUserSign(User.getUserId())
             .subscribe(object : BaseObserver<String>() {
                 override fun onSuccess(t: String?) {
                     if (TextUtils.isEmpty(t).not()) {
@@ -65,16 +65,14 @@ class InitService : Service() {
     private fun loginIM(t: String) {
         V2TIMManager.getInstance().login(User.getUserId(), t, object : V2TIMCallback {
             override fun onSuccess() {
-                Log.e("wpp", "IM登陆成功")
+                "IM登陆成功".logd()
             }
 
             override fun onError(p0: Int, p1: String?) {
-                Log.e("wpp", "IM登陆失败$p1\t错误码：$p0")
+                "IM登陆失败$p1\t错误码：$p0".loge()
                 CrashReport.postCatchedException(
                     Throwable(
-                        User.getName() +
-                                "IM登陆失败，报错信息：" + p1 + " ,用户信息:" + User.getUserId() + "  \n" +
-                                User.getName() + " ,错误码:" + p0
+                        User.getName() + "IM登陆失败，报错信息：" + p1 + " ,用户信息:" + User.getUserId() + "  \n" + User.getName() + " ,错误码:" + p0
                     )
                 )
             }