unify-external-plugin-platform 0.0.2-62 → 0.0.2-66

package/dist/external-plugin.common.js

@@ -84019,8 +84019,8 @@ var scanner_cameravue_type_template_id_00e9072f_scoped_true_render = function re
 };
 var scanner_cameravue_type_template_id_00e9072f_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=template&id=74130935&scoped=true&
-var scanner_camera_componentvue_type_template_id_74130935_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=template&id=65e6d7b8&scoped=true&
+var scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -84084,7 +84084,7 @@ var scanner_camera_componentvue_type_template_id_74130935_scoped_true_render = f
     }, [_vm._v(_vm._s(item.label))]), _vm._t("action")];
   })], 2)])]);
 };
-var scanner_camera_componentvue_type_template_id_74130935_scoped_true_staticRenderFns = [];
+var scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/utils/custom-axios.ts
 /**
@@ -84370,6 +84370,8 @@ var JieYuMethodCode;
   JieYuMethodCode["ScannerMainCamera_Base64"] = "main";
   /** 扫描-副摄像头 */
   JieYuMethodCode["ScannerSecondaryCamera_Base64"] = "vice";
+  /** 自动寻边*/
+  JieYuMethodCode["AutoFindEdge"] = "findEdge";
   /** 拍照 */
   JieYuMethodCode["TakePhoto_Base64"] = "takePhoto";
   /** 高拍仪读卡 */
@@ -84496,6 +84498,10 @@ class JieYueService {
           // 副摄像头
           method = 'bStartPlay2';
           break;
+        case JieYuMethodCode.AutoFindEdge:
+          // 自动寻边
+          method = 'bSetMode(3)';
+          break;
         case JieYuMethodCode.TakePhoto_Base64:
           // 拍照
           method = 'bSaveJPGEx';
@@ -84586,11 +84592,14 @@ class JieYueService {
   // 开启主摄像头/副摄像头
   static async turnOnTheCamera(type) {
     if (this.ws) this.ws.close();
-    await JieYueService.read(HardwareName.ScannerCamera, type);
+    JieYueService.read(HardwareName.ScannerCamera, type);
+    setTimeout(() => {
+      JieYueService.read(HardwareName.ScannerCamera, JieYuMethodCode.AutoFindEdge);
+    }, 1000);
   }
   // 拍照
   static async scanByCamera() {
-    if (this.ws) this.ws.close();
+    // if (this.ws) this.ws.close();
     let res = await JieYueService.read(HardwareName.ScannerCamera, JieYuMethodCode.TakePhoto_Base64);
     return res.replace('BeginbSaveJPGEx', '').replace('EndbSaveJPGEx', '');
   }
@@ -84857,12 +84866,18 @@ _defineProperty(FounderPluginSocketService, "scannerCameraUrl", 'ws://127.0.0.1:
 _defineProperty(FounderPluginSocketService, "ws", void 0);
 ;// CONCATENATED MODULE: ./packages/service/external-plugins/uds-plugin-socket.service.ts
 
+
 /**
  * @author: lvcy
  * @date: 2023-07-26
  * @description：紫图速拍仪
  */
 
+var UdsPluginMethodCode;
+(function (UdsPluginMethodCode) {
+  UdsPluginMethodCode["TurnOnCamera"] = "turnOnCamera";
+  UdsPluginMethodCode["TakePhoto_Base64"] = "TakePhoto_Base64";
+})(UdsPluginMethodCode || (UdsPluginMethodCode = {}));
 class UdsPluginSocketService {
   static startConnect() {
     if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
@@ -84885,9 +84900,23 @@ class UdsPluginSocketService {
     return onConnect;
   }
   static handleError() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('handleError');
+      });
+    }
     throw Error('紫图速拍仪设备功能加载失败');
   }
   static handleClose() {
+    for (const type in this.requestStore) {
+      this.requestStore.forEach(({
+        reject
+      }) => {
+        reject('close');
+      });
+    }
     if (this.ws) this.ws.close();
   }
   static handleMessage(msg) {
@@ -84895,33 +84924,82 @@ class UdsPluginSocketService {
     if (data.FuncName === 'ShowVideo') {
       const event = new ScannerCameraRefreshPhotoEvent(data.result);
       return window.dispatchEvent(event);
+    } else if (data.FuncName === "CaptureBase64" || data.FuncName === "CaptureDualBase64") {
+      this.requestStore.forEach(({
+        resolve
+      }) => {
+        resolve(data.result);
+      });
+      this.requestStore = [];
     }
   }
   /**
    * 发送请求
    */
-  static async read(method) {
+  static async read(methodCode, data) {
     await this.startConnect();
     if (this.ws.readyState === 1) {
-      this.ws.send(JSON.stringify({
-        Func: "StartRunMain",
-        arg: 0
-      }));
-      this.ws.send(JSON.stringify(method));
+      let method = '';
+      switch (methodCode) {
+        case UdsPluginMethodCode.TurnOnCamera:
+          this.ws.send(JSON.stringify({
+            Func: "StartRunMain",
+            arg: 0
+          }));
+          method = JSON.stringify({
+            Func: "ChangeCutType",
+            arg: 0
+          });
+          break;
+        case UdsPluginMethodCode.TakePhoto_Base64:
+          this.ws.send(JSON.stringify({
+            Func: "SetJPGQuality",
+            arg: 70
+          })); // jpg格式时有效
+          this.ws.send(JSON.stringify({
+            Func: "SetColorType",
+            arg: "彩色"
+          })); // 指定图像色彩模式，“彩色”、“灰度”、“黑白”三个选项
+          this.ws.send(JSON.stringify({
+            Func: "SetBoardColor",
+            arg: 0
+          })); // 1灰色底板机型，0或其他值为黑色底板机型
+          this.ws.send(JSON.stringify({
+            Func: "SetCamDPI",
+            arg: 720
+          })); // 设置高拍仪DPI，不设置则默认96DPI
+          method = JSON.stringify({
+            Func: "CaptureBase64",
+            arg: 0
+          });
+        // 0-jpg,1-bmp,2-png,3-tif格式
+      }
+
+      this.ws.send(method);
+      return new Promise((resolve, reject) => {
+        if (!this.requestStore) {
+          this.requestStore = [];
+        }
+        this.requestStore.push({
+          resolve,
+          reject
+        });
+      });
     } else {
       throw Error('设备未准备完成');
     }
   }
   static async turnOnTheCamera() {
-    let param = {
-      Func: "ChangeCutType",
-      arg: 1
-    };
-    await UdsPluginSocketService.read(param);
+    await UdsPluginSocketService.read(UdsPluginMethodCode.TurnOnCamera);
+  }
+  static async scanByCamera() {
+    const res = await UdsPluginSocketService.read(UdsPluginMethodCode.TakePhoto_Base64);
+    return res;
   }
 }
 _defineProperty(UdsPluginSocketService, "scannerCameraUrl", 'ws://127.0.0.1:8341');
 _defineProperty(UdsPluginSocketService, "ws", void 0);
+_defineProperty(UdsPluginSocketService, "requestStore", []);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=script&lang=js&
 
 
@@ -84993,19 +85071,25 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           let res = await JieYueService.scanByCamera();
           this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
           break;
-        case 3: // 方正
-        case 4:
+        case 3:
           {
-            // 紫图
+            // 方正
             this.$emit('send-scanner-result', this.scannerVideoSrc);
+            break;
+          }
+        case 4:
+          {
+            let res = await UdsPluginSocketService.scanByCamera();
+            this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
+            break;
           }
-          break;
         case 5:
           {
             // 良田
             let type = this.camera === 0 ? 'main' : 'vice';
             const res = await eloam_plugin_service_ELoamPassService.scanByCamera(type);
             this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
+            break;
           }
       }
     },
@@ -85075,10 +85159,10 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
 });
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=script&lang=js&
  /* harmony default export */ var component_scanner_camera_componentvue_type_script_lang_js_ = (scanner_camera_componentvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=74130935&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=65e6d7b8&prod&scoped=true&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=74130935&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=65e6d7b8&prod&scoped=true&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue
 
@@ -85091,11 +85175,11 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
 
 var scanner_camera_component_component = normalizeComponent(
   component_scanner_camera_componentvue_type_script_lang_js_,
-  scanner_camera_componentvue_type_template_id_74130935_scoped_true_render,
-  scanner_camera_componentvue_type_template_id_74130935_scoped_true_staticRenderFns,
+  scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_render,
+  scanner_camera_componentvue_type_template_id_65e6d7b8_scoped_true_staticRenderFns,
   false,
   null,
-  "74130935",
+  "65e6d7b8",
   null
   
 )