feat(scanner): 多厂商PDA扫码器兼容方案及扫码功能重构

- 采用策略模式及配置表驱动方式支持多品牌扫码器广播注册
- 实现扫码广播的统一注册和注销管理，支持并发多个扫码广播接收器
- 重构扫码处理逻辑，统一处理扫码结果，支持条码和二维码识别
- 移除原有单一品牌扫码注册，整合商米、新大陆等扫码头支持
- 调整扫码相关页面代码，集成scanMixin，实现扫码广播注册和注销自动化
- 优化扫码结果处理，支持删除模式及整缸扫描状态区分
- 修正多处界面文本格式与代码风格，提高代码一致性和可维护性
- 升级manifest版本号至1.1.3，标记此功能更新

src/pages/saleship/salepickscandetail.vue

@@ -6,31 +6,17 @@
         <text class="title" style="width: 200px">日期：{{ BillDate }}</text>
       </u-form-item>
       <u-form-item>
-        <text class="title" style="width: 200px"
-          >客户名称：{{ CustomerName }}</text
-        >
-        <text class="title" style="width: 200px"
-          >销 售 员：{{ SaleUserName }}</text
-        >
+        <text class="title" style="width: 200px">客户名称：{{ CustomerName }}</text>
+        <text class="title" style="width: 200px">销 售 员：{{ SaleUserName }}</text>
       </u-form-item>
       <u-form-item>
-        <text class="title" style="width: 200px"
-          >仓库名称：{{ StoreName }}{{ ToStoreName }}</text
-        >
+        <text class="title" style="width: 200px">仓库名称：{{ StoreName }}{{ ToStoreName }}</text>
       </u-form-item>
       <u-form-item>
-        <text class="title" style="width: 200px"
-          >备注内容：{{ BillRemark }}</text
-        >
+        <text class="title" style="width: 200px">备注内容：{{ BillRemark }}</text>
       </u-form-item>
       <u-form-item label-width="130" label="条码资料:">
-        <input
-          type="text"
-          v-model="QRBarCode"
-          maxlength="-1"
-          style="width: 170px"
-          @confirm="SalePickBillDetailScan"
-        />
+        <input type="text" v-model="QRBarCode" maxlength="-1" style="width: 170px" @confirm="SalePickBillDetailScan" />
         <checkbox-group @change="handleAllCrockNoChange">
           <checkbox :checked="AllCrockNoScanStatus">整缸</checkbox>
         </checkbox-group>
@@ -41,58 +27,38 @@
     </u-form>
     <u-form ref="uForm">
       <u-form-item>
-        <text class="title" style="width: 400px"
-          >成品名称：{{ FabricGoodsNo }}{{ FabricGoodsName }}</text
-        >
+        <text class="title" style="width: 400px">成品名称：{{ FabricGoodsNo }}{{ FabricGoodsName }}</text>
       </u-form-item>
       <u-form-item>
-        <text class="title" style="width: 400px"
-          >色号颜色：{{ GoodsCodeNo }}{{ GoodsCodeName }}</text
-        >
+        <text class="title" style="width: 400px">色号颜色：{{ GoodsCodeNo }}{{ GoodsCodeName }}</text>
       </u-form-item>
       <u-form-item>
         <text class="title" style="width: 200px">成品缸号：{{ CrockNo }}</text>
-        <text class="title" style="width: 200px"
-          >成品卷号：{{ GoodsBillNo }}</text
-        >
+        <text class="title" style="width: 200px">成品卷号：{{ GoodsBillNo }}</text>
       </u-form-item>
       <u-form-item>
         <text class="title">{{ BillDataMessage }}</text>
       </u-form-item>
       <u-form-item>
-        <text class="title" style="width: 130px"
-          >配布条数：{{ BillSumRoll }}</text
-        >
+        <text class="title" style="width: 130px">配布条数：{{ BillSumRoll }}</text>
         <text class="title" style="width: 130px">数量：{{ BillSumQty }}</text>
         <text class="title" style="width: 120px">米数：{{ BillSumMQty }}</text>
       </u-form-item>
       <u-form-item>
-        <text class="title" style="width: 130px"
-          >已配条数：{{ BillScanRoll }}</text
-        >
+        <text class="title" style="width: 130px">已配条数：{{ BillScanRoll }}</text>
         <text class="title" style="width: 130px">数量：{{ BillScanQty }}</text>
         <text class="title" style="width: 120px">米数：{{ BillScanMQty }}</text>
       </u-form-item>
       <view class="submitView">
-        <u-button
-          type="primary"
-          class="submitBtn"
-          :ripple="true"
-		  :loading="submitLoading"
-          ripple-bg-color="#909399"
-          @click="submitBtnFun"
-        >
+        <u-button type="primary" class="submitBtn" :ripple="true" :loading="submitLoading" ripple-bg-color="#909399"
+          @click="submitBtnFun">
           {{ pageType ? "保存" : "提交" }}
         </u-button>
       </view>
     </u-form>
     <view class="u-demo-area">
       <u-toast ref="uToast"></u-toast>
-      <wyb-table
-        ref="table"
-        :headers="headersMaster"
-        :contents="GoodsDetailList"
-      />
+      <wyb-table ref="table" :headers="headersMaster" :contents="GoodsDetailList" />
     </view>
   </view>
 </template>
@@ -105,8 +71,10 @@ import util, {
   playErrorAudio,
 } from "../../common/util";
 import wybTable from "@/components/wyb-table/wyb-table.vue";
+import scanMixin from "@/common/scanMixin.js";
 let that = "";
 export default {
+  mixins: [scanMixin],
   data() {
     return {
       SaleBillNo: "", // 单号
@@ -115,7 +83,7 @@ export default {
       align: "center",
       index: 0,
       pageType: "",
-	  submitLoading: false,
+      submitLoading: false,
       actionSheetShow: false,
       QRBarCode: "",
       BillNo: "",
@@ -192,8 +160,7 @@ export default {
       ],
       scanningInput: "", // 用于累积扫码输入
       lastKeyTime: 0, // 用于判断扫码速度
-      scanReceiver: null,
-      isPageActive: false, // 添加页面活动状态标志
+      // scanReceiver 和 isPageActive 由 scanMixin 提供
     };
   },
 
@@ -214,14 +181,13 @@ export default {
   },
 
   onUnload() {
-    // #ifdef APP-PLUS
     this.isPageActive = false;
+    // #ifdef APP-PLUS
     this.unregisterScanBroadcast();
     // #endif
   },
 
   onHide() {
-    // 页面隐藏时
     this.isPageActive = false;
     // #ifdef APP-PLUS
     this.unregisterScanBroadcast();
@@ -229,10 +195,15 @@ export default {
   },
 
   onShow() {
-    // 页面显示时
     this.isPageActive = true;
     // #ifdef APP-PLUS
-    this.registerScanBroadcast();
+    this.registerScanBroadcast((scanResult) => {
+      console.log("配布单详情-扫码结果:", scanResult);
+      this.QRBarCode = scanResult;
+      this.$nextTick(() => {
+        this.handleScans();
+      });
+    });
     // #endif
   },
 
@@ -300,7 +271,7 @@ export default {
         }
 
         this.GoodsDetailList = aResultDataList;
-       
+
       }).catch(error => {
         this.triggered = false;
         this.showError(error.msg);
@@ -323,247 +294,93 @@ export default {
         icon: 'success'
       });
     },
-	   handleScans() {
-	     // 删除模式判断
-	     let aBarCodeDelStatus = 1; // 1=正常扫码，3=删除模式
-	     if (this.BarCodeDelStatus) {
-	       aBarCodeDelStatus = 3;
-	     }
-
-	     // 整缸扫描判断
-	     let aAllCrockNoScanStatus = 2; // 0=普通扫描，1=整缸扫描
-	     if (this.AllCrockNoScanStatus) {
-	       aAllCrockNoScanStatus = "1";
-	     }
-
-	     // 数据清理：去除空格、换行符等
-	     let cleanCode = this.QRBarCode.replace(/\s+/g, '').replace(/[\r\n]/g, '');
-	     
-	     console.log("this.QRBarCode ---->>" + cleanCode);
-	     
-	     // 初始化条码和二维码变量
-	     let aQRBarCode = "";
-	     let aBarCode = "";
-
-	     if (cleanCode.startsWith("66^") || cleanCode.startsWith("99^") || /[\u4E00-\u9FA5]/.test(cleanCode)) {
-	       aQRBarCode = cleanCode;
-	     } else {
-	       aBarCode = cleanCode;
-	     }
-
-	     if (aQRBarCode == "" && aBarCode == "") {
-	       this.QRBarCode = "";
-	       this.showError('请扫描二维码或者条码');
-	       return;
-	     }
-
-	     console.log('请求参数', aBarCodeDelStatus);
-	     console.log('请求参数', aBarCode);
-	     console.log('请求参数', aQRBarCode);
-	     console.log('请求参数', this.BillMasterID);
-	     console.log('请求参数 SaleBillNo', this.SaleBillNo);
-	     console.log('请求参数 token', uni.getStorageSync("userToken").Token);
-	     // 发送请求
-	     util.request({
-	       url: "/product/fpmArrangeOrder/updateFpmArrangeOrder",
-	       method: "PUT",
-	       header: {
-	         Platform: 2,
-	         Authorization: uni.getStorageSync("userToken").Token,
-	       },
-	       data: {
-	         arrange_type: aBarCodeDelStatus, // 1=正常扫码，3=删除模式
-	         bar_code: aBarCode, // 条码（如果是条形码就使用这个）
-	         qr_code: aQRBarCode, // 二维码（如果是二维码就使用这个）
-	         id: parseInt(this.BillMasterID), // 订单ID
-	         // order_no: this.SaleBillNo, // 单号
-	       },
-	       success: (res) => {
-	         console.log('API响应:', res);
-
-	         if (res.data.code == 0 && res.data.msg == "success") {
-	           var aResultData = res.data.data;
-	           this.playSuccess();
-	           this.FabricGoodsNo = aResultData.product_code;
-	           this.FabricGoodsName = aResultData.product_name;
-	           this.GoodsCodeNo = aResultData.product_color_code;
-	           this.GoodsCodeName = aResultData.product_color_name;
-	           this.CrockNo = aResultData.dyelot_number;
-	           this.GoodsBillNo = aResultData.volume_number;
-	           this.QRBarCode = "";
-
-	           if (aBarCodeDelStatus == 1) {
-	             this.showSuccess("扫描成功！");
-	           } else {
-	             this.showSuccess("删除成功！");
-	           }
-
-	           this.SalePickDetail();
-	         } else {
-	           this.showError("扫描出错，" + res.data.msg);
-	           this.QRBarCode = "";
-	         }
-	       },
-	       fail: (error) => {
-	         console.error('API请求失败:', error);
-	         this.QRBarCode = "";
-	         this.showError("连接服务器出错，请检查后台服务是否启动！");
-	       },
-	     });
-	   },
-
-    // 注册扫码广播接收器（支持商米和新大陆扫码头）
-    registerScanBroadcast() {
-      try {
-        // 先尝试注册商米扫码头
-        this.registerSunmiBroadcast()
-          .then(() => {
-            console.log('商米扫码头注册成功');
-          })
-          .catch((error) => {
-            console.log('商米扫码头注册失败，尝试新大陆扫码头:', error);
-            // 如果商米扫码头注册失败，尝试新大陆扫码头
-            this.registerNewlandBroadcast();
-          });
-      } catch (error) {
-        console.error("注册扫码广播失败：", error);
+    handleScans() {
+      // 删除模式判断
+      let aBarCodeDelStatus = 1; // 1=正常扫码，3=删除模式
+      if (this.BarCodeDelStatus) {
+        aBarCodeDelStatus = 3;
       }
-    },
 
-    // 注册商米扫码头广播接收器
-    registerSunmiBroadcast() {
-      return new Promise((resolve, reject) => {
-        try {
-          const main = plus.android.runtimeMainActivity();
-          const IntentFilter = plus.android.importClass("android.content.IntentFilter");
-          
-          const filter = new IntentFilter();
-          filter.addAction("com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED");
+      // 整缸扫描判断
+      let aAllCrockNoScanStatus = 2; // 0=普通扫描，1=整缸扫描
+      if (this.AllCrockNoScanStatus) {
+        aAllCrockNoScanStatus = "1";
+      }
 
-          const receiver = plus.android.implements(
-            "io.dcloud.feature.internal.reflect.BroadcastReceiver",
-            {
-              onReceive: (context, intent) => {
-                console.log('商米扫码广播接收，isPageActive:', this.isPageActive);
-                // 只有当页面活动时才处理广播
-                if (!this.isPageActive) return;
+      // 数据清理：去除空格、换行符等
+      let cleanCode = this.QRBarCode.replace(/\s+/g, '').replace(/[\r\n]/g, '');
 
-                try {
-                  const scanResult = intent.getStringExtra("data");
-                  const sourceBytes = intent.getByteArrayExtra("source_byte");
-                  
-                  console.log('商米扫码结果:', scanResult, sourceBytes);
-                  
-                  if (scanResult) {
-                    this.handleScanResult(scanResult);
-                  }
-                } catch (error) {
-                  console.error('处理商米广播数据时出错：', error);
-                }
-              }
+      console.log("this.QRBarCode ---->>" + cleanCode);
+
+      // 初始化条码和二维码变量
+      let aQRBarCode = "";
+      let aBarCode = "";
+
+      if (cleanCode.startsWith("66^") || cleanCode.startsWith("99^") || /[\u4E00-\u9FA5]/.test(cleanCode)) {
+        aQRBarCode = cleanCode;
+      } else {
+        aBarCode = cleanCode;
+      }
+
+      if (aQRBarCode == "" && aBarCode == "") {
+        this.QRBarCode = "";
+        this.showError('请扫描二维码或者条码');
+        return;
+      }
+
+      console.log('请求参数', aBarCodeDelStatus);
+      console.log('请求参数', aBarCode);
+      console.log('请求参数', aQRBarCode);
+      console.log('请求参数', this.BillMasterID);
+      console.log('请求参数 SaleBillNo', this.SaleBillNo);
+      console.log('请求参数 token', uni.getStorageSync("userToken").Token);
+      // 发送请求
+      util.request({
+        url: "/product/fpmArrangeOrder/updateFpmArrangeOrder",
+        method: "PUT",
+        header: {
+          Platform: 2,
+          Authorization: uni.getStorageSync("userToken").Token,
+        },
+        data: {
+          arrange_type: aBarCodeDelStatus, // 1=正常扫码，3=删除模式
+          bar_code: aBarCode, // 条码（如果是条形码就使用这个）
+          qr_code: aQRBarCode, // 二维码（如果是二维码就使用这个）
+          id: parseInt(this.BillMasterID), // 订单ID
+          // order_no: this.SaleBillNo, // 单号
+        },
+        success: (res) => {
+          console.log('API响应:', res);
+
+          if (res.data.code == 0 && res.data.msg == "success") {
+            var aResultData = res.data.data;
+            this.playSuccess();
+            this.FabricGoodsNo = aResultData.product_code;
+            this.FabricGoodsName = aResultData.product_name;
+            this.GoodsCodeNo = aResultData.product_color_code;
+            this.GoodsCodeName = aResultData.product_color_name;
+            this.CrockNo = aResultData.dyelot_number;
+            this.GoodsBillNo = aResultData.volume_number;
+            this.QRBarCode = "";
+
+            if (aBarCodeDelStatus == 1) {
+              this.showSuccess("扫描成功！");
+            } else {
+              this.showSuccess("删除成功！");
             }
-          );
 
-          // 注册广播接收器
-          main.registerReceiver(receiver, filter);
-          this.scanReceiver = receiver;
-          console.log('商米扫码广播接收器注册成功');
-          resolve();
-        } catch (error) {
-          console.error('注册商米广播接收器失败：', error);
-          reject(error);
-        }
-      });
-    },
-
-    // 注册新大陆扫码头广播接收器
-    registerNewlandBroadcast() {
-      try {
-        const main = plus.android.runtimeMainActivity();
-
-        // 先配置扫码枪广播设置
-        try {
-          const Intent = plus.android.importClass("android.content.Intent");
-          const intent = new Intent("com.android.scanner.service_settings");
-          intent.putExtra(
-            "action_barcode_broadcast",
-            "com.android.server.scannerservice.broadcast"
-          );
-          intent.putExtra("key_barcode_broadcast", "scannerdata");
-          main.sendBroadcast(intent);
-          console.log('新大陆扫码枪广播配置完成');
-        } catch (error) {
-          console.error("配置新大陆扫码枪广播失败：", error);
-        }
-
-        // 注册广播接收器
-        const IntentFilter = plus.android.importClass(
-          "android.content.IntentFilter"
-        );
-        const filter = new IntentFilter();
-        filter.addAction("com.android.server.scannerservice.broadcast");
-        console.log("添加新大陆广播action完成");
-
-        const receiver = plus.android.implements(
-          "io.dcloud.feature.internal.reflect.BroadcastReceiver",
-          {
-            onReceive: (context, intent) => {
-              console.log('新大陆扫码广播接收，isPageActive:', this.isPageActive);
-              // 只有当页面活动时才处理广播
-              if (!this.isPageActive) return;
-              
-              try {
-                const scanResult = intent.getStringExtra("scannerdata");
-                console.log("新大陆扫码结果:", scanResult);
-                if (scanResult) {
-                  this.handleScanResult(scanResult);
-                }
-              } catch (error) {
-                console.error("处理新大陆广播数据时出错：", error);
-              }
-            },
+            this.SalePickDetail();
+          } else {
+            this.showError("扫描出错，" + res.data.msg);
+            this.QRBarCode = "";
           }
-        );
-
-        // 注册广播接收器
-        main.registerReceiver(receiver, filter);
-        this.scanReceiver = receiver;
-        console.log("新大陆扫码广播注册成功，等待扫码...");
-      } catch (error) {
-        console.error("注册新大陆扫码广播失败：", error);
-        throw error;
-      }
-    },
-
-    // 处理扫码结果的统一方法
-    handleScanResult(scanResult) {
-      try {
-        // 数据清理：去除空格、换行符等
-        let cleanCode = scanResult.replace(/\s+/g, '').replace(/[\r\n]/g, '');
-        
-        console.log("配布单详情-扫码结果:", cleanCode);
-        
-        this.QRBarCode = cleanCode;
-        this.$nextTick(() => {
-          this.handleScans();
-        });
-      } catch (error) {
-        console.error("处理扫码结果时出错：", error);
-      }
-    },
-
-    // 注销扫码广播接收器
-    unregisterScanBroadcast() {
-      if (this.scanReceiver) {
-        try {
-          const main = plus.android.runtimeMainActivity();
-          main.unregisterReceiver(this.scanReceiver);
-          this.scanReceiver = null;
-          console.log("扫码广播注销成功");
-        } catch (error) {
-          console.error("注销扫码广播失败：", error);
-        }
-      }
+        },
+        fail: (error) => {
+          console.error('API请求失败:', error);
+          this.QRBarCode = "";
+          this.showError("连接服务器出错，请检查后台服务是否启动！");
+        },
+      });
     },
 
     SalePickBillDetailScan() {
@@ -601,13 +418,13 @@ export default {
       }
     },
     // 新增提交订单的方法
-    submitOrder: function() {
-		  this.submitLoading = true
+    submitOrder: function () {
+      this.submitLoading = true
       this.$u.api.outFpmArrangeOrder({
         id: parseInt(this.BillMasterID)
       }).then(res => {
-		    this.submitLoading = false
-        console.log('outFpmArrangeOrder res',res)
+        this.submitLoading = false
+        console.log('outFpmArrangeOrder res', res)
         if (res) {
           this.BillDataMessage = "成功生成出仓单！";
           this.playSuccess();
@@ -617,7 +434,7 @@ export default {
           return;
         }
       }).catch(error => {
-			  this.submitLoading = false
+        this.submitLoading = false
         this.playError();
         this.BillDataMessage = "连接服务器出错，请检查后台服务是否启动！";
       });
@@ -676,7 +493,7 @@ page {
   margin-right: 12rpx;
 }
 
-.cpInput > input {
+.cpInput>input {
   box-sizing: border-box;
   border: 1rpx solid #dddddd;
   width: 100%;
@@ -690,7 +507,7 @@ page {
   margin-right: 12rpx;
 }
 
-.cpInput1 > input {
+.cpInput1>input {
   box-sizing: border-box;
   border: 1rpx solid #dddddd;
   width: 100%;