From 0303d6a3edcbe225ff4b4c8ab4d022d32f0315bf Mon Sep 17 00:00:00 2001 From: 15876 Date: Fri, 3 Mar 2023 15:57:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9LomBok=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../NewUserChargeGiftDialog.kt | 6 +- .../MentoringRelationshipActivity.java | 2 +- core/build.gradle | 2 +- .../association/bean/ClanListInfo.java | 15 -- .../association/bean/ClanListInfo.kt | 12 ++ .../pay/bean/FirstChargeGoods.java | 21 -- .../pay/bean/FirstChargeGoods.kt | 14 ++ .../pay/bean/NewUserChargeInfo.java | 13 -- .../pay/bean/NewUserChargeInfo.kt | 6 + .../bean/GrabApprenticesInfo.java | 45 ---- .../bean/GrabApprenticesInfo.kt | 28 +++ .../bean/GrabApprenticesMissionInfo.java | 16 -- .../bean/GrabApprenticesMissionInfo.kt | 9 + .../bean/MentoringRankingDataInfo.java | 197 ------------------ .../bean/MentoringRankingDataInfo.kt | 174 ++++++++++++++++ ...ringTipsInfo.java => MentoringTipsInfo.kt} | 16 +- ...ringUserInfo.java => MentoringUserInfo.kt} | 57 +++-- .../bean/{MissionVo.java => MissionVo.kt} | 37 ++-- ...nticeInfo.java => PickUpApprenticeInfo.kt} | 18 +- .../{SimpleUserVo.java => SimpleUserVo.kt} | 26 +-- .../model/MentoringRelationshipModel.java | 26 +-- 22 files changed, 325 insertions(+), 417 deletions(-) delete mode 100644 core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.java create mode 100644 core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt delete mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java create mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.kt delete mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java create mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.kt delete mode 100644 core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java create mode 100644 core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt delete mode 100644 core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java create mode 100644 core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt delete mode 100644 core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java create mode 100644 core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt rename core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/{MentoringTipsInfo.java => MentoringTipsInfo.kt} (53%) rename core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/{MentoringUserInfo.java => MentoringUserInfo.kt} (62%) rename core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/{MissionVo.java => MissionVo.kt} (54%) rename core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/{PickUpApprenticeInfo.java => PickUpApprenticeInfo.kt} (57%) rename core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/{SimpleUserVo.java => SimpleUserVo.kt} (54%) diff --git a/app/build.gradle b/app/build.gradle index b2c15ab5d..36e2f9f92 100644 --- a/app/build.gradle +++ b/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']) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt index afddd7b12..d7c25d470 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt @@ -91,7 +91,7 @@ class NewUserChargeGiftDialog : BaseViewBindingActivity initData(it1) } initNewUserCharge(it.limitEndTime) dialogManager.dismissDialog() }, { @@ -126,7 +126,7 @@ class NewUserChargeGiftDialog : BaseViewBindingActivity goodsList.getOrNull(index)?.let { - if (!it.isFinishCharge && !initChecked) { + if (!it.finishCharge && !initChecked) { initChecked = true button.isChecked = true } @@ -167,7 +167,7 @@ class NewUserChargeGiftDialog : BaseViewBindingActivity { diff --git a/core/build.gradle b/core/build.gradle index 08c6ff64e..7892a9563 100644 --- a/core/build.gradle +++ b/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']) diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.java deleted file mode 100644 index 61eb1ce95..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.java +++ /dev/null @@ -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=已申请 -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt new file mode 100644 index 000000000..39c5966d7 --- /dev/null +++ b/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=已申请 +) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java deleted file mode 100644 index d7cd63e1b..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java +++ /dev/null @@ -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 firstChargeRewardList; - private String giveMoney; - private boolean finishCharge; - private SkuDetails skuDetails; -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.kt b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.kt new file mode 100644 index 000000000..bb42dfe68 --- /dev/null +++ b/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? = null, + val giveMoney: String = "", + val finishCharge: Boolean = false, + var skuDetails: SkuDetails? = null +) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java deleted file mode 100644 index 5dbd363a1..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java +++ /dev/null @@ -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 limitFirstChargeTaskList; - public NewUserChargeInfo() { - } -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.kt b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.kt new file mode 100644 index 000000000..737fac149 --- /dev/null +++ b/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? = null +) \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java deleted file mode 100644 index 93299e72b..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java +++ /dev/null @@ -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; - } -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt new file mode 100644 index 000000000..600596dc1 --- /dev/null +++ b/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 +) \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java deleted file mode 100644 index 6c31f5db5..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.java +++ /dev/null @@ -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 apprentices; -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt new file mode 100644 index 000000000..fd3cb3832 --- /dev/null +++ b/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? = null +) \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java deleted file mode 100644 index 2f574ace8..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.java +++ /dev/null @@ -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 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; - } - } -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt new file mode 100644 index 000000000..f39e90fbf --- /dev/null +++ b/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? = 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 + ) + +} \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt similarity index 53% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.java rename to core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt index 0f17af4fd..c0850bab5 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.java +++ b/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 lombok.Data; - -@Data -public class MentoringTipsInfo implements Serializable { +import java.io.Serializable +class MentoringTipsInfo( /** * 消息提示的内容 */ - private String tips; + val tips: String = "", /** * 对话窗口的 UID (正在与当前用户聊天的那个人的 UID) */ - private String sessionId; -} + val sessionId: String = "" +) : Serializable \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt similarity index 62% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.java rename to core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt index eb0640546..d3f0a5fa6 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.java +++ b/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; - -import lombok.Data; - -@Data -public class MentoringUserInfo { - - public final static long TYPE_MASTER = 1; - public final static long TYPE_APPRENTICE = 2; +package com.yizhuan.xchat_android_core.mentoring_relationship.bean +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 */ - - private int uid; - private int erbanNo; - private String avatar; - private String nick; - private int gender; - private UserLevelVoBean userLevelVo; + val uid: Int = 0, + val erbanNo: Int = 0, + val avatar: String = "", + val nick: String = "", + val gender: Int = 0, + val userLevelVo: UserLevelVoBean? = null, /** * 用户类型（1：我的师傅，2：我的徒弟） */ - private int type; + val type: Int = 0 +) { + companion object { + const val TYPE_MASTER: Long = 1 + const val TYPE_APPRENTICE: Long = 2 + } - @Data - public static class UserLevelVoBean { + 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; - - } -} +} \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt similarity index 54% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.java rename to core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt index b95704c09..0d22ce15f 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.java +++ b/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.util.List; - -import lombok.Data; +import java.io.Serializable /** * Created by chucheng on 2019/1/15. */ -@Data -public class MissionVo implements Serializable { - +class MissionVo( /** * 任务标号，任务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 content; + val content: List? = 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; - -} \ No newline at end of file + private val data: T? = null +) : Serializable \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt similarity index 57% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.java rename to core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt index 4f33a82b3..44eaee60a 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.java +++ b/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; - -import lombok.Data; - -@Data -public class PickUpApprenticeInfo { +package com.yizhuan.xchat_android_core.mentoring_relationship.bean +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 +) \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt similarity index 54% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java rename to core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt index fb721c6f6..160937c77 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java +++ b/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 lombok.Data; +import java.io.Serializable /** * Created by chucheng on 2019/1/18. */ -@Data -public class SimpleUserVo implements Serializable { +data class SimpleUserVo( /** * 用户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 \ No newline at end of file diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java index e460ca779..a0022ea4e 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java +++ b/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();