From: qiaowei Date: Thu, 26 Sep 2019 09:45:32 +0000 (+0800) Subject: 极光推送问题 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=e82a1f8fc4b338bf929dedfab095f5ba772db8d8;p=dali_platform%2Fmobile.git 极光推送问题 --- diff --git a/config.xml b/config.xml index 4a21478..b657713 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + dlapp A sample Apache Cordova application that responds to the deviceready event. diff --git a/package.json b/package.json index 649c3ea..323d848 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "com.supwisdom.dlapp", + "name": "com.dalicitycard.app", "displayName": "大理市民卡", "version": "1.0.3", "description": "A sample Apache Cordova application that responds to the deviceready event.", diff --git a/platforms/android/CordovaLib/CordovaLib.iml b/platforms/android/CordovaLib/CordovaLib.iml deleted file mode 100644 index da4f936..0000000 --- a/platforms/android/CordovaLib/CordovaLib.iml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/platforms/android/android.iml b/platforms/android/android.iml deleted file mode 100644 index f0a5ac2..0000000 --- a/platforms/android/android.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/platforms/android/android.json b/platforms/android/android.json index f654e07..476c50e 100644 --- a/platforms/android/android.json +++ b/platforms/android/android.json @@ -93,11 +93,11 @@ "count": 2 }, { - "xml": "", + "xml": "", "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { @@ -177,7 +177,7 @@ "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { @@ -185,19 +185,19 @@ "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { @@ -205,11 +205,11 @@ "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { @@ -217,7 +217,7 @@ "count": 1 }, { - "xml": "", + "xml": "", "count": 1 }, { @@ -255,55 +255,55 @@ }, "installed_plugins": { "cordova-plugin-add-swift-support": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-fingerprint-aio": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-touch-id": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-whitelist": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-file": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-advanced-http": { "OKHTTP_VERSION": "3.10.0", - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-statusbar": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-disable-ios11-statusbar": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-qrscanner": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-camera": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-inappbrowser": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-device": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-themeablebrowser": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-jcore": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "jpush-phonegap-plugin": { "APP_KEY": "d644d997f2cab0551ff704a3", "CHANNEL": "developer-default", - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-app-version": { - "PACKAGE_NAME": "com.supwisdom.dlapp" + "PACKAGE_NAME": "com.dalicitycard.app" }, "cordova-plugin-wkwebview-engine": { "PACKAGE_NAME": "com.dalicitycard.app" diff --git a/platforms/android/app/app.iml b/platforms/android/app/app.iml deleted file mode 100644 index f1a0fda..0000000 --- a/platforms/android/app/app.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle index 26cd3f9..3a20b4b 100644 --- a/platforms/android/app/build.gradle +++ b/platforms/android/app/build.gradle @@ -169,7 +169,7 @@ android { if (cdvMinSdkVersion != null) { minSdkVersion cdvMinSdkVersion } - minSdkVersion 19 + minSdkVersion 24 ndk { abiFilters "armeabi" } @@ -184,7 +184,47 @@ android { // Android Manifest by 10 and add a number for each architecture. // If you are not using Crosswalk or SQLite, you can // ignore this chunk of code, and your version codes will be respected. + if (Boolean.valueOf(cdvBuildMultipleApks)) { + flavorDimensions "default" + productFlavors { + armeabi { + versionCode defaultConfig.versionCode * 10 + 1 + ndk { + abiFilters = ["armeabi"] + } + } + armv7 { + versionCode defaultConfig.versionCode * 10 + 2 + ndk { + abiFilters = ["armeabi-v7a"] + } + } + arm64 { + versionCode defaultConfig.versionCode * 10 + 3 + ndk { + abiFilters = ["arm64-v8a"] + } + } + x86 { + versionCode defaultConfig.versionCode * 10 + 4 + ndk { + abiFilters = ["x86"] + } + } + x86_64 { + versionCode defaultConfig.versionCode * 10 + 5 + ndk { + abiFilters = ["x86_64"] + } + } + } + } else if (Boolean.valueOf(cdvVersionCodeForceAbiDigit)) { + // This provides compatibility to the default logic for versionCode before cordova-android 5.2.0 + defaultConfig { + versionCode defaultConfig.versionCode * 10 + } + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/platforms/android/app/release/app-release.apk b/platforms/android/app/release/app-release.apk index 8664e26..9058c6b 100644 Binary files a/platforms/android/app/release/app-release.apk and b/platforms/android/app/release/app-release.apk differ diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml index 823d9b5..107ebba 100644 --- a/platforms/android/app/src/main/AndroidManifest.xml +++ b/platforms/android/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ - + @@ -27,18 +27,18 @@ - + - + - + - + @@ -54,13 +54,14 @@ - + - + - + @@ -75,7 +76,7 @@ - + @@ -87,8 +88,8 @@ - - + + diff --git a/platforms/android/app/src/main/assets/www/js/main.js b/platforms/android/app/src/main/assets/www/js/main.js index da93b6c..8d7e506 100644 --- a/platforms/android/app/src/main/assets/www/js/main.js +++ b/platforms/android/app/src/main/assets/www/js/main.js @@ -44,7 +44,17 @@ var app = { } }); var uid = window.localStorage.getItem("uid"); - + console.log(uid); + window.JPush.setAlias({ sequence: 1, alias: uid }, + (result) => { + var sequence = result.sequence + var alias = result.alias + console.log(alias) + }, (error) => { + console.log(JSON.stringify(error)) + var sequence = error.sequence + var errorCode = error.code + }) }, onDeviceReady: function() { diff --git a/platforms/android/build.gradle b/platforms/android/build.gradle index a3473f2..bea8a74 100644 --- a/platforms/android/build.gradle +++ b/platforms/android/build.gradle @@ -29,8 +29,6 @@ buildscript { // in the individual module build.gradle files classpath 'com.android.tools.build:gradle:3.3.0' - - } } diff --git a/platforms/ios/dlapp.xcarchive/Info.plist b/platforms/ios/dlapp.xcarchive/Info.plist index f54150d..6a13a29 100644 --- a/platforms/ios/dlapp.xcarchive/Info.plist +++ b/platforms/ios/dlapp.xcarchive/Info.plist @@ -9,9 +9,9 @@ CFBundleIdentifier com.dalicitycard.app CFBundleShortVersionString - 1.0.4 + 1.0.5 CFBundleVersion - 1.0.4 + 1.0.5 SigningIdentity iPhone Developer: chuan xu (8FWH8QKULT) Team @@ -20,7 +20,7 @@ ArchiveVersion 2 CreationDate - 2019-09-25T06:49:04Z + 2019-09-26T03:33:22Z Name dlapp SchemeName diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car index 694b01d..439ef35 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib index 24c2de2..99f1d2f 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib index e2b92ee..a96530b 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib index 4a8696c..45c19f9 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib index 6c6db60..0810743 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib index dbdda11..3ca564c 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib index a270cb7..d661792 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib index d69a005..118a9bf 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib index 6757d90..760620c 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib index 589e184..033731f 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib index 637c518..fc192b8 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib index b563931..56eb771 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib index c260f2c..296e9d2 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib index ca49fd4..b3c8e50 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib index 4ca3c94..262e625 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib index 44d9a82..6ec56c3 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib index 7cb498f..c14107f 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib index 4763208..7efc1cc 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist index 08ebb57..06b5a26 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib index 47321ea..3e9ca35 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources index 8083a0e..b5429c7 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources @@ -78,79 +78,79 @@ Assets.car - KKAirXh8K/ModwnSXLShV5/etr0= + g8zkpxmqkYLNeSWR12e1gNQYWTY= Frameworks/libswiftAVFoundation.dylib - uDfYCHXGi4LJJ7PehI1sKbZqVf4= + 8Qj0lW0Ymvy5KyAWLJHwYSk6u+U= Frameworks/libswiftCore.dylib - hnZxV4PUHdqbt8IOBCPhBpfSwUE= + 2uXteUPyAvfHG476W5U8cUjZHx0= Frameworks/libswiftCoreAudio.dylib - /mmLx8jrVORtoTACElCyWqzqYfA= + v6VcOdQFWvRkIl4ot9I3OPjYVH0= Frameworks/libswiftCoreFoundation.dylib - v7BE4evcLJt3iFrwd9m33m5rFI8= + Zi64xPHRsx39JoIsd+FL0ZQu81o= Frameworks/libswiftCoreGraphics.dylib - qxYPH4/wxggOGD73Xj6EkCR0xkY= + m7c9XriI9UvRELbZP7K+j+ypGsE= Frameworks/libswiftCoreImage.dylib - vlRBCfDqtrrwzkBLtGs2HbO4YbI= + /JAWw3eLhtYii8EaproxWv4OZ/M= Frameworks/libswiftCoreMedia.dylib - CyOREkCX0hnTg5JHbY6kdrfAERI= + VBxFpSMpOnOyxdhr7fFmNfYltYY= Frameworks/libswiftDarwin.dylib - nd3vDcLn6YQQrhlqobWhMV/sLAE= + TzQzDoWlyGOG+LxX/bq5utRJs/s= Frameworks/libswiftDispatch.dylib - Xlup3R5V6sXScSmXMkAysKJWVXk= + CPl5Gsoy+SEzLF4TP5caS627GWY= Frameworks/libswiftFoundation.dylib - 6FQCjaFEt9vOMPGkD3Bi4b9USw0= + aXmoTPmqDfxQp/HFMCdCG4/5COk= Frameworks/libswiftMetal.dylib - JJGt6xWjffN+5mM0q0dDOmJ8dDE= + xPaIpCnJ+DSZwkJceploiwt6Pq8= Frameworks/libswiftObjectiveC.dylib - OIdIVW04vwXmE+cHkwyzMTkbvnU= + fVmGxWQRRqnOcfdNBoZByuBlVgc= Frameworks/libswiftQuartzCore.dylib - cshqKXNDw3S4IFGWYenc+0CqhCk= + v81eB3IUtC9er+KovxdS1KLgDxw= Frameworks/libswiftSwiftOnoneSupport.dylib - T9TevUnkeG5ZEUxj0Pdl4fF0vUE= + uk8eGXXRu+UEjRYEHuNBxqEElfo= Frameworks/libswiftUIKit.dylib - TrQW8qKOdy8IEbHkKhWe3R+o2ZM= + 7g0O3uLYgaPNe2b0FPLlcfJsLMU= Frameworks/libswiftos.dylib - TQ11eqpSTjqthNmaPsfIeasSdUk= + wjhieac5H3WQl8RMgjJm/Q6sinM= Frameworks/libswiftsimd.dylib - 3yFMAEujHZwmMLxWNEPsqtRI7l8= + 8JFWbSQfhpLwLvQIw/1WuTICIGs= Info.plist - ptakydEySnuUqGLwmDSThlf9kP8= + juvGuJJaPnLgqxd3MSbC0kiDMgI= JPushConfig.plist @@ -198,7 +198,7 @@ MainViewController.nib - Hbj+jg8kHggfQilLv2funLLiKdE= + cjvTFQXfZRdmAYsSW398uuCbmBA= PkgInfo @@ -206,7 +206,7 @@ config.xml - IgESgLidVuYaBKc1zJzsW9K32uo= + PZUzb4/2ynWqr9WkAFnsX6KOZ1k= embedded.mobileprovision @@ -554,7 +554,7 @@ www/js/scan.js - Cea6nn8OF3hogSuEpiL+IkVdO0I= + u/uxG7pig1OIhkJvIOSMYiOTs8c= www/js/security.js @@ -1273,198 +1273,198 @@ hash - KKAirXh8K/ModwnSXLShV5/etr0= + g8zkpxmqkYLNeSWR12e1gNQYWTY= hash2 - nReIXWpgV9Kb7kvFFviDa0ldEsVlJYZnX3sW+zEIOoE= + hGZP6DsKlLJF9P4lCwrh3qAYrMMrR0Occ4xRUmvB0Ck= Frameworks/libswiftAVFoundation.dylib hash - uDfYCHXGi4LJJ7PehI1sKbZqVf4= + 8Qj0lW0Ymvy5KyAWLJHwYSk6u+U= hash2 - uBXupAH/nHa8Xn0vQL18OKMoz5nwtyOQyRrDYywnT2Y= + v2O6O1GGrVVAsfEYjnL8E1hQXMzlFHfpzFUMk8BTeTQ= Frameworks/libswiftCore.dylib hash - hnZxV4PUHdqbt8IOBCPhBpfSwUE= + 2uXteUPyAvfHG476W5U8cUjZHx0= hash2 - p6+Hu5nJHIAgwObOZvX2YVFv9uZmIAdxaXpuKk99HsQ= + TWGfJk+0MT16isdzShKr59MX6DvSCRXWxIg3MPqOP7w= Frameworks/libswiftCoreAudio.dylib hash - /mmLx8jrVORtoTACElCyWqzqYfA= + v6VcOdQFWvRkIl4ot9I3OPjYVH0= hash2 - p9sdnJpMpkRQ+jg6wuB9bs/n5/l0uNQQlya0Vspe5Y4= + dtxhnx2+ZA57b0cQnwC7KIRzcwf2GTJnSJArY/BKcKQ= Frameworks/libswiftCoreFoundation.dylib hash - v7BE4evcLJt3iFrwd9m33m5rFI8= + Zi64xPHRsx39JoIsd+FL0ZQu81o= hash2 - A8VfO5EJH/1XaYYpedcjFu0C8tPp6sULSQkH6c9Snk8= + Z5gGPTEtndo0LQprh2y2G//esdzINHviqwJILb8a6vk= Frameworks/libswiftCoreGraphics.dylib hash - qxYPH4/wxggOGD73Xj6EkCR0xkY= + m7c9XriI9UvRELbZP7K+j+ypGsE= hash2 - MATi1ECxIR33VrEed+K9v0VXz+qfWvzXZoZhaCeiA8c= + l/HNmRQFWzUXzRv4xBDeHKvePCEiO7hExLq0d9fe9mI= Frameworks/libswiftCoreImage.dylib hash - vlRBCfDqtrrwzkBLtGs2HbO4YbI= + /JAWw3eLhtYii8EaproxWv4OZ/M= hash2 - K47oJc8r9dJYRsWzi+BIhDtLTFCZihsGFBh+/mHQuVk= + /BonXWVlfvAGk4ofEjuuwtKZcXo2pHILvim59W3JTs8= Frameworks/libswiftCoreMedia.dylib hash - CyOREkCX0hnTg5JHbY6kdrfAERI= + VBxFpSMpOnOyxdhr7fFmNfYltYY= hash2 - /fidqVROE0ZTPK+z2Ivl0fr9LvkZtMM+k/HfToN/S1A= + jWDKTymB6McXNkHsz6ltHJOaDX1LrVOlyRPh+JsqAew= Frameworks/libswiftDarwin.dylib hash - nd3vDcLn6YQQrhlqobWhMV/sLAE= + TzQzDoWlyGOG+LxX/bq5utRJs/s= hash2 - +jx6Y88pLiTayhNHrKV+cvGDubsban8mTTSKAFyxXtc= + OHAb3OyhZOJSvH5/FtuU3rQh7Gztifi3DqqDec5jMnw= Frameworks/libswiftDispatch.dylib hash - Xlup3R5V6sXScSmXMkAysKJWVXk= + CPl5Gsoy+SEzLF4TP5caS627GWY= hash2 - kf3F5hCOQjxwhh0bnjLpfQ0at4IYiQXRnFA0GHgdKTM= + u3kJECdKSg4eKbhDS+QmU6GBs/jQdHm1rBEqzLgQfxs= Frameworks/libswiftFoundation.dylib hash - 6FQCjaFEt9vOMPGkD3Bi4b9USw0= + aXmoTPmqDfxQp/HFMCdCG4/5COk= hash2 - buTkqHRqLULyfmgfMfODWvRvz4dt1Cg/1Hrv5ndbJjk= + XRG6C/d3ESRa2YIxg2ludYWLFJZjbJXxns4rBXNEE6c= Frameworks/libswiftMetal.dylib hash - JJGt6xWjffN+5mM0q0dDOmJ8dDE= + xPaIpCnJ+DSZwkJceploiwt6Pq8= hash2 - Q/eqOi5Bts/4DzykQhKDZEEmvs0P0XeelFxTIwKhuRY= + JxZNz3OOkQ85DZGfZdarb++dRNNPjsIMbKuYuegX3bA= Frameworks/libswiftObjectiveC.dylib hash - OIdIVW04vwXmE+cHkwyzMTkbvnU= + fVmGxWQRRqnOcfdNBoZByuBlVgc= hash2 - 09Rh2HZy1FxjpKjOdWogDCPxC77vqjKOmnxFWTYTTbg= + SlDXeFJtdcw5OU0mSxtr24SWrJk7DhHoqH2Kc1wPn/Q= Frameworks/libswiftQuartzCore.dylib hash - cshqKXNDw3S4IFGWYenc+0CqhCk= + v81eB3IUtC9er+KovxdS1KLgDxw= hash2 - d6iUBJvHmPEduWaf3mresVZuJx5f0uDmj/Q6yKRf9xE= + fELviAuzeIrdBNyow1tenv/lTjpcnZxZ+f22ABeKzE8= Frameworks/libswiftSwiftOnoneSupport.dylib hash - T9TevUnkeG5ZEUxj0Pdl4fF0vUE= + uk8eGXXRu+UEjRYEHuNBxqEElfo= hash2 - ZGaqmTrf9sdGpU6nQ3WEQmC/NopTbMZ9hbX1MW6WXXY= + z18X0FoF4w+dBoXxWnl7EqOTUy/j2pj/V8AC0N07emY= Frameworks/libswiftUIKit.dylib hash - TrQW8qKOdy8IEbHkKhWe3R+o2ZM= + 7g0O3uLYgaPNe2b0FPLlcfJsLMU= hash2 - f5qWx1UwiW+tVgxmWY2uRxr0eTEkWMqis3s5hJnUAIM= + yncCZEKhCnGN/35HMO1XzmBeMnlWe7DoFxSyBe2hH2k= Frameworks/libswiftos.dylib hash - TQ11eqpSTjqthNmaPsfIeasSdUk= + wjhieac5H3WQl8RMgjJm/Q6sinM= hash2 - Ql7Bw3we9SVQ5fEOtjrVgHsY5hhGuGNKvi3jPv8/ZLI= + mneq7YCMTdC9JxEwrugMQw/2d6nDckL8vAarcPrPnZM= Frameworks/libswiftsimd.dylib hash - 3yFMAEujHZwmMLxWNEPsqtRI7l8= + 8JFWbSQfhpLwLvQIw/1WuTICIGs= hash2 - QBy+8Rh3zSljUjUo1mnDhNzyp0XPtzHOidN4SwhRDkI= + nmCbJjUc3G0t1bp2bf9qNCoS7J0Cj1aQ7W0j+uKJ5hg= JPushConfig.plist @@ -1592,22 +1592,22 @@ hash - Hbj+jg8kHggfQilLv2funLLiKdE= + cjvTFQXfZRdmAYsSW398uuCbmBA= hash2 - AQvB0y4SawJMCUT1q06CQjD/NgLijaua3CvtGzExEUo= + 5ztrKpbIHJlcfYR5qM4ZanQy00wZABi1MFbtuiwXcDU= config.xml hash - IgESgLidVuYaBKc1zJzsW9K32uo= + PZUzb4/2ynWqr9WkAFnsX6KOZ1k= hash2 - SbLdTrUoZlolkwamhFCqAvtbQUU/oaBoDoDAZGW4rCI= + Rc9fXTgQhylUY1cVz6eRZG2E2MiHf7lNVaYC/IY6ZD8= embedded.mobileprovision @@ -2560,11 +2560,11 @@ hash - Cea6nn8OF3hogSuEpiL+IkVdO0I= + u/uxG7pig1OIhkJvIOSMYiOTs8c= hash2 - boEwP89p0NKOJH9RNkGe9B9GsagQ2Ug8esVLc2s5oP8= + gPLadH5W2VlCuZ52V99qWeU68uCz62OtFYHpY3jTFBc= www/js/security.js diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml index 89c5991..14bae9c 100755 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml @@ -1,5 +1,5 @@ - + diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp index e2e075e..8ff51f5 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js index 0bde5cd..f331281 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js @@ -32,14 +32,12 @@ var app = { $.alert('扫描出错，请稍后再试：' + JSON.stringify(err), '提示'); } else { // The scan completed, display the contents of the QR code: - //$.alert(text, '提示'); - showRet(text); QRScanner.destroy(); + showRet(text); } } //开始扫描，需要将页面的背景设置成透明 QRScanner.show(); - console.log("QRScanner.scan"); } else if (status.denied) { // The video preview will remain black, and scanning is disabled. We can // try to ask the user to change their mind, but we'll have to send them @@ -66,23 +64,57 @@ var app = { }); }, goPage: function() { - QRScanner.destroy(); + //QRScanner.destroy(); window.location = "main.html" } }; app.initialize(); -var inAppBrowserRef; +function showRet1(url){ + if(isEmpty(url)){ + return; + } + var userid = window.localStorage.getItem("userid"); + if (url.indexOf("yy.dlsmk.cn")>=0) { + if(url.indexOf("?")>0){ + url=url+'&userid='+userid; + }else{ + url=url+'?userid='+userid; + } + } + var ref = cordova.InAppBrowser.open(url, '_blank',"location=yes,beforeload=yes"); + ref.addEventListener('loadstart', function(params){ + if (params.url.indexOf("yy.dlsmk.cn")>=0) { + if (params.url.indexOf("userid")<0) { + if(params.url.indexOf("?")>0){ + params.url=params.url+'&userid='+userid; + }else{ + params.url=params.url+'?userid='+userid; + } + ref.hide(); + var neRef = cordova.InAppBrowser.open(params.url, '_blank',"location=yes,beforeload=yes"); + neRef.addEventListener('exit', function(e){ + ref.close(); + window.location = "main.html" + }); + } + } + }); +} + function showRet(url) { if(isEmpty(url)){ return; } var userid = window.localStorage.getItem("userid"); - if(url.indexOf("?")>0){ - url=url+'&userid='+userid; - }else{ - url=url+'?userid='+userid; + if (url.indexOf("yy.dlsmk.cn")>=0) { + if(url.indexOf("?")>0){ + url=url+'&userid='+userid; + }else{ + url=url+'?userid='+userid; + } } - inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', { + console.log(url) + var inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', { statusbar: { color: '#03a9f4ff' }, @@ -107,19 +139,25 @@ function showRet(url) { event: 'closePressed' }, backButtonCanClose: true - }).addEventListener('backPressed', function(e) { - //alert('back pressed'); - }).addEventListener('closePressed', function(e) { - //alert('closePressed pressed'); - inAppBrowserRef.close(); - window.location = "main.html" - }).addEventListener(cordova.ThemeableBrowser.EVT_ERR, function(e) { - console.error(e.message); - }).addEventListener(cordova.ThemeableBrowser.EVT_WRN, function(e) { - console.log(e.message); - }); - inAppBrowserRef.addEventListener('loadstart', loadStartCallBack); - inAppBrowserRef.addEventListener('beforeload', beforeloadCallBack); + }).addEventListener('loadstart', function(params){ + if (params.url.indexOf("yy.dlsmk.cn")>=0) { + if (params.url.indexOf("userid")<0) { + if(params.url.indexOf("?")>0){ + params.url=params.url+'&userid='+userid; + }else{ + params.url=params.url+'?userid='+userid; + } + //ref.hide(); + var neRef = cordova.ThemeableBrowser.open(params.url, '_blank'); + neRef.addEventListener('closePressed', function(e){ + neRef.close(); + window.location = "main.html" + }); + } + } + }); + //inAppBrowserRef.addEventListener('loadstart', loadStartCallBack); + //inAppBrowserRef.addEventListener('beforeload', beforeloadCallBack); } function loadStartCallBack(params,callback) { console.log("1",params.url); diff --git a/platforms/ios/dlapp.xcodeproj/project.pbxproj b/platforms/ios/dlapp.xcodeproj/project.pbxproj index 88f42ff..d2839b7 100644 --- a/platforms/ios/dlapp.xcodeproj/project.pbxproj +++ b/platforms/ios/dlapp.xcodeproj/project.pbxproj @@ -5,12 +5,14 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; }; 04347BD0ABAC4EE0B4CDDDB6 /* jcore-ios-2.1.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 444DBF371D8346D7BC7EE35D /* jcore-ios-2.1.1.a */; }; 0FBFC45D12B44FF79785B959 /* UIImage+CropScaleOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 281DF600F6B747808087E4FC /* UIImage+CropScaleOrientation.m */; }; 1D3623260D0F684500981E51 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; }; 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; + 1F969D21D7EF4CF1A547A1DF /* CDVWKProcessPoolFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 473FEFEEBB2C4F5EAF594EBD /* CDVWKProcessPoolFactory.m */; }; 2FE26256C715470F8240C690 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2625E3AABA8145E6901F06D3 /* SystemConfiguration.framework */; }; 301BF552109A68D80062928A /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 301BF535109A57CC0062928A /* libCordova.a */; settings = {ATTRIBUTES = (Required, ); }; }; 302D95F114D2391D003F00A1 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 302D95EF14D2391D003F00A1 /* MainViewController.m */; }; @@ -21,6 +23,7 @@ 3EBABAA2209349F6AF91DF03 /* JPushPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = CD3E9CB7CBA54989AB62BA7F /* JPushPlugin.m */; }; 432FFA418F2F4247BE9C8472 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1F790D5B00B4F178F835DE1 /* CoreTelephony.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 4F83621E48F143429B20FB3A /* CDVThemeableBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 28B91F31B6FD410AAF87BBDC /* CDVThemeableBrowser.m */; }; + 562D29FCB1FB4F86B95BB2BC /* CDVWKWebViewEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 59FDAA2CEE4540A3913846E4 /* CDVWKWebViewEngine.m */; }; 5E2BDB8CFE4E41F39241956C /* CordovaHttpPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B9D06BD3024E0FBFF74967 /* CordovaHttpPlugin.m */; }; 5F67F2BDBB534EF4A4F1F319 /* BinaryResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F753C8AE424EAE851FA1FD /* BinaryResponseSerializer.m */; }; 5F8969599D7F41909F597D14 /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FEED8E986814AC1AC60FC28 /* AFNetworkReachabilityManager.m */; }; @@ -36,6 +39,7 @@ 7EC1B4999B2E48C098BA1BBB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C44E29C3B190445C98BBAB84 /* CoreFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 8A202CA89E434389BBA0AD60 /* AppVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AAC7231E47A434EAF06A5B0 /* AppVersion.m */; }; 8ABB6F36D85243238622D4F8 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3A85B8119074F699E1A15CD /* LocalAuthentication.framework */; }; + 8C09122A89C14C5FB0C28636 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE0B455916A4481681D59FE0 /* WebKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 8E2516CFE16944B8B9702955 /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = BA6C5B1A6A6A488790CA41EB /* AFSecurityPolicy.m */; }; 90E2E49D3A2449AB8D4D82D0 /* TextResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 57E66D7A151D45828ED66B7F /* TextResponseSerializer.m */; }; 9224D3CE70AE4072BBEB170D /* CDVLocalFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A8DD2DDC8694A97A56F9FA7 /* CDVLocalFilesystem.m */; }; @@ -58,12 +62,9 @@ D404D18DD0114DA787E0BB43 /* SDNetworkActivityIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 148A2122F3E242E4AF09A28D /* SDNetworkActivityIndicator.m */; }; D834895F80744E0F96D59047 /* TouchID.m in Sources */ = {isa = PBXBuildFile; fileRef = B3CE13EED96B44C0B06B1B2C /* TouchID.m */; }; F46AE1B50D8B4A81B05D4100 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A673D8D8920E4086A9152FC4 /* Security.framework */; }; + F68EA21E51A3463A8FE2EE92 /* CDVWKWebViewUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B73EA28E46846FF84E6AF02 /* CDVWKWebViewUIDelegate.m */; }; F939AD8D22BB769B006B371B /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F939AD8C22BB769B006B371B /* libsqlite3.0.tbd */; }; FDE92C386167415E8040F8AB /* AFURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = FDEE8379D7A34C55A616F700 /* AFURLResponseSerialization.m */; }; - 562D29FCB1FB4F86B95BB2BC /* CDVWKWebViewEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 59FDAA2CEE4540A3913846E4 /* CDVWKWebViewEngine.m */; }; - F68EA21E51A3463A8FE2EE92 /* CDVWKWebViewUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B73EA28E46846FF84E6AF02 /* CDVWKWebViewUIDelegate.m */; }; - 1F969D21D7EF4CF1A547A1DF /* CDVWKProcessPoolFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 473FEFEEBB2C4F5EAF594EBD /* CDVWKProcessPoolFactory.m */; }; - 8C09122A89C14C5FB0C28636 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE0B455916A4481681D59FE0 /* WebKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -111,6 +112,7 @@ 1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 1D6058910D05DD3D006BFB54 /* dlapp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dlapp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1E5CB6025B2E4D14ABFDB037 /* CDVWKWebViewUIDelegate.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVWKWebViewUIDelegate.h; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.h"; sourceTree = ""; }; 22AE2683802B4CB1BAF69ABF /* AFURLSessionManager.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFURLSessionManager.m; path = "cordova-plugin-advanced-http/AFURLSessionManager.m"; sourceTree = ""; }; 22DF35565BBA44B1980FFAF5 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 2625E3AABA8145E6901F06D3 /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; @@ -130,23 +132,28 @@ 3291AEB63DCC45B58959915F /* JPushPlugin.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = JPushPlugin.h; path = "jpush-phonegap-plugin/JPushPlugin.h"; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* dlapp-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "dlapp-Prefix.pch"; sourceTree = ""; }; 331EEE6AB06B4F35BFBC8120 /* AppVersion.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AppVersion.h; path = "cordova-plugin-app-version/AppVersion.h"; sourceTree = ""; }; + 3B73EA28E46846FF84E6AF02 /* CDVWKWebViewUIDelegate.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVWKWebViewUIDelegate.m; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.m"; sourceTree = ""; }; 3BE5364CD5E74AFDAB853364 /* AFURLResponseSerialization.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFURLResponseSerialization.h; path = "cordova-plugin-advanced-http/AFURLResponseSerialization.h"; sourceTree = ""; }; 3D1EDC804D3646E7BE4A92BF /* AFNetworking.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFNetworking.h; path = "cordova-plugin-advanced-http/AFNetworking.h"; sourceTree = ""; }; 3FD6ED94AE9243B29217547A /* CDVLocalFilesystem.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVLocalFilesystem.h; path = "cordova-plugin-file/CDVLocalFilesystem.h"; sourceTree = ""; }; 41DFF309018A479EA8F43611 /* CDVInAppBrowser.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVInAppBrowser.h; path = "cordova-plugin-inappbrowser/CDVInAppBrowser.h"; sourceTree = ""; }; 444DBF371D8346D7BC7EE35D /* jcore-ios-2.1.1.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; name = "jcore-ios-2.1.1.a"; path = "dlapp/Plugins/cordova-plugin-jcore/jcore-ios-2.1.1.a"; sourceTree = ""; }; + 473FEFEEBB2C4F5EAF594EBD /* CDVWKProcessPoolFactory.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVWKProcessPoolFactory.m; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m"; sourceTree = ""; }; 4BF1AE7251084FD2876E0BF5 /* AFURLRequestSerialization.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFURLRequestSerialization.m; path = "cordova-plugin-advanced-http/AFURLRequestSerialization.m"; sourceTree = ""; }; 5192EB17EA164DFD80D433E4 /* ImageIO.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; 57E66D7A151D45828ED66B7F /* TextResponseSerializer.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = TextResponseSerializer.m; path = "cordova-plugin-advanced-http/TextResponseSerializer.m"; sourceTree = ""; }; 59D1F618C1ED464283B7B2E6 /* UserNotifications.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; + 59FDAA2CEE4540A3913846E4 /* CDVWKWebViewEngine.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVWKWebViewEngine.m; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m"; sourceTree = ""; }; 607F51FCFC7C4062A93BD011 /* CDVInAppBrowser.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVInAppBrowser.m; path = "cordova-plugin-inappbrowser/CDVInAppBrowser.m"; sourceTree = ""; }; 61106E22F1D348DDBDC4DC0B /* DisableStatusbar.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = DisableStatusbar.m; path = "cordova-plugin-disable-ios11-statusbar/DisableStatusbar.m"; sourceTree = ""; }; 62C24B1E8F294AC587C6D051 /* UIImage+CropScaleOrientation.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "UIImage+CropScaleOrientation.h"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.h"; sourceTree = ""; }; + 648BD3182CD64A77AD2D447B /* CDVWKWebViewEngine.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVWKWebViewEngine.h; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h"; sourceTree = ""; }; 683645F69456461BB8712924 /* AFNetworkReachabilityManager.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFNetworkReachabilityManager.h; path = "cordova-plugin-advanced-http/AFNetworkReachabilityManager.h"; sourceTree = ""; }; 6D5F2FFCAD8E4A4392B781A3 /* UIKit.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 6DC53FCFEEFD4EC89C2073E0 /* TextRequestSerializer.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = TextRequestSerializer.h; path = "cordova-plugin-advanced-http/TextRequestSerializer.h"; sourceTree = ""; }; 6FEED8E986814AC1AC60FC28 /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFNetworkReachabilityManager.m; path = "cordova-plugin-advanced-http/AFNetworkReachabilityManager.m"; sourceTree = ""; }; 7601E9450D7240078C98ED9D /* CordovaHttpPlugin.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CordovaHttpPlugin.h; path = "cordova-plugin-advanced-http/CordovaHttpPlugin.h"; sourceTree = ""; }; + 7DC7711D3C76485B9E422E3A /* CDVWKProcessPoolFactory.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVWKProcessPoolFactory.h; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h"; sourceTree = ""; }; 7E931FBE72E74C4887498E5F /* AFURLSessionManager.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFURLSessionManager.h; path = "cordova-plugin-advanced-http/AFURLSessionManager.h"; sourceTree = ""; }; 80B448E71F8941268B78692C /* CDVCamera.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVCamera.m; path = "cordova-plugin-camera/CDVCamera.m"; sourceTree = ""; }; 8895AD78E31D471583178B91 /* TextResponseSerializer.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = TextResponseSerializer.h; path = "cordova-plugin-advanced-http/TextResponseSerializer.h"; sourceTree = ""; }; @@ -188,13 +195,7 @@ FC8EA7F3637547AD8BC62127 /* JPushDefine.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = JPushDefine.h; path = "jpush-phonegap-plugin/JPushDefine.h"; sourceTree = ""; }; FCC7E279D80D4FB9BCF2530A /* Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "cordova-plugin-fingerprint-aio/Bridging-Header.h"; sourceTree = ""; }; FDEE8379D7A34C55A616F700 /* AFURLResponseSerialization.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFURLResponseSerialization.m; path = "cordova-plugin-advanced-http/AFURLResponseSerialization.m"; sourceTree = ""; }; - 59FDAA2CEE4540A3913846E4 /* CDVWKWebViewEngine.m */ = {isa = PBXFileReference; name = "CDVWKWebViewEngine.m"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; - 3B73EA28E46846FF84E6AF02 /* CDVWKWebViewUIDelegate.m */ = {isa = PBXFileReference; name = "CDVWKWebViewUIDelegate.m"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; - 473FEFEEBB2C4F5EAF594EBD /* CDVWKProcessPoolFactory.m */ = {isa = PBXFileReference; name = "CDVWKProcessPoolFactory.m"; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; - 648BD3182CD64A77AD2D447B /* CDVWKWebViewEngine.h */ = {isa = PBXFileReference; name = "CDVWKWebViewEngine.h"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; - 1E5CB6025B2E4D14ABFDB037 /* CDVWKWebViewUIDelegate.h */ = {isa = PBXFileReference; name = "CDVWKWebViewUIDelegate.h"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; - 7DC7711D3C76485B9E422E3A /* CDVWKProcessPoolFactory.h */ = {isa = PBXFileReference; name = "CDVWKProcessPoolFactory.h"; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; - FE0B455916A4481681D59FE0 /* WebKit.framework */ = {isa = PBXFileReference; name = "WebKit.framework"; path = "System/Library/Frameworks/WebKit.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; + FE0B455916A4481681D59FE0 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ diff --git a/platforms/ios/dlapp/config.xml b/platforms/ios/dlapp/config.xml index 89c5991..14bae9c 100755 --- a/platforms/ios/dlapp/config.xml +++ b/platforms/ios/dlapp/config.xml @@ -1,5 +1,5 @@ - + diff --git a/platforms/ios/dlapp/dlapp-Info.plist b/platforms/ios/dlapp/dlapp-Info.plist index fc16293..6fbc115 100644 --- a/platforms/ios/dlapp/dlapp-Info.plist +++ b/platforms/ios/dlapp/dlapp-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.0.4 + 1.0.5 LSRequiresIPhoneOS NSAppTransportSecurity @@ -40,11 +40,13 @@ NSCameraUsageDescription APP需要使用您的相机权限，没有该权限将无法完成扫一扫功能 NSFaceIDUsageDescription - + NSMainNibFile - + NSMainNibFile~ipad - + + NSPhotoLibraryUsageDescription + APP需要使用您的相册权限，没有该权限将无法完成扫一扫功能 UIBackgroundModes remote-notification @@ -67,7 +69,5 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown - NSPhotoLibraryUsageDescription - APP需要使用您的相册权限，没有该权限将无法完成扫一扫功能 - \ No newline at end of file + diff --git a/www/js/scan.js b/www/js/scan.js index bb0a001..f331281 100644 --- a/www/js/scan.js +++ b/www/js/scan.js @@ -33,13 +33,11 @@ var app = { } else { // The scan completed, display the contents of the QR code: QRScanner.destroy(); - $.alert(text, '提示'); showRet(text); } } //开始扫描，需要将页面的背景设置成透明 QRScanner.show(); - console.log("QRScanner.scan"); } else if (status.denied) { // The video preview will remain black, and scanning is disabled. We can // try to ask the user to change their mind, but we'll have to send them @@ -66,24 +64,57 @@ var app = { }); }, goPage: function() { - QRScanner.destroy(); + //QRScanner.destroy(); window.location = "main.html" } }; app.initialize(); -var inAppBrowserRef; +function showRet1(url){ + if(isEmpty(url)){ + return; + } + var userid = window.localStorage.getItem("userid"); + if (url.indexOf("yy.dlsmk.cn")>=0) { + if(url.indexOf("?")>0){ + url=url+'&userid='+userid; + }else{ + url=url+'?userid='+userid; + } + } + var ref = cordova.InAppBrowser.open(url, '_blank',"location=yes,beforeload=yes"); + ref.addEventListener('loadstart', function(params){ + if (params.url.indexOf("yy.dlsmk.cn")>=0) { + if (params.url.indexOf("userid")<0) { + if(params.url.indexOf("?")>0){ + params.url=params.url+'&userid='+userid; + }else{ + params.url=params.url+'?userid='+userid; + } + ref.hide(); + var neRef = cordova.InAppBrowser.open(params.url, '_blank',"location=yes,beforeload=yes"); + neRef.addEventListener('exit', function(e){ + ref.close(); + window.location = "main.html" + }); + } + } + }); +} + function showRet(url) { if(isEmpty(url)){ return; } var userid = window.localStorage.getItem("userid"); - if(url.indexOf("?")>0){ - url=url+'&userid='+userid; - }else{ - url=url+'?userid='+userid; + if (url.indexOf("yy.dlsmk.cn")>=0) { + if(url.indexOf("?")>0){ + url=url+'&userid='+userid; + }else{ + url=url+'?userid='+userid; + } } console.log(url) - inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', { + var inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', { statusbar: { color: '#03a9f4ff' }, @@ -108,19 +139,25 @@ function showRet(url) { event: 'closePressed' }, backButtonCanClose: true - }).addEventListener('backPressed', function(e) { - //alert('back pressed'); - }).addEventListener('closePressed', function(e) { - //alert('closePressed pressed'); - inAppBrowserRef.close(); - window.location = "main.html" - }).addEventListener(cordova.ThemeableBrowser.EVT_ERR, function(e) { - console.error(e.message); - }).addEventListener(cordova.ThemeableBrowser.EVT_WRN, function(e) { - console.log(e.message); - }); - inAppBrowserRef.addEventListener('loadstart', loadStartCallBack); - inAppBrowserRef.addEventListener('beforeload', beforeloadCallBack); + }).addEventListener('loadstart', function(params){ + if (params.url.indexOf("yy.dlsmk.cn")>=0) { + if (params.url.indexOf("userid")<0) { + if(params.url.indexOf("?")>0){ + params.url=params.url+'&userid='+userid; + }else{ + params.url=params.url+'?userid='+userid; + } + //ref.hide(); + var neRef = cordova.ThemeableBrowser.open(params.url, '_blank'); + neRef.addEventListener('closePressed', function(e){ + neRef.close(); + window.location = "main.html" + }); + } + } + }); + //inAppBrowserRef.addEventListener('loadstart', loadStartCallBack); + //inAppBrowserRef.addEventListener('beforeload', beforeloadCallBack); } function loadStartCallBack(params,callback) { console.log("1",params.url);