From 00599ca0bc992c44f4b2966e0b7431b98d229ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=89=AF=E5=96=9C?= <liangxilee@zikko-store.com>
Date: Fri, 23 Dec 2022 16:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EsetAuth=E9=9A=90=E7=A7=81?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                   | 31 +++++++------------------------
 src/android/JPushPlugin.java | 12 ++++++++++++
 www/JPushPlugin.js           |  6 ++++++
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 350504d..37cb701 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -85,33 +85,30 @@
 
             <!-- Required  一些系统要求的权限，如访问网络等-->
             <uses-permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE" />
-            <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
             <uses-permission android:name="android.permission.INTERNET" />
             <uses-permission android:name="android.permission.READ_PHONE_STATE" />
             <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
             <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-            <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
             <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
+            <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
 
             <!-- Optional for location -->
             <uses-permission android:name="android.permission.VIBRATE" />
-            <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 用于开启 debug 版本的应用在6.0 系统上 层叠窗口权限 -->
             <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
             <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
             <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
             <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!-- Android Q后台定位权限-->
-            <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.QUERY_ALL_PACKAGES"/>
-            <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 			    <!--华为角标-->
 			<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
             <!-- vivo 角标 -->
             <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
+            <!--honor 角标-->
+            <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" />
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest/application" mode="merge">
@@ -136,7 +133,7 @@
                     android:name="cn.jpush.android.ui.PushActivity"
                     android:configChanges="orientation|keyboardHidden"
                     android:theme="@android:style/Theme.NoTitleBar"
-                    android:exported="false">
+                    android:exported="true">
                 <intent-filter>
                     <action android:name="cn.jpush.android.ui.PushActivity" />
                     <category android:name="android.intent.category.DEFAULT" />
@@ -230,7 +227,7 @@
             <activity
                 android:name="cn.jpush.android.service.JNotifyActivity"
                 android:exported="true"
-                android:taskAffinity="jpush.custom"
+                android:taskAffinity=""
                 android:theme="@style/JPushTheme" >
                 <intent-filter>
                     <action android:name="cn.jpush.android.intent.JNotifyActivity" />
@@ -243,7 +240,7 @@
             <activity
                 android:name="cn.android.service.JTransitActivity"
                 android:exported="true"
-                android:taskAffinity="jpush.custom"
+                android:taskAffinity=""
                 android:theme="@style/JPushTheme" >
                 <intent-filter>
                     <action android:name="cn.android.service.JTransitActivity" />
@@ -263,20 +260,6 @@
                     <action android:name="cn.jiguang.user.service.action" />
                 </intent-filter>
             </service>
-            <!-- since 4.6.3 可选，适配Anroid7.0及以上，如果您的应用需要在Anroid7.0及以上环境运行 -->
-            <provider
-                android:name="cn.jiguang.union.ads.service.JAdFileProvider"
-                android:authorities="$PACKAGE_NAME.JAdFileProvider"
-                android:exported="false"
-                android:grantUriPermissions="true" >
-                <meta-data
-                    android:name="android.support.FILE_PROVIDER_PATHS"
-                    android:resource="@xml/jpush_file_paths" />
-                <intent-filter>
-                    <action android:name="cn.jpush.android.intent.FileProvider" />
-                    <category android:name="$PACKAGE_NAME" />
-                </intent-filter>
-            </provider>
 
             <receiver
                     android:name="cn.jiguang.cordova.push.JPushReceiver"
@@ -299,7 +282,7 @@
 
         </config-file>
 
-        <lib-file src="src/android/libs/jpush-android-4.8.1.jar" />
+        <lib-file src="src/android/libs/jpush-android-4.8.5.jar" />
 
         <source-file src="src/android/PushService.java" target-dir="src/cn/jiguang/cordova/push" />
         <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jiguang/cordova/push" />
diff --git a/src/android/JPushPlugin.java b/src/android/JPushPlugin.java
index d62ca8e..eb5fa82 100644
--- a/src/android/JPushPlugin.java
+++ b/src/android/JPushPlugin.java
@@ -31,6 +31,7 @@ import cn.jpush.android.api.BasicPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.api.TagAliasCallback;
 import cn.jpush.android.data.JPushLocalNotification;
+import cn.jiguang.api.utils.JCollectionAuth;
 
 public class JPushPlugin extends CordovaPlugin {
 
@@ -674,6 +675,17 @@ public class JPushPlugin extends CordovaPlugin {
         JPushInterface.setMobileNumber(mContext,sequence, number);
     }
 
+    void setAuth(JSONArray data, CallbackContext callbackContext) {
+        boolean isAuth = false;
+        try {
+            isAuth = data.getBoolean(0);
+            JCollectionAuth.setAuth(mContext, isAuth);
+            callbackContext.success();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     private boolean isValidHour(int hour) {
         return !(hour < 0 || hour > 23);
     }
diff --git a/www/JPushPlugin.js b/www/JPushPlugin.js
index 66e8b32..865e8a8 100644
--- a/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -482,6 +482,12 @@ JPushPlugin.prototype.setBadgeNumber = function(badgeNumb) {
   }
 };
 
+JPushPlugin.prototype.setAuth = function(isAuth){
+    if(device.platform === "Android"){
+        this.callNative("setAuth", [isAuth], null);
+    }
+}
+
 /**
  * 设置手机号。
  *