diff --git a/app/src/module_community/java/com/chwl/app/community/holder/DynamicSysHolder.java b/app/src/module_community/java/com/chwl/app/community/holder/DynamicSysHolder.java index 65cdfdc6a..b9e9be250 100644 --- a/app/src/module_community/java/com/chwl/app/community/holder/DynamicSysHolder.java +++ b/app/src/module_community/java/com/chwl/app/community/holder/DynamicSysHolder.java @@ -63,8 +63,7 @@ public class DynamicSysHolder extends MsgViewHolderBase { String layout = erbanSysMsgInfo.getLayout(); ErbanSysMsgLayout erbanSysMsgLayout; try { -// erbanSysMsgLayout = JSON.parseObject(layout, ErbanSysMsgLayout.class); - erbanSysMsgLayout = JsonUtils.fromJson(layout, ErbanSysMsgLayout.class); + erbanSysMsgLayout = JSON.parseObject(layout, ErbanSysMsgLayout.class); } catch (Exception ex) { // json解析出错 ex.printStackTrace(); diff --git a/core/src/main/java/com/chwl/core/im/custom/bean/SysMsgAttachment.java b/core/src/main/java/com/chwl/core/im/custom/bean/SysMsgAttachment.java index a082b960d..ed90a0178 100644 --- a/core/src/main/java/com/chwl/core/im/custom/bean/SysMsgAttachment.java +++ b/core/src/main/java/com/chwl/core/im/custom/bean/SysMsgAttachment.java @@ -1,5 +1,7 @@ package com.chwl.core.im.custom.bean; +import androidx.annotation.Keep; + import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.chwl.core.msg.sys.bean.ErbanSysMsgInfo; @@ -10,6 +12,7 @@ import lombok.EqualsAndHashCode; /** * Created by MadisonRong on 17/06/2018. */ +@Keep @EqualsAndHashCode(callSuper = true) @Data public class SysMsgAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgLayout.java b/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgLayout.java index ea6697cd3..ce86665ad 100644 --- a/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgLayout.java +++ b/core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgLayout.java @@ -1,5 +1,7 @@ package com.chwl.core.msg.sys; +import androidx.annotation.Keep; + import com.chwl.core.msg.sys.bean.ErbanSysMsgComponent; import java.util.List; @@ -9,6 +11,7 @@ import lombok.Data; /** * Created by MadisonRong on 21/06/2018. */ +@Keep @Data public class ErbanSysMsgLayout { private ErbanSysMsgComponent title; diff --git a/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgComponent.java b/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgComponent.java index d595fc26f..9c44dc56a 100644 --- a/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgComponent.java +++ b/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgComponent.java @@ -1,10 +1,13 @@ package com.chwl.core.msg.sys.bean; +import androidx.annotation.Keep; + import lombok.Data; /** * Created by MadisonRong on 21/06/2018. */ +@Keep @Data public class ErbanSysMsgComponent { private String content; diff --git a/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgInfo.java b/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgInfo.java index d97333a38..a8e2bd69e 100644 --- a/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgInfo.java +++ b/core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgInfo.java @@ -1,5 +1,7 @@ package com.chwl.core.msg.sys.bean; +import androidx.annotation.Keep; + import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -12,6 +14,7 @@ import lombok.Data; /** * Created by MadisonRong on 21/06/2018. */ +@Keep @Data public class ErbanSysMsgInfo implements Serializable{ diff --git a/core/src/model_community/java/com/chwl/core/community/bean/DynamicMedia.java b/core/src/model_community/java/com/chwl/core/community/bean/DynamicMedia.java index cdf9cd709..c5aa40056 100644 --- a/core/src/model_community/java/com/chwl/core/community/bean/DynamicMedia.java +++ b/core/src/model_community/java/com/chwl/core/community/bean/DynamicMedia.java @@ -2,12 +2,15 @@ package com.chwl.core.community.bean; import android.text.TextUtils; +import androidx.annotation.Keep; + import kotlin.jvm.Transient; import lombok.Data; /** * create by lvzebiao @2019/11/21 */ +@Keep @Data public class DynamicMedia { diff --git a/core/src/model_community/java/com/chwl/core/community/bean/WorldDynamicBean.java b/core/src/model_community/java/com/chwl/core/community/bean/WorldDynamicBean.java index ee5ae7aa8..a51288266 100644 --- a/core/src/model_community/java/com/chwl/core/community/bean/WorldDynamicBean.java +++ b/core/src/model_community/java/com/chwl/core/community/bean/WorldDynamicBean.java @@ -3,6 +3,8 @@ package com.chwl.core.community.bean; import android.text.TextUtils; +import androidx.annotation.Keep; + import com.chwl.core.user.bean.BaseUserInfo; import java.io.Serializable; @@ -15,6 +17,7 @@ import lombok.Setter; /** * create by lvzebiao @2019/11/13 */ +@Keep @Setter @Getter public class WorldDynamicBean extends BaseUserInfo implements Serializable {