yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.排麦抱不在房间用户将其移除排麦队列

Browse Source 
2.完善资料昵称判空优化
This commit is contained in:
huangjian
2021-02-23 19:07:23 +08:00
parent 9c562a76df
commit 6b50d67aa9
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
View File

@@ -131,28 +131,26 @@ public class MicQueueDialog extends BaseDialog implements
rvMicQueue.addItemDecoration(new ColorDecoration(Color.TRANSPARENT, 0, Utils.dip2px(getContext(), 5), true));
adapter = new MicQueueAdapter(dataList);
adapter.setOnUpMicListener(new MicQueueAdapter.OnUpMicListener() {
@Override
public void onUpMic(QueuingMicMemeberInfo member, final int itemPos) {
long targetUid = member.getUid();
if (AvRoomDataManager.get().isOnMic(member.getUid())) {
toast("TA已经在麦上了");
return;
}
AvRoomDataManager.get().checkMemberInRoomById(targetUid)
.subscribe(new BeanObserver<ChatRoomMember>() {
@Override
public void onErrorMsg(String error) {
toast(error);
}
@Override
public void onSuccess(ChatRoomMember mem) {
inviteToMic(member, itemPos);
}
});
adapter.setOnUpMicListener((member, itemPos) -> {
long targetUid = member.getUid();
if (AvRoomDataManager.get().isOnMic(member.getUid())) {
toast("TA已经在麦上了");
return;
}
AvRoomDataManager.get().checkMemberInRoomById(targetUid)
.subscribe(new BeanObserver<ChatRoomMember>() {
@Override
public void onErrorMsg(String error) {
toast(error);
MicQueueModel.get().cancelApplyForQueuing(AvRoomDataManager.get().getRoomUid(), targetUid).subscribe();
}
@Override
public void onSuccess(ChatRoomMember mem) {
inviteToMic(member, itemPos);
}
});
});
rvMicQueue.setAdapter(adapter);
@@ -242,7 +240,7 @@ public class MicQueueDialog extends BaseDialog implements
return;
}
//抱别人上麦
model.inviteMicroPhone(new BaseInfo(targetUid, member.getNick(),member.getGroupType()), micPosition)
model.inviteMicroPhone(new BaseInfo(targetUid, member.getNick(), member.getGroupType()), micPosition)
.subscribe();
} else {

2
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -107,7 +107,7 @@ public class AddUserInfoFragment extends BaseFragment
public void onClick(View v) {
switch (v.getId()) {
case R.id.ok_btn:
if (TextUtils.isEmpty(tvNick.getText())) {
if (TextUtils.isEmpty(tvNick.getText().toString().trim())) {
toast("昵称不能为空！");
return;
}