国内外版本支付界面优化

module_backstage/src/main/java/com/module/backstage/adapter/PayAdapter.kt

@@ -32,16 +32,15 @@ class PayAdapter(var productList: MutableList<PayEnum>) :
                 object : TypeToken<HashMap<String, PayTypeBean>?>() {}.type
             )
         }else{
-            if (Heartbeat.isForeign) {
-                arrayListState[PayEnum.BILL_COIN.code] = PayTypeBean(PayEnum.BILL_COIN.code,true)
-            }else{
+            if (MMKVName.APP_VERSION==1) {
                 arrayListState[PayEnum.TWO_CODE.code] = PayTypeBean(PayEnum.TWO_CODE.code,true)
+            }else{
+                arrayListState[PayEnum.BILL_COIN.code] = PayTypeBean(PayEnum.BILL_COIN.code,true)
             }
         }
-
-
     }
 
+
     inner class MyViewHolder(binding: BackstageItemPayBinding) :
         RecyclerView.ViewHolder(binding.root) {
         private val mBinding = binding

module_backstage/src/main/java/com/module/backstage/repo/PayFragmentRepo.kt

@@ -21,10 +21,13 @@ class PayFragmentRepo @Inject constructor() : BaseRepository() {
 
     var arrayList: MutableList<PayEnum> = Arrays.asList(
         PayEnum.FREE,
-        PayEnum.TWO_CODE,
         PayEnum.BILL_COIN,
         PayEnum.NAYAX,
         PayEnum.MDB_NO_CASH,
     )
+    var arrayList1: MutableList<PayEnum> = Arrays.asList(
+        PayEnum.FREE,
+        PayEnum.TWO_CODE,
+    )
 
 }

module_backstage/src/main/java/com/module/backstage/vm/PayFragmentVM.kt

@@ -5,6 +5,7 @@ import com.module.backstage.repo.PayFragmentRepo
 import com.quyunshuo.androidbaseframemvvm.base.addressenum.PayEnum
 import com.quyunshuo.androidbaseframemvvm.base.mvvm.vm.BaseViewModel
 import com.quyunshuo.androidbaseframemvvm.common.bean.ProductDataBean
+import com.quyunshuo.androidbaseframemvvm.common.constant.MMKVName
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.util.ArrayList
 import javax.inject.Inject
@@ -51,7 +52,10 @@ class PayFragmentVM @Inject constructor(private val mRepo: PayFragmentRepo) : Ba
     }
 
     fun getPayData(): MutableList<PayEnum> {
-
-        return mRepo.arrayList
+        if (MMKVName.APP_VERSION==1){
+            return mRepo.arrayList1
+        }else{
+            return mRepo.arrayList
+        }
     }
 }

module_home/src/main/java/com/quyunshuo/module/home/dialog/PayChooseDialogFragment.kt

@@ -92,11 +92,11 @@ class PayChooseDialogFragment :
                     object : TypeToken<HashMap<String, PayTypeBean>?>() {}.type
                 )
             } else {
-                if (Heartbeat.isForeign) {
+                if (MMKVName.APP_VERSION==1) {
+                    arrayListState[PayEnum.TWO_CODE.code] = PayTypeBean(PayEnum.TWO_CODE.code, true)
+                } else {
                     arrayListState[PayEnum.BILL_COIN.code] =
                         PayTypeBean(PayEnum.BILL_COIN.code, true)
-                } else {
-                    arrayListState[PayEnum.TWO_CODE.code] = PayTypeBean(PayEnum.TWO_CODE.code, true)
                 }
             }
             Log.d("arrayListState", "arrayListState initView: " + arrayListState.size)

module_home/src/main/java/com/quyunshuo/module/home/fragment/fragment/HomeFragment.kt

@@ -280,10 +280,14 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
             showTipsDialog(deviceStatusCheck)
             return true
         }
-        //        if (product?.price!! <= 0 && !Heartbeat.isForeign) {
-        //            showTipsDialog("价格低于0元,不能购买")
-        //            return
-        //        }
+//        if (product?.price!! <= 0 && !Heartbeat.isForeign) {
+//            showTipsDialog("价格低于0元,不能购买")
+//            return true
+//        }
+        if (product?.price!! <= 0 && MMKVName.APP_VERSION==1) {
+            showTipsDialog("价格低于0元,不能购买")
+            return true
+        }
         return false
     }
 

module_home/src/main/res/layout/backstage_dialog_cout_down.xml

@@ -23,7 +23,7 @@
             android:textColor="#576478"
             android:textSize="42sp"
             android:textStyle="bold"
-            android:text="初次初始化中..."
+            android:text="@string/initializing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -33,7 +33,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="30秒"
+            android:text="@string/second"
             android:textColor="#576478"
             android:textSize="42sp"
             android:textStyle="bold"