Browse Source

1.修改倒计时崩溃bug

王鹏鹏 1 year ago
parent
commit
4a2006683a

+ 2 - 2
baselib/build.gradle

@@ -40,7 +40,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"41Fzb2ZIuKRGNtrVcQOHxEI3vFM4Rkxi\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
-            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
+            buildConfigField "String", "API_URL", "\"http://192.168.0.122:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
@@ -54,7 +54,7 @@ android {
             buildConfigField "String", "BAIDU_SECRETKEY", "\"41Fzb2ZIuKRGNtrVcQOHxEI3vFM4Rkxi\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
-            buildConfigField "String", "API_URL", "\"http://60.205.201.7:8110\""
+            buildConfigField "String", "API_URL", "\"http://192.168.0.122:8110\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

+ 2 - 0
baselib/src/main/java/com/yingyangfly/baselib/dialog/GameLoadingDialog.kt

@@ -23,6 +23,7 @@ class GameLoadingDialog : DialogFragment() {
     private var progressBar: ProgressBar? = null
     private lateinit var rxTimer: RxTimer
     private var time: Long = 3
+    var onDialogClickListener: ((bean: String) -> Unit)? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -77,6 +78,7 @@ class GameLoadingDialog : DialogFragment() {
             progressBar!!.progress = it.toInt() + 1
             if (time == it) {
                 rxTimer.cancel()
+                onDialogClickListener?.invoke("")
                 dismiss()
             }
         }

+ 8 - 6
game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -61,8 +61,14 @@ class GameIntroductionActivity :
     }
 
     override fun initViews() {
-        voicePlayer = VoicePlayer.getInstance(mContext)
         ImgUtil.loadGameBackground(mContext, gameInbetweenImage, binding.imageBg)
+        if (isEnterGame.not()) {
+            val gameLoadingDialog = GameLoadingDialog()
+            gameLoadingDialog.onDialogClickListener = {
+                speak()
+            }
+            gameLoadingDialog.show(supportFragmentManager, "gameLoadingDialog")
+        }
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -86,11 +92,7 @@ class GameIntroductionActivity :
 
     override fun onResume() {
         super.onResume()
-        if (isEnterGame.not()) {
-            val gameLoadingDialog = GameLoadingDialog()
-            gameLoadingDialog.show(supportFragmentManager, "gameLoadingDialog")
-            speak()
-        }
+        voicePlayer = VoicePlayer.getInstance(mContext)
         getGameDetailByCode()
     }
 

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

@@ -344,7 +344,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         }
         //游戏进度
         LiveEventBusUtil.observer<String>(this, RxBusCodes.SAVEDATA) {
-            binding.tvScore.post {
+            binding.tvScore.postDelayed({
                 if (TextUtils.isEmpty(it).not()) {
                     Log.e("wpp", "-----------" + it)
                     val gameDataBean = GsonUtil.GsonToBean(it, GameDataBean::class.java)
@@ -362,7 +362,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                         saveData(gameDataBean, isPass)
                     }
                 }
-            }
+            }, 100)
         }
         //游戏加载完成
         LiveEventBusUtil.observer<String>(this, RxBusCodes.LOADINGOVER) {