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

新增首页新用户打招呼弹窗

Browse Source
This commit is contained in:
huangjian
2022-06-02 18:44:37 +08:00
parent cd90bdb3aa
commit 96539bcb9b
16 changed files with 315 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java
View File

@@ -56,7 +56,7 @@ public class GameHomeModel extends BaseModel {
return api.apiRoomShortcut(String.valueOf(AuthModel.get().getCurrentUid()),
CommunityConstant.VERSION_VALID_TYPE,
AuthModel.get().getTicket())
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleStringData())
.compose(RxHelper.handleSchedulers());
}

13
core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/NewUserHelloInfo.kt Normal file
View File

@@ -0,0 +1,13 @@
package com.yizhuan.xchat_android_core.channel_page.bean
import java.io.Serializable
data class NewUserHelloInfo(
val roomUid: Long = 0L,
val sayHello: Boolean = false,
val sayHelloMsg: String = "",
val sayHelloUserUid: Long = 0L,
val sayHelloUserAvatar: String = "",
val sayHelloUserErbanNo: Int = 0,
val sayHelloUserNickname: String = ""
) : Serializable

14
core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/ChannelPageModel.java
View File

@@ -3,6 +3,7 @@ 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.NewUserHelloInfo;
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;
@@ -66,6 +67,13 @@ public class ChannelPageModel extends BaseModel implements IChannelPageModel {
.compose(RxHelper.handleSchAndExce());
}
@Override
public Single<NewUserHelloInfo> checkNewUserInRoom() {
return api.checkNewUserInRoom()
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchAndExce());
}
/**
*
*/
@@ -130,6 +138,12 @@ public class ChannelPageModel extends BaseModel implements IChannelPageModel {
@GET("/user/v2/checkInviteUserInRoom")
Single<ServiceResult<InviteUserInfo>> checkInviteUserInRoom(@Query("inviteCode") String inviteCode);
/**
* 新用户推荐房间弹窗
*/
@GET("/newUserStart/indexSayHello")
Single<ServiceResult<NewUserHelloInfo>> checkNewUserInRoom();
/**
* 字节跳动推广接口
*/

3
core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/IChannelPageModel.java
View File

@@ -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.NewUserHelloInfo;
import com.yizhuan.xchat_android_core.user.bean.InviteUserInfo;
import io.reactivex.Single;
@@ -15,6 +16,8 @@ public interface IChannelPageModel {
Single<InviteUserInfo> checkInviteUserInRoom(String inviteCode);
Single<NewUserHelloInfo> checkNewUserInRoom();
void checkAd();
void checkByteDanceAd(String evenType);