feat: bugFIx , 代理翻译

2025-02-27 15:47:51 +08:00
parent 9f6f785dbb
commit fe4a576b17
15 changed files with 387 additions and 159 deletions
--- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt
@@ -508,6 +508,14 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
            mPageManager?.scrollToPagerIndex(0)
        }

+        mGiftDataSelect.clear()
+        val iterator = mGiftDataSelectPos.iterator()
+        while (iterator.hasNext()) {
+            val next = iterator.next().value
+            if (next.count <= 0) {
+                iterator.remove()
+            }
+        }
        mIsGiftReview = false

    }
@@ -527,7 +535,6 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
        binding.redBagDesc.setPadding2(bottom =  0.toDP())

        mGiftDataSelect.clear()
-
        val iterator = mGiftDataSelectPos.iterator()
        while (iterator.hasNext()) {
            val next = iterator.next().value
@@ -667,6 +674,7 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {

        if (!items.isVerify()) {
            R.string._ver_24_sentLuckyBagNoSelect.doToast()
+            isSenting = false
            return
        }

--- a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt
@@ -16,6 +16,7 @@ import com.chwl.app.ui.search.SearchActivity
 import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
 import com.chwl.app.utils.HomeUIManager
+import com.chwl.app.utils.RoomHelperManager
 import com.chwl.core.DemoCache

 /**
@@ -39,11 +40,13 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), View.OnClic
            R.id.layout_title_bar->{
                if (BuildConfig.DEBUG) {
                    //todo do  测试代码
-                    context?.let {
+                    context?.let { context->

-                            val i = 1/0
+//                            val i = 1/0
 //                        DemoActivity.start(it)
-                        RoomLuckyBagDialog().show(it)
+                        RoomHelperManager.test {
+                            RoomLuckyBagDialog().show(context)
+                        }
 //                        R.string._ver_24_cpInRoomTips.getString("string-1", "string-2", "string-3").doToastDeBug()
 //                        R.string._ver_24_cpUpMicTips.getString("string-1", "string-2", "string-3").doToastDeBug()
 //                        GiftDialog(it,3224,false,false,false).show()
--- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
+++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
@@ -145,6 +145,46 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
        }


+        UserModel.get().cacheLoginUserInfo?.let { user->
+            binding.enbanNo.text = R.string.text_user_id.getString(user.erbanNo)
+            binding.charmLevel.load(user.userLevelVo?.charmUrl?:"")
+            binding.charmLevel.setVis(user.userLevelVo?.charmUrl.isVerify())
+            binding.userLevel.load(user.userLevelVo?.experUrl?:"")
+            binding.charmLevel.setVis(user.userLevelVo?.experUrl.isVerify())
+            binding.nick.text = user.nick
+            binding.avatar.loadAvatar(user.avatar)
+        }
+
+
+
+        binding.arDetail.click {
+            GiveGoldBiliActivity.start(context)
+        }
+        binding.enDetail.click {
+            GiveGoldBiliActivity.start(context)
+        }
+        binding.agent.click {
+            GiveGoldAgentsActivity.start(context)
+        }
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+        loadData(true)
+        GiftModel.get().requestKnapGiftInfos().subscribe()
+        loadUserCardInfo()
+    }
+
+    @SuppressLint("CheckResult")
+    fun loadData(isRefresh: Boolean) {
+        binding.refreshLayout.isRefreshing = isRefresh
+        pageNum = if (isRefresh) 1 else (pageNum + 1)
+        giveGoldModel.getDiamondListInfo(pageNum, pageSize)
+
+    }
+
+    private fun loadUserCardInfo() {
        getRechargeUserInfo()
            .compose(bindToLifecycle())
            .doOnSuccess {
@@ -177,43 +217,6 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {

                }
            }.subscribe()
-
-
-        UserModel.get().cacheLoginUserInfo?.let { user->
-            binding.enbanNo.text = R.string.text_user_id.getString(user.erbanNo)
-            binding.charmLevel.load(user.userLevelVo?.charmUrl?:"")
-            binding.charmLevel.setVis(user.userLevelVo?.charmUrl.isVerify())
-            binding.userLevel.load(user.userLevelVo?.experUrl?:"")
-            binding.charmLevel.setVis(user.userLevelVo?.experUrl.isVerify())
-            binding.nick.text = user.nick
-            binding.avatar.loadAvatar(user.avatar)
-        }
-
-
-
-        binding.arDetail.click {
-            GiveGoldBiliActivity.start(context)
-        }
-        binding.enDetail.click {
-            GiveGoldBiliActivity.start(context)
-        }
-        binding.agent.click {
-            GiveGoldAgentsActivity.start(context)
-        }
-
-    }
-
-    override fun onResume() {
-        super.onResume()
-        loadData(true)
-        GiftModel.get().requestKnapGiftInfos().subscribe()
-    }
-
-    @SuppressLint("CheckResult")
-    fun loadData(isRefresh: Boolean) {
-        binding.refreshLayout.isRefreshing = isRefresh
-        pageNum = if (isRefresh) 1 else (pageNum + 1)
-        giveGoldModel.getDiamondListInfo(pageNum, pageSize)
    }

    override fun setStatusBar() {
--- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldBiliActivity.kt
+++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldBiliActivity.kt
@@ -49,14 +49,24 @@ class GiveGoldBiliActivity : BaseViewBindingActivity<ActivityGiveGoldBiliBinding

    private var mDataThisCycleGold = mutableListOf<GiveGoldBiliBean>()
    private var mDataThisCycleGoldUs = mutableListOf<GiveGoldBiliBean>()
+
    private var mDataLastCycleGold = mutableListOf<GiveGoldBiliBean>()
    private var mDataLastCycleGoldUs = mutableListOf<GiveGoldBiliBean>()

    private var mPageNumThisCycleGold = 1
    private var mPageNumThisCycleGoldUs = 1
+
    private var mPageNumLastCycleGold = 1
    private var mPageNumLastCycleGoldUs = 1

+    private var thisCycleTimeStr = ""
+    private var thisCycleGoldStr  = ""
+    private var thisCycleGoldUsStr  = ""
+
+    private var lastCycleTimeStr = ""
+    private var lastCycleGoldStr  = ""
+    private var lastCycleGoldUsStr = ""
+
    override fun init() {

        initWhiteTitleBar(R.string._ver_23_Transfer_History.getString())
@@ -93,12 +103,25 @@ class GiveGoldBiliActivity : BaseViewBindingActivity<ActivityGiveGoldBiliBinding
        binding.tabLayout.setVis(UserModel.get().isArUser)


+
+
        binding.thisCycle.performClick()
        if (UserModel.get().isArUser) {
            binding.btnGoldUs.performClick()
        } else {
            binding.btnGold.performClick()
        }
+
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+//        if (mCycle != -1 && mTabType != -1) {
+//            getData(null,true)
+//            getPageNum(true)
+//            loadData()
+//        }
    }


@@ -151,17 +174,39 @@ class GiveGoldBiliActivity : BaseViewBindingActivity<ActivityGiveGoldBiliBinding

    private fun loadData() {
        if (mCycle == -1 || mTabType == -1) return
-        val data = getData(arrayListOf())
+        val data = getData(null)
        if (data.isVerify()) {
+            if (mCycle == GiveGoldBiliEntity.Cycle.thisCycle) {
+                binding.totalCoin.text = if (mTabType == GiveGoldBiliEntity.TabType.gold) thisCycleGoldStr else thisCycleGoldUsStr
+            } else {
+                binding.totalCoin.text = if (mTabType == GiveGoldBiliEntity.TabType.gold) lastCycleGoldStr else lastCycleGoldUsStr
+            }
+            binding.time.text = if (mCycle == GiveGoldBiliEntity.Cycle.thisCycle) thisCycleTimeStr else lastCycleTimeStr
            mAdapter.setNewData(data)
        } else {
            getHistory(getPageNum(), 20, mCycle, mTabType)
                .compose(bindToLifecycle())
                .doOnSuccess {

+                    if (mCycle == GiveGoldBiliEntity.Cycle.thisCycle) {
+                        thisCycleTimeStr = it.cycleDateStr ?: ""
+                        if (mTabType == GiveGoldBiliEntity.TabType.gold) {
+                            thisCycleGoldStr = it.totalGiveGold.toString()
+                        } else {
+                            thisCycleGoldUsStr = it.totalGiveGoldUsd.toString()
+                        }
+                    } else {
+                        lastCycleTimeStr = it.cycleDateStr ?: ""
+                        if (mTabType == GiveGoldBiliEntity.TabType.gold) {
+                            lastCycleGoldStr = it.totalGiveGold.toString()
+                        } else {
+                            lastCycleGoldUsStr = it.totalGiveGoldUsd.toString()
+                        }
+                    }
+
                    binding.time.text = it.cycleDateStr ?: ""
-                    binding.totalCoin.text =
-                        if (mTabType == GiveGoldBiliEntity.TabType.gold) it.totalGiveGold.toString() else it.totalGiveGoldUsd.toString()
+                    binding.totalCoin.text = if (mTabType == GiveGoldBiliEntity.TabType.gold) it.totalGiveGold.toString() else it.totalGiveGoldUsd.toString()
+

                    if (getPageNum() == 1) {
                        mAdapter.setNewData(getData(it.diamondGiveHistoryVoList))
@@ -204,84 +249,95 @@ class GiveGoldBiliActivity : BaseViewBindingActivity<ActivityGiveGoldBiliBinding
        }
    }

-    private fun getData(list: List<GiveGoldBiliBean>): List<GiveGoldBiliBean> {
+    private fun getData(list: List<GiveGoldBiliBean>?,isRefresh:Boolean = false): List<GiveGoldBiliBean> {
        val data = tranData(list)
-
        if (mCycle == GiveGoldBiliEntity.Cycle.thisCycle) {
            if (mTabType == GiveGoldBiliEntity.TabType.gold) {
-
-                if (data.isVerify()) {
-                    if (mDataThisCycleGold.isVerify()) {
-                        mDataThisCycleGold.addAll(data)
-                    } else {
-                        mDataThisCycleGold = data.toMutableList()
+                if (isRefresh) {
+                    mDataThisCycleGold.clear()
+                }else{
+                    if (data.isVerify()) {
+                        if (mDataThisCycleGold.isVerify()) {
+                            mDataThisCycleGold.addAll(data)
+                        } else {
+                            mDataThisCycleGold = data.toMutableList()
+                        }
                    }
                }
-
                return mDataThisCycleGold
            } else {
-
-                if (data.isVerify()) {
-                    if (mDataThisCycleGoldUs.isVerify()) {
-                        mDataThisCycleGoldUs.addAll(data)
-                    } else {
-                        mDataThisCycleGoldUs = data.toMutableList()
+                if (isRefresh){
+                    mDataThisCycleGoldUs.clear()
+                }else{
+                    if (data.isVerify()) {
+                        if (mDataThisCycleGoldUs.isVerify()) {
+                            mDataThisCycleGoldUs.addAll(data)
+                        } else {
+                            mDataThisCycleGoldUs = data.toMutableList()
+                        }
                    }
                }
-
                return mDataThisCycleGoldUs
            }
        } else {
-
            if (mTabType == GiveGoldBiliEntity.TabType.gold) {
-                if (data.isVerify()) {
-                    if (mDataLastCycleGold.isVerify()) {
-                        mDataLastCycleGold.addAll(data)
-                    } else {
-                        mDataLastCycleGold = data.toMutableList()
+                if (isRefresh){
+                    mDataLastCycleGold.clear()
+                }else{
+                    if (data.isVerify()) {
+                        if (mDataLastCycleGold.isVerify()) {
+                            mDataLastCycleGold.addAll(data)
+                        } else {
+                            mDataLastCycleGold = data.toMutableList()
+                        }
                    }
-
                }
-
                return mDataLastCycleGold
            } else {

-                if (data.isVerify()) {
-                    if (mDataLastCycleGoldUs.isVerify()) {
-                        mDataLastCycleGoldUs.addAll(data)
-                    } else {
-                        mDataLastCycleGoldUs = data.toMutableList()
+                if (isRefresh){
+                    mDataLastCycleGoldUs.clear()
+                }else{
+                    if (data.isVerify()) {
+                        if (mDataLastCycleGoldUs.isVerify()) {
+                            mDataLastCycleGoldUs.addAll(data)
+                        } else {
+                            mDataLastCycleGoldUs = data.toMutableList()
+                        }
                    }
                }
-
                return mDataLastCycleGoldUs
            }
        }
    }


-    private fun getPageNum(): Int {
+    private fun getPageNum(isRefresh: Boolean = false): Int {
        if (mCycle == GiveGoldBiliEntity.Cycle.thisCycle) {
            if (mTabType == GiveGoldBiliEntity.TabType.gold) {
+                if (isRefresh) mPageNumThisCycleGold = 1
                return mPageNumThisCycleGold
            } else {
+                if (isRefresh) mPageNumThisCycleGoldUs = 1
                return mPageNumThisCycleGoldUs
            }
        } else {
            if (mTabType == GiveGoldBiliEntity.TabType.gold) {
+                if (isRefresh) mPageNumLastCycleGold = 1
                return mPageNumLastCycleGold
            } else {
+                if (isRefresh) mPageNumLastCycleGoldUs = 1
                return mPageNumLastCycleGoldUs
            }
        }
    }

-    private fun tranData(list: List<GiveGoldBiliBean>): MutableList<GiveGoldBiliBean> {
+    private fun tranData(list: List<GiveGoldBiliBean>?): MutableList<GiveGoldBiliBean> {
        val data = mutableListOf<GiveGoldBiliBean>()
        if (list.isVerify()) {
-            val group = list.groupBy { it.timeStr }
+            val group = list?.groupBy { it.timeStr }

-            group.forEach { (t, u) ->
+            group?.forEach { (t, u) ->
                u.filterIndexed { index, bean ->
                    if (index == 0) {
                        bean.isHead = true
--- a/app/src/main/java/com/chwl/app/utils/RoomHelperManager.kt
+++ b/app/src/main/java/com/chwl/app/utils/RoomHelperManager.kt
@@ -107,6 +107,14 @@ object RoomHelperManager {
                .subscribe()
        }
    }
+    public fun test(run:(info:RoomLuckyBagInfo)->Unit) {
+        getRoomLuckyBagInfo(3224)
+            .doOnSuccess {
+                mLuckyBagConfig = it.redEnvelopeV2Config
+                run(it)
+            }
+            .subscribe()
+    }



--- a/app/src/main/res/layout/item_give_gold_bili.xml
+++ b/app/src/main/res/layout/item_give_gold_bili.xml
@@ -29,13 +29,17 @@

    <TextView
        android:id="@+id/nick"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="11dp"
        android:layout_marginTop="3dp"
        android:textColor="@color/color_313131"
+        android:layout_marginEnd="10dp"
+        android:ellipsize="end"
+        android:lines="1"
        android:textSize="15sp"
        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/goldLayout"
        app:layout_constraintStart_toEndOf="@id/avatar"
        app:layout_constraintTop_toTopOf="@id/avatar" />

@@ -50,47 +54,51 @@
        app:layout_constraintTop_toBottomOf="@id/nick" />


-    <com.chwl.library.widget.text.DrawableTextView
-        android:id="@+id/gold"
+    <FrameLayout
+        android:id="@+id/goldLayout"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="6dp"
        android:layout_marginEnd="15dp"
-        android:drawablePadding="4dp"
-        android:text="0"
-        android:textColor="@color/color_ff8c03"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:visibility="invisible"
-        app:dt_drawableRightHeight="22dp"
-        app:dt_drawableRightSrc="@drawable/ic_coin_84"
-        app:dt_drawableRightWidth="22dp"
-        app:dt_drawableType="shape"
        app:layout_constraintBottom_toBottomOf="@id/nick"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/nick"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="@id/nick">

-    <com.chwl.library.widget.text.DrawableTextView
-        android:id="@+id/goldUs"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="15dp"
-        android:drawablePadding="4dp"
-        android:text="0"
-        android:textColor="@color/color_313131"
-        android:textSize="13sp"
-        android:textStyle="bold"
-        android:visibility="invisible"
-        app:dt_drawableRightHeight="13dp"
-        app:dt_drawableRightSrc="@drawable/ic_coin_84"
-        app:dt_drawableRightWidth="13dp"
-        app:dt_drawableType="shape"
-        app:layout_constraintBottom_toBottomOf="@id/nick"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/nick"
-        tools:visibility="visible" />
+        <com.chwl.library.widget.text.DrawableTextView
+            android:id="@+id/gold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:drawablePadding="4dp"
+            android:text="0"
+            android:textColor="@color/color_ff8c03"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:visibility="invisible"
+            app:dt_drawableRightHeight="22dp"
+            app:dt_drawableRightSrc="@drawable/ic_coin_84"
+            app:dt_drawableRightWidth="22dp"
+            app:dt_drawableType="shape"
+            tools:visibility="visible" />
+
+        <com.chwl.library.widget.text.DrawableTextView
+            android:id="@+id/goldUs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:drawablePadding="4dp"
+            android:text="0"
+            android:textColor="@color/color_313131"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:visibility="invisible"
+            app:dt_drawableRightHeight="13dp"
+            app:dt_drawableRightSrc="@drawable/ic_coin_84"
+            app:dt_drawableRightWidth="13dp"
+            app:dt_drawableType="shape"
+            tools:visibility="visible" />
+
+    </FrameLayout>

    <TextView
        android:id="@+id/time"
@@ -99,8 +107,8 @@
        android:layout_marginTop="8dp"
        android:textColor="@color/color_7b7b7d"
        android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="@id/gold"
-        app:layout_constraintTop_toBottomOf="@id/gold" />
+        app:layout_constraintEnd_toEndOf="@id/goldLayout"
+        app:layout_constraintTop_toBottomOf="@id/goldLayout" />


    <View
--- a/app/src/main/res/layout/item_lately_give.xml
+++ b/app/src/main/res/layout/item_lately_give.xml
@@ -17,14 +17,17 @@

    <TextView
        android:id="@+id/tv_nickname"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="10dp"
        android:textColor="@color/color_1F1A4E"
        android:textSize="@dimen/sp_14"
+        android:lines="1"
+        android:ellipsize="end"
        android:textStyle="bold"
        app:layout_constraintBottom_toTopOf="@id/tv_id"
        app:layout_constraintStart_toEndOf="@id/iv_avatar"
+        app:layout_constraintEnd_toStartOf="@+id/transfer"
        app:layout_constraintTop_toTopOf="@id/iv_avatar"
        app:layout_constraintVertical_chainStyle="packed"
        tools:text="@string/layout_item_lately_give_01" />
--- a/app/src/main/res/layout/list_item_dialog_gift.xml
+++ b/app/src/main/res/layout/list_item_dialog_gift.xml
@@ -115,10 +115,9 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="@dimen/dp_4"
-            android:layout_marginTop="4dp"
+            android:layout_marginHorizontal="@dimen/dp_2"
+            android:layout_marginTop="2dp"
            android:gravity="center"
-            android:visibility="invisible"
            android:orientation="horizontal">

            <ImageView
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -5419,4 +5419,18 @@
    <string name="_ver_24_sentLuckyBagNoSelect">الرجاء اختيار الهدية أولا</string>
    <string name="_ver_23_ID_Login">تسجيل الدخول بالمعرف</string>
    <string name="_ver_23_SMS_Login">تسجيل الدخول بالرسائل القصيرة</string>
+    <string name="_ver_23_sub_recharge_agent">وكيل إعادة الشحن الفرعي</string>
+    <string name="_ver_23_Recent_Transfers">التحويلات الأخيرة</string>
+    <string name="_ver_23_Transfer_Coins">تحويل الكونزات</string>
+    <string name="_ver_23_Us_Settlement">تحويل الراتب</string>
+    <string name="_ver_23_View_Details">عرض التفاصيل</string>
+    <string name="_ver_23_History">السجل</string>
+    <string name="_ver_23_Transfer">التحويل</string>
+    <string name="_ver_23_This_Cycle">هذه الدورة</string>
+    <string name="_ver_23_Last_Cycle">الدورة الأخيرة</string>
+    <string name="_ver_23_Total_Amount_of_Transfer_Coins">إجمالي مبلغ تحويلات الكونزات</string>
+    <string name="_ver_23_Sub_Recharge_Agent_List">قائمة وكلاء إعادة الشحن الفرعيين</string>
+    <string name="_ver_23_Transfer_Past_30_days">التحويل خلال الثلاثين يومًا الماضية</string>
+    <string name="_ver_23_Transfer_History">سجل التحويلات</string>
+    <string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>
 </resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -5213,4 +5213,18 @@ Toplam imza alın, ilgili ödülü alın
    <string name="_ver_24_sentLuckyBagNoSelect">Lütfen önce bir hediye seçin</string>
    <string name="_ver_23_ID_Login">Kimlik Girişi</string>
    <string name="_ver_23_SMS_Login">SMS Girişi</string>
+    <string name="_ver_23_sub_recharge_agent">Alt Yükleme Temsilcisi</string>
+    <string name="_ver_23_Recent_Transfers">Son Transferler</string>
+    <string name="_ver_23_Transfer_Coins">Transfer Coins</string>
+    <string name="_ver_23_Us_Settlement">ÜS Hesaplaşması</string>
+    <string name="_ver_23_View_Details">Ayrıntıları görüntüle</string>
+    <string name="_ver_23_History">Geçmiş</string>
+    <string name="_ver_23_Transfer">Transfer</string>
+    <string name="_ver_23_This_Cycle">Bu Döngü</string>
+    <string name="_ver_23_Last_Cycle">Son Döngü</string>
+    <string name="_ver_23_Total_Amount_of_Transfer_Coins">Toplam Coin Transferi Miktarı</string>
+    <string name="_ver_23_Sub_Recharge_Agent_List">Alt Yükleme Temsilcisi Listesi</string>
+    <string name="_ver_23_Transfer_Past_30_days">Geçmiş 30 gün içindeki transfer</string>
+    <string name="_ver_23_Transfer_History">Transfer Geçmişi</string>
+    <string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -5361,5 +5361,19 @@
    <string name="_ver_24_sentLuckyBagNoSelect">請先選擇禮物</string>
    <string name="_ver_23_ID_Login">ID 登入</string>
    <string name="_ver_23_SMS_Login">SMS 登入</string>
+    <string name="_ver_23_sub_recharge_agent">子代理</string>
+    <string name="_ver_23_Recent_Transfers">最近轉贈</string>
+    <string name="_ver_23_Transfer_Coins">轉贈金幣</string>
+    <string name="_ver_23_Us_Settlement">代發薪資</string>
+    <string name="_ver_23_View_Details">詳情</string>
+    <string name="_ver_23_History">歷史</string>
+    <string name="_ver_23_Transfer">轉贈</string>
+    <string name="_ver_23_This_Cycle">本週期</string>
+    <string name="_ver_23_Last_Cycle">上週期</string>
+    <string name="_ver_23_Total_Amount_of_Transfer_Coins">金幣轉贈</string>
+    <string name="_ver_23_Sub_Recharge_Agent_List">子代理列表</string>
+    <string name="_ver_23_Transfer_Past_30_days">近30天轉贈</string>
+    <string name="_ver_23_Transfer_History">轉贈歷史</string>
+    <string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5452,23 +5452,23 @@ You cannot join again within 24 hours after leaving</string>
    <string name="_ver_23_SMS_Login">SMS Login</string>


-    <string name="_ver_23_sub_recharge_agent">sub recharge agent</string>
+    <string name="_ver_23_sub_recharge_agent">Sub Recharge Agent</string>
    <string name="_ver_23_Recent_Transfers">Recent Transfers</string>
    <string name="_ver_23_Transfer_Coins">Transfer Coins</string>
-    <string name="_ver_23_Us_Settlement">Us Settlement</string>
-    <string name="_ver_23_View_Details">View Details</string>
+    <string name="_ver_23_Us_Settlement">ÜS Settlement</string>
+    <string name="_ver_23_View_Details">View details</string>
    <string name="_ver_23_History">History</string>
    <string name="_ver_23_Transfer">Transfer</string>

    <string name="_ver_23_This_Cycle">This Cycle</string>
    <string name="_ver_23_Last_Cycle">Last Cycle</string>

-    <string name="_ver_23_Total_Amount_of_Transfer_Coins">Total Amount of Transfer Coins</string>
+    <string name="_ver_23_Total_Amount_of_Transfer_Coins">Total Amount of Coin Transfers</string>
    <string name="_ver_23_Sub_Recharge_Agent_List">Sub Recharge Agent List</string>

    <string name="_ver_23_Transfer_Past_30_days">Transfer Past 30 days</string>
    <string name="_ver_23_Transfer_History">Transfer History</string>
-    <string name="_ver_23_Settlement_s">Settlement:%s Us </string>
+    <string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>



--- a/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java
+++ b/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java
@@ -370,7 +370,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
     * 执行 : 上麦
     */
    private void doUpMicroPhone(final int micPosition, final String uId, final String roomId, boolean isInviteUpMic, final CallBack<String> callBack, int teamId){
-        MyUtil.INSTANCE.setUpMicIng(true);
+        MyUtil.INSTANCE.changeUpMicStatus(true);
        queryRoomMicInfo(roomId)
                .map(this::dealMicMemberFromIMNet)
                .flatMap(this::dealMicChatRoomMemberFromIMNet)
@@ -378,6 +378,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
                .doOnNext(roomQueueInfoSparseArray -> {
                    RoomQueueInfo roomQueueInfo = roomQueueInfoSparseArray.get(micPosition);
                    if (roomQueueInfo == null) {
+                        MyUtil.INSTANCE.changeUpMicStatus(false);
                        return;
                    }
                    MicMemberInfo chatRoomMember = roomQueueInfo.mChatRoomMember;
@@ -385,6 +386,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
                    if (chatRoomMember != null) {
                        SingleToastUtil.showToast(ResUtil.getString(R.string.room_model_roombasemodel_01));
                        callBack.onFail(CODE_UPDATE_MIC, ResUtil.getString(R.string.room_model_roombasemodel_02));
+                        MyUtil.INSTANCE.changeUpMicStatus(false);
                        return;
                    }
                    //坑上没人且没锁
@@ -396,13 +398,13 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
                                @Override
                                public void onSuccess(String data) {
                                    callBack.onSuccess(data);
-                                    MyUtil.INSTANCE.setUpMicIng(false);
+                                    MyUtil.INSTANCE.changeUpMicStatus(false);
                                }

                                @Override
                                public void onFail(int code, String error) {
                                    callBack.onFail(code, error);
-                                    MyUtil.INSTANCE.setUpMicIng(false);
+                                    MyUtil.INSTANCE.changeUpMicStatus(false);
                                }
                            };

@@ -425,6 +427,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
                                        }
                                        public void onFail(int code, String error) {
                                            callBackTmp.onFail(-1, ResUtil.getString(R.string.room_model_roombasemodel_03));
+                                            MyUtil.INSTANCE.changeUpMicStatus(false);
                                        }
                                    });
                                }
@@ -436,7 +439,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {

                })
                .doOnError(throwable -> {
-                    MyUtil.INSTANCE.setUpMicIng(false);
+                    MyUtil.INSTANCE.changeUpMicStatus(false);
                })
                .subscribe();
    }
--- a/core/src/main/java/com/chwl/core/utils/myutil/MyUtil.kt
+++ b/core/src/main/java/com/chwl/core/utils/myutil/MyUtil.kt
@@ -1,6 +1,7 @@
 package com.chwl.core.utils.myutil

 import android.view.View
+import com.chwl.library.common.util.doLog

 object MyUtil {
    var mAppWidth = 0
@@ -9,6 +10,10 @@ object MyUtil {
    var upMicIng = false
    var downMicNum = 0 //需要下麦的 计数

+    fun changeUpMicStatus(isUpMic: Boolean) {
+        upMicIng = isUpMic
+        "上麦 上麦状态 设置 upMicIng = $upMicIng".doLog()
+    }

    fun initAppWidth(view: View?) {
        view?.post {
--- a/mode.json
+++ b/mode.json
@@ -1,32 +1,122 @@
-{
-  "code": 200,
-  "message": "success",
-  "data": {
-    "cycleDateStr": "2025-02-16 00:00:00~2025-02-25 13:37:30",
-    "totalGiveGoldUsd": -6.0,
-    "totalGiveGold": 360,
-    "diamondGiveHistoryVoList": [
-      {
-        "targetUid": 3207,
-        "targetErbanNo": 993,
-        "targetNick": "总舵主",
-        "targetAvatar": "https://image.pekolive.com/image/dfcc5d56a064e0eae829d61c1a24fbf2.jpeg",
-        "diamondNum": 35000,
-        "createTime": 1740479827000,
-        "createTimeStr": "2025-02-25 13:37:07",
-        "guildUsdNum": -5.00
-      },
-      {
-        "targetUid": 3207,
-        "targetErbanNo": 993,
-        "targetNick": "总舵主",
-        "targetAvatar": "https://image.pekolive.com/image/dfcc5d56a064e0eae829d61c1a24fbf2.jpeg",
-        "diamondNum": 7000,
-        "createTime": 1740479819000,
-        "createTimeStr": "2025-02-25 13:36:59",
-        "guildUsdNum": -1.00
-      }
-    ]
+[
+  {
+    "code": 200,
+    "message": "success",
+    "data": {
+      "cycleDateStr": "2025-02-16 00:00:00~2025-02-26 18:39:30",
+      "totalGiveGoldUsd": 0.0,
+      "totalGiveGold": 40000,
+      "diamondGiveHistoryVoList": [
+        {
+          "id": 1894694777146396674,
+          "fromUid": 3469,
+          "targetUid": 3476,
+          "targetErbanNo": 644,
+          "targetNick": "英文区",
+          "targetAvatar": "https://img.molistar.xyz/default_avatar_molistar.png",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565411000,
+          "createTimeStr": "2025-02-26 18:23:31"
+        },
+        {
+          "id": 1894694309158539265,
+          "fromUid": 3469,
+          "targetUid": 3461,
+          "targetErbanNo": 622,
+          "targetNick": "有个好听的名字叫做",
+          "targetAvatar": "https://image.pekolive.com/image/668c4b1f5bf4db80a49f5eca7b996bed.jpeg",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565300000,
+          "createTimeStr": "2025-02-26 18:21:40"
+        },
+        {
+          "id": 1894694198206615554,
+          "fromUid": 3469,
+          "targetUid": 3459,
+          "targetErbanNo": 611,
+          "targetNick": "好听点",
+          "targetAvatar": "https://image.pekolive.com/8fc197d7-e481-491d-8315-5b6e44264f5c.jpeg",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565273000,
+          "createTimeStr": "2025-02-26 18:21:13"
+        },
+        {
+          "id": 1894694133983432705,
+          "fromUid": 3469,
+          "targetUid": 3459,
+          "targetErbanNo": 611,
+          "targetNick": "好听点",
+          "targetAvatar": "https://image.pekolive.com/8fc197d7-e481-491d-8315-5b6e44264f5c.jpeg",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565258000,
+          "createTimeStr": "2025-02-26 18:20:58"
+        }
+      ]
+    },
+    "timestamp": 1740566370253
  },
-  "timestamp": 1740479850715
-}
+  {
+    "code": 200,
+    "message": "success",
+    "data": {
+      "cycleDateStr": "2025-02-01 18:39:54~2025-02-15 23:59:59",
+      "totalGiveGoldUsd": 0.0,
+      "totalGiveGold": 40000,
+      "diamondGiveHistoryVoList": [
+        {
+          "id": 1894694777146396674,
+          "fromUid": 3469,
+          "targetUid": 3476,
+          "targetErbanNo": 644,
+          "targetNick": "英文区",
+          "targetAvatar": "https://img.molistar.xyz/default_avatar_molistar.png",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565411000,
+          "createTimeStr": "2025-02-26 18:23:31"
+        },
+        {
+          "id": 1894694309158539265,
+          "fromUid": 3469,
+          "targetUid": 3461,
+          "targetErbanNo": 622,
+          "targetNick": "有个好听的名字叫做",
+          "targetAvatar": "https://image.pekolive.com/image/668c4b1f5bf4db80a49f5eca7b996bed.jpeg",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565300000,
+          "createTimeStr": "2025-02-26 18:21:40"
+        },
+        {
+          "id": 1894694198206615554,
+          "fromUid": 3469,
+          "targetUid": 3459,
+          "targetErbanNo": 611,
+          "targetNick": "好听点",
+          "targetAvatar": "https://image.pekolive.com/8fc197d7-e481-491d-8315-5b6e44264f5c.jpeg",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565273000,
+          "createTimeStr": "2025-02-26 18:21:13"
+        },
+        {
+          "id": 1894694133983432705,
+          "fromUid": 3469,
+          "targetUid": 3459,
+          "targetErbanNo": 611,
+          "targetNick": "好听点",
+          "targetAvatar": "https://image.pekolive.com/8fc197d7-e481-491d-8315-5b6e44264f5c.jpeg",
+          "diamondNum": 10000,
+          "realDiamondNum": 10000.0,
+          "createTime": 1740565258000,
+          "createTimeStr": "2025-02-26 18:20:58"
+        }
+      ]
+    },
+    "timestamp": 1740566394348
+  }
+]