Kaynağa Gözat

1、支付方式选择优化
2、投入金额UI显示优化

ccc 17 saat önce
ebeveyn
işleme
48ae50a3cf

+ 4 - 3
module_backstage/src/main/java/com/module/backstage/fragment/PayFragment.kt

@@ -66,15 +66,16 @@ class PayFragment : BaseFragment<BackstageFragmentPayBinding, PayFragmentVM>() {
                 payTypeMap.remove("TwoCode")
                 // 保存修改后的数据
                 SpUtils.put(MMKVName.PAY_TYPE, gson.toJson(payTypeMap))
-                Log.d(TAG, "savePayType: " + gson.toJson(payTypeMap))
+                Log.d(TAG, "savePayType:1 " + gson.toJson(payTypeMap))
                 ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.modific_success))
             } else {
                 val keysToRemove = payTypeMap.keys.filter { it != "TwoCode" && it != "Free" }
                 for (key in keysToRemove) {
                     payTypeMap.remove(key)
+                    Log.d(TAG, "savePayType: "+keysToRemove)
                 }
-                SpUtils.put(MMKVName.PAY_TYPE, Gson().toJson(priceAdapter?.arrayListState))
-                Log.d(TAG, "savePayType: " + Gson().toJson(priceAdapter?.arrayListState))
+                SpUtils.put(MMKVName.PAY_TYPE, gson.toJson(payTypeMap))
+                Log.d(TAG, "savePayType:2 " + gson.toJson(payTypeMap))
                 ToastUtil.switchToastStyleToSuccess(UiUtil.getStringRes(R.string.modific_success))
             }
         }

+ 6 - 1
module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/HomeFragment.kt

@@ -123,7 +123,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
     private var material = SpUtils.getBoolean(MMKVName.MATERIAL,false)
     private var productCount = 0
     private val shopCartSize = SpUtils.getString(MMKVName.SHOPPING_CART_SIZE, "3")?.toInt()
-
+    private val payType = SpUtils.getString(MMKVName.PAY_TYPE,"").toString()
     @RequiresApi(Build.VERSION_CODES.P)
     override fun HomeFragmentHomeBinding.initView() {
         if (material == true){
@@ -209,6 +209,11 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
                     myHandler.sendEmptyMessage(NETWORK_LEVEL)
                 }
             })
+        if (payType.contains("BillCoin")) {
+            llCashAacpe.visibility = View.VISIBLE
+        }else{
+            llCashAacpe.visibility=View.GONE
+        }
     }
 
 

+ 1 - 0
module_home/src/main/res/layout/home_fragment_home.xml

@@ -176,6 +176,7 @@
         app:layout_constraintGuide_percent="0.98" />
 
     <LinearLayout
+        android:id="@+id/ll_cash_aacpe"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="100dp"

+ 0 - 8
module_pay/src/main/java/com/module/pay/common/OtherEnum.kt

@@ -73,11 +73,3 @@ enum class OtherEnum(var nameId:Int,var nameS:String,var category:String,var def
     COIN_MULTIPLY(R.string.coin_multiply,"硬币脉冲相乘","找零设置","1", 2,MMKVName.COIN_PULSE_MULTIPLY),
     COIN_DIVIDE(R.string.coin_divide,"硬币脉冲相除","找零设置","1", 2,MMKVName.COIN_PULSE_DIVIDE),;
 }
-
-fun unitList() =
-    listOf("¥", "$","€","руб","៛","₪","₴","zł",
-        "Ұ","NT","₩","₮","〒","S/.","R$","৲৳","Rp",
-        "Sk","R","Q","P","₱","₦","Lm","₤","£",
-        "kr","₭","₲","Rs.","Ft","ƒ","₫","₡","₵",
-        "Br","Bs","¤",
-        "﷼")