xiongzhu il y a 3 ans
Parent
commit
6edaf765cb
6 fichiers modifiés avec 37 ajouts et 76 suppressions
  1. 3 2
      config.xml
  2. 12 49
      package-lock.json
  3. 5 8
      package.json
  4. 13 6
      www/index.html
  5. 1 0
      www/template.html
  6. 3 11
      yarn.lock

+ 3 - 2
config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="vip.raex.nft" version="1.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" ios-CFBundleIdentifier="new.raex.meta" ios-CFBundleVersion="147" android-versionCode="1170">
+<widget id="vip.raex.nft" version="1.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" ios-CFBundleIdentifier="new.raex.meta" ios-CFBundleVersion="152" android-versionCode="1172">
 	<name>RAEX宇宙</name>
 	<description>
         A sample Apache Cordova application that responds to the deviceready event.
@@ -7,7 +7,7 @@
 	<author email="dev@cordova.apache.org" href="http://cordova.io">
         Apache Cordova Team
     </author>
-	<content src="index.html"/>
+	<content src="http://192.168.6.215:8082"/>
 	<access origin="*"/>
 	<allow-intent href="http://*/*"/>
 	<allow-intent href="https://*/*"/>
@@ -21,6 +21,7 @@
 	<allow-navigation href="http://192.168.6.116:8082/*"/>
 	<allow-navigation href="http://192.168.6.116:8081/*"/>
 	<allow-navigation href="http://192.168.6.116:8080/*"/>
+	<allow-navigation href="http://192.168.6.215:8082/*"/>
 	<preference name="AppendUserAgent" value="#cordova#"/>
 	<preference name="BackgroundColor" value="#000000"/>
 	<preference name="DisallowOverscroll" value="true"/>

+ 12 - 49
package-lock.json

@@ -32,7 +32,7 @@
         "cordova-plugin-remote-injection": "git+https://github.com/x1ongzhu/cordova-plugin-remote-injection.git",
         "cordova-plugin-splashscreen": "^6.0.0",
         "cordova-plugin-statusbar": "^3.0.0",
-        "cordova-plugin-wechat": "^3.0.0",
+        "cordova-plugin-umeng": "file:../UmengPlugin",
         "cordova-plugin-whitelist": "^1.3.5",
         "cordova-plugin-wkwebview-engine": "^1.2.2",
         "cordova-plugin-x-socialsharing": "^6.0.3",
@@ -41,6 +41,12 @@
         "es6-promise-plugin": "^4.2.2"
       }
     },
+    "../UmengPlugin": {
+      "name": "cordova-plugin-umeng",
+      "version": "0.0.1",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/@netflix/nerror": {
       "version": "1.1.3",
       "resolved": "https://registry.npm.taobao.org/@netflix/nerror/download/@netflix/nerror-1.1.3.tgz",
@@ -751,38 +757,9 @@
         }
       }
     },
-    "node_modules/cordova-plugin-wechat": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/cordova-plugin-wechat/-/cordova-plugin-wechat-3.0.0.tgz",
-      "integrity": "sha512-GZtQOaQAURvbi9rJU2HbQI9tHUhS4/i2TiH4R9k12jLY6rTJ4VmhSgEO3xAGBKlVn9bXofYnKZBWXtU3GvFP7A==",
-      "dev": true,
-      "dependencies": {
-        "shelljs": "^0.5.3"
-      },
-      "engines": {
-        "cordovaDependencies": {
-          "<2.0.0": {
-            "cordova": ">=3.5.0"
-          },
-          "2.0.0": {
-            "cordova": ">=6.1.0",
-            "cordova-android": ">=6.1.0",
-            "cordova-ios": ">=4.3.1"
-          }
-        }
-      }
-    },
-    "node_modules/cordova-plugin-wechat/node_modules/shelljs": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmmirror.com/shelljs/-/shelljs-0.5.3.tgz",
-      "integrity": "sha512-C2FisSSW8S6TIYHHiMHN0NqzdjWfTekdMpA2FJTbRWnQMLO1RRIXEB9eVZYOlofYmjZA7fY3ChoFu09MeI3wlQ==",
-      "dev": true,
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
+    "node_modules/cordova-plugin-umeng": {
+      "resolved": "../UmengPlugin",
+      "link": true
     },
     "node_modules/cordova-plugin-whitelist": {
       "version": "1.3.5",
@@ -3547,22 +3524,8 @@
       "integrity": "sha512-nzkeWeyLA6+1FryzO0aeB6NS8MZ45gnBYeq2VZqfdNbddZEgtpI4XPYdBVxvm9NhcVoJ3tdA1OBnQD9JryoV0Q==",
       "dev": true
     },
-    "cordova-plugin-wechat": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/cordova-plugin-wechat/-/cordova-plugin-wechat-3.0.0.tgz",
-      "integrity": "sha512-GZtQOaQAURvbi9rJU2HbQI9tHUhS4/i2TiH4R9k12jLY6rTJ4VmhSgEO3xAGBKlVn9bXofYnKZBWXtU3GvFP7A==",
-      "dev": true,
-      "requires": {
-        "shelljs": "^0.5.3"
-      },
-      "dependencies": {
-        "shelljs": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmmirror.com/shelljs/-/shelljs-0.5.3.tgz",
-          "integrity": "sha512-C2FisSSW8S6TIYHHiMHN0NqzdjWfTekdMpA2FJTbRWnQMLO1RRIXEB9eVZYOlofYmjZA7fY3ChoFu09MeI3wlQ==",
-          "dev": true
-        }
-      }
+    "cordova-plugin-umeng": {
+      "version": "file:../UmengPlugin"
     },
     "cordova-plugin-whitelist": {
       "version": "1.3.5",

+ 5 - 8
package.json

@@ -32,7 +32,7 @@
     "cordova-plugin-remote-injection": "git+https://github.com/x1ongzhu/cordova-plugin-remote-injection.git",
     "cordova-plugin-splashscreen": "^6.0.0",
     "cordova-plugin-statusbar": "^3.0.0",
-    "cordova-plugin-wechat": "^3.0.0",
+    "cordova-plugin-umeng": "file:../UmengPlugin",
     "cordova-plugin-whitelist": "^1.3.5",
     "cordova-plugin-wkwebview-engine": "^1.2.2",
     "cordova-plugin-x-socialsharing": "^6.0.3",
@@ -58,15 +58,12 @@
         "PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly."
       },
-      "cordova-plugin-wechat": {
-        "WECHATAPPID": "wx6816dbdc07254dcb",
-        "UNIVERSALLINK": "https://www.raex.vip/9th/app"
-      },
-      "cordova-plugin-qrscanner": {}
+      "cordova-plugin-qrscanner": {},
+      "cordova-plugin-umeng": {}
     },
     "platforms": [
-      "ios",
-      "android"
+      "android",
+      "ios"
     ]
   },
   "dependencies": {

+ 13 - 6
www/index.html

@@ -12,7 +12,14 @@
 
 <body>
     <script>
+
         let flag = new URLSearchParams(location.search).get('flag') || localStorage.getItem('flag');
+        function padding(s, num) {
+            return ('00000000000000' + s).slice(-num);
+        }
+        let date = new Date();
+        let dateFlag = date.getFullYear() + padding(date.getMonth() + 1, 2) + padding(date.getDate(), 2);
+        dateFlag = new Date().getTime();
         if (flag === '1') {
             console.log('set flag 1');
             localStorage.setItem('flag', flag);
@@ -20,23 +27,23 @@
         }
 
         var version = '1.0.2';
-        var iosCFBundleVersion = '147';
-        var androidVersionCode = '1169';
+        var iosCFBundleVersion = '151';
+        var androidVersionCode = '1171';
         document.addEventListener('deviceready', function () {
             axios.get('https://www.raex.vip/appVersion/getVersion?version=' + version + '&platform=' + cordova.platformId)
                 .then(function (res) {
                     if (res.data.review) {
                         if ('ios' === cordova.platformId) {
-                            location.href = 'https://ios.raex.vip?review=true';
+                            location.href = 'https://ios.raex.vip?review=true&dateFlag=' + dateFlag;
                         } else {
-                            location.href = 'https://www.raex.vip?review=true';
+                            location.href = 'https://www.raex.vip?review=true&dateFlag=' + dateFlag;
                         }
                     } else {
-                        location.href = 'https://www.raex.vip';
+                        location.href = 'https://www.raex.vip?dateFlag=' + dateFlag;
                     }
                 })
                 .catch(function (e) {
-                    location.href = 'https://www.raex.vip';
+                    location.href = 'https://www.raex.vip?dateFlag=' + dateFlag;
                 });
         });
 

+ 1 - 0
www/template.html

@@ -19,6 +19,7 @@
         }
         let date = new Date();
         let dateFlag = date.getFullYear() + padding(date.getMonth() + 1, 2) + padding(date.getDate(), 2);
+        dateFlag = new Date().getTime();
         if (flag === '1') {
             console.log('set flag 1');
             localStorage.setItem('flag', flag);

+ 3 - 11
yarn.lock

@@ -408,12 +408,9 @@
   "resolved" "https://registry.npmmirror.com/cordova-plugin-statusbar/download/cordova-plugin-statusbar-3.0.0.tgz"
   "version" "3.0.0"
 
-"cordova-plugin-wechat@^3.0.0":
-  "integrity" "sha512-GZtQOaQAURvbi9rJU2HbQI9tHUhS4/i2TiH4R9k12jLY6rTJ4VmhSgEO3xAGBKlVn9bXofYnKZBWXtU3GvFP7A=="
-  "resolved" "https://registry.npmmirror.com/cordova-plugin-wechat/-/cordova-plugin-wechat-3.0.0.tgz"
-  "version" "3.0.0"
-  dependencies:
-    "shelljs" "^0.5.3"
+"cordova-plugin-umeng@file:../UmengPlugin":
+  "resolved" "file:../UmengPlugin"
+  "version" "0.0.1"
 
 "cordova-plugin-whitelist@^1.3.5":
   "integrity" "sha1-E+GmA28clyE1rUjO3u3Yl7qt95c="
@@ -1531,11 +1528,6 @@
   "resolved" "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896304371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz"
   "version" "3.0.0"
 
-"shelljs@^0.5.3":
-  "integrity" "sha512-C2FisSSW8S6TIYHHiMHN0NqzdjWfTekdMpA2FJTbRWnQMLO1RRIXEB9eVZYOlofYmjZA7fY3ChoFu09MeI3wlQ=="
-  "resolved" "https://registry.npmmirror.com/shelljs/-/shelljs-0.5.3.tgz"
-  "version" "0.5.3"
-
 "shelljs@^0.8.5":
   "integrity" "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="
   "resolved" "https://registry.npmmirror.com/shelljs/-/shelljs-0.8.5.tgz"