修改屏幕亮度和图标
diff --git a/platforms/android/android.json b/platforms/android/android.json
index 476c50e..2b20a7d 100644
--- a/platforms/android/android.json
+++ b/platforms/android/android.json
@@ -59,6 +59,10 @@
{
"xml": "<feature name=\"AppVersion\"><param name=\"android-package\" value=\"uk.co.whiteoctober.cordova.AppVersion\" /></feature>",
"count": 1
+ },
+ {
+ "xml": "<feature name=\"Brightness\"><param name=\"android-package\" value=\"org.apache.cordova.plugin.Brightness.BrightnessPlugin\" /></feature>",
+ "count": 1
}
]
}
@@ -307,6 +311,9 @@
},
"cordova-plugin-wkwebview-engine": {
"PACKAGE_NAME": "com.dalicitycard.app"
+ },
+ "cordova-plugin-brightness": {
+ "PACKAGE_NAME": "com.dalicitycard.app"
}
},
"dependent_plugins": {},
@@ -646,6 +653,14 @@
"clobbers": [
"cordova.getAppVersion"
]
+ },
+ {
+ "id": "cordova-plugin-brightness.Brightness",
+ "file": "plugins/cordova-plugin-brightness/www/brightness.js",
+ "pluginId": "cordova-plugin-brightness",
+ "clobbers": [
+ "cordova.plugins.brightness"
+ ]
}
],
"plugin_metadata": {
@@ -665,6 +680,7 @@
"cordova-plugin-jcore": "1.3.0",
"jpush-phonegap-plugin": "3.7.2",
"cordova-plugin-app-version": "0.1.9",
- "cordova-plugin-wkwebview-engine": "1.2.1"
+ "cordova-plugin-wkwebview-engine": "1.2.1",
+ "cordova-plugin-brightness": "0.1.5"
}
}
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
index 5b518d8..41524d3 100644
--- a/platforms/android/app/build.gradle
+++ b/platforms/android/app/build.gradle
@@ -268,9 +268,9 @@
dependencies {
implementation fileTree(include: '*.jar', dir: 'libs')
// SUB-PROJECT DEPENDENCIES START
- implementation project(path: ':CordovaLib')
- implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
- implementation 'com.android.support:support-v4:24.1.1+'
+ implementation(project(path: ":CordovaLib"))
+ implementation "com.squareup.okhttp3:okhttp-urlconnection:3.10.0"
+ implementation "com.android.support:support-v4:24.1.1+"
// SUB-PROJECT DEPENDENCIES END
}
diff --git a/platforms/android/app/release/app-release.apk b/platforms/android/app/release/app-release.apk
index 64af5de..be551b3 100644
--- a/platforms/android/app/release/app-release.apk
+++ b/platforms/android/app/release/app-release.apk
Binary files differ
diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml
index 9b5f879..93b3137 100644
--- a/platforms/android/app/src/main/AndroidManifest.xml
+++ b/platforms/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10004" android:versionName="1.0.4" package="com.dalicitycard.app"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10005" android:versionName="1.0.5" package="com.dalicitycard.app" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/launcher_name" android:supportsRtl="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
@@ -58,8 +57,7 @@
<category android:name="com.dalicitycard.app" />
</intent-filter>
</receiver>
- <activity android:exported="true" android:name="cn.jpush.android.service.JNotifyActivity"
- android:taskAffinity="jpush.custom" android:theme="@android:style/Theme.Translucent.NoTitleBar">
+ <activity android:exported="true" android:name="cn.jpush.android.service.JNotifyActivity" android:taskAffinity="jpush.custom" android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter>
<action android:name="cn.jpush.android.intent.JNotifyActivity" />
<category android:name="com.dalicitycard.app" />
@@ -105,4 +103,5 @@
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
</manifest>
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 ee6832d..951ded8 100644
--- a/platforms/android/app/src/main/assets/www/cordova_plugins.js
+++ b/platforms/android/app/src/main/assets/www/cordova_plugins.js
@@ -335,6 +335,14 @@
"clobbers": [
"cordova.getAppVersion"
]
+ },
+ {
+ "id": "cordova-plugin-brightness.Brightness",
+ "file": "plugins/cordova-plugin-brightness/www/brightness.js",
+ "pluginId": "cordova-plugin-brightness",
+ "clobbers": [
+ "cordova.plugins.brightness"
+ ]
}
];
module.exports.metadata = {
@@ -354,6 +362,7 @@
"cordova-plugin-jcore": "1.3.0",
"jpush-phonegap-plugin": "3.7.2",
"cordova-plugin-app-version": "0.1.9",
- "cordova-plugin-wkwebview-engine": "1.2.1"
+ "cordova-plugin-wkwebview-engine": "1.2.1",
+ "cordova-plugin-brightness": "0.1.5"
};
});
\ No newline at end of file
diff --git a/platforms/android/app/src/main/assets/www/js/bindcard.js b/platforms/android/app/src/main/assets/www/js/bindcard.js
index 27a0817..f7e91a2 100644
--- a/platforms/android/app/src/main/assets/www/js/bindcard.js
+++ b/platforms/android/app/src/main/assets/www/js/bindcard.js
@@ -19,6 +19,7 @@
dict = ret.idtypes;
let keys = Object.keys(dict);
let vals = Object.values(dict);
+ console.log(keys, vals)
var items=[];
var selectItem=items[0];
for(var key of keys){
@@ -28,7 +29,7 @@
}
if(key == 'idcard'){
selectItem=bean;
- }
+ }
items.push(bean)
}
$("#idtype").val(selectItem.title)
@@ -61,6 +62,7 @@
cardnum = cardnum.trim();
name = name.trim();
idno = idno.trim();
+
$.showLoading("正在处理");
var param = {
"cardno": cardnum,
@@ -77,7 +79,6 @@
window.localStorage.setItem("cardno", cardnum);
window.localStorage.setItem("idtype", idtype);
window.localStorage.setItem("idno", idno);
-
window.localStorage.setItem("phoneX",ret.phonex);
window.localStorage.setItem("personid", ret.personid);
window.localStorage.setItem("signed", ret.signed);
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 c5ba03b..e0a358f 100644
--- a/platforms/android/app/src/main/assets/www/js/main.js
+++ b/platforms/android/app/src/main/assets/www/js/main.js
@@ -44,16 +44,15 @@
}
});
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)
+ //alert(JSON.stringify(result))
}, (error) => {
- console.log(JSON.stringify(error))
var sequence = error.sequence
var errorCode = error.code
+ //alert(JSON.stringify(error))
})
},
@@ -93,13 +92,18 @@
})
});
$('#secBtn').click(function() {
- window.location = "security.html";
- /*app.checkBefore(function() {
+ //window.location = "security.html";
+ app.checkBefore(function() {
app.checkOther(function() {
window.location = "security.html";
})
- })*/
+ })
});
+ /*$("#doorBtn").click(function(){
+ app.checkBefore(function() {
+ showRet(DOOR_URl);
+ })
+ })*/
$('#usersec').click(function() {
app.checkBefore(function() {
app.checkOther(function() {
@@ -111,11 +115,11 @@
this.backBtn();
},
backBtn: function(){
- document.addEventListener("backbutton", function(e){
- e.preventDefault();
- navigator.app.exitApp();
- }, false);
- },
+ document.addEventListener("backbutton", function(e){
+ e.preventDefault();
+ navigator.app.exitApp();
+ }, false);
+ },
initTab: function() {
$("#maincontent").css("top", $("#maintop").height())
var tab = new auiTab({
@@ -324,11 +328,50 @@
} else {
window.location = 'cardinfor.html'
}
- },
- logout:function(){
- window.localStorage.removeItem("token");
- window.location = "login.html";
}
-
};
app.initialize();
+
+function showRet(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;
+ }
+ //}
+ console.log(url)
+ var inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', {
+ statusbar: {
+ color: '#03a9f4ff'
+ },
+ toolbar: {
+ height: 44,
+ color: '#03a9f4ff'
+ },
+ title: {
+ color: '#ffffffff',
+ showPageTitle: true
+ },
+ backButton: {
+ image: 'back.png',
+ imagePressed: 'back.png',
+ align: 'left',
+ event: 'backPressed'
+ },
+ closeButton: {
+ image: 'close.png',
+ imagePressed: 'close.png',
+ align: 'left',
+ event: 'closePressed'
+ },
+ backButtonCanClose: true
+ }).addEventListener('closePressed', function(params){
+ inAppBrowserRef.close();
+ //window.location = "main.html"
+ });
+ }
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 1b5a036..79ae312 100644
--- a/platforms/android/app/src/main/assets/www/js/qrcode.js
+++ b/platforms/android/app/src/main/assets/www/js/qrcode.js
@@ -1,16 +1,27 @@
+var brightness;
+var bvalue;
+var setted= false;
var app = {
// Application Constructor
initialize: function() {
document.addEventListener('deviceready', this.onDeviceReady.bind(this), false);
},
-
onDeviceReady: function() {
var uid = window.localStorage.getItem("token");
- this.loadQrcode();
+ app.loadQrcode();
setInterval(function () {
window.location.reload();
},100000);
+
+ brightness = cordova.plugins.brightness;
+ if(brightness){
+ brightness.getBrightness(function(val){
+ bvalue = val;
+ }, function(err){
+ console.log(err);
+ });
+ }
},
loadQrcode: function() {
$.showLoading("加载中");
@@ -27,6 +38,38 @@
colorLight: "#ffffff",
correctLevel: QRCode.CorrectLevel.L
});
+ if(!setted&&brightness){
+ brightness.setBrightness(1, function(ret){
+ console.log(ret);
+ setted = true;
+ brightness.setKeepScreenOn(true);
+ }, function(e){
+ console.log(e)
+ });
+ }
+ } else {
+ $.hideLoading();
+ $.alert("请求失败，请稍后再试", "错误");
+ }
+ } else {
+ $.hideLoading();
+ $.alert("请求失败了:" + ret.status + "请稍后再试", "错误");
+ }
+ })
+ },
+ refresh:function(){
+ V1Qrcode(function(ok, ret) {
+ if (ok) {
+ if (ret.code == 200) {
+ $.hideLoading();
+ var qrcode = new QRCode(document.getElementById("qrcode"), {
+ text: ret.qrcode,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.L
+ });
} else {
$.hideLoading();
$.alert("请求失败，请稍后再试", "错误");
@@ -37,28 +80,15 @@
}
})
},
- refresh:function(){
- V1Qrcode(function(ok, ret) {
- if (ok) {
- if (ret.code == 200) {
- $.hideLoading();
- var qrcode = new QRCode(document.getElementById("qrcode"), {
- text: ret.qrcode,
- width: 150,
- height: 150,
- colorDark: "#000000",
- colorLight: "#ffffff",
- correctLevel: QRCode.CorrectLevel.L
- });
- } else {
- $.hideLoading();
- $.alert("请求失败，请稍后再试", "错误");
- }
- } else {
- $.hideLoading();
- $.alert("请求失败了:" + ret.status + "请稍后再试", "错误");
- }
- })
+ backTo:function(){
+ if(brightness&&bvalue){
+ brightness.setBrightness(bvalue, function(ret){
+ brightness.setKeepScreenOn(false);
+ }, function(e){
+ console.log(e)
+ });
+ }
+ window,location.href='main.html';
}
};
app.initialize();
\ No newline at end of file
diff --git a/platforms/android/app/src/main/assets/www/js/register.js b/platforms/android/app/src/main/assets/www/js/register.js
index d10558e..f53220a 100644
--- a/platforms/android/app/src/main/assets/www/js/register.js
+++ b/platforms/android/app/src/main/assets/www/js/register.js
@@ -27,7 +27,6 @@
"platform":device.name+","+device.platform+","+device.version,
"uuid":device.uuid
}
- console.log(param)
ICheckCode(param,function(ok,ret){
if(ok){
$.hideLoading();
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 c8eb688..64a6da6 100644
--- a/platforms/android/app/src/main/assets/www/js/server.js
+++ b/platforms/android/app/src/main/assets/www/js/server.js
@@ -1,10 +1,11 @@
var dev = false;
var SERVER = "https://yy.dlsmk.cn/payapi/mobileapi";
+var DOOR_URl = "http://172.28.43.8:8099/door/app/appMintUIindex";//门禁服务地址
var GLOBAL_TODAY="";
var GLOBAL_YESTERDAY="";
var CURRENT_INDEX=1;
if (dev) {
- SERVER = "http://172.28.201.70:10010/payapi/mobileapi";
+ SERVER = "http://172.28.43.7:8099/payapi/mobileapi";
}
function V1Qrcode(callback) {
diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html
index 6d43efa..3ade7e7 100644
--- a/platforms/android/app/src/main/assets/www/main.html
+++ b/platforms/android/app/src/main/assets/www/main.html
@@ -44,6 +44,10 @@
<div class="center-in"><img src="img/icon_securty.png" style="width:28px;height: 28px"></div>
<div class="aui-grid-label" style="margin-top:10px;">账户安全</div>
</div>
+ <!--<div class="aui-col-xs-4" id="doorBtn">
+ <div class="center-in"><img src="img/icon_door.png" style="width:28px;height: 28px"></div>
+ <div class="aui-grid-label" style="margin-top:10px;">远程开门</div>
+ </div>-->
</div>
</div>
</section>
@@ -189,7 +193,7 @@
</div>
</div>
</div>
- <section class="aui-content aui-grid " style="display:none;">
+ <section class="aui-content aui-grid ">
<div class="aui-row aui-margin-t-10">
<div class="aui-col-xs-4 aui-border-r">
<big class="aui-text-warning" id="user-amount">0.00</big>
@@ -238,9 +242,6 @@
</div>
</li>
</ul>
- <div style="padding: 20px;margin-top: 40px;">
- <a href="javascript:app.logout();" class="weui-btn weui-btn_warn">退出登录</a>
- </div>
</section>
</div>
<footer class="aui-bar aui-bar-tab aui-border-t" id="footer">
diff --git a/platforms/android/app/src/main/assets/www/qrcode.html b/platforms/android/app/src/main/assets/www/qrcode.html
index ca6cb07..48e9b69 100644
--- a/platforms/android/app/src/main/assets/www/qrcode.html
+++ b/platforms/android/app/src/main/assets/www/qrcode.html
@@ -15,7 +15,7 @@
</head>
<body style="background: #fff" >
<header class="aui-bar aui-bar-nav" style="padding-top:25px;">
- <a class="aui-pull-left" href="main.html">
+ <a class="aui-pull-left" href="app.backTo()">
<span class="aui-iconfont aui-icon-left"></span>
</a>
<div class="aui-title">付款码</div>
diff --git a/platforms/android/app/src/main/assets/www/security.html b/platforms/android/app/src/main/assets/www/security.html
index f6ddd43..39a40ca 100644
--- a/platforms/android/app/src/main/assets/www/security.html
+++ b/platforms/android/app/src/main/assets/www/security.html
@@ -50,7 +50,9 @@
</div>
</li>
</ul>
-
+ <div style="padding: 20px;margin-top: 40px;">
+ <a href="javascript:app.logout();" class="weui-btn weui-btn_warn">退出登录</a>
+ </div>
</section>
</body>
diff --git a/platforms/android/app/src/main/java/org/apache/cordova/plugin/Brightness/BrightnessPlugin.java b/platforms/android/app/src/main/java/org/apache/cordova/plugin/Brightness/BrightnessPlugin.java
new file mode 100644
index 0000000..6a42ff4
--- /dev/null
+++ b/platforms/android/app/src/main/java/org/apache/cordova/plugin/Brightness/BrightnessPlugin.java
@@ -0,0 +1,158 @@
+package org.apache.cordova.plugin.Brightness;
+
+import org.apache.cordova.CallbackContext;
+import org.apache.cordova.CordovaPlugin;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import android.app.Activity;
+import android.view.WindowManager.LayoutParams;
+import android.view.WindowManager;
+import android.view.Window;
+
+/**
+ * @author Evgeniy Lukovsky
+ *
+ */
+public class BrightnessPlugin extends CordovaPlugin {
+ public enum Action{
+ setBrightness,
+ getBrightness,
+ setKeepScreenOn
+ }
+
+ private class SetTask implements Runnable{
+ private Activity target = null;
+ private LayoutParams lp = null;
+ @Override
+ public void run() {
+ target.getWindow().setAttributes(lp);
+ }
+ public void setParams(Activity act, LayoutParams params){
+ this.target = act;
+ this.lp = params;
+ }
+ }
+
+ private class KeepOnTask implements Runnable{
+ private Window win = null;
+ private boolean state = false;
+ @Override
+ public void run() {
+ if(state){
+ win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ } else {
+ win.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+ }
+ public void setParams(Window win, boolean state){
+ this.win = win;
+ this.state = state;
+ }
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.cordova.CordovaPlugin#execute(java.lang.String, org.json.JSONArray, org.apache.cordova.CallbackContext)
+ */
+ @Override
+ public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+ System.out.println("plugin has been started");
+ boolean result = false;
+
+ switch(Action.valueOf(action)){
+ case setBrightness: result = true;
+ setBrightness(args, callbackContext);
+ break;
+ case getBrightness: result = true;
+ getBrightness(args, callbackContext);
+ break;
+ case setKeepScreenOn: result = true;
+ setKeepScreenOn(args, callbackContext);
+ break;
+ }
+ return result;
+ }
+
+ /**
+ * @param args
+ * @param callbackContext
+ * @return
+ */
+ private boolean setBrightness(JSONArray args, CallbackContext callbackContext) {
+ try {
+ Activity activity = cordova.getActivity();
+ WindowManager.LayoutParams layoutParams = activity.getWindow().getAttributes();
+ String value = args.getString(0);
+ double brightness = Double.parseDouble(value);
+ layoutParams.screenBrightness = (float) brightness;
+ SetTask task = new SetTask();
+ task.setParams(activity, layoutParams);
+ activity.runOnUiThread(task);
+ callbackContext.success("OK");
+
+ } catch (NullPointerException e) {
+ System.out.println("Null pointer exception");
+ System.out.println(e.getMessage());
+ callbackContext.error(e.getMessage());
+ return false;
+ } catch (JSONException e) {
+ System.out.println("JSONException exception");
+ System.out.println(e.getMessage());
+ callbackContext.error(e.getMessage());
+ return false;
+ }
+ System.out.println("All went fine.");
+ return true;
+ }
+
+ /**
+ * @param args
+ * @param callbackContext
+ * @return
+ */
+ private boolean getBrightness(JSONArray args, CallbackContext callbackContext) {
+ try {
+ Activity activity = cordova.getActivity();
+ WindowManager.LayoutParams layoutParams = activity.getWindow().getAttributes();
+ Double brightness = (double) layoutParams.screenBrightness;
+ callbackContext.success(brightness.toString());
+
+ } catch (NullPointerException e) {
+ System.out.println("Null pointer exception");
+ System.out.println(e.getMessage());
+ callbackContext.error(e.getMessage());
+ return false;
+ }
+ System.out.println("All went fine.");
+ return true;
+ }
+ /**
+ * @param args
+ * @param callbackContext
+ * @return
+ */
+ private boolean setKeepScreenOn(JSONArray args, CallbackContext callbackContext){
+ try {
+ boolean value = args.getBoolean(0);
+ Activity activity = cordova.getActivity();
+ KeepOnTask task = new KeepOnTask();
+ task.setParams(activity.getWindow(), value);
+ activity.runOnUiThread(task);
+ callbackContext.success("OK");
+
+ } catch (NullPointerException e) {
+ System.out.println("Null pointer exception");
+ System.out.println(e.getMessage());
+ callbackContext.error(e.getMessage());
+ return false;
+ } catch (JSONException e) {
+ System.out.println("JSONException");
+ System.out.println(e.getMessage());
+ callbackContext.error(e.getMessage());
+ return false;
+ }
+ System.out.println("All went fine.");
+ return true;
+ }
+}
diff --git a/platforms/android/app/src/main/res/drawable-hdpi/icon.png b/platforms/android/app/src/main/res/drawable-hdpi/icon.png
index 4edb4c6..1769fc5 100644
--- a/platforms/android/app/src/main/res/drawable-hdpi/icon.png
+++ b/platforms/android/app/src/main/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/drawable-ldpi/icon.png b/platforms/android/app/src/main/res/drawable-ldpi/icon.png
index 0508de6..1769fc5 100644
--- a/platforms/android/app/src/main/res/drawable-ldpi/icon.png
+++ b/platforms/android/app/src/main/res/drawable-ldpi/icon.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/drawable-mdpi/icon.png b/platforms/android/app/src/main/res/drawable-mdpi/icon.png
index ed81661..92a3334 100644
--- a/platforms/android/app/src/main/res/drawable-mdpi/icon.png
+++ b/platforms/android/app/src/main/res/drawable-mdpi/icon.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/drawable-xhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xhdpi/icon.png
index b764a7e..4f54d23 100644
--- a/platforms/android/app/src/main/res/drawable-xhdpi/icon.png
+++ b/platforms/android/app/src/main/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png
index 3c7efa4..ea73508 100644
--- a/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png
+++ b/platforms/android/app/src/main/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png b/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png
index 8c027a7..8b754c8 100644
--- a/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png
+++ b/platforms/android/app/src/main/res/drawable-xxxhdpi/icon.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/drawable/icon.png b/platforms/android/app/src/main/res/drawable/icon.png
index b764a7e..1769fc5 100644
--- a/platforms/android/app/src/main/res/drawable/icon.png
+++ b/platforms/android/app/src/main/res/drawable/icon.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 4edb4c6..1769fc5 100644
--- a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png
index 0508de6..530c91d 100644
--- a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png
+++ b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png
index ed81661..92a3334 100644
--- a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png
+++ b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index ed81661..92a3334 100644
--- a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png
index b764a7e..4f54d23 100644
--- a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png
+++ b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index b764a7e..4f54d23 100644
--- a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png
index 3c7efa4..ea73508 100644
--- a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png
+++ b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 3c7efa4..ea73508 100644
--- a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png
index 8c027a7..8b754c8 100644
--- a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png
+++ b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 8c027a7..8b754c8 100644
--- a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/platforms/android/app/src/main/res/xml/config.xml b/platforms/android/app/src/main/res/xml/config.xml
index cda74bc..59faded 100644
--- a/platforms/android/app/src/main/res/xml/config.xml
+++ b/platforms/android/app/src/main/res/xml/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="com.dalicitycard.app" version="1.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.dalicitycard.app" version="1.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="Fingerprint">
<param name="android-package" value="de.niklasmerz.cordova.fingerprint.Fingerprint" />
</feature>
@@ -40,6 +40,9 @@
<feature name="AppVersion">
<param name="android-package" value="uk.co.whiteoctober.cordova.AppVersion" />
</feature>
+ <feature name="Brightness">
+ <param name="android-package" value="org.apache.cordova.plugin.Brightness.BrightnessPlugin" />
+ </feature>
<name short="大理市民卡">dlapp</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
diff --git a/platforms/android/platform_www/cordova_plugins.js b/platforms/android/platform_www/cordova_plugins.js
index ee6832d..951ded8 100644
--- a/platforms/android/platform_www/cordova_plugins.js
+++ b/platforms/android/platform_www/cordova_plugins.js
@@ -335,6 +335,14 @@
"clobbers": [
"cordova.getAppVersion"
]
+ },
+ {
+ "id": "cordova-plugin-brightness.Brightness",
+ "file": "plugins/cordova-plugin-brightness/www/brightness.js",
+ "pluginId": "cordova-plugin-brightness",
+ "clobbers": [
+ "cordova.plugins.brightness"
+ ]
}
];
module.exports.metadata = {
@@ -354,6 +362,7 @@
"cordova-plugin-jcore": "1.3.0",
"jpush-phonegap-plugin": "3.7.2",
"cordova-plugin-app-version": "0.1.9",
- "cordova-plugin-wkwebview-engine": "1.2.1"
+ "cordova-plugin-wkwebview-engine": "1.2.1",
+ "cordova-plugin-brightness": "0.1.5"
};
});
\ No newline at end of file
diff --git a/platforms/android/platform_www/plugins/cordova-plugin-brightness/www/brightness.js b/platforms/android/platform_www/plugins/cordova-plugin-brightness/www/brightness.js
new file mode 100644
index 0000000..c1111d6
--- /dev/null
+++ b/platforms/android/platform_www/plugins/cordova-plugin-brightness/www/brightness.js
@@ -0,0 +1,18 @@
+cordova.define("cordova-plugin-brightness.Brightness", function(require, exports, module) {
+'use strict';
+
+var exec = require('cordova/exec');
+
+exports.getBrightness = function( success, error) {
+ exec(success, error, 'Brightness', 'getBrightness', []);
+};
+
+exports.setBrightness = function(value, success, error) {
+ exec(success, error, 'Brightness', 'setBrightness', [value]);
+};
+
+exports.setKeepScreenOn = function(value, success, error) {
+ exec(success, error, 'Brightness', 'setKeepScreenOn', [value]);
+};
+
+});
