修改LomBok的配置信息

app/build.gradle

@@ -195,7 +195,7 @@ android {
 
 }
 
-def Lombok = "1.18.18"
+def Lombok = "1.18.24"
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])

app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt

@@ -91,7 +91,7 @@ class NewUserChargeGiftDialog : BaseViewBindingActivity<DialogNewUserChargeGiftB
         PayModel.get().newUserChargeInfo
             .compose(bindToLifecycle())
             .subscribe({
-                initData(it.limitFirstChargeTaskList)
+                it.limitFirstChargeTaskList?.let { it1 -> initData(it1) }
                 initNewUserCharge(it.limitEndTime)
                 dialogManager.dismissDialog()
             }, {
@@ -126,7 +126,7 @@ class NewUserChargeGiftDialog : BaseViewBindingActivity<DialogNewUserChargeGiftB
         var initChecked = false
         planViews.forEachIndexed { index, button ->
             goodsList.getOrNull(index)?.let {
-                if (!it.isFinishCharge && !initChecked) {
+                if (!it.finishCharge && !initChecked) {
                     initChecked = true
                     button.isChecked = true
                 }
@@ -167,7 +167,7 @@ class NewUserChargeGiftDialog : BaseViewBindingActivity<DialogNewUserChargeGiftB
         firstChargeGoods?.let {
             currGoods = it
             binding.tvTitle.text = it.chargeProdTitle
-            binding.tvCharge.isEnabled = !it.isFinishCharge
+            binding.tvCharge.isEnabled = !it.finishCharge
             rewardAdapter.setNewData(it.firstChargeRewardList)
         }
     }

app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java

@@ -116,7 +116,7 @@ public class MentoringRelationshipActivity extends BaseMvpActivity<IMentoringRel
         });
         rvMyApprentices = findViewById(R.id.rv_my_apprentices);
         rvMyApprentices.setLayoutManager(new LinearLayoutManager(MentoringRelationshipActivity.this,
-                OrientationHelper.VERTICAL, false));
+                RecyclerView.VERTICAL, false));
         myMasterAndApprenticesAdapter = new MyMasterAndApprenticesAdapter(MentoringRelationshipActivity.this);
         rvMyApprentices.setAdapter(myMasterAndApprenticesAdapter);
         myMasterAndApprenticesAdapter.setOnItemChildClickListener((adapter1, view, position) -> {

core/build.gradle

@@ -58,7 +58,7 @@ android {
 }
 
 def loggerVersion = "2.2.0"
-def Lombok = "1.18.18"
+def Lombok = "1.18.24"
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.java

@@ -1,15 +0,0 @@
-package com.yizhuan.xchat_android_core.association.bean;
-
-import lombok.Data;
-
-@Data
-public class ClanListInfo {
-    private int clanId;
-    private long clanElderUid;
-    private String avatar;
-    private String name;
-    private String levelIcon;
-    private double income;
-    private int level;
-    private int applyBtnStatus;//0=不显示 1=可申请 2=已申请
-}

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt

@@ -0,0 +1,12 @@
+package com.yizhuan.xchat_android_core.association.bean
+
+data class ClanListInfo(
+    val clanId: Int = 0,
+    val clanElderUid: Long = 0,
+    val avatar: String = "",
+    val name: String = "",
+    val levelIcon: String = "",
+    val income: Double = 0.0,
+    val level: Int = 0,
+    var applyBtnStatus: Int = 0//0=不显示 1=可申请 2=已申请
+)

core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java

@@ -1,21 +0,0 @@
-package com.yizhuan.xchat_android_core.pay.bean;
-
-import com.android.billingclient.api.SkuDetails;
-
-import java.util.ArrayList;
-
-import lombok.Data;
-
-@Data
-public class FirstChargeGoods {
-    public FirstChargeGoods() {
-    }
-    private Double chargeMoney;
-    private String chargeProdDesc;
-    private String chargeProdId;
-    private String chargeProdTitle;
-    private ArrayList<FirstChargeReward> firstChargeRewardList;
-    private String giveMoney;
-    private boolean finishCharge;
-    private SkuDetails skuDetails;
-}

core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.kt

@@ -0,0 +1,14 @@
+package com.yizhuan.xchat_android_core.pay.bean
+
+import com.android.billingclient.api.SkuDetails
+
+data class FirstChargeGoods(
+    val chargeMoney: Double = 0.0,
+    val chargeProdDesc: String = "",
+    val chargeProdId: String = "",
+    val chargeProdTitle: String = "",
+    val firstChargeRewardList: ArrayList<FirstChargeReward>? = null,
+    val giveMoney: String = "",
+    val finishCharge: Boolean = false,
+    var skuDetails: SkuDetails? = null
+)

core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java

@@ -1,13 +0,0 @@
-package com.yizhuan.xchat_android_core.pay.bean;
-
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-public class NewUserChargeInfo {
-    private long limitEndTime;
-    private List<FirstChargeGoods> limitFirstChargeTaskList;
-    public NewUserChargeInfo() {
-    }
-}

core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.kt

@@ -0,0 +1,6 @@
+package com.yizhuan.xchat_android_core.pay.bean
+
+class NewUserChargeInfo(
+    val limitEndTime: Long = 0,
+    val limitFirstChargeTaskList: List<FirstChargeGoods>? = null
+)

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java

@@ -1,45 +0,0 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
-
-import lombok.Data;
-
-@Data
-public class GrabApprenticesInfo {
-    /**
-     * 用户uid
-     */
-    private Long uid;
-
-    /**
-     * Peko号
-     */
-    private Long erbanNo;
-
-    /**
-     * 头像
-     */
-    private String avatar;
-
-    /**
-     * 昵称
-     */
-    private String nick;
-
-    /**
-     * 性别 1.男  2.女
-     */
-    private Byte gender;
-
-    /**
-     * 倒计时数值(仅客户端 UI 要用到)
-     */
-    private int countDown;
-
-    public GrabApprenticesInfo(Long uid, Long erbanNo, String avatar, String nick, Byte gender, int countDown) {
-        this.uid = uid;
-        this.erbanNo = erbanNo;
-        this.avatar = avatar;
-        this.nick = nick;
-        this.gender = gender;
-        this.countDown = countDown;
-    }
-}

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt

@@ -0,0 +1,28 @@
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+
+data class GrabApprenticesInfo(
+    /**
+     * 用户uid
+     */
+    val uid: Long = 0L,
+    /**
+     * Peko号
+     */
+    val erbanNo: Long = 0L,
+    /**
+     * 头像
+     */
+    val avatar: String = "",
+    /**
+     * 昵称
+     */
+    val nick: String = "",
+    /**
+     * 性别 1.男  2.女
+     */
+    val gender: Byte = 0,
+    /**
+     * 倒计时数值(仅客户端 UI 要用到)
+     */
+    var countDown: Int = 0
+)

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java

@@ -1,16 +0,0 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
-
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-public class GrabApprenticesMissionInfo {
-
-    /**
-     * 倒计时数值
-     */
-    private int countDown;
-
-    private List<SimpleUserVo> apprentices;
-}

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt

@@ -0,0 +1,9 @@
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+
+class GrabApprenticesMissionInfo(
+    /**
+     * 倒计时数值
+     */
+    val countDown: Int = 0,
+    val apprentices: List<SimpleUserVo>? = null
+)

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java

@@ -1,197 +0,0 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
-
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-public class MentoringRankingDataInfo {
-
-    /**
-     * 查询类型，本周排行榜数据
-     */
-    public static final int TYPE_THIS_WEEK = 1;
-
-    /**
-     * 查询类型，上周排行榜数据
-     */
-    public static final int TYPE_LAST_WEEK = 2;
-
-    /**
-     * masterVos : [{"uid":90001,"erbanNo":854623,"avatar":"shdlskdsjl.jpg","nick":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_01),"gender":2,"nobleUsers":{"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_02),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0},"userLevelVo":{"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_03),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_04),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_05),"experLevelSeq":55,"charmLevelSeq":3},"appreniceCount":10,"rank":2}]
-     * myRankVo : {"uid":90001,"erbanNo":854623,"avatar":"shdlskdsjl.jpg","nick":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_06),"gender":2,"nobleUsers":{"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_07),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0},"userLevelVo":{"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_08),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_09),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_010),"experLevelSeq":55,"charmLevelSeq":3},"appreniceCount":10,"rank":2}
-     */
-
-    private MyRankVoBean myRankVo;
-    private List<MasterVosBean> masterVos;
-
-    @Data
-    public static class MyRankVoBean {
-        /**
-         * uid : 90001
-         * erbanNo : 854623
-         * avatar : shdlskdsjl.jpg
-         * nick : 小决绝
-         * gender : 2
-         * nobleUsers : {"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_011),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0}
-         * userLevelVo : {"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_012),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_013),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_014),"experLevelSeq":55,"charmLevelSeq":3}
-         * apprenticeCount : 10
-         * rank : 2
-         */
-
-        private int uid;
-        private int erbanNo;
-        private String avatar;
-        private String nick;
-        private int gender;
-        private NobleUsersBean nobleUsers;
-        private UserLevelVoBean userLevelVo;
-        private int apprenticeCount;
-        private int rank;
-
-        @Data
-        public static class NobleUsersBean {
-            /**
-             * uid : 900014
-             * nobleId : 3
-             * nobleName : 伯爵
-             * expire : 1621871997000
-             * badgeId : 66
-             * badge : badge_3_2
-             * cardbgId : 67
-             * cardbg : https://image.zhongjialx.com/cardbg/cardbg_3_1.png
-             * zonebgId : 68
-             * zonebg : https://image.zhongjialx.com//zonebg/zonebg_3_1.png
-             * enterHide : 0
-             * rankHide : 0
-             * goodNum : 0
-             * recomCount : 0
-             */
-
-            private int uid;
-            private int nobleId;
-            private String nobleName;
-            private long expire;
-            private int badgeId;
-            private String badge;
-            private int cardbgId;
-            private String cardbg;
-            private int zonebgId;
-            private String zonebg;
-            private int enterHide;
-            private int rankHide;
-            private int goodNum;
-            private int recomCount;
-        }
-
-        @Data
-        public static class UserLevelVoBean {
-            /**
-             * experAmount : 136493
-             * charmAmount : 1314
-             * experUrl : https://image.zhongjialx.com/new_ul_55.png
-             * charmUrl : https://image.zhongjialx.com/new_ml_3.png
-             * experLevelName : 白金Lv5
-             * charmLevelName : 初出茅庐LV3
-             * experLevelGrp : 高阶石头
-             * experLevelSeq : 55
-             * charmLevelSeq : 3
-             */
-
-            private int experAmount;
-            private int charmAmount;
-            private String experUrl;
-            private String charmUrl;
-            private String experLevelName;
-            private String charmLevelName;
-            private String experLevelGrp;
-            private int experLevelSeq;
-            private int charmLevelSeq;
-        }
-    }
-
-    @Data
-    public static class MasterVosBean {
-        /**
-         * uid : 90001
-         * erbanNo : 854623
-         * avatar : shdlskdsjl.jpg
-         * nick : 小决绝
-         * gender : 2
-         * nobleUsers : {"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_015),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0}
-         * userLevelVo : {"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_016),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_017),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_018),"experLevelSeq":55,"charmLevelSeq":3}
-         * appreniceCount : 10
-         * rank : 2
-         */
-
-        private int uid;
-        private int erbanNo;
-        private String avatar;
-        private String nick;
-        private int gender;
-        private NobleUsersBeanX nobleUsers;
-        private UserLevelVoBeanX userLevelVo;
-        private int appreniceCount;
-        private int rank;
-
-        @Data
-        public static class NobleUsersBeanX {
-            /**
-             * uid : 900014
-             * nobleId : 3
-             * nobleName : 伯爵
-             * expire : 1621871997000
-             * badgeId : 66
-             * badge : badge_3_2
-             * cardbgId : 67
-             * cardbg : https://image.zhongjialx.com/cardbg/cardbg_3_1.png
-             * zonebgId : 68
-             * zonebg : https://image.zhongjialx.com//zonebg/zonebg_3_1.png
-             * enterHide : 0
-             * rankHide : 0
-             * goodNum : 0
-             * recomCount : 0
-             */
-
-            private int uid;
-            private int nobleId;
-            private String nobleName;
-            private long expire;
-            private int badgeId;
-            private String badge;
-            private int cardbgId;
-            private String cardbg;
-            private int zonebgId;
-            private String zonebg;
-            private int enterHide;
-            private int rankHide;
-            private int goodNum;
-            private int recomCount;
-        }
-
-        @Data
-        public static class UserLevelVoBeanX {
-            /**
-             * experAmount : 136493
-             * charmAmount : 1314
-             * experUrl : https://image.zhongjialx.com/new_ul_55.png
-             * charmUrl : https://image.zhongjialx.com/new_ml_3.png
-             * experLevelName : 白金Lv5
-             * charmLevelName : 初出茅庐LV3
-             * experLevelGrp : 高阶石头
-             * experLevelSeq : 55
-             * charmLevelSeq : 3
-             */
-
-            private int experAmount;
-            private int charmAmount;
-            private String experUrl;
-            private String charmUrl;
-            private String experLevelName;
-            private String charmLevelName;
-            private String experLevelGrp;
-            private int experLevelSeq;
-            private int charmLevelSeq;
-        }
-    }
-}

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt

@@ -0,0 +1,174 @@
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
+
+data class MentoringRankingDataInfo(
+    /**
+     * masterVos : [{"uid":90001,"erbanNo":854623,"avatar":"shdlskdsjl.jpg","nick":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_01),"gender":2,"nobleUsers":{"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_02),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0},"userLevelVo":{"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_03),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_04),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_05),"experLevelSeq":55,"charmLevelSeq":3},"appreniceCount":10,"rank":2}]
+     * myRankVo : {"uid":90001,"erbanNo":854623,"avatar":"shdlskdsjl.jpg","nick":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_06),"gender":2,"nobleUsers":{"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_07),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0},"userLevelVo":{"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_08),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_09),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_010),"experLevelSeq":55,"charmLevelSeq":3},"appreniceCount":10,"rank":2}
+     */
+    val myRankVo: MyRankVoBean? = null,
+    val masterVos: List<MasterVosBean>? = null
+) {
+    companion object {
+        const val TYPE_THIS_WEEK = 1
+        const val TYPE_LAST_WEEK = 2
+    }
+
+    data class MyRankVoBean(
+        /**
+         * uid : 90001
+         * erbanNo : 854623
+         * avatar : shdlskdsjl.jpg
+         * nick : 小决绝
+         * gender : 2
+         * nobleUsers : {"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_011),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0}
+         * userLevelVo : {"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_012),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_013),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_014),"experLevelSeq":55,"charmLevelSeq":3}
+         * apprenticeCount : 10
+         * rank : 2
+         */
+        val uid: Int = 0,
+        val erbanNo: Int = 0,
+        val avatar: String = "",
+        val nick: String = "",
+        val gender: Int = 0,
+        val nobleUsers: NobleUsersBean? = null,
+        val userLevelVo: UserLevelVoBean? = null,
+        val apprenticeCount: Int = 0,
+        val rank: Int = 0
+    )
+
+    data class MasterVosBean(
+        /**
+         * uid : 90001
+         * erbanNo : 854623
+         * avatar : shdlskdsjl.jpg
+         * nick : 小决绝
+         * gender : 2
+         * nobleUsers : {"uid":900014,"nobleId":3,"nobleName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_015),"expire":1621871997000,"badgeId":66,"badge":"badge_3_2","cardbgId":67,"cardbg":"https://image.zhongjialx.com/cardbg/cardbg_3_1.png","zonebgId":68,"zonebg":"https://image.zhongjialx.com//zonebg/zonebg_3_1.png","enterHide":0,"rankHide":0,"goodNum":0,"recomCount":0}
+         * userLevelVo : {"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_016),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_017),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringrankingdatainfo_018),"experLevelSeq":55,"charmLevelSeq":3}
+         * appreniceCount : 10
+         * rank : 2
+         */
+        val uid: Int = 0,
+        val erbanNo: Int = 0,
+        val avatar: String = "",
+        val nick: String = "",
+        val gender: Int = 0,
+        val nobleUsers: NobleUsersBeanX? = null,
+        val userLevelVo: UserLevelVoBeanX? = null,
+        val appreniceCount: Int = 0,
+        val rank: Int = 0
+    )
+
+    data class NobleUsersBean(
+        /**
+         * uid : 900014
+         * nobleId : 3
+         * nobleName : 伯爵
+         * expire : 1621871997000
+         * badgeId : 66
+         * badge : badge_3_2
+         * cardbgId : 67
+         * cardbg : https://image.zhongjialx.com/cardbg/cardbg_3_1.png
+         * zonebgId : 68
+         * zonebg : https://image.zhongjialx.com//zonebg/zonebg_3_1.png
+         * enterHide : 0
+         * rankHide : 0
+         * goodNum : 0
+         * recomCount : 0
+         */
+        val uid: Int = 0,
+        val nobleId: Int = 0,
+        val nobleName: String = "",
+        val expire: Long = 0,
+        val badgeId: Int = 0,
+        val badge: String = "",
+        val cardbgId: Int = 0,
+        val cardbg: String = "",
+        val zonebgId: Int = 0,
+        val zonebg: String = "",
+        val enterHide: Int = 0,
+        val rankHide: Int = 0,
+        val goodNum: Int = 0,
+        val recomCount: Int = 0
+    )
+
+    data class UserLevelVoBean(
+        /**
+         * experAmount : 136493
+         * charmAmount : 1314
+         * experUrl : https://image.zhongjialx.com/new_ul_55.png
+         * charmUrl : https://image.zhongjialx.com/new_ml_3.png
+         * experLevelName : 白金Lv5
+         * charmLevelName : 初出茅庐LV3
+         * experLevelGrp : 高阶石头
+         * experLevelSeq : 55
+         * charmLevelSeq : 3
+         */
+        val experAmount: Int = 0,
+        val charmAmount: Int = 0,
+        val experUrl: String = "",
+        val charmUrl: String = "",
+        val experLevelName: String = "",
+        val charmLevelName: String = "",
+        val experLevelGrp: String = "",
+        val experLevelSeq: Int = 0,
+        val charmLevelSeq: Int = 0
+    )
+
+    data class NobleUsersBeanX(
+        /**
+         * uid : 900014
+         * nobleId : 3
+         * nobleName : 伯爵
+         * expire : 1621871997000
+         * badgeId : 66
+         * badge : badge_3_2
+         * cardbgId : 67
+         * cardbg : https://image.zhongjialx.com/cardbg/cardbg_3_1.png
+         * zonebgId : 68
+         * zonebg : https://image.zhongjialx.com//zonebg/zonebg_3_1.png
+         * enterHide : 0
+         * rankHide : 0
+         * goodNum : 0
+         * recomCount : 0
+         */
+        val uid: Int = 0,
+        val nobleId: Int = 0,
+        val nobleName: String = "",
+        val expire: Long = 0,
+        val badgeId: Int = 0,
+        val badge: String = "",
+        val cardbgId: Int = 0,
+        val cardbg: String = "",
+        val zonebgId: Int = 0,
+        val zonebg: String = "",
+        val enterHide: Int = 0,
+        val rankHide: Int = 0,
+        val goodNum: Int = 0,
+        val recomCount: Int = 0
+    )
+
+    class UserLevelVoBeanX(
+        /**
+         * experAmount : 136493
+         * charmAmount : 1314
+         * experUrl : https://image.zhongjialx.com/new_ul_55.png
+         * charmUrl : https://image.zhongjialx.com/new_ml_3.png
+         * experLevelName : 白金Lv5
+         * charmLevelName : 初出茅庐LV3
+         * experLevelGrp : 高阶石头
+         * experLevelSeq : 55
+         * charmLevelSeq : 3
+         */
+        val experAmount: Int = 0,
+        val charmAmount: Int = 0,
+        val experUrl: String = "",
+        val charmUrl: String = "",
+        val experLevelName: String = "",
+        val charmLevelName: String = "",
+        val experLevelGrp: String = "",
+        val experLevelSeq: Int = 0,
+        val charmLevelSeq: Int = 0
+    )
+
+}

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt

@@ -1,19 +1,15 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
 
-import java.io.Serializable;
+import java.io.Serializable
-
-import lombok.Data;
-
-@Data
-public class MentoringTipsInfo implements Serializable {
 
+class MentoringTipsInfo(
     /**
      * 消息提示的内容
      */
-    private String tips;
+    val tips: String = "",
 
     /**
      * 对话窗口的 UID (正在与当前用户聊天的那个人的 UID)
      */
-    private String sessionId;
+    val sessionId: String = ""
-}
+) : Serializable

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt

@@ -1,13 +1,6 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
-
-import lombok.Data;
-
-@Data
-public class MentoringUserInfo {
-
-    public final static long TYPE_MASTER = 1;
-    public final static long TYPE_APPRENTICE = 2;
 
+data class MentoringUserInfo(
     /**
      * uid : 900001
      * erbanNo : 564201
@@ -17,21 +10,24 @@ public class MentoringUserInfo {
      * userLevelVo : {"experAmount":136493,"charmAmount":1314,"experUrl":"https://image.zhongjialx.com/new_ul_55.png","charmUrl":"https://image.zhongjialx.com/new_ml_3.png","experLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringuserinfo_01),"charmLevelName":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringuserinfo_02),"experLevelGrp":ResUtil.getString(R.string.mentoring_relationship_bean_mentoringuserinfo_03),"experLevelSeq":55,"charmLevelSeq":3}
      * type : 1
      */
-
+    val uid: Int = 0,
-    private int uid;
+    val erbanNo: Int = 0,
-    private int erbanNo;
+    val avatar: String = "",
-    private String avatar;
+    val nick: String = "",
-    private String nick;
+    val gender: Int = 0,
-    private int gender;
+    val userLevelVo: UserLevelVoBean? = null,
-    private UserLevelVoBean userLevelVo;
 
     /**
      * 用户类型（1：我的师傅，2：我的徒弟）
      */
-    private int type;
+    val type: Int = 0
+) {
+    companion object {
+        const val TYPE_MASTER: Long = 1
+        const val TYPE_APPRENTICE: Long = 2
+    }
 
-    @Data
+    class UserLevelVoBean(
-    public static class UserLevelVoBean {
         /**
          * experAmount : 136493
          * charmAmount : 1314
@@ -43,16 +39,15 @@ public class MentoringUserInfo {
          * experLevelSeq : 55
          * charmLevelSeq : 3
          */
+        val experAmount: Int = 0,
+        val charmAmount: Int = 0,
+        val experUrl: String = "",
+        val charmUrl: String = "",
+        val experLevelName: String = "",
+        val charmLevelName: String = "",
+        val experLevelGrp: String = "",
+        val experLevelSeq: Int = 0,
+        val charmLevelSeq: Int = 0
+    )
 
-        private int experAmount;
-        private int charmAmount;
-        private String experUrl;
-        private String charmUrl;
-        private String experLevelName;
-        private String charmLevelName;
-        private String experLevelGrp;
-        private int experLevelSeq;
-        private int charmLevelSeq;
-
-    }
 }

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt

@@ -1,47 +1,48 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
 
-import java.io.Serializable;
+import java.io.Serializable
-import java.util.List;
-
-import lombok.Data;
 
 /**
  * Created by chucheng on 2019/1/15.
  */
-@Data
+class MissionVo<T>(
-public class MissionVo<T> implements Serializable {
-
     /**
      * 任务标号，任务1、2、3、4...
      */
-    private int step;
+    val step: Int = 0,
+
     /**
      * 标题
      */
-    private String title;
+    val title: String = "",
+
     /**
      * 提示
      */
-    private String tips;
+    val tips: String = "",
+
     /**
      * 内容
      */
-    private List<String> content;
+    val content: List<String>? = null,
+
     /**
      * 消息
      */
-    private String message;
+    val message: String = "",
+
     /**
      * 师父uid
      */
-    private long masterUid;
+    val masterUid: Long = 0,
+
     /**
      * 徒弟uid
      */
-    private long apprenticeUid;
+    val apprenticeUid: Long = 0,
+
     /**
      * 扩展字段，如：礼物信息
      */
-    private T data;
+    private val data: T? = null
-
+) : Serializable
-}

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt

@@ -1,27 +1,23 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
-
-import lombok.Data;
-
-@Data
-public class PickUpApprenticeInfo {
 
+data class PickUpApprenticeInfo(
     /**
      * 标题
      */
-    private String title;
+    val title: String = "",
 
     /**
      * 内容
      */
-    private String content;
+    val content: String = "",
 
     /**
      * 提示
      */
-    private String tips;
+    val tips: String = "",
 
     /**
      * 是否能收徒，true 表示能收徒，false 则不能
      */
-    private boolean can;
+    val can: Boolean = false
-}
+)

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt

@@ -1,33 +1,33 @@
-package com.yizhuan.xchat_android_core.mentoring_relationship.bean;
+package com.yizhuan.xchat_android_core.mentoring_relationship.bean
 
-import java.io.Serializable;
+import java.io.Serializable
-
-import lombok.Data;
 
 /**
  * Created by chucheng on 2019/1/18.
  */
-@Data
+data class SimpleUserVo(
-public class SimpleUserVo implements Serializable {
     /**
      * 用户uid
      */
-    private Long uid;
+    val uid: Long = 0L,
+
     /**
      * Peko号
      */
-    private Long erbanNo;
+    val erbanNo: Long = 0L,
+
     /**
      * 头像
      */
-    private String avatar;
+    val avatar: String = "",
+
     /**
      * 昵称
      */
-    private String nick;
+    val nick: String = "",
+
     /**
      * 性别 1.男  2.女
      */
-    private Byte gender;
+    val gender: Byte = 0
-
+) : Serializable
-}

core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java

@@ -324,7 +324,7 @@ public class MentoringRelationshipModel extends BaseModel implements IMentoringR
                         .compose(RxHelper.handleSchedulers());
         return canPickUpApprentice()
                 .flatMap(pickUpApprenticeInfo -> {
-                    if (pickUpApprenticeInfo.isCan()) {
+                    if (pickUpApprenticeInfo.getCan()) {
                         return requestToPckUpApprentice;
                     } else {
                         return Single.error(new FailReasonException("", CODE_LESS_THAN_FIVE_MINUTE));
@@ -683,6 +683,10 @@ public class MentoringRelationshipModel extends BaseModel implements IMentoringR
                         break;
 
                     case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_ONE_TIPS:
+
+                    case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_ONE_MASTER_TIPS:
+
+                    case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_FAIL_TIPS:
                         MentoringMissionTipsAttachment apprenticeMissionOneTipsAttachment = (MentoringMissionTipsAttachment) customAttachment;
                         MentoringTipsInfo apprenticeMissionOneTipsData = apprenticeMissionOneTipsAttachment.getMentoringTipsInfo();
                         imMessage = MessageBuilder.createTipMessage(
@@ -763,26 +767,6 @@ public class MentoringRelationshipModel extends BaseModel implements IMentoringR
                         EventBus.getDefault().post(new MentoringSuccessEvent());
                         break;
 
-                    case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_ONE_MASTER_TIPS:
-                        MentoringMissionTipsAttachment masterMissionOneTipsAttachment = (MentoringMissionTipsAttachment) customAttachment;
-                        MentoringTipsInfo masterMissionOneTipsData = masterMissionOneTipsAttachment.getMentoringTipsInfo();
-                        imMessage = MessageBuilder.createTipMessage(
-                                masterMissionOneTipsData.getSessionId(), SessionTypeEnum.P2P);
-                        imMessage.setContent(masterMissionOneTipsData.getTips());
-                        imMessage.setFromAccount(String.valueOf(masterMissionOneTipsData.getSessionId()));
-                        imMessage.setDirect(MsgDirectionEnum.In);
-                        break;
-
-                    case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_FAIL_TIPS:
-                        MentoringMissionTipsAttachment missionFailTipsAttachment = (MentoringMissionTipsAttachment) customAttachment;
-                        MentoringTipsInfo missionFailTipsData = missionFailTipsAttachment.getMentoringTipsInfo();
-                        imMessage = MessageBuilder.createTipMessage(
-                                missionFailTipsData.getSessionId(), SessionTypeEnum.P2P);
-                        imMessage.setContent(missionFailTipsData.getTips());
-                        imMessage.setFromAccount(String.valueOf(missionFailTipsData.getSessionId()));
-                        imMessage.setDirect(MsgDirectionEnum.In);
-                        break;
-
                     case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_GRAB_APPRENTICES:
                         MentoringGrabApprenticesAttachment grabApprenticesAttachment = (MentoringGrabApprenticesAttachment) customAttachment;
                         GrabApprenticesMissionInfo grabApprenticesMissionInfo = grabApprenticesAttachment.getGrabApprenticesMissionInfo();