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

Merge branch 'develop_new' into develop_home

Browse Source
This commit is contained in:
oujunhui
2020-05-09 19:03:28 +08:00
parent cfdc618e4a a05e148cb3
commit 65ed047f4c
11 changed files with 181 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -3101,4 +3101,11 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
setActTimerVisibility(View.GONE);
}
@Override
public void updateMicView() {
gameBinding.microView.getAdapter().notifyDataSetChanged();
}
}

15
app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java
View File

@@ -1,12 +1,11 @@
package com.yizhuan.erban.avroom.presenter;
import android.annotation.SuppressLint;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.netease.nimlib.sdk.NIMClient;
@@ -31,7 +30,6 @@ import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.manager.event.HistoryMessageEvent;
import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel;
import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo;
import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel;
@@ -46,6 +44,7 @@ import com.yizhuan.xchat_android_core.room.game.AiPlayEndEvent;
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.room.model.HomePartyModel;
import com.yizhuan.xchat_android_core.room.model.RoomBaseModel;
import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
@@ -57,7 +56,6 @@ import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.base.PresenterEvent;
import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
@@ -71,14 +69,12 @@ import java.util.Objects;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.ObservableSource;
import io.reactivex.Single;
import io.reactivex.SingleSource;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.BiConsumer;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
import io.reactivex.functions.Predicate;
import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL;
import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_END;
@@ -306,6 +302,11 @@ public class HomePartyPresenter extends BaseMvpPresenter<IHomePartyView> {
@Override
public void onFail(int code, String error) {
if (code == RoomBaseModel.CODE_UPDATE_MIC) {
if (getMvpView() != null) {
getMvpView().updateMicView();
}
}
Logger.i("用户%1$s上麦失败：%2$s----", uId, error);
}
});

2
app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java
View File

@@ -226,8 +226,6 @@ public class RoomSettingPresenter extends BaseMvpPresenter<IRoomSettingView> {
if (userInfo != null)
IMNetEaseManager.get().leaveModeMessage(roomInfo1.getRoomId(), userInfo.getNick(), userInfo.getGender(), userInfo.getAvatar()).subscribe();
});
if (roomInfo1.isShowGiftValue())
GiftValueModel.get().upMic(AuthModel.get().getCurrentUid(), -1).subscribe();
}

1
app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java
View File

@@ -113,4 +113,5 @@ public interface IHomePartyView extends IMvpBaseView {
*/
void onFollowFail(String msg);
void updateMicView();
}

1
app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java
View File

@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.coorchice.library.utils.LogUtils;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;

7
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -6,11 +6,13 @@ import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -25,6 +27,7 @@ import android.widget.PopupWindow;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.coorchice.library.utils.LogUtils;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.business.session.emoji.EmoticonPickerView;
import com.netease.nim.uikit.business.session.emoji.IEmoticonSelectedListener;
@@ -198,6 +201,10 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
*/
public static void start(Context context, long dynamicId, long worldId, int listPosition,
boolean needKeyboard, int event) {
if (dynamicId == 0) {
LogUtils.e("-------------------------动态id为0------------------");
return;
}
String label = "其他";
switch (event) {
case 1:

5
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java
View File

@@ -63,7 +63,7 @@ public class GiftValueModel extends BaseModel implements IGiftValueModel {
@Override
public Single<String> upMic(long micUid, int position) {
return api.upMic(AvRoomDataManager.get().getRoomUid(),
micUid, position)
micUid, position,AvRoomDataManager.get().isShowGiftValue())
.compose(RxHelper.handleIgnoreData());
}
@@ -119,7 +119,8 @@ public class GiftValueModel extends BaseModel implements IGiftValueModel {
@POST("/room/gift/value/up/mic")
Single<ServiceResult<JsonElement>> upMic(@Field("roomUid") long roomUid,
@Field("micUid") long micUid,
@Field("position") int position);
@Field("position") int position,
@Field("showGiftValue") boolean showGiftValue);
/**
* 下麦，通知缓存变更

3
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
View File

@@ -244,9 +244,6 @@ public class GiftValueMrg {
}
public void requestUpMic(int micPosition, String upMicUid) {
if (!AvRoomDataManager.get().isShowGiftValue()) {
return;
}
if (!TextUtils.isEmpty(upMicUid)) {
GiftValueModel.get().upMic(JavaUtil.str2long(upMicUid), micPosition).subscribe();
}

103
core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
View File

@@ -1,9 +1,13 @@
package com.yizhuan.xchat_android_core.room.model;
import android.annotation.SuppressLint;
import android.text.TextUtils;
import android.util.SparseArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.netease.nimlib.sdk.NIMChatRoomSDK;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
@@ -45,6 +49,7 @@ import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.ArrayList;
import java.util.List;
@@ -80,6 +85,8 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
*/
protected static final int ROOM_MEMBER_SIZE = 50;
public static final int CODE_UPDATE_MIC = 110;
protected final Api mRoomService;
public RoomBaseModel() {
@@ -321,22 +328,31 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
* @param callBack
* @param teamId
*/
@SuppressLint("CheckResult")
@Override
public void upMicroPhone(final int micPosition, final String uId, final String roomId,
boolean isInviteUpMic, final CallBack<String> callBack, int teamId) {
RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().mMicQueueMemberMap.get(micPosition);
queryRoomMicInfo(roomId)
.map(this::dealMicMemberFromIMNet)
.flatMap(this::dealMicChatRoomMemberFromIMNet)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(roomQueueInfoSparseArray -> {
RoomQueueInfo roomQueueInfo = roomQueueInfoSparseArray.get(micPosition);
if (roomQueueInfo == null) {
return;
}
ChatRoomMember chatRoomMember = roomQueueInfo.mChatRoomMember;
final RoomMicInfo roomMicInfo = roomQueueInfo.mRoomMicInfo;
if (chatRoomMember != null) {
SingleToastUtil.showToast("该麦位已经有人了哦~");
callBack.onFail(CODE_UPDATE_MIC,"该麦位已经有人了");
return;
}
//坑上没人且没锁
if (roomMicInfo != null
&& ((!roomMicInfo.isMicLock() || AvRoomDataManager.get().isRoomOwner(uId)
|| AvRoomDataManager.get().isRoomAdmin(uId))
|| isInviteUpMic)
&& chatRoomMember == null) {
if (roomMicInfo != null &&
(!roomMicInfo.isMicLock() || AvRoomDataManager.get().isRoomOwner(uId) ||
AvRoomDataManager.get().isRoomAdmin(uId) || isInviteUpMic)) {
final UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null) {
userInfo.setGroupType(teamId);
@@ -371,7 +387,72 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
}
}
}
});
}
/**
* 处理网易云信坑位信息
* 这里只有在这个坑位原来没人但是云信队列信息有人,才更新这个坑位,防止挤麦
*/
private List<String> dealMicMemberFromIMNet(List<Entry<String, String>> entries) {
List<String> accounts = new ArrayList<>();
if (!ListUtils.isListEmpty(entries)) {
JsonParser jsonParser = new JsonParser();
ChatRoomMember chatRoomMember;
for (Entry<String, String> entry : entries) {
RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().mMicQueueMemberMap.get(Integer.parseInt(entry.key));
//当前坑上有人就不要去管了
if (roomQueueInfo != null && roomQueueInfo.mChatRoomMember == null) {
JsonObject valueJsonObj = jsonParser.parse(entry.value).getAsJsonObject();
if (valueJsonObj != null) {
chatRoomMember = new ChatRoomMember();
if (valueJsonObj.has("uid")) {
int uid = valueJsonObj.get("uid").getAsInt();
accounts.add(String.valueOf(uid));
chatRoomMember.setAccount(String.valueOf(uid));
}
if (valueJsonObj.has("nick")) {
chatRoomMember.setNick(valueJsonObj.get("nick").getAsString());
}
if (valueJsonObj.has("avatar")) {
chatRoomMember.setAvatar(valueJsonObj.get("avatar").getAsString());
}
if (valueJsonObj.has("gender")) {
roomQueueInfo.gender = valueJsonObj.get("gender").getAsInt();
}
if (valueJsonObj.has("groupType")) {
roomQueueInfo.groupType = valueJsonObj.get("groupType").getAsInt();
}
roomQueueInfo.mChatRoomMember = chatRoomMember;
}
AvRoomDataManager.get().mMicQueueMemberMap.put(Integer.parseInt(entry.key), roomQueueInfo);
}
}
}
return accounts;
}
/**
* 处理网易云信队列上人员的信息
*/
private Observable<SparseArray<RoomQueueInfo>> dealMicChatRoomMemberFromIMNet(List<String> accounts) {
if (ListUtils.isListEmpty(accounts))
return Observable.just(AvRoomDataManager.get().mMicQueueMemberMap);
return IMNetEaseManager.get().fetchRoomMembersByIds(accounts)
.observeOn(AndroidSchedulers.mainThread())
.flatMap(chatRoomMembers -> {
for (ChatRoomMember chatRoomMember : chatRoomMembers) {
AvRoomDataManager.get().updateQueueChatRoomMemberExtension(chatRoomMember);
}
//accounts不为空则表示出现了本地队列信息和云信队列信息不一致的情况,更新队列信息后更新下相应的坑位信息
//updateMicView();
return Single.just(AvRoomDataManager.get().mMicQueueMemberMap);
}).toObservable();
}
/**
* 上麦
*
@@ -380,6 +461,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
* @param roomId
* @param callBack
*/
@SuppressLint("CheckResult")
public void upAiMicroPhone(final int micPosition, final String uId, final String roomId, final CallBack<String> callBack) {
RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().mMicQueueMemberMap.get(micPosition);
if (roomQueueInfo == null) {
@@ -702,6 +784,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
*/
@GET("/room/get")
Single<RoomResult> getRoomInfo(@Query("uid") String uid, @Query("intoUid") long intoUid);
/**
* @param key
* @return
@@ -712,6 +795,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
/**
* 获取该Uid 所在的房间信息，如果不在房间 返回的房间实体uid==0,或者roomId == 0
*
* @param uid
* @return
*/
@@ -867,6 +951,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
/**
* 关闭公屏
* true是关闭公屏
*
* @param uid -
* @return -
*/
@@ -906,6 +991,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
/**
* 查询是否限制进房
*
* @param uid -
* @return -
*/
@@ -916,6 +1002,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
* 设置聊天室角色，
* 用于拉黑用户
* 设置管理员
*
* @param roomUid -
* @param targetUid -
* @param opt 1: 设置为管理员;2:设置普通等级用户;-1:设为黑名单用户;-2:设为禁言用户
@@ -929,6 +1016,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
/**
* 获取嗨聊房间列表
*
* @param uid
* @return
*/
@@ -937,6 +1025,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
/**
* 获取房间倒计时
*
* @param roomUid 房主Uid
*/
@GET("/activities/draw/getRoomRunawayTime")

6
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java
View File

@@ -502,13 +502,7 @@ public class UserInfo implements Serializable {
this.remainDay = remainDay;
}
public UserLevelVo getUserLevelVo() {
return userLevelVo;
}
public void setUserLevelVo(UserLevelVo userLevelVo) {
this.userLevelVo = userLevelVo;
}
public CarInfo getCarInfo() {
return mCarInfo;

2
core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java
View File

@@ -11,7 +11,7 @@ import com.yizhuan.xchat_android_core.music.db.dao.LocalMusicDao;
import com.yizhuan.xchat_android_core.music.db.dao.SongDao;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = true)
@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = false)
public abstract class AppDataBase extends RoomDatabase {
private static volatile AppDataBase mInstance;