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

新增赛事详情页交友弹窗

Browse Source
This commit is contained in:
huangjian
2021-10-28 15:54:21 +08:00
parent f4fbcea34b
commit 700f020db2
11 changed files with 178 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
View File

@@ -1705,18 +1705,6 @@ public final class IMNetEaseManager {
if (curRoomInfo != null) {
long uid = AuthModel.get().getCurrentUid();
model.userRoomIn(String.valueOf(uid), curRoomInfo.getUid())
.subscribe(new BiConsumer<ServiceResult<RoomInfo>, Throwable>() {
@Override
public void accept(ServiceResult<RoomInfo> stringServiceResult,
Throwable throwable) throws Exception {
if (throwable != null) {
LogUtil.e(TAG, "userroomin", throwable);
} else
EventBus.getDefault().post(new AudioPartyOpenEvent());
}
});
if (curRoomInfo.getUid() == uid) {
StatisticManager.Instance().onEventStart(BasicConfig.INSTANCE.getAppContext(),
StatisticsProtocol.Event.EVENT_OPENROOM, "开房");

4
core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java
View File

@@ -427,9 +427,9 @@ public class AvRoomModel extends RoomBaseModel implements IAvRoomModel {
}
@Override
public Single<ServiceResult<RoomInfo>> userRoomIn(String uid, long roomUid) {
public Single<ServiceResult<RoomInfo>> userRoomIn(String uid, long roomUid,int behaveType,String inviteUid) {
return mRoomService.userRoomInV2(uid, AuthModel.get().getTicket(),
String.valueOf(roomUid))
String.valueOf(roomUid),behaveType,inviteUid)
.subscribeOn(Schedulers.io())
.unsubscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());

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

@@ -80,13 +80,11 @@ import retrofit2.http.Query;
*/
public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
public static final int CODE_UPDATE_MIC = 110;
/**
* 一页房间人数
*/
protected static final int ROOM_MEMBER_SIZE = 50;
public static final int CODE_UPDATE_MIC = 110;
protected final Api mRoomService;
private Gson gson = new Gson();
@@ -835,7 +833,9 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
@POST("userroom/inV2")
Single<ServiceResult<RoomInfo>> userRoomInV2(@Field("uid") String uid,
@Field("ticket") String ticket,
@Field("roomUid") String roomUid);
@Field("roomUid") String roomUid,
@Field("behaveType") int behaveType,
@Field("inviteUid") String inviteUid);
/**
* 退出房间

32
core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java
View File

@@ -29,40 +29,41 @@ public interface IAvRoomModel extends IModel {
* @param retryCount 重试次数
* @return
*/
Observable<EnterChatRoomResultData> enterRoom(final long roomId, final int retryCount,final int fromType, final String fromNick, final String fromUid);
Observable<EnterChatRoomResultData> enterRoom(final long roomId, final int retryCount, final int fromType, final String fromNick, final String fromUid);
/** 离开聊天室（退出房间） */
/**
* 离开聊天室（退出房间）
*/
void quitRoom(String roomId);
/** 退出房间 */
/**
* 退出房间
*/
void exitRoom(CallBack<RoomInfo> callBack);
/**
* 通知服务端房间退出
*
*/
void quitRoomForOurService(CallBack<String> callBack);
/**
* 通知服务端房间退出
*
*/
void quitRoomForOurService(long roomUid, CallBack<String> callBack);
/**
* 告知服务端用户退出房间（贵族清除需要）
*
*/
Observable<ServiceResult<String>> quitUserRoom();
/**
* 告知服务端用户退出房间（贵族清除需要）
*
*/
Observable<String> quitUserRoomV2();
/**
* 从我们的服务器中获取房间信息
*
* @param uid
* @param callBack
*/
@@ -70,23 +71,26 @@ public interface IAvRoomModel extends IModel {
Single<RoomInfo> requestRoomInfo(String uid);
/** 获取活动信息 */
/**
* 获取活动信息
*/
void getActionDialog(int type, CallBack<List<BannerInfo>> callBack);
/**
* 告知服务端用户进入房间(后端统计需要)
*
* @param uid
* @param roomUid
* @return
*/
Single<ServiceResult<RoomInfo>> userRoomIn(String uid, long roomUid);
Single<ServiceResult<RoomInfo>> userRoomIn(String uid, long roomUid, int behaveType, String inviteUid);
void getNormalChatMember(String roomId, final long currentUid);
/**
* 搜索房间
*/
Single<ServiceResult<List<SearchRoomInfo>>> roomSearch(String key,int type);
Single<ServiceResult<List<SearchRoomInfo>>> roomSearch(String key, int type);
/**
* 获取某个用户的房间信息
@@ -95,6 +99,7 @@ public interface IAvRoomModel extends IModel {
/**
* 判断用户是否限制进房
*
* @return -
*/
Single<ServiceResult<JsonElement>> getLimitRoomInfo();
@@ -108,19 +113,22 @@ public interface IAvRoomModel extends IModel {
/**
* 通过服务器接口拉黑
*
* @param targetUid 被拉黑的uid
*/
Single<String> markBlack(long targetUid);
/**
* 通过服务器接口设置为管理员
*
* @param targetUid 被拉黑的uid
* @param isSet true 设置管理, false 取消管理
* @param isSet true 设置管理, false 取消管理
*/
Single<String> markManager(long targetUid,boolean isSet);
Single<String> markManager(long targetUid, boolean isSet);
/**
* 通过服务器接口移除拉黑
*
* @param targetUid 被拉黑的uid
*/
Single<String> removeBlack(long targetUid);