From c7e94472cef542b94112a113d92f9d9767b25242 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Tue, 3 Jan 2023 14:46:59 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/earn/activity/EarnRecordActivity.kt |  6 ++--
 .../erban/earn/activity/GoldDetailActivity.kt |  5 ++-
 .../main/res/layout/activity_earn_record.xml  | 33 +++----------------
 .../main/res/layout/activity_gold_detail.xml  | 30 ++++++++++++++---
 app/src/main/res/values/strings.xml           |  4 +--
 .../bean/ClanHallMemberIncomeTotalInfo.kt     |  4 +++
 6 files changed, 42 insertions(+), 40 deletions(-)

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 bfebc947c..bf2fbb735 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
@@ -49,8 +49,10 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
                 binding.tvGoldNum.text = String.format(it.golds.toString())
                 if (it.isClanElder) {
                     binding.tvGoldDetail.visibility = View.VISIBLE
+                    binding.tvConvertDiamond.visibility = View.GONE
                 } else {
                     binding.tvGoldDetail.visibility = View.GONE
+                    binding.tvConvertDiamond.visibility = View.VISIBLE
                 }
             }
         }
@@ -79,7 +81,6 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
         binding.tvDiamondDetail.setOnClickListener(this)
         binding.tvGoldDetail.setOnClickListener(this)
         binding.tvConvertDiamond.setOnClickListener(this)
-        binding.tvConvertWithdraw.setOnClickListener(this)
     }
 
     override fun onClick(view: View?) {
@@ -105,9 +106,6 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
             R.id.tvConvertDiamond -> {//兑换钻石
                 earnRecordModel.getGoldToDiamondInfo()
             }
-            R.id.tvConvertWithdraw -> {//提现
-                earnRecordModel.getConfigWithdraw()
-            }
         }
     }
 
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 cb47a5a21..47b81f796 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
@@ -273,7 +273,10 @@ class GoldDetailActivity : BaseViewBindingActivity<ActivityGoldDetailBinding>(),
 
         earnRecordModel.memberSettleLiveData.observe(this) {
             it?.let {
-                binding.tvTotalGold.text = String.format(it.total.toString())
+                binding.tvTotalGold.text = FormatUtils.formatToShortDown(it.totalRemainGolds)
+                binding.tvGuildRevenueGold.text = FormatUtils.formatToShortDown(it.totalEarnGolds)
+                binding.tvAllMemberGold.text = FormatUtils.formatToShortDown(it.totalGiftGolds)
+                binding.tvMemberExchangeGold.text = FormatUtils.formatToShortDown(it.totalExchangeGolds)
                 settlementList = it.hallMemberMap
                 mGoldRoomAdapter.setNewData(it.hallVoList)
                 if (it.hallVoList.isNotEmpty()) {
diff --git a/app/src/main/res/layout/activity_earn_record.xml b/app/src/main/res/layout/activity_earn_record.xml
index e477e890e..c7e9b5472 100644
--- a/app/src/main/res/layout/activity_earn_record.xml
+++ b/app/src/main/res/layout/activity_earn_record.xml
@@ -96,6 +96,7 @@
         android:layout_marginStart="@dimen/dp_15"
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_15"
+        android:paddingBottom="@dimen/dp_18"
         android:background="@drawable/bg_earn_gold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -126,10 +127,8 @@
             android:textColor="@color/color_572714"
             android:textSize="@dimen/sp_18"
             android:textStyle="bold"
-            android:layout_marginBottom="@dimen/dp_20"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvGold"
-            app:layout_constraintBottom_toBottomOf="parent"
             tools:text="123,456,789,000" />
 
         <com.coorchice.library.SuperTextView
@@ -137,45 +136,21 @@
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="13dp"
-            app:layout_goneMarginEnd="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_18"
+            android:layout_marginEnd="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_18"
             android:gravity="center"
             android:text="@string/convert_diamond"
             android:textColor="@color/color_93570B"
             android:textSize="@dimen/sp_16"
             android:textStyle="bold"
             app:corner="@dimen/dp_20"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tvConvertWithdraw"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvGoldNum"
             app:stroke_color="@color/color_93570B"
             app:stroke_width="1dp" />
 
-        <com.coorchice.library.SuperTextView
-            android:id="@+id/tvConvertWithdraw"
-            android:layout_width="0dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_18"
-            android:visibility="gone"
-            android:gravity="center"
-            android:text="@string/withdraw"
-            android:textColor="@color/color_582815"
-            android:textSize="@dimen/sp_16"
-            android:textStyle="bold"
-            app:corner="@dimen/dp_20"
-            app:layout_goneMarginEnd="@dimen/dp_20"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/tvConvertDiamond"
-            app:layout_constraintTop_toBottomOf="@+id/tvGoldNum"
-            app:solid="@color/color_ECC36A" />
-
         <TextView
             android:id="@+id/tvGoldDetail"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_gold_detail.xml b/app/src/main/res/layout/activity_gold_detail.xml
index 89ab82c51..0fa3c570f 100644
--- a/app/src/main/res/layout/activity_gold_detail.xml
+++ b/app/src/main/res/layout/activity_gold_detail.xml
@@ -106,8 +106,8 @@
             app:layout_constraintBaseline_toBaselineOf="@+id/tvGoldCoin"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvMemberGold"
-            android:text="@string/total_member_gold"
+            android:id="@+id/tvAdd"
+            android:text="+"
             android:textSize="@dimen/sp_10"
             android:textColor="@color/color_572714"
             android:layout_width="wrap_content"
@@ -117,8 +117,19 @@
             app:layout_constraintBaseline_toBaselineOf="@+id/tvGuildRevenue"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvMemberExchange"
-            android:text="@string/total_member_exchange"
+            android:id="@+id/tvMemberGold"
+            android:text="@string/total_member_gold"
+            android:textSize="@dimen/sp_10"
+            android:textColor="@color/color_572714"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_10"
+            app:layout_constraintStart_toEndOf="@+id/tvAdd"
+            app:layout_constraintBaseline_toBaselineOf="@+id/tvAdd"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvReduce"
+            android:text="-"
             android:textSize="@dimen/sp_10"
             android:textColor="@color/color_572714"
             android:layout_width="wrap_content"
@@ -127,6 +138,17 @@
             app:layout_constraintStart_toEndOf="@+id/tvMemberGold"
             app:layout_constraintBaseline_toBaselineOf="@+id/tvMemberGold"/>
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvMemberExchange"
+            android:text="@string/total_member_exchange"
+            android:textSize="@dimen/sp_10"
+            android:textColor="@color/color_572714"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_10"
+            app:layout_constraintStart_toEndOf="@+id/tvReduce"
+            app:layout_constraintBaseline_toBaselineOf="@+id/tvReduce"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTotalGold"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 330c21541..60f0ef2bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5020,8 +5020,8 @@
     <string name="have_converted">已兌:%s</string>
     <string name="total_income_diamond">總收入(鉆石)</string>
     <string name="basic_summary_counts_as_gold">基礎總結算金币  =</string>
-    <string name="guild_revenue">公會收益     +</string>
-    <string name="total_member_gold">成員總金幣     -</string>
+    <string name="guild_revenue">公會收益</string>
+    <string name="total_member_gold">成員總金幣</string>
     <string name="total_member_exchange">成員總兌換</string>
     <string name="shield_manager">屏蔽管理</string>
     <string name="your_shield_list_is_empty">你的屏蔽列表為空哦!</string>
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
index ac060fd45..7eaf1371c 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt
@@ -6,6 +6,10 @@ import java.math.BigDecimal
 @Data
 data class ClanHallMemberIncomeTotalInfo(
     val total: BigDecimal,
+    val totalRemainGolds: Double,
+    val totalEarnGolds: Double,
+    val totalGiftGolds: Double,
+    val totalExchangeGolds: Double,
     val hallVoList: List<HallVo>,
     val hallMemberMap:Map<Long, HallMemberGoldFlowTotalInfo>
 )
\ No newline at end of file