合并开发

src/components/MenuIcon/big/MenuIconBig.scss

@@ -16,13 +16,13 @@
   }
   &.left {
     .text-box {
-      margin-left: 114px;
+      margin-left: 50px;
     }
   }
   &.right {
     .text-box {
       position: absolute;
-      right: 114px;
+      right: 50px;
     }
   }
   .text {

src/pages/BarCode/BarCode.tsx

@@ -223,8 +223,18 @@ class BarCode extends Component {
   }
   drawBarCode() {
     const { userinfo } = this.props;
+    const routeParams = this.$router.params;
+    let serviceId = '';
+    if (routeParams && routeParams.serviceId) {
+      serviceId =
+        routeParams.serviceId.length === 1
+          ? '0' + routeParams.serviceId
+          : routeParams.serviceId;
+    }
+    console.log('serviceId: ', serviceId);
     if (userinfo.idBar && userinfo.idBar.length > 2) {
-      let idBar = userinfo.idBar.substring(0, userinfo.idBar.length - 2) + '04';
+      let idBar =
+        userinfo.idBar.substring(0, userinfo.idBar.length - 2) + serviceId;
       wxbarcode.barcode('BarCode', idBar, 646, 188);
       wxbarcode.barcode('BarCodeBig', idBar, 700, 364);
     } else {

src/pages/Shower/Shower.tsx

@@ -44,7 +44,6 @@ type IProps = PageStateProps & PageDispatchProps;
 
 type PageState = {
   bluetoothState: boolean;
-  task: Taro.SocketTask | null;
   deviceInfo: DeviceInfo;
   sockedDone: boolean;
   deviceDone: boolean;
@@ -59,7 +58,7 @@ interface Shower {
 
 let timer: number | null = null;
 let reConnectting: boolean = false;
-
+let socketTask: Taro.SocketTask | null = null;
 @connect(
   ({ userinfo, Shower }) => ({
     userinfo,
@@ -80,7 +79,6 @@ class Shower extends Component {
     super(props);
     this.state = {
       bluetoothState: false,
-      task: null,
       sockedDone: false,
       deviceDone: false,
       showerState: false,
@@ -106,18 +104,21 @@ class Shower extends Component {
 
   componentWillUnmount() {
     this.closeBluetooth();
-    this.closeDeviceSocket();
+    Taro.closeSocket();
+    timer && clearTimeout(timer);
+    timer = null;
+    reConnectting = false;
   }
 
   connectDeviceSocket() {
     connectSocket(SOCKET_URL).then(task => {
+      socketTask = task;
       task.onOpen(() => {
         console.log('onOpen');
         if (reConnectting) {
           this.reConnectDeviceSocket(true);
         }
         this.setState({
-          task: task,
           sockedDone: true,
         });
         task.send({ data: str2ab('{}') });
@@ -149,16 +150,14 @@ class Shower extends Component {
       task.onClose(e => {
         console.log('socked关闭', e, reConnectting, timer);
         this.setState({
-          task: null,
           sockedDone: false,
         });
+        socketTask = null;
         if (e.code === StopCode) {
           console.log('正确结束socket连接');
-        } else if (!reConnectting) {
+        } else {
           console.log('开始重连socket');
           this.reConnectDeviceSocket(false);
-        } else {
-          console.log('断开socket', e);
         }
       });
     });
@@ -185,25 +184,24 @@ class Shower extends Component {
         content: '请保持网络畅通正常',
       });
     } else {
-      let newTimer = setTimeout(() => {
+      timer = setTimeout(() => {
         reConnectting = false;
       }, 10000);
       reConnectting = true;
-      timer = newTimer;
       console.log(reConnectting, timer);
       this.connectDeviceSocket();
     }
   }
 
   sendDeviceCode() {
-    const { task, sockedDone, deviceDone } = this.state;
+    const { sockedDone, deviceDone } = this.state;
     const { bluetoothDevice } = this.props;
     console.log('socket状态：', sockedDone, '蓝牙状态：', deviceDone);
 
-    if (sockedDone && task && deviceDone) {
+    if (sockedDone && socketTask && deviceDone) {
       let deviceData = '{<' + bluetoothDevice.code + '>}';
       console.log('<---发送设备编号:', deviceData);
-      task.send({
+      socketTask.send({
         data: str2ab(deviceData),
         success: msg => {
           console.log('发送设备编号:', msg, '--->');
@@ -216,15 +214,12 @@ class Shower extends Component {
   }
 
   closeDeviceSocket() {
-    const { task } = this.state;
-    console.log('in close', task, timer);
-    if (task) {
-      task.close({
+    console.log('in close', socketTask, timer);
+    if (socketTask) {
+      socketTask.close({
         code: StopCode,
         complete: () => {
-          this.setState({
-            task: null,
-          });
+          socketTask = null;
         },
       });
     }
@@ -422,14 +417,13 @@ class Shower extends Component {
           this.closeDeviceSocket();
           this.closeBluetoothConnection();
         } else {
-          const { task } = this.state;
           if (
             datastr.substring(0, 1) === '{' &&
             datastr.substring(datastr.length - 1, datastr.length) === '}'
           ) {
             console.log('<---发送完整数据： ', datastr);
-            if (task) {
-              task.send({
+            if (socketTask) {
+              socketTask.send({
                 data: str2ab(datastr),
                 success: msg => {
                   console.log('发送完整数据：', msg, '--->');
@@ -449,8 +443,8 @@ class Shower extends Component {
             abStr += datastr;
             console.log('接受尾部数据后： ', abStr);
             console.log('<---发送完整数据： ', abStr);
-            if (task) {
-              task.send({
+            if (socketTask) {
+              socketTask.send({
                 data: str2ab(abStr),
                 success: msg => {
                   console.log('发送完整数据：', msg, '--->');
@@ -586,10 +580,9 @@ class Shower extends Component {
             msg.substring(0, 1) === '{' &&
             msg.substring(msg.length - 1, msg.length) === '}'
           ) {
-            const { task } = this.state;
             console.log('<---发送给socket完整数据： ', msg);
-            task &&
-              task.send({
+            socketTask &&
+              socketTask.send({
                 data: str2ab(msg),
                 success: msg => {
                   console.log('发送给socket完整数据：', msg, '--->');
@@ -609,9 +602,8 @@ class Shower extends Component {
             console.log('接受尾部数据后： ', abStr);
             console.log('<---发送给socket完整数据： ', abStr);
 
-            const { task } = this.state;
-            task &&
-              task.send({
+            socketTask &&
+              socketTask.send({
                 data: str2ab(abStr),
                 success: msg => {
                   console.log('发送给socket完整数据：', msg, '--->');

src/pages/WaterDispenser/WaterDispenser.tsx

@@ -113,7 +113,7 @@ class WaterDispenser extends Component {
 
   toggleCodeState() {
     Taro.redirectTo({
-      url: `/pages/BarCode/BarCode?backPage=${encodeURIComponent(
+      url: `/pages/BarCode/BarCode?serviceId=9&backPage=${encodeURIComponent(
         '/pages/WaterDispenser/WaterDispenser',
       )}`,
     });