1.添加游戏结算页面

baselib/src/main/java/com/yingyangfly/baselib/utils/LiveEventBusUtil.kt

@@ -10,18 +10,22 @@ import com.jeremyliao.liveeventbus.LiveEventBus
  */
 object LiveEventBusUtil {
 
-    inline fun <reified T:Any> send(key: String, value: T?) {
+    inline fun <reified T : Any> send(key: String, value: T?) {
         LiveEventBus.get(key, T::class.java).post(value)
     }
 
-    inline fun <reified T> observer(owner: LifecycleOwner, key: String, crossinline callback: (T) -> Unit) {
+    inline fun <reified T> observer(
+        owner: LifecycleOwner,
+        key: String,
+        crossinline callback: (T) -> Unit
+    ) {
         LiveEventBus.get(key, T::class.java).observe(owner) {
             callback.invoke(it)
         }
     }
 
-     fun   sendSimple(key: String, value: String?) {
-        LiveEventBus.get(key,String::class.java).post(value)
+    fun sendSimple(key: String, value: String?) {
+        LiveEventBus.get(key, String::class.java).post(value)
     }
 
 }

game/src/main/java/com/yingyangfly/game/dialog/CountdownDialog.kt

@@ -60,19 +60,30 @@ class CountdownDialog : DialogFragment() {
         )
         findId(rootView)
         initData()
+        initTimer()
         return rootView
     }
 
     private fun findId(rootView: View) {
-        imageCountdown = rootView.findViewById(R.id.imageCountdown)
         gameImage = rootView.findViewById(R.id.gameImage)
-        loadingImage = rootView.findViewById(R.id.loadingImage)
         val options: RequestOptions = RequestOptions()
             .diskCacheStrategy(DiskCacheStrategy.ALL)
         Glide.with(requireActivity()).load(url).apply(options).into(gameImage!!)
+        imageCountdown = rootView.findViewById(R.id.imageCountdown)
+        loadingImage = rootView.findViewById(R.id.loadingImage)
     }
 
     private fun initData() {
+        Glide.with(requireActivity())
+            .asGif()
+            .load(R.drawable.fish)
+            .into(loadingImage!!)
+    }
+
+    /**
+     * 初始化定时器
+     */
+    private fun initTimer() {
         rxTimer = RxTimer()
         val m: Long = 1000
         val time: Long = 3
@@ -91,14 +102,9 @@ class CountdownDialog : DialogFragment() {
             }
             if (it == time) {
                 onDialogClickListener?.invoke("")
+                rxTimer.cancel()
                 dismiss()
             }
         }
-
-        Glide.with(requireActivity())
-            .asGif()
-            .load(R.drawable.fish)
-            .into(loadingImage!!)
     }
-
 }

game/src/main/java/com/yingyangfly/game/loading/GameLoadingActivity.kt

@@ -62,6 +62,7 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
                     .withString("desn", desn)
                     .withTransition(R.anim.leftin, R.anim.leftout)
                     .navigation(mContext)
+                rxTimer.cancel()
                 finish()
             }
         }

game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -351,8 +351,4 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
             loadingOver = true
         }
     }
-
-    override fun finish() {
-        super.finish()
-    }
 }

game/src/main/res/layout/activity_game_introduction.xml

@@ -181,7 +181,6 @@
                                     android:id="@+id/tvGameType"
                                     android:layout_width="@dimen/divider_146px"
                                     android:layout_height="@dimen/divider_46px"
-                                    android:layout_marginStart="@dimen/divider_41px"
                                     android:layout_marginBottom="@dimen/divider_52px"
                                     android:background="@drawable/bg_game_type"
                                     android:gravity="center"
@@ -190,6 +189,7 @@
                                     android:textSize="@dimen/divider_28px"
                                     android:textStyle="bold"
                                     app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toStartOf="parent" />
 
                             </androidx.constraintlayout.widget.ConstraintLayout>