From c73c7425a740ea30290252ca77a498cf11ba1766 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Tue, 15 Oct 2024 19:19:38 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=E9=BA=A6=E4=BD=8D=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E5=8C=96=E6=97=B6=20=E5=9B=9E=E6=9D=A5=E5=BC=82=E5=B8=B8=20=20?= =?UTF-8?q?fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chwl/app/avroom/activity/AVRoomActivity.java | 2 +- .../java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt | 2 +- app/src/main/java/com/chwl/app/avroom/widget/BottomView.java | 4 ++++ .../main/java/com/chwl/app/notify/views/BaiShunGameNotify.kt | 4 ++++ app/src/main/res/values-ar/strings.xml | 3 +++ app/src/main/res/values-zh-rTW/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 4 ++++ 7 files changed, 20 insertions(+), 2 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 6b4cb1580..071d91ace 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 @@ -815,7 +815,6 @@ public class AVRoomActivity extends BaseMvpActivity?> : openOrCloseGiftValue(true) updateView() updateMicBtn() - AudioEngineManager.get().isNotRecord = false + AudioEngineManager.get().isNotRecord = AudioEngineManager.get().isNotRecord microView.setOnMicroItemClickListener(this) mDisposable = IMNetEaseManager.get().chatRoomEventObservable .subscribe { onReceiveRoomEvent(it) } diff --git a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java index 663ad8741..972a35880 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java @@ -39,6 +39,7 @@ import com.chwl.core.utils.LogUtils; import com.chwl.core.utils.SharedPreferenceUtils; import com.chwl.core.utils.extension.StringExtensionKt; import com.chwl.library.utils.ListUtils; +import com.hjq.toast.ToastUtils; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nimlib.sdk.msg.model.RecentContact; @@ -540,6 +541,7 @@ public class BottomView extends LinearLayout implements View.OnClickListener { micOn.setOnClickListener(v -> { micSetPopupWindow.dismiss(); if (wrapper != null) { + ToastUtils.show(R.string.roomMicSetOpen); wrapper.onOpenMicBtnClick(MyConstant.MicType.open); } }); @@ -547,6 +549,7 @@ public class BottomView extends LinearLayout implements View.OnClickListener { micMusic.setOnClickListener(v -> { micSetPopupWindow.dismiss(); if (wrapper != null) { + ToastUtils.show(R.string.roomMicSetMusic); wrapper.onOpenMicBtnClick(MyConstant.MicType.music); } }); @@ -554,6 +557,7 @@ public class BottomView extends LinearLayout implements View.OnClickListener { micOff.setOnClickListener(v -> { micSetPopupWindow.dismiss(); if (wrapper != null) { + ToastUtils.show(R.string.roomMicSetClose); wrapper.onOpenMicBtnClick(MyConstant.MicType.close); } }); diff --git a/app/src/main/java/com/chwl/app/notify/views/BaiShunGameNotify.kt b/app/src/main/java/com/chwl/app/notify/views/BaiShunGameNotify.kt index 31ac2fd0c..edaa81aae 100644 --- a/app/src/main/java/com/chwl/app/notify/views/BaiShunGameNotify.kt +++ b/app/src/main/java/com/chwl/app/notify/views/BaiShunGameNotify.kt @@ -152,6 +152,10 @@ class BaiShunGameNotify(context: Context) : BaseFloatView(context), // } // } + val textSize = data.fontSize?.toFloat() ?: 12f + val textColor = templateMessageAdapter.parseColor(data.textColor) ?: Color.WHITE + textView.textSize = textSize + textView.setTextColor(textColor) templateMessageAdapter.convertText(textView, data) val go = findViewById(R.id.go) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1ff21f77a..e389dbaed 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -5377,4 +5377,7 @@ تهانينا! %s إطلاق الجائزة الكبرى السوبر بووم، ستتم مكافأة جميع المستخدمين في الغرفة! وقت إعادة الضبط 0:00 (GMT+8) يوميًا وقت إعادة الضبط 0:00 (GMT+3) يوميًا + لقد قمت بتشغيل الميكروفون والموسيقى + لقد قمت بتشغيل الموسيقى ولكنك أوقفت الميكروفون + لقد أوقفت الموسيقى والميكروفون \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 55c58c903..4944719ad 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -5319,5 +5319,8 @@ 恭喜！%s 触发超级大奖BOOM，所有在房用户将获得奖励！ 重置時間：每日 0:00 (GMT+8) 重置時間：每日 0:00 (GMT+3) + 你打開了麥克風和音樂。 + 您打開了音樂但關閉了麥克風。 + 你關掉了音樂和麥克風。 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c4df1e3c..b26f60d41 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5379,6 +5379,10 @@ You cannot join again within 24 hours after leaving Congratulations! %s has triggered the super jackpot BOOM, and all users in the room will receive rewards! + You turned on the mic and the music. + You turned on the music but turned off the mic. + You turned off the music and the mic. +