From 9d0b6e3a9f9c814e2a1208822c37695275a70431 Mon Sep 17 00:00:00 2001 From: max Date: Tue, 18 Jun 2024 19:41:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=88=91=E7=9A=84-?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=9A=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=88=E6=8E=A5=E5=8F=A3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chwl/app/home/MeViewModel.kt | 126 ++++++------------ .../chwl/app/home/adapter/MeCenterAdapter.kt | 31 ++++- .../com/chwl/app/home/fragment/MeFragment.kt | 60 +++------ .../com/chwl/app/ui/im/RouterHandler.java | 5 +- .../res/drawable-xxhdpi/home_ic_room_pk.png | Bin 6477 -> 0 bytes .../drawable-xxhdpi/me_ic_menu_collect.png | Bin 4109 -> 0 bytes .../drawable-xxhdpi/me_ic_menu_donation.png | Bin 7502 -> 0 bytes .../drawable-xxhdpi/me_ic_menu_dress_shop.png | Bin 3159 -> 0 bytes .../drawable-xxhdpi/me_ic_menu_invite_fan.png | Bin 7397 -> 0 bytes .../res/drawable-xxhdpi/me_ic_menu_level.png | Bin 3632 -> 0 bytes .../drawable-xxhdpi/me_ic_menu_revenue.png | Bin 4976 -> 0 bytes .../res/drawable-xxhdpi/me_ic_menu_room.png | Bin 3473 -> 0 bytes app/src/main/res/layout/fragment_me.xml | 5 +- .../com/chwl/core/home/model/HomeModel.kt | 12 ++ .../chwl/core/im/custom/bean/RouterType.java | 18 +-- .../com/chwl/core/room/bean/MeCenterInfo.kt | 16 ++- 16 files changed, 122 insertions(+), 151 deletions(-) delete mode 100644 app/src/main/res/drawable-xxhdpi/home_ic_room_pk.png delete mode 100644 app/src/main/res/drawable-xxhdpi/me_ic_menu_collect.png delete mode 100644 app/src/main/res/drawable-xxhdpi/me_ic_menu_donation.png delete mode 100644 app/src/main/res/drawable-xxhdpi/me_ic_menu_dress_shop.png delete mode 100644 app/src/main/res/drawable-xxhdpi/me_ic_menu_invite_fan.png delete mode 100644 app/src/main/res/drawable-xxhdpi/me_ic_menu_level.png delete mode 100644 app/src/main/res/drawable-xxhdpi/me_ic_menu_revenue.png delete mode 100644 app/src/main/res/drawable-xxhdpi/me_ic_menu_room.png diff --git a/app/src/main/java/com/chwl/app/home/MeViewModel.kt b/app/src/main/java/com/chwl/app/home/MeViewModel.kt index 4eb9b3034..9f3867bb0 100644 --- a/app/src/main/java/com/chwl/app/home/MeViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/MeViewModel.kt @@ -3,108 +3,58 @@ package com.chwl.app.home import androidx.lifecycle.MutableLiveData import com.chwl.app.R import com.chwl.app.base.BaseViewModel -import com.chwl.core.UriProvider +import com.chwl.core.home.model.HomeModel import com.chwl.core.im.custom.bean.RouterType import com.chwl.core.room.bean.MeCenterInfo import com.chwl.library.utils.ResUtil class MeViewModel : BaseViewModel() { - private val _meCenterInfoLiveData = MutableLiveData?>() - val meCenterInfoLiveData: MutableLiveData?> = _meCenterInfoLiveData + private var menuList: List? = null - var donationMenuVisible = false + val menuListLiveData = MutableLiveData?>() - val donationMenu: MeCenterInfo by lazy(LazyThreadSafetyMode.NONE) { - MeCenterInfo( - icon = R.drawable.me_ic_menu_donation, - centerName = ResUtil.getString(R.string.me_donation), - skipType = RouterType.USER_DONATION - ) + private var donationMenuVisible = false + + fun updateDonationMenuVisible(isVisible: Boolean) { + donationMenuVisible = isVisible + if (!menuList.isNullOrEmpty()) { + menuListLiveData.value = transformMenuList(menuList) + } } -// private val _bannerLiveData = MutableLiveData?>() -// val bannerLiveData: MutableLiveData?> = _bannerLiveData - - init { - refreshData() - } - - fun refreshData() { -// getBannerInfo() - requestMeCenterInfoList() - } - -// private fun getBannerInfo() { -// safeLaunch( -// block = { -// _bannerLiveData.value = HomeModel.getHomeBanner("10") -// }, -// onError = { -// _bannerLiveData.value = null -// } -// ) -// } - - private fun requestMeCenterInfoList() { - safeLaunch( - block = { - _meCenterInfoLiveData.value = requestCenterList() - }, - onError = { - _meCenterInfoLiveData.value = null + fun requestMenuList() { + safeLaunch(onError = { + if (menuListLiveData.value.isNullOrEmpty()) { + menuListLiveData.postValue(transformMenuList(null)) } - ) + }) { + val value = HomeModel.requestMeCenterInfoList() + menuList = value + menuListLiveData.postValue(transformMenuList(value)) + } } - private fun requestCenterList(): MutableList? { + private fun transformMenuList(list: List?): List { + val finalList = ArrayList() + if (list.isNullOrEmpty()) { + finalList.addAll(getDefaultMenuList()) + } else { + finalList.addAll(list) + } + if (!donationMenuVisible) { + val donationMenuPosition = finalList.indexOfFirst { + it.skipType == RouterType.MY_DONATION + } + if (donationMenuPosition >= 0) { + finalList.removeAt(donationMenuPosition) + } + } + return finalList + } + + private fun getDefaultMenuList(): MutableList { return ArrayList().apply { - add( - MeCenterInfo( - icon = R.drawable.me_ic_menu_room, - centerName = ResUtil.getString(R.string.me_my_room), - skipType = RouterType.MY_ROOM - ) - ) - add( - MeCenterInfo( - icon = R.drawable.me_ic_menu_invite_fan, - centerName = ResUtil.getString(R.string.menu_my_invite), - skipType = RouterType.H5, - centerUrl = UriProvider.getInviteFan() - ) - ) - add( - MeCenterInfo( - icon = R.drawable.me_ic_menu_dress_shop, - centerName = ResUtil.getString(R.string.decoration_view_decorationstoreactivity_01), - skipType = RouterType.DECORATION_STORE - ) - ) -// add( -// MeCenterInfo( -// icon = R.drawable.me_ic_menu_revenue, -// centerName = ResUtil.getString(R.string.me_gain_recording), -// skipType = RouterType.MY_REVENUE -// ) -// ) - if (donationMenuVisible) { - add(donationMenu) - } - add( - MeCenterInfo( - icon = R.drawable.me_ic_menu_collect, - centerName = ResUtil.getString(R.string.my_collection), - skipType = RouterType.COLLECTION_ROOM - ) - ) - add( - MeCenterInfo( - icon = R.drawable.me_ic_menu_level, - centerName = ResUtil.getString(R.string.menu_my_level), - skipType = RouterType.USER_LEVEL - ) - ) add( MeCenterInfo( icon = R.drawable.me_ic_menu_setting, diff --git a/app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt index f2d6986a4..307622325 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/MeCenterAdapter.kt @@ -3,9 +3,9 @@ package com.chwl.app.home.adapter import android.widget.ImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder +import com.chad.library.adapter.base.diff.BaseQuickDiffCallback import com.chwl.app.R -import com.chwl.app.ui.im.RouterHandler -import com.chwl.app.ui.utils.load +import com.chwl.app.ui.utils.loadImage import com.chwl.core.room.bean.MeCenterInfo @@ -15,8 +15,35 @@ class MeCenterAdapter : override fun convert(helper: BaseViewHolder, item: MeCenterInfo) { item.icon?.let { helper.getView(R.id.iv_pic).setImageResource(it) + } ?: let { + helper.getView(R.id.iv_pic).loadImage(item.androidCenterPic) } helper.setText(R.id.tv_name, item.centerName) } + fun updateData(list: List?) { + val newList = ArrayList() + if (list != null) { + newList.addAll(list) + } + setNewDiffData(object : BaseQuickDiffCallback(newList) { + override fun areItemsTheSame( + oldItem: MeCenterInfo, + newItem: MeCenterInfo + ): Boolean { + return newItem.centerId == oldItem.centerId + } + + override fun areContentsTheSame( + oldItem: MeCenterInfo, + newItem: MeCenterInfo + ): Boolean { + return newItem.skipType == oldItem.skipType + && newItem.centerName == oldItem.centerName + && newItem.centerUrl == oldItem.centerUrl + && newItem.androidCenterPic == oldItem.androidCenterPic + } + }, true) + } + } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt index e946e7043..28cc3f71b 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt @@ -29,7 +29,6 @@ import com.chwl.app.module_hall.hall.activity.ModuleClanActivity import com.chwl.app.module_hall.hall.activity.ModuleHallActivity import com.chwl.app.support.FragmentVisibleStateHelper import com.chwl.app.ui.im.RouterHandler -import com.chwl.app.ui.pay.ChargeActivity import com.chwl.app.ui.relation.AttentionListActivity import com.chwl.app.ui.relation.FansListActivity import com.chwl.app.ui.utils.ImageLoadUtils @@ -39,7 +38,6 @@ import com.chwl.app.view.GenderAgeTextView import com.chwl.app.vip.VipMainActivity import com.chwl.app.vip.VipViewModel import com.chwl.core.auth.AuthModel -import com.chwl.core.im.custom.bean.RouterType import com.chwl.core.initial.InitialModel import com.chwl.core.level.UserLevelVo import com.chwl.core.manager.IMNetEaseManager @@ -100,9 +98,11 @@ class MeFragment : BaseFragment(), View.OnClickListener { override fun initiate() { EventBus.getDefault().register(this) + mBinding.rvMenu.adapter = mCenterAdapter + mCenterAdapter.setOnItemClickListener { adapter, view, position -> mCenterAdapter.getItem(position)?.let { - RouterHandler.handle(mContext, it.skipType, it.centerUrl) + RouterHandler.handle(mContext, it.skipType?:-1, it.centerUrl) } } @@ -116,7 +116,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { } ) - meViewModel.meCenterInfoLiveData.observe(viewLifecycleOwner) { + meViewModel.menuListLiveData.observe(viewLifecycleOwner) { setCenterData(it) } @@ -136,19 +136,20 @@ class MeFragment : BaseFragment(), View.OnClickListener { loadVipInfo(it) } - FragmentVisibleStateHelper(this).start { - onVisibleChanged(it) + FragmentVisibleStateHelper(this).apply { + start { + onVisibleChanged(it, isFirstVisible) + } } } private fun setCenterData(list: List?) { if (list.isNullOrEmpty()) { - mBinding.rvMenu.visibility = View.GONE + mBinding.layoutMenu.visibility = View.GONE return } - mBinding.rvMenu.visibility = View.VISIBLE - mBinding.rvMenu.adapter = mCenterAdapter - mCenterAdapter.setNewData(list) + mBinding.layoutMenu.visibility = View.VISIBLE + mCenterAdapter.updateData(list) } private fun onGetRelationShipEvent(event: RelationShipEvent) { @@ -200,33 +201,9 @@ class MeFragment : BaseFragment(), View.OnClickListener { || levelSep >= (initInfo?.giveDiamondExperLevel ?: 0) || levelSep >= (initInfo?.giveGiftExperLevel ?: 0) ) { - reloadMenuForDonation(true) + meViewModel.updateDonationMenuVisible(true) } else { - reloadMenuForDonation(false) - } - } - - private fun reloadMenuForDonation(isVisible: Boolean) { - meViewModel.donationMenuVisible = isVisible - val list = mCenterAdapter.data - val itemIndex = list.indexOfFirst { - it.skipType == RouterType.USER_DONATION - } - if (isVisible) { - if (itemIndex == -1) { - val index = list.indexOfFirst { - it.skipType == RouterType.MY_REVENUE - } - if (index == -1) { - mCenterAdapter.addData(meViewModel.donationMenu) - } else { - mCenterAdapter.addData(index, meViewModel.donationMenu) - } - } - } else { - if (itemIndex != -1) { - mCenterAdapter.remove(itemIndex) - } + meViewModel.updateDonationMenuVisible(false) } } @@ -266,12 +243,12 @@ class MeFragment : BaseFragment(), View.OnClickListener { fun onLoginUserInfoUpdateEvent(event: LoginUserInfoUpdateEvent?) { setUserData() vipViewModel.getVipPageInfo() - meViewModel.refreshData() } @SuppressLint("CheckResult") - private fun reloadClanInfo(){ - HallDataManager.get().requestUserClanInfo(AuthModel.get().currentUid).compose(bindToLifecycle()) + private fun reloadClanInfo() { + HallDataManager.get().requestUserClanInfo(AuthModel.get().currentUid) + .compose(bindToLifecycle()) .subscribe { info: UserClanInfo? -> val clanHallInfo = info?.asClanHall() if (clanHallInfo != null) { @@ -320,7 +297,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { } else { mBinding.tvGuild.setText(R.string.me_join_guild) mBinding.ivGuild.singleClick { - CommonWebViewActivity.start(context, familyInfo.getFullFamilyListUrl()) + CommonWebViewActivity.start(context, familyInfo.getFullFamilyListUrl()) } } } @@ -395,9 +372,10 @@ class MeFragment : BaseFragment(), View.OnClickListener { private fun loadVipInfo(data: VipInfo?) { } - private fun onVisibleChanged(isVisible: Boolean) { + private fun onVisibleChanged(isVisible: Boolean, isFirstVisible: Boolean) { if (isVisible) { reloadClanInfo() + meViewModel.requestMenuList() } } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java index 45342bdc7..8e747097c 100644 --- a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java +++ b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java @@ -290,10 +290,7 @@ public class RouterHandler { case RouterType.MY_REVENUE: EarnRecordActivity.start(context); break; - case RouterType.USER_LEVEL: - CommonWebViewActivity.start(context, UriProvider.getUserLevelUrl()); - break; - case RouterType.USER_DONATION: + case RouterType.MY_DONATION: GiveGoldActivity.Companion.start(context); break; default: diff --git a/app/src/main/res/drawable-xxhdpi/home_ic_room_pk.png b/app/src/main/res/drawable-xxhdpi/home_ic_room_pk.png deleted file mode 100644 index 3adbdb3cfc33d7b9c077c6d595230ed0132bb22b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6477 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 LWi@4GARsLY-s|q? diff --git a/app/src/main/res/drawable-xxhdpi/me_ic_menu_donation.png b/app/src/main/res/drawable-xxhdpi/me_ic_menu_donation.png deleted file mode 100644 index d4dfe3f9a029058801aa1e2355702e0e55693916..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7502 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 Y50i8!@Z1q~WdHyG07*qoM6N<$f*+oiRsaA1 diff --git a/app/src/main/res/drawable-xxhdpi/me_ic_menu_dress_shop.png b/app/src/main/res/drawable-xxhdpi/me_ic_menu_dress_shop.png deleted file mode 100644 index f7b932fcc7e99eb783f55b77f3159dd94d1cc277..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3159 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 diff --git a/app/src/main/res/drawable-xxhdpi/me_ic_menu_invite_fan.png b/app/src/main/res/drawable-xxhdpi/me_ic_menu_invite_fan.png deleted file mode 100644 index 802abb61e9031ee63e08d739784cb28dd650b1c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7397 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 Xz_tUS;;}xh00000NkvXXu0mjfh&e(} diff --git a/app/src/main/res/drawable-xxhdpi/me_ic_menu_level.png b/app/src/main/res/drawable-xxhdpi/me_ic_menu_level.png deleted file mode 100644 index b81adf4aea66fdb5f9a02619de717562c341ac8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3632 zcmV-04$tw4P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS|bxA})RCodHn}2Xr)fLC@eY=~) z{N4nlLIU|=weq8C8EVzGM#1q{?Q~kT9nh&-JK8ehufh5UGtG=GN?TexqP5s*p89LHL+ckj-( za|OwltHAa3^^+XOUa7TeqU}fk&UMJq;IC&g&#JDjda<*!^H?q&TDdU8YuUEF2yiZu ze2#6$liiXDMfN*$l{+U3s;#YONjZ-&NMJm*J%O=jS5#EI)z#ItGuuA0258!}X=eb= zALw{$ww<4XdC93E!(_#b7VLHy^W3hfHTu^)Gbsp11V{n*3PmN>bMi^Wyt)V zL5u?Ex9-}tOMn_SWdo3Q9Q_bIu@j^ub_D&zZc<9kI1~0@(#VDtsa}I9^?)QgX+xch zG#o%yZSAxlV5(QRS`8Jp^!1fIMUiE8$|bwFxNt2}Z81p3q&ru}bxT=-F7}L08pkXV z@~?R+U9BjvZGIe$MsDipXx;0rJ5|bu4<8PdmIk-^eCnIXRN|Ej9mHY3io@>k)+Nem z0h%;vQi;#!UjpN$JYG}8Vyyex+xM(bbabk|dwM!Mg2CWXmekb-J<3@fR#8#WE60u< z3!8LEyTl3#iZ7${4oM$#fqoLbi<-sImoB(K!VVuW!*)r%t^Fvs(>wmA5kn_-}7- z@9cvI4`vmGdfSh8dBTJVWyQtC|3bgd8e}=loZn1%@B(#%lkY-o%9JTp#5@aOFx~Bl zdEWDB1xElO;O)^`-$T~4)I|3m3I@WPNG^bUKHr5{$z@b}ElZ9Q>u`3P6AeGDZ*+JC zUH*jpgH|%23)rc-f|DoeLnT$tD6ho&p1$qO3|UNuI@Ls zt>(ej;9)Hg44^%qpt~#xa6X@?NPa_qeBZuZ?iA$e&J*MHS;Zm0b)D@GwETIgQ=RMh$^4wd-W8paX^FfS0~bJ8 zU15ST`38IFpV1qAV2f>p?)oQWA89re@mLL>H>iDJ9A6#M)%43n0H= z{~d-w2bIi7ehPI@0Fukgdw9|ogR6p_{RP&2ETz8qa*8jrxW7pNGhkUUe-x()Fky^d zz~S8&_N)8m->wg(9VkPE$nNvSu0YVml=Sm)42J4l0PWnlvx}RH2LZx#(WJN{n1~Zw zQ&ZD0i!QvOz)-Jga-Fub>3G23f+g7rUnKANQW{!XalgdwCRQU$O27#yn|#Z$$`M%) zKUFo%64^xuvv{Jj{a_q}Ar2QnLMD>j&JE%1WLt;WT)BF!BflV^N;3;CURPnpDwW?iq59)GA$Dy-X4(j&uCa~YE0eA{{Fsu z4;(mPa_r_N1JswB``3gm-+Tf?O9I8HpC%a$dtv9Tk7`}G_%yU$u1Tt z#1RiziuWA}sBPM(nse)2DUk`;?nK6PzygS~JQ9h>&TRxo#>@neYHx4vvn)$2=$FE5 zNW~2DBYQT0ooyBYQkav3f-0s zcYMkSkaSB}ejE@UVmUoa(S&pbb*pP@YbClJwm<1pl5W;EowWeQCUL?^pv3doBmv>3 z@Nw1B%| zfV_qEEYZ04q&&ps$*o%DG)A;~$u3ZhG5;ew7Jew=SFHiRx?<5>-RfzQsVMhZ$Y=c? z5lnYJ()M+6%7F7hrj8PISpy^un3+b*awFzhm*^nrEud_%?dbI^&3#GqVY4frapr{r zYONDclkhpp_NxPyPu+OWrF!GAjguIVZ?e{wTxEQTCq*}Qvfca=GY|Qg%gt|p6|EH;sq~S4=)BY}I1wWv!=~Cyw2=U$7%1A+)%jLMMesB_ zpTpx7%!j~pSUNlT)$%{oXT4N132Ugc__g9YEXAeNi7ejKk2U|2pXq-pGJ7ktDUS%C zM8|y6wiOWMOg59p+ZXOuH@SkNAo-F_z)2@rO6ylpmwc6zO9vP7D5U306#~ zGP2}VDyLqK968bt09%g~WC~k7X?27=Q4C{!b?F z4*br+l*Ty_P6!|w2kYnoqz!;1yGJ#T*YQgrIlZc?>NRHau(UbR)X>my7JdhCoO29) z$#VXXaN}CG^ZkbUoJc1Okc=iEm6erYNtRgB=>`cVv+JFWqueCChWe~YY!Fk33RVKn zSJE_k-?pt=_^=|YKrl@ogXB>GNP0u@kIKt~`*6;eQ#74_8UXMdKB9b)sGW`v?@5w72i(24Zx;5$R0>xwOi)(B0kjHXkL)>`A!K z$!aK}m>gzjqG&Hx^yW~_usMwnyNhLdFMXJ{^J7@<(!G24$gRVuSWZHsQ3pr_EGVdX z$L|kSBlK*_-V=Tyw2N742Lb8d2|+TwSz6y`MLi5psevyFa8KgjB-SDB8QnA%0IA;I zgM9i{vemNuUqIYOgUDi87h-AK0ZC5l>1N&HSaTKiD*!0vGr)mCIHFE_?TXf8n2N(pQnz;lXNjNKQkDt+yY1)p2}DeaL!{pf0Sj_V5*1yDn9Ld zqp_Wv`WKpMCrHOTB09@sI>S6gU?Rp?w`DlYHG+-MxVG7wXgbE?562QZNZ{BK@UnON`XD9j7e5=1QKF(?7Hsd>iR- z<0n6DFXTx95?VjN-Nmw6L*C{Y^K`NR5=9)2BOegsNgVS<9`D!!+9j;0Cf;5EAt?e& z{Rn5QM~T`)LO2=8E997tiDD6Uw)eoQmVsvFG8mTgtj}jPV?ATCou`w<B&te)q)bLv9leouCCt9PV{AHXYiz(DEy3m+wb=+;75Q1 ziS{S+JuU!=f?T$B6C`e9_mUvc7zje&L?F1BD0xg{9g!zpN;h-q_(z+r8yg!ZMx)WI z0qVO1eiC)_pG5i{e9mePwd)BWPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IT2wMj%lRCodHn|qX8Rh5VDIrmmo zKa&m}l8{HII}ZqC7;wVKps)h6h=@qWnE^pyFbbmrqA)zf1x!SOAS)rGFapAeFA#JP zg%QR?B!nQ32`(cMkdOzRgoM00O+V^!?>Y1BN>x*J`&M9lePL-rR*e{4{{tUeRh%Wr0zwf)X(X+>aDll>Z0EAxIB3} zSz46$S(1tNRnikCOc>?5?hGcFV6AP`+S7dWjvxrE*7{6qos(%B%TtOEtCX{iu}=fk zPXW?%oM61Q%7sp^<9M5_&Ai;%IcA&Vtjz3-4=Kgiu;x1W;DehQ8k#<3ZSc>0`(Y5P zXYpD2>~!)WA_*gTG*2Z-B&C~22*h)5sY_C|f%gyl`g-o$zJ2?<DI}A$8J9EMV@6;yu!nFvaOV5 zJ5`*Rcf8hibaQj_lJ4&Anw)?&Tjj<^|45YS888_|GvF)JJb4`=0LnIa7e)PeJnk(* zaj#y#emy$HaoRcdjj_i->k8UM8XKgZl+!zo(2McN7A{m1n*JwoFdRqyfAb7GMSV<_ zMEz44I4)xFMwtE;I_dR2ZTbV`XK)e$PVh)97JKl`H{V2p-b*>4o*h4a{A;v-hL(>* z12EK|$iK{ZQN|ODasB}iKS;h%Vn@;U@2RT^K!xZ-v+AVU+S;E)DCUGHY_ZmS2I*M7 zdGqF!v~j}KH#RmlrPFEukV6jHy>eyw<9X)Hnek*Y*#ZsS-{1f4)~#D*>xd+INZLef zq{jhnrqIqOz+XOfYWqi?e)?%YUsvtBCIHDt^z`&BW99y?kP+;b|LE*ocS&Jgt@D#7 zPyQV9eh<2Z-|}*EbJOhAt5^37cfLZ=teO^#uu^J}Qe-QL?Xpi3dM~fr2IgVgrEyhi zVmQ_WAUHFuVot{l@JYssE3r=#_D_-2%4C4Hd(E0P`xQWr=jmr*Hq6v99UUEq?JI;( z;-jH`e2BgeA3vu~^wh9Ztt7}niN1^!tq*ZDj{12h)4EXou#3~CO-s0L>z)&K}?B}TWh|xu zM@9Y4eAv3KF>~X%CJCM(ZBC2gUX(A}^m=G5<%x_QqVQOBbtLUKV+Je`$&R8`XGd#w1Ad{p@8&oYBVsfCX_tu~&SY8`#4tMxh1W3;(X8GUEQch+As zS4B#S5a2{R$n(69qMJU=xRa?O_B}YUKu-bc*9fD$NUOx5Do%S1(1|CW=rIw-pS_h? z#zf4NhM^xA6T7vubIm&1qgL1X)?>-(D&}2>-kJf+hiL1JR$A5J)q%UytBv!vW6V3s zs^{EZee=cVsz}`heT^iKK?nY$*3OkIPJ0AT@Sv6&<9}8pFrvL=)!qU`+_~cvzTh4x zP7YC(mD!9?EEqAO@jg6!@v;Y{+a9rFbc4B`4>_N^n-MV1;X^kbc@N}eq?7}j(ShBe ze0zCazx(LCc`7-GXs&__gCl+4EM(wps^X!3hMDe9Ci^ej8$)uh0AerW_oyE+@drYa zOL0Bh>g$O7gLu-};8?iN9ZPL%CK=qNw0k;0)MY2ngCd<}o#jnk793uAz+B(F6F2tS zbhrDX&wqZ9Q!Jw-5x8sX;C&6*^LdB29N?;J3Gsfn6puorFjcIibDr~j1|L;OAeZ05 zwpxgh_CUFbO|SW)YxQY5aO!xF4)%wS_DKg_Zqjs-H#*~(crw@>PupG>lTY)YxJhb^ z3Dk8>P0pl<`SVp4V|6W;lGnh`cc~1=sOqS{Jel+*L{gD(R0NP1U7i;|7n&b~aM2jV z7XQb7b;E`Yca+*z!u`V!+j{iMm$gw10#5eB)3(n`1^*LE1;@t&=XTeingeTG-`)~S zoAcuR=2bv4DhrfCn$!f7_Rki26|#2|EB>!g{h;DDCp8;@n)4C?NXE;UWp3bI(Bj2kllm+Wfae7| zJ@0()(YVnU(Wg@+NI(UuxDFH{*6jWLpg9UF;CY);F>EILa$!Arx%rsG=_B(qyQ10kPAG^nTfq6jhk`u?&YtjE4@d8#pA*pichhyFO z=8E1Z?APk*>O^4|MIe!&6HyUIK%^w#*xBQk6!uqK`faI*yIdy>ye^fo z52APcyfPLk$~gLn3?7FH^cOG+H9i?z%n<7tS`k+|KZYR^Z=a%nk=ue~wXz(?P+t;< zk_~Jxe(+>ZU~of-5v*lz$xt_#=oV>5EkDtg{(GOvR z>e)m>|7n22US!U`*x9I3=}Q{|^Bi_hGH(bDC~g7GcXZ0QC#S4l7zD9j9M=#$@YHST zWA|d3$gaeNB$BWq)X4X%Sxrq%NK$kv36R$DDTv^N&@j;uOUqfyq5efh(I;nprSA32 zGWW!UF$cXEOSa-wB{Vv8YJ+G1^|e0_MIbw34QOP1c^-|_qcJJwde^$gDJ zFJUOG&&K<{(_X}AL7@yla?h?t74+rC(%I~~&a%R~YVv3OOa*fFa7WJ&JP1)X9dbO%2>r%q^(27RFg2Vy3sju^EvxOf$crMfF;z zk?dm6opL`)PLQuE;fxYSwFxKSR>wHlHkrVJ7^NCXQzl*?2X(Nr1;oNfbmumwsW{*yh z0HxES3B=AVN?8dns@aQz7xX_=Z=4?aP>}?Utb@h5$>2R_bFzHi0MQubuv8UxDVzV`{H85P z&~M`$7S(!%SL-HMYAxl4)f|8m+D-^pO^+64}itd!AJ$ZV4I5QVTGmoD;@N5m&lr+IN(k zL{%juNbd29emj70ZcnFEk@_`Kg7^uED6;J#4(c#T#CWVaZI8$Q%n`k~G4Qr!w-X;N zZzKc^{03xSX=^Zbf_g=0I${`q zMoJJN)ZVtX$!~`TxUM>iI$2aXkoP*BG+zQ8&fRZZ;qQ#A*tKcx9|{}^xc2f&0e!RQ zC`W{lHbWr4zur&$h12bkOs~6W>iwnf#VTQllksTqE)optwh`zrI@$8HA_1aNqHr%j z=;Qg0@}@ikBXU%!tK`DI&q7VL#eT)0OCiP>LubqB6cI*8*Hb8 z_9>Jfdatg!T*qxn0&d@b<4ZPyypJG6bY-u~Tp_xqF6I8Xug6=wVY<_ole+3A35_C# zKAY_n3Z2MbB1-@0vq;nm=^2y$Gv&2~b?h#W+ki_tIyxp(pWhY5UG}mx{W~f(Zi};1 zXH2gsV=)vxNB2zsiR!K;IOE2R<0iwo1onzz(A2H-JSE>6nMwjgZZ)YiP<`ZgjR^a<>Guhq0kb7HZWH$V+1ysIpd9%PrZer)z3bk4cVH7jDi6w>o8Bx^yr2x(b> zgy__%Q^#a7!5t{FPXb1iQm4t;L0h+MN8XVu5y9ZTtdhkf5TE^=$++w8gG>TCmm78O~YRfI+Lx6K7;0$?n#r@OJY4`5kU86>|JP$}> zg?8|W2VN1lLsNg>dWd9q5f!}$DWA`;QHBIZII9RC>DWbTZ9V9B_+xVP%Uzj79E*-j z%KK~D3S-Z(1HOSTb{9V;-Bl^0)kuMhUTP)4bQBVG1{3`)6HgGONM3-ehGwPwR?<%- zMNW#{u+oWwdPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS{)=5M`RCodHoC|Cm#TmzEckj-Q z9lsxm96LG30RbU^8Wf-^6(A@ zgOEyt5TX=;+7O5cZGcpX<5wIL5<7NGY@hdT`}_8GFS~np=6t!_C6-4T&(3?k|Ng&k z9y@2HX5B0Tvk1&0FpIz}0;eki+Nm<|rAwDa#>dBN6N$te%d%u#H2(TL~8uug81M z0M%6`{<7-o+S-bWrX8cBgU2$oRj{OD0HiHiwCL=3+*;4fbT<-~Wf;B8Q2#*i+q%2E zUmPAj@@`dC)juiQ2tH?!7aV7ZybBE@aZYu0)gDx?KSP@ZNeXsckVd_YEL^y7IYPcb z+EoCMr9W#UYoE0k;7{GU2z?Nc-emf>NLzsqxp__~ZJh~FSJc+l_6-jY|BtwoEvWO- zx1bHTw6s(hM&z5UW1geo$_$MojCB}8{b+A*_mdg&-6S0b{t)&(jBf_yOm=I;vJ&@J zR8+jQd-v|6ZpA``S>EW0HQmwC(Tw2h5auCT5^&O91bP3lEdA%r&5eIJaNxjH#@2!z zJF2Vew?n4IwAF?Wf`r;?E8}rUcvc)&CF&`1jea+}hjQ`(J-nezAfvX!-Kx zVN~ksP)NOu0Ow#Ef;K~u2K}uKV`EjffA(4D=L~sTHsk2gqazsbE!Z3}>KEY4@!pqg zF9qo5`>dBf#rI&#q-@@=8z?fY3W=cX0c_;{nP&b@1T6FWkg@ z!q(Q-f5&1IEEct8)Mutkb7c(SS`2&{hWvA|K4|k$bFH0mTvu0D zxAVx6Bl{^ctrwIRKr)5b*VnIRKlL;no)0)dCW>u206342jaA+|FtGO!@sr|)hK44Z zni}6`A$ph&&c{~;I$~^E9ZQ7EtEy@zo12?<4h|0Hd@2wWEYNm(w5h3SF6)g4>F~$o zRtHP)wk-6&AJEn`Ha5Qg!3Q5q2FskJxUpctf)$}qXai$|*=a9Lx|MCo7So)(tG~ZL zrhq%qGG$&){Z5*Zaz!Dm*Rser+9w}#{UK{ z@lI@_tlX!ZNpn&$nZiS%@@qpOT@2!7_#m*-$uT;9)-d$7blgY0Bu*BI%v^uNFw?(< zUD7JN0|6LOxeol-+3*gsP~9_?%H;%5I2>L}Cr{uPurVr&R1C<{DllTMwrRq zWMWRr-gv+*!?1q~Od52KL|KMg_rW^Z8T(WURg%iAI5ja`Gr?s7V*lGFH7^>AD6d(4yZdvi0 z`}(?HBQFy*gH=w4c$yr55H}39l@o{S5%V_W{vGSOTUZ=F&Z2iLv}ezrL)f5akWMZQ zG~vf7^v8=YUUA>%&719Auc#Uz&IIQ&Bu$q6`}fOoMYd8tC$pHv-s$CNH2N`Txn~gX z=Sbiq7aU*d(>x+<;br?AaoN0Pb?!88v8Iuot$4*wJZpv1IRksT7chJi5&Yn6TpQ0O zSDo?X%v>@F9pIzw7RWKob4KSfC}U!$=jcMn*VdQ4r^d-anZ)rA2nCv+%OG8^=Z&#kI(g<5A!s24&Lsv{KR zb^?~c4M|tx!;&_xIt)|2pheWW$KJ7mhw{0~npe4!F~~Ti)`l$ZCdO5{A?6b1*bL$s zHrd{dOGsKJ%(^o)rsQ(M`n;sgqf$v2^vjQ|OTsbr2n;DFv{~bZHiJl$cq&bpB=KbV zN1okeU6O~ac~vPoK#ya0R7^b-o>ZExQldhRx7A6&khlQnK0EnNIZZd!LmM~JP7z$u zRc!2-I+sqDxrR6xI_hK_YQr(uqH=D!6D~6?buRd9JJ}c&9iVbkEoC~dwr48`01-Mc zd!=kp3LJl#YJioa)0qblGg1QpmDx=23!R+a18GuD47eC_+jvVp^dz5h`sTo0i)Nu>(NVdC!LB~t6(1l}NAx5r}Juxk7x&PpY zimsBGGh*2huu}7Vp^prgk7CB%Fu)?5EhjuOItMFC12q|Tl!62P|Tg5wrk*=BC zQpsx2asr4&$6l<4cPtWV;kOf81L@u}8J|Dyc}tyBw+w+ry+nOv8Ueb8yuS@Nh5q59EUv)i0)b_M0~mqjDlm1@rn7p&d$!!Y;ENP5I-N-!*pXTLjaTg=l#Q3tBiJSo9OTe*~ zmX2SALh;3D^QAPH_Z1ltJi=j4asen|y876li28Y0V{bLk5F0or^a4MfXH?2W<+|Ch zuIBsuzNzZw1due)-@mt)i`qAGPx@v+`UXjWm41<2%1-61_~e|B8H(e->e$%R)4iMclrCq0q!m8! zA0~L3n^!MJB9XZ!cW0(-Jwv9cCXhdo(9EzU61x9TA>vvGHtET95;R?vNxF!Y{38#_ z498h##%afz)=!-Ph41j%7{3%4+O=yJo1R%Wi@+=bvk1&0FpI!UM&SRwuc6wQ*Q3|~ z0000dTrV>xDKHZ?OeWi@4GARsLYrb$w6 diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index b3e573850..584457f25 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -329,13 +329,16 @@ app:layout_constraintVertical_bias="0.82" /> + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@id/iv_vip" + tools:visibility="visible"> ? = launchRequest { @@ -195,6 +197,11 @@ object HomeModel : BaseModel() { api.getHomeMyCollectRoomList(pageNum, pageSize) } + suspend fun requestMeCenterInfoList(): List? = + launchRequest { + api.requestMeCenterInfoList() + } + private interface Api { /** @@ -408,6 +415,11 @@ object HomeModel : BaseModel() { @Query("pageSize") pageSize: Int ): ServiceResult> + /** + * 个人主页 + */ + @GET("personal/center/list") + suspend fun requestMeCenterInfoList(): ServiceResult> } } \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java b/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java index 710363785..39c475b1e 100644 --- a/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java +++ b/core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java @@ -209,16 +209,18 @@ public class RouterType { */ public static final int MY_SET = 75; + /** + * 76-切换分区 + */ + public static final int SWITCH_REGION= 76; + + /** + * 77-我的转赠 + */ + public static final int MY_DONATION = 77; + /** * 收益记录（目前只是本地用到，所以用了100000） */ public static final int MY_REVENUE = 100000; - /** - * 用户等级（目前只是本地用到，所以用了100001） - */ - public static final int USER_LEVEL = 100001; - /** - * 我的转赠（目前只是本地用到，所以用了100002） - */ - public static final int USER_DONATION = 100002; } diff --git a/core/src/main/java/com/chwl/core/room/bean/MeCenterInfo.kt b/core/src/main/java/com/chwl/core/room/bean/MeCenterInfo.kt index 49d5db9ff..9bcfcbbb4 100644 --- a/core/src/main/java/com/chwl/core/room/bean/MeCenterInfo.kt +++ b/core/src/main/java/com/chwl/core/room/bean/MeCenterInfo.kt @@ -2,12 +2,14 @@ package com.chwl.core.room.bean data class MeCenterInfo( val icon: Int? = null, + val centerCode: String? = null, val centerBadge: String? = null, - val centerId: Int = 0, - val centerName: String = "", - val centerPic: String = "", - val centerSeq: Int = 0, - val centerStatus: Int = 0, - val centerUrl: String = "", - val skipType: Int = 0, + val centerId: Int? = null, + var centerName: String? = null, + val centerPic: String? = null, + val androidCenterPic: String? = null, + val centerSeq: Int? = null, + val centerStatus: Int? = null, + val centerUrl: String? = null, + val skipType: Int? = null, ) \ No newline at end of file