Browse Source

1.添加直播推送游戏任务功能

王鹏鹏 2 years ago
parent
commit
88997dbf65

+ 1 - 1
.idea/misc.xml

@@ -574,7 +574,7 @@
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_live_status.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/selector_live_tab_center.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/selector_live_tab_left.xml" value="0.1715" />
-        <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.72" />
+        <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_live_broadcast.xml" value="0.329232995658466" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_live_broadcast_list.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_video_player.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/dialog_game_tasks.xml" value="0.536" />

+ 1 - 0
baselib/src/main/java/com/yingyangfly/baselib/bean/MessageBean.kt

@@ -9,6 +9,7 @@ data class MessageBean(
     val businessID: String,
     val data: String,
     val ext: String,
+    var description: String,
     var timestamp: Long
 ) {
     fun getMessageData(): String {

+ 2 - 2
game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -68,7 +68,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     private var playClass: String = ""
     private var gameType: String = ""
     private var url: String = ""
-    private var gameTotalScore: String = ""
+    private var gameTotalScore: String = "0"
     private var gameInbetweenImage = ""
     private var gameBackgroundImage = ""
     private var gameShortDesn = ""
@@ -97,7 +97,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         playClass = intent.getStringExtra("playClass") ?: ""
         url = intent.getStringExtra("url") ?: ""
         gameType = intent.getStringExtra("gameType") ?: ""
-        gameTotalScore = intent.getStringExtra("gameTotalScore") ?: ""
+        gameTotalScore = intent.getStringExtra("gameTotalScore") ?: "0"
         gameInbetweenImage = intent.getStringExtra("gameInbetweenImage") ?: ""
         gameBackgroundImage = intent.getStringExtra("gameBackgroundImage") ?: ""
         gameShortDesn = intent.getStringExtra("gameShortDesn") ?: ""

+ 6 - 3
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -264,16 +264,19 @@ class LiveBroadcastActivity :
             runOnUiThread {
                 if (msg != null) {
                     if (msg.isRead.not()) {
-                        Log.e("wpp", "--------------------------------" + GsonUtil.GsonString(msg))
                         makeMessageAsRead(msg)
                         if (msg.elemType == V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM) {
                             val customElem = msg.customElem
                             if (customElem != null && customElem.data != null) {
                                 val data = String(customElem.data)
+                                val description = customElem.description
                                 if (TextUtils.isEmpty(data).not()) {
                                     val messageBean =
                                         GsonUtil.GsonToBean(data, MessageBean::class.java)
                                     if (messageBean != null) {
+                                        if (TextUtils.isEmpty(description).not()) {
+                                            messageBean.description = description
+                                        }
                                         if (TextUtils.equals("live", messageBean.businessID)) {
                                             binding.statusLayout.visibility = View.VISIBLE
                                         } else if (TextUtils.equals(
@@ -281,8 +284,8 @@ class LiveBroadcastActivity :
                                                 messageBean.businessID
                                             )
                                         ) {
-                                            if (TextUtils.isEmpty(messageBean.data).not()) {
-                                                showGameTasksDialog(messageBean.data)
+                                            if (TextUtils.isEmpty(messageBean.description).not()) {
+                                                showGameTasksDialog(messageBean.description)
                                             }
                                         }
                                     }

+ 5 - 0
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/list/LiveBroadcastListActivity.kt

@@ -192,6 +192,11 @@ class LiveBroadcastListActivity :
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        loadData(true, true)
+    }
+
     /**
      * 获取应用权限
      */

+ 0 - 1
livebroadcast/src/main/res/layout/activity_live_broadcast.xml

@@ -65,7 +65,6 @@
                 tools:text="@string/complete" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-
         <com.google.android.material.card.MaterialCardView
             android:layout_width="@dimen/divider_1078px"
             android:layout_height="0dp"