Browse Source

1.优化代码

王鹏鹏 2 years ago
parent
commit
9e87d026de

+ 5 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -74,4 +74,9 @@ object RxBusCodes {
      * 结束游戏
      */
     const val FINISHGAME = "finishGame"
+
+    /**
+     * 游戏倒计时弹框消失
+     */
+    const val COUNTDOWNSUCCESS = "countdownSuccess"
 }

+ 1 - 1
game/src/main/java/com/yingyangfly/game/dialog/CountdownDialog.kt

@@ -170,7 +170,7 @@ class CountdownDialog : DialogFragment() {
             } else {
                 if (it == totalTime) {
                     rxTimer.cancel()
-                    LiveEventBusUtil.send(RxBusCodes.FINISHGAME, "")
+                    LiveEventBusUtil.send(RxBusCodes.COUNTDOWNSUCCESS, "")
                     dismiss()
                 }
             }

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

@@ -45,8 +45,20 @@ import com.yingyangfly.game.utils.AndroidToJs
 class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewModel>(),
     View.OnTouchListener {
 
+    /**
+     * 游戏是否加载完成
+     */
     private var loadingOver = false
+
+    /**
+     * 是否第一次启动activity
+     */
     private var newStartGame = true
+
+    /**
+     * 倒计时是否结束
+     */
+    private var countdownSuccess = false
     private var gameCode: String = ""
     private var playClass: String = ""
     private var gameType: String = ""
@@ -362,6 +374,9 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         //游戏加载完成
         LiveEventBusUtil.observer<String>(this, RxBusCodes.LOADINGOVER) {
             loadingOver = true
+            if (countdownSuccess) {
+                callStartGame()
+            }
         }
         //播放语音
         LiveEventBusUtil.observer<String>(this, RxBusCodes.PLAYVOICE) {
@@ -392,6 +407,10 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 finish()
             }
         }
+        //游戏倒计时弹框消失
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.COUNTDOWNSUCCESS) {
+            countdownSuccess = true
+        }
     }
 
     /**

+ 2 - 2
game/src/main/res/layout/activity_play_game.xml

@@ -112,8 +112,8 @@
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/gameLayout"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_width="@dimen/divider_767px"
+                android:layout_height="@dimen/divider_668px"
                 android:layout_marginStart="@dimen/divider_31px"
                 android:layout_marginTop="@dimen/divider_104px"
                 android:layout_marginBottom="@dimen/divider_62px"

+ 1 - 0
game/src/main/res/values/dimens.xml

@@ -10,6 +10,7 @@
     <dimen name="divider_693px" tools:ignore="ResourceName">693px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_684px" tools:ignore="ResourceName">684px</dimen>
+    <dimen name="divider_668px" tools:ignore="ResourceName">668px</dimen>
     <dimen name="divider_665px" tools:ignore="ResourceName">665px</dimen>
     <dimen name="divider_664px" tools:ignore="ResourceName">664px</dimen>
     <dimen name="divider_656px" tools:ignore="ResourceName">656px</dimen>