unify-external-plugin-platform 0.0.3-1 → 0.0.3-11

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=dc9fa1f2&scoped=true&
-var scanner_camera_componentvue_type_template_id_dc9fa1f2_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=4394461f&scoped=true&
+var scanner_camera_componentvue_type_template_id_4394461f_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_dc9fa1f2_scoped_true_render = f
     }, [_vm._v(_vm._s(item.label))]) : _vm._e()];
   }), _vm._t("action")]], 2)])]);
 };
-var scanner_camera_componentvue_type_template_id_dc9fa1f2_scoped_true_staticRenderFns = [];
+var scanner_camera_componentvue_type_template_id_4394461f_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/utils/custom-axios.ts
 /**
@@ -84151,10 +84151,17 @@ class custom_axios_CustomAxios {
 
 var eloam_plugin_service_ELoamMethodCode;
 (function (ELoamMethodCode) {
+  ELoamMethodCode["ScannerCameraLinuxInit"] = "ScannerCameraLinuxInit";
+  /** 打开摄像头linux*/
+  ELoamMethodCode["ScannerCameraLinuxStartPreview"] = "ScannerCameraLinuxStartPreview";
+  /** 获取视频帧 linux*/
+  ELoamMethodCode["ScannerCameraLinuxGetFrame"] = "ScannerCameraLinuxGetFrame";
   /** 糾偏 */
   ELoamMethodCode["ScannerCameraDeskew_Base64"] = "ScannerCameraDeskew_Base64";
   /** 合并*/
   ELoamMethodCode["ScannerCameraMerge_Base64"] = "ScannerCameraMerge_Base64";
+  /** 旋转 */
+  ELoamMethodCode["ScannerCameraRotate"] = "ScannerCameraRotate";
   /** 扫描-主摄像头 */
   ELoamMethodCode["ScannerMainCamera_Base64"] = "ScannerMainCamera_Base64";
   /** 扫描-副摄像头 */
@@ -84170,71 +84177,118 @@ const eloam_plugin_service_ELoamMethodDesc = {
 class eloam_plugin_service_ELoamPassService {
   /** 主摄像头地址 */
   static get mainCameraUrl() {
-    return this.baseServiceUrl + '/video=stream&camidx=0';
+    if (this._isLinux) {
+      return this.baseLinuxServiceUrl + '/StartPreview?dev_idx=0&res_id=0';
+    } else {
+      return this.baseServiceUrl + '/video=stream&camidx=0';
+    }
   }
   /** 副摄像头地址 */
   static get secondaryCameraUrl() {
-    return this.baseServiceUrl + '/video=stream&camidx=1';
+    if (this._isLinux) {
+      return this.baseLinuxServiceUrl + '/StartPreview?dev_idx=1&res_id=0';
+    } else {
+      return this.baseServiceUrl + '/video=stream&camidx=1';
+    }
   }
   static async read(method, data) {
     let param = {},
       url = '',
       requestType = '';
     switch (method) {
-      case eloam_plugin_service_ELoamMethodCode.ScannerCameraDeskew_Base64:
-        // 开启纠偏裁边
-        url = this.baseServiceUrl + '/dvideo=cameradeskew';
+      case eloam_plugin_service_ELoamMethodCode.ScannerCameraLinuxInit:
+        url = `${this.baseLinuxServiceUrl}/GetAllDisplayInfo`;
+        requestType = 'get';
+        break;
+      case eloam_plugin_service_ELoamMethodCode.ScannerCameraLinuxStartPreview:
+        url = `${this.baseLinuxServiceUrl}/StartPreview?dev_idx=${data}&res_id=0`;
+        requestType = 'get';
+        break;
+      case eloam_plugin_service_ELoamMethodCode.ScannerCameraLinuxGetFrame:
+        url = `${this.baseLinuxServiceUrl}/getFrame`;
+        requestType = 'get';
+        break;
+      case eloam_plugin_service_ELoamMethodCode.ScannerCameraRotate:
+        url = this.baseServiceUrl + '/video=rotate';
         param = {
           camidx: "0",
-          open: "1"
+          rotate: data.toString()
         };
         requestType = 'post';
         break;
+      case eloam_plugin_service_ELoamMethodCode.ScannerCameraDeskew_Base64:
+        // 纠偏
+        if (eloam_plugin_service_ELoamPassService._isLinux) {
+          url = `${this.baseLinuxServiceUrl}/EnableDeskImage?enable=${data}`;
+          requestType = 'get';
+        } else {
+          // 开启纠偏裁边
+          url = this.baseServiceUrl + '/dvideo=cameradeskew';
+          param = {
+            camidx: "0",
+            open: data
+          };
+          requestType = 'post';
+        }
+        break;
       case eloam_plugin_service_ELoamMethodCode.ScannerCameraMerge_Base64:
         // 合并
-        url = this.baseServiceUrl + '/compose=photos';
-        // outputfilepath 输出文件保存地址。例：D://res.jpg
-        // outputmaxwidth 合成后文件最大宽度。例：3000px
-        // inputimagetype 待合成文件类型：0：file；1：base64
-        // outputimagetype 合成后文件类型：0：jpg；1：PDF
-        param = {
-          outputfilepath: "",
-          outputmaxwidth: "3000",
-          inputimagetype: "1",
-          outputimagetype: "0",
-          imagelist: data.toString()
-        };
-        requestType = 'post';
+        if (this._isLinux) {
+          // 国产
+          url = `${this.baseLinuxServiceUrl}/composeIDcardPic?image1=${data.list[0]}&image2=${data.list[1]}`;
+          requestType = 'get';
+        } else {
+          url = this.baseServiceUrl + '/compose=photos';
+          param = {
+            outputfilepath: "",
+            outputmaxwidth: "3000",
+            inputimagetype: "1",
+            outputimagetype: "0",
+            isIDCardCompose: data.type,
+            imagelist: data.list.toString()
+          };
+          requestType = 'post';
+        }
         break;
       case eloam_plugin_service_ELoamMethodCode.ScannerMainCamera_Base64:
         // rotate: 旋转角度；deskew：纠偏，主摄像头1，副摄像头0 camidx：主摄像头0，副摄像头1；ColorMode：quality
-        url = this.baseServiceUrl + '/video=grabimage';
-        param = {
-          filepath: "",
-          rotate: "0",
-          deskew: "0",
-          deskewval: "0",
-          camidx: "0",
-          ColorMode: "0",
-          quality: "0",
-          bIsPrint1to1: "0"
-        };
-        requestType = 'post';
+        if (this._isLinux) {
+          url = this.baseLinuxServiceUrl + '/getPic?filepath=/tmp';
+          requestType = 'get';
+        } else {
+          url = this.baseServiceUrl + '/video=grabimage';
+          param = {
+            filepath: "base64",
+            rotate: "0",
+            deskew: data,
+            deskewval: "20",
+            camidx: "0",
+            ColorMode: "0",
+            quality: "0",
+            bIsPrint1to1: "0"
+          };
+          requestType = 'post';
+        }
         break;
       case eloam_plugin_service_ELoamMethodCode.ScannerSecondaryCamera_Base64:
-        // rotate: 旋转角度,；deskew：纠偏，主摄像头1，副摄像头0 camidx：主摄像头0，副摄像头1；ColorMode：quality
-        url = this.baseServiceUrl + '/video=grabimage';
-        param = {
-          filepath: "",
-          rotate: "0",
-          deskew: "0",
-          deskewval: "0",
-          camidx: "1",
-          ColorMode: "0",
-          quality: "0",
-          bIsPrint1to1: "0"
-        };
-        requestType = 'post';
+        if (this._isLinux) {
+          url = this.baseLinuxServiceUrl + '/getPic?filepath=/tmp';
+          requestType = 'get';
+        } else {
+          // rotate: 旋转角度,；deskew：纠偏，主摄像头1，副摄像头0 camidx：主摄像头0，副摄像头1；ColorMode：quality
+          url = this.baseServiceUrl + '/video=grabimage';
+          param = {
+            filepath: "",
+            rotate: "0",
+            deskew: "0",
+            deskewval: "0",
+            camidx: "1",
+            ColorMode: "0",
+            quality: "0",
+            bIsPrint1to1: "0"
+          };
+          requestType = 'post';
+        }
         break;
       case eloam_plugin_service_ELoamMethodCode.ReadIDCard_Base64:
         url = this.baseServiceUrl + '/card=idcard';
@@ -84244,24 +84298,44 @@ class eloam_plugin_service_ELoamPassService {
     let res = await custom_axios_CustomAxios[requestType](url, param);
     return res;
   }
+  static async initLinuxCamera() {
+    await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraLinuxInit);
+  }
+  static async startPreview(data) {
+    return await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraLinuxStartPreview, data);
+  }
+  static async getEloamFrame() {
+    return await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraLinuxGetFrame);
+  }
   /** 主摄像头拍照 */
-  static async scanByMainCamera() {
-    const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerMainCamera_Base64);
-    return res.photoBase64;
+  static async scanByMainCamera(deskew) {
+    const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerMainCamera_Base64, deskew);
+    if (this._isLinux) {
+      return res.data.img; // 国产
+    } else {
+      return res.photoBase64;
+    }
   }
   /** 副摄像头拍照 */
   static async scanBySecondaryCamera() {
     const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerSecondaryCamera_Base64);
-    return res.photoBase64;
+    if (this._isLinux) {
+      return res.data.img; // 国产
+    } else {
+      return res.photoBase64;
+    }
   }
-  static async mergeImage(list) {
-    const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraMerge_Base64, list);
-    return res.base64;
+  static async mergeImage(list, type) {
+    const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraMerge_Base64, {
+      list,
+      type
+    });
+    return res.base64 || res.data;
   }
-  static async scanByCamera(type) {
+  static async scanByCamera(type, deskew) {
     switch (type) {
       case "main":
-        return this.scanByMainCamera();
+        return this.scanByMainCamera(deskew);
       case 'vice':
         return this.scanBySecondaryCamera();
     }
@@ -84322,6 +84396,8 @@ class eloam_plugin_service_ELoamPassService {
   }
 }
 _defineProperty(eloam_plugin_service_ELoamPassService, "baseServiceUrl", 'http://127.0.0.1:38088');
+_defineProperty(eloam_plugin_service_ELoamPassService, "baseLinuxServiceUrl", 'http://127.0.0.1:6543');
+_defineProperty(eloam_plugin_service_ELoamPassService, "_isLinux", String(navigator.platform).indexOf("Linux") > -1);
 ;// CONCATENATED MODULE: ./packages/model/common-message.ts
 
 /**
@@ -85469,13 +85545,26 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
         name: '照片',
         value: 1
       }],
+      deskewStatus: '0',
+      rotateDeg: 0,
       buttonList: [{
         label: '拍照',
         name: 'take-pictures'
       }, {
-        label: '合并拍照',
+        label: '图片合并',
         name: 'take-pictures-merge'
+      }, {
+        label: '证件合并',
+        name: 'take-idCard-pictures-merge'
+      }, {
+        label: '纠偏裁边',
+        name: 'open-deskew'
+      }, {
+        label: '旋转',
+        name: 'rotate-video'
       }],
+      _isLinux: String(navigator.platform).indexOf("Linux") > -1,
+      eloamLinuxFrameTimer: {},
       mergeImageList: []
     };
   },
@@ -85542,10 +85631,10 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           {
             // 良田
             let type = this.camera === 0 ? 'main' : 'vice';
-            const res = await eloam_plugin_service_ELoamPassService.scanByCamera(type);
-            console.log('良田=>', res);
+            const res = await eloam_plugin_service_ELoamPassService.scanByCamera(type, this.deskewStatus);
             if (res) {
-              this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
+              let path = String(navigator.platform).indexOf("Linux") > -1 ? res.photoBase64 : res;
+              this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${path}`);
             } else {
               this.$message.error('拍照出错，请检查设备是否连接成功');
             }
@@ -85579,10 +85668,15 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           break;
         case 5:
           // 良田高拍仪
-          this.scannerVideoSrc = eloam_plugin_service_ELoamPassService.mainCameraUrl;
-          setTimeout(() => {
-            eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraDeskew_Base64); // 开启纠偏裁边
-          }, 2000);
+          if (!(String(navigator.platform).indexOf("Linux") > -1)) {
+            this.scannerVideoSrc = eloam_plugin_service_ELoamPassService.mainCameraUrl;
+          } else {
+            await eloam_plugin_service_ELoamPassService.initLinuxCamera();
+            let res = await eloam_plugin_service_ELoamPassService.startPreview('0');
+            if (res.returnCode == "0" || res.returnCode == "2") {
+              this.eloamLinuxFrameTimer = setInterval(this.getEloamFrame, 300);
+            }
+          }
           break;
         case 6:
           // 国产客户端一体机
@@ -85590,6 +85684,15 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           break;
       }
     },
+    async getEloamFrame() {
+      let res = await eloam_plugin_service_ELoamPassService.getEloamFrame();
+      if (res.returnCode == "1") {
+        clearInterval(this.eloamLinuxFrameTimer);
+        return;
+      }
+      if (res.data.img == "") return;
+      this.scannerVideoSrc = `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res.data.img}`;
+    },
     /**
      * 副摄像头
      */
@@ -85609,7 +85712,13 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           break;
         case 5:
           // 良田
-          this.scannerVideoSrc = eloam_plugin_service_ELoamPassService.secondaryCameraUrl;
+          if (!(String(navigator.platform).indexOf("Linux") > -1)) {
+            this.scannerVideoSrc = eloam_plugin_service_ELoamPassService.mainCameraUrl;
+          } else {
+            await eloam_plugin_service_ELoamPassService.initLinuxCamera();
+            await eloam_plugin_service_ELoamPassService.startPreview('1');
+            this.eloamLinuxFrameTimer = setInterval(this.getEloamFrame, 300);
+          }
           break;
         case 6:
           // 国产客户端一体机
@@ -85617,13 +85726,15 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           break;
       }
     },
-    async takePictureMerge() {
-      const res = await eloam_plugin_service_ELoamPassService.scanByCamera('main');
+    async takePictureMerge(type) {
+      if (type === '1' && this.deskewStatus === '0') return this.$message.warning('请先开启纠偏');
+      const res = await eloam_plugin_service_ELoamPassService.scanByCamera('main', this.deskewStatus);
       if (res) {
-        this.mergeImageList.push(res);
+        let path = String(navigator.platform).indexOf("Linux") > -1 ? res.filepath : res;
+        this.mergeImageList.push(path);
         if (this.mergeImageList.length === 1) this.$message.success('第一张拍摄成功，请拍第二张');
         if (this.mergeImageList.length === 2) {
-          let result = await eloam_plugin_service_ELoamPassService.mergeImage(this.mergeImageList);
+          let result = await eloam_plugin_service_ELoamPassService.mergeImage(this.mergeImageList, type);
           this.mergeImageList = [];
           this.$message.success('合并成功');
           this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${result}`);
@@ -85635,6 +85746,9 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
     _isShowButton(name) {
       switch (name) {
         case 'take-pictures-merge':
+        case 'take-idCard-pictures-merge':
+        case 'open-deskew': // 纠偏裁边
+        case 'rotate-video':
           return this.machineType === 5;
         // 良田显示合并拍照
         default:
@@ -85657,18 +85771,35 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           break;
         case 'take-pictures-merge':
           // 拍照合并
-          this.takePictureMerge();
+          this.takePictureMerge('0');
           break;
+        case 'take-idCard-pictures-merge':
+          // 合并拍照身份证
+          this.takePictureMerge('1');
+          break;
+        case 'rotate-video':
+          if (String(navigator.platform).indexOf("Linux") > -1) {
+            this.rotateDeg += 90;
+            if (this.rotateDeg === 360) this.rotateDeg = 0;
+          } else {
+            this.rotateDeg = 90;
+          }
+          eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraRotate, this.rotateDeg); // 选装
+          break;
+        case 'open-deskew':
+          this.deskewStatus = this.deskewStatus === '1' ? '0' : '1';
+          eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraDeskew_Base64, this.deskewStatus);
+        // 开启纠偏裁边
       }
     }
   }
 });
 ;// 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=dc9fa1f2&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=4394461f&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=dc9fa1f2&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=4394461f&prod&scoped=true&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue
 
@@ -85681,11 +85812,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_dc9fa1f2_scoped_true_render,
-  scanner_camera_componentvue_type_template_id_dc9fa1f2_scoped_true_staticRenderFns,
+  scanner_camera_componentvue_type_template_id_4394461f_scoped_true_render,
+  scanner_camera_componentvue_type_template_id_4394461f_scoped_true_staticRenderFns,
   false,
   null,
-  "dc9fa1f2",
+  "4394461f",
   null
   
 )
@@ -87544,6 +87675,257 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
  * @date: 2023-10-12
  * @description：华视电子读卡器
  */
+const NationalityEnum = {
+  AND: "安道尔",
+  AFG: "阿富汗",
+  ATG: "安提瓜和巴布达",
+  AIA: "安圭拉",
+  ALB: "阿尔巴尼亚",
+  ARM: "亚美尼亚",
+  AGO: "安哥拉",
+  ATA: "南极洲",
+  ARG: "阿根廷",
+  ASM: "美属萨摩亚",
+  AUT: "奥地利",
+  AUS: "澳大利亚",
+  ABW: "阿鲁巴",
+  ALA: "奥兰群岛",
+  AZE: "阿塞拜疆",
+  BIH: "波黑",
+  BRB: "巴巴多斯",
+  BGD: "孟加拉",
+  BEL: "比利时",
+  BFA: "布基纳法索",
+  BGR: "保加利亚",
+  BHR: "巴林",
+  BDI: "布隆迪",
+  BEN: "贝宁",
+  BLM: "圣巴泰勒米岛",
+  BMU: "百慕大",
+  BRN: "文莱",
+  BOL: "玻利维亚",
+  BES: "荷兰加勒比区",
+  BRA: "巴西",
+  BHS: "巴哈马",
+  BTN: "不丹",
+  BVT: "布韦岛",
+  BWA: "博茨瓦纳",
+  BLR: "白俄罗斯",
+  BLZ: "伯利兹",
+  CAN: "加拿大",
+  CCK: "科科斯群岛",
+  CAF: "中非",
+  CHE: "瑞士",
+  CHL: "智利",
+  CMR: "喀麦隆",
+  COL: "哥伦比亚",
+  CRI: "哥斯达黎加",
+  CUB: "古巴",
+  CPV: "佛得角",
+  CXR: "圣诞岛",
+  CYP: "塞浦路斯",
+  CZE: "捷克",
+  DEU: "德国",
+  DJI: "吉布提",
+  DNK: "丹麦",
+  DMA: "多米尼克",
+  DOM: "多米尼加",
+  DZA: "阿尔及利亚",
+  ECU: "厄瓜多尔",
+  EST: "爱沙尼亚",
+  EGY: "埃及",
+  ESH: "西撒哈拉",
+  ERI: "厄立特里亚",
+  ESP: "西班牙",
+  FIN: "芬兰",
+  FJI: "斐济群岛",
+  FLK: "马尔维纳斯群岛（福克兰）",
+  FSM: "密克罗尼西亚联邦",
+  FRO: "法罗群岛",
+  FRA: "法国",
+  GAB: "加蓬",
+  GRD: "格林纳达",
+  GEO: "格鲁吉亚",
+  GUF: "法属圭亚那",
+  GHA: "加纳",
+  GIB: "直布罗陀",
+  GRL: "格陵兰",
+  GIN: "几内亚",
+  GLP: "瓜德罗普",
+  GNQ: "赤道几内亚",
+  GRC: "希腊",
+  SGS: "南乔治亚岛和南桑威奇群岛",
+  GTM: "危地马拉",
+  GUM: "关岛",
+  GNB: "几内亚比绍",
+  GUY: "圭亚那",
+  HKG: "香港",
+  HMD: "赫德岛和麦克唐纳群岛",
+  HND: "洪都拉斯",
+  HRV: "克罗地亚",
+  HTI: "海地",
+  HUN: "匈牙利",
+  IDN: "印尼",
+  IRL: "爱尔兰",
+  ISR: "以色列",
+  IMN: "马恩岛",
+  IND: "印度",
+  IOT: "英属印度洋领地",
+  IRQ: "伊拉克",
+  IRN: "伊朗",
+  ISL: "冰岛",
+  ITA: "意大利",
+  JEY: "泽西岛",
+  JAM: "牙买加",
+  JOR: "约旦",
+  JPN: "日本",
+  KHM: "柬埔寨",
+  KIR: "基里巴斯",
+  COM: "科摩罗",
+  KWT: "科威特",
+  CYM: "开曼群岛",
+  LBN: "黎巴嫩",
+  LIE: "列支敦士登",
+  LKA: "斯里兰卡",
+  LBR: "利比里亚",
+  LSO: "莱索托",
+  LTU: "立陶宛",
+  LUX: "卢森堡",
+  LVA: "拉脱维亚",
+  LBY: "利比亚",
+  MAR: "摩洛哥",
+  MCO: "摩纳哥",
+  MDA: "摩尔多瓦",
+  MNE: "黑山",
+  MAF: "法属圣马丁",
+  MDG: "马达加斯加",
+  MHL: "马绍尔群岛",
+  MKD: "马其顿",
+  MLI: "马里",
+  MMR: "缅甸",
+  MAC: "澳门",
+  MTQ: "马提尼克",
+  MRT: "毛里塔尼亚",
+  MSR: "蒙塞拉特岛",
+  MLT: "马耳他",
+  MDV: "马尔代夫",
+  MWI: "马拉维",
+  MEX: "墨西哥",
+  MYS: "马来西亚",
+  NAM: "纳米比亚",
+  NER: "尼日尔",
+  NFK: "诺福克岛",
+  NGA: "尼日利亚",
+  NIC: "尼加拉瓜",
+  NLD: "荷兰",
+  NOR: "挪威",
+  NPL: "尼泊尔",
+  NRU: "瑙鲁",
+  OMN: "阿曼",
+  PAN: "巴拿马",
+  PER: "秘鲁",
+  PYF: "法属波利尼西亚",
+  PNG: "巴布亚新几内亚",
+  PHL: "菲律宾",
+  PAK: "巴基斯坦",
+  POL: "波兰",
+  PCN: "皮特凯恩群岛",
+  PRI: "波多黎各",
+  PSE: "巴勒斯坦",
+  PLW: "帕劳",
+  PRY: "巴拉圭",
+  QAT: "卡塔尔",
+  REU: "留尼汪",
+  ROU: "罗马尼亚",
+  SRB: "塞尔维亚",
+  RUS: "俄罗斯",
+  RWA: "卢旺达",
+  SLB: "所罗门群岛",
+  SYC: "塞舌尔",
+  SDN: "苏丹",
+  SWE: "瑞典",
+  SGP: "新加坡",
+  SVN: "斯洛文尼亚",
+  SJM: "斯瓦尔巴群岛和 扬马延岛",
+  SVK: "斯洛伐克",
+  SLE: "塞拉利昂",
+  SMR: "圣马力诺",
+  SEN: "塞内加尔",
+  SOM: "索马里",
+  SUR: "苏里南",
+  SSD: "南苏丹",
+  STP: "圣多美和普林西比",
+  SLV: "萨尔瓦多",
+  SYR: "叙利亚",
+  SWZ: "斯威士兰",
+  TCA: "特克斯和凯科斯群岛",
+  TCD: "乍得",
+  TGO: "多哥",
+  THA: "泰国",
+  TKL: "托克劳",
+  TLS: "东帝汶",
+  TUN: "突尼斯",
+  TON: "汤加",
+  TUR: "土耳其",
+  TUV: "图瓦卢",
+  TZA: "坦桑尼亚",
+  UKR: "乌克兰",
+  UGA: "乌干达",
+  USA: "美国",
+  URY: "乌拉圭",
+  VAT: "梵蒂冈",
+  VEN: "委内瑞拉",
+  VGB: "英属维尔京群岛",
+  VIR: "美属维尔京群岛",
+  VNM: "越南",
+  WLF: "瓦利斯和富图纳",
+  WSM: "萨摩亚",
+  YEM: "也门",
+  MYT: "马约特",
+  ZAF: "南非",
+  ZMB: "赞比亚",
+  ZWE: "津巴布韦",
+  CHN: "中国",
+  COG: "刚果（布）",
+  COD: "刚果（金）",
+  MOZ: "莫桑比克",
+  GGY: "根西岛",
+  GMB: "冈比亚",
+  MNP: "北马里亚纳群岛",
+  ETH: "埃塞俄比亚",
+  NCL: "新喀里多尼亚",
+  VUT: "瓦努阿图",
+  ATF: "法属南部领地",
+  NIU: "纽埃",
+  UMI: "美国本土外小岛屿",
+  COK: "库克群岛",
+  GBR: "英国",
+  TTO: "特立尼达和多巴哥",
+  VCT: "圣文森特和格林纳丁斯",
+  TWN: "台湾",
+  NZL: "新西兰",
+  SAU: "沙特阿拉伯",
+  LAO: "老挝",
+  PRK: "朝鲜",
+  KOR: "韩国",
+  PRT: "葡萄牙",
+  KGZ: "吉尔吉斯斯坦",
+  KAZ: "哈萨克斯坦",
+  TJK: "塔吉克斯坦",
+  TKM: "土库曼斯坦",
+  UZB: "乌兹别克斯坦",
+  KNA: "圣基茨和尼维斯",
+  SPM: "圣皮埃尔和密克隆",
+  SHN: "圣赫勒拿",
+  LCA: "圣卢西亚",
+  MUS: "毛里求斯",
+  CIV: "科特迪瓦",
+  KEN: "肯尼亚",
+  MNG: "蒙古国"
+};
+function convertNationality(nationality) {
+  return NationalityEnum[nationality];
+}
 class HuaShiService {
   static startConnect() {
     if (this.ws && this.ws.readyState === WebSocket.CONNECTING) {
@@ -87619,23 +88001,55 @@ class HuaShiService {
     const readData = await HuaShiService.read();
     if (readData) {
       // 身份证|姓名|性别|民族|生日|地址|证件号|派出所|有效期起|有效期止||证件照   中间好多占位
-      let [type, name, sex, nation, birthday, address, cardId, police, validStart, validEnd] = readData.split('|');
-      let base64_ID = readData.split('|')[17];
-      const IDCardData = {
-        info: {
-          name,
-          sex,
-          birthday,
-          address,
-          cardId,
-          nation,
-          police,
-          validStart,
-          validEnd
-        },
-        headImage: base64_ID
-      };
-      return IDCardData;
+      // 永居证|姓名|性别|永居证证件号|国籍代码|中文姓名|有效期起|有效期止|生日|证件版本号|受理机关代码|证件类别|照片内容   中间好多占位
+      // 永居证|姓名|性别|永居证证件号|国籍代码|中文姓名|有效期起|有效期止|生日|换证次数|旧证件号|证件类别|照片内容   中间好多占位
+      // 港澳台|姓名|性别|生日|住址|证件号|派出所|有效期起|有效期止|通行证号码|签发次数|证件类别|照片内容   中间好多占位
+      let [model, placeholder, type, name, sex, nation, birthday, address, cardId, police, validStart, validEnd] = readData.split('|');
+      let base64_ID = readData.split('|')[19];
+      let NationCode = readData.split('|')[18];
+      if (NationCode === '1') {
+        // 身份证
+        const IDCardData = {
+          info: {
+            cardType: '1',
+            name,
+            chineseName: '',
+            englishName: '',
+            sex,
+            birthday,
+            address,
+            cardId,
+            nationality: '中国',
+            nation,
+            police,
+            validStart,
+            validEnd
+          },
+          headImage: base64_ID
+        };
+        return IDCardData;
+      } else {
+        let chineseName = readData.split('|')[16] || '无中文姓名';
+        const IDCardData = {
+          info: {
+            cardType: '9',
+            name: chineseName === '无中文姓名' ? name : chineseName || name,
+            chineseName,
+            englishName: name,
+            sex,
+            birthday,
+            address,
+            cardId,
+            nationality: convertNationality(NationCode),
+            nation: '',
+            police: '中华人民共和国国家移民管理局',
+            validStart,
+            validEnd
+          },
+          headImage: base64_ID
+        };
+        return IDCardData;
+      }
     } else {
       throw Error('未匹配可用的读卡器');
     }
@@ -87923,7 +88337,7 @@ var ExitAndEntryMethodCode;
   /** 获取识别结果 */
   ExitAndEntryMethodCode["GetReadResult"] = "GetReadResult";
 })(ExitAndEntryMethodCode || (ExitAndEntryMethodCode = {}));
-const NationalityEnum = {
+const exit_and_entry_plugin_service_NationalityEnum = {
   AND: "安道尔",
   AFG: "阿富汗",
   ATG: "安提瓜和巴布达",
@@ -88007,7 +88421,7 @@ const NationalityEnum = {
   GUM: "关岛",
   GNB: "几内亚比绍",
   GUY: "圭亚那",
-  HKG: "中国",
+  HKG: "香港",
   HMD: "赫德岛和麦克唐纳群岛",
   HND: "洪都拉斯",
   HRV: "克罗地亚",
@@ -88051,7 +88465,7 @@ const NationalityEnum = {
   MKD: "马其顿",
   MLI: "马里",
   MMR: "缅甸",
-  MAC: "中国",
+  MAC: "澳门",
   MTQ: "马提尼克",
   MRT: "毛里塔尼亚",
   MSR: "蒙塞拉特岛",
@@ -88150,7 +88564,7 @@ const NationalityEnum = {
   GBR: "英国",
   TTO: "特立尼达和多巴哥",
   VCT: "圣文森特和格林纳丁斯",
-  TWN: "中国",
+  TWN: "台湾",
   NZL: "新西兰",
   SAU: "沙特阿拉伯",
   LAO: "老挝",
@@ -88176,8 +88590,8 @@ var SexEnum;
   SexEnum["MALE"] = "\u7537";
   SexEnum["FEMALE"] = "\u5973";
 })(SexEnum || (SexEnum = {}));
-function convertNationality(nationality) {
-  return NationalityEnum[nationality];
+function exit_and_entry_plugin_service_convertNationality(nationality) {
+  return exit_and_entry_plugin_service_NationalityEnum[nationality];
 }
 function urlToBase64(url) {
   return new Promise((resolve, reject) => {
@@ -88240,7 +88654,7 @@ async function formatNFCResult(data) {
     sex: SexEnum[sex] || '未知',
     cardId: doc_number,
     birthday: birth_DateFormat.replace('-', '').replace('-', ''),
-    nationality: convertNationality(state),
+    nationality: exit_and_entry_plugin_service_convertNationality(state),
     validEnd: expired_DateFormat.replace('-', '').replace('-', ''),
     headImage: img.replace('data:image/png;base64,', '')
   };
@@ -88324,7 +88738,7 @@ async function formatPermanentResidencePermit(data) {
     sex: xbdm.replace('性', ''),
     cardId: zjhm || yjjlzhm,
     birthday: csrq,
-    nationality: convertNationality(gjdm),
+    nationality: exit_and_entry_plugin_service_convertNationality(gjdm),
     validStart: yxqqsrq || zjqfrq,
     validEnd: yxqjzrq || zjzzrq,
     police: '中华人民共和国国家移民管理局',