From 98635db0eb006c7df03bbb712d2fbd54cacb3cf2 Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Sun, 28 Jun 2020 17:41:21 +0800
Subject: [PATCH] =?utf8?q?=E5=8C=85=E5=90=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config.xml                                    |   2 +-
 package.json                                  |   4 +-
 platforms/android/android.json                |  60 +++++++++---------
 platforms/android/app/build.gradle            |   6 +-
 .../android/app/src/main/AndroidManifest.xml  |  24 +++----
 .../app/MainActivity.java                     |   2 +-
 .../android/app/src/main/res/xml/config.xml   |   2 +-
 www/img/icon_more5.png                        | Bin 0 -> 1499 bytes
 www/img/icon_more6.png                        | Bin 0 -> 1678 bytes
 www/img/icon_more7.png                        | Bin 0 -> 2459 bytes
 www/img/icon_reauth.png                       | Bin 965 -> 0 bytes
 www/js/main.js                                |   2 +
 www/js/mainmenu.js                            |   1 +
 www/js/more.js                                |  30 +++++++--
 www/more.html                                 |  34 ++++++----
 15 files changed, 99 insertions(+), 68 deletions(-)
 rename platforms/android/app/src/main/java/com/{dalicitycard => dalipolice}/app/MainActivity.java (97%)
 create mode 100644 www/img/icon_more5.png
 create mode 100644 www/img/icon_more6.png
 create mode 100644 www/img/icon_more7.png
 delete mode 100644 www/img/icon_reauth.png

diff --git a/config.xml b/config.xml
index 9b650e6..409322b 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.dalicitycard.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.dalipolice.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name short="大理智警">dlapp</name>
     <description>
         A sample Apache Cordova application that responds to the deviceready event.
diff --git a/package.json b/package.json
index 5d65b05..e39792b 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "com.dalicitycard.app",
+  "name": "com.dalipolice.app",
   "displayName": "大理市民卡",
   "version": "1.0.3",
   "description": "A sample Apache Cordova application that responds to the deviceready event.",
@@ -49,7 +49,7 @@
       "cordova-plugin-device": {},
       "cordova-plugin-themeablebrowser": {},
       "jpush-phonegap-plugin": {
-        "APP_KEY": "d644d997f2cab0551ff704a3",
+        "APP_KEY": "1fc62c8c6204ec4b0ae65ee2",
         "CHANNEL": "developer-default"
       },
       "cordova-plugin-app-version": {},
diff --git a/platforms/android/android.json b/platforms/android/android.json
index f684e89..eb6d7bb 100644
--- a/platforms/android/android.json
+++ b/platforms/android/android.json
@@ -101,11 +101,11 @@
               "count": 2
             },
             {
-              "xml": "<permission android:name=\"com.dalicitycard.app.permission.JPUSH_MESSAGE\" android:protectionLevel=\"signature\" />",
+              "xml": "<permission android:name=\"com.dalipolice.app.permission.JPUSH_MESSAGE\" android:protectionLevel=\"signature\" />",
               "count": 1
             },
             {
-              "xml": "<uses-permission android:name=\"com.dalicitycard.app.permission.JPUSH_MESSAGE\" />",
+              "xml": "<uses-permission android:name=\"com.dalipolice.app.permission.JPUSH_MESSAGE\" />",
               "count": 1
             },
             {
@@ -185,7 +185,7 @@
               "count": 1
             },
             {
-              "xml": "<activity android:configChanges=\"orientation|keyboardHidden\" android:exported=\"false\" android:name=\"cn.jpush.android.ui.PushActivity\" android:theme=\"@android:style/Theme.NoTitleBar\"><intent-filter><action android:name=\"cn.jpush.android.ui.PushActivity\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></activity>",
+              "xml": "<activity android:configChanges=\"orientation|keyboardHidden\" android:exported=\"false\" android:name=\"cn.jpush.android.ui.PushActivity\" android:theme=\"@android:style/Theme.NoTitleBar\"><intent-filter><action android:name=\"cn.jpush.android.ui.PushActivity\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></activity>",
               "count": 1
             },
             {
@@ -193,19 +193,19 @@
               "count": 1
             },
             {
-              "xml": "<provider android:authorities=\"com.dalicitycard.app.DataProvider\" android:exported=\"false\" android:name=\"cn.jpush.android.service.DataProvider\" android:process=\":pushcore\" />",
+              "xml": "<provider android:authorities=\"com.dalipolice.app.DataProvider\" android:exported=\"false\" android:name=\"cn.jpush.android.service.DataProvider\" android:process=\":pushcore\" />",
               "count": 1
             },
             {
-              "xml": "<service android:enabled=\"true\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DaemonService\"><intent-filter><action android:name=\"cn.jpush.android.intent.DaemonService\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></service>",
+              "xml": "<service android:enabled=\"true\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DaemonService\"><intent-filter><action android:name=\"cn.jpush.android.intent.DaemonService\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></service>",
               "count": 1
             },
             {
-              "xml": "<provider android:authorities=\"com.dalicitycard.app.DownloadProvider\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DownloadProvider\" />",
+              "xml": "<provider android:authorities=\"com.dalipolice.app.DownloadProvider\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DownloadProvider\" />",
               "count": 1
             },
             {
-              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jpush.android.service.PushReceiver\"><intent-filter android:priority=\"1000\"><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.USER_PRESENT\" /><action android:name=\"android.net.conn.CONNECTIVITY_CHANGE\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.PACKAGE_ADDED\" /><action android:name=\"android.intent.action.PACKAGE_REMOVED\" /><data android:scheme=\"package\" /></intent-filter></receiver>",
+              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jpush.android.service.PushReceiver\"><intent-filter android:priority=\"1000\"><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY\" /><category android:name=\"com.dalipolice.app\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.USER_PRESENT\" /><action android:name=\"android.net.conn.CONNECTIVITY_CHANGE\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.PACKAGE_ADDED\" /><action android:name=\"android.intent.action.PACKAGE_REMOVED\" /><data android:scheme=\"package\" /></intent-filter></receiver>",
               "count": 1
             },
             {
@@ -213,11 +213,11 @@
               "count": 1
             },
             {
-              "xml": "<receiver android:name=\"cn.jiguang.cordova.push.JPushEventReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.RECEIVE_MESSAGE\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></receiver>",
+              "xml": "<receiver android:name=\"cn.jiguang.cordova.push.JPushEventReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.RECEIVE_MESSAGE\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></receiver>",
               "count": 1
             },
             {
-              "xml": "<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\" /></intent-filter></activity>",
+              "xml": "<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.dalipolice.app\" /></intent-filter></activity>",
               "count": 1
             },
             {
@@ -225,7 +225,7 @@
               "count": 1
             },
             {
-              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jiguang.cordova.push.JPushReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.REGISTRATION\" /><action android:name=\"cn.jpush.android.intent.MESSAGE_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_OPENED\" /><action android:name=\"cn.jpush.android.intent.CONNECTION\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></receiver>",
+              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jiguang.cordova.push.JPushReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.REGISTRATION\" /><action android:name=\"cn.jpush.android.intent.MESSAGE_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_OPENED\" /><action android:name=\"cn.jpush.android.intent.CONNECTION\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></receiver>",
               "count": 1
             },
             {
@@ -233,7 +233,7 @@
               "count": 1
             },
             {
-              "xml": "<meta-data android:name=\"JPUSH_APPKEY\" android:value=\"d644d997f2cab0551ff704a3\" />",
+              "xml": "<meta-data android:name=\"JPUSH_APPKEY\" android:value=\"1fc62c8c6204ec4b0ae65ee2\" />",
               "count": 1
             },
             {
@@ -267,61 +267,61 @@
   },
   "installed_plugins": {
     "cordova-plugin-add-swift-support": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-touch-id": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-whitelist": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-file": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-advanced-http": {
       "OKHTTP_VERSION": "3.10.0",
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-statusbar": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-disable-ios11-statusbar": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-qrscanner": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-camera": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-inappbrowser": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-device": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-themeablebrowser": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-jcore": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "jpush-phonegap-plugin": {
-      "APP_KEY": "d644d997f2cab0551ff704a3",
+      "APP_KEY": "1fc62c8c6204ec4b0ae65ee2",
       "CHANNEL": "developer-default",
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-app-version": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-wkwebview-engine": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-brightness": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-fingerprint-aio": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     }
   },
   "dependent_plugins": {},
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
index e4b404a..31d4b5c 100644
--- a/platforms/android/app/build.gradle
+++ b/platforms/android/app/build.gradle
@@ -166,7 +166,7 @@ task cdvPrintProps {
 
 android {
     defaultConfig {
-        applicationId 'com.dalicitycard.app'
+        applicationId 'com.dalipolice.app'
         if (cdvMinSdkVersion != null) {
             minSdkVersion cdvMinSdkVersion
         }
@@ -174,8 +174,8 @@ android {
         ndk {
             abiFilters "armeabi"
         }
-        versionCode 13
-        versionName '1.4.0'
+        versionCode 14
+        versionName '1.4.1'
         targetSdkVersion 28
     }
     lintOptions {
diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml
index 3238e12..b7ece77 100644
--- a/platforms/android/app/src/main/AndroidManifest.xml
+++ b/platforms/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10006" android:versionName="1.0.6" package="com.dalicitycard.app" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10006" android:versionName="1.0.6" package="com.dalipolice.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" android:usesCleartextTraffic="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">
@@ -16,7 +16,7 @@
             <intent-filter>
                 <action android:name="cn.jpush.android.ui.PushActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </activity>
         <service android:exported="false" android:name="cn.jpush.android.service.PushService" android:process=":pushcore">
@@ -27,18 +27,18 @@
                 <action android:name="cn.jpush.android.intent.PUSH_TIME" />
             </intent-filter>
         </service>
-        <provider android:authorities="com.dalicitycard.app.DataProvider" android:exported="false" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" />
+        <provider android:authorities="com.dalipolice.app.DataProvider" android:exported="false" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" />
         <service android:enabled="true" android:exported="true" android:name="cn.jpush.android.service.DaemonService">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.DaemonService" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </service>
-        <provider android:authorities="com.dalicitycard.app.DownloadProvider" android:exported="true" android:name="cn.jpush.android.service.DownloadProvider" />
+        <provider android:authorities="com.dalipolice.app.DownloadProvider" android:exported="true" android:name="cn.jpush.android.service.DownloadProvider" />
         <receiver android:enabled="true" android:exported="false" android:name="cn.jpush.android.service.PushReceiver">
             <intent-filter android:priority="1000">
                 <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.USER_PRESENT" />
@@ -54,13 +54,13 @@
         <receiver android:name="cn.jiguang.cordova.push.JPushEventReceiver">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.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">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.JNotifyActivity" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </activity>
         <service android:name="cn.jiguang.cordova.push.PushService" android:process=":pushcore">
@@ -75,11 +75,11 @@
                 <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
                 <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
                 <action android:name="cn.jpush.android.intent.CONNECTION" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </receiver>
         <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
-        <meta-data android:name="JPUSH_APPKEY" android:value="d644d997f2cab0551ff704a3" />
+        <meta-data android:name="JPUSH_APPKEY" android:value="1fc62c8c6204ec4b0ae65ee2" />
         <activity android:exported="true" android:name="de.niklasmerz.cordova.biometric.BiometricActivity" android:theme="@style/TransparentTheme" />
     </application>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -87,8 +87,8 @@
     <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-feature android:name="android.hardware.camera.front" android:required="false" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <permission android:name="com.dalicitycard.app.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
-    <uses-permission android:name="com.dalicitycard.app.permission.JPUSH_MESSAGE" />
+    <permission android:name="com.dalipolice.app.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
+    <uses-permission android:name="com.dalipolice.app.permission.JPUSH_MESSAGE" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java b/platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
similarity index 97%
rename from platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java
rename to platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
index 7b7fe6b..9682df9 100644
--- a/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java
+++ b/platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
@@ -17,7 +17,7 @@
        under the License.
  */
 
-package com.dalicitycard.app;
+package com.dalipolice.app;
 
 import android.os.Bundle;
 import org.apache.cordova.*;
diff --git a/platforms/android/app/src/main/res/xml/config.xml b/platforms/android/app/src/main/res/xml/config.xml
index 1cae32d..ca7b3a0 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.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.dalipolice.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Whitelist">
         <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
         <param name="onload" value="true" />
diff --git a/www/img/icon_more5.png b/www/img/icon_more5.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d13b94eb1d76ff806a64a1287456ff06095f3f1
GIT binary patch
literal 1499
zcmV<11tj{3P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000G|Nkl<ZcwX(A
zTWl0%6vuyO+j0?YiwGz;At4aNL{Lni(<w#tMH7V*3?^!PK@<qSpov5x20;UFVo~8q
zBOzb_FNr=7x$Nw=ktpH?jiLfUBrVs1q?ERE%yhf9O52&){buQgen}s?d(Qd(=QroO
z?DvgugEzUs^QR9$Uj^idfF{ePpaqo(GeO1zLqUfDmx0r5f69Jh-rv<)nf}$qTu6(2
z2xx8PSlrfEfoHl*sHhkQ-viB;py4pM&7hnB)=9bZcGM6e1)xcL0q_RkJ@KyFnE6mV
zA@!Zx1m}N%`u)&)1(4mi?pm=E`=SC7830Y#OA$8s3Lp0*47&5bW-Wii@$JxfD*gFl
zv7C2&V`X3v2>`9J_o7q=(o--HZhrs<Pr26o$a~OqCjI#`u^fM(fjaFlG7dnK_6NXI
zA$7o@F>vcND4EpZ+H@L@Z-c81sn0|om$Jl1p=0;pU=%>$vhOK_lDlB^+zyNL-^0nz
zI{tTcn%IeNOhGUPKo3-m=Bg$UMrSQ<Xc-Kj)e*)6;DJb$!6vcdi?Z$`9nDlAt+6+t
zEHxF6k&krD3-xiRcOt0*a}|)ZPXZ&10f_YjZ-r1dH4n5lcAmM`OPTYMiN1^g(B#Y+
z;MSNBbWM!niKz*)u?{Z%+P**Fm{`s@6aAS1;FPZ-Cf;t(Z0lD76FQBm&U1mQvrKG|
z%m7GMRD&)yn?0!wk~a*}?d$<KwYz;TG_xcc0$^_k<{Jm#1)Q`T3i_u)AN>$6A8+qQ
zmxz_vm~EeC0EF53Wun-tge!IF@t=y|>T6;rR%H^dvyUMF74M_^bhctb`Kv6D^7yt;
zK3y1_0gx<T4f0C1VnX@5Iz{ZnccFZu17JT7WIY~3B-2F0%_Z{i7fm62x->OY0X6m<
zlwH}13GT0l#7ayJZr{D78321LN71kKVCtAF7foLmE3wi<PeuTELNsBoLwM1ID4!S?
z>8DfW{=^?9`Z5Qgwqg>lehaiO+9u?66+_+<EB=D1=*9q~s-XN`M2!7Z?K;VVsbcLr
z)GGnBK}bfpE9~tjLg}Xx34{oe_w*Va0-ej!AcS*>K4<zYFs(H*0BysereYDQD}XT>
zj@d25WR1*-|D2(}uUn)5+8`XQ9Kb2}O;p3o+~-hPCgt%hz8Pd`5IKNO^TILUe>WiA
zs8_9)@`Snb#U3E#5`czySbM~BW{0rP*fb{qwAQ{CmoR7fe~IOc%s8tMj=2Glv=;)K
zLg@1LlOtrB^Y7(gDBlpqxdD){*CM<eLYKEf&lW4bC!9}s>)ZfH+FJqdsyuiTSt@1m
z>fjEUS%w0jHRbbB@t)*F;HJ#FjLge>%j6eaT^Z)MJTL%F*y|CNM<(B7-~uMgbmyla
zAp-%>s4hN&D9p^}F#UNb$RrvJK+^sZn4FoG>*N*i*xVO@rVcs+mD6=fwYzQ)isjtr
zr^z2cqM{1X9e#m&-S<L+lsTn-y8Hpu+ADBb;}@t`ejh6sCo}eWzd^cf{s5vp;fb1B
zD-TMA^JTUGjsWAM)*4a#XT@?hXA2<AuegZv$S`bxl_1Cv$iF2p&C3XY)b`iA|IfE}
zSS;smKheGw;04gH?K@~xZ~vbkE#{sOtLFD0VgmsP5-4A70s&~+F=VwMPXMFRS6>2k
zy(wvh;q7|7EAu}E-C8v7tnUS?FMyUEL#y2=UVzF0y%@5waNg-9883tS`S||LjTgKZ
z_w%+D4J;iX5C7KfixfRpfbJ?SZFURK=WX^tQLJUK%)M}-yBvInK=aPqK33(ie1ssv
zCq-3f=43ns+Lpkb!-utK>t=;V^9h2$r-f3mP^#+cvjUKIzPR(2Aw?~PgYp4Fb79Nn
z;;Kt$gJ|^~0zrc0vrQj>e13W+wD(nj35xj~;~!SZ!B9Oo{v`ka002ovPDHLkV1h|y
B%S`|P

literal 0
HcmV?d00001

diff --git a/www/img/icon_more6.png b/www/img/icon_more6.png
new file mode 100644
index 0000000000000000000000000000000000000000..04b56f2fa007761f713407d790115afa81637e07
GIT binary patch
literal 1678
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
Y5BqJCZl>{G0{{R307*qoM6N<$f+5TulmGw#

literal 0
HcmV?d00001

diff --git a/www/img/icon_more7.png b/www/img/icon_more7.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb900f0c23f5e91e4b647a0ed496f60a35d55d76
GIT binary patch
literal 2459
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
Z{{vjEY`7>Ds-^${002ovPDHLkV1kXinA89O

literal 0
HcmV?d00001

diff --git a/www/img/icon_reauth.png b/www/img/icon_reauth.png
deleted file mode 100644
index 5b18a4287bc8cbeec4bbab477b8c4654f08eca56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk000AwNkl<ZXhZFp
zOQ=mz7{`A%B`Ibik0=RwM?{2yf#gwSBF_N>k4z*JuaQg;<ryLaN#0Th6k<Rk$}{AV
zGNY7I^mX^C-EQCW|JFWxpL6a#dkydUf8Y9k>%Z>0dwsW!78`9X#!Cs@)g3P#E*-9Y
z2YLeYfKejVOW+3ZyY?kJ&QSD`9t2zgCO9FU0t<o9PJOVfXyAjuhQO*00UHBj-14G<
z&8dOzYTAWg06Q6ljG}?R0{sIk{{{>QjB(3Dfp-Fffgxgr+0pz}V7|MWcHuQ(K@?-_
z&8!mt5%>g{&NV`S?*OwLS>FM}V!9WO8@eL5n|gFC_9igbvF2T%vdLBDUf|WhNyow!
z$t2)OOusC#32CX`0_S2A6M@G8YpwxKDZLl?88B8Qi_ISc)&=O(q(_0Z0Xd!n<CNYD
z{7)rHnZF3^2VMg|obi2t;lO5Ku`?zvlRQ!oWy=Dbq28K9B##u7z%`ptXaZ@V6qF7Z
zYEaF|rGZjVI$W~}g(i>&N<ryxp$65QTpB0^4RqL=2lgni*VZcMR!ANxXb|v9;7kni
zgX2kRa>*kF4FKK->`6GfFZ#Y#MoS(ks57t~<4q}4*4!JfXgiz3_PSb<0<{I$>wxW4
zNBUvZvG|h!v&%|8>SHnT#7aROj<ofptUY5FQ+!zS-g?^IobEQ%;nTohU<xp%O2MYF
zKG}nWW-?$6z`g;n4FjGEJc<gn4(H)2jku-2g#?tvTu(Ifyxj7{N<rX}eg%w7RM#D_
z+c(*tvNq0vgtiA@ok~{+GG!Mej}!y~n|wsn$4b^?z2hCx5AD|7no{t2z+BHdB##ti
z0KN>^m(tIas;!eb9ax?+Xa7@LpOrL<lRQ$80oX#UpKO0ptg-GH+ksskq0mSkDaZ(H
zVc!93;NKEOn(Ie$fVC8oM+#~Ht}xhTb-V+hMZl$;V4DWm3fUdIuqu4hBKLcBMPOsH
zPegkKy@@_HP5?u5gl#H^<6QQr_xu+!%U;M|Q7OpbcQ{MoSz{!R6qLYO_r5-H(m*LF
z9j=d4Syzz;N<phSY!87vKM=AySS{`s&|4+;I(#pB<*0m(oWBpuPz88_?Ku~3jH|qj
zm|p>$RSSE8El+3%QLUZlyuHe-k0wV5uqB%legF28nd>94C+K_Nws*NuU~k^0)s?_a
nYfVmtl@8~$kxiSX<sAMGJ|KoYd)Y>D00000NkvXXu0mjf!??7e

diff --git a/www/js/main.js b/www/js/main.js
index 78b896f..9009475 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -44,6 +44,7 @@ var app = {
           }
          });
         var uid = window.localStorage.getItem("uid");
+
         window.JPush.setAlias({ sequence: 1, alias: uid },
           (result) => {
             var sequence = result.sequence
@@ -58,6 +59,7 @@ var app = {
 
     onDeviceReady: function() {
         var uid = window.localStorage.getItem("token");
+        console.log("1."+window.localStorage.getItem("uid"))
         this.initJpush();
         $('#scanBtn').click(function() {
             //window.location = "scan.html";
diff --git a/www/js/mainmenu.js b/www/js/mainmenu.js
index eacec44..7a98ae0 100644
--- a/www/js/mainmenu.js
+++ b/www/js/mainmenu.js
@@ -58,6 +58,7 @@ var app = {
 
     onDeviceReady: function() {
         var uid = window.localStorage.getItem("token");
+        console.log("1."+window.localStorage.getItem("uid"))
         this.initJpush();
         $('#scanBtn').click(function() {
             //window.location = "scan.html";
diff --git a/www/js/more.js b/www/js/more.js
index 0251b0d..bd4cc2a 100644
--- a/www/js/more.js
+++ b/www/js/more.js
@@ -12,23 +12,39 @@ var app = {
         });
         $("#moreBtn1").click(function(){
             //window.location = "more.html";
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/addindex?custid="+userid);
         })
-        $("#moreBtn2").click(function(){
+        $("#moreBtn4").click(function(){
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            alert("暂未开通");
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/clockindex?custid="+userid);
         })
-        $("#moreBtn4").click(function(){
+        $("#moreBtn5").click(function(){
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/reviewindex?custid="+userid);
         })
-        $("#moreBtn5").click(function(){
+        $("#moreBtn6").click(function(){
+            //window.location = "more.html";
+            //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/reviewClock?custid="+userid);
+        })
+        $("#moreBtn7").click(function(){
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/doordtl?custid="+userid);
         })
+        $("#moreBtn8").click(function(){
+            //window.location = "more.html";
+            //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/doordtl?custid="+userid);
+        })
+        $("#moreBtn2").click(function(){
+            //window.location = "more.html";
+            //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/attendconference?custid="+userid);
+        })
+
     },
    
 };
diff --git a/www/more.html b/www/more.html
index a3bf7a7..72f6702 100644
--- a/www/more.html
+++ b/www/more.html
@@ -24,26 +24,38 @@
     <section class="aui-grid aui-margin-b-15">
         <p style="padding:10px;color:#000;font-size: 0.8rem">考勤</p>
         <div class="aui-row">
-            <div class="aui-col-xs-4" id="moreBtn1">
+            <div class="aui-col-xs-3" id="moreBtn1">
                <div class="center-in"><img src="img/icon_qj.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="moreBtn4">
-               <div class="center-in"><img src="img/icon_meeting.png" style="width:28px;height: 28px"></div>
+            <div class="aui-col-xs-3" id="moreBtn4">
+               <div class="center-in"><img src="img/icon_redo.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="moreBtn5">
-               <div class="center-in"><img src="img/icon_meeting.png" style="width:28px;height: 28px"></div>
-               <div class="aui-grid-label" style="margin-top:10px;">审批</div>
+            <div class="aui-col-xs-3" id="moreBtn5">
+               <div class="center-in"><img src="img/icon_more5.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">报备审批</div>
+            </div>
+             <div class="aui-col-xs-3" id="moreBtn6">
+               <div class="center-in"><img src="img/icon_more6.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">补签审批</div>
             </div>
         </div>
     </section>
-    <section class="aui-grid">
+    <section class="aui-grid aui-margin-b-15">
         <p style="padding:10px;color:#000;font-size: 0.8rem">查询</p>
         <div class="aui-row">
-            <div class="aui-col-xs-4" id="moreBtn3">
+            <div class="aui-col-xs-3" id="moreBtn3">
                <div class="center-in"><img src="img/icon_bill.png" style="width:28px;height: 28px"></div>
-               <div class="aui-grid-label" style="margin-top:10px;">记录</div>
+               <div class="aui-grid-label" style="margin-top:10px;">交易记录</div>
+            </div>
+             <div class="aui-col-xs-3" id="moreBtn7">
+               <div class="center-in"><img src="img/icon_more7.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">其他记录</div>
+            </div>
+            <div class="aui-col-xs-3" id="moreBtn8" style="display: none">
+               <div class="center-in"><img src="img/icon_bill.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">考勤记录</div>
             </div>
         </div>
     </section>
@@ -51,8 +63,8 @@
     <section class="aui-grid">
         <p style="padding:10px;color:#000;font-size: 0.8rem">其他</p>
         <div class="aui-row">
-            <div class="aui-col-xs-4" id="moreBtn2">
-               <div class="center-in"><img src="img/icon_bill.png" style="width:28px;height: 28px"></div>
+            <div class="aui-col-xs-3" id="moreBtn2">
+               <div class="center-in"><img src="img/icon_meeting.png" style="width:28px;height: 28px"></div>
                <div class="aui-grid-label" style="margin-top:10px;">会议</div>
             </div>
         </div>
-- 
2.17.1