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

feat : 麦位最小化时 回来异常 fix

Browse Source
This commit is contained in:
eggmanQQQ
2024-10-15 19:19:38 +08:00
parent 2d33a96376
commit c73c7425a7
7 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java
View File

@@ -815,7 +815,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
public void exitRoom(RoomInfo currentRoomInfo) {
if (currentRoomInfo != null && currentRoomInfo.getUid() == roomUid) {
finish();
AudioEngineManager.get().setNotRecord(false);
}
}
@@ -859,6 +858,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
if (!justClosePage) {
getMvpPresenter().exitRoom();
}
AudioEngineManager.get().setNotRecord(false);
finish();
}

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

@@ -411,7 +411,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
openOrCloseGiftValue(true)
updateView()
updateMicBtn()
AudioEngineManager.get().isNotRecord = false
AudioEngineManager.get().isNotRecord = AudioEngineManager.get().isNotRecord
microView.setOnMicroItemClickListener(this)
mDisposable = IMNetEaseManager.get().chatRoomEventObservable
.subscribe { onReceiveRoomEvent(it) }

4
app/src/main/java/com/chwl/app/avroom/widget/BottomView.java
View File

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

4
app/src/main/java/com/chwl/app/notify/views/BaiShunGameNotify.kt
View File

@@ -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<ImageView>(R.id.go)

3
app/src/main/res/values-ar/strings.xml
View File

@@ -5377,4 +5377,7 @@
<string name="roomBoomMessageView">تهانينا! %s إطلاق الجائزة الكبرى السوبر بووم، ستتم مكافأة جميع المستخدمين في الغرفة!</string>
<string name="roomBoomInfoRankHint">وقت إعادة الضبط 0:00 (GMT+8) يوميًا</string>
<string name="roomBoomInfoRankHint2">وقت إعادة الضبط 0:00 (GMT+3) يوميًا</string>
<string name="roomMicSetOpen">لقد قمت بتشغيل الميكروفون والموسيقى</string>
<string name="roomMicSetMusic">لقد قمت بتشغيل الموسيقى ولكنك أوقفت الميكروفون</string>
<string name="roomMicSetClose">لقد أوقفت الموسيقى والميكروفون</string>
</resources>

3
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -5319,5 +5319,8 @@
<string name="roomBoomMessageView">恭喜！%s 触发超级大奖BOOM，所有在房用户将获得奖励！</string>
<string name="roomBoomInfoRankHint">重置時間：每日 0:00 (GMT+8)</string>
<string name="roomBoomInfoRankHint2">重置時間：每日 0:00 (GMT+3)</string>
<string name="roomMicSetOpen">你打開了麥克風和音樂。</string>
<string name="roomMicSetMusic">您打開了音樂但關閉了麥克風。</string>
<string name="roomMicSetClose">你關掉了音樂和麥克風。</string>
</resources>

4
app/src/main/res/values/strings.xml
View File

@@ -5379,6 +5379,10 @@ You cannot join again within 24 hours after leaving</string>
<string name="roomBoomMessageView">Congratulations! %s has triggered the super jackpot BOOM, and all users in the room will receive rewards!</string>
<string name="roomMicSetOpen">You turned on the mic and the music.</string>
<string name="roomMicSetMusic">You turned on the music but turned off the mic.</string>
<string name="roomMicSetClose">You turned off the music and the mic.</string>