1.优化代码

baselib/src/main/java/com/yingyangfly/baselib/bean/MessageBean.kt

@@ -10,7 +10,6 @@ data class MessageBean(
     val data: String,
     val ext: String,
     var description: String,
-    var sender: String,//消息发送人
     var timestamp: Long
 ) {
     fun getMessageData(): String {

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

@@ -45,8 +45,7 @@ import gorden.rxbus2.ThreadMode
  * 新版首页
  */
 @Route(path = RouterUrlCommon.home)
-class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
-    View.OnTouchListener {
+class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), View.OnTouchListener {
 
     /**
      * 进行中的任务
@@ -78,17 +77,11 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
             rvGame.adapter = gameAdapter
             gameAdapter.onGameImageClickListener = {
                 if (TextUtils.equals("0", it.status)) {
-                    TipsDialog.TipDialogBuilder()
-                        .title("恭喜您")
-                        .content("当前游戏已通关，是否重新开始？")
-                        .leftBtnText("取消")
-                        .rightBtnText("确定")
-                        .leftClick({
-                        }, true)
-                        .rightClick({
+                    TipsDialog.TipDialogBuilder().title("恭喜您")
+                        .content("当前游戏已通关，是否重新开始？").leftBtnText("取消")
+                        .rightBtnText("确定").leftClick({}, true).rightClick({
                             gameReplay(it)
-                        }, true)
-                        .show(supportFragmentManager)
+                        }, true).show(supportFragmentManager)
                 } else {
                     jumpWebView(it)
                 }
@@ -157,10 +150,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                 gameLayout.show(false)
                 interstellarLayout.show(false)
                 effectLayout.show(true)
-                Glide.with(this@HomeActivity)
-                    .asGif()
-                    .load(R.drawable.fish)
-                    .into(fishImage)
+                Glide.with(this@HomeActivity).asGif().load(R.drawable.fish).into(fishImage)
             }
             LiveEventBusUtil.send(RxBusCodes.FINISHGAME, "")
         }
@@ -300,19 +290,14 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      * 训练完成弹窗页面
      */
     private fun showTipDialog() {
-        TipsDialog.TipDialogBuilder()
-            .title("恭喜您")
+        TipsDialog.TipDialogBuilder().title("恭喜您")
             .content("您完成了今天的专属训练！今天的训练报告已生成，快去查看吧！")
-            .leftBtnText("稍后再看")
-            .rightBtnText("立即查看")
-            .leftClick({
+            .leftBtnText("稍后再看").rightBtnText("立即查看").leftClick({
                 showLayout(true)
                 getGameList()
-            }, dimiss = true)
-            .rightClick({
+            }, dimiss = true).rightClick({
                 JumpUtil.jumpActivity(RouterUrlCommon.trainData, mContext)
-            }, dimiss = true)
-            .show(supportFragmentManager)
+            }, dimiss = true).show(supportFragmentManager)
     }
 
     /**
@@ -358,14 +343,10 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      * 跳转游戏列表
      */
     private fun jumpWebView(bean: Record) {
-        ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
-            .withString("id", bean.id)
-            .withString("gameCode", bean.gameCode)
-            .withString("playClass", bean.playClass)
-            .withString("videoUrl", bean.gameVideoUrl)
-            .withString("desn", bean.desn)
-            .withBoolean("homePage", true)
-            .withTransition(R.anim.leftin, R.anim.leftout)
+        ARouter.getInstance().build(RouterUrlCommon.gameIntroduction).withString("id", bean.id)
+            .withString("gameCode", bean.gameCode).withString("playClass", bean.playClass)
+            .withString("videoUrl", bean.gameVideoUrl).withString("desn", bean.desn)
+            .withBoolean("homePage", true).withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)
     }
 
@@ -374,9 +355,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun showPlayPorpoiseView() {
         val builder = GuideBuilder()
-        builder.setTargetView(binding.tvPlayPorpoise)
-            .setAlpha(150)
-            .setHighTargetCorner(20)
+        builder.setTargetView(binding.tvPlayPorpoise).setAlpha(150).setHighTargetCorner(20)
             .setHighTargetPadding(3)
         builder.setOnVisibilityChangedListener(object : GuideBuilder.OnVisibilityChangedListener {
             override fun onShown() {
@@ -397,10 +376,8 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun showProfessionalEvaluation() {
         val builder = GuideBuilder()
-        builder.setTargetView(binding.tvProfessionalEvaluation)
-            .setAlpha(150)
-            .setHighTargetCorner(20)
-            .setHighTargetPadding(3)
+        builder.setTargetView(binding.tvProfessionalEvaluation).setAlpha(150)
+            .setHighTargetCorner(20).setHighTargetPadding(3)
         builder.setOnVisibilityChangedListener(object : GuideBuilder.OnVisibilityChangedListener {
             override fun onShown() {
             }
@@ -419,9 +396,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun showHealthCounseling() {
         val builder = GuideBuilder()
-        builder.setTargetView(binding.tvHealthCounseling)
-            .setAlpha(150)
-            .setHighTargetCorner(20)
+        builder.setTargetView(binding.tvHealthCounseling).setAlpha(150).setHighTargetCorner(20)
             .setHighTargetPadding(3)
         builder.setOnVisibilityChangedListener(object : GuideBuilder.OnVisibilityChangedListener {
             override fun onShown() {
@@ -441,9 +416,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun showFunTime() {
         val builder = GuideBuilder()
-        builder.setTargetView(binding.tvfunTime)
-            .setAlpha(150)
-            .setHighTargetCorner(20)
+        builder.setTargetView(binding.tvfunTime).setAlpha(150).setHighTargetCorner(20)
             .setHighTargetPadding(3)
         builder.setOnVisibilityChangedListener(object : GuideBuilder.OnVisibilityChangedListener {
             override fun onShown() {
@@ -461,14 +434,11 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp ||
-                    v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise ||
-                    v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime ||
-                    v.id == R.id.btnCheck || v.id == R.id.btnNextPage || v.id == R.id.btnTask || v.id == R.id.opneBtn
-                ) {
+                if (v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp || v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise || v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime || v.id == R.id.btnCheck || v.id == R.id.btnNextPage || v.id == R.id.btnTask || v.id == R.id.opneBtn) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
+
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 when (v.id) {
@@ -476,42 +446,52 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                         //用户头像
                         JumpUtil.jumpActivity(RouterUrlCommon.personalCenter, mContext)
                     }
+
                     R.id.layoutLiveBroadcast -> {
                         //直播
                         JumpUtil.jumpActivity(RouterUrlCommon.liveBroadcastList, mContext)
                     }
+
                     R.id.layoutHelp -> {
                         //使用帮助
                         JumpUtil.jumpActivity(RouterUrlCommon.help, mContext)
                     }
+
                     R.id.layoutNotify -> {
                         //消息通知
                         JumpUtil.jumpActivity(RouterUrlCommon.messageList, mContext)
                     }
+
                     R.id.layoutServicePackage -> {
                         //服务套餐
                         JumpUtil.jumpActivity(RouterUrlCommon.servicePackage, mContext)
                     }
+
                     R.id.tvPlayPorpoise -> {
                         //畅玩蓝豚
                         JumpUtil.jumpActivity(RouterUrlCommon.freeTrain, mContext)
                     }
+
                     R.id.tvProfessionalEvaluation -> {
                         //专业测评
                         JumpUtil.jumpActivity(RouterUrlCommon.evaluation, mContext)
                     }
+
                     R.id.tvHealthCounseling -> {
                         //健康咨询
                         JumpUtil.jumpActivity(RouterUrlCommon.healthConsultation, mContext)
                     }
+
                     R.id.tvfunTime -> {
                         //康复课堂
                         JumpUtil.jumpActivity(RouterUrlCommon.leisureBrain, mContext)
                     }
+
                     R.id.btnCheck -> {
                         //查看
                         JumpUtil.jumpActivity(RouterUrlCommon.trainData, mContext)
                     }
+
                     R.id.btnNextPage -> {
                         //下一页
                         pageList.clear()
@@ -526,6 +506,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                         }
                         gameAdapter.setData(pageList)
                     }
+
                     R.id.btnTask -> {
                         //开始专属训练
                         if (currentTaskRecord != null) {
@@ -539,9 +520,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                             interstellarLayout.show(true)
                             opneBtn.post {
                                 AnimUtil.setTranslateAnimationLeft(
-                                    binding.leftDoorImage,
-                                    binding.gameLayout,
-                                    2500
+                                    binding.leftDoorImage, binding.gameLayout, 2500
                                 )
                                 AnimUtil.setTranslateAnimationRight(binding.rightDoorImage, 2500)
                             }
@@ -549,12 +528,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                     }
                 }
             }
+
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp ||
-                    v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise ||
-                    v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime ||
-                    v.id == R.id.btnCheck || v.id == R.id.btnNextPage || v.id == R.id.btnTask || v.id == R.id.opneBtn
-                ) {
+                if (v.id == R.id.imageSetting || v.id == R.id.layoutLiveBroadcast || v.id == R.id.layoutHelp || v.id == R.id.layoutNotify || v.id == R.id.layoutServicePackage || v.id == R.id.tvPlayPorpoise || v.id == R.id.tvProfessionalEvaluation || v.id == R.id.tvHealthCounseling || v.id == R.id.tvfunTime || v.id == R.id.btnCheck || v.id == R.id.btnNextPage || v.id == R.id.btnTask || v.id == R.id.opneBtn) {
                     v.startAnimation(getEndAnimation())
                 }
             }
@@ -567,14 +543,10 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun gameLoading(bean: Record) {
         ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
-            .withString("gameCode", bean.gameCode)
-            .withString("id", bean.id)
-            .withString("playClass", "A")
-            .withString("videoUrl", bean.gameVideoUrl)
-            .withString("desn", bean.desn)
-            .withBoolean("homePage", true)
-            .withTransition(R.anim.leftin, R.anim.leftout)
-            .navigation(mContext)
+            .withString("gameCode", bean.gameCode).withString("id", bean.id)
+            .withString("playClass", "A").withString("videoUrl", bean.gameVideoUrl)
+            .withString("desn", bean.desn).withBoolean("homePage", true)
+            .withTransition(R.anim.leftin, R.anim.leftout).navigation(mContext)
     }
 
     private fun initLiveData() {
@@ -631,8 +603,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      * 获取声音url
      */
     private fun getVoiceUrl(taskDesn: String) {
-        viewModel.getVoiceUrl(taskDesn, fail = {
-        }, success = {
+        viewModel.getVoiceUrl(taskDesn, fail = {}, success = {
             if (TextUtils.isEmpty(it).not()) {
                 if (db != null) {
                     val voicePlayerDao = db?.getVoicePlayerDao()
@@ -662,6 +633,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
             runOnUiThread {
                 Log.e("wpp", "msg---------------------->    " + GsonUtil.GsonString(msg))
                 if (msg.isRead.not()) {
+                    Log.e("wpp", "msg-------------------------->消息未读")
                     makeMessageAsRead(msg)
                     if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
                         val customElem = msg.customElem
@@ -670,15 +642,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                             val description = customElem.description
                             val messageBean = GsonUtil.GsonToBean(data, MessageBean::class.java)
                             Log.e(
-                                "wpp1",
-                                "messageBean----------------------->          $messageBean"
+                                "wpp1", "messageBean----------------------->          $messageBean"
                             )
                             if (messageBean != null) {
-                                messageBean.sender = if (TextUtils.isEmpty(msg.sender)) {
-                                    ""
-                                } else {
-                                    msg.sender
-                                }
                                 messageBean.timestamp = msg.timestamp
                                 if (TextUtils.isEmpty(description).not()) {
                                     messageBean.description = description
@@ -689,41 +655,43 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                                 )
                                 when (messageBean.businessID) {
                                     "A" -> {
-                                        if (TextUtils.equals("购买成功，等待医生接诊。", messageBean.data) ||
-                                            TextUtils.equals(
+                                        if (TextUtils.equals(
+                                                "购买成功，等待医生接诊。", messageBean.data
+                                            ) || TextUtils.equals(
                                                 "医生暂时繁忙，已经拒绝您的问诊要求，咨询费用1到3天原路退回您的支付账户。",
                                                 messageBean.data
                                             )
                                         ) {
                                             LiveEventBusUtil.send(
-                                                RxBusCodes.SuccessfulPurchase,
-                                                messageBean.data
+                                                RxBusCodes.SuccessfulPurchase, messageBean.data
                                             )
                                             binding.imageSetting.postDelayed({
                                                 LiveEventBusUtil.send(
-                                                    RxBusCodes.SHOWTASKDIALOG,
-                                                    messageBean
+                                                    RxBusCodes.SHOWTASKDIALOG, messageBean
                                                 )
                                             }, 800)
                                         } else {
                                             addAMessageData(messageBean)
                                         }
                                     }
+
                                     "B" -> {
                                         getFindMyTask()
                                         addAMessageData(messageBean)
                                     }
+
                                     "C", "D", "E", "F", "G" -> {
                                         addAMessageData(messageBean)
                                     }
+
                                     "end" -> {
                                         //结束问诊清空IM聊天历史
                                         LiveEventBusUtil.send(
-                                            RxBusCodes.SuccessfulPurchase,
-                                            messageBean.data
+                                            RxBusCodes.SuccessfulPurchase, messageBean.data
                                         )
                                         clearC2CHistoryMessage(msg.sender)
                                     }
+
                                     "start" -> {
                                         //医生接诊
                                         RxBus.get().send(RxBusCodes.doctorReception)
@@ -732,6 +700,8 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                             }
                         }
                     }
+                } else {
+                    Log.e("wpp", "msg-------------------------->消息已读")
                 }
             }
         }
@@ -741,17 +711,17 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      * 消息改成已读
      */
     private fun makeMessageAsRead(msg: V2TIMMessage) {
-        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?) {
+                    }
+                })
     }
 
     /**
@@ -785,8 +755,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
 
                     override fun onFinish() {
                         Log.e(
-                            "wpp8",
-                            "onFinish------------------------->    " + GsonUtil.GsonString(
+                            "wpp8", "onFinish------------------------->    " + GsonUtil.GsonString(
                                 aMessageList
                             )
                         )
@@ -847,8 +816,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
         val list = messageBeans.sortedWith(lengthComparator)
         if (list.isNullOrEmpty().not()) {
             LiveEventBusUtil.send(
-                RxBusCodes.SHOWTASKDIALOG,
-                list[0]
+                RxBusCodes.SHOWTASKDIALOG, list[0]
             )
         }
     }
@@ -858,16 +826,15 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun clearC2CHistoryMessage(userId: String) {
         runOnUiThread {
-            V2TIMManager.getMessageManager()
-                .clearC2CHistoryMessage(userId, object : V2TIMCallback {
-                    override fun onSuccess() {
-                        // 清空单聊消息成功
-                    }
+            V2TIMManager.getMessageManager().clearC2CHistoryMessage(userId, object : V2TIMCallback {
+                override fun onSuccess() {
+                    // 清空单聊消息成功
+                }
 
-                    override fun onError(code: Int, desc: String) {
-                        // 清空单聊消息失败
-                    }
-                })
+                override fun onError(code: Int, desc: String) {
+                    // 清空单聊消息失败
+                }
+            })
         }
     }
 
@@ -881,16 +848,17 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                 val patientStartConsultationBean = PatientStartConsultationBean()
                 patientStartConsultationBean.businessID = "patient"
                 val data = GsonUtil.GsonString(patientStartConsultationBean)
-                val v2TIMMessage = V2TIMManager.getMessageManager()
-                    .createCustomMessage(
-                        data.toByteArray(),
-                        event.patientInfo,
-                        data.toByteArray()
-                    )
+                val v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(
+                    data.toByteArray(), event.patientInfo, data.toByteArray()
+                )
                 Log.e("wpp", "患者信息自定义消息" + GsonUtil.GsonString(v2TIMMessage))
-                V2TIMManager.getMessageManager().sendMessage(v2TIMMessage, event.doctorId, "",
-                    V2TIMMessage.V2TIM_PRIORITY_DEFAULT, false, null, object :
-                        V2TIMSendCallback<V2TIMMessage> {
+                V2TIMManager.getMessageManager().sendMessage(v2TIMMessage,
+                    event.doctorId,
+                    "",
+                    V2TIMMessage.V2TIM_PRIORITY_DEFAULT,
+                    false,
+                    null,
+                    object : V2TIMSendCallback<V2TIMMessage> {
                         override fun onSuccess(p0: V2TIMMessage?) {
                             Log.e("wpp", "患者信息发送成功")
                         }