包名问题
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 @@
android {
defaultConfig {
- applicationId 'com.dalicitycard.app'
+ applicationId 'com.dalipolice.app'
if (cdvMinSdkVersion != null) {
minSdkVersion cdvMinSdkVersion
}
@@ -174,8 +174,8 @@
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" />