Merge branch 'nuxt' into dev-5.3.1

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "android-cloud-H5-nuxt",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
   "packages": {
     "": {
@@ -24013,6 +24013,16 @@
       "resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmmirror.com/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
@@ -24031,8 +24041,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -24062,14 +24071,12 @@
     "ajv-errors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "requires": {}
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "requires": {}
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -24549,6 +24556,16 @@
         "file-uri-to-path": "1.0.0"
       }
     },
+    "bl": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/bl/-/bl-1.2.3.tgz",
+      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz",
@@ -25387,7 +25404,8 @@
     "commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "commondir": {
       "version": "1.0.1",
@@ -25543,8 +25561,8 @@
       "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==",
       "dev": true,
       "requires": {
-        "is-text-path": "^1.0.1",
         "JSONStream": "^1.0.4",
+        "is-text-path": "^1.0.1",
         "lodash": "^4.17.15",
         "meow": "^8.0.0",
         "split2": "^3.0.0",
@@ -26487,195 +26505,6 @@
       "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
       "dev": true
     },
-    "esbuild": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.14.45.tgz",
-      "integrity": "sha512-JOxGUD8jcs8xE8DjyGWC8by/vLMCXTJ/wuauWipL5kJRZx1dhpqIntb31QHjA45GZJWaXv7SjC/Zwu1bCkXWtQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "esbuild-android-64": "0.14.45",
-        "esbuild-android-arm64": "0.14.45",
-        "esbuild-darwin-64": "0.14.45",
-        "esbuild-darwin-arm64": "0.14.45",
-        "esbuild-freebsd-64": "0.14.45",
-        "esbuild-freebsd-arm64": "0.14.45",
-        "esbuild-linux-32": "0.14.45",
-        "esbuild-linux-64": "0.14.45",
-        "esbuild-linux-arm": "0.14.45",
-        "esbuild-linux-arm64": "0.14.45",
-        "esbuild-linux-mips64le": "0.14.45",
-        "esbuild-linux-ppc64le": "0.14.45",
-        "esbuild-linux-riscv64": "0.14.45",
-        "esbuild-linux-s390x": "0.14.45",
-        "esbuild-netbsd-64": "0.14.45",
-        "esbuild-openbsd-64": "0.14.45",
-        "esbuild-sunos-64": "0.14.45",
-        "esbuild-windows-32": "0.14.45",
-        "esbuild-windows-64": "0.14.45",
-        "esbuild-windows-arm64": "0.14.45"
-      }
-    },
-    "esbuild-android-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.45.tgz",
-      "integrity": "sha512-krVmwL2uXQN1A+Ci4u2MR+Y0IAvQK0u3no5TsgguHVhTy138szjuohScCGjkpvLCpGLk7P4kFP1LKuntvJ0d4A==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-android-arm64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.45.tgz",
-      "integrity": "sha512-62POGdzAjM+XOXEM5MmFW6k9Pjdjg1hTrXKKBbPE700LFF36B+1Jv9QkskT5UadbTk4cdH9BQ7bGiRPYY0p/Dw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.45.tgz",
-      "integrity": "sha512-dbkVUAnGx5IeZesWnIhnvxy7dSvgUQvfy0TVLzd9XVP3oI/VsKs8UNsfPrxI5HiN4SINv7oPAbxWceMpB7IqNA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.45.tgz",
-      "integrity": "sha512-O6Bz7nnOae5rvbh2Ueo8ibSr7+/eLjsbPdgeMsAZri+LkOa7nsVPnhmocpO3Hy/LWfagTtHy1O9HRPIaArPmTg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.45.tgz",
-      "integrity": "sha512-y1X2nr3XSWnDC7MRcy21EVAT0TiCtdefOntJ+SQcZnPBTURzX77f99S8lDF2KswukChkiacpd2Wd4VZieo7w7Q==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.45.tgz",
-      "integrity": "sha512-r3ZNejkx1BKXQ6sYOP6C5rTwgiUajyAh03wygLWZtl+SLyygvAnu+OouqtveesufjBDgujp4wZXP/n8PVqXkqg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.45.tgz",
-      "integrity": "sha512-Qk9cCO3PJig/Y+SdslN/Th4pbAjgaH9oUjVH28eMsLTPf6QDUuK6EED91jepJdR3vxhcnVjyl6JqtOWmP+uxCg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.45.tgz",
-      "integrity": "sha512-IybO2ugqvc/Zzn1Kih3x0FVjYAy3GTCwhtcp91dbdqk3wPqxYCzObYspa8ca0s+OovI0Cnb+rhXrUtq8gBqlqw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.45.tgz",
-      "integrity": "sha512-qKWJ4A4TAcxXV2TBLPw3Av5X2SYNfyNnBHNJTQJ5VuevK6Aq5i6XEMvUgdlcVuZ9MYPfS5aJZWglzDzJMf1Lpw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.45.tgz",
-      "integrity": "sha512-UNEyuHTwztrkEU/+mWIxGzKrYBo2cEtjYAZQVZB1kliANKgRITktg2miaO/b/VtNe84ob1aXSvW8XOPEn5RTGQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.45.tgz",
-      "integrity": "sha512-s/jcfw3Vpku5dIVSFVY7idJsGdIpIJ88IrkyprVgCG2yBeXatb67B7yIt0E1tL+OHrJJdNBw6GikCiMPAAu1VA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-ppc64le": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.45.tgz",
-      "integrity": "sha512-lJItl6ESZnhSx951U9R7MTBopgwIELHlQzC6SBR023V5JC1rPRFDZ/UEBsV+7BFcCAfqlyb+odGEAmcBSf4XCA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-riscv64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.45.tgz",
-      "integrity": "sha512-8anMu+QLl9MununVCGJN2I/JvUWPm1EVsBBLq/J+Nz4hr8t6QOCuEp0HRaeMohyl2XiMFBchVu0mwa05rF7GFQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-linux-s390x": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.45.tgz",
-      "integrity": "sha512-1TPeNvNCoahMw745KNTA6POKaFfSqQrBb3fdOL82GXZqyKU/6rHNwGP0NgHe88bAUMp3QZfjGfCGKxfBHL77RQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-netbsd-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.45.tgz",
-      "integrity": "sha512-55f2eZ8EQhhOZosqX0mApgRoI9PrVyXlHd9Uivk+B0B4WTKUgzkoHaVk4EkIUtNRQTpDWPciTlpb/C2tUYVejA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-openbsd-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.45.tgz",
-      "integrity": "sha512-Z5sNcT3oN9eryMW3mGn5HAgg7XCxiUS4isqH1tZXpsdOdOESbgbTEP0mBEJU0WU7Vt2gIN5XMbAp7Oigm0k71g==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-sunos-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.45.tgz",
-      "integrity": "sha512-WmWu4wAm8mIxxK9aWFCj5VHunY3BHQDT3dAPexMLLszPyMF7RDtUYf+Dash9tjyitvnoxPAvR7DpWpirDLQIlQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-windows-32": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.45.tgz",
-      "integrity": "sha512-DPPehKwPJFBoSG+jILc/vcJNN8pTwz1m6FWojxqtqPhgw8OabTgN4vL7gNMqL/FSeDxF+zyvZeeMrZFYF1d81Q==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-windows-64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.45.tgz",
-      "integrity": "sha512-t6bxFZcp9bLmSs+1pCNL/BW2bq3QEQHxU4HoiMEyWfF8QBU8iNXFI1iLGdyCzB1Ue2739h55tpOvojFrfyNPWA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "esbuild-windows-arm64": {
-      "version": "0.14.45",
-      "resolved": "https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.45.tgz",
-      "integrity": "sha512-DnhrvjECBJ2L0owoznPb4RqQKZ498SM8J+YHqmqzi0Gf/enkUwwTjB8vPCK6dDuFnNU/NE8f94FhKdkBHYruDQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
@@ -26832,15 +26661,13 @@
       "version": "8.5.0",
       "resolved": "https://registry.npmmirror.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
       "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-config-standard": {
       "version": "17.0.0",
       "resolved": "https://registry.npmmirror.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
       "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-import-resolver-node": {
       "version": "0.3.6",
@@ -27095,8 +26922,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmmirror.com/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz",
       "integrity": "sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-plugin-unicorn": {
       "version": "42.0.0",
@@ -27554,6 +27380,29 @@
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "optional": true
     },
+    "file-type": {
+      "version": "12.4.2",
+      "resolved": "https://registry.npmmirror.com/file-type/-/file-type-12.4.2.tgz",
+      "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==",
+      "dev": true
+    },
+    "filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/filenamify/-/filenamify-2.1.0.tgz",
+      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "^2.0.0",
+        "strip-outer": "^1.0.0",
+        "trim-repeated": "^1.0.0"
+      }
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
@@ -28599,6 +28448,13 @@
         "param-case": "^2.1.1",
         "relateurl": "^0.2.7",
         "uglify-js": "^3.5.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+        }
       }
     },
     "html-minifier-terser": {
@@ -29531,16 +29387,6 @@
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
       "dev": true
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmmirror.com/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz",
@@ -30318,12 +30164,6 @@
       "resolved": "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
-    "nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmmirror.com/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
-      "optional": true
-    },
     "nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz",
@@ -31569,8 +31409,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmmirror.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
           "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -32328,8 +32167,7 @@
     "prettier": {
       "version": "2.6.2",
       "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.6.2.tgz",
-      "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
-      "devOptional": true
+      "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew=="
     },
     "pretty-bytes": {
       "version": "5.6.0",
@@ -33050,16 +32888,6 @@
         "inherits": "^2.0.1"
       }
     },
-    "rollup": {
-      "version": "2.75.6",
-      "resolved": "https://registry.npmmirror.com/rollup/-/rollup-2.75.6.tgz",
-      "integrity": "sha512-OEf0TgpC9vU6WGROJIk1JA3LR5vk/yvqlzxqdrE2CzzXnqKXNzbAwlWUXis8RS3ZPe7LAq+YUxsRa0l3r27MLA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz",
@@ -33811,14 +33639,6 @@
       "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
@@ -33839,6 +33659,14 @@
         "es-abstract": "^1.19.5"
       }
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -34040,8 +33868,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmmirror.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
           "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "string-width": {
           "version": "4.2.3",
@@ -34066,22 +33893,19 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/stylelint-config-html/-/stylelint-config-html-1.0.0.tgz",
       "integrity": "sha512-rKQUUWDpaYC7ybsS6tLxddjn6DxhjSIXybElSmcTyVQj3ExhmU3q+l41ktrlwHRyY0M5SkTkZiwngvYPYmsgSQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "stylelint-config-prettier": {
       "version": "9.0.3",
       "resolved": "https://registry.npmmirror.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz",
       "integrity": "sha512-5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "stylelint-config-recommended": {
       "version": "7.0.0",
       "resolved": "https://registry.npmmirror.com/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
       "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "stylelint-config-recommended-vue": {
       "version": "1.4.0",
@@ -34118,8 +33942,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmmirror.com/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -34422,6 +34245,13 @@
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
         "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+        }
       }
     },
     "terser-webpack-plugin": {
@@ -34440,6 +34270,11 @@
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
@@ -34529,8 +34364,7 @@
     "time-fix-plugin": {
       "version": "2.0.7",
       "resolved": "https://registry.npmmirror.com/time-fix-plugin/-/time-fix-plugin-2.0.7.tgz",
-      "integrity": "sha512-uVFet1LQToeUX0rTcSiYVYVoGuBpc8gP/2jnlUzuHMHe+gux6XLsNzxLUweabMwiUj5ejhoIMsUI55nVSEa/Vw==",
-      "requires": {}
+      "integrity": "sha512-uVFet1LQToeUX0rTcSiYVYVoGuBpc8gP/2jnlUzuHMHe+gux6XLsNzxLUweabMwiUj5ejhoIMsUI55nVSEa/Vw=="
     },
     "timers-browserify": {
       "version": "2.0.12",
@@ -35339,34 +35173,6 @@
         }
       }
     },
-    "vite": {
-      "version": "2.9.12",
-      "resolved": "https://registry.npmmirror.com/vite/-/vite-2.9.12.tgz",
-      "integrity": "sha512-suxC36dQo9Rq1qMB2qiRorNJtJAdxguu5TMvBHOc/F370KvqAe9t48vYp+/TbPKRNrMh/J55tOUmkuIqstZaew==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "esbuild": "^0.14.27",
-        "fsevents": "~2.3.2",
-        "postcss": "^8.4.13",
-        "resolve": "^1.22.0",
-        "rollup": "^2.59.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "8.4.14",
-          "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.14.tgz",
-          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "nanoid": "^3.3.4",
-            "picocolors": "^1.0.0",
-            "source-map-js": "^1.0.2"
-          }
-        }
-      }
-    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -35625,8 +35431,7 @@
     "vuetify": {
       "version": "2.6.6",
       "resolved": "https://registry.npmmirror.com/vuetify/-/vuetify-2.6.6.tgz",
-      "integrity": "sha512-H4KtxDFmDN8QiTRiGfBySyjMhVaHAJTKB0llGGKZT5jKxtnx9gvEtMWXKtVuRP0NJJP0H6xBPJHNOH7nT18qiQ==",
-      "requires": {}
+      "integrity": "sha512-H4KtxDFmDN8QiTRiGfBySyjMhVaHAJTKB0llGGKZT5jKxtnx9gvEtMWXKtVuRP0NJJP0H6xBPJHNOH7nT18qiQ=="
     },
     "vuetify-loader": {
       "version": "1.7.3",
@@ -35642,8 +35447,7 @@
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
-      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
-      "requires": {}
+      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
     },
     "watchpack": {
       "version": "1.7.5",
@@ -35756,11 +35560,7 @@
           "version": "1.2.13",
           "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
+          "optional": true
         },
         "glob-parent": {
           "version": "3.1.0",
@@ -36702,8 +36502,7 @@
     "ws": {
       "version": "7.5.8",
       "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.8.tgz",
-      "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
-      "requires": {}
+      "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw=="
     },
     "xhr": {
       "version": "2.6.0",

static/screenAndroid/WXdraw.js

@@ -22,20 +22,13 @@ url = url.split('/');
 var parameters = GetRequest();
 var form = {};
 
-var cardToken = parameters["cardToken"];
-cardToken = cardToken && decodeURIComponent(cardToken);
-form.ip = parameters["ip"];
-form.domainName = parameters["domainName"];
-var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives" : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives";
-var videoWidth = Number(parameters['resolvingPower']) ? Number(parameters['resolvingPower']) : 720
+var videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 var videoHeight = videoWidth === 720 ? 1280 : 1920
 var isControl = true; // 是否是观看模式
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 
 var wsss, errorTime = 0;
 var first = true;
-doConnect();
 function throttle(fn, delay) {
   var flag = true;
   errorTime += delay;
@@ -49,7 +42,7 @@ function throttle(fn, delay) {
   };
 }
 
-function doConnect() {
+function doConnectDirectives() {
   wsss = new WebSocket(cUrl);
   wsss.binaryType = 'arraybuffer';
 
@@ -66,7 +59,7 @@ function doConnect() {
   };
   wsss.onerror = function (evt) {
     wsss.close();
-    throttle(doConnect, 100);
+    throttle(doConnectDirectives, 100);
     if (errorTime > 1000) {
       quit();
     }

static/screenAndroid/WXtrialInterface.html

@@ -232,6 +232,92 @@
         $('.loading_sceen_pic').attr('src', '../static/img/home_bg_PRO.png');
       }
       initAD();
+      let dbName = parameters['username'],
+        version = 1,
+        storeName = 'usercard';
+      let indexedDB = window.indexedDB;
+      let db, socketURL, cUrl, cardToken, resolvingPower;
+      const request = indexedDB.open(dbName, version);
+      request.onsuccess = function (event) {
+        db = event.target.result; // 数据库对象
+        console.log('数据库打开成功');
+      };
+
+      request.onerror = function (event) {
+        console.log('数据库打开报错');
+      };
+
+      request.onupgradeneeded = function (event) {
+        // 数据库创建或升级的时候会触发
+        console.log('onupgradeneeded');
+        db = event.target.result; // 数据库对象
+        let objectStore;
+        if (!db.objectStoreNames.contains(storeName)) {
+          objectStore = db.createObjectStore(storeName, { keyPath: 'id' }); // 创建表
+        }
+      };
+      // 添加数据
+      function addData(db, storeName, data) {
+        let request = db
+          .transaction([storeName], 'readwrite') // 事务对象 指定表格名称和操作模式（"只读"或"读写"）
+          .objectStore(storeName) // 仓库对象
+          .add(data);
+
+        request.onsuccess = function (event) {
+          console.log('数据写入成功');
+        };
+
+        request.onerror = function (event) {
+          console.log('数据写入失败');
+          throw new Error(event.target.error);
+        };
+      }
+
+      // 根据id获取数据
+      function getDataByKey(db, storeName, key) {
+        let transaction = db.transaction([storeName]); // 事务
+        let objectStore = transaction.objectStore(storeName); // 仓库对象
+        let request = objectStore.get(key);
+
+        request.onerror = function (event) {
+          connect();
+        };
+
+        request.onsuccess = function (event) {
+          console.log('主键查询结果: ', request.result);
+          if (request.result) {
+            socketURL = request.result.socketURL;
+            cUrl = request.result.cUrl;
+            cardToken = request.result.cardToken;
+            resolvingPower = request.result.resolvingPower;
+            doConnectBusiness();
+            doConnectDirectives();
+          } else {
+            connect();
+          }
+        };
+      }
+
+      // 根据id修改数
+      function updateDB(db, storeName, data) {
+        let request = db
+          .transaction([storeName], 'readwrite') // 事务对象
+          .objectStore(storeName) // 仓库对象
+          .put(data);
+
+        request.onsuccess = function () {
+          console.log('数据更新成功');
+        };
+
+        request.onerror = function () {
+          console.log('数据更新失败');
+        };
+      }
+
+      // 由于打开indexDB是异步的加个定时器避免 db对象还没获取到值导致 报错
+      setTimeout(() => {
+        getDataByKey(db, storeName, form.userCardId);
+      }, 1000);
       var isAudioPlay = false;
       if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
         var video = document.getElementById('playerVideo');
@@ -291,21 +377,62 @@
       Module.onRuntimeInitialized = function () {
         isFinish = true;
       };
-
-      var isWSS = true;
-      var ip = parameters['ip'];
-      var cardToken = parameters['cardToken'];
-      cardToken = cardToken && decodeURIComponent(cardToken);
-      var appletPushAddress = parameters['appletPushAddress'];
-      var socketURL = isWSS
-        ? 'wss://' +
-          appletPushAddress +
-          '?cardIp=' +
-          ip +
-          '&token=' +
-          cardToken +
-          '&type=business'
-        : 'ws://' + appletPushAddress + '?cardIp=' + ip + '&token=' + cardToken;
+      function connect() {
+        $.ajax({
+          url: baseUrl + '/api/resources/user/cloud/connect',
+          type: 'post',
+          data: JSON.stringify({
+            userCardId: Number(form.userCardId),
+          }),
+          headers: {
+            'content-Type': 'application/json',
+            Authorization: form.token,
+          },
+          dataType: 'json',
+          async: false,
+          success: function (res) {
+            if (res.status === 0) {
+              if (res.data.internetHttps) {
+                socketURL =
+                  'wss://' +
+                  res.data.internetHttps +
+                  '/plugflow?cardIp=' +
+                  res.data.localIp +
+                  '&token=' +
+                  res.data.cardToken +
+                  '&type=business';
+                cUrl =
+                  'wss://' +
+                  res.data.internetHttps +
+                  '/businessChannel?cardIp=' +
+                  res.data.localIp +
+                  '&token=' +
+                  res.data.cardToken +
+                  '&type=directives';
+                cardToken = res.data.cardToken;
+                resolvingPower = res.data.resolvingPower;
+                addData(db, storeName, {
+                  id: form.userCardId,
+                  socketURL: socketURL,
+                  cUrl: cUrl,
+                  cardToken: res.data.cardToken,
+                  resolvingPower: res.data.resolvingPower,
+                });
+                doConnectBusiness();
+                doConnectDirectives();
+              } else {
+                $.toast('网络异常，请稍后重试', 'text');
+              }
+            } else {
+              $.toast('画面异常,请重新进入', 'text');
+              clearInterval(intervaler);
+              quit();
+              ws.close();
+              wsss.close();
+            }
+          },
+        });
+      }
 
       var jmuxer = new JMuxer({
         node: 'playerVideo',
@@ -324,7 +451,7 @@
       };
       var ws,
         errorTime = 0;
-      doConnect();
+
       // 节流
       // 设置一个标志
       function throttle(fn, delay) {
@@ -340,7 +467,7 @@
         };
       }
       var intervaler;
-      function doConnect() {
+      function doConnectBusiness() {
         ws = new WebSocket(socketURL);
         ws.binaryType = 'arraybuffer';
         intervaler = setInterval(() => {
@@ -363,7 +490,7 @@
         ws.addEventListener('error', function (event) {
           ws.close();
           clearInterval(intervaler);
-          throttle(doConnect, 100);
+          throttle(doConnectBusiness, 100);
           if (errorTime > 1000) {
             $.toast('画面异常,请重新进入', 'text');
             wsss.close();
@@ -547,11 +674,7 @@
               var checkBuffer = GetScreenState();
               ws.send(checkBuffer);
             } else {
-              $.toast('画面异常,请重新进入', 'text');
-              clearInterval(intervaler);
-              quit();
-              ws.close();
-              wsss.close();
+              connect();
             }
           }
           if (input[23] == 0x05) {
@@ -601,9 +724,6 @@
         return false;
       }
 
-      var form = {};
-      form.token = parameters['token'];
-      form.userCardId = parameters['userCardId'];
       function array_unique(arr) {
         return arr.filter(function (e, i) {
           return arr.indexOf(e) === i;
@@ -992,7 +1112,6 @@
             type: 'get',
             dataType: 'json',
             success: function (res) {
-              console.log(res);
               let obj = res.data;
               if (res.status === 0) {
                 resolve(obj);
@@ -1268,9 +1387,6 @@
       }
       //关闭广告
       $('.time-close-wrap')[0].addEventListener('click', () => {
-        if(videoTime == 0) {
-          reportFrequency()
-        }
         $('.buy-phone-wrap').eq(0).show();
       });
       // 点击取消
@@ -1323,7 +1439,12 @@
         } else {
           // 过期续费按钮进入
           wx.miniProgram.navigateTo({
-            url: `/packageA/order/renew/index?buyType=${sourceType == 1 ? '试用弹窗购买按钮进入-普通试用' : '试用弹窗购买按钮进入-激活码试用'}&record=` + form.userCardId,
+            url:
+              `/packageA/order/renew/index?buyType=${
+                sourceType == 1
+                  ? '试用弹窗购买按钮进入-普通试用'
+                  : '试用弹窗购买按钮进入-激活码试用'
+              }&record=` + form.userCardId,
           });
         }
       });
@@ -1361,19 +1482,6 @@
           success: function (res) {},
         });
       }
-      // 观看广告次数上报
-      function reportFrequency() {
-        $.ajax({
-          url: baseUrl + '/api/resoures/v1/trial/reportFrequency/' + form.userCardId,
-          headers: {
-            Authorization: form.token
-          },
-          type: 'post',
-          contentType: 'application/json',
-          dataType: 'json',
-          success: function (res) {},
-        });
-      }
       function quit() {
         if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
           tt.miniProgram.switchTab({

static/screenIos/WXdraw.js

@@ -19,21 +19,13 @@ url = url.split('/');
 
 var parameters = GetRequest();
 
-var form = {};
-var cardToken = parameters["cardToken"];
-cardToken = cardToken && decodeURIComponent(cardToken);
-form.ip = parameters['ip'];
-form.domainName = parameters["domainName"];
-var isWSS = true;
-var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives" : "ws://" + form.domainName + "?cardIp=" + form.ip + "&token=" + cardToken + "&type=directives";
-var videoWidth = Number(parameters['resolvingPower']) ? Number(parameters['resolvingPower']) : 720
+var videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
 var videoHeight = videoWidth === 720 ? 1280 : 1920
 var isControl = true; // 是否是观看模式
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 var wsss;
 var errorTime = 0;
 var first = true;
-doConnect();
 
 function throttle(fn, delay) {
   var flag = true;
@@ -48,7 +40,7 @@ function throttle(fn, delay) {
   };
 }
 
-function doConnect() {
+function doConnectDirectives() {
   wsss = new WebSocket(cUrl);
   wsss.binaryType = 'arraybuffer';
 
@@ -75,7 +67,7 @@ function doConnect() {
   };
   wsss.onerror = function () {
     wsss.close();
-    throttle(doConnect, 100);
+    throttle(doConnectDirectives, 100);
     if (errorTime > 1000) {
       quit();
     }

static/screenIos/WXtrialInterface.html

@@ -302,6 +302,153 @@
       var winese = document.createElement('wine');
       wine.style.top = '-' + winese + 'px';
       var isAudioPlay = false;
+      let dbName = parameters['username'],
+        version = 1,
+        storeName = 'usercard';
+      let indexedDB = window.indexedDB;
+      let db;
+      var socketURL;
+      var cUrl;
+      var cardToken;
+      const request = indexedDB.open(dbName, version);
+      request.onsuccess = function (event) {
+        db = event.target.result; // 数据库对象
+        console.log('数据库打开成功');
+      };
+
+      request.onerror = function (event) {
+        console.log('数据库打开报错');
+      };
+
+      request.onupgradeneeded = function (event) {
+        // 数据库创建或升级的时候会触发
+        console.log('onupgradeneeded');
+        db = event.target.result; // 数据库对象
+        let objectStore;
+        if (!db.objectStoreNames.contains(storeName)) {
+          objectStore = db.createObjectStore(storeName, { keyPath: 'id' }); // 创建表
+        }
+      };
+      // 添加数据
+      function addData(db, storeName, data) {
+        let request = db
+          .transaction([storeName], 'readwrite') // 事务对象 指定表格名称和操作模式（"只读"或"读写"）
+          .objectStore(storeName) // 仓库对象
+          .add(data);
+
+        request.onsuccess = function (event) {
+          console.log('数据写入成功');
+        };
+
+        request.onerror = function (event) {
+          console.log('数据写入失败');
+          throw new Error(event.target.error);
+        };
+      }
+
+      // 根据id获取数据
+      function getDataByKey(db, storeName, key) {
+        let transaction = db.transaction([storeName]); // 事务
+        let objectStore = transaction.objectStore(storeName); // 仓库对象
+        let request = objectStore.get(key);
+
+        request.onerror = function (event) {
+          connect();
+        };
+
+        request.onsuccess = function (event) {
+          console.log('主键查询结果: ', request.result);
+          if (request.result) {
+            socketURL = request.result.socketURL;
+            cUrl = request.result.cUrl;
+            cardToken = request.result.cardToken;
+            resolvingPower = request.result.resolvingPower;
+            doConnectBusiness();
+            doConnectDirectives();
+          } else {
+            connect();
+          }
+        };
+      }
+
+      // 根据id修改数
+      function updateDB(db, storeName, data) {
+        let request = db
+          .transaction([storeName], 'readwrite') // 事务对象
+          .objectStore(storeName) // 仓库对象
+          .put(data);
+
+        request.onsuccess = function () {
+          console.log('数据更新成功');
+        };
+
+        request.onerror = function () {
+          console.log('数据更新失败');
+        };
+      }
+
+      // 由于打开indexDB是异步的加个定时器避免 db对象还没获取到值导致 报错
+      setTimeout(() => {
+        getDataByKey(db, storeName, form.userCardId);
+      }, 1000);
+
+      function connect() {
+        $.ajax({
+          url: baseUrl + '/api/resources/user/cloud/connect',
+          type: 'post',
+          data: JSON.stringify({
+            userCardId: Number(form.userCardId),
+          }),
+          headers: {
+            'content-Type': 'application/json',
+            Authorization: form.token,
+          },
+          dataType: 'json',
+          async: false,
+          success: function (res) {
+            if (res.status === 0) {
+              if (res.data.internetHttps) {
+                socketURL =
+                  'wss://' +
+                  res.data.internetHttps +
+                  '/plugflow?cardIp=' +
+                  res.data.localIp +
+                  '&token=' +
+                  res.data.cardToken +
+                  '&type=business';
+                cUrl =
+                  'wss://' +
+                  res.data.internetHttps +
+                  '/businessChannel?cardIp=' +
+                  res.data.localIp +
+                  '&token=' +
+                  res.data.cardToken +
+                  '&type=directives';
+                cardToken = res.data.cardToken;
+                resolvingPower = res.data.resolvingPower;
+                addData(db, storeName, {
+                  id: form.userCardId,
+                  socketURL: socketURL,
+                  cUrl: cUrl,
+                  cardToken: res.data.cardToken,
+                  resolvingPower: res.data.resolvingPower,
+                });
+                doConnectBusiness();
+                doConnectDirectives();
+              } else {
+                $.toast('网络异常，请稍后重试', 'text');
+              }
+            } else {
+              $.toast('画面异常,请重新进入', 'text');
+              clearInterval(intervaler);
+              quit();
+              ws.close();
+              wsss.close();
+            }
+          },
+        });
+      }
+
       initAD();
       $.alert({
         title: '提示',
@@ -770,70 +917,67 @@
         }
         return obj;
       }
-      var ip = parameters['ip'];
-      var appletPushAddress = parameters['appletPushAddress'];
-      var token = parameters['cardToken'];
-      var webSocketWorker = new Worker(
-        'websocket.js?ip=' +
-          ip +
-          '&appletPushAddress=' +
-          appletPushAddress +
-          '&token=' +
-          token,
-      );
-
-      webSocketWorker.onmessage = function (event) {
-        var input = event.data;
-        if (input[0] == 0xff && isAudioPlay) {
-          decodeAAC(input);
-        }
-        if (input[0] == 0 && input[1] == 0 && input[2] == 0 && input[3] == 1) {
-          var cmd = {
-            type: 'rawData',
-            data: event.data,
-          };
-          decodeWoker.postMessage(cmd);
-        }
-        if (input[0] == 0x68) {
-          if (input[23] == 0x5c) {
-            if (CheckVerifyCode(input)) {
-              webSocketWorker.postMessage(ConfigChannel('RK3923C1201900139'));
-              var checkBuffer = GetScreenState();
-              webSocketWorker.postMessage(checkBuffer);
-            } else {
-              $.toast('画面异常,请重新进入', 'text');
-              decodeWoker.postMessage('close');
-              decodeWoker.terminate();
-              webSocketWorker.terminate();
-              quit();
-            }
+      function doConnectBusiness() {
+        var webSocketWorker = new Worker(
+          'websocket.js?socketURL=' +
+            encodeURIComponent(socketURL) +
+            '&cardToken=' +
+            encodeURIComponent(cardToken),
+        );
+        webSocketWorker.onmessage = function (event) {
+          var input = event.data;
+          if (input[0] == 0xff && isAudioPlay) {
+            decodeAAC(input);
           }
-          if (input[23] == 0x05) {
-            //横竖屏标识
-            var state = CheckScreenDirection(input.slice(24, 24 + 8));
+          if (
+            input[0] == 0 &&
+            input[1] == 0 &&
+            input[2] == 0 &&
+            input[3] == 1
+          ) {
+            var cmd = {
+              type: 'rawData',
+              data: event.data,
+            };
+            decodeWoker.postMessage(cmd);
+          }
+          if (input[0] == 0x68) {
+            if (input[23] == 0x5c) {
+              if (CheckVerifyCode(input)) {
+                webSocketWorker.postMessage(ConfigChannel('RK3923C1201900139'));
+                var checkBuffer = GetScreenState();
+                webSocketWorker.postMessage(checkBuffer);
+              } else {
+                connect();
+              }
+            }
+            if (input[23] == 0x05) {
+              //横竖屏标识
+              var state = CheckScreenDirection(input.slice(24, 24 + 8));
 
-            if (state == 1) {
-              console.log('安卓卡此时竖屏');
-              //竖屏处理
-              resolving = 1;
-            } else {
-              console.log('安卓卡此时横屏');
-              //横屏处理
-              resolving = 0;
+              if (state == 1) {
+                console.log('安卓卡此时竖屏');
+                //竖屏处理
+                resolving = 1;
+              } else {
+                console.log('安卓卡此时横屏');
+                //横屏处理
+                resolving = 0;
+              }
+            }
+            if (input[23] == 0x0b) {
+              console.log('多端登陆');
             }
           }
-          if (input[23] == 0x0b) {
-            console.log('多端登陆');
+          if (event.data === 'close') {
+            $.toast('画面异常,请重新进入', 'text');
+            decodeWoker.postMessage('close');
+            decodeWoker.terminate();
+            webSocketWorker.terminate();
+            quit();
           }
-        }
-        if (event.data === 'close') {
-          $.toast('画面异常,请重新进入', 'text');
-          decodeWoker.postMessage('close');
-          decodeWoker.terminate();
-          webSocketWorker.terminate();
-          quit();
-        }
-      };
+        };
+      }
 
       // 激活码广告相关配置
       function getConfigByPhoneType() {
@@ -1046,9 +1190,6 @@
       }
       //关闭广告
       $('.time-close-wrap')[0].addEventListener('click', () => {
-        if(videoTime == 0) {
-          reportFrequency()
-        }
         $('.buy-phone-wrap').eq(0).show();
       });
       // 点击取消
@@ -1097,7 +1238,7 @@
         if (getDate) {
           if (window.__wxjs_environment === 'miniprogram') {
             wx.miniProgram.navigateTo({
-              url: '/packageA/order/buy/index?buyType=试用界面购买'
+              url: '/packageA/order/buy/index?buyType=试用界面购买',
             });
           } else {
             uni.webView.navigateTo({
@@ -1107,7 +1248,12 @@
         } else {
           if (window.__wxjs_environment === 'miniprogram') {
             wx.miniProgram.navigateTo({
-              url: `/packageA/order/renew/index?buyType=${sourceType == 1 ? '试用弹窗购买按钮进入-普通试用' : '试用弹窗购买按钮进入-激活码试用'}&record=` + form.userCardId
+              url:
+                `/packageA/order/renew/index?buyType=${
+                  sourceType == 1
+                    ? '试用弹窗购买按钮进入-普通试用'
+                    : '试用弹窗购买按钮进入-激活码试用'
+                }&record=` + form.userCardId,
             });
           } else {
             uni.webView.navigateTo({
@@ -1116,137 +1262,6 @@
           }
         }
       });
-      // 放弃
-      $('.cannel-ad-btn')[0].addEventListener('click', () => {
-        if (sourceType == 1) {
-          systemBuriedPoint('免费试用-强制关闭-放弃');
-        } else {
-          systemBuriedPoint('激活码-强制关闭-放弃');
-        }
-        quit();
-      });
-      // 继续观看
-      $('.looking')[0].addEventListener('click', () => {
-        $('.look-wrap').eq(0).hide();
-        if (sourceType == 1) {
-          systemBuriedPoint('免费试用-强制关闭-继续观看');
-        } else {
-          systemBuriedPoint('激活码-强制关闭-继续观看');
-        }
-      });
-
-      // 埋点
-      function systemBuriedPoint(pointName) {
-        $.ajax({
-          url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
-          headers: {
-            Authorization: form.token,
-          },
-          type: 'post',
-          data: JSON.stringify({
-            pointName: pointName,
-          }),
-          contentType: 'application/json',
-          dataType: 'json',
-          success: function (res) {},
-        });
-      }
-
-      // 观看广告次数上报
-      function reportFrequency() {
-        $.ajax({
-          url: baseUrl + '/api/resoures/v1/trial/reportFrequency/' + form.userCardId,
-          headers: {
-            Authorization: form.token
-          },
-          type: 'post',
-          contentType: 'application/json',
-          dataType: 'json',
-          success: function (res) {},
-        });
-      }
-
-      function Close() {
-        // webworker 关闭,清理
-        var cmd = {
-          cmd: 0,
-        };
-        decodeWoker.postMessage(cmd);
-        decodeWoker.terminate();
-        webSocketWorker.postMessage(cmd);
-        webSocketWorker.terminate();
-      }
-
-      var isDrag = false;
-
-      myVideo.onkeydown = function (event) {
-        ExexuteKeyDown(e.keyCode);
-      };
-      var level = 2;
-      function switchSharpness() {
-        var cmd = {
-          type: 'switchSharpness',
-        };
-
-        decodeWoker.postMessage(cmd); //通知解码器worker切换分辨率
-        var buffer = makeSharpness(level);
-        webSocketWorker.postMessage(buffer);
-
-        if (level < 4) {
-          level++;
-        } else {
-          level = 0;
-        }
-      }
-      var hidden, visibilityChange;
-      if (typeof document.hidden !== 'undefined') {
-        // Opera 12.10 and Firefox 18 and later support
-        hidden = 'hidden';
-        visibilityChange = 'visibilitychange';
-      } else if (typeof document.msHidden !== 'undefined') {
-        hidden = 'msHidden';
-        visibilityChange = 'msvisibilitychange';
-      } else if (typeof document.webkitHidden !== 'undefined') {
-        hidden = 'webkitHidden';
-        visibilityChange = 'webkitvisibilitychange';
-      }
-
-      // 处理页面可见属性的改变
-      document.addEventListener(
-        'visibilitychange',
-        function () {
-          if (document[hidden]) {
-            if (
-              !navigator.userAgent.toLowerCase().includes('toutiaomicroapp') ||
-              window.__wxjs_environment !== 'miniprogram'
-            ) {
-              ws.close();
-              wsss.close();
-              uni.webView.navigateTo({
-                url: '/pages/index/index',
-              });
-            }
-          }
-        },
-        false,
-      );
-
-      function quit() {
-        if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-          tt.miniProgram.switchTab({
-            url: '/pages/home/home',
-          });
-        } else if (window.__wxjs_environment === 'miniprogram') {
-          wx.miniProgram.switchTab({
-            url: '/pages/home/home',
-          });
-        } else {
-          uni.webView.navigateTo({
-            url: '/pages/index/index',
-          });
-        }
-      }
-
       window.onbeforeunload = function () {
         wsss.close();
         decodeWoker.postMessage('close');

static/screenIos/websocket.js

@@ -1,12 +1,9 @@
 self.importScripts("helper.js");
 var parameters = GetRequest();
-var ip = parameters["ip"];
-var appletPushAddress = parameters["appletPushAddress"];
-var cardToken = parameters["token"];
+var cardToken = parameters["cardToken"];
 cardToken = cardToken && decodeURIComponent(cardToken);
-var isWSS = true;
 var errorTime = 0;
-var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business" : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business";
+var socketURL = decodeURIComponent(parameters['socketURL']);
 var intervaler;
 doConnect();