diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0b52a257c..dd6e0a894 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -56,10 +56,10 @@ + android:maxSdkVersion="28" /> + android:maxSdkVersion="28" /> @@ -355,9 +355,6 @@ - @@ -790,11 +787,6 @@ android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection" android:exported="false" android:screenOrientation="portrait" /> - ?> : val game = GameUtil.findGame(gameId.toLong(), gameplayList!!) if (game != null) { GameUtil.startGame(game){url, config-> - (activity as? AVRoomActivity)?.showBaiShunGame(url, config) + if (game.isLeadercc()) { + (activity as? AVRoomActivity)?.showLeaderccGame(url, config) + }else if (game.isBaiShunGame()) { + (activity as? AVRoomActivity)?.showBaiShunGame(url, config) + } } } } diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt index cacc18812..9b2a22c46 100644 --- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt @@ -120,9 +120,13 @@ class UserInfoModifyActivity : BaseViewBindingActivity= 33){ + if (Build.VERSION.SDK_INT >= 29){ DialogUtil.getDialog(this,object : EasyAlertDialogHelper.OnDialogActionListener { override fun doCancelAction() { } @@ -537,9 +541,13 @@ class UserInfoModifyActivity : BaseViewBindingActivity diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 6cd757ab4..c2582baed 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -7,9 +7,9 @@ + android:maxSdkVersion="28" />