From: qiaowei Date: Thu, 5 Dec 2019 03:40:00 +0000 (+0800) Subject: 解约、解绑 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=8055aa750936353ded5e7d587b33e2741ffabe52;p=dali_platform%2Fmobile.git 解约、解绑 --- diff --git a/config.xml b/config.xml index b657713..2eab5ec 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 7f29550..e358ecb 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ }, "cordova-plugin-app-version": {}, "cordova-plugin-wkwebview-engine": {}, - "cordova-plugin-brightness": {} + "cordova-plugin-brightness": {}, + "cordova-plugin-file": {} }, "platforms": [ "android", diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle index 41524d3..13c0960 100644 --- a/platforms/android/app/build.gradle +++ b/platforms/android/app/build.gradle @@ -165,23 +165,22 @@ task cdvPrintProps { android { defaultConfig { - applicationId privateHelpers.extractStringFromManifest("package") + applicationId 'com.dalicitycard.app' if (cdvMinSdkVersion != null) { minSdkVersion cdvMinSdkVersion } - minSdkVersion 24 + minSdkVersion 23 ndk { abiFilters "armeabi" } - versionCode 10 - versionName '1.3.6' - versionNameSuffix 'v1' + versionCode 11 + versionName '1.3.7' targetSdkVersion 26 } lintOptions { - abortOnError false; + abortOnError false } - compileSdkVersion 24 + compileSdkVersion 26 buildToolsVersion '28.0.3' // This code exists for Crosswalk and other Native APIs. // By default, we multiply the existing version code in the diff --git a/platforms/android/app/release/app-release.apk b/platforms/android/app/release/app-release.apk index be551b3..e3b9bf3 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/release/output.json b/platforms/android/app/release/output.json index 8aa304e..67e22e8 100644 --- a/platforms/android/app/release/output.json +++ b/platforms/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.3.6v1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"1.3.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml index 93b3137..4591837 100644 --- a/platforms/android/app/src/main/AndroidManifest.xml +++ b/platforms/android/app/src/main/AndroidManifest.xml @@ -91,7 +91,6 @@ - @@ -104,4 +103,5 @@ + diff --git a/platforms/android/app/src/main/assets/www/cordova_plugins.js b/platforms/android/app/src/main/assets/www/cordova_plugins.js index 951ded8..fb0347b 100644 --- a/platforms/android/app/src/main/assets/www/cordova_plugins.js +++ b/platforms/android/app/src/main/assets/www/cordova_plugins.js @@ -343,6 +343,38 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "clobbers": [ "cordova.plugins.brightness" ] + }, + { + "id": "cordova-plugin-file-opener2.FileOpener2", + "file": "plugins/cordova-plugin-file-opener2/www/plugins.FileOpener2.js", + "pluginId": "cordova-plugin-file-opener2", + "clobbers": [ + "cordova.plugins.fileOpener2" + ] + }, + { + "id": "cordova-plugin-file-transfer.FileTransferError", + "file": "plugins/cordova-plugin-file-transfer/www/FileTransferError.js", + "pluginId": "cordova-plugin-file-transfer", + "clobbers": [ + "window.FileTransferError" + ] + }, + { + "id": "cordova-plugin-file-transfer.FileTransfer", + "file": "plugins/cordova-plugin-file-transfer/www/FileTransfer.js", + "pluginId": "cordova-plugin-file-transfer", + "clobbers": [ + "window.FileTransfer" + ] + }, + { + "id": "cordova-plugin-crop.CropPlugin", + "file": "plugins/cordova-plugin-crop/www/crop.js", + "pluginId": "cordova-plugin-crop", + "clobbers": [ + "plugins.crop" + ] } ]; module.exports.metadata = { @@ -363,6 +395,9 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "jpush-phonegap-plugin": "3.7.2", "cordova-plugin-app-version": "0.1.9", "cordova-plugin-wkwebview-engine": "1.2.1", - "cordova-plugin-brightness": "0.1.5" + "cordova-plugin-brightness": "0.1.5", + "cordova-plugin-file-opener2": "2.2.1", + "cordova-plugin-file-transfer": "1.7.1", + "cordova-plugin-crop": "0.3.1" }; }); \ No newline at end of file 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 e0a358f..9d3b017 100644 --- a/platforms/android/app/src/main/assets/www/js/main.js +++ b/platforms/android/app/src/main/assets/www/js/main.js @@ -328,6 +328,10 @@ var app = { } else { window.location = 'cardinfor.html' } + }, + logout:function(){ + window.localStorage.removeItem("token"); + window.location = "login.html"; } }; app.initialize(); diff --git a/platforms/android/app/src/main/assets/www/js/qrcode.js b/platforms/android/app/src/main/assets/www/js/qrcode.js index 79ae312..b9d81b9 100644 --- a/platforms/android/app/src/main/assets/www/js/qrcode.js +++ b/platforms/android/app/src/main/assets/www/js/qrcode.js @@ -88,7 +88,7 @@ var app = { console.log(e) }); } - window,location.href='main.html'; + window.location.href='main.html'; } }; app.initialize(); \ No newline at end of file diff --git a/platforms/android/app/src/main/assets/www/js/server.js b/platforms/android/app/src/main/assets/www/js/server.js index 64a6da6..0674e1a 100644 --- a/platforms/android/app/src/main/assets/www/js/server.js +++ b/platforms/android/app/src/main/assets/www/js/server.js @@ -7,6 +7,13 @@ var CURRENT_INDEX=1; if (dev) { SERVER = "http://172.28.43.7:8099/payapi/mobileapi"; } +function V1Unbindcard(param,callback){ + ajaxPost("/v1/unbindcard", param, callback) +} + +function V1UnSignbxy(param,callback){ + ajaxPost("/v1/unsignbxy", param, callback) +} function V1Qrcode(callback) { ajaxPost("/v1/qrcode", {}, callback) @@ -76,7 +83,6 @@ function IGetCode(param,callback) { ajaxPost("/i/code", param, callback) } - function IServeTime(callback) { ajaxPost("/i/time", {}, callback) } diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html index 3ade7e7..79e824b 100644 --- a/platforms/android/app/src/main/assets/www/main.html +++ b/platforms/android/app/src/main/assets/www/main.html @@ -177,7 +177,8 @@
我的
-
+ +
-
-
-
- 0.00 -
余额
-
-
- 0 -
积分
-
-
- 0 -
优惠券
-
-
-
- +
    @@ -242,6 +242,9 @@
+