From ef052fff6c4e572eba8f4f49d12462557b52852b Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Wed, 25 Dec 2024 15:01:50 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=E4=BF=AE=E5=A4=8D=E9=BA=A6=E4=BD=8D?= =?UTF-8?q?UI=E5=BC=82=E5=B8=B8,=20=E4=BF=A1=E8=AA=89=E7=AD=89=E7=BA=A7=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chwl/app/home/fragment/MeFragment.kt | 4 ++ .../chwl/app/pay/activity/GiveGoldActivity.kt | 66 ++++++++++++++----- .../chwl/app/ui/bean/RechargeUserInfo.java | 16 +++++ app/src/main/res/layout/list_item_micro.xml | 23 ++++--- mode.json | 53 ++++----------- 5 files changed, 96 insertions(+), 66 deletions(-) create mode 100644 app/src/main/java/com/chwl/app/ui/bean/RechargeUserInfo.java 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 75431e909..55c6a8d6d 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 @@ -196,9 +196,12 @@ class MeFragment : BaseFragment(), View.OnClickListener { private fun setDonation(userInfo: UserInfo) { val initInfo = InitialModel.get().cacheInitInfo + val diamondList = initInfo?.giveDiamondErbanNoList val giftList = initInfo?.giveGiftErbanNoList + val levelSep = userInfo.userLevelVo.experLevelSeq + if (diamondList?.contains(userInfo.erbanNo) == true || giftList?.contains(userInfo.erbanNo) == true || levelSep >= (initInfo?.giveDiamondExperLevel ?: 0) @@ -208,6 +211,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { } else { meViewModel.updateDonationMenuVisible(false) } + } private fun copyName(erbanNo: String) { diff --git a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt index 828425bbb..2d698e174 100644 --- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt @@ -17,16 +17,24 @@ import com.chwl.app.common.EmptyViewHelper import com.chwl.app.databinding.ActivityGiveGoldBinding import com.chwl.app.pay.GiveGoldModel import com.chwl.app.pay.adapter.LatelyGiveAdapter +import com.chwl.app.ui.bean.RechargeUserInfo import com.chwl.app.ui.utils.RVDelegate import com.chwl.app.ui.utils.load import com.chwl.app.ui.utils.loadAvatar +import com.chwl.core.bean.response.ServiceResult import com.chwl.core.gift.GiftModel import com.chwl.core.user.UserModel import com.chwl.core.user.bean.DiamondGiveHistoryInfo +import com.chwl.core.utils.net.RxHelper +import com.chwl.library.common.util.ClickUtils.click +import com.chwl.library.common.util.doLog import com.chwl.library.common.util.setViewWH +import com.chwl.library.net.rxnet.RxNet import com.chwl.library.utils.ResUtil import com.example.lib_utils.ktx.getString import com.netease.nim.uikit.StatusBarUtil +import io.reactivex.Single +import retrofit2.http.GET /** * 轉贈鉆石頁面 @@ -111,25 +119,39 @@ class GiveGoldActivity : BaseViewBindingActivity() { } } + binding.more.click { + //todo do 待完善: 规则h5 - UserModel.get().cacheLoginUserInfo?.let { user-> - - binding.enbanNo.text = R.string.text_user_id.getString(user.erbanNo) - binding.charmLevel.load(user.userLevelVo?.charmUrl?:"") - binding.userLevel.load(user.userLevelVo?.experUrl?:"") - binding.nick.text = user.nick - binding.avatar.loadAvatar(user.avatar) - - binding.starLayout.removeAllViews() - for (i in 0 until 5) { - val star = ImageView(context) - star.setViewWH(15, 15) - star.setImageResource( if (true) R.drawable.c_draw_un else R.drawable.c_draw_un) - binding.starLayout.addView(star) - } } + getRechargeUserInfo() + .compose(bindToLifecycle()) + .doOnSuccess { + " data = $it".doLog() + UserModel.get().cacheLoginUserInfo?.let { user-> + + binding.enbanNo.text = R.string.text_user_id.getString(user.erbanNo) + binding.charmLevel.load(user.userLevelVo?.charmUrl?:"") + binding.userLevel.load(user.userLevelVo?.experUrl?:"") + binding.nick.text = user.nick + binding.avatar.loadAvatar(user.avatar) + + binding.starLayout.removeAllViews() + if (it != null) { + for (i in 0 until 5) { + val star = ImageView(context) + star.setViewWH(15, 15) + //todo do 待完善: 信誉等级 星星图片 + star.setImageResource( if (i < it.starLevel) R.drawable.c_draw_focused else R.drawable.c_draw_un) + binding.starLayout.addView(star) + } + } + } + + }.subscribe() + + } override fun onResume() { @@ -155,4 +177,18 @@ class GiveGoldActivity : BaseViewBindingActivity() { return true } + + private fun getRechargeUserInfo(): Single { + return api.getRechargeUserInfo() + .compose(RxHelper.handleBeanData()) + .compose(RxHelper.handleSchedulers()) + } + + private val api: Api = RxNet.create(Api::class.java); + interface Api { + @GET("/recharge/user/info") + fun getRechargeUserInfo(): Single> + } + + } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/bean/RechargeUserInfo.java b/app/src/main/java/com/chwl/app/ui/bean/RechargeUserInfo.java new file mode 100644 index 000000000..9548dbf87 --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/bean/RechargeUserInfo.java @@ -0,0 +1,16 @@ +package com.chwl.app.ui.bean; + + +import lombok.Data; + +@Data +public class RechargeUserInfo { + public long id; + public long uid; + public long type; + public int starLevel; + public long erbanNo; + public String nick; + public String avatar; + public int isOnline; +} diff --git a/app/src/main/res/layout/list_item_micro.xml b/app/src/main/res/layout/list_item_micro.xml index 710ad87a0..fea2c451b 100644 --- a/app/src/main/res/layout/list_item_micro.xml +++ b/app/src/main/res/layout/list_item_micro.xml @@ -1,19 +1,20 @@ - + android:clipChildren="false" + android:clipToPadding="false" + android:orientation="vertical"> + tools:background="#FF5722" + android:layout_gravity="center" />