honghengqiang 3 jaren geleden
bovenliggende
commit
35dc3e979f

+ 2 - 2
app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.swago.app"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 6002
-        versionName "6.0.0.2"
+        versionCode 6003
+        versionName "6.0.0.3"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

+ 1 - 1
baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -27,7 +27,7 @@ object UrlConstant {
         if (BuildConfig.DEBUG) {
             "http://swago-h5.codedreamit.com"
         } else {
-            "http://h5.swago.cn"
+            "https://h5.swago.cn"
         }
     }
 

+ 1 - 0
baseswago/src/main/res/values-in/strings.xml

@@ -174,6 +174,7 @@
     <string name="prepare_to_open_red_envelope">Saya mengirim Angpao keberuntungan, akan dirampok dalam 30-an, silakan persiapkan terlebih dahulu</string>
     <string name="thank_for_boss">Saya mendapat %s koin, terima kasih bos %s!</string>
 
+    <string name="please_update">Please upgrade the application first</string>
 
 
 </resources>

+ 2 - 0
baseswago/src/main/res/values-zh/strings.xml

@@ -164,4 +164,6 @@
     <string name="cancel">取消</string>
     <string name="not_enough_coin">金币余额不足</string>
 
+    <string name="please_update">请您先更新应用</string>
+
 </resources>

+ 2 - 0
baseswago/src/main/res/values/strings.xml

@@ -191,5 +191,7 @@
     <string name="prepare_to_open_red_envelope">I sent out a lucky red envelope, which will be robbed in 30s, please prepare in advance</string>
     <string name="thank_for_boss">I got %s coins, thank you boss %s!</string>
 
+    <string name="please_update">Please upgrade the application first</string>
+
 
 </resources>

+ 19 - 12
room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -4,6 +4,7 @@ import android.graphics.Rect
 import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
@@ -327,20 +328,26 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
     }
 
     fun openGameDialog() {
-
         SwagoRoomManager.iRoomInfo?.let {
-            val download = checkGameVersion(
-                it.getGameType().toString(),
-                it.getGameDownLoadUrl(),
-                it.getGameVersion().toString()
-            )
-            if (download) {
-                gameDialog =
-                    GamePlayDialog.newInstance("file://" + UrlConstant.appGameRootPath + File.separator + it.getGameType() + File.separator + "index.html")
-            } else {
-                gameDialog = GamePlayDialog.newInstance(it.getGameUrl())
+            when(it.getGameType()){
+               1,2 -> {
+                   val download = checkGameVersion(
+                       it.getGameType().toString(),
+                       it.getGameDownLoadUrl(),
+                       it.getGameVersion().toString()
+                   )
+                   if (download) {
+                       gameDialog =
+                           GamePlayDialog.newInstance("file://" + UrlConstant.appGameRootPath + File.separator + it.getGameType() + File.separator + "index.html")
+                   } else {
+                       gameDialog = GamePlayDialog.newInstance(it.getGameUrl())
+                   }
+                   gameDialog?.show(childFragmentManager, "GamePlayDialog")
+               }
+               else -> {
+                   Toast.makeText(AppContext.getContext(), AppContext.getContext().resources.getString(R.string.please_update), Toast.LENGTH_SHORT).show()
+               }
             }
-            gameDialog?.show(childFragmentManager, "GamePlayDialog")
         }
     }