moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat ; UI 走查問題

Browse Source
This commit is contained in:
eggmanQQQ
2024-10-25 13:43:48 +08:00
parent ef38916fa1
commit 6fde178c79
9 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/AndroidManifest.xml
View File

@@ -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"

6
app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -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)
}
}
}
}

22
app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt
View File

@@ -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 {

1
app/src/main/java/com/chwl/app/ui/utils/GameUtil.kt
View File

@@ -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)

10
app/src/main/res/layout/fragment_av_room_game.xml
View File

@@ -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"

8
app/src/main/res/layout/fragment_game_room.xml
View File

@@ -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"

8
app/src/main/res/layout/fragment_single_room.xml
View File

@@ -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"

6
app/src/module_labour_union/res/layout/item_vip_auth.xml
View File

@@ -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" />

4
library/src/main/AndroidManifest.xml
View File

@@ -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>