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

Cp升级消息跳转装扮 邀请弹窗文案修改 关系任务界面调整

Browse Source
This commit is contained in:
yitao_hello
2022-02-24 19:25:42 +08:00
parent 6a2524d109
commit 47b2c2950b
36 changed files with 590 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -386,4 +386,11 @@ public class UriProvider {
public static String getVipHelpUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule/introduction-patrician.html");
}
/**
* Cp装扮
*/
public static String getCpDecorationUrl() {
return JAVA_WEB_URL.concat("/yinyou/activity/act-nameplate-cp/index.html");
}
}

26
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java
View File

@@ -1,8 +1,13 @@
package com.yizhuan.xchat_android_core.im.custom.bean;
import android.util.Log;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo;
import com.yizhuan.xchat_android_core.relation.cp.CpInviteMessage;
import lombok.val;
public class CpInviteAttachment extends CustomAttachment {
@@ -13,6 +18,8 @@ public class CpInviteAttachment extends CustomAttachment {
public int mSecond;
private CpInviteInfo entity;
final String TAG = "CpInviteAttachment";
public CpInviteAttachment(int second) {
super(CustomAttachment.CP_INVITE_MESSAGE, second);
}
@@ -21,18 +28,13 @@ public class CpInviteAttachment extends CustomAttachment {
protected void parseData(JSONObject data) {
super.parseData(data);
if (data != null) {
if (data.containsKey("msg")) {
msg = data.getString("msg");
}
if (data.containsKey("routerType")) {
routerType = data.getInteger("routerType");
}
if (data.containsKey("popInfo")) {
entity = new Gson().fromJson(routerValue, CpInviteInfo.class);
}
if (data.containsKey("title")) {
title = data.getString("title");
}
final Gson gson = new Gson();
CpInviteMessage inviteMessage = gson.fromJson(data.toJSONString(), CpInviteMessage.class);
msg = inviteMessage.getMsg();
title = inviteMessage.getTitle();
routerType = inviteMessage.getRouterType();
routerValue = inviteMessage.getPopInfo();
entity = gson.fromJson(routerValue,CpInviteInfo.class);
}
}

36
core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt
View File

@@ -1,18 +1,26 @@
package com.yizhuan.xchat_android_core.relation.cp
data class CpInviteMessage(
val msg: String = "",
val routerType: Int = 0,
val popInfo: String = "",
val title: String = ""
)
data class CpInviteInfo(
val replyExpireTime: String,
val inviteUid: Long,
val inviteAvatar: String,
val inviteNick: String,
val inviteGender: Int,
val acceptUid: Long,
val acceptAvatar: String,
val acceptNick: String,
val acceptGender: Int,
val propsId: Int,
val propsName: String,
val propsImg: String,
val propsPrice: Double,
val recommenTxt: List<String>,
val replyExpireTime: String = "",
val inviteUid: Long = 0,
val inviteAvatar: String = "",
val inviteNick: String = "",
val inviteGender: Int = 0,
val acceptUid: Long = 0,
val acceptAvatar: String = "",
val acceptNick: String = "",
val acceptGender: Int = 0,
val propsId: Int = 0,
val propsName: String = "",
val propsImg: String = "",
val propsPrice: String = "",
val recommenTxtList: List<String>? = null,
val recommenTxt: String = ""
)

23
core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt
View File

@@ -7,16 +7,17 @@ package com.yizhuan.xchat_android_core.relation.cp
*/
data class CpInvitePageEntity(
val acceptAvatar: String?,
val acceptGender: Int,//1-男2-女
val acceptNick: String,
val acceptUid: Long,
val acceptGender: Int=0,//1-男2-女
val acceptNick: String="",
val acceptUid: Long=0,
val inviteAvatar: String?,
val inviteGender: Int,
val inviteNick: String,
val inviteUid: Long,
val propsId: Int,
val propsImg: String,
val propsName: String,
val propsPrice: String,
val recommenTxt:List<String>
val inviteGender: Int=0,
val inviteNick: String="",
val inviteUid: Long=0,
val propsId: Int=0,
val propsImg: String="",
val propsName: String="",
val propsPrice: String="",
val recommenTxtList:List<String>?=null,
val recommenTxt:String=""
)

12
core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt
View File

@@ -7,10 +7,10 @@ package com.yizhuan.xchat_android_core.relation.cp
*/
data class CpMpApplyListEntity(
val applyTime: String?,
val auditType: Int,//0、待审核，1、审核不通过，2、审核通过
val iconPic: String,
val mpId: Int,
val mpName: String,
val mpTxt: String,
val noPassReason: String
val auditType: Int=0,//0、待审核，1、审核不通过，2、审核通过
val iconPic: String="",
val mpId: Int=0,
val mpName: String="",
val mpTxt: String="",
val noPassReason: String=""
)

30
core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt
View File

@@ -4,23 +4,23 @@ data class CpRelation(
/**
*
*/
val cpId: Long,// cp记录id
val cpId: Long = 0,// cp记录id
//邀请人
val uid: Long,//邀请人uid
val nick: String,//邀请人
val gender: Int,//1-男2-女 //邀请人
val avatar: String,//邀请人
val uid: Long = 0,//邀请人uid
val nick: String = "",//邀请人
val gender: Int = 0,//1-男2-女 //邀请人
val avatar: String = "",//邀请人
//被邀请人
val cpUid: Long,//
val cpNick: String,
val cpGender: Int,
val cpAvatar: String,
val cpUid: Long = 0,//
val cpNick: String = "",
val cpGender: Int = 0,
val cpAvatar: String = "",
var cpLevel: Int,
val declaration: String,//cp关系誓言
val cpKeepDuration: String,
val cpBackImg: String,
val waitUnbound: Boolean,//CP状态 true 解绑中
val unboundUid: Long//解绑发起人UID
var cpLevel: Int = 0,
val declaration: String = "",//cp关系誓言
val cpKeepDuration: String = "",
val cpBackImg: String = "",
val waitUnbound: Boolean = false,//CP状态 true 解绑中
val unboundUid: Long = 0//解绑发起人UID
)

52
core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt
View File

@@ -1,33 +1,33 @@
package com.yizhuan.xchat_android_core.relation.cp
data class CpTaskEntity(
val avatar: String?,
val cpAvatar: String?,
val cpBackImg: String?,
val cpGender: Int,
val cpKeepDuration: String,
val cpLevel: Int,
val cpNextLevelSecretVal: Int,//cp下一等级所需亲密值
val cpNick: String,
val cpSecretVal: Int,//cp亲密值
val cpUid: Long,
val dailyTask: List<Task>,//日任务列表
val declaration: String,//cp关系誓言
val gender: Int,//1-男2-女
val isDamp: Boolean,//是否衰减标志：true-是，false-否
val levelPercent: String,//cp当前等级到下一等级亲密值百分比(0~1间的小数)
val nick: String,
val totalTask: List<Task>,// 累计任务列表
val uid: Long,
val waitUnbound:Boolean,//CP状态 true 解绑中
val unBoundUid:Long//解绑发起人UID
val avatar: String = "",
val cpAvatar: String = "",
val cpBackImg: String = "",
val cpGender: Int = 0,
val cpKeepDuration: String = "",
val cpLevel: Int = 0,
val cpNextLevelSecretVal: Int = 0,//cp下一等级所需亲密值
val cpNick: String = "",
val cpSecretVal: Int = 0,//cp亲密值
val cpUid: Long = 0,
val dailyTask: List<Task>? = null,//日任务列表
val declaration: String = "",//cp关系誓言
val gender: Int = 0,//1-男2-女
val isDamp: Boolean = false,//是否衰减标志：true-是，false-否
val levelPercent: String = "",//cp当前等级到下一等级亲密值百分比(0~1间的小数)
val nick: String = "",
val totalTask: List<Task>? = null,// 累计任务列表
val uid: Long = 0,
val waitUnbound: Boolean = false,//CP状态 true 解绑中
val unBoundUid: Long = 0//解绑发起人UID
)
data class Task(
val currentVal: Int,//当前值
val isComplete: Boolean,
val taskDesc: String,
val taskNeedVal: Int,//任务所需值
val taskSecretDesc: String,//任务亲密值描述
val taskType: Int//任务类型：1-私聊，2-同一房间时长，3-送礼，4-陪伴
val currentVal: Int = 0,//当前值
val isComplete: Boolean = false,
val taskDesc: String = "",
val taskNeedVal: Int = 0,//任务所需值
val taskSecretDesc: String = "",//任务亲密值描述
val taskType: Int = 0//任务类型：1-私聊，2-同一房间时长，3-送礼，4-陪伴
)

12
core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt
View File

@@ -1,13 +1,13 @@
package com.yizhuan.xchat_android_core.relation.cp
data class UserCpLevelMpRootEntity(
val haveCp: Boolean,
val mpDtoList: List<UserCpLevelMpEntity>
val haveCp: Boolean = false,
val mpDtoList: List<UserCpLevelMpEntity>? = null
)
data class UserCpLevelMpEntity(
val iconPic: String,
val isHave: Boolean,//是否已经申请过：true-是，false-否
val mpId: Int,
val mpName: String
val iconPic: String = "",
val isHave: Boolean = false,//是否已经申请过：true-是，false-否
val mpId: Int = 0,
val mpName: String = ""
)

38
core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt
View File

@@ -1,23 +1,23 @@
package com.yizhuan.xchat_android_core.relation.cp
data class UserCpListEntity(
val acceptUid: Long,
val acceptUserAvatar: String?,
val acceptUserNick: String,
val acceptUserSex: Int,//1-男 2女
val createTime: String,
val declaration: String,//关系誓言
val id: Int,//邀请记录id
val inviteUid: Long,//邀请人uid
val inviteUserAvatar: String?,//邀请方头像
val inviteUserNick: String,
val inviteUserSex: Int,
val levelSeq: Int,//CP等级
val propsId: Int,
val propsImg: String,
val propsName: String,
val propsPrice: String,
val state: Int,//状态：1-邀请中，2-CP中，3-拒绝，4-解绑中，5-解绑完成
val unboundUid: Int,//解绑人
val updateTime: String
val acceptUid: Long = 0,
val acceptUserAvatar: String = "",
val acceptUserNick: String = "",
val acceptUserSex: Int = 0,//1-男 2女
val createTime: String = "",
val declaration: String = "",//关系誓言
val id: Int = 0,//邀请记录id
val inviteUid: Long = 0,//邀请人uid
val inviteUserAvatar: String = "",//邀请方头像
val inviteUserNick: String = "",
val inviteUserSex: Int = 0,
val levelSeq: Int = 0,//CP等级
val propsId: Int = 0,
val propsImg: String = "",
val propsName: String = "",
val propsPrice: String = "",
val state: Int = 0,//状态：1-邀请中，2-CP中，3-拒绝，4-解绑中，5-解绑完成
val unboundUid: Int = 0,//解绑人
val updateTime: String = ""
)