优化自动返回广告时间

buildSrc/src/main/kotlin/com/quyunshuo/sbm10/buildsrc/ProjectBuildConfig.kt

@@ -11,8 +11,8 @@ object ProjectBuildConfig {
     const val applicationId = "com.quyunshuo.sbm10"
     const val minSdkVersion = 21
     const val targetSdkVersion = 29
-    const val versionCode = 8
-    const val versionName = "1.0.8"
+    const val versionCode = 9
+    const val versionName = "1.0.9"
     const val isAppMode = false
     /**
      * 项目当前的版本状态

module_backstage/src/main/java/com/module/backstage/fragment/param/DebugParamFragment.kt

@@ -110,9 +110,9 @@ class DebugParamFragment :
         observeLiveData(mViewModel.refreshPage, ::refreshPage)
         observeLiveData(mViewModel.loading, ::setLoading)
         lifecycle.addObserver(this)
-        mBinding.tvLutou.text = SBCHeartbeat.headTemp + "°C"
     }
     private fun mainCoreDataList(string: String) {
+        mBinding.tvLutou.text = SBCHeartbeat.headTemp + "°C"
         Log.d(TAG, "mainCoreDataList: "+string)
         var i = 0
         val len = string.length

module_backstage/src/main/res/drawable/backstage_shape_debug_param_cb_select.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#2E80DD" />
+    <solid android:color="@color/colorOrange" />
     <corners
         android:bottomLeftRadius="18dp"
         android:bottomRightRadius="18dp"

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

@@ -88,7 +88,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
     private var productList = ArrayList<ProductDataBean>()//传递给make的制作商品list
     private var homeProductAdapter: HomeProductAdapter? = null
     override val mViewModel: HomeFragmentVM by viewModels()
-    private var CLOSE_TIME = 60
+    private var CLOSE_TIME = 120
     private var backTime: Int = CLOSE_TIME //倒计时时间
     private var pauseTime: Boolean = true //用于对话框出现的时候，那么就要修改为false，如果关掉，则修改为true，继续倒计时
     private val TAG = "HomeFragment"
@@ -232,10 +232,11 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
         val coinData = BigDecimal(coin)
         val coinMultiply = BigDecimal(SpUtils.getString(MMKVName.COIN_PULSE_MULTIPLY, "1"))
         val coinDivide = BigDecimal(SpUtils.getString(MMKVName.COIN_PULSE_DIVIDE, "1"))
-        Heartbeat.coinData = (coinData.multiply(coinMultiply)).divide(coinDivide)
+        Heartbeat.coinData = (coinData.multiply(coinMultiply)).divide(coinDivide).setScale(2, java.math.RoundingMode.HALF_UP)
 
         mBinding.tvAacpeCoin.setText("" + Heartbeat.coinData)
-        if (lastCoin != coinData) {
+        if (lastCoin != Heartbeat.coinData) {
+            backTime = CLOSE_TIME//币值发生变化重新计时
             lastCoin = Heartbeat.coinData
             EventBus.getDefault().post(ApiMessageEvent(PayName.COIN_DATA, Heartbeat.coinData))
         }
@@ -387,6 +388,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
             }
 
             PayName.ACCEPT_BILL -> {
+                backTime = CLOSE_TIME//币值发生变化重新计时
                 mBinding.tvAacpeBill.setText("" + Heartbeat.acceptBill)
             }
 
@@ -571,6 +573,7 @@ class HomeFragment : BaseFragment<HomeFragmentHomeBinding, HomeFragmentVM>(), Vi
 
             if (fragment.pauseTime) {
                 fragment.backTime--
+                Log.d("backTime", "setTimeDate: "+fragment.backTime)
                 if (fragment.backTime == 0) {
                     val findNavController = fragment.findNavController()
                     findNavController.navigate(R.id.home_action_home_homefragment_to_home_buyfragment)

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

@@ -1,5 +1,6 @@
 package com.quyunshuo.module.home.fragment.fragment.pay
 
+import android.util.Log
 import androidx.fragment.app.viewModels
 import com.elvishew.xlog.XLog
 import com.quyunshuo.sbm10.base.addressenum.PayEnum
@@ -33,12 +34,14 @@ import java.math.RoundingMode
 @AndroidEntryPoint
 class BillCoinFragment : BaseFragment<HomeFragmentBillCoinBinding, BuyFragmentVM>() {
 
+    private  val TAG = "BillCoinFragment"
     override val mViewModel: BuyFragmentVM by viewModels()
     override fun createVB() = HomeFragmentBillCoinBinding.inflate(layoutInflater)
-    var sumPrice: BigDecimal? = null
+    var sumPrice: BigDecimal? = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP)
 
     override fun HomeFragmentBillCoinBinding.initView() {
-        sumPrice = BigDecimal(arguments?.getDouble("PRICE", 0.0)!!)
+        val price = arguments?.getDouble("PRICE", 0.0) ?: 0.0
+        sumPrice = BigDecimal(price).setScale(2, RoundingMode.HALF_UP)
         XLogUtil.d("price:" + sumPrice + Heartbeat.acceptBill)
         settlement()
     }
@@ -63,7 +66,8 @@ class BillCoinFragment : BaseFragment<HomeFragmentBillCoinBinding, BuyFragmentVM
 
     //金额结算
     private fun settlement() {
-        var price = sumPrice?.subtract(Heartbeat.acceptBill + Heartbeat.coinData)
+        var price = sumPrice?.subtract(Heartbeat.acceptBill.add(Heartbeat.coinData))
+        Log.d(TAG, "settlement: "+"acceptBill:"+Heartbeat.acceptBill +"coinData:"+Heartbeat.coinData)
         if (price!!.toDouble() <= 0.0) {
             //如果支付成功，通知前台。
             EventBus.getDefault().post(