From 22e23f87b12458d2a2082f95dee7ccd0ddc943f9 Mon Sep 17 00:00:00 2001 From: qiaowei Date: Thu, 26 Sep 2019 11:15:57 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E5=AE=89=E5=8D=93=E6=89=AB?= =?utf8?q?=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config.xml | 15 +- package-lock.json | 12 +- package.json | 10 +- .../android/CordovaLib/AndroidManifest.xml | 1 - platforms/android/CordovaLib/CordovaLib.iml | 1 + platforms/android/android.json | 34 +- platforms/android/app/app.iml | 5 + platforms/android/app/build.gradle | 66 +- platforms/android/app/release/app-release.apk | Bin 0 -> 3290716 bytes platforms/android/app/release/output.json | 1 + .../android/app/src/main/AndroidManifest.xml | 6 +- .../app/src/main/assets/www/billdetail.html | 2 +- .../src/main/assets/www/cordova_plugins.js | 12 +- .../app/src/main/assets/www/js/billdetail.js | 3 +- .../app/src/main/assets/www/js/index.js | 11 +- .../app/src/main/assets/www/js/login.js | 4 +- .../app/src/main/assets/www/js/main.js | 78 +- .../app/src/main/assets/www/js/register.js | 1 - .../app/src/main/assets/www/js/scan.js | 112 ++- .../app/src/main/assets/www/js/server.js | 7 +- .../app/src/main/assets/www/register.html | 2 +- .../app/src/main/assets/www/security.html | 2 +- .../bitpay/cordova/qrscanner/QRScanner.java | 98 ++- .../app}/MainActivity.java | 2 +- .../com/visionsmarts/VSBarcodeReader.java | 90 ++ .../java/com/visionsmarts/VSReaderQR.java | 190 +++++ .../pic2shop/view/BarQrCodeUtil.java | 27 + .../pic2shop/view/ScannerLiveView.java | 784 ++++++++++++++++++ .../pic2shop/view/ScannerLiveViewLiner.java | 601 ++++++++++++++ .../pic2shop/view/ScannerOverlay.java | 124 +++ .../co/whiteoctober/cordova/AppVersion.java | 45 + .../jniLibs/armeabi/libVSBarcodeReader.so | Bin 0 -> 448532 bytes .../src/main/jniLibs/armeabi/libVSReaderQR.so | Bin 0 -> 63684 bytes .../app/src/main/res/drawable/back.png | Bin 0 -> 370 bytes .../app/src/main/res/drawable/close.png | Bin 0 -> 306 bytes .../android/app/src/main/res/xml/config.xml | 9 +- .../dlapp-qrscanner.gradle | 4 +- .../android/platform_www/cordova_plugins.js | 12 +- .../www/AppVersionPlugin.js | 68 ++ platforms/browser/browser.json | 28 +- platforms/browser/config.xml | 5 +- .../browser/platform_www/cordova_plugins.js | 12 +- .../www/AppVersionPlugin.js | 67 ++ platforms/ios/dlapp.xcarchive/Info.plist | 12 +- .../dlapp.app/AppIcon20x20@2x.png | Bin 2212 -> 714 bytes .../dlapp.app/AppIcon20x20@2x~ipad.png | Bin 2212 -> 714 bytes .../dlapp.app/AppIcon20x20@3x.png | Bin 3326 -> 802 bytes .../dlapp.app/AppIcon20x20~ipad.png | Bin 1230 -> 620 bytes .../Applications/dlapp.app/AppIcon29x29.png | Bin 736 -> 661 bytes .../dlapp.app/AppIcon29x29@2x.png | Bin 1602 -> 796 bytes .../dlapp.app/AppIcon29x29@2x~ipad.png | Bin 1602 -> 796 bytes .../dlapp.app/AppIcon29x29@3x.png | Bin 2368 -> 1141 bytes .../dlapp.app/AppIcon29x29~ipad.png | Bin 736 -> 661 bytes .../dlapp.app/AppIcon40x40@2x.png | Bin 5077 -> 1034 bytes .../dlapp.app/AppIcon40x40@2x~ipad.png | Bin 5077 -> 1034 bytes .../dlapp.app/AppIcon40x40@3x.png | Bin 7823 -> 1327 bytes .../dlapp.app/AppIcon40x40~ipad.png | Bin 2212 -> 714 bytes .../dlapp.app/AppIcon50x50@2x~ipad.png | Bin 6463 -> 0 bytes .../dlapp.app/AppIcon50x50~ipad.png | Bin 2882 -> 0 bytes .../Applications/dlapp.app/AppIcon57x57.png | Bin 3342 -> 0 bytes .../dlapp.app/AppIcon57x57@2x.png | Bin 7478 -> 0 bytes .../dlapp.app/AppIcon60x60@2x.png | Bin 7823 -> 1327 bytes .../dlapp.app/AppIcon60x60@3x.png | Bin 12491 -> 1819 bytes .../dlapp.app/AppIcon72x72@2x~ipad.png | Bin 9545 -> 0 bytes .../dlapp.app/AppIcon72x72~ipad.png | Bin 4661 -> 0 bytes .../dlapp.app/AppIcon76x76@2x~ipad.png | Bin 10206 -> 1635 bytes .../dlapp.app/AppIcon76x76~ipad.png | Bin 4817 -> 1042 bytes .../dlapp.app/AppIcon83.5x83.5@2x~ipad.png | Bin 11313 -> 1691 bytes .../Applications/dlapp.app/Assets.car | Bin 290696 -> 71928 bytes .../Frameworks/libswiftAVFoundation.dylib | Bin 665936 -> 665936 bytes .../dlapp.app/Frameworks/libswiftCore.dylib | Bin 23297568 -> 23297568 bytes .../Frameworks/libswiftCoreAudio.dylib | Bin 408608 -> 408592 bytes .../Frameworks/libswiftCoreFoundation.dylib | Bin 335280 -> 335280 bytes .../Frameworks/libswiftCoreGraphics.dylib | Bin 857648 -> 857632 bytes .../Frameworks/libswiftCoreImage.dylib | Bin 335072 -> 335072 bytes .../Frameworks/libswiftCoreMedia.dylib | Bin 400112 -> 400112 bytes .../dlapp.app/Frameworks/libswiftDarwin.dylib | Bin 499744 -> 499728 bytes .../Frameworks/libswiftDispatch.dylib | Bin 1377360 -> 1377360 bytes .../Frameworks/libswiftFoundation.dylib | Bin 11552336 -> 11552320 bytes .../dlapp.app/Frameworks/libswiftMetal.dylib | Bin 395696 -> 395696 bytes .../Frameworks/libswiftObjectiveC.dylib | Bin 400112 -> 400112 bytes .../Frameworks/libswiftQuartzCore.dylib | Bin 338256 -> 338256 bytes .../libswiftSwiftOnoneSupport.dylib | Bin 1610592 -> 1610592 bytes .../dlapp.app/Frameworks/libswiftUIKit.dylib | Bin 655616 -> 655616 bytes .../dlapp.app/Frameworks/libswiftos.dylib | Bin 396976 -> 396960 bytes .../dlapp.app/Frameworks/libswiftsimd.dylib | Bin 1323760 -> 1323760 bytes .../Applications/dlapp.app/Info.plist | Bin 2262 -> 2366 bytes .../Applications/dlapp.app/JPushConfig.plist | Bin 0 -> 146 bytes .../dlapp.app/MainViewController.nib | Bin 943 -> 943 bytes .../dlapp.app/_CodeSignature/CodeResources | 485 ++++++----- .../Applications/dlapp.app/config.xml | 15 +- .../Products/Applications/dlapp.app/dlapp | Bin 2034256 -> 4086384 bytes .../dlapp.app/embedded.mobileprovision | Bin 16767 -> 9510 bytes .../dlapp.app/www/billdetail.html | 2 +- .../dlapp.app/www/cordova_plugins.js | 38 +- .../dlapp.app/www/js/billdetail.js | 3 +- .../Applications/dlapp.app/www/js/index.js | 11 +- .../Applications/dlapp.app/www/js/login.js | 4 +- .../Applications/dlapp.app/www/js/main.js | 87 +- .../Applications/dlapp.app/www/js/qrcode.js | 61 +- .../Applications/dlapp.app/www/js/register.js | 1 - .../Applications/dlapp.app/www/js/scan.js | 4 +- .../Applications/dlapp.app/www/js/security.js | 11 +- .../Applications/dlapp.app/www/js/server.js | 10 +- .../www/AppVersionPlugin.js | 68 ++ .../src/www/ios/ios-wkwebview-exec.js | 177 ++++ .../src/www/ios/ios-wkwebview.js | 33 + .../jpush-phonegap-plugin/www/JPushPlugin.js | 489 +++++++++++ .../Applications/dlapp.app/www/qrcode.html | 8 +- .../Applications/dlapp.app/www/register.html | 2 +- .../Applications/dlapp.app/www/security.html | 11 +- platforms/ios/dlapp.xcodeproj/project.pbxproj | 151 ++-- .../AppIcon.appiconset/AppIcon24x24@2x.png | Bin 2721 -> 0 bytes .../AppIcon27.5x27.5@2x.png | Bin 3298 -> 0 bytes .../AppIcon.appiconset/AppIcon29x29@2x.png | Bin 3433 -> 0 bytes .../AppIcon.appiconset/AppIcon29x29@3x.png | Bin 5476 -> 0 bytes .../AppIcon.appiconset/AppIcon40x40@2x.png | Bin 4947 -> 0 bytes .../AppIcon.appiconset/AppIcon44x44@2x.png | Bin 5331 -> 0 bytes .../AppIcon.appiconset/AppIcon86x86@2x.png | Bin 10991 -> 0 bytes .../AppIcon.appiconset/AppIcon98x98@2x.png | Bin 12663 -> 0 bytes .../AppIcon.appiconset/Contents.json | 365 +++----- .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 647 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 881 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 1071 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 712 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 1052 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 1523 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 881 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 1356 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 1996 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 1996 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 2997 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 1356 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 2513 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 2726 bytes .../AppIcon.appiconset/ItunesArtwork@2x.png | Bin 0 -> 24404 bytes .../AppIcon.appiconset/icon-1024.png | Bin 108294 -> 0 bytes .../AppIcon.appiconset/icon-20.png | Bin 1203 -> 0 bytes .../AppIcon.appiconset/icon-20@2x.png | Bin 2262 -> 0 bytes .../AppIcon.appiconset/icon-20@3x.png | Bin 3556 -> 0 bytes .../AppIcon.appiconset/icon-24@2x.png | Bin 1136 -> 0 bytes .../AppIcon.appiconset/icon-27.5@2x.png | Bin 1325 -> 0 bytes .../AppIcon.appiconset/icon-29.png | Bin 723 -> 0 bytes .../AppIcon.appiconset/icon-29@2x.png | Bin 1367 -> 0 bytes .../AppIcon.appiconset/icon-29@3x.png | Bin 2065 -> 0 bytes .../AppIcon.appiconset/icon-40.png | Bin 2262 -> 0 bytes .../AppIcon.appiconset/icon-40@2x.png | Bin 4947 -> 0 bytes .../AppIcon.appiconset/icon-44@2x.png | Bin 2069 -> 0 bytes .../AppIcon.appiconset/icon-50.png | Bin 2956 -> 0 bytes .../AppIcon.appiconset/icon-50@2x.png | Bin 6212 -> 0 bytes .../AppIcon.appiconset/icon-60@2x.png | Bin 7557 -> 0 bytes .../AppIcon.appiconset/icon-60@3x.png | Bin 11736 -> 0 bytes .../AppIcon.appiconset/icon-72.png | Bin 4452 -> 0 bytes .../AppIcon.appiconset/icon-72@2x.png | Bin 9168 -> 0 bytes .../AppIcon.appiconset/icon-76.png | Bin 4681 -> 0 bytes .../AppIcon.appiconset/icon-76@2x.png | Bin 9610 -> 0 bytes .../AppIcon.appiconset/icon-83.5@2x.png | Bin 10797 -> 0 bytes .../AppIcon.appiconset/icon-86@2x.png | Bin 4022 -> 0 bytes .../AppIcon.appiconset/icon-98@2x.png | Bin 4744 -> 0 bytes .../AppIcon.appiconset/icon-small.png | Bin 1512 -> 0 bytes .../AppIcon.appiconset/icon-small@2x.png | Bin 3433 -> 0 bytes .../AppIcon.appiconset/icon-small@3x.png | Bin 5476 -> 0 bytes .../AppIcon.appiconset/icon.png | Bin 3446 -> 0 bytes .../AppIcon.appiconset/icon@2x.png | Bin 7186 -> 0 bytes .../cordova-plugin-app-version/AppVersion.h | 13 + .../cordova-plugin-app-version/AppVersion.m | 47 ++ .../CDVWKProcessPoolFactory.h | 27 + .../CDVWKProcessPoolFactory.m | 49 ++ .../CDVWKWebViewEngine.h | 29 + .../CDVWKWebViewEngine.m | 494 +++++++++++ .../CDVWKWebViewUIDelegate.h | 28 + .../CDVWKWebViewUIDelegate.m | 123 +++ .../ios/dlapp/Resources/JPushConfig.plist | 2 +- platforms/ios/dlapp/config.xml | 12 +- platforms/ios/dlapp/dlapp-Info.plist | 14 +- platforms/ios/frameworks.json | 3 +- platforms/ios/ios.json | 58 +- platforms/ios/platform_www/cordova_plugins.js | 28 +- .../www/AppVersionPlugin.js | 68 ++ .../src/www/ios/ios-wkwebview-exec.js | 177 ++++ .../src/www/ios/ios-wkwebview.js | 33 + plugins/android.json | 8 +- plugins/browser.json | 6 + plugins/cordova-plugin-app-version/LICENSE | 20 + plugins/cordova-plugin-app-version/VERSION | 1 + .../cordova-plugin-app-version/package.json | 54 ++ plugins/cordova-plugin-app-version/plugin.xml | 79 ++ .../src/android/AppVersion.java | 45 + .../src/ios/AppVersion.h | 13 + .../src/ios/AppVersion.m | 47 ++ .../src/windows/AppVersionProxy.js | 33 + .../src/wp8/AppVersion.cs | 53 ++ .../www/AppVersionPlugin.js | 65 ++ .../www/blackberry10/AppVersionProxy.js | 18 + .../cordova-plugin-wkwebview-engine/LICENSE | 202 +++++ .../cordova-plugin-wkwebview-engine/NOTICE | 5 + .../package.json | 72 ++ .../plugin.xml | 63 ++ .../src/ios/CDVWKProcessPoolFactory.h | 27 + .../src/ios/CDVWKProcessPoolFactory.m | 49 ++ .../src/ios/CDVWKWebViewEngine.h | 29 + .../src/ios/CDVWKWebViewEngine.m | 494 +++++++++++ .../src/ios/CDVWKWebViewUIDelegate.h | 28 + .../src/ios/CDVWKWebViewUIDelegate.m | 123 +++ .../src/www/ios/ios-wkwebview-exec.js | 174 ++++ .../src/www/ios/ios-wkwebview.js | 30 + .../contents.xcworkspacedata | 7 + .../CDVWKWebViewEngineTest.xccheckout | 41 + .../xcschemes/CordovaLib.xcscheme | 80 ++ .../CDVWKWebViewEngineTest.m | 240 ++++++ .../CDVWKWebViewEngineLibTests/Info.plist | 24 + .../project.pbxproj | 559 +++++++++++++ .../contents.xcworkspacedata | 7 + .../CDVWKWebViewEngineTest.xccheckout | 41 + .../xcschemes/CDVWKWebViewEngineLib.xcscheme | 80 ++ .../CDVWKWebViewEngineLibTests.xcscheme | 104 +++ .../tests/ios/package.json | 13 + .../tests/ios/test.xcconfig | 20 + .../tests/package.json | 14 + .../tests/plugin.xml | 29 + .../tests/tests.js | 44 + plugins/fetch.json | 18 +- plugins/ios.json | 8 +- www/billdetail.html | 2 +- www/js/billdetail.js | 3 +- www/js/index.js | 14 +- www/js/login.js | 4 +- www/js/main.js | 87 +- www/js/register.js | 1 - www/js/scan.js | 9 +- www/js/server.js | 7 +- www/register.html | 2 +- www/security.html | 2 +- 233 files changed, 8209 insertions(+), 793 deletions(-) create mode 100644 platforms/android/app/release/app-release.apk create mode 100644 platforms/android/app/release/output.json rename platforms/android/app/src/main/java/com/{supwisdom/dlapp => dalicitycard/app}/MainActivity.java (97%) create mode 100644 platforms/android/app/src/main/java/com/visionsmarts/VSBarcodeReader.java create mode 100644 platforms/android/app/src/main/java/com/visionsmarts/VSReaderQR.java create mode 100644 platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/BarQrCodeUtil.java create mode 100644 platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveView.java create mode 100644 platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveViewLiner.java create mode 100644 platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerOverlay.java create mode 100644 platforms/android/app/src/main/java/uk/co/whiteoctober/cordova/AppVersion.java create mode 100644 platforms/android/app/src/main/jniLibs/armeabi/libVSBarcodeReader.so create mode 100644 platforms/android/app/src/main/jniLibs/armeabi/libVSReaderQR.so create mode 100644 platforms/android/app/src/main/res/drawable/back.png create mode 100644 platforms/android/app/src/main/res/drawable/close.png create mode 100644 platforms/android/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js create mode 100644 platforms/browser/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js delete mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50@2x~ipad.png delete mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50~ipad.png delete mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57.png delete mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57@2x.png delete mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72@2x~ipad.png delete mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72~ipad.png create mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/JPushConfig.plist create mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js create mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js create mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js create mode 100644 platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/jpush-phonegap-plugin/www/JPushPlugin.js delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon24x24@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon27.5x27.5@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon44x44@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon86x86@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon98x98@2x.png mode change 100644 => 100755 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-1024.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@3x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-24@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-27.5@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@3x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-44@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@3x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-86@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-98@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@2x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@3x.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon.png delete mode 100644 platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon@2x.png create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.h create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.m create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.h create mode 100644 platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.m create mode 100644 platforms/ios/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js create mode 100644 platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js create mode 100644 platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js create mode 100644 plugins/cordova-plugin-app-version/LICENSE create mode 100644 plugins/cordova-plugin-app-version/VERSION create mode 100644 plugins/cordova-plugin-app-version/package.json create mode 100644 plugins/cordova-plugin-app-version/plugin.xml create mode 100644 plugins/cordova-plugin-app-version/src/android/AppVersion.java create mode 100644 plugins/cordova-plugin-app-version/src/ios/AppVersion.h create mode 100644 plugins/cordova-plugin-app-version/src/ios/AppVersion.m create mode 100644 plugins/cordova-plugin-app-version/src/windows/AppVersionProxy.js create mode 100644 plugins/cordova-plugin-app-version/src/wp8/AppVersion.cs create mode 100644 plugins/cordova-plugin-app-version/www/AppVersionPlugin.js create mode 100644 plugins/cordova-plugin-app-version/www/blackberry10/AppVersionProxy.js create mode 100644 plugins/cordova-plugin-wkwebview-engine/LICENSE create mode 100644 plugins/cordova-plugin-wkwebview-engine/NOTICE create mode 100644 plugins/cordova-plugin-wkwebview-engine/package.json create mode 100644 plugins/cordova-plugin-wkwebview-engine/plugin.xml create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.h create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.m create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.h create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.m create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.h create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.m create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js create mode 100644 plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/contents.xcworkspacedata create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/CDVWKWebViewEngineTest.m create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/Info.plist create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLib.xcscheme create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLibTests.xcscheme create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/package.json create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/ios/test.xcconfig create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/package.json create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/plugin.xml create mode 100644 plugins/cordova-plugin-wkwebview-engine/tests/tests.js diff --git a/config.xml b/config.xml index 4b754cd..4a21478 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + dlapp A sample Apache Cordova application that responds to the deviceready event. @@ -28,6 +28,7 @@ + @@ -41,6 +42,14 @@ APP需要使用您的相机权限，没有该权限将无法完成扫一扫功能 + + APP需要使用您的相册权限，没有该权限将无法完成扫一扫功能 + + + + + + @@ -58,4 +67,8 @@ + + + + diff --git a/package-lock.json b/package-lock.json index 092a907..ad4f7f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "com.supwisdom.dlapp", - "version": "1.0.0", + "version": "1.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -269,6 +269,11 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-2.1.1.tgz", "integrity": "sha512-C8NQ5+PsUOqDCEzlhhTP9pIHizK/O9rVcdNU3+psfU/4mg5heiEVj/E3AS2TSjMo2wef1xw8yempSKETzuRGig==" }, + "cordova-plugin-app-version": { + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.9.tgz", + "integrity": "sha1-nbBgeGMzenEEiTAuX1CpBPFEm9s=" + }, "cordova-plugin-camera": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-4.0.3.tgz", @@ -337,6 +342,11 @@ "integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=", "dev": true }, + "cordova-plugin-wkwebview-engine": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-engine/-/cordova-plugin-wkwebview-engine-1.2.1.tgz", + "integrity": "sha512-usp6pu+tJ1y0btVAXOjE5+tMjbvTY6hsiLfHJPMdyzkgHvxoNSePZ/NavTGj4CBJJlUjnMsN3TUq25+SeTZCow==" + }, "cordova-serve": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz", diff --git a/package.json b/package.json index 4ca4c6f..649c3ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.supwisdom.dlapp", "displayName": "大理市民卡", - "version": "1.0.0", + "version": "1.0.3", "description": "A sample Apache Cordova application that responds to the deviceready event.", "main": "index.js", "scripts": { @@ -17,6 +17,7 @@ "cordova-browser": "^6.0.0", "cordova-ios": "^5.0.1", "cordova-plugin-advanced-http": "^2.1.1", + "cordova-plugin-app-version": "^0.1.9", "cordova-plugin-camera": "^4.0.3", "cordova-plugin-device": "^2.0.2", "cordova-plugin-disable-ios11-statusbar": "^1.0.0", @@ -28,6 +29,7 @@ "cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-themeablebrowser": "^0.2.18", "cordova-plugin-touch-id": "^3.4.0", + "cordova-plugin-wkwebview-engine": "^1.2.1", "jpush-phonegap-plugin": "^3.7.2" }, "cordova": { @@ -48,9 +50,11 @@ "cordova-plugin-device": {}, "cordova-plugin-themeablebrowser": {}, "jpush-phonegap-plugin": { - "APP_KEY": "bd22b85f247a6e2ca307d3c5", + "APP_KEY": "d644d997f2cab0551ff704a3", "CHANNEL": "developer-default" - } + }, + "cordova-plugin-app-version": {}, + "cordova-plugin-wkwebview-engine": {} }, "platforms": [ "android", diff --git a/platforms/android/CordovaLib/AndroidManifest.xml b/platforms/android/CordovaLib/AndroidManifest.xml index 1625b89..320c253 100755 --- a/platforms/android/CordovaLib/AndroidManifest.xml +++ b/platforms/android/CordovaLib/AndroidManifest.xml @@ -19,5 +19,4 @@ --> - diff --git a/platforms/android/CordovaLib/CordovaLib.iml b/platforms/android/CordovaLib/CordovaLib.iml index b80b08f..da4f936 100644 --- a/platforms/android/CordovaLib/CordovaLib.iml +++ b/platforms/android/CordovaLib/CordovaLib.iml @@ -15,6 +15,7 @@ generateDebugSources