1.修改bug

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

@@ -232,60 +232,64 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
      * 查询是否有进行中的任务
      */
     private fun getFindMyTask() {
-        viewModel.findMyCurrentTask(fail = {
-            "获取任务列表失败".toast()
-        }, success = {
-            if (it.isNullOrEmpty().not()) {
-                showLayout(false)
-                it!![0].let {
-                    binding.task = it
-                    if (it.details.isNullOrEmpty().not()) {
-                        val index = it.currentTaskNum - 1
-                        currentTaskRecord = it.details[index]
-                        taskList.addAll(it.details)
-                    }
-                    if (it.currentTaskNum == it.totalTaskNum) {
-                        if (TextUtils.equals("0", it.status)) {
-                            //任务完成
-                            if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
-                                    .not()
-                            ) {
-                                User.saveTaskDialogStatus(User.getNowDay())
-                                showTipDialog()
+        runOnUiThread {
+            viewModel.findMyCurrentTask(fail = {
+                "获取任务列表失败".toast()
+            }, success = {
+                if (it.isNullOrEmpty().not()) {
+                    showLayout(false)
+                    it!![0].let {
+                        binding.task = it
+                        if (it.details.isNullOrEmpty().not()) {
+                            val index = it.currentTaskNum - 1
+                            currentTaskRecord = it.details[index]
+                            taskList.addAll(it.details)
+                        }
+                        if (it.currentTaskNum == it.totalTaskNum) {
+                            if (TextUtils.equals("0", it.status)) {
+                                //任务完成
+                                if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
+                                        .not()
+                                ) {
+                                    User.saveTaskDialogStatus(User.getNowDay())
+                                    showTipDialog()
+                                } else {
+                                    showLayout(true)
+                                    getGameList()
+                                }
+                                binding.btnTask.text = "继续专属训练"
                             } else {
-                                showLayout(true)
-                                getGameList()
+                                binding.btnTask.text = if (it.currentTaskNum == 1) {
+                                    "开始专属训练"
+                                } else {
+                                    "继续专属训练"
+                                }
+                                showLayout(false)
+                                if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
+                                        .not()
+                                ) {
+                                    User.saveTaskDialogStatus(User.getNowDay())
+                                }
                             }
-                            binding.btnTask.text = "继续专属训练"
                         } else {
                             binding.btnTask.text = if (it.currentTaskNum == 1) {
                                 "开始专属训练"
                             } else {
                                 "继续专属训练"
                             }
-                            showLayout(false)
                             if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
                                     .not()
                             ) {
                                 User.saveTaskDialogStatus(User.getNowDay())
                             }
                         }
-                    } else {
-                        binding.btnTask.text = if (it.currentTaskNum == 1) {
-                            "开始专属训练"
-                        } else {
-                            "继续专属训练"
-                        }
-                        if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
-                            User.saveTaskDialogStatus(User.getNowDay())
-                        }
                     }
+                } else {
+                    showLayout(true)
+                    getGameList()
                 }
-            } else {
-                showLayout(true)
-                getGameList()
-            }
-        })
+            })
+        }
     }
 
     /**
@@ -476,7 +480,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
 
                     R.id.tvProfessionalEvaluation -> {
                         //专业测评
-                        JumpUtil.jumpActivity(RouterUrlCommon.hospitalEvaluation, mContext)
+                        JumpUtil.jumpActivity(RouterUrlCommon.evaluation, mContext)
                     }
 
                     R.id.tvHealthCounseling -> {
@@ -648,6 +652,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
             runOnUiThread {
                 Log.e("wpp", "msg---------------------->    " + GsonUtil.GsonString(msg))
                 if (msg.isRead.not()) {
+                    Log.e("wpp", "---------------------------->消息已读")
                     makeMessageAsRead(msg)
                     analyticMessage(msg)
                 } else {
@@ -664,17 +669,19 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
      * 消息改成已读
      */
     private fun makeMessageAsRead(msg: V2TIMMessage) {
-        V2TIMManager.getConversationManager()
-            .cleanConversationUnreadMessageCount(String.format("c2c_%s", msg.sender),
-                0,
-                0,
-                object : V2TIMCallback {
-                    override fun onSuccess() {
-                    }
+        runOnUiThread {
+            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?) {
+                        }
+                    })
+        }
     }
 
     /**
@@ -699,6 +706,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                 aMessageList[msg.timestamp] = msg
             }
             if (aCountDownTimer != null) {
+                if (User.getShowWelcomeMessage().not()) {
+                    User.saveShowWelcomeMessage(true)
+                }
                 aCountDownTimer?.cancel()
                 aCountDownTimer?.start()
             } else {
@@ -707,11 +717,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                     }
 
                     override fun onFinish() {
-                        Log.e(
-                            "wpp8", "onFinish------------------------->    " + GsonUtil.GsonString(
-                                aMessageList
-                            )
-                        )
                         sortMessageDataByTimestamp(ArrayList(aMessageList.values))
                     }
                 }
@@ -724,40 +729,60 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
      * 消息分类
      */
     private fun sortMessageDataByTimestamp(conversationList: List<MessageBean>) {
-        if (conversationList.isNullOrEmpty().not()) {
-            Log.e("wpp7", GsonUtil.GsonString(conversationList))
-            val aMessages = mutableListOf<MessageBean>()
-            val bMessages = mutableListOf<MessageBean>()
-            val cMessages = mutableListOf<MessageBean>()
-            val dMessages = mutableListOf<MessageBean>()
-            conversationList.forEach {
-                when (it.businessID) {
-                    "A" -> aMessages.add(it)
-                    "B" -> bMessages.add(it)
-                    "C" -> cMessages.add(it)
-                    "D" -> dMessages.add(it)
+        runOnUiThread {
+            if (conversationList.isNullOrEmpty().not()) {
+                Log.e("wpp7", GsonUtil.GsonString(conversationList))
+                val aMessages = mutableListOf<MessageBean>()
+                val bMessages = mutableListOf<MessageBean>()
+                val cMessages = mutableListOf<MessageBean>()
+                val dMessages = mutableListOf<MessageBean>()
+                val eMessages = mutableListOf<MessageBean>()
+                val fMessages = mutableListOf<MessageBean>()
+                val gMessages = mutableListOf<MessageBean>()
+                conversationList.forEach {
+                    when (it.businessID) {
+                        "A" -> aMessages.add(it)
+                        "B" -> bMessages.add(it)
+                        "C" -> cMessages.add(it)
+                        "D" -> dMessages.add(it)
+                        "E" -> eMessages.add(it)
+                        "F" -> fMessages.add(it)
+                        "G" -> gMessages.add(it)
+                    }
+                }
+                if (aMessages.isNotEmpty()) {
+                    Log.e("wpp7", GsonUtil.GsonString(aMessages))
+                    showMessageDialog(aMessages)
+                }
+                if (bMessages.isNotEmpty()) {
+                    Log.e("wpp7", GsonUtil.GsonString(bMessages))
+                    showMessageDialog(bMessages)
+                }
+                if (cMessages.isNotEmpty()) {
+                    Log.e("wpp7", GsonUtil.GsonString(cMessages))
+                    binding.headLayout.postDelayed({
+                        showMessageDialog(cMessages)
+                    }, 3000)
+                }
+                if (dMessages.isNotEmpty()) {
+                    Log.e("wpp7", GsonUtil.GsonString(dMessages))
+                    showMessageDialog(dMessages)
+                }
+                if (eMessages.isNotEmpty()) {
+                    Log.e("wpp7", GsonUtil.GsonString(eMessages))
+                    showMessageDialog(eMessages)
+                }
+                if (fMessages.isNotEmpty()) {
+                    Log.e("wpp7", GsonUtil.GsonString(fMessages))
+                    showMessageDialog(fMessages)
+                }
+                if (gMessages.isNotEmpty()) {
+                    Log.e("wpp7", GsonUtil.GsonString(gMessages))
+                    showMessageDialog(gMessages)
                 }
             }
-            if (aMessages.isNotEmpty()) {
-                Log.i("wpp3", "aMessages------------>     " + GsonUtil.GsonString(aMessages))
-                showMessageDialog(aMessages)
-            }
-            if (bMessages.isNotEmpty()) {
-                Log.i("wpp4", "bMessages------------>      " + GsonUtil.GsonString(bMessages))
-                showMessageDialog(bMessages)
-            }
-            if (cMessages.isNotEmpty()) {
-                Log.i("wpp5", "bMessages------------>      " + GsonUtil.GsonString(cMessages))
-                binding.headLayout.postDelayed({
-                    showMessageDialog(cMessages)
-                }, 3000)
-            }
-            if (dMessages.isNotEmpty()) {
-                Log.i("wpp6", "dMessages------------>      " + GsonUtil.GsonString(dMessages))
-                showMessageDialog(dMessages)
-            }
+            aMessageList.clear()
         }
-        aMessageList.clear()
     }
 
     /**
@@ -860,17 +885,8 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                             }
 
                             "B" -> {
-                                val welcomeMessage =
-                                    "欢迎" + User.getName() + "使用未来蓝豚康复平台"
-                                if (messageBean.data.contains(welcomeMessage)) {
-                                    if (User.getShowWelcomeMessage().not()) {
-                                        User.saveShowWelcomeMessage(true)
-                                        addAMessageData(messageBean)
-                                    }
-                                } else {
-                                    getFindMyTask()
-                                    addAMessageData(messageBean)
-                                }
+                                addAMessageData(messageBean)
+                                getFindMyTask()
                             }
 
                             "C", "D", "E", "F", "G" -> {
@@ -900,36 +916,38 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
      * 缴费类型消息
      */
     private fun purchaseServices(messageBean: MessageBean) {
-        val userInfo = "尊敬的" + User.getName()
-        if (TextUtils.isEmpty(messageBean.data).not()) {
-            if (TextUtils.equals(
-                    "购买成功，等待医生接诊。", messageBean.data
-                ) || TextUtils.equals(
-                    "医生暂时繁忙，已经拒绝您的问诊要求，咨询费用1到3天原路退回您的支付账户。",
-                    messageBean.data
-                )
-            ) {
-                LiveEventBusUtil.send(
-                    RxBusCodes.SuccessfulPurchase, messageBean.data
-                )
-                binding.imageSetting.postDelayed({
+        runOnUiThread {
+            val userInfo = "尊敬的" + User.getName()
+            if (TextUtils.isEmpty(messageBean.data).not()) {
+                if (TextUtils.equals(
+                        "购买成功，等待医生接诊。", messageBean.data
+                    ) || TextUtils.equals(
+                        "医生暂时繁忙，已经拒绝您的问诊要求，咨询费用1到3天原路退回您的支付账户。",
+                        messageBean.data
+                    )
+                ) {
                     LiveEventBusUtil.send(
-                        RxBusCodes.SHOWTASKDIALOG, messageBean
+                        RxBusCodes.SuccessfulPurchase, messageBean.data
                     )
-                }, 800)
-            } else {
-                addAMessageData(messageBean)
-                if (messageBean.data.contains(userInfo)) {
-                    //服务套餐购买成功
                     binding.imageSetting.postDelayed({
                         LiveEventBusUtil.send(
-                            RxBusCodes.SuccessfulPurchase, messageBean.data
+                            RxBusCodes.SHOWTASKDIALOG, messageBean
                         )
                     }, 800)
+                } else {
+                    addAMessageData(messageBean)
+                    if (messageBean.data.contains(userInfo)) {
+                        //服务套餐购买成功
+                        binding.imageSetting.postDelayed({
+                            LiveEventBusUtil.send(
+                                RxBusCodes.SuccessfulPurchase, messageBean.data
+                            )
+                        }, 800)
+                    }
                 }
+            } else {
+                addAMessageData(messageBean)
             }
-        } else {
-            addAMessageData(messageBean)
         }
     }
 }

login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -135,7 +135,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
                     }
                     //保存是否第一次登陆（0第一次登陆）
                     if (TextUtils.isEmpty(it.firstLogin).not()) {
-                        User.saveShowWelcomeMessage(TextUtils.equals("0", it.firstLogin))
+                        User.saveShowWelcomeMessage(TextUtils.equals("1", it.firstLogin))
                         User.saveFirstLogin(it.firstLogin)
                     }
                     startInitService()