From 6fde178c790362485e37bae9e31ddf5c0790f5c1 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Fri, 25 Oct 2024 13:43:48 +0800
Subject: [PATCH] =?UTF-8?q?feat=20;=20UI=20=E8=B5=B0=E6=9F=A5=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 12 ++--------
 .../app/avroom/fragment/BaseRoomFragment.kt   |  6 ++++-
 .../user/activity/UserInfoModifyActivity.kt   | 22 +++++++++++++------
 .../java/com/chwl/app/ui/utils/GameUtil.kt    |  1 +
 .../main/res/layout/fragment_av_room_game.xml | 10 ++++-----
 .../main/res/layout/fragment_game_room.xml    |  8 +++----
 .../main/res/layout/fragment_single_room.xml  |  8 +++----
 .../res/layout/item_vip_auth.xml              |  6 ++---
 library/src/main/AndroidManifest.xml          |  4 ++--
 9 files changed, 41 insertions(+), 36 deletions(-)

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 @@
     <uses-permission tools:node="remove" android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+        android:maxSdkVersion="28" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+        android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- 如果需要实时音视频通话模块，下面的权限也是必须的。否则，可以不加 -->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- SDK 权限申明, 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
@@ -355,9 +355,6 @@
         <activity
             android:name=".bills.activities.TotalBillsActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".bills.activities.WithdrawBillsActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".bills.activities.ChargeBillsActivity"
             android:screenOrientation="portrait" />
@@ -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" />
-        <activity
-            android:name=".earn.activity.BindWithdrawMsgActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".earn.activity.GoldDetailActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
index 3c17f5344..fd5949567 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
@@ -1628,7 +1628,11 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
                                 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<ActivityUserInfoModifyBin
                 if (uri != null) {
                     mUri?.let {
                         if (isGif) {
-                            val isCopy = MyUriUtils.copyFileToUrl(this,uri, it)
-                            if (isCopy) {
-                                onActivityResult(UCrop.REQUEST_CROP,RESULT_OK,null)
+                            if (MyUriUtils.isGif(context, uri)){
+                                val isCopy = MyUriUtils.copyFileToUrl(this,uri, it)
+                                if (isCopy) {
+                                    onActivityResult(UCrop.REQUEST_CROP,RESULT_OK,null)
+                                }
+                            }else{
+                                ToastUtils.show(R.string.error_file_type)
                             }
                         } else {
                             crop(uri, 1, it)
@@ -457,7 +461,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
 
         val fileWith = if (isGif)".gif"  else ".jpg"
 
-        if (Build.VERSION.SDK_INT >= 33){
+        if (Build.VERSION.SDK_INT >= 29){
             DialogUtil.getDialog(this,object : EasyAlertDialogHelper.OnDialogActionListener {
                 override fun doCancelAction() {
                 }
@@ -537,9 +541,13 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
                         val photo = photos[0]
                         if (isGif) {
                             mUri?.let {
-                                val isCopy = MyUriUtils.copyFileToUrl(this,photo.uri, it)
-                                if (isCopy) {
-                                    onActivityResult(UCrop.REQUEST_CROP,RESULT_OK,null)
+                                if (MyUriUtils.isGif(context,photo.uri)){
+                                    val isCopy = MyUriUtils.copyFileToUrl(this,photo.uri, it)
+                                    if (isCopy) {
+                                        onActivityResult(UCrop.REQUEST_CROP,RESULT_OK,null)
+                                    }
+                                }else{
+                                    ToastUtils.show(R.string.error_file_type)
                                 }
                             }
                         } else {
diff --git a/app/src/main/java/com/chwl/app/ui/utils/GameUtil.kt b/app/src/main/java/com/chwl/app/ui/utils/GameUtil.kt
index f0e7b55b3..a08efd6e4 100644
--- a/app/src/main/java/com/chwl/app/ui/utils/GameUtil.kt
+++ b/app/src/main/java/com/chwl/app/ui/utils/GameUtil.kt
@@ -34,6 +34,7 @@ object GameUtil {
             )
             if (config != null && url != null) {
                 config.reloadDynamicParams()
+                config.showType = data.showType
                 openGame(url, config)
             } else {
                 SingleToastUtil.showToast(R.string.manager_trtc_trtcengineadapter_042)
diff --git a/app/src/main/res/layout/fragment_av_room_game.xml b/app/src/main/res/layout/fragment_av_room_game.xml
index fc2f5a74b..1e41ff979 100644
--- a/app/src/main/res/layout/fragment_av_room_game.xml
+++ b/app/src/main/res/layout/fragment_av_room_game.xml
@@ -270,12 +270,12 @@
 
         <ImageView
             android:id="@+id/iv_config_entrance"
-            android:layout_width="@dimen/dp_38"
-            android:layout_height="@dimen/dp_38"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
             android:layout_above="@id/iv_game"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="@dimen/dp_11"
-            android:layout_marginBottom="@dimen/dp_20"
+            android:layout_marginBottom="@dimen/dp_10"
             android:onClick="@{click}"
             android:src="@drawable/room_ic_game"
             android:visibility="gone"
@@ -284,8 +284,8 @@
 
         <ImageView
             android:id="@+id/iv_game"
-            android:layout_width="@dimen/dp_38"
-            android:layout_height="@dimen/dp_38"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
             android:layout_above="@id/iv_queuing_micro"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="@dimen/dp_11"
diff --git a/app/src/main/res/layout/fragment_game_room.xml b/app/src/main/res/layout/fragment_game_room.xml
index 34516444b..39b455abd 100644
--- a/app/src/main/res/layout/fragment_game_room.xml
+++ b/app/src/main/res/layout/fragment_game_room.xml
@@ -221,8 +221,8 @@
 
         <ImageView
             android:id="@+id/iv_config_entrance"
-            android:layout_width="@dimen/dp_38"
-            android:layout_height="@dimen/dp_38"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
             android:layout_above="@id/iv_game"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="@dimen/dp_11"
@@ -234,8 +234,8 @@
 
         <ImageView
             android:id="@+id/iv_game"
-            android:layout_width="@dimen/dp_38"
-            android:layout_height="@dimen/dp_38"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
             android:layout_above="@id/bottom_view"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="@dimen/dp_11"
diff --git a/app/src/main/res/layout/fragment_single_room.xml b/app/src/main/res/layout/fragment_single_room.xml
index 413a3764f..7b3f00148 100644
--- a/app/src/main/res/layout/fragment_single_room.xml
+++ b/app/src/main/res/layout/fragment_single_room.xml
@@ -218,8 +218,8 @@
 
             <ImageView
                 android:id="@+id/iv_config_entrance"
-                android:layout_width="@dimen/dp_38"
-                android:layout_height="@dimen/dp_38"
+                android:layout_width="@dimen/dp_55"
+                android:layout_height="@dimen/dp_55"
                 android:layout_above="@id/iv_game"
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/dp_11"
@@ -230,8 +230,8 @@
 
             <ImageView
                 android:id="@+id/iv_game"
-                android:layout_width="@dimen/dp_38"
-                android:layout_height="@dimen/dp_38"
+                android:layout_width="@dimen/dp_55"
+                android:layout_height="@dimen/dp_55"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
                 android:layout_marginEnd="@dimen/dp_11"
diff --git a/app/src/module_labour_union/res/layout/item_vip_auth.xml b/app/src/module_labour_union/res/layout/item_vip_auth.xml
index 2b8982eed..00945c68a 100644
--- a/app/src/module_labour_union/res/layout/item_vip_auth.xml
+++ b/app/src/module_labour_union/res/layout/item_vip_auth.xml
@@ -11,8 +11,8 @@
 
     <ImageView
         android:id="@+id/iv_auth_icon"
-        android:layout_width="46dp"
-        android:layout_height="46dp"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
         android:src="@drawable/default_cover" />
 
     <TextView
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="7dp"
         android:textColor="#ff9f8052"
-        android:textSize="14sp"
+        android:textSize="13sp"
         android:gravity="center_horizontal"
         tools:text="@string/layout_item_vip_auth_01" />
 
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 @@
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission tools:node="remove" android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+        android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"
+        android:maxSdkVersion="28"
         tools:ignore="ScopedStorage" />
 
     <application>