moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BugFix]优化BaseDialog判空，周星榜ui调整，夺宝精灵闪退修复

Browse Source
This commit is contained in:
wushaocheng
2023-07-24 16:36:56 +08:00
parent 144fa832f1
commit e014e6a6b2
63 changed files with 486 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfo.kt
View File

@@ -1,48 +0,0 @@
package com.yizhuan.xchat_android_core.treasurefairy
data class FairyMsgInfo(
/**
* uid
*/
val uid: Long = 0L,
/**
* 昵称
*/
val nick: String = "",
/**
* 所在房间uid
*/
val roomUid: Long = 0L,
/**
* 奖励类型
*/
val rewardType: String = "",
/**
* 奖励名称
*/
val rewardName: String = "",
/**
* 奖励等级
*/
val rewardLevel: Int = 0,
/**
* 奖励数量
*/
val rewardNum: Int = 0,
/**
* 限制等级
*/
val userLevelLimit: Int = 0,
/**
* 展示价值
*/
val rewardShowValue: Int = 0
)

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairyMsgInfoBean.java → core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfoBean.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.xchat_android_core.im.custom.bean;
package com.yizhuan.xchat_android_core.treasurefairy;
import lombok.Data;

10
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairyMsgAttachment.java
View File

@@ -2,14 +2,14 @@ package com.yizhuan.xchat_android_core.im.custom.bean;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfo;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
/**
* Created by chenran on 2017/10/4.
*/
public class FairyMsgAttachment extends CustomAttachment {
private FairyMsgInfo fairyMsgInfo;
private FairyMsgInfoBean fairyMsgInfo;
public FairyMsgAttachment(int first, int second) {
super(first, second);
@@ -17,14 +17,14 @@ public class FairyMsgAttachment extends CustomAttachment {
@Override
protected void parseData(JSONObject jsonObject) {
fairyMsgInfo = new Gson().fromJson(jsonObject.toJSONString(), FairyMsgInfo.class);
fairyMsgInfo = new Gson().fromJson(jsonObject.toJSONString(), FairyMsgInfoBean.class);
}
public FairyMsgInfo getFairyMsgInfo() {
public FairyMsgInfoBean getFairyMsgInfo() {
return fairyMsgInfo;
}
public void setFairyMsgInfo(FairyMsgInfo fairyMsgInfo) {
public void setFairyMsgInfo(FairyMsgInfoBean fairyMsgInfo) {
this.fairyMsgInfo = fairyMsgInfo;
}

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/PlayEffectInfo.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.im.custom.bean;
import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfo;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
import lombok.Data;