Merge pull request #906 from LcTerry/master

更新
jpush · Apr 6, 2023 · 99fcc32 · 99fcc32
2 parents 703e4d8 + d094cf9
commit 99fcc32
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/android/libs/jpush-android-4.8.1.jar b/android/libs/jpush-android-4.8.1.jar
diff --git a/android/libs/jpush-android-4.8.3.jar b/android/libs/jpush-android-4.8.3.jar
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -4,35 +4,40 @@
     <permission
         android:name="${applicationId}.permission.JPUSH_MESSAGE"
         android:protectionLevel="signature" />
-
     <!-- Required -->
     <uses-permission android:name="${applicationId}.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"/>
+    <!--华为角标-->
+    <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" />
+    <!--小米 推送必须-->
+    <uses-permission android:name="android.permission.VIBRATE" />
     <!-- Optional. Required for location feature -->
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <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_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.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
-
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <application>
         <activity
             android:name="cn.jpush.android.ui.PopWinActivity"
-            android:exported="false"
-            android:theme="@style/MyDialogStyle" />
+            android:exported="true"
+            android:theme="@style/MyDialogStyle" >
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="cn.jpush.android.ui.PopWinActivity" />
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name="cn.jpush.android.ui.PushActivity"
@@ -50,7 +55,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" />
@@ -83,7 +88,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" />
@@ -95,7 +100,7 @@
             android:enabled="true"
             android:exported="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:taskAffinity="jpush.custom">
+            android:taskAffinity="">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.DActivity"/>
                 <category android:name="${applicationId}" />

diff --git a/example/package.json b/example/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "jcore-react-native": "1.9.5",
-    "jpush-react-native": "2.9.4",
+    "jpush-react-native": "2.9.7",
     "react": "16.8.6",
     "react-native": "0.60.5",
     "update": "^0.7.4"

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "types": "index.d.ts",
   "license": "ISC",
   "author": "wicked.tc130",
-  "version": "2.9.4",
+  "version": "2.9.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/jpush/jpush-react-native"