diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt index 42863d9a6..e55e4b09f 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt @@ -45,8 +45,8 @@ class EarnRecordActivity : BaseViewBindingActivity(), earnRecordModel.earnRecordLiveData.observe(this) { it?.let { - binding.tvDiamondNum.text = it.diamonds.toString() - binding.tvGoldNum.text = it.golds.toString() + binding.tvDiamondNum.text = String.format(it.diamonds.toString()) + binding.tvGoldNum.text = String.format(it.golds.toString()) if (it.isClanElder) { binding.tvGoldDetail.visibility = View.VISIBLE binding.tvConvertWithdraw.visibility = View.VISIBLE diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt index fa1b0dd2e..7e3dd0ada 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt @@ -97,7 +97,7 @@ class EarnWithdrawActivity : BaseViewBindingActivity - binding.edGold.setText(it.golds.toString()) + binding.edGold.setText(String.format(it.golds.toString())) } binding.tvWithdraw.setOnClickListener { view -> diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt index d36761a56..f6c1e89ca 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt @@ -25,6 +25,7 @@ import com.yizhuan.erban.earn.adapter.GoldRoomAdapter import com.yizhuan.erban.module_hall.hall.view.dialog.TimePickerDialog import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration +import com.yizhuan.xchat_android_core.earn.bean.HallVo import com.yizhuan.xchat_android_core.earn.bean.MemberSettlement /** @@ -42,6 +43,7 @@ class GoldDetailActivity : BaseViewBindingActivity(), private lateinit var roomPopupWindow: PopupWindow private var settlementList : List ?= null + private var hallVoList : List ?= null companion object { @@ -121,7 +123,7 @@ class GoldDetailActivity : BaseViewBindingActivity(), roomPopupWindow.isOutsideTouchable = true roomPopupWindow.isFocusable = true - val list = settlementList?.map { it.hallName }?.toMutableList() + val list = hallVoList?.map { it.hallName }?.toMutableList() list?.add(0, getString(R.string.all)) val recyclerview = contentView.findViewById(R.id.mRecyclerView) val goldRoomAdapter = GoldRoomAdapter() @@ -159,9 +161,10 @@ class GoldDetailActivity : BaseViewBindingActivity(), earnRecordModel.memberSettleLiveData.observe(this) { it?.let { - binding.tvTotalGold.text = it.total.toString() + binding.tvTotalGold.text = String.format(it.total.toString()) rvDelegate.setNewData(it.memberSettlement) settlementList = it.memberSettlement + hallVoList = it.hallVoList } } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.kt index 4bfcd3c03..0624f627a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserGiftActivity.kt @@ -1,78 +1,56 @@ -package com.yizhuan.erban.ui.user; +package com.yizhuan.erban.ui.user -import android.os.Bundle; -import android.widget.LinearLayout; +import android.widget.LinearLayout +import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.viewpager.widget.ViewPager +import com.netease.nim.uikit.StatusBarUtil +import com.yizhuan.erban.R +import com.yizhuan.erban.base.BaseViewBindingActivity +import com.yizhuan.erban.databinding.ActivityUserGiftBinding +import com.yizhuan.erban.ui.user.adapter.CommonWrapIndicatorAdapter +import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter +import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator +import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper +import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.yizhuan.xchat_android_library.utils.ResUtil -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +class UserGiftActivity : BaseViewBindingActivity() { -import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter; -import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter; -import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_library.utils.ResUtil; + override fun init() { + initWhiteTitleBar(ResUtil.getString(R.string.ui_user_usergiftactivity_01)) -import java.util.ArrayList; -import java.util.List; - -public class UserGiftActivity extends BaseActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_user_gift); - initWhiteTitleBar(ResUtil.getString(R.string.ui_user_usergiftactivity_01)); - ViewPager viewPager = findViewById(R.id.view_pager); - MagicIndicator magicIndicator = findViewById(R.id.magic_indicator); - List fragmentList = new ArrayList<>(2); + val viewPager: ViewPager = binding.viewPager + val magicIndicator: MagicIndicator = binding.magicIndicator + val fragmentList: MutableList = ArrayList(2) //礼物类型 1:普通礼物;2:辛运礼物 - fragmentList.add(UserInfoGiftFragment.newInstance(1,true)); - fragmentList.add(UserInfoGiftFragment.newInstance(2,true)); - UserInfoPagerAdapter pagerAdapter = new UserInfoPagerAdapter(getSupportFragmentManager(), fragmentList); - final List tagList = new ArrayList<>(2); - tagList.add(ResUtil.getString(R.string.ui_user_usergiftactivity_02)); - tagList.add(ResUtil.getString(R.string.ui_user_usergiftactivity_03)); - CommonNavigator commonNavigator = new CommonNavigator(context); - commonNavigator.setTitleWrapContent(true); - UserInfoIndicatorAdapter magicIndicatorAdapter = new UserInfoIndicatorAdapter(context, tagList); - magicIndicatorAdapter.setOnItemSelectListener((position, view) -> { - viewPager.setCurrentItem(position); - }); - commonNavigator.setAdapter(magicIndicatorAdapter); - magicIndicator.setNavigator(commonNavigator); - commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - viewPager.setOffscreenPageLimit(2); - viewPager.setAdapter(pagerAdapter); - ViewPagerHelper.bind(magicIndicator, viewPager); - viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } - - @Override - public void onPageSelected(int position) { - viewPager.requestLayout(); - } - - @Override - public void onPageScrollStateChanged(int state) { - } - }); - + fragmentList.add(UserInfoGiftFragment.newInstance(1, true)) + fragmentList.add(UserInfoGiftFragment.newInstance(2, true)) + val pagerAdapter = UserInfoPagerAdapter(supportFragmentManager, fragmentList) + val tagList: MutableList = ArrayList(2) + tagList.add(getString(R.string.me_ordinary_gift)) + tagList.add(getString(R.string.me_lucky_gift)) + val commonNavigator = CommonNavigator(context) + commonNavigator.setTitleWrapContent(true) + val magicIndicatorAdapter = CommonWrapIndicatorAdapter(context, tagList) + magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? -> + viewPager.currentItem = position + } + commonNavigator.adapter = magicIndicatorAdapter + magicIndicator.navigator = commonNavigator + commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE + viewPager.offscreenPageLimit = 2 + viewPager.adapter = pagerAdapter + ViewPagerHelper.bind(magicIndicator, viewPager) } - @Override - protected boolean needSteepStateBar() { - return true; + override fun needSteepStateBar(): Boolean { + return true } - @Override - protected void setStatusBar() { - StatusBarUtil.transparencyBar(this); - StatusBarUtil.StatusBarLightMode(this); + override fun setStatusBar() { + StatusBarUtil.transparencyBar(this) + StatusBarUtil.StatusBarLightMode(this) } -} + +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java index ac052fa47..c1cfdd524 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoGiftFragment.java @@ -159,7 +159,7 @@ public class UserInfoGiftFragment extends BaseBindingFragment diff --git a/app/src/main/res/layout/activity_user_gift.xml b/app/src/main/res/layout/activity_user_gift.xml index 71f9baade..8f67485ec 100644 --- a/app/src/main/res/layout/activity_user_gift.xml +++ b/app/src/main/res/layout/activity_user_gift.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_normal_1c1b22" + android:background="@color/color_white" android:orientation="vertical"> + android:paddingStart="13dp" + android:paddingEnd="10dp" /> - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + diff --git a/app/src/main/res/layout/item_gold_room_popwindow.xml b/app/src/main/res/layout/item_gold_room_popwindow.xml index cd71440c0..983cbe793 100644 --- a/app/src/main/res/layout/item_gold_room_popwindow.xml +++ b/app/src/main/res/layout/item_gold_room_popwindow.xml @@ -7,6 +7,7 @@ android:background="@color/color_white" android:paddingTop="@dimen/dp_4" android:paddingBottom="@dimen/dp_4" + android:singleLine="true" android:maxLines="1" android:ellipsize="end" android:textColor="@color/color_1F1A4E" diff --git a/app/src/main/res/layout/layout_belong_room_view.xml b/app/src/main/res/layout/layout_belong_room_view.xml index 0da534db2..63293a8d2 100644 --- a/app/src/main/res/layout/layout_belong_room_view.xml +++ b/app/src/main/res/layout/layout_belong_room_view.xml @@ -8,7 +8,7 @@ , val memberSettlement: List ) \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt index f9cf471d1..4b13dada7 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt @@ -1,10 +1,11 @@ package com.yizhuan.xchat_android_core.earn.bean import java.io.Serializable +import java.math.BigDecimal data class ConfigWithdrawInfo( val account: WithdrawAccount? = null, - val golds: Double,//钱包当前金币数 + val golds: BigDecimal,//钱包当前金币数 val remainTimes: Int,//周剩余次数 val fee: Double,//手续费 val minGolds: Long, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt index ba8546f8d..def7f0c14 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt @@ -1,10 +1,12 @@ package com.yizhuan.xchat_android_core.earn.bean +import java.math.BigDecimal + data class EarnRecordInfo( val uid: Long, - val diamonds: Double, + val diamonds: BigDecimal, val crystals: Double, - val golds: Double, + val golds: BigDecimal, val isClan: Boolean, val isClanElder: Boolean ) \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt index 1bff8bf9f..f4b313a41 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt @@ -1,10 +1,11 @@ package com.yizhuan.xchat_android_core.earn.bean import java.io.Serializable +import java.math.BigDecimal data class GoldToDiamondInfo( - val diamonds: Double, - val golds: Double, + val diamonds: BigDecimal, + val golds: BigDecimal, val rate: Double, val maxDiamonds: Long, val minDiamonds: Long, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt new file mode 100644 index 000000000..623b9eb64 --- /dev/null +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt @@ -0,0 +1,6 @@ +package com.yizhuan.xchat_android_core.earn.bean + +data class HallVo( + val hallId: Long, + val hallName: String, +) \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/MemberSettlement.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/MemberSettlement.kt index 4555b862d..65bb9a97d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/MemberSettlement.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/MemberSettlement.kt @@ -1,11 +1,13 @@ package com.yizhuan.xchat_android_core.earn.bean +import java.math.BigDecimal + data class MemberSettlement( val uid: Long, val nick: String,//昵称 val avatar: String,//头像 - val exchangeGolds: Double,//兑换金币数 - val settlementGolds: Double,//结算金币数 + val exchangeGolds: BigDecimal,//兑换金币数 + val settlementGolds: BigDecimal,//结算金币数 val hallId: Long, val hallOwnerUid: Long, val hallAvatar: String,//房间头像