2.9.0.00

refactor-Upgrade minSdk from 21 to 23 refactor-条码展示用的字段改为displayBarcode
wxw-9527 · May 21, 2024 · 35d99ec · 35d99ec
1 parent 0fee620
commit 35d99ec
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
     compileSdk 34
     defaultConfig {
         applicationId "com.rouxinpai.demo"
-        minSdk 21
+        minSdk 23
         targetSdk 34
         versionCode 10000
         versionName "1.0.0.00"

diff --git a/arms/build.gradle b/arms/build.gradle
@@ -12,7 +12,7 @@ android {
     namespace 'com.rouxinpai.arms'
     compileSdk 34
     defaultConfig {
-        minSdk 21
+        minSdk 23
         targetSdk 34
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/arms/src/main/java/com/rouxinpai/arms/barcode/model/BarcodeInfoVO.kt b/arms/src/main/java/com/rouxinpai/arms/barcode/model/BarcodeInfoVO.kt
@@ -12,10 +12,10 @@ data class BarcodeInfoVO(
     val contextId: String,
     val batchCode: String,
     val barcode: String,
+    val displayBarcode: String?,
     val uniqueIdent: String,
     val barTypeEnum: BarTypeEnum,
     val snList: List<String>,
-    val extendData: String?,
     val barContextDataMap: Map<String, String>,
     val bomVO: BomVO?,
 ) {
@@ -38,10 +38,10 @@ data class BarcodeInfoVO(
                 contextId = dto.contextId,
                 batchCode = dto.batchCode,
                 barcode = dto.barCode,
+                displayBarcode = dto.extendData ?: dto.barCode,
                 uniqueIdent = dto.uniqueIdent,
                 barTypeEnum = BarTypeEnum.getBarTypeEnum(dto.barType),
                 snList = snList,
-                extendData = dto.extendData,
                 barContextDataMap = map,
                 bomVO = dto.bomList?.firstOrNull()?.let { BomVO.fromDto(it) },
             ).apply {

diff --git a/arms/src/main/java/com/rouxinpai/arms/base/activity/BaseActivity.kt b/arms/src/main/java/com/rouxinpai/arms/base/activity/BaseActivity.kt
@@ -83,11 +83,9 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity(), IView, OnRe
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        if (intent != null) {
-            onParseData(intent)
-        }
+        onParseData(intent)
     }
 
     // 处理双击退出程序的回调

diff --git a/arms/src/main/java/com/rouxinpai/arms/base/activity/BaseMvpActivity.kt b/arms/src/main/java/com/rouxinpai/arms/base/activity/BaseMvpActivity.kt
@@ -99,7 +99,7 @@ abstract class BaseMvpActivity<VB : ViewBinding, V : IView, P : IPresenter<V>> :
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         onParseNfcIntent(intent)
     }

diff --git a/arms/src/main/java/com/rouxinpai/arms/print/PrintActivity.kt b/arms/src/main/java/com/rouxinpai/arms/print/PrintActivity.kt
@@ -281,7 +281,7 @@ class PrintActivity : BaseMvpActivity<PrintActivityBinding, PrintContract.View,
                 // TODO: 其他类型条码待实现
             }
             // 条码
-            binding.tvBarcode.text = barcodeInfo.extendData ?: barcodeInfo.barcode
+            binding.tvBarcode.text = barcodeInfo.displayBarcode
             // 状态
             binding.tvStatus.setText(if (item.printSuccess) R.string.print__printed else R.string.print__unprinted)
         }

diff --git a/arms/src/main/java/com/rouxinpai/arms/print/PrintPresenter.kt b/arms/src/main/java/com/rouxinpai/arms/print/PrintPresenter.kt
@@ -91,7 +91,7 @@ class PrintPresenter @Inject constructor() :
                         addProperty(it, barcodeInfo.barContextDataMap[it])
                     }
                     addProperty("barCode", barcodeInfo.barcode)
-                    addProperty("sn", barcodeInfo.extendData ?: barcodeInfo.barcode)
+                    addProperty("sn", barcodeInfo.displayBarcode)
                     addProperty("materialCode", material.code) // 物料编码
                     addProperty("materialName", material.name) // 物料名称
                     addProperty("materialUnit", material.unit) // 物料单位

diff --git a/arms/src/main/java/com/rouxinpai/arms/print/SelectBarcodeActivity.kt b/arms/src/main/java/com/rouxinpai/arms/print/SelectBarcodeActivity.kt
@@ -150,7 +150,7 @@ class SelectBarcodeActivity :
         }
         if (missCopiesBarcode != null) {
             showWarningTip(
-                getString(R.string.select_barcode__miss_copies, missCopiesBarcode.barcode)
+                getString(R.string.select_barcode__miss_copies, missCopiesBarcode.displayBarcode)
             )
             return
         }
@@ -293,7 +293,7 @@ class SelectBarcodeActivity :
             item: BarcodeVO,
         ) {
             // 条码
-            binding.cbBarcode.text = item.extendData ?: item.barcode
+            binding.cbBarcode.text = item.displayBarcode
             binding.cbBarcode.isChecked = item.isChecked
             // 打印份数
             with(binding.stepperCopies) {

diff --git a/arms/src/main/java/com/rouxinpai/arms/print/SelectBarcodePresenter.kt b/arms/src/main/java/com/rouxinpai/arms/print/SelectBarcodePresenter.kt
@@ -44,7 +44,7 @@ class SelectBarcodePresenter @Inject constructor() : BasePresenter<SelectBarcode
                     .filter { dto -> dto.barType in materialBarTypeSet } // 过滤物料条码
                     .forEach { dto ->
                         val key = Pair(dto.materialInfo.materialCode, dto.supplierVO?.supplierCode)
-                        val barcodeVo = BarcodeVO(dto.barCode, dto.extendData)
+                        val barcodeVo = BarcodeVO.fromDto(dto)
                         val materialVo = materialMap.getOrPut(key) {
                             // 如果Map中不存在，则创建新的MaterialVO并加入到Map和List中
                             MaterialVO.fromDto(dto).also { materialVoList.add(it) }

diff --git a/arms/src/main/java/com/rouxinpai/arms/print/model/BarcodeVO.kt b/arms/src/main/java/com/rouxinpai/arms/print/model/BarcodeVO.kt
@@ -1,12 +1,27 @@
 package com.rouxinpai.arms.print.model
 
+import com.rouxinpai.arms.barcode.model.BarcodeInfoDTO
+
 /**
  * author : Saxxhw
  * email  : [email protected]
  * time   : 2024/4/1 10:33
  * desc   :
  */
-data class BarcodeVO(val barcode: String, val extendData: String?) {
+data class BarcodeVO(val barcode: String, val displayBarcode: String?) {
+
+    companion object {
+
+        /**
+         *
+         */
+        fun fromDto(dto: BarcodeInfoDTO): BarcodeVO {
+            return BarcodeVO(
+                barcode = dto.barCode,
+                displayBarcode = dto.extendData ?: dto.barCode
+            )
+        }
+    }
 
     // 是否选中
     var isChecked: Boolean = false