xiongzhu пре 3 година
родитељ
комит
40fefe2d99
6 измењених фајлова са 72 додато и 30 уклоњено
  1. 2 1
      config.xml
  2. 16 16
      package-lock.json
  3. 2 2
      package.json
  4. 41 0
      scripts/ios/fixQRScanner.js
  5. 3 3
      www/index.html
  6. 8 8
      yarn.lock

+ 2 - 1
config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="vip.raex.nft" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" ios-CFBundleIdentifier="vip.raex.meta" ios-CFBundleVersion="142" android-versionCode="1161">
+<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="146" android-versionCode="1163">
 	<name>RAEX宇宙</name>
 	<description>
         A sample Apache Cordova application that responds to the deviceready event.
@@ -55,6 +55,7 @@
 	<platform name="ios">
 		<hook type="after_prepare" src="scripts/ios/fixFileTransfer.js"/>
 		<hook type="after_plugin_install" src="scripts/ios/fixCodePush.js"/>
+		<hook type="after_plugin_install" src="scripts/ios/fixQRScanner.js"/>
 		<icon height="20" src="res/icon/ios/icon-20.png" width="20"/>
 		<icon height="29" src="res/icon/ios/icon-29.png" width="29"/>
 		<icon height="40" src="res/icon/ios/icon-40.png" width="40"/>

+ 16 - 16
package-lock.json

@@ -700,8 +700,8 @@
     },
     "node_modules/cordova-plugin-qrscanner": {
       "version": "3.0.1",
-      "resolved": "https://registry.nlark.com/cordova-plugin-qrscanner/download/cordova-plugin-qrscanner-3.0.1.tgz",
-      "integrity": "sha1-NK8u3lzoV+6bTXWTbikW/q0jhUU=",
+      "resolved": "https://registry.npmmirror.com/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1.tgz",
+      "integrity": "sha512-xrwOP3nD+VmRSiV0w7chZ5PLw2YwpI9vtLdeoGNYLLzmmjjYbyIof+x9vOEOgjtwrg9S61rukmOZhQAmkzaosA==",
       "dev": true,
       "dependencies": {
         "qrcode-reader": "^1.0.4",
@@ -2216,8 +2216,8 @@
     },
     "node_modules/qrcode-reader": {
       "version": "1.0.4",
-      "resolved": "https://registry.nlark.com/qrcode-reader/download/qrcode-reader-1.0.4.tgz",
-      "integrity": "sha1-ldm7noEwgANhqWy1pDEkrR2eBrg=",
+      "resolved": "https://registry.npmmirror.com/qrcode-reader/-/qrcode-reader-1.0.4.tgz",
+      "integrity": "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ==",
       "dev": true
     },
     "node_modules/qs": {
@@ -2362,8 +2362,8 @@
     },
     "node_modules/sdp": {
       "version": "1.5.4",
-      "resolved": "https://registry.nlark.com/sdp/download/sdp-1.5.4.tgz",
-      "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA=",
+      "resolved": "https://registry.npmmirror.com/sdp/-/sdp-1.5.4.tgz",
+      "integrity": "sha512-9x0+fpJHW2bbqtIktmL+H9m+BswgurPVPhWrur4cCZPDWDSsdGYvRBaKhDXlnNCD1b/Xi8cOTG2u703CTQuwgg==",
       "dev": true
     },
     "node_modules/semver": {
@@ -2863,8 +2863,8 @@
     },
     "node_modules/webrtc-adapter": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/webrtc-adapter/download/webrtc-adapter-3.4.3.tgz",
-      "integrity": "sha1-tjYGLu6abvFYrNDYUBtnhDS1bxY=",
+      "resolved": "https://registry.npmmirror.com/webrtc-adapter/-/webrtc-adapter-3.4.3.tgz",
+      "integrity": "sha512-rz+SxzIEuHDbyTKhYffLmzSGX6+D/pOwoXKzS1pbR2PmMhBQTXCd7aYVhSoCcTHRcmcAR3OsFE8pbYFdy1qjbQ==",
       "dev": true,
       "dependencies": {
         "sdp": "^1.5.0"
@@ -3521,8 +3521,8 @@
     },
     "cordova-plugin-qrscanner": {
       "version": "3.0.1",
-      "resolved": "https://registry.nlark.com/cordova-plugin-qrscanner/download/cordova-plugin-qrscanner-3.0.1.tgz",
-      "integrity": "sha1-NK8u3lzoV+6bTXWTbikW/q0jhUU=",
+      "resolved": "https://registry.npmmirror.com/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1.tgz",
+      "integrity": "sha512-xrwOP3nD+VmRSiV0w7chZ5PLw2YwpI9vtLdeoGNYLLzmmjjYbyIof+x9vOEOgjtwrg9S61rukmOZhQAmkzaosA==",
       "dev": true,
       "requires": {
         "qrcode-reader": "^1.0.4",
@@ -4726,8 +4726,8 @@
     },
     "qrcode-reader": {
       "version": "1.0.4",
-      "resolved": "https://registry.nlark.com/qrcode-reader/download/qrcode-reader-1.0.4.tgz",
-      "integrity": "sha1-ldm7noEwgANhqWy1pDEkrR2eBrg=",
+      "resolved": "https://registry.npmmirror.com/qrcode-reader/-/qrcode-reader-1.0.4.tgz",
+      "integrity": "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ==",
       "dev": true
     },
     "qs": {
@@ -4850,8 +4850,8 @@
     },
     "sdp": {
       "version": "1.5.4",
-      "resolved": "https://registry.nlark.com/sdp/download/sdp-1.5.4.tgz",
-      "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA=",
+      "resolved": "https://registry.npmmirror.com/sdp/-/sdp-1.5.4.tgz",
+      "integrity": "sha512-9x0+fpJHW2bbqtIktmL+H9m+BswgurPVPhWrur4cCZPDWDSsdGYvRBaKhDXlnNCD1b/Xi8cOTG2u703CTQuwgg==",
       "dev": true
     },
     "semver": {
@@ -5256,8 +5256,8 @@
     },
     "webrtc-adapter": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/webrtc-adapter/download/webrtc-adapter-3.4.3.tgz",
-      "integrity": "sha1-tjYGLu6abvFYrNDYUBtnhDS1bxY=",
+      "resolved": "https://registry.npmmirror.com/webrtc-adapter/-/webrtc-adapter-3.4.3.tgz",
+      "integrity": "sha512-rz+SxzIEuHDbyTKhYffLmzSGX6+D/pOwoXKzS1pbR2PmMhBQTXCd7aYVhSoCcTHRcmcAR3OsFE8pbYFdy1qjbQ==",
       "dev": true,
       "requires": {
         "sdp": "^1.5.0"

+ 2 - 2
package.json

@@ -54,7 +54,6 @@
       "cordova-plugin-android-notch": {},
       "cordova-plugin-appinfo": {},
       "cordova-plugin-purchase": {},
-      "cordova-plugin-qrscanner": {},
       "cordova-plugin-x-socialsharing": {
         "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."
@@ -62,7 +61,8 @@
       "cordova-plugin-wechat": {
         "WECHATAPPID": "wx6816dbdc07254dcb",
         "UNIVERSALLINK": "https://www.raex.vip/9th/app"
-      }
+      },
+      "cordova-plugin-qrscanner": {}
     },
     "platforms": [
       "android",

+ 41 - 0
scripts/ios/fixQRScanner.js

@@ -0,0 +1,41 @@
+const fs = require("fs");
+const path = require("path");
+const https = require("https");
+module.exports = function (context) {
+    if (
+        context.opts.plugin &&
+        context.opts.plugin.id === "cordova-plugin-qrscanner"
+    ) {
+        const projectRoot = context.opts.projectRoot;
+
+        const cordovaCommon = context.requireCordovaModule("cordova-common");
+        const { ConfigParser } = cordovaCommon;
+        const appConfig = new ConfigParser(
+            path.resolve(projectRoot, "config.xml")
+        );
+
+        let projectName = appConfig.name();
+
+        const file = path.resolve(
+            projectRoot,
+            "platforms",
+            "ios",
+            projectName,
+            "Plugins",
+            "cordova-plugin-qrscanner",
+            "QRScanner.swift"
+        );
+        if (fs.existsSync(file)) {
+            fs.writeFileSync(
+                file,
+                fs
+                    .readFileSync(file)
+                    .toString()
+                    .replaceAll(
+                        "UIApplication.openSettingsURLString",
+                        "UIApplicationOpenSettingsURLString"
+                    )
+            );
+        }
+    }
+};

+ 3 - 3
www/index.html

@@ -19,9 +19,9 @@
             location.href = 'https://www.raex.vip';
         }
 
-        var version = '1.0.1';
-        var iosCFBundleVersion = '141';
-        var androidVersionCode = '1161';
+        var version = '1.0.2';
+        var iosCFBundleVersion = '145';
+        var androidVersionCode = '1163';
         document.addEventListener('deviceready', function () {
             axios.get('https://www.raex.vip/appVersion/getVersion?version=' + version + '&platform=' + cordova.platformId)
                 .then(function (res) {

+ 8 - 8
yarn.lock

@@ -386,8 +386,8 @@
   "version" "10.6.1"
 
 "cordova-plugin-qrscanner@^3.0.1":
-  "integrity" "sha1-NK8u3lzoV+6bTXWTbikW/q0jhUU="
-  "resolved" "https://registry.nlark.com/cordova-plugin-qrscanner/download/cordova-plugin-qrscanner-3.0.1.tgz"
+  "integrity" "sha512-xrwOP3nD+VmRSiV0w7chZ5PLw2YwpI9vtLdeoGNYLLzmmjjYbyIof+x9vOEOgjtwrg9S61rukmOZhQAmkzaosA=="
+  "resolved" "https://registry.npmmirror.com/cordova-plugin-qrscanner/-/cordova-plugin-qrscanner-3.0.1.tgz"
   "version" "3.0.1"
   dependencies:
     "qrcode-reader" "^1.0.4"
@@ -1318,8 +1318,8 @@
   "version" "1.5.1"
 
 "qrcode-reader@^1.0.4":
-  "integrity" "sha1-ldm7noEwgANhqWy1pDEkrR2eBrg="
-  "resolved" "https://registry.nlark.com/qrcode-reader/download/qrcode-reader-1.0.4.tgz"
+  "integrity" "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ=="
+  "resolved" "https://registry.npmmirror.com/qrcode-reader/-/qrcode-reader-1.0.4.tgz"
   "version" "1.0.4"
 
 "qs@2.3.3":
@@ -1474,8 +1474,8 @@
   "version" "1.1.4"
 
 "sdp@^1.5.0":
-  "integrity" "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA="
-  "resolved" "https://registry.nlark.com/sdp/download/sdp-1.5.4.tgz"
+  "integrity" "sha512-9x0+fpJHW2bbqtIktmL+H9m+BswgurPVPhWrur4cCZPDWDSsdGYvRBaKhDXlnNCD1b/Xi8cOTG2u703CTQuwgg=="
+  "resolved" "https://registry.npmmirror.com/sdp/-/sdp-1.5.4.tgz"
   "version" "1.5.4"
 
 "semver@^5.7.1":
@@ -1812,8 +1812,8 @@
   "version" "7.0.3"
 
 "webrtc-adapter@^3.1.4":
-  "integrity" "sha1-tjYGLu6abvFYrNDYUBtnhDS1bxY="
-  "resolved" "https://registry.npmmirror.com/webrtc-adapter/download/webrtc-adapter-3.4.3.tgz"
+  "integrity" "sha512-rz+SxzIEuHDbyTKhYffLmzSGX6+D/pOwoXKzS1pbR2PmMhBQTXCd7aYVhSoCcTHRcmcAR3OsFE8pbYFdy1qjbQ=="
+  "resolved" "https://registry.npmmirror.com/webrtc-adapter/-/webrtc-adapter-3.4.3.tgz"
   "version" "3.4.3"
   dependencies:
     "sdp" "^1.5.0"