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

Merge branch 'yinyou_v5.6.0' into yinyou_develop

Browse Source 
# Conflicts:
#	core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java
This commit is contained in:
huangjian
2022-12-28 15:06:46 +08:00
parent 372fc2911d 551dd1bc2f
commit 5deefcc209
41 changed files with 554 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java
View File

@@ -24,6 +24,7 @@ import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.hjq.toast.ToastUtils;
import com.mango.core.im.custom.bean.WishListAttachment;
import com.mango.core.room.anotherroompk.ShowPkMatchEvent;
import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
import com.netease.nim.uikit.common.antispam.AntiSpamEvent;
import com.netease.nim.uikit.common.util.AntiSpamUtil;
@@ -1283,6 +1284,10 @@ public final class IMNetEaseManager {
case CUSTOM_MSG_SUB_ROOM_PK_UPDATE:
case CUSTOM_MSG_SUB_SINGLE_ROOM_PK_UPDATE:
AvRoomDataManager.get().roomPkLiveData.postValue(roomPkBean);
if (AvRoomDataManager.get().getPkMatchStartTime() != 0) {
AvRoomDataManager.get().setPkMatchStartTime(0);
EventBus.getDefault().post(new ShowPkMatchEvent(0));
}
break;
case CUSTOM_MSG_SUB_ROOM_PK_FINISH:
noticeRoomEvent(msg, RoomEvent.ROOM_PK_FINISH);
@@ -1312,6 +1317,10 @@ public final class IMNetEaseManager {
case CUSTOM_MSG_SUB_SINGLE_ROOM_PK_MATCH_TIMEOUT:
if (AvRoomDataManager.get().isRoomOwner()) {
noticeRoomEvent(msg, RoomEvent.ROOM_PK_TIMEOUT);
if (AvRoomDataManager.get().getPkMatchStartTime() != 0) {
AvRoomDataManager.get().setPkMatchStartTime(0);
EventBus.getDefault().post(new ShowPkMatchEvent(0));
}
}
break;
case CUSTOM_MSG_SUB_SINGLE_ROOM_PK_MUTE_MIC:

2
core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java
View File

@@ -271,7 +271,7 @@ public class XChatConstants {
/**
* Referer (RELEASE)
*/
public static final String KEY_REFERER_RELEASE = "https://yinyou.api.shengxuanwangluo.com/";
public static final String KEY_REFERER_RELEASE = "https://api.lecheng163.com/";
public static final String APP_MARK = "yinbao";
/**
* 聊天室文本消息易盾反垃圾业务id

2
core/src/main/java/com/mango/core/room/bean/RoomInfo.java
View File

@@ -144,7 +144,7 @@ public class RoomInfo implements Parcelable,Serializable {
private long pkBeginTime;
/**
* 个播匹配结束时间
* 个播匹配开始时间
*/
private long pkMatchStartTime;

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

@@ -832,7 +832,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
* @return
*/
@GET("/every/one/search/getRoomList")
Single<ServiceResult<List<SearchRoomInfo>>> commonSearch(@Query("id") String id);
Single<ServiceResult<List<SearchRoomInfo>>> commonSearch(@Query("wordId") String id);
/**
* 获取该Uid 所在的房间信息，如果不在房间 返回的房间实体uid==0,或者roomId == 0

9
core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java
View File

@@ -426,6 +426,15 @@ public interface StatisticsProtocol {
String EVENT_WISHLIST_PANEL_CLICK = "wishlist_panel_click";//礼物心愿面板赠送点击
String EVENT_WISHLIST_PANEL_CLOSE_CLICK = "wishlist_panel_close_click";//礼物心愿面板关闭点击
String EVENT_SAYHI_POP_SHOW = "sayhi_pop_show";//打招呼弹窗曝光 统计弹窗主播的id
String EVENT_SAYHI_POP_FIND_CLICK = "sayhi_pop_find_click";//打招呼弹窗去找TA点击 统计进房房间的id
String EVENT_SAYHI_POP_VOICE_CLICK = "sayhi_pop_voice_click";//打招呼弹窗播放声音秀点击
String EVENT_ALLINSEARCH_ENTRY_CLICK = "allinsearch_entry_click";//词条点击 统计点击时对应词条的名称
String EVENT_ALLINSEARCH_ENTRY_ROOM_CLICK = "allinsearch_entry_room_click";//词条搜索结果相关房间点击 统计点击时对应房间的名称
String EVENT_SEARCH_INPUT_CLICK = "search_input_click";//搜索框点击 统计用户输入搜索框并搜索的内容
String EVENT_SEARCH_INTERCEPT_POP_SHOW = "search_intercept_pop_show";//搜索劫持结果弹窗曝光 统计弹窗奖励内容的名称
String EVENT_SEARCH_INTERCEPT_POP_CLICK = "search_intercept_pop_click";//搜索劫持结果弹窗关闭
String EVENT_GRADE_PROFIT_POP_CLICK = "grade_profit_pop_click";//主播评级入口点击
String EVENT_GRADE_PROFIT_POP_SHOW = "grade_profit_pop_show";//主播评级入口曝光
String EVENT_GRADE_PROFIT_CLOSE_CLICK = "grade_profit_close_click";//主播评级弹窗关闭点击

1
core/src/model_channel_page/java/com/mango/core/channel_page/bean/NewUserHelloInfo.kt
View File

@@ -11,5 +11,6 @@ data class NewUserHelloInfo(
val sayHelloUserAvatar: String = "",
val sayHelloUserErbanNo: Int = 0,
val sayHelloUserNickname: String = "",
val gender: Int = 0,
val voiceCard: UserInfoSkillEntity? = null
) : Serializable