Merge branch 'hotfix/修复云机挂在中' of Software/android-cloud-H5 into master

package.json

@@ -48,6 +48,7 @@
     "webpack": "^4.46.0"
   },
   "devDependencies": {
+    "@babel/core": "^7",
     "@babel/eslint-parser": "^7.16.3",
     "@commitlint/cli": "^15.0.0",
     "@commitlint/config-conventional": "^15.0.0",

pages/test/clipboard.vue

@@ -0,0 +1,45 @@
+<template>
+  <div class="">
+    <div v-if="hasClipboard" class="">
+      <div class="">window.navigator.clipboard</div>
+      <v-btn @click="writeText()">写入剪贴板</v-btn>
+      <v-btn @click="readText()">读取剪贴板</v-btn>
+    </div>
+    <div v-else class="">
+      <span>当前环境不支持 window.navigator.clipboard</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  auth: false,
+  data() {
+    return {
+      hasClipboard: false,
+    };
+  },
+  mounted() {
+    this.hasClipboard = !!window.navigator.clipboard;
+  },
+  methods: {
+    async writeText() {
+      try {
+        const now = Date.now();
+        await navigator.clipboard.writeText(now);
+        this.$toast.success(`写入成功 ${now}`);
+      } catch (error) {
+        this.$toast.error(`写入失败 ${error.message}`);
+      }
+    },
+    async readText() {
+      try {
+        const clipText = await navigator.clipboard.readText();
+        this.$toast.success(`读取成功 ${clipText}`);
+      } catch (error) {
+        this.$toast.error(`读取失败 ${error.message}`);
+      }
+    },
+  },
+};
+</script>

static/screenAndroid/WXtrialInterface.html

@@ -376,6 +376,7 @@
       Module.onRuntimeInitialized = function () {
         isFinish = true;
       };
+      var timerInterval = null, timeInterval = 0;
       function connect(type) {
         $.ajax({
           url: baseUrl + '/api/resources/user/cloud/connect',
@@ -391,6 +392,9 @@
           async: false,
           success: function (res) {
             if (res.status === 0) {
+              if (timerInterval) {
+                timerInterval = clearTimeout();
+              }
               if (res.data.internetHttps) {
                 socketURL =
                   'wss://' +
@@ -431,13 +435,31 @@
                 }
               } else {
                 $.toast('网络异常，请稍后重试', 'text');
+                setTimeout(() => {
+                  clearInterval(intervaler);
+                  quit();
+                }, 3000);
+              }
+            } else if (res.status === 5200) {
+              if (timeInterval > 7) {
+                $.toast('网络异常，请稍后重试', 'text');
+                setTimeout(() => {
+                  clearInterval(intervaler);
+                  quit();
+                }, 3000);
+                timerInterval = clearTimeout()
+                return
               }
+              timerInterval = setTimeout(() => {
+                connect(type);
+                timeInterval += 1;
+              }, 3000)
             } else {
               $.toast('画面异常,请重新进入', 'text');
-              clearInterval(intervaler);
-              quit();
-              ws.close();
-              wsss.close();
+              setTimeout(() => {
+                clearInterval(intervaler);
+                quit();
+              }, 3000);
             }
           },
         });
@@ -485,7 +507,9 @@
           } else {
             clearInterval(intervaler);
             $.toast('画面异常,请重新进入', 'text');
-            quit();
+            setTimeout(() => {
+              quit();
+            }, 3000)
           }
         }, 3000);
 
@@ -502,8 +526,10 @@
           throttle(doConnectBusiness, 100);
           if (errorTime > 1000) {
             $.toast('画面异常,请重新进入', 'text');
-            wsss.close();
-            quit();
+            setTimeout(() => {
+              wsss.close();
+              quit();
+            }, 3000)
           }
         });
         ws.addEventListener('message', function (event) {
@@ -746,46 +772,75 @@
           return;
         }
         stopManyClick(() => {
-          $('.box-shear-plate').empty();
-          $.ajax({
-            url: baseUrl + '/api/public/v5/shear/content',
-            headers: {
-              Authorization: token,
-            },
-            type: 'get',
-            dataType: 'json',
-            success: function (res) {
-              if (res.status === 0) {
-                if (res.data.length) {
-                  cutList = array_unique(res.data);
-                  var str =
-                    '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
-                  cutList.forEach(function (item) {
-                    str +=
-                      "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
-                      item.content +
-                      '")\'>' +
-                      item.content +
-                      "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
-                      item.id +
-                      ")'>删除</button></div></div></div>";
-                  });
-                  str += '</div>';
-                  $('.box-shear-plate').append(str);
+          new Promise((resolve, reject) => {
+            if (window.navigator.clipboard) {
+              window.navigator.clipboard
+                .readText()
+                .then(
+                  function (content) {
+                    return $.ajax({
+                      url: baseUrl + '/api/public/v5/shear/content',
+                      type: 'post',
+                      dataType: 'json',
+                      data: JSON.stringify({
+                        content: content,
+                      }),
+                      headers: {
+                        'content-Type': 'application/json',
+                        Authorization: token,
+                      },
+                    });
+                  },
+                  function (err) {
+                    $.toast('读取剪贴板失败', 'text');
+                  },
+                )
+                .finally(resolve);
+            } else {
+              resolve();
+            }
+          }).then(function () {
+            $('.box-shear-plate').empty();
+            $.ajax({
+              url: baseUrl + '/api/public/v5/shear/content',
+              headers: {
+                Authorization: token,
+              },
+              type: 'get',
+              dataType: 'json',
+              success: function (res) {
+                if (res.status === 0) {
+                  if (res.data.length) {
+                    cutList = array_unique(res.data);
+                    var str =
+                      '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
+                    cutList.forEach(function (item) {
+                      str +=
+                        "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
+                        item.content +
+                        '")\'>' +
+                        item.content +
+                        "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
+                        item.id +
+                        ")'>删除</button></div></div></div>";
+                    });
+                    str += '</div>';
+                    $('.box-shear-plate').append(str);
+                  } else {
+                    $('.box-shear-plate').append(
+                      '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
+                    );
+                  }
+                  $('.mask').show();
+                  initSlider();
                 } else {
                   $('.box-shear-plate').append(
                     '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
                   );
+                  $('.mask').show();
                 }
-                $('.mask').show();
-                initSlider();
-              } else {
-                $('.box-shear-plate').append(
-                  '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
-                );
-                $('.mask').show();
-              }
-            },
+              },
+            });
           });
         });
       }

static/screenIos/WXtrialInterface.html

@@ -269,7 +269,7 @@
       var token = parameters['token'];
       var mealType = parameters['mealType'];
       var userCardId = parameters['userCardId'];
-      
+
       var videoTimer = null,
         videoTime = 0,
         adType = 0,
@@ -390,6 +390,7 @@
         getDataByKey(db, storeName, userCardId);
       }, 1000);
 
+      var timerInterval = null, timeInterval = 0;
       function connect(type) {
         $.ajax({
           url: baseUrl + '/api/resources/user/cloud/connect',
@@ -445,10 +446,29 @@
                 }
               } else {
                 $.toast('网络异常，请稍后重试', 'text');
+                setTimeout(() => {
+                  clearInterval(intervaler);
+                  quit();
+                }, 3000);
               }
-            } else {
+            } else if (res.status === 5200) {
+              if (timeInterval > 7) {
+                $.toast('网络异常，请稍后重试', 'text');
+                timerInterval = clearTimeout()
+                setTimeout(() => {
+                  quit();
+                }, 3000)
+                return
+              }
+              timerInterval = setTimeout(() => {
+                connect(type);
+                timeInterval += 1;
+              }, 3000)
+            }  else {
               $.toast('画面异常,请重新进入', 'text');
-              quit();
+              setTimeout(() => {
+                quit();
+              }, 3000)
             }
           },
         });
@@ -483,47 +503,76 @@
       let timer,
         isFlag = true;
       function showShearPlate() {
-        stopManyClick(() => {
-          $('.box-shear-plate').empty();
-          $.ajax({
-            url: baseUrl + '/api/public/v5/shear/content',
-            headers: {
-              Authorization: token,
-            },
-            type: 'get',
-            dataType: 'json',
-            success: function (res) {
-              if (res.status === 0) {
-                if (res.data.length) {
-                  cutList = array_unique(res.data);
-                  var str =
-                    '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
-                  cutList.forEach(function (item) {
-                    str +=
-                      "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
-                      item.content +
-                      '")\'>' +
-                      item.content +
-                      "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
-                      item.id +
-                      ")'>删除</button></div></div></div>";
-                  });
-                  str += '</div>';
-                  $('.box-shear-plate').append(str);
+        stopManyClick(function () {
+          new Promise((resolve, reject) => {
+            if (window.navigator.clipboard) {
+              window.navigator.clipboard
+                .readText()
+                .then(
+                  function (content) {
+                    return $.ajax({
+                      url: baseUrl + '/api/public/v5/shear/content',
+                      type: 'post',
+                      dataType: 'json',
+                      data: JSON.stringify({
+                        content: content,
+                      }),
+                      headers: {
+                        'content-Type': 'application/json',
+                        Authorization: token,
+                      },
+                    });
+                  },
+                  function (err) {
+                    $.toast('读取剪贴板失败', 'text');
+                  },
+                )
+                .finally(resolve);
+            } else {
+              resolve();
+            }
+          }).then(function () {
+            $('.box-shear-plate').empty();
+            return $.ajax({
+              url: baseUrl + '/api/public/v5/shear/content',
+              headers: {
+                Authorization: token,
+              },
+              type: 'get',
+              dataType: 'json',
+              success: function (res) {
+                if (res.status === 0) {
+                  if (res.data.length) {
+                    cutList = array_unique(res.data);
+                    var str =
+                      '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
+                    cutList.forEach(function (item) {
+                      str +=
+                        "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
+                        item.content +
+                        '")\'>' +
+                        item.content +
+                        "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
+                        item.id +
+                        ")'>删除</button></div></div></div>";
+                    });
+                    str += '</div>';
+                    $('.box-shear-plate').append(str);
+                  } else {
+                    $('.box-shear-plate').append(
+                      '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
+                    );
+                  }
+                  $('.mask').show();
+                  initSlider();
                 } else {
                   $('.box-shear-plate').append(
                     '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
                   );
+                  $('.mask').show();
                 }
-                $('.mask').show();
-                initSlider();
-              } else {
-                $('.box-shear-plate').append(
-                  '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
-                );
-                $('.mask').show();
-              }
-            },
+              },
+            });
           });
         });
       }
@@ -975,9 +1024,11 @@
           }
           if (event.data === 'close') {
             $.toast('画面异常,请重新进入', 'text');
-            decodeWoker.postMessage('close');
-            decodeWoker.terminate();
-            quit();
+            setTimeout(() => {
+              decodeWoker.postMessage('close');
+              decodeWoker.terminate();
+              quit();
+            }, 3000);
           }
         };
       }