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

fix ; bug fix

Browse Source
This commit is contained in:
eggmanQQQ
2025-02-26 14:05:00 +08:00
parent 368caf9392
commit c15b8581be
11 changed files with 254 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java
View File

@@ -252,80 +252,78 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
public void onResume() {
super.onResume();
updateView(AvRoomDataManager.get().mCurrentRoomInfo);
// OtherExtKt.doLog("房间消息 注册房间消息监听");
gameMainBinding.getRoot().post(() -> {
IMNetEaseManager.get().getChatRoomEventObservable()
.doOnNext(roomEvent -> {
OtherExtKt.postSafe(gameMainBinding.getRoot(), () -> {
try {
if (roomEvent == null) return null;
int event = roomEvent.getEvent();
IMNetEaseManager.get().getChatRoomEventObservable()
.compose(bindToLifecycle())
.doOnNext(roomEvent -> {
OtherExtKt.postSafe(gameMainBinding.getRoot(), () -> {
try {
if (roomEvent == null) return null;
int event = roomEvent.getEvent();
// OtherExtKt.doLog("房间消息 接收到房间消息 - "+event + " == 34 ?");
switch (event) {
case RoomEvent.ENTER_ROOM:
try {
if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
updateOnlineNumberView(AvRoomDataManager.get().mCurrentRoomInfo.onlineNum);
}
addTipMsg();
} catch (Exception e) {
OtherExtKt.doLog("房间消息 接收到房间消息=1 报错 - "+e.getMessage());
}
case RoomEvent.ROOM_INFO_UPDATE:
updateView(AvRoomDataManager.get().mCurrentRoomInfo);
break;
case RoomEvent.RECEIVE_NORMALE_GIFT://普通
onReceiveGiftMsg(roomEvent.getGiftReceiveInfo());
break;
case RoomEvent.RECEIVE_NORMALE_GIFT_ALL_SERVICE:// 全服普通
onReceiveGiftMsgAllService(roomEvent.getGiftReceiveInfo());
case RoomEvent.RECEIVE_NORMALE_GIFT_ALL_SERVICE_NOTIFY:// 全服飘屏
onReceiveGiftMsgAllServiceNotify(roomEvent.getAnyData());
break;
case RoomEvent.RECEIVE_MUTLT_NORMALEI_GIFT://普通多人
onReceiveMultiGiftMsg(roomEvent.getGiftMultiReceiverInfo());
break;
case RoomEvent.RECEIVE_ALL_MIC__NORMALEI_GIFT://普通全麦
onReceiveAllMicGiftMsg(roomEvent.getMultiGiftReceiveInfo());
break;
//福袋礼物
case RoomEvent.RECEIVE_LUCKY_GIFT:
case RoomEvent.RECEIVE_MULTI_LUCKY_GIFT:
case RoomEvent.RECEIVE_ALL_MIC_LUCKY_GIFT:
onReceiveLuckyGiftToMultiMsg(roomEvent.getLuckygiftMultiReceiverInfo());
break;
case RoomEvent.RECEIVED_SINGLE_MAGIC:
onReceiveMagicMsg(roomEvent.getMagicReceivedInfo());
break;
case RoomEvent.RECEIVED_ALL_MIC_MAGIC:
onReceiveMultiMagicMsg(roomEvent.getMultiMagicReceivedInfo());
break;
case RoomEvent.FANS_TEAM_JOIN:
onReceiveFansTeamJoinMsg(roomEvent.getChatRoomMessage());
break;
case RoomEvent.MSG_SUPER_LUCKY_GIFT:
onLuckyGiftMsg(roomEvent);
break;
case RoomEvent.MSG_CP_ABOUT:
onCpAboutMsg(roomEvent);
case RoomEvent.MSG_ROOM_BG_CHANGE:
onRoomBgChange(roomEvent);
case RoomEvent.MSG_ROOM_LEVEL_CHANGE:
onRoomLevelChange(roomEvent);
break;
default:
break;
}
} catch (Exception e) {
OtherExtKt.doLog("房间消息 报错 "+roomEvent.getEvent()+" "+e.getMessage());
}
switch (event) {
case RoomEvent.ENTER_ROOM:
try {
if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
updateOnlineNumberView(AvRoomDataManager.get().mCurrentRoomInfo.onlineNum);
}
addTipMsg();
} catch (Exception e) {
OtherExtKt.doLog("房间消息 接收到房间消息=1 报错 - "+e.getMessage());
}
case RoomEvent.ROOM_INFO_UPDATE:
updateView(AvRoomDataManager.get().mCurrentRoomInfo);
break;
case RoomEvent.RECEIVE_NORMALE_GIFT://普通
onReceiveGiftMsg(roomEvent.getGiftReceiveInfo());
break;
case RoomEvent.RECEIVE_NORMALE_GIFT_ALL_SERVICE:// 全服普通
onReceiveGiftMsgAllService(roomEvent.getGiftReceiveInfo());
case RoomEvent.RECEIVE_NORMALE_GIFT_ALL_SERVICE_NOTIFY:// 全服飘屏
onReceiveGiftMsgAllServiceNotify(roomEvent.getAnyData());
break;
case RoomEvent.RECEIVE_MUTLT_NORMALEI_GIFT://普通多人
onReceiveMultiGiftMsg(roomEvent.getGiftMultiReceiverInfo());
break;
case RoomEvent.RECEIVE_ALL_MIC__NORMALEI_GIFT://普通全麦
onReceiveAllMicGiftMsg(roomEvent.getMultiGiftReceiveInfo());
break;
//福袋礼物
case RoomEvent.RECEIVE_LUCKY_GIFT:
case RoomEvent.RECEIVE_MULTI_LUCKY_GIFT:
case RoomEvent.RECEIVE_ALL_MIC_LUCKY_GIFT:
onReceiveLuckyGiftToMultiMsg(roomEvent.getLuckygiftMultiReceiverInfo());
break;
case RoomEvent.RECEIVED_SINGLE_MAGIC:
onReceiveMagicMsg(roomEvent.getMagicReceivedInfo());
break;
case RoomEvent.RECEIVED_ALL_MIC_MAGIC:
onReceiveMultiMagicMsg(roomEvent.getMultiMagicReceivedInfo());
break;
case RoomEvent.FANS_TEAM_JOIN:
onReceiveFansTeamJoinMsg(roomEvent.getChatRoomMessage());
break;
case RoomEvent.MSG_SUPER_LUCKY_GIFT:
onLuckyGiftMsg(roomEvent);
break;
case RoomEvent.MSG_CP_ABOUT:
onCpAboutMsg(roomEvent);
case RoomEvent.MSG_ROOM_BG_CHANGE:
onRoomBgChange(roomEvent);
case RoomEvent.MSG_ROOM_LEVEL_CHANGE:
onRoomLevelChange(roomEvent);
break;
default:
break;
}
} catch (Exception e) {
OtherExtKt.doLog("房间消息 报错 "+roomEvent.getEvent()+" "+e.getMessage());
}
return null;
});
return null;
});
})
.subscribe();
});
})
.subscribe();
}

70
app/src/main/java/com/chwl/app/base/PhotoPickActivity.kt
View File

@@ -15,6 +15,7 @@ import com.chwl.app.R
import com.chwl.app.ui.widget.dialog.CommonTipDialog
import com.chwl.core.utils.DialogUtil
import com.chwl.library.common.util.SPUtils
import com.chwl.library.common.util.doToast
import com.chwl.library.constants.ConstantsLib
import com.chwl.library.easypermisssion.EasyPermissions
import com.hjq.toast.ToastUtils
@@ -53,35 +54,40 @@ class PhotoPickActivity : ComponentActivity(), EasyPermissions.PermissionCallbac
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// setContentView(R.layout.activity_photo_pick)
window?.setDimAmount(0f)
mMediaType = intent?.getStringExtra(PICK_ACT_TYPE) ?: IMG
pickMedia = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
if (uri != null) {
val intent = Intent()
intent.setData(uri)
setResult(RESULT_OK, intent)
// 接收方 用 intent.data 来获取
finish()
} else {
try {
window?.setDimAmount(0f)
mMediaType = intent?.getStringExtra(PICK_ACT_TYPE) ?: IMG
pickMedia = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
if (uri != null) {
val intent = Intent()
intent.setData(uri)
setResult(RESULT_OK, intent)
// 接收方 用 intent.data 来获取
finish()
} else {
finish()
}
}
pickMediaForDocument = registerForActivityResult(ActivityResultContracts.OpenDocument()) {
if (it != null) {
val intent = Intent()
intent.setData(it)
setResult(RESULT_OK, intent)
}
finish()
}
checkStoragePermission()
} catch (e: Exception) {
R.string.error_tips.doToast()
}
pickMediaForDocument = registerForActivityResult(ActivityResultContracts.OpenDocument()) {
if (it != null) {
val intent = Intent()
intent.setData(it)
setResult(RESULT_OK, intent)
}
finish()
}
checkStoragePermission()
}
private fun checkStoragePermission() {
if (Build.VERSION.SDK_INT >= 29) {
DialogUtil.getDialog(this, object : EasyAlertDialogHelper.OnDialogActionListener {
override fun doCancelAction() {
@@ -89,14 +95,12 @@ class PhotoPickActivity : ComponentActivity(), EasyPermissions.PermissionCallbac
}
override fun doOkAction() {
SPUtils.putBoolean(ConstantsLib.Key.Permissions_Img, true)
pickMedia?.launch(
PickVisualMediaRequest(
ActivityResultContracts.PickVisualMedia.SingleMimeType(
mMediaType
)
)
)
try {
SPUtils.putBoolean(ConstantsLib.Key.Permissions_Img, true)
pickMedia?.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.SingleMimeType(mMediaType)))
} catch (e: Exception) {
R.string.error_tips.doToast()
}
}
})
} else {
@@ -111,7 +115,11 @@ class PhotoPickActivity : ComponentActivity(), EasyPermissions.PermissionCallbac
// val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
// intent.setType("*/*")
// intent.putExtra(Intent.EXTRA_MIME_TYPES,mMediaType)
pickMediaForDocument?.launch(arrayOf(mMediaType))
try {
pickMediaForDocument?.launch(arrayOf(mMediaType))
} catch (e: Exception) {
R.string.error_tips.doToast()
}
}
}
}

2
app/src/main/java/com/chwl/app/team/view/TeamMemberSearchListActivity.java
View File

@@ -258,7 +258,7 @@ public class TeamMemberSearchListActivity extends BaseBindingActivity<ActivityTe
.subscribe((s, throwable) -> {
if (throwable != null) {
throwable.printStackTrace();
toast(ResUtil.getString(R.string.team_view_teammembersearchlistactivity_04));
toast(ResUtil.getString(R.string.error_tips));
} else {
teamMemberInfo.setDisable(wannaMute);
teamInfo.setDisabledCount(wannaMute ?

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

@@ -2231,7 +2231,7 @@
<string name="team_view_teammembersearchlistactivity_01">الرجاء إدخال محتوى البحث!</string>
<string name="team_view_teammembersearchlistactivity_02">الرجاء إدخال محتوى البحث!</string>
<string name="team_view_teammembersearchlistactivity_03">تمت إزالته بنجاح من المجموعة</string>
<string name="team_view_teammembersearchlistactivity_04">فشلت العملية</string>
<string name="error_tips">فشلت العملية</string>
<string name="team_view_teamweeklybillsearchactivity_01">الرجاء إدخال محتوى البحث!</string>
<string name="team_view_teamweeklybillsearchactivity_02">الرجاء إدخال محتوى البحث!</string>
<string name="team_view_updateteamnameactivity_01">تعديل اسم المجموعة</string>

2
app/src/main/res/values-tr/strings.xml
View File

@@ -2131,7 +2131,7 @@ Toplam imza alın, ilgili ödülü alın
<string name="team_view_teammembersearchlistactivity_01">Arama içeriği girin!</string>
<string name="team_view_teammembersearchlistactivity_02">Arama içeriği girin!</string>
<string name="team_view_teammembersearchlistactivity_03">Grup başarıyla çıkarıldı</string>
<string name="team_view_teammembersearchlistactivity_04">İşlem başarısız</string>
<string name="error_tips">İşlem başarısız</string>
<string name="team_view_teamweeklybillsearchactivity_01">Arama içeriği girin!</string>
<string name="team_view_teamweeklybillsearchactivity_02">Arama içeriği girin!</string>
<string name="team_view_updateteamnameactivity_01">Grup adını güncelle</string>

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

@@ -2248,7 +2248,7 @@
<string name="team_view_teammembersearchlistactivity_01">請輸入搜索內容!</string>
<string name="team_view_teammembersearchlistactivity_02">請輸入搜索內容!</string>
<string name="team_view_teammembersearchlistactivity_03">成功移出群</string>
<string name="team_view_teammembersearchlistactivity_04">操作失敗</string>
<string name="error_tips">操作失敗</string>
<string name="team_view_teamweeklybillsearchactivity_01">請輸入搜索內容!</string>
<string name="team_view_teamweeklybillsearchactivity_02">請輸入搜索內容!</string>
<string name="team_view_updateteamnameactivity_01">修改群名稱</string>

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

@@ -2279,7 +2279,7 @@
<string name="team_view_teammembersearchlistactivity_01">Please enter search content!</string>
<string name="team_view_teammembersearchlistactivity_02">Please enter search content!</string>
<string name="team_view_teammembersearchlistactivity_03">Successfully removed from the group</string>
<string name="team_view_teammembersearchlistactivity_04">Operation failed</string>
<string name="error_tips">Operation failed</string>
<string name="team_view_teamweeklybillsearchactivity_01">Please enter search content!</string>
<string name="team_view_teamweeklybillsearchactivity_02">Please enter search content!</string>
<string name="team_view_updateteamnameactivity_01">Modify group name</string>