新增房间新用户打招呼弹窗
This commit is contained in:
@@ -41,6 +41,7 @@ public class UserInfo implements Serializable {
|
||||
public static final transient int GENDER_MALE = 1;
|
||||
public static final transient int GENDER_FEMALE = 2;
|
||||
public static String IS_NEW_USER = "newUser";
|
||||
public static String IS_FROM_SAY_HELLO_CHANNEL = "fromSayHelloChannel";
|
||||
public static String GENDER = "gender";
|
||||
public static String IS_OFFICIAL = "official";
|
||||
public static String DEF_USER = "defUser";
|
||||
@@ -252,6 +253,9 @@ public class UserInfo implements Serializable {
|
||||
private boolean newUser;
|
||||
@Getter
|
||||
@Setter
|
||||
private boolean fromSayHelloChannel;
|
||||
@Getter
|
||||
@Setter
|
||||
private LiveTagInfo userInfoSkillVo;
|
||||
|
||||
@Getter
|
||||
@@ -581,6 +585,7 @@ public class UserInfo implements Serializable {
|
||||
map.put(GENDER, userInfo.getGender());
|
||||
map.put(IS_OFFICIAL, userInfo.getDefUser() == USER_TYPE_OFFICIAL);
|
||||
map.put(IS_NEW_USER, isNewUser());
|
||||
map.put(IS_FROM_SAY_HELLO_CHANNEL, isFromSayHelloChannel());
|
||||
map.put(DEF_USER, userInfo.getDefUser());
|
||||
map.put(HAS_PRETTY, userInfo.isHasPrettyErbanNo());
|
||||
|
||||
|
@@ -0,0 +1,9 @@
|
||||
package com.yizhuan.xchat_android_core.channel_page.bean
|
||||
|
||||
import java.io.Serializable
|
||||
|
||||
data class HelloMessageInfo(
|
||||
val roomPopup: Boolean = false,
|
||||
val sayHelloUserAvatarList: List<String>? = null,
|
||||
val sayHelloUserNum: Int = 0,
|
||||
) : Serializable
|
@@ -3,7 +3,9 @@ package com.yizhuan.xchat_android_core.channel_page.model;
|
||||
import com.yizhuan.xchat_android_core.base.BaseModel;
|
||||
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
|
||||
import com.yizhuan.xchat_android_core.channel_page.bean.ChannelPageInfo;
|
||||
import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo;
|
||||
import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo;
|
||||
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
|
||||
import com.yizhuan.xchat_android_core.user.bean.InviteUserInfo;
|
||||
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
|
||||
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
|
||||
@@ -74,6 +76,13 @@ public class ChannelPageModel extends BaseModel implements IChannelPageModel {
|
||||
.compose(RxHelper.handleSchAndExce());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Single<HelloMessageInfo> checkHelloMessage() {
|
||||
return api.checkHelloMessage(AvRoomDataManager.get().getRoomUid())
|
||||
.compose(RxHelper.handleBeanData())
|
||||
.compose(RxHelper.handleSchAndExce());
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@@ -144,6 +153,12 @@ public class ChannelPageModel extends BaseModel implements IChannelPageModel {
|
||||
@GET("/newUserStart/indexSayHello")
|
||||
Single<ServiceResult<NewUserHelloInfo>> checkNewUserInRoom();
|
||||
|
||||
/**
|
||||
* 新用户推荐房间进入房间后收到消息提示弹窗
|
||||
*/
|
||||
@GET("/newUserStart/roomSayHello")
|
||||
Single<ServiceResult<HelloMessageInfo>> checkHelloMessage(@Query("roomUid") Long roomUid);
|
||||
|
||||
/**
|
||||
* 字节跳动推广接口
|
||||
*/
|
||||
|
@@ -1,6 +1,7 @@
|
||||
package com.yizhuan.xchat_android_core.channel_page.model;
|
||||
|
||||
import com.yizhuan.xchat_android_core.channel_page.bean.ChannelPageInfo;
|
||||
import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo;
|
||||
import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo;
|
||||
import com.yizhuan.xchat_android_core.user.bean.InviteUserInfo;
|
||||
|
||||
@@ -18,6 +19,8 @@ public interface IChannelPageModel {
|
||||
|
||||
Single<NewUserHelloInfo> checkNewUserInRoom();
|
||||
|
||||
Single<HelloMessageInfo> checkHelloMessage();
|
||||
|
||||
void checkAd();
|
||||
|
||||
void checkByteDanceAd(String evenType);
|
||||
|
Reference in New Issue
Block a user