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

搜索功能改造

Browse Source
This commit is contained in:
memory
2022-11-30 15:27:50 +08:00
parent dbf1673a6a
commit 361fd84b0a
12 changed files with 612 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/com/mango/core/room/bean/SearchHijackInfo.java Normal file
View File

@@ -0,0 +1,20 @@
package com.mango.core.room.bean;
import java.io.Serializable;
import lombok.Data;
@Data
public class SearchHijackInfo {
private String roomUid;
private AwardInfo awardVo;
@Data
public static class AwardInfo implements Serializable {
private String awardType;
private String awardName;
private String awardUrl;
}
}

12
core/src/main/java/com/mango/core/room/bean/SearchKeyInfo.java Normal file
View File

@@ -0,0 +1,12 @@
package com.mango.core.room.bean;
import lombok.Data;
@Data
public class SearchKeyInfo {
private String id;
private String word;
}

20
core/src/main/java/com/mango/core/room/model/AvRoomModel.java
View File

@@ -5,6 +5,8 @@ import android.text.TextUtils;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.mango.core.room.bean.SearchHijackInfo;
import com.mango.core.room.bean.SearchKeyInfo;
import com.netease.nimlib.sdk.AbortableFuture;
import com.netease.nimlib.sdk.NIMChatRoomSDK;
import com.netease.nimlib.sdk.NIMClient;
@@ -475,6 +477,24 @@ public class AvRoomModel extends RoomBaseModel implements IAvRoomModel {
.compose(RxHelper.handleSchedulers());
}
@Override
public Single<SearchHijackInfo> hijackSearch(String key) {
return mRoomService.hijackSearch(key)
.compose(RxHelper.handleCommon());
}
@Override
public Single<List<SearchKeyInfo>> getCommonSearchList() {
return mRoomService.getCommonSearchList()
.compose(RxHelper.handleCommon());
}
@Override
public Single<List<SearchRoomInfo>> commonSearch(String id) {
return mRoomService.commonSearch(id)
.compose(RxHelper.handleCommon());
}
@Override
public Single<RoomResult> getUserRoom(long uid) {
return mRoomService.getUserRoom(String.valueOf(uid))

65
core/src/main/java/com/mango/core/room/model/RoomBaseModel.java
View File

@@ -9,6 +9,8 @@ import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.mango.core.room.bean.SearchHijackInfo;
import com.mango.core.room.bean.SearchKeyInfo;
import com.netease.nimlib.sdk.NIMChatRoomSDK;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
@@ -813,6 +815,25 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
@GET("/search/room")
Single<ServiceResult<List<SearchRoomInfo>>> roomSearch(@Query("key") String key);
/**
* @return
*/
@GET("/search/hijack/get")
Single<ServiceResult<SearchHijackInfo>> hijackSearch(@Query("key") String key);
/**
* @return
*/
@GET("/every/one/search/getList")
Single<ServiceResult<List<SearchKeyInfo>>> getCommonSearchList();
/**
* @param id
* @return
*/
@GET("/every/one/search/getRoomList")
Single<ServiceResult<List<SearchRoomInfo>>> commonSearch(@Query("id") String id);
/**
* 获取该Uid 所在的房间信息，如果不在房间 返回的房间实体uid==0,或者roomId == 0
*
@@ -822,27 +843,6 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
@GET("/userroom/get")
Single<RoomResult> getUserRoom(@Query("uid") String uid);
/**
* 房间标签列表
*
* @param ticket
* @return
*/
@POST("/room/tag/all")
Single<ServiceResult<List<RoomSettingTabInfo>>> getRoomTagList(@Query("ticket") String ticket);
/**
* @param uid
* @param ticket
* @param roomUid
* @return
*/
@POST("/userroom/in")
Single<ServiceResult> userRoomIn(@Query("uid") String uid,
@Query("ticket") String ticket,
@Query("roomUid") String roomUid);
/**
* @param uid
* @param ticket
@@ -947,29 +947,6 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
@Field("hasAnimationEffect") boolean hasAnimationEffect,
@Field("audioQuality") int audioQuality);
/**
* 更新房间设置信息
*
* @param title
* @param desc
* @param pwd
* @param label 标签名字
* @param tagId 标签id
* @param uid 用户id
* @param ticket
*/
@FormUrlEncoded
@POST("room/updateByAdmin")
Single<ServiceResult<RoomInfo>> updateByAdmin(@Field("roomUid") long roomUid,
@Field("title") String title,
@Field("roomDesc") String desc,
@Field("roomPwd") String pwd,
@Field("roomTag") String label,
@Field("tagId") int tagId,
@Field("uid") long uid,
@Field("ticket") String ticket,
@Field("hasAnimationEffect") boolean hasAnimationEffect,
@Field("audioQuality") int audioQuality);
/**
* 关闭公屏

8
core/src/main/java/com/mango/core/room/model/inteface/IAvRoomModel.java
View File

@@ -1,6 +1,8 @@
package com.mango.core.room.model.inteface;
import com.google.gson.JsonElement;
import com.mango.core.room.bean.SearchHijackInfo;
import com.mango.core.room.bean.SearchKeyInfo;
import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData;
import com.mango.core.base.IModel;
import com.mango.core.bean.response.ServiceResult;
@@ -90,6 +92,12 @@ public interface IAvRoomModel extends IModel {
*/
Single<ServiceResult<List<SearchRoomInfo>>> roomSearch(String key, int type);
Single<SearchHijackInfo> hijackSearch(String key);
Single<List<SearchKeyInfo>> getCommonSearchList();
Single<List<SearchRoomInfo>> commonSearch(String id);
/**
* 获取某个用户的房间信息
*/