fix 消除开发信息和调试代码

app/build.gradle

@@ -14,8 +14,8 @@ android {
         minSdkVersion 25
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0.0" + "." + getTime()
-        archivesBaseName = versionName
+        versionName "1.0.0"
+        archivesBaseName = versionName + "." + getTime()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/com/doverfuelingsolutions/issp/bugly/BuglyUtil.kt

@@ -2,7 +2,6 @@ package com.doverfuelingsolutions.issp.bugly
 
 import android.content.Context
 import android.content.Intent
-import com.doverfuelingsolutions.issp.BuildConfig
 import com.doverfuelingsolutions.issp.DFSApplication
 import com.doverfuelingsolutions.issp.R
 import com.doverfuelingsolutions.issp.utils.AppUtil
@@ -41,7 +40,7 @@ object BuglyUtil : UpgradeListener, UpgradeStateListener {
         Beta.upgradeCheckPeriod = 5 * 60_000
         Beta.upgradeListener = this
         val appId = if (AppUtil.isDebug()) "789ca54e1f" else "7bb19916d9"
-        Bugly.init(applicationContext, appId, BuildConfig.DEBUG)
+        Bugly.init(applicationContext, appId, AppUtil.isDebug())
     }
 
     fun checkUpgrade() {

app/src/main/java/com/doverfuelingsolutions/issp/data/entity/WayneOrderRecord.kt

@@ -14,7 +14,7 @@ data class WayneOrderRecord(
         private const val serialVersionUID = 273576873L
     }
 
-    // 超过 7 天认为过期，可以删除以节约存储空间，降低内存，提高效率
+    // 超过 7 天认为过期
     fun isExpire(): Boolean {
         return System.currentTimeMillis() - timeMills > 604800000
     }

app/src/main/java/com/doverfuelingsolutions/issp/driver/printer/ComPrintManager.java

@@ -48,7 +48,6 @@ public class ComPrintManager implements PrintManager, DataReceivedListener {
 
     /**
      * 支付成功后的小票打印
-     * TODO LZP备注：新的数据应该拿 payResult 的
      */
     public void printOrderOkBillHs(DeviceClass dc, ResultPayment.PosTrxBean ptb) throws Exception {
         if (serialControl == null) return;

app/src/main/java/com/doverfuelingsolutions/issp/utils/AppUtil.kt

@@ -14,8 +14,8 @@ class AppUtil {
          * 获取版本代号
          */
         fun getVersionName(): String {
-            val buildType = if (BuildConfig.DEBUG) "D" else "R"
-            return "${BuildConfig.VERSION_NAME}$buildType"
+            val buildType = if (BuildConfig.DEBUG) "DEBUG" else "PRO"
+            return "${BuildConfig.VERSION_NAME}.$buildType"
         }
 
         /**

app/src/main/java/com/doverfuelingsolutions/issp/utils/DFSUtil.kt

@@ -2,16 +2,13 @@ package com.doverfuelingsolutions.issp.utils
 
 import android.content.Context
 import com.doverfuelingsolutions.issp.bugly.BuglyUtil
-import com.doverfuelingsolutions.issp.utils.crash.DFSCrashUtil
 import com.doverfuelingsolutions.issp.utils.sp.SPUtil
-import com.hjq.toast.ToastUtils
 import java.lang.ref.WeakReference
 
 object DFSUtil {
 
     fun init(context: Context) {
         BuglyUtil.init(context)
-        DFSCrashUtil.init(context) // TODO change into bugly
         StringUtil.ctxBeforeApplication = WeakReference(context)
         SPUtil.init(context)
     }

app/src/main/java/com/doverfuelingsolutions/issp/utils/DeviceUtil.kt

@@ -12,8 +12,8 @@ class DeviceUtil {
 
         fun generateSerialNumber(): String {
             if (sn.isEmpty()) {
-                // val deviceSN = rawSN()
-                val deviceSN = "4f49a5dbfbf7c6a6" // FIXME 测试代码
+                val deviceSN = hardwareSerialNumber()
+                // val deviceSN = "4f49a5dbfbf7c6a6" // 测试代码
                 sn = if (deviceSN == "03778700666" || deviceSN == "03492200711" || deviceSN == "f02b5d95d98833d3" || deviceSN == "cf811453a0548b77") {
                     SN_PREFIX + deviceSN.substring(0, deviceSN.length - SN_PREFIX.length)
                 } else {

app/src/main/java/com/doverfuelingsolutions/issp/utils/sp/SPUtil.kt

@@ -126,7 +126,6 @@ object SPUtil {
         }
     }
 
-    // TODO 需要一个刷新全部数据的机制
     /**
      * 油品代码信息：读取
      */

app/src/main/java/com/doverfuelingsolutions/issp/view/MainActivity.kt

@@ -26,8 +26,8 @@ import com.doverfuelingsolutions.issp.utils.sp.SPKeys
 import com.doverfuelingsolutions.issp.utils.sp.SPUtil
 import com.doverfuelingsolutions.issp.view.fragment.FragmentNozzle
 import com.doverfuelingsolutions.issp.view.fragment.FragmentReconnect
-import com.doverfuelingsolutions.issp.view.fragment.router.FragmentRouter
 import com.doverfuelingsolutions.issp.view.fragment.FragmentSelect
+import com.doverfuelingsolutions.issp.view.fragment.router.FragmentRouter
 import com.doverfuelingsolutions.issp.view.fragment.router.OnRouteChangeListener
 import com.doverfuelingsolutions.issp.view.util.LoadingDialogBuilder
 import com.doverfuelingsolutions.issp.view.util.LoginTokenRefresher
@@ -272,7 +272,6 @@ class MainActivity : AppCompatActivity(),
         )
     }
 
-    // TODO 当本地未处理订单无法按预期处理时（如本地锁的单，但在服务器上被其他渠道解锁了，造成解锁失败；消单同理；）
     private fun handleUnsolvedOrder() {
         GlobalScope.launch(Dispatchers.IO) {
             val lockList = SPUtil.getLockOrderList()

app/src/main/java/com/doverfuelingsolutions/issp/view/fragment/FragmentOrderList.kt

@@ -161,7 +161,6 @@ class FragmentOrderList private constructor(private val pumpId: Int) : FragmentB
     private suspend fun loadRemoteData() {
         val result = FusionManager.getAllUnsettledOrder(pumpId)
         if (result.success && result.data != null) {
-            // TODO 本地缓存的订单数据（云订单，锁定，待清除订单），需要对照这里的远端数据进行整理
             if (pumpId == -1) {
                 SPUtil.setAllOrderList(result.data)
             } else {

app/src/main/java/com/doverfuelingsolutions/issp/view/fragment/FragmentPayScanCode.kt

@@ -80,7 +80,6 @@ class FragmentPayScanCode(private val dc: DeviceClass, private val posTrx: PosTr
                 return@launch
             }
 
-            // TODO 处理扫描成功后倒计时不足的问题
             val scanValue = scanCodeManager.start()
             if (scanValue == null) {
                 DFSToastUtil.fail(R.string.plz_correct_pay_code)
@@ -103,14 +102,12 @@ class FragmentPayScanCode(private val dc: DeviceClass, private val posTrx: PosTr
                         SPUtil.removeUnclearedOrder(dc)
                     } else {
                         // 失败则记下来，后续再尝试消单
-                        // TODO 如果后续仍然失败呢？包括锁单！！！！！
                         SPUtil.addUnclearedOrder(dc)
                     }
                 }
 
                 (activity as MainActivity).fragmentRouter.push(FragmentPayResult.build(dc, result.data.PosTrx))
             } else {
-                // TODO 倒计时不足的问题
                 DFSToastUtil.fail(result.message)
                 viewModel.scanTip.value = StringUtil.get(R.string.plz_scan_again)
                 startPay()