From b382d9883978547ad2a4d2b4f54d2f1b7855d24f Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Thu, 17 Oct 2024 16:18:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20boomInfo=20=20?= =?UTF-8?q?=E7=9A=84=20=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chwl/app/avroom/activity/AVRoomActivity.java | 5 +++++ .../java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt | 6 +++++- .../com/chwl/app/avroom/fragment/HomePartyFragment.java | 1 + .../main/java/com/chwl/app/home/fragment/MeFragment.kt | 8 ++++---- .../com/chwl/app/ui/webview/CommonWebViewActivity.java | 3 +++ app/src/main/java/com/chwl/app/utils/RoomBoomManager.kt | 2 ++ 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java index 6c55ae993..fc129fb6d 100644 --- a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java @@ -509,6 +509,9 @@ public class AVRoomActivity extends BaseMvpActivity?> : } fun initRoomBoom() { - LogUtils.d("RoomBoomManager initRoomBoom() ") + LogUtils.d("roomLog RoomBoomManager initRoomBoom() roomUid = "+AvRoomDataManager.get().roomUid + " RoomBoomManager.mRoomUid = "+RoomBoomManager.mRoomUid) + if (RoomBoomManager.mRoomUid == -1L) return checkBoomInfo() upDateBoomExp() + LogUtils.d("roomLog RoomBoomManager initRoomBoom() end") + } @SuppressLint("CheckResult") @@ -790,6 +793,7 @@ open class BaseRoomFragment?> : super.onDestroyView() releaseView() unregisterWidgets() + RoomBoomManager.mRoomUid = -1L mBoomInfoDialog?.dismiss() mBoomInfoDialog = null } diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java index f4ea698cf..aa19c5ec6 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java @@ -294,6 +294,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe break; case RoomEvent.MSG_CP_ABOUT: onCpAboutMsg(roomEvent); + break; default: break; } diff --git a/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt index e38bdbc7f..5c5e72aff 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt @@ -201,10 +201,10 @@ class MeFragment : BaseFragment(), View.OnClickListener { val diamondList = initInfo?.giveDiamondErbanNoList val giftList = initInfo?.giveGiftErbanNoList val levelSep = userInfo.userLevelVo.experLevelSeq - if (diamondList?.contains(userInfo.erbanNo) == true || giftList?.contains(userInfo.erbanNo) == true - || levelSep >= (initInfo?.giveDiamondExperLevel - ?: 0) || levelSep >= (initInfo?.giveGiftExperLevel ?: 0) - ) { + if (diamondList?.contains(userInfo.erbanNo) == true + || giftList?.contains(userInfo.erbanNo) == true + || levelSep >= (initInfo?.giveDiamondExperLevel ?: 0) + || levelSep >= (initInfo?.giveGiftExperLevel ?: 0)) { meViewModel.updateDonationMenuVisible(true) } else { meViewModel.updateDonationMenuVisible(false) diff --git a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java index f268015f3..98a122549 100644 --- a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java @@ -190,6 +190,9 @@ public class CommonWebViewActivity extends BaseActivity { webView.getSettings().setUseWideViewPort(true); webView.getSettings().setLoadWithOverviewMode(true); webView.getSettings().setDomStorageEnabled(true); + webView.getSettings().setDatabaseEnabled(true); + webView.getSettings().setMediaPlaybackRequiresUserGesture(true); + webView.setLayerType(View.LAYER_TYPE_HARDWARE, null); // 设置 WebView 可以在 HTTPS 通道上加载 HTTP 资源，Android 4.4 后的暗坑 // 因为 Android 4.4 后默认不允许在 HTTPS 通道上加载 HTTP 资源 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { diff --git a/app/src/main/java/com/chwl/app/utils/RoomBoomManager.kt b/app/src/main/java/com/chwl/app/utils/RoomBoomManager.kt index 2d6aa187b..4e55b9d9b 100644 --- a/app/src/main/java/com/chwl/app/utils/RoomBoomManager.kt +++ b/app/src/main/java/com/chwl/app/utils/RoomBoomManager.kt @@ -44,6 +44,8 @@ object RoomBoomManager { var boomInfo : List? = null + var mRoomUid = -1L + fun addDialog(data: BoomMsgDialogBean) { LogUtils.dd(" RoomBoomManager addDialog() ") queue.add(data)