Merge remote-tracking branch 'origin/master'

android @ baab8abe

-Subproject commit 1fbbb7eba77679e3f994946bbff48304a7206ea8
+Subproject commit baab8abedf9e86b923151a4fa61bc968f358e22a

package.json

 {
   "name": "zm-face-counter",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -8,8 +8,8 @@
     "test": "jest",
     "lint": "eslint --ext .js index.js src",
     "apk": "cd android && ./gradlew app:assembleRelease && cp ./app/build/outputs/apk/release/app-release.apk ../fcounter.apk",
-    "android-staging": "code-push release-react ZmFaceCounter-android android -t '1.0.0' --des '提升用户体验'",
-    "android-product": "code-push promote ZmFaceCounter-android Staging Production --des '提升用户体验'",
+    "android-staging": "code-push release-react ZmFaceCounter-android android -t '1.0.0' --des '1.2.7'",
+    "android-product": "code-push promote ZmFaceCounter-android Staging Production --des '1.2.7'",
     "android-history": "code-push deployment history ZmFaceCounter-android Production"
   },
   "pre-commit": [
@@ -19,6 +19,7 @@
     "@react-native-community/async-storage": "1.11.0",
     "antd-mobile-rn": "2.3.3",
     "axios": "0.19.2",
+    "buffer": "6.0.3",
     "dva-core": "2.0.2",
     "moment": "2.27.0",
     "qs": "6.9.4",

src/components/LoadingModal.js

@@ -70,7 +70,7 @@ const styles = {
     justifyContent: 'center',
   },
   tips: {
-    fontSize: setSpText(75),
+    fontSize: setSpText(60),
     color: 'white',
   },
 };

src/components/Touch.js

@@ -6,6 +6,7 @@ import {
   TouchableWithoutFeedback,
   View,
 } from 'react-native';
+import EnterEvent from '../utils/EnterEvent';
 
 let TouchableComponent;
 
@@ -30,7 +31,11 @@ export default class PlatformTouchable extends React.Component {
   static Ripple = TouchableComponent.Ripple;
   static canUseNativeForeground = TouchableComponent.canUseNativeForeground;
 
-  onPress = () => {
+  onPress = e => {
+    if (e.constructor.name === 'SyntheticEvent') {
+      EnterEvent.emit('Trigger');
+      return;
+    }
     let {onPress} = this.props;
     window.count = window.defaultCount;
     if (onPress) {
@@ -50,9 +55,7 @@ export default class PlatformTouchable extends React.Component {
       ...props
     } = this.props;
 
-    if (feedback === false) {
-      TouchableComponent = TouchableWithoutFeedback;
-    }
+    if (!feedback) TouchableComponent = TouchableWithoutFeedback;
     props.onPress = this.onPress;
 
     // Even though it works for TouchableWithoutFeedback and

src/pages/CounterMixins.js

@@ -16,6 +16,7 @@ import NP from '../utils/np';
 import {total} from '../utils/validity';
 import RedPacketModal from '../components/RedPacketModal';
 import {width, scaleSize} from '../utils/screen';
+import EnterEvent from '../utils/EnterEvent';
 
 window.RN = RN;
 window.Toast = Toast;
@@ -110,6 +111,10 @@ const CounterMixins = ComposeComponent => {
           this.barcode += pressedKey;
         }
       });
+      EnterEvent.on('Trigger', async () => {
+        await handleScan();
+        this.barcode = '';
+      });
       this.listen();
     };
 
@@ -532,8 +537,18 @@ const CounterMixins = ComposeComponent => {
           } // 称重计价不可修改数量
           this.goodsMap[barcode] = data.data;
           let dataReal = data.data;
-          dataReal.num = data.data.num || 1;
-          goodsArr.push({...dataReal});
+          let t = 0;
+          for (let i = 0; i < goodsArr.length; i++) {
+            if (goodsArr[i].barcode === barcode) {
+              goodsArr[i].num += 1;
+            } else {
+              t++;
+            }
+          }
+          if (t === goodsArr.length) {
+            dataReal.num = data.data.num || 1;
+            goodsArr.push({...dataReal});
+          }
           const current = Math.ceil(goodsArr.length / window.pageSize);
           this.setState({
             current,

src/pages/FacePage.js

@@ -476,7 +476,7 @@ class FacePage extends Component {
           authinfo: auth.authinfo || auth.authInfo,
           payscore_out_request_no,
           payscore_service_id,
-          // ask_unionid: 1,
+          ask_unionid: 1,
         };
         WxFacepay.getUserPayScoreStatus(params);
         return {orderId: out_trade_no, code: payscore_out_request_no};

src/utils/EnterEvent.js

+import mitt from './mitt';
+
+const emitter = mitt();
+
+export default emitter;

src/utils/Printer.js

+import {NativeModules} from 'react-native';
+import axios from 'axios';
+import {Buffer} from 'buffer';
+
+const {Printer: _Printer} = NativeModules;
+
+let Printer = null;
+if (_Printer) {
+  const Command = {
+    INIT_PRINTER: 0,
+    WAKE_PRINTER: 1,
+    PRINT_AND_RETURN_STANDARD: 2,
+    PRINT_AND_NEWLINE: 3,
+    PRINT_AND_ENTER: 4,
+    MOVE_NEXT_TAB_POSITION: 5,
+    DEF_LINE_SPACING: 6,
+    PRINT_AND_WAKE_PAPER_BY_LNCH: 0,
+    PRINT_AND_WAKE_PAPER_BY_LINE: 1,
+    CLOCKWISE_ROTATE_90: 4,
+    ALIGN: 13,
+    ALIGN_LEFT: 0,
+    ALIGN_CENTER: 1,
+    ALIGN_RIGHT: 2,
+    LINE_HEIGHT: 10,
+    CHARACTER_RIGHT_MARGIN: 11,
+    UNDERLINE: 15,
+    UNDERLINE_OFF: 16,
+    UNDERLINE_ONE_DOTE: 17,
+    UNDERLINE_TWO_DOTE: 18,
+    FONT_MODE: 16,
+    FONT_SIZE: 17,
+  };
+  const BarcodeType = {
+    UPC_A: 0,
+    UPC_E: 1,
+    JAN13: 2,
+    JAN8: 3,
+    CODE39: 4,
+    ITF: 5,
+    CODABAR: 6,
+    JAN128: 7,
+    CODE93: 72,
+    CODE128: 73,
+    PDF417: 100,
+    DATAMATRIX: 101,
+    QRCODE: 102,
+  };
+  Printer = {
+    // 初始化打印参数
+    initPrinter: _Printer.initPrinter,
+    /**
+     * 方法描述：设置打印机打印字体，包括设置加粗，倍高，倍宽，下划线，标准ASCII字体A (12 × 24)，压缩ASCII字体B (9 × 17)
+     * int type 0表示12*24字体大小，1表示9*16字体大小，此设置临时有效，打印机不保存此设置，即打印机重启后无效。如需打印9*16大小字体，需要每次传入1手动设置
+     * int width 倍宽，范围0~7
+     * int height 倍高，范围0~7
+     * int bold 0 不加粗，1加粗
+     * int underline 0无下划线，1下划线
+     */
+    setFont: _Printer.setFont,
+    /**
+     * 方法描述：设置打印机，包括打印并走纸n点行；打印并走纸n字符行；设置字符对齐方式，左对齐，居中，右对
+     * 参数：command, value
+       Command.PRINT_AND_WAKE_PAPER_BY_LNCH
+       打印并走纸value点行
+       Command.PRINT_AND_WAKE_PAPER_BY_LINE
+       打印并走纸value字符行
+       Command.ALIGN  设置打印内容位置，Value值可指定设置的具体位置，可以为
+       Command.ALIGN_LEFT;
+       Command.ALIGN_CENTER;
+       Command.ALIGN_RIGHT
+       例1：设置打印文本居中
+       Printer.setPrinter(Command.ALIGN, Command.ALIGN_CENTER);
+       Printer.printText("hello world!\n");
+       例2：设置打印一维码居中
+       Printer.setPrinter(Command.ALIGN, Command.ALIGN_CENTER);
+       Printer.printBarCode(BarcodeType.CODE128, 2, 150, 2,"123456");
+       例3：设置打印二维码居中
+       Printer.setPrinter(Command.ALIGN, Command.ALIGN_CENTER);
+       Printer.printBarCode(BarcodeType.QRCODE, 2, 3, 6,"123456");
+       注：以上居中对于打印图片printImage方法无效
+     */
+    setPrinter: _Printer.setPrinter,
+    // 获取当前打印机状态
+    getCurrentStatus: _Printer.getCurrentStatus,
+    // 打印自检页面
+    printSelfCheckingPage: _Printer.printSelfCheckingPage,
+    // 打印文本，String text 文本内容
+    printText: _Printer.printText,
+    /**
+     * 打印表格
+     * @param column 表头
+     * @param split 分隔符
+     * @param width 列宽，传入数组按照数组比例分配宽度，传入数字(384,576,724)，自动匹配热敏纸尺寸，仅限四列内容
+     * @param row 内容
+     */
+    printTable: (column, split, width, row) => {
+      if (typeof width === 'number') {
+        if (width === 384) width = [14, 6, 6, 6];
+        if (width === 576) width = [18, 10, 10, 12];
+        if (width === 724) width = [22, 14, 14, 18];
+      }
+      if (!Array.isArray(width)) return; // 列宽不为数组，终止执行
+      _Printer.printTable(column, split, width, row);
+    },
+    /**
+     * 打印条码和二维码
+     * int type, int param1, int param2, int param3, String content
+     * type为条码类型，类型常量以PrinterConstants.BarcodeType.开头： 一维条码： UPC_A， UPC_E， JAN13， JAN8， CODE39， ITF， CODABAR， CODE93， CODE128。
+       二维条码： PDF417，DATAMATRIX，QRCODE。
+       width，height，anno为具体条码参数：
+       条码类型type为一维条码时，三个参数表示：
+       param1：条码横向宽度 ，2<=n<=6，默认为2
+       param2：条码高度 1<=n<=255，默认162
+       param3：条码注释位置，0不打印，1上方，2下方，3上下方均有 。条码类型type为二维条码时，三个参数表示不同的意思：
+     * type为二维码类型：QRCODE
+       param1：表示图形版本号，1<=n<=30(0:自动选择)。
+       param2：表示纠错等级，n = 76,77,81,72(L:7%,M:15%,Q:25%,H:30%)。
+       param3：表示纵向放大倍数。
+     * content为条码数据。
+     */
+    printBarCode: _Printer.printBarCode,
+    // 打印图片，imgUrl，图片URL
+    printImage: async imgUrl => {
+      const res = await axios.get(imgUrl, {responseType: 'arraybuffer'});
+      const base64Image = new Buffer(res.data, 'binary').toString('base64');
+      return await _Printer.printImage(base64Image, 'NONE', 50, 128);
+    },
+    /**
+     * 方法描述：发送十六进制指令至打印机，例如：若此SDK没有提供需要的功能，可参照指令手册调用此方法直接发送指令给打印机。
+       如：在指令手册上查得设置打印位置居中的指令为：0x1B,0x61,0x01，代码可如下编写以实现设置打印位置居中效果：
+       Printer.sendBytesData([27, 97, 1]);
+       开启斜体文字指令为：0x1C,0x21,0x80，Printer.sendBytesData([28, 33, 128]);
+       关闭斜体文字指令为：0x1C,0x21,0x00，Printer.sendBytesData([28, 33, 0]);
+     */
+    sendBytesData: _Printer.sendBytesData,
+    halfCut: _Printer.halfCut, // 全切
+    allCut: _Printer.allCut, // 半切
+    usbConnect: _Printer.usbConnect, // 连接打印机
+    disconnect: _Printer.disconnect, // 断开打印机连接
+    isConnected: _Printer.isConnected, // 是否连接成功
+    testPrint: async () => {
+      await Printer.initPrinter(); // 初始化配置
+      await Printer.setFont(0, 0, 0, 0, 1); // 设置下划线
+      await Printer.sendBytesData([28, 33, 128]);
+      await Printer.printText('打印机测试：');
+      await Printer.sendBytesData([28, 33, 0]);
+      await Printer.setPrinter(Command.PRINT_AND_WAKE_PAPER_BY_LINE, 1); // 换行
+      await Printer.setFont(0, 0, 0, 1, 0); // 设置加粗
+      const row = ['可乐,2,3.5,7.0', '怡宝,4,2.0,8.0'];
+      await Printer.printTable('商品,数量,单价,金额', ',', 384, row);
+      await Printer.printImage(
+        'https://zmgo.oss-cn-shenzhen.aliyuncs.com/app/app-logo.jpg?x-oss-process=image/resize,w_300',
+      );
+      await Printer.setPrinter(Command.ALIGN, Command.ALIGN_CENTER);
+      await Printer.printBarCode(BarcodeType.QRCODE, 2, 3, 6, '123456');
+      await Printer.halfCut(); // 半切
+      // await Printer.allCut(); // 全切
+    },
+  };
+  (async () => {
+    const isConnected = await Printer.isConnected();
+    if (!isConnected) await Printer.usbConnect();
+  })();
+}
+
+export default Printer;

yarn.lock

@@ -1741,6 +1741,11 @@ base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.2.3:
   resolved "https://registry.npm.taobao.org/base64-js/download/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha1-WOzoy3XdB+ce0IxzarxfrE2/jfE=
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.npm.taobao.org/base64-js/download/base64-js-1.5.1.tgz?cache=0&sync_timestamp=1605123440207&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbase64-js%2Fdownload%2Fbase64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha1-GxtEAWClv3rUC2UPCVljSBkDkwo=
+
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.npm.taobao.org/base/download/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -1883,6 +1888,14 @@ buffer@^5.4.3:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.npm.taobao.org/buffer/download/buffer-6.0.3.tgz?cache=0&sync_timestamp=1606098159535&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha1-Ks5XhFnMj74qcKqo9S7mO2p0xsY=
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -3612,6 +3625,11 @@ ieee754@^1.1.4:
   resolved "https://registry.npm.taobao.org/ieee754/download/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q=
 
+ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/ieee754/download/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha1-jrehCmP/8l0VpXsAFYbRd9Gw01I=
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.npm.taobao.org/ignore/download/ignore-4.0.6.tgz?cache=0&sync_timestamp=1590809289115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fignore%2Fdownload%2Fignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"