@cniot/android-pda-components 0.0.23 → 0.0.27

package/es/index.es.js

@@ -14,6 +14,18 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
@@ -120,7 +132,7 @@ class ButtonGroup extends React__default.Component {
 }
 Button.Group = ButtonGroup;
 var index$i = "";
-const blankFunc$2 = () => {
+const blankFunc$5 = () => {
 };
 class PdaTitle extends React__default.Component {
   constructor(props) {
@@ -130,7 +142,7 @@ class PdaTitle extends React__default.Component {
     });
   }
   render() {
-    const { className, goBack = true, goBackHandle = blankFunc$2, icon = "scan", title = "\u4EFB\u52A1", menuList = null } = this.props;
+    const { className, goBack = true, goBackHandle = blankFunc$5, icon = "scan", title = "\u4EFB\u52A1", menuList = null } = this.props;
     const { showMenu } = this.state;
     return /* @__PURE__ */ React__default.createElement("div", {
       className: classNames({ [className]: true, "pda-header": true })
@@ -262,9 +274,9 @@ var index$f = "";
 function empty$1() {
 }
 function Confirm$1(props) {
-  const { title = "title", message = null, subMessage = [], okText = "okText", cancelText = "cancelText", onClick = empty$1 } = props;
+  const { title = "title", message = null, subMessage = [], okText = "okText", cancelText = null, onClick = empty$1, type = "primary" } = props;
   return /* @__PURE__ */ React__default.createElement("div", {
-    className: "confirm-wrap"
+    className: classNames({ "confirm-wrap": true, ["confirm-" + type]: true })
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "confirm-title"
   }, title), message ? /* @__PURE__ */ React__default.createElement("div", {
@@ -368,17 +380,19 @@ function Prompt(props) {
 function toast(props) {
   const { data = {}, service } = props;
   const { title, level, message, duration = null } = data;
+  const [hidden, setHidden2] = useState(false);
   React__default.useEffect(() => {
-    if (data.hasNext !== false) {
-      service.onNext("");
+    let timeout = null;
+    if (duration) {
+      setTimeout(() => {
+        setHidden2(true);
+        service.onNext("");
+      }, duration);
     }
-  }, [data, service]);
-  const [hidden, setHidden2] = useState(false);
-  if (duration) {
-    setTimeout(() => {
-      setHidden2(true);
-    }, duration);
-  }
+    return () => {
+      clearTimeout(timeout);
+    };
+  }, []);
   return !hidden ? /* @__PURE__ */ React__default.createElement(Overlay, {
     verticalPosition: "bottom"
   }, /* @__PURE__ */ React__default.createElement(Confirm, {
@@ -702,19 +716,16 @@ function DefaultItem(props) {
 }
 List.Item = DefaultItem;
 var index$8 = "";
-const blankFunc$1 = () => {
+const blankFunc$4 = () => {
 };
-class BaseLayout extends React__default.Component {
+class BaseLayoutContainer extends React__default.Component {
   constructor(props) {
     super(props);
+    this.state = {};
     this._handleKeyUp = (e) => {
-      const { onScan = blankFunc$1, onEnter = blankFunc$1, onEsc = blankFunc$1, onDelete = blankFunc$1 } = this.props;
+      const { onScan = blankFunc$4, onEnter = blankFunc$4, onEsc = blankFunc$4, onDelete = blankFunc$4, scanMode = null } = this.props;
       e.preventDefault();
       const { code, keyCode, key } = e;
-      if (code === "F23" || code === "F24") {
-        onScan(e);
-        return;
-      }
       if (code === "Enter") {
         onEnter(e);
         return;
@@ -729,7 +740,7 @@ class BaseLayout extends React__default.Component {
       }
     };
     this._handleContinuousRfidScan = (ev) => {
-      const { continuousRfidScan = false, onRfidScan = blankFunc$1 } = this.props;
+      const { continuousRfidScan = false, onRfidScan = blankFunc$4 } = this.props;
       if (continuousRfidScan) {
         onRfidScan(ev.param);
       }
@@ -769,6 +780,232 @@ class BaseLayout extends React__default.Component {
     }, footer));
   }
 }
+const blankFunc$3 = () => {
+};
+class RfidOnce$1 extends React__default.Component {
+  constructor(props) {
+    super(props);
+    this._rfidBeginScan = false;
+    this._handleRfidScan = (e) => {
+      const { onRfidOnce, onRfidBoxOnce, onRfidPalletOnce } = this.props;
+      const data = e.param;
+      const isBox = !data.rfidData.startsWith("0F011");
+      if (onRfidBoxOnce) {
+        if (isBox) {
+          this._stopWork();
+          onRfidBoxOnce(e.param);
+        }
+      } else if (onRfidPalletOnce) {
+        if (!isBox) {
+          this._stopWork();
+          onRfidPalletOnce(e.param);
+        }
+      }
+      if (onRfidOnce) {
+        this._stopWork();
+        onRfidOnce(e.param);
+      }
+    };
+    this._startWork = (e) => {
+      document.addEventListener("ContinuousRfidScan", this._handleRfidScan);
+      WindVane.call("WindvanePlugin", "invoke", "{'domain': 'rfid', 'method': 'startScan', 'params': null}", function(e2) {
+      }, function(e2) {
+      });
+      this._rfidBeginScan = true;
+    };
+    this._stopWork = (e) => {
+      document.removeEventListener("ContinuousRfidScan", this._handleRfidScan);
+      WindVane.call("WindvanePlugin", "invoke", "{'domain': 'rfid', 'method': 'stopScan', 'params':null}", function(e2) {
+      }, function(e2) {
+      });
+    };
+    this._handleKeyDown = (e) => {
+      const { code, keyCode, key } = e;
+      if (code === "F23" || code === "F24") {
+        if (!this._rfidBeginScan) {
+          this._startWork();
+        }
+      }
+    };
+    this._handleKeyUp = (e) => {
+      const { code, keyCode, key } = e;
+      if (code === "F23" || code === "F24") {
+        this._stopWork();
+        this._rfidBeginScan = false;
+      }
+    };
+  }
+  componentDidMount() {
+    document.addEventListener("keydown", this._handleKeyDown);
+    document.addEventListener("keyup", this._handleKeyUp);
+    WindVane.call("WindvanePlugin", "invoke", "{'domain': 'keyboard', 'method': 'changeScanMode', 'params': {'scanMode': 'RFID'}}", function(e) {
+    }, function(e) {
+    });
+  }
+  componentWillUnmount() {
+    document.removeEventListener("keydown", this._handleKeyDown);
+    document.removeEventListener("keyup", this._handleKeyUp);
+  }
+  render() {
+    const props = this.props;
+    const _a = props, { onRfidOnce = blankFunc$3 } = _a, opts = __objRest(_a, ["onRfidOnce"]);
+    return /* @__PURE__ */ React__default.createElement(BaseLayoutContainer, __spreadValues({}, opts));
+  }
+}
+const blankFunc$2 = () => {
+};
+class RfidOnce extends React__default.Component {
+  constructor(props) {
+    super(props);
+    this._rfidBeginScan = false;
+    this._handleRfidScan = (e) => {
+      const { onRfidScan, onRfidBoxScan, onRfidPalletScan } = this.props;
+      const data = e.param;
+      const isBox = !data.rfidData.startsWith("0F011");
+      if (isBox && onRfidBoxScan) {
+        onRfidBoxScan(data);
+      } else if (!isBox && onRfidPalletScan) {
+        onRfidPalletScan(data);
+      }
+      onRfidScan(data);
+    };
+    this._startWork = (e) => {
+      document.addEventListener("ContinuousRfidScan", this._handleRfidScan);
+      WindVane.call("WindvanePlugin", "invoke", "{'domain': 'rfid', 'method': 'startScan', 'params': null}", function(e2) {
+      }, function(e2) {
+      });
+      this._rfidBeginScan = true;
+    };
+    this._stopWork = (e) => {
+      document.removeEventListener("ContinuousRfidScan", this._handleRfidScan);
+      WindVane.call("WindvanePlugin", "invoke", "{'domain': 'rfid', 'method': 'stopScan', 'params':null}", function(e2) {
+      }, function(e2) {
+      });
+    };
+    this._handleKeyDown = (e) => {
+      const { code, keyCode, key } = e;
+      if (code === "F23" || code === "F24") {
+        if (!this._rfidBeginScan) {
+          this._startWork();
+        }
+      }
+    };
+    this._handleKeyUp = (e) => {
+      const { code, keyCode, key } = e;
+      if (code === "F23" || code === "F24") {
+        this._stopWork();
+        this._rfidBeginScan = false;
+      }
+    };
+  }
+  componentDidMount() {
+    const { autoRfidScan = false, rfidReaderSleep } = this.props;
+    WindVane.call("WindvanePlugin", "invoke", "{'domain': 'keyboard', 'method': 'changeScanMode', 'params': {'scanMode': 'RFID'}}", function(e) {
+    }, function(e) {
+    });
+    if (!autoRfidScan) {
+      document.addEventListener("keydown", this._handleKeyDown);
+      document.addEventListener("keyup", this._handleKeyUp);
+    } else {
+      if (!rfidReaderSleep) {
+        this._startWork();
+      }
+    }
+  }
+  componentWillUnmount() {
+    document.removeEventListener("keydown", this._handleKeyDown);
+    document.removeEventListener("keyup", this._handleKeyUp);
+    this._stopWork();
+  }
+  shouldComponentUpdate(nextProps, nextState) {
+    if (this.props.autoRfidScan && this.props.rfidReaderSleep !== nextProps.rfidReaderSleep) {
+      if (!nextProps.rfidReaderSleep) {
+        this._startWork();
+      } else {
+        this._stopWork();
+      }
+    }
+    return true;
+  }
+  render() {
+    const props = this.props;
+    const _a = props, { onRfidScan = blankFunc$2, autoRfidScan } = _a, opts = __objRest(_a, ["onRfidScan", "autoRfidScan"]);
+    return /* @__PURE__ */ React__default.createElement(BaseLayoutContainer, __spreadValues({}, opts));
+  }
+}
+__publicField(RfidOnce, "defaultProps", {
+  rfidReaderSleep: false
+});
+const blankFunc$1 = () => {
+};
+class BarcodeScan extends React__default.Component {
+  constructor(props) {
+    super(props);
+    this._barcodeBeginScan = false;
+    this._handleBarcodeScan = (e) => {
+      const { onBarcodeScan } = this.props;
+      this._stopWork();
+      onBarcodeScan(e.param);
+    };
+    this._startWork = (e) => {
+      document.addEventListener("BarcodeScan", this._handleBarcodeScan);
+      this._barcodeBeginScan = true;
+    };
+    this._stopWork = (e) => {
+      document.removeEventListener("BarcodeScan", this._handleBarcodeScan);
+    };
+    this._handleKeyDown = (e) => {
+      const { code, keyCode, key } = e;
+      if (code === "F23" || code === "F24") {
+        if (!this._barcodeBeginScan) {
+          this._startWork();
+        }
+      }
+    };
+    this._handleKeyUp = (e) => {
+      const { code, keyCode, key } = e;
+      if (code === "F23" || code === "F24") {
+        this._stopWork();
+        this._barcodeBeginScan = false;
+      }
+    };
+  }
+  componentDidMount() {
+    document.addEventListener("keydown", this._handleKeyDown);
+    document.addEventListener("keyup", this._handleKeyUp);
+    WindVane.call("WindvanePlugin", "invoke", "{'domain': 'keyboard', 'method': 'changeScanMode', 'params': {'scanMode': 'barcode'}}", function(e) {
+    }, function(e) {
+    });
+  }
+  componentWillUnmount() {
+    document.removeEventListener("keydown", this._handleKeyDown);
+    document.removeEventListener("keyup", this._handleKeyUp);
+  }
+  render() {
+    const props = this.props;
+    const _a = props, { onBarcodeScan = blankFunc$1 } = _a, opts = __objRest(_a, ["onBarcodeScan"]);
+    return /* @__PURE__ */ React__default.createElement(BaseLayoutContainer, __spreadValues({}, opts));
+  }
+}
+class BaseLayout extends React__default.Component {
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    const props = this.props;
+    const { onBarcodeScan, onRfidOnce, onRfidBoxOnce, onRfidPalletOnce, onRfidScan, onRfidBoxScan, onRfidPalletScan } = props;
+    if (onRfidOnce || onRfidBoxOnce || onRfidPalletOnce) {
+      return /* @__PURE__ */ React__default.createElement(RfidOnce$1, __spreadValues({}, props));
+    }
+    if (onRfidScan || onRfidBoxScan || onRfidPalletScan) {
+      return /* @__PURE__ */ React__default.createElement(RfidOnce, __spreadValues({}, props));
+    }
+    if (onBarcodeScan) {
+      return /* @__PURE__ */ React__default.createElement(BarcodeScan, __spreadValues({}, props));
+    }
+    return /* @__PURE__ */ React__default.createElement(BaseLayoutContainer, __spreadValues({}, props));
+  }
+}
 var index$7 = "";
 const blankFunc = () => {
 };

package/es/style.css

@@ -1 +1 @@
-*{margin:0;padding:0}div{box-sizing:border-box}.op-overlay{top:0;left:0;position:fixed;width:100vw;height:100vh;display:flex;justify-content:center;align-items:center;background-color:#0006;z-index:100}.op-overlay.center{align-items:center;justify-content:center}.op-overlay.top{align-items:flex-start;justify-content:center}.op-overlay.bottom{align-items:flex-end;justify-content:center}.pda-button{display:block;box-sizing:border-box;padding-right:0;text-align:center;font-size:40px;height:90px;line-height:90px;color:#fff;background-color:#f3f4f8;border-radius:10px;width:100%;border-width:0}.pda-button.pda-button-default{color:#000}.pda-button:active{background-color:#979797}.pda-button.pda-button-primary{background-color:#0091ea}.pda-button.pda-button-primary:active{background-color:#0074bb}.pda-button.pda-button-dark{background-color:#282828}.pda-button.pda-button-dark:active{background-color:#979797}.pda-button.pda-button-cutout{color:#0091ea;border-width:4px;border-color:#0091ea}.button-group{display:flex;flex-direction:row;padding:20px 24px;width:100%}.button-group .pda-button:not(:last-child){margin-right:16px}.pda-header{display:flex;flex-direction:row;align-items:center;color:#fff;height:84px;padding-left:24px;padding-right:24px}.pda-header .pda-goback{background-image:url(https://img.alicdn.com/imgextra/i4/O1CN01O46CYm1Gc4yvZtk7A_!!6000000000642-2-tps-36-64.png);width:18px;height:32px;background-size:100%;margin-left:4px;margin-right:8px}.pda-header .pda-header-icon{height:36px;width:36px;margin-left:16px;background-size:100%}.pda-header .pda-header-icon-scan{background-image:url(https://img.alicdn.com/imgextra/i4/O1CN017UD9RM1vCKxsjxsrE_!!6000000006136-2-tps-68-68.png)}.pda-header .pda-header-icon-select{background-image:url(https://img.alicdn.com/imgextra/i2/O1CN0170QXc91udWriUp19S_!!6000000006060-2-tps-74-72.png)}.pda-header .pda-header-icon-read{background-image:url(https://img.alicdn.com/imgextra/i2/O1CN01EMphgH1ylYGXImCZn_!!6000000006619-2-tps-70-70.png)}.pda-header .pda-title-text{margin-left:16px;font-size:40px}.pda-header .pda-header-more{height:36px;width:36px;background-image:url(https://img.alicdn.com/imgextra/i4/O1CN01dTdXds1p9gz4wKAve_!!6000000005318-2-tps-70-26.png);background-size:100%;background-repeat:no-repeat;background-position:center;margin-left:auto}.pda-header .pda-menus{background-color:#fff;border-radius:8px;width:100%;padding:24px;display:flex;flex-direction:column}.pda-header .pda-menus>*{margin-bottom:12px}.pda-info-card{border-radius:16px;padding:24px 16px;background-color:#fff}.pda-info-card p{margin:0}.pda-info-card .pda-info-card-title-section{display:flex;flex-direction:row;justify-content:space-between;align-items:center}.pda-info-card .pda-info-card-title-section .pda-info-card-title{font-size:32px;color:#666}.pda-info-card .pda-info-card-title-section .pda-info-card-tag{display:flex;align-items:center;justify-content:center;height:36px;padding:0 8px;background-color:#fc0;border-radius:8px}.pda-info-card .pda-info-card-highlight-section{display:flex;flex-direction:row;justify-content:space-between;align-items:flex-start}.pda-info-card .pda-info-card-highlight-section .pda-info-card-title{font-size:32px;color:#666;margin-top:20px}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight{font-size:80px;line-height:64px;color:#0091ea;font-weight:bold;display:flex;flex-direction:row;align-items:flex-end}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight .pda-info-card-highlight1CN{font-size:64px}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight .pda-info-card-highlight2{font-size:50px;line-height:40px}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight .pda-info-card-highlight2CN{font-size:40px;line-height:40px}.pda-info-card .pda-info-card-bold{font-weight:bold;font-size:40px;line-height:48px;color:#000;margin-top:12px}.pda-info-card .pda-info-card-list{margin-top:8px;color:#4a4a4a;font-size:32px;line-height:32px;word-break:break-all}.pda-info-card-progress{background-color:#f3f4f8;height:12px;border-radius:6px;margin-top:17px}.pda-info-card-progress .pda-info-card-progress-inside{background-color:#0091ea;height:12px;border-radius:6px}.pda-info-card.pda-info-card-dark{background-color:#000}.pda-info-card.pda-info-card-dark .pda-info-card-title{color:#ffffff60}.pda-info-card.pda-info-card-dark .pda-info-card-highlight{color:#fff}.pda-info-card.pda-info-card-dark .pda-info-card-bold{color:#fff}.pda-info-card.pda-info-card-dark .pda-info-card-list{color:#ffffff60}.pda-list-item{padding:24px 16px;border-radius:16px;position:relative}.pda-list-item p{margin:0}.pda-list-item>p,.pda-list-item>div{margin-bottom:16px}.pda-list-item .pda-listitem-highlight{font-size:40px;line-height:40px;font-weight:bold;color:#fff;display:flex;flex-direction:row;justify-content:space-between}.pda-list-item .pda-listitem-header,.pda-list-item .pda-listitem-state-text,.pda-list-item .pda-listitem-subinfo{font-size:32px;line-height:32px;color:#ffffff60;word-break:break-all}.pda-list-item .pda-listitem-state-block{display:flex;flex-direction:row;flex-wrap:wrap;margin-bottom:0}.pda-list-item .pda-listitem-state-block>div{padding:6px 10px;border-radius:4px;background-color:#0091ea;margin-bottom:12px;margin-right:12px;font-size:24px;line-height:24px}.pda-list-item .pda-listitem-state-block>div.success{background-color:#0f0}.pda-list-item .pda-listitem-state-block>div.warning{background-color:#fc0}.pda-list-item .pda-listitem-state-block>div.error{background-color:red}.pda-list-item .pda-listitem-icon{position:absolute;top:0;right:0;width:60px;height:60px;background-color:#0091ea;border-radius:0 16px;display:flex;justify-content:center;align-items:center}.pda-list-item .listitem-icon-container{background-size:100%;background-repeat:no-repeat;width:16px;height:24px}.pda-list-item .listitem-icon-next{background-image:url(https://img.alicdn.com/imgextra/i4/O1CN01FkZisA1tCg1sj3b6U_!!6000000005866-2-tps-40-58.png)}.confirm-wrap{background:#ffffff;border-radius:6px 6px 0 0;padding:24px 20px;width:100%}.confirm-wrap .confirm-title{font-size:2.4rem;font-weight:700}.confirm-wrap .confirm-message{font-size:2.2rem;margin-bottom:1rem}.confirm-wrap .confirm-sub-message{font-size:2.2rem;margin-bottom:1rem}.confirm-wrap .confirm-btns{display:flex}.confirm-wrap .confirm-btns .confirm-cancel-button{margin-right:2%}.toast-wrap{background:#00FF00;border-radius:6px;padding:10px 15px;width:90%;box-sizing:border-box}.toast-wrap.warning{background-color:#ffcb00}.toast-wrap.error{background-color:red}.toast-wrap .toast-title{font-size:2.4rem;font-weight:700}.toast-wrap .toast-message{font-size:1.9rem}.mini-app-start-page{display:flex;flex-direction:column;justify-content:center;align-items:center;width:100vw;height:100vh}.mini-app-start-page button{padding:.3em 3em;border-radius:6px;border:none;font-size:36px;background-color:#00bdff;color:#fff;margin-top:20px}.mini-app-start-page button:active{transform:scale(.95)}.mini-app-start-page .desc{opacity:.3}.local-debug-side{position:absolute;right:0;bottom:0}.presentation-card{margin:12px;background-color:#fff;border-radius:6px;text-align:center;padding:20px 6px}.presentation-card img{width:50%;height:auto}.presentation-card.transparent{background-color:transparent;color:#fff}.presentation-card .text{margin-top:12px;font-weight:700;font-size:16px}.presentation-card .sub-text{margin-top:6px;font-weight:700;font-size:12px}.android-pda-list .default-item{background-color:#282828;font-size:23.76px;padding:10px;border-radius:6px;color:#fff;margin:5px 0;display:flex;justify-content:space-between;align-items:center}.android-pda-list .default-item:hover,.android-pda-list .default-item:active,.android-pda-list .default-item:focus{background-color:#686868}.android-pda-list .default-item .text{flex:1}.android-pda-list .default-item .sub-text{font-size:80%;opacity:.7}.android-pda-list .default-item .sub-tags{display:flex}.android-pda-list .default-item .sub-tags .sub-tag-item{background-color:#0f0;padding:2px;font-size:60%;margin-right:3px;border-radius:2px;color:#000;line-height:1em}.android-pda-list .default-item .sub-tags .sub-tag-item:first-child{margin-left:0}.android-pda-list .default-item .extra{font-size:80%;opacity:.7}.baselayout-wrapper{height:100%;min-height:100%;display:flex;flex-direction:column;position:absolute;top:0;left:0;right:0;bottom:0}.baselayout-wrapper .baselayout-container{padding:0 24px;overflow-x:auto;flex:1}.baselayout-wrapper .baselayout-footer{padding:16px 0}.wakekeyborard .wakekeyborard-icon{width:80px;height:80px;background-image:url(https://img.alicdn.com/imgextra/i3/O1CN01kxYh3U25Xzr9nAcYp_!!6000000007537-2-tps-240-240.png);background-size:100%;position:fixed;right:24px;bottom:24px}.wakekeyborard .wakekeyborard-overlay{position:fixed;top:0;right:0;left:0;bottom:0;background-color:#dedede33}.wakekeyborard .wakekeyborard-inputbox{display:flex;flex-direction:row;height:85px;position:absolute;bottom:0;left:0;right:0}.wakekeyborard .wakekeyborard-inputbox input{flex:2}.wakekeyborard .wakekeyborard-inputbox button{flex:1}.pda-step-card{display:flex;flex-direction:row}.pda-step-card .pda-step-indictor{display:flex;flex-direction:column;align-items:center;margin-right:16px}.pda-step-card .pda-step-indictor .pda-step-indictor-top{width:1px;background-color:#bec0c6;flex:1}.pda-step-card .pda-step-indictor .pda-step-indictor-top-hidden{background-color:#fff0}.pda-step-card .pda-step-indictor .pda-step-indictor-center{height:24px;width:24px;border-radius:12px;background-color:#bec0c6}.pda-step-card .pda-step-indictor .pda-step-indictor-center-active{background-color:#0091ea}.pda-step-card .pda-step-indictor .pda-step-indictor-bottom{flex:1;width:1px;background-color:#bec0c6}.pda-step-card .pda-step-indictor .pda-step-indictor-bottom-hidden{background-color:#fff0}.pda-step{border-radius:16px;padding:24px 16px;background-color:#fff;margin-bottom:16px}.pda-step p{margin:0}.pda-step .pda-step-title{font-size:60px;color:#0091ea}.pda-step .pda-step-list{margin-top:8px;color:#4a4a4a;font-size:32px;line-height:32px}.pda-step.pda-step-dark{background-color:#000}.pda-step.pda-step-dark .pda-step-title{color:#fff}.pda-step.pda-step-dark .pda-step-list{color:#bec0c6}.pda-finish-card-top{height:100%;display:flex;flex-direction:column;align-items:center;color:#fff}.pda-finish-card-top .pda-finish-card-img{width:100%;margin:100px auto 0}.pda-finish-card-top .pda-finish-card-title{font-size:50px;line-height:45px;color:#fff;font-weight:500;margin-bottom:16px}.pda-finish-card-top .pda-finish-card-list{margin-top:16px;color:#ffffff80;font-size:32px;line-height:30px}.pda-distance-card{border-radius:16px;padding:36px 16px;background-color:#fff}.pda-distance-card p{margin:0;font-size:28px;color:#738399}.pda-distance-card .pda-distance-card-highlight{font-size:60px;line-height:64px;color:#0091ea}.pda-distance-card .pda-distance-indictor{margin-top:36px;display:flex}.pda-distance-card .pda-distance-card-progress{background-color:#ebecf2;height:34px;border-radius:6px;border:4px solid #D9D9D9;margin-top:8px;position:relative}.pda-distance-card .pda-distance-card-progress .pda-distance-card-progress-indictor{position:absolute;bottom:0;left:5px}.pda-distance-card .pda-distance-card-progress .pda-distance-card-progress-inside{background-color:#0091ea;height:26px;border-radius:6px 0 0 6px}.pda-distance-card .pda-distance-label{display:flex;justify-content:space-between}.android-sub-card{background:#282828;border-radius:16px;padding:10px;color:#fff}.android-sub-card .android-sub-card-title-section{display:flex;justify-content:space-between}.android-sub-card .android-sub-card-title-section .android-sub-card-title{opacity:.6;font-size:21.312px}.android-sub-card .android-sub-card-title-section .android-sub-card-tag{margin-bottom:0}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div{padding:6px 10px;border-radius:4px;background-color:#0091ea;color:#fff;font-size:15.984px;line-height:15.984px}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div.success{background-color:#0f0}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div.warning{background-color:#fc0;color:#000}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div.error{background-color:red}.android-sub-card .android-sub-card-context{font-size:39.6px;margin:-6px 0}.android-sub-card .android-sub-card-name{font-size:26.4px}.android-sub-card .android-sub-card-attrs{opacity:.6;font-size:21.12px}.pda-infinite-scroll{margin-top:10px}.pda-infinite-scroll span{color:#999}.pda-infinite-scroll .pda-infinite-scroll-view{display:flex;align-items:center;justify-content:center}.pda-action-sheet{position:absolute;z-index:1000;width:100%;height:100%;background-color:#00000059}.pda-action-sheet .pda-action-sheet-body{position:absolute;background-color:#fff;z-index:1010;width:100%;bottom:0;left:0;border-radius:9.9px 9.9px 0 0;padding-bottom:10.56px}.pda-action-sheet .pda-action-sheet-body .pda-action-sheet-item{margin:10.56px 15.84px 0;background-color:#f3f4f8;height:54px;display:flex;align-items:center;justify-content:center;font-size:24px;border-radius:9.9px}
+*{margin:0;padding:0}div{box-sizing:border-box}.op-overlay{top:0;left:0;position:fixed;right:0;bottom:0;display:flex;justify-content:center;align-items:center;background-color:#0006;z-index:100}.op-overlay.center{align-items:center;justify-content:center}.op-overlay.top{align-items:flex-start;justify-content:center}.op-overlay.bottom{align-items:flex-end;justify-content:center}.pda-button{display:block;box-sizing:border-box;padding-right:0;text-align:center;font-size:40px;height:90px;line-height:90px;color:#fff;background-color:#f3f4f8;border-radius:10px;width:100%;border-width:0}.pda-button.pda-button-default{color:#000}.pda-button:active{background-color:#979797}.pda-button.pda-button-primary{background-color:#0091ea}.pda-button.pda-button-primary:active{background-color:#0074bb}.pda-button.pda-button-dark{background-color:#282828}.pda-button.pda-button-dark:active{background-color:#979797}.pda-button.pda-button-cutout{color:#0091ea;border-width:4px;border-color:#0091ea}.button-group{display:flex;flex-direction:row;padding:20px 24px;width:100%}.button-group .pda-button:not(:last-child){margin-right:16px}.pda-header{display:flex;flex-direction:row;align-items:center;color:#fff;height:84px;padding-left:24px;padding-right:24px}.pda-header .pda-goback{background-image:url(https://img.alicdn.com/imgextra/i4/O1CN01O46CYm1Gc4yvZtk7A_!!6000000000642-2-tps-36-64.png);width:18px;height:32px;background-size:100%;margin-left:4px;margin-right:8px}.pda-header .pda-header-icon{height:36px;width:36px;margin-left:16px;background-size:100%}.pda-header .pda-header-icon-scan{background-image:url(https://img.alicdn.com/imgextra/i4/O1CN017UD9RM1vCKxsjxsrE_!!6000000006136-2-tps-68-68.png)}.pda-header .pda-header-icon-select{background-image:url(https://img.alicdn.com/imgextra/i2/O1CN0170QXc91udWriUp19S_!!6000000006060-2-tps-74-72.png)}.pda-header .pda-header-icon-read{background-image:url(https://img.alicdn.com/imgextra/i2/O1CN01EMphgH1ylYGXImCZn_!!6000000006619-2-tps-70-70.png)}.pda-header .pda-title-text{margin-left:16px;font-size:40px}.pda-header .pda-header-more{height:36px;width:36px;background-image:url(https://img.alicdn.com/imgextra/i4/O1CN01dTdXds1p9gz4wKAve_!!6000000005318-2-tps-70-26.png);background-size:100%;background-repeat:no-repeat;background-position:center;margin-left:auto}.pda-header .pda-menus{background-color:#fff;border-radius:8px;width:100%;padding:24px;display:flex;flex-direction:column}.pda-header .pda-menus>*{margin-bottom:12px}.pda-info-card{border-radius:16px;padding:24px 16px;background-color:#fff}.pda-info-card p{margin:0}.pda-info-card .pda-info-card-title-section{display:flex;flex-direction:row;justify-content:space-between;align-items:center}.pda-info-card .pda-info-card-title-section .pda-info-card-title{font-size:32px;color:#666}.pda-info-card .pda-info-card-title-section .pda-info-card-tag{display:flex;align-items:center;justify-content:center;height:36px;padding:0 8px;background-color:#fc0;border-radius:8px}.pda-info-card .pda-info-card-highlight-section{display:flex;flex-direction:row;justify-content:space-between;align-items:flex-start}.pda-info-card .pda-info-card-highlight-section .pda-info-card-title{font-size:32px;color:#666;margin-top:20px}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight{font-size:80px;line-height:64px;color:#0091ea;font-weight:bold;display:flex;flex-direction:row;align-items:flex-end}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight .pda-info-card-highlight1CN{font-size:64px}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight .pda-info-card-highlight2{font-size:50px;line-height:40px}.pda-info-card .pda-info-card-highlight-section .pda-info-card-highlight .pda-info-card-highlight2CN{font-size:40px;line-height:40px}.pda-info-card .pda-info-card-bold{font-weight:bold;font-size:40px;line-height:48px;color:#000;margin-top:12px}.pda-info-card .pda-info-card-list{margin-top:8px;color:#4a4a4a;font-size:32px;line-height:32px;word-break:break-all}.pda-info-card-progress{background-color:#f3f4f8;height:12px;border-radius:6px;margin-top:17px}.pda-info-card-progress .pda-info-card-progress-inside{background-color:#0091ea;height:12px;border-radius:6px}.pda-info-card.pda-info-card-dark{background-color:#000}.pda-info-card.pda-info-card-dark .pda-info-card-title{color:#ffffff60}.pda-info-card.pda-info-card-dark .pda-info-card-highlight{color:#fff}.pda-info-card.pda-info-card-dark .pda-info-card-bold{color:#fff}.pda-info-card.pda-info-card-dark .pda-info-card-list{color:#ffffff60}.pda-list-item{padding:24px 16px;border-radius:16px;position:relative}.pda-list-item p{margin:0}.pda-list-item>p,.pda-list-item>div{margin-bottom:16px}.pda-list-item .pda-listitem-highlight{font-size:40px;line-height:40px;font-weight:bold;color:#fff;display:flex;flex-direction:row;justify-content:space-between}.pda-list-item .pda-listitem-header,.pda-list-item .pda-listitem-state-text,.pda-list-item .pda-listitem-subinfo{font-size:32px;line-height:32px;color:#ffffff60;word-break:break-all}.pda-list-item .pda-listitem-state-block{display:flex;flex-direction:row;flex-wrap:wrap;margin-bottom:0}.pda-list-item .pda-listitem-state-block>div{padding:6px 10px;border-radius:4px;background-color:#0091ea;margin-bottom:12px;margin-right:12px;font-size:24px;line-height:24px}.pda-list-item .pda-listitem-state-block>div.success{background-color:#0f0}.pda-list-item .pda-listitem-state-block>div.warning{background-color:#fc0}.pda-list-item .pda-listitem-state-block>div.error{background-color:red}.pda-list-item .pda-listitem-icon{position:absolute;top:0;right:0;width:60px;height:60px;background-color:#0091ea;border-radius:0 16px;display:flex;justify-content:center;align-items:center}.pda-list-item .listitem-icon-container{background-size:100%;background-repeat:no-repeat;width:16px;height:24px}.pda-list-item .listitem-icon-next{background-image:url(https://img.alicdn.com/imgextra/i4/O1CN01FkZisA1tCg1sj3b6U_!!6000000005866-2-tps-40-58.png)}.confirm-wrap{background:#ffffff;border-radius:6px 6px 0 0;padding:24px 20px;width:100%}.confirm-wrap .confirm-title{font-size:2.4rem;font-weight:700}.confirm-wrap .confirm-message{font-size:2.2rem;margin-bottom:1rem}.confirm-wrap .confirm-sub-message{font-size:2.2rem;margin-bottom:1rem}.confirm-wrap .confirm-btns{display:flex}.confirm-wrap .confirm-btns .confirm-cancel-button{margin-right:2%}.confirm-wrap.confirm-warning{background-color:red}.confirm-wrap.confirm-warning .pda-button{background-color:transparent;color:#000;border:2px solid black;border-radius:40px}.toast-wrap{background:#00FF00;border-radius:6px;padding:10px 15px;width:90%;box-sizing:border-box}.toast-wrap.warning{background-color:#ffcb00}.toast-wrap.error{background-color:red}.toast-wrap .toast-title{font-size:2.4rem;font-weight:700}.toast-wrap .toast-message{font-size:1.9rem}.mini-app-start-page{display:flex;flex-direction:column;justify-content:center;align-items:center;width:100vw;height:100vh}.mini-app-start-page button{padding:.3em 3em;border-radius:6px;border:none;font-size:36px;background-color:#00bdff;color:#fff;margin-top:20px}.mini-app-start-page button:active{transform:scale(.95)}.mini-app-start-page .desc{opacity:.3}.local-debug-side{position:absolute;right:0;bottom:0}.presentation-card{margin:12px;background-color:#fff;border-radius:6px;text-align:center;padding:20px 6px}.presentation-card img{width:50%;height:auto}.presentation-card.transparent{background-color:transparent;color:#fff}.presentation-card .text{margin-top:12px;font-weight:700;font-size:16px}.presentation-card .sub-text{margin-top:6px;font-weight:700;font-size:12px}.android-pda-list .default-item{background-color:#282828;font-size:23.76px;padding:10px;border-radius:6px;color:#fff;margin:5px 0;display:flex;justify-content:space-between;align-items:center}.android-pda-list .default-item:hover,.android-pda-list .default-item:active,.android-pda-list .default-item:focus{background-color:#686868}.android-pda-list .default-item .text{flex:1}.android-pda-list .default-item .sub-text{font-size:80%;opacity:.7}.android-pda-list .default-item .sub-tags{display:flex}.android-pda-list .default-item .sub-tags .sub-tag-item{background-color:#0f0;padding:2px;font-size:60%;margin-right:3px;border-radius:2px;color:#000;line-height:1em}.android-pda-list .default-item .sub-tags .sub-tag-item:first-child{margin-left:0}.android-pda-list .default-item .extra{font-size:80%;opacity:.7}.baselayout-wrapper{height:100%;min-height:100%;display:flex;flex-direction:column;position:absolute;top:0;left:0;right:0;bottom:0}.baselayout-wrapper .baselayout-container{padding:0 24px;overflow-x:auto;flex:1}.baselayout-wrapper .baselayout-footer{padding:16px 0}.wakekeyborard .wakekeyborard-icon{width:80px;height:80px;background-image:url(https://img.alicdn.com/imgextra/i3/O1CN01kxYh3U25Xzr9nAcYp_!!6000000007537-2-tps-240-240.png);background-size:100%;position:fixed;right:24px;bottom:24px}.wakekeyborard .wakekeyborard-overlay{position:fixed;top:0;right:0;left:0;bottom:0;background-color:#dedede33}.wakekeyborard .wakekeyborard-inputbox{display:flex;flex-direction:row;height:85px;position:absolute;bottom:0;left:0;right:0}.wakekeyborard .wakekeyborard-inputbox input{flex:2}.wakekeyborard .wakekeyborard-inputbox button{flex:1}.pda-step-card{display:flex;flex-direction:row}.pda-step-card .pda-step-indictor{display:flex;flex-direction:column;align-items:center;margin-right:16px}.pda-step-card .pda-step-indictor .pda-step-indictor-top{width:1px;background-color:#bec0c6;flex:1}.pda-step-card .pda-step-indictor .pda-step-indictor-top-hidden{background-color:#fff0}.pda-step-card .pda-step-indictor .pda-step-indictor-center{height:24px;width:24px;border-radius:12px;background-color:#bec0c6}.pda-step-card .pda-step-indictor .pda-step-indictor-center-active{background-color:#0091ea}.pda-step-card .pda-step-indictor .pda-step-indictor-bottom{flex:1;width:1px;background-color:#bec0c6}.pda-step-card .pda-step-indictor .pda-step-indictor-bottom-hidden{background-color:#fff0}.pda-step{border-radius:16px;padding:24px 16px;background-color:#fff;margin-bottom:16px}.pda-step p{margin:0}.pda-step .pda-step-title{font-size:60px;color:#0091ea}.pda-step .pda-step-list{margin-top:8px;color:#4a4a4a;font-size:32px;line-height:32px}.pda-step.pda-step-dark{background-color:#000}.pda-step.pda-step-dark .pda-step-title{color:#fff}.pda-step.pda-step-dark .pda-step-list{color:#bec0c6}.pda-finish-card-top{height:100%;display:flex;flex-direction:column;align-items:center;color:#fff}.pda-finish-card-top .pda-finish-card-img{width:100%;margin:100px auto 0}.pda-finish-card-top .pda-finish-card-title{font-size:50px;line-height:45px;color:#fff;font-weight:500;margin-bottom:16px}.pda-finish-card-top .pda-finish-card-list{margin-top:16px;color:#ffffff80;font-size:32px;line-height:30px}.pda-distance-card{border-radius:16px;padding:36px 16px;background-color:#fff}.pda-distance-card p{margin:0;font-size:28px;color:#738399}.pda-distance-card .pda-distance-card-highlight{font-size:60px;line-height:64px;color:#0091ea}.pda-distance-card .pda-distance-indictor{margin-top:36px;display:flex}.pda-distance-card .pda-distance-card-progress{background-color:#ebecf2;height:34px;border-radius:6px;border:4px solid #D9D9D9;margin-top:8px;position:relative}.pda-distance-card .pda-distance-card-progress .pda-distance-card-progress-indictor{position:absolute;bottom:0;left:5px}.pda-distance-card .pda-distance-card-progress .pda-distance-card-progress-inside{background-color:#0091ea;height:26px;border-radius:6px 0 0 6px}.pda-distance-card .pda-distance-label{display:flex;justify-content:space-between}.android-sub-card{background:#282828;border-radius:16px;padding:10px;color:#fff}.android-sub-card .android-sub-card-title-section{display:flex;justify-content:space-between}.android-sub-card .android-sub-card-title-section .android-sub-card-title{opacity:.6;font-size:21.312px}.android-sub-card .android-sub-card-title-section .android-sub-card-tag{margin-bottom:0}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div{padding:6px 10px;border-radius:4px;background-color:#0091ea;color:#fff;font-size:15.984px;line-height:15.984px}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div.success{background-color:#0f0}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div.warning{background-color:#fc0;color:#000}.android-sub-card .android-sub-card-title-section .android-sub-card-tag>div.error{background-color:red}.android-sub-card .android-sub-card-context{font-size:39.6px;margin:-6px 0}.android-sub-card .android-sub-card-name{font-size:26.4px}.android-sub-card .android-sub-card-attrs{opacity:.6;font-size:21.12px}.pda-infinite-scroll{margin-top:10px}.pda-infinite-scroll span{color:#999}.pda-infinite-scroll .pda-infinite-scroll-view{display:flex;align-items:center;justify-content:center}.pda-action-sheet{position:absolute;z-index:1000;width:100%;height:100%;background-color:#00000059}.pda-action-sheet .pda-action-sheet-body{position:absolute;background-color:#fff;z-index:1010;width:100%;bottom:0;left:0;border-radius:9.9px 9.9px 0 0;padding-bottom:10.56px}.pda-action-sheet .pda-action-sheet-body .pda-action-sheet-item{margin:10.56px 15.84px 0;background-color:#f3f4f8;height:54px;display:flex;align-items:center;justify-content:center;font-size:24px;border-radius:9.9px}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cniot/android-pda-components",
-  "version": "0.0.23",
+  "version": "0.0.27",
   "description": "",
   "main": "./es/index.cjs.js",
   "module": "./es/index.es.js",

package/test/config/pre/pageflow.xml

@@ -28,7 +28,10 @@
         <!-- @cniot/pageflow 指令 end -->
 
         <!-- 自定义页面 start -->
+        <function name = "index" action="router" page="/pages/index" />
         <function name = "scanContainer" action="router" page="/pages/scanContainer" />
+        <function name = "rfidOnce" action="router" page="/pages/rfidOnce" />
+        <function name = "rfidScan" action="router" page="/pages/rfidScan" />
         <function name = "continuousRfidScan" action="router" page="/pages/continuousRfidScan" />
         <function name = "success" action="router" page="/pages/success" />
         <!-- 自定义页面 end -->

package/test/src/gs/start.gs

@@ -41,26 +41,23 @@ var flow = Flow();
 // });
 
 flow.push('index', function(data, flow) {
-    var ret = pageFlow.scanContainer({
+    var ret = pageFlow.index({
 
     })
     var code = ret.code;
     pageFlow.log(ret);
-    // if(String(code) === 'continuousRfidScan') {
-    //     // pageFlow.log({in: 'continuousRfidScan', code: code});
-    //     // 分支1
-    //     return flow.get('continuousRfidScan', {})
-    // }
-    // if(String(code) === 'success') {
-    //     // pageFlow.log({in: 'success', code: code});
-    //     // 分支2
-    //     return flow.get('success', {})
-    // }
     if(code === 0) {
         pageFlow.log({in: 'continuousRfidScan', code: code});
         // 分支1
         return flow.get('continuousRfidScan', {})
     }
+    if(String(code) === 'rfidOnce') {
+        return flow.get('rfidOnce', {})
+    }
+    if(String(code) === 'rfidScan') {
+        return flow.get('rfidScan', {})
+    }
+
     if(code === 1) {
         pageFlow.log({in: 'success', code: code});
         // 分支2
@@ -70,37 +67,33 @@ flow.push('index', function(data, flow) {
     return {}
 });
 
-// flow.push('pageName', function(data, flow) {
-//     var res = linkdo();
-//     if(!res.true) {
-//         new Error('xxx 接口请求错误')
-//     }
-//     var ret = pageFlow.page({
-//         // page data
-//     })
-//     var code = ret.code;
-
-//     if(code === -1) {
-//         return flow.back();
-//     }
-//     if(code === 0) {
-//         // 错误处理
-//     }
-//   	if(String(code) === 'fenzhi1') {
-//       // pageFlow.log({in: 'success', code: code});
-//       // 分支1
-//       return flow.get('fenzhi1', {})   
-//     }
-  	
-//     // 默认按照 push 流程走
-//     return {}
-// })
 
 flow.push('continuousRfidScan', function(data, flow) {
     var ret = pageFlow.continuousRfidScan({
 
     })
 })
+
+flow.push('rfidOnce', function(data, flow) {
+    var ret = pageFlow.rfidOnce({
+
+    })
+
+    const code = ret.code;
+    if(code === -1) {
+        return flow.back({});
+    }
+})
+flow.push('rfidScan', function(data, flow) {
+    var ret = pageFlow.rfidScan({
+
+    })
+    const code = ret.code;
+    if(code === -1) {
+        return flow.back({});
+    }
+})
+
 flow.push('success', function(data, flow) {
     // pageFlow.log({render: 'success'});
     var ret = pageFlow.success({

package/test/src/web/pages/{scanContainer → index}/index.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, {useState, useEffect} from "react";
 import "./index.less";
 // import { Title, BaseLayout, Button, Presentation, WakeKeyborard } from '@cniot/android-pda-components'
 import { Title, BaseLayout, Button, Presentation, WakeKeyborard } from '../../../../../packages'
@@ -10,35 +10,34 @@ import { Title, BaseLayout, Button, Presentation, WakeKeyborard } from '../../..
  */
 export default function (props) {
   const { data, service, isActive } = props;
+  const [barcode, setBarcode] = useState('')
 
-  const header = <Title></Title>;
+  const header = <Title goBackHandle={e => {console.log('hhhhhh')}}></Title>;
   const footer = (
     <Button.Group>
-      <Button type="cutout" onClick={e => service.onNext({code: 0, data: {}})}>连扫</Button>
+      <Button type="cutout" onClick={e => service.onNext({code: 'rfidOnce', data: {}})}>Rfid单次</Button>
       <Button 
         type="primary" 
         onClick={e => {
-          WindVane.call('WindvanePlugin', 'invoke', "{'domain': 'rfid', 'method': 'startScanOnce', 'params':null}", function(e) {
-            console.log(e);
-            service.onNext({code: 1, data: e.data})
-          }, function(e) {
-            alert('failure ' + JSON.stringify(e));
-          });
+          service.onNext({code: 'rfidScan', data: {}});
         }
-      }>单次</Button>
+      }>Rfid连续</Button>
     </Button.Group>
   )
   return (
     <BaseLayout
       header={header}
       footer={footer}
-      onScan={
-        e => {
-          alert('scan key down');
+      onBarcodeScan = {
+        data => {
+            console.log('barcode scan');
+            console.log(data);
+            setBarcode(data.scanData)
         }
       }
     >
       <Presentation text="请靠近箱码进行识别" ></Presentation>
+      <p style={{color: 'white'}}>barcode: {barcode}</p>
       <WakeKeyborard
         onWakeKeyboard={() => { console.log('wake keyboard') }}
         onClick={v => { alert(v) }}

package/test/src/web/pages/{continuousRfidScan → rfidOnce}/index.jsx

@@ -10,52 +10,48 @@ import { Title, BaseLayout, Button, Presentation, WakeKeyborard } from '../../..
  */
 export default function (props) {
   const { data, service, isActive } = props;
-  const [rfidList, setRfidList] = useState([]);
-  const [scanning, setScanning] = useState(true)
+  const [rfid, setRfid] = useState('')
+  const [box, setBox] = useState('')
 
-  const header = <Title></Title>;
+  const header = <Title goBackHandle={e => { service.onNext({code: -1, data: {}}) }}></Title>;
   const footer = (
     <Button.Group>
       <Button 
         type="cutout" 
+        onClick={
+          e => {
+            
+          }
+        }>连扫</Button>
+      <Button 
+        type="primary" 
         onClick={e => {
-          setScanning(!scanning);
-        }}
-      >{scanning ? '暂停' : '开始'}</Button>
-      <Button type="primary" onClick={e => service.onNext({code: '', data: {}})}>完成</Button>
+        }
+      }>完成</Button>
     </Button.Group>
   )
   return (
     <BaseLayout
       header={header}
       footer={footer}
-      continuousRfidScan={scanning}
-      onRfidScan={
+      onRfidBoxOnce= {
         data => {
-          // console.log(data);
-          setRfidList(data.rfidHistory);
+          setBox(data.rfidData);
         }
       }
-      onScan={
-        e => {
-          alert('scan key down');
+      onRfidOnce={
+        data => {
+          setRfid(data.rfidData);
         }
       }
     >
-      <Presentation image={Presentation.IMAGE_4} text="请靠近纸箱" subText="开始识别" transparent={true}></Presentation>
+      <Presentation text="请靠近箱码进行识别" ></Presentation>
+      <p style={{color: 'white'}}>rfid: {rfid}</p>
+      <p style={{color: 'white'}}>box: {box}</p>
       <WakeKeyborard
         onWakeKeyboard={() => { console.log('wake keyboard') }}
         onClick={v => { alert(v) }}
       />
-      {
-        <div>
-          {
-            rfidList.map((item, index) => {
-              return <p key={index} style={{color: 'white'}}>{item}</p>
-            })
-          }
-        </div>
-      }
     </BaseLayout>
   )
 }