1.添加消息通知点击查看消息内容弹框

baselib/src/main/java/com/yingyangfly/baselib/dialog/TaskFragment.kt

@@ -105,14 +105,18 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
      * 播放语音合成内容
      */
     private fun speak(taskDesn: String) {
-        val db = AppDataBase.getInstance(requireActivity())
-        if (db != null) {
-            val voicePlayerDao = db.getVoicePlayerDao()
-            if (voicePlayerDao != null) {
-                val voicePlayerBean = voicePlayerDao.getVoicePlayerBean(taskDesn)
-                if (voicePlayerBean != null && voicePlayer != null) {
-                    voicePlayer?.play(voicePlayerBean.url) {
+        if (voicePlayer != null && voicePlayer?.isPlaying == false) {
+            val db = AppDataBase.getInstance(requireActivity())
+            if (db != null) {
+                val voicePlayerDao = db.getVoicePlayerDao()
+                if (voicePlayerDao != null) {
+                    val voicePlayerBean = voicePlayerDao.getVoicePlayerBean(taskDesn)
+                    if (voicePlayerBean != null && voicePlayer != null) {
+                        voicePlayer?.play(voicePlayerBean.url) {
 
+                        }
+                    } else {
+                        getWordsUrl(taskDesn)
                     }
                 } else {
                     getWordsUrl(taskDesn)
@@ -120,8 +124,6 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
             } else {
                 getWordsUrl(taskDesn)
             }
-        } else {
-            getWordsUrl(taskDesn)
         }
     }
 

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

@@ -95,20 +95,6 @@ class HomeViewModel : BaseViewModel() {
         fail
     )
 
-    /**
-     * 更改消息状态
-     */
-    fun updateReadMsg(
-        msgId: String,
-        fail: ((msg: String) -> Unit)? = null,
-        success: ((success: Unit?) -> Unit)? = null,
-    ) = launchFlow(false) {
-        HOME_API.updateReadMsg(msgId)
-    }.runUI(
-        success,
-        fail
-    )
-
     /**
      * 获取声音url
      */

home/src/main/java/com/yingyangfly/home/net/HomeApiService.kt

@@ -47,12 +47,6 @@ interface HomeApiService {
     @POST("app/warn/selectHomePageMsg")
     suspend fun getSelectHomePageMsg(@Query("msgType") msgType: String): BaseResp<HomePageMsgBean>
 
-    /**
-     * 更改消息状态
-     */
-    @POST("app/warn/readMsg")
-    suspend fun updateReadMsg(@Query("msgId") msgId: String): BaseResp<Unit>
-
     /**
      * 获取mmse试题
      */
@@ -79,12 +73,6 @@ interface HomeApiService {
     @POST("app/review/findReviewResult")
     suspend fun findReviewResult(@Body requestBody: RequestBody): BaseResp<EvaluationResultBean>
 
-    /**
-     * 获取腾讯IM密钥
-     */
-    @POST("im/user_sign")
-    suspend fun getUserSign(@Query("userId") userId: String): BaseResp<String>
-
     /**
      * 保存游戏进度
      */

push/src/main/java/com/yingyang/push/activity/MessgeListActivity.kt

@@ -143,7 +143,7 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
         }, success = {
             if (pushListAdapter.data.isNullOrEmpty().not()) {
                 if (pushListAdapter.data.get(position) != null) {
-                    pushListAdapter.data[position].status = "1"
+                    pushListAdapter.data[position].status = "0"
                     pushListAdapter.notifyItemChanged(position)
                 }
             }

push/src/main/java/com/yingyang/push/adapter/PushListAdapter.kt

@@ -40,7 +40,6 @@ class PushListAdapter(override val layoutId: Int = R.layout.item_push_list) :
             binding.tvStatus.setTextColorResource(R.color.color_FFFF2B2B)
         }
         binding.messageLayout.setOnSingleClickListener {
-            notifyDataSetChanged()
             onPushClickListener?.invoke(item, position)
         }
     }