Update SDK to Android v3.6.6 iOS v3.3.3

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jpush-phonegap-plugin",
-    "version": "3.7.5",
+    "version": "3.7.6",
     "description": "JPush for cordova plugin",
     "cordova": {
         "id": "jpush-phonegap-plugin",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="jpush-phonegap-plugin"
-  version="3.7.5">
+  version="3.7.6">
 
     <name>JPush</name>
     <description>JPush for cordova plugin</description>
@@ -49,7 +49,7 @@
         <source-file src="src/ios/Plugins/AppDelegate+JPush.m" />
 
         <header-file src="src/ios/lib/JPUSHService.h" />
-        <source-file src="src/ios/lib/jpush-ios-3.2.6.a" framework="true" />
+        <source-file src="src/ios/lib/jpush-ios-3.3.3.a" framework="true" />
         <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />
@@ -255,7 +255,7 @@
 
         </config-file>
 
-        <lib-file src="src/android/libs/jpush-android-3.5.8.jar" />
+        <lib-file src="src/android/libs/jpush-android-3.6.6.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" />
@@ -278,6 +278,8 @@
           target="res/layout/jpush_webview_layout.xml" />
         <resource-file src="src/android/res/layout/push_notification.xml"
           target="res/layout/push_notification.xml" />
+        <resource-file src="src/android/res/layout-v21/push_notification.xml"
+          target="res/layout-v21/push_notification.xml" />
 
         <resource-file src="src/android/res/values/jpush_style.xml"
                        target="res/values/jpush_style.xml" />

src/android/res/layout-v21/push_notification.xml

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/push_root_view"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="2dp"
+    android:paddingRight="8dp"
+    android:paddingLeft="8dp"
+    android:paddingBottom="4dp">
+
+    <FrameLayout
+        android:id="@+id/v21"
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
+
+    <RelativeLayout
+        android:id="@+id/push_notification_style_default"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:id="@+id/push_notification_layout_lefttop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@+id/push_notification_big_icon"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/push_notification_small_icon"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginLeft="6dp"
+                android:scaleType="centerInside" />
+            <TextView
+                style="@android:style/TextAppearance.Material.Notification.Title"
+                android:id="@+id/push_notification_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:maxLines="1"
+                android:maxWidth="200dp"
+                android:maxLength="24"
+                android:textSize="12sp" />
+            <TextView
+                style="@android:style/TextAppearance.Material.Notification.Info"
+                android:id="@+id/push_notification_dot"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:text="· "
+                android:textSize="20sp" />
+            <TextView
+                style="@android:style/TextAppearance.Material.Notification.Time"
+                android:maxLines="1"
+                android:id="@+id/push_notification_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/push_notification_big_icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="8dp"
+            android:scaleType="centerInside" />
+
+        <TextView
+            style="@android:style/TextAppearance.Material.Notification.Title"
+            android:id="@+id/push_notification_sub_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="1dp"
+            android:layout_below="@id/push_notification_layout_lefttop"
+            android:layout_toLeftOf="@+id/push_notification_big_icon"
+            android:layout_marginLeft="6dp"
+            android:layout_marginRight="4dp"
+            android:maxLines="1"
+            android:textSize="13sp"
+            android:visibility="gone" />
+
+        <TextView
+            style="@android:style/TextAppearance.Material.Notification.Info"
+            android:id="@+id/push_notification_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="4dp"
+            android:layout_below="@id/push_notification_sub_title"
+            android:layout_toLeftOf="@+id/push_notification_big_icon"
+            android:layout_marginLeft="6dp"
+            android:ellipsize="end"
+            android:layout_marginTop="1dp"
+            android:maxLines="2"
+            android:textSize="13sp" />
+        <TextView
+            style="@android:style/TextAppearance.Material.Notification.Info"
+            android:id="@+id/push_notification_content_one_line"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="4dp"
+            android:layout_toLeftOf="@+id/push_notification_big_icon"
+            android:layout_below="@id/push_notification_sub_title"
+            android:ellipsize="end"
+            android:layout_marginLeft="6dp"
+            android:layout_marginTop="1dp"
+            android:textSize="13sp"
+            android:maxLines="1"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/push_notification_style_1"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:visibility="gone">
+        <ImageView
+            android:id="@+id/push_notification_style_1_big_icon"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:scaleType="centerInside" />
+        <LinearLayout
+            android:layout_marginLeft="6dp"
+            android:layout_toRightOf="@+id/push_notification_style_1_big_icon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:orientation="vertical">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    style="@android:style/TextAppearance.Material.Notification.Time"
+                    android:id="@+id/push_notification_style_1_date"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_width="wrap_content"
+                    android:textSize="12sp" />
+                <TextView
+                    style="@android:style/TextAppearance.Material.Notification.Title"
+                    android:id="@+id/push_notification_style_1_title"
+                    android:layout_alignParentLeft="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toLeftOf="@+id/push_notification_style_1_date"
+                    android:maxLines="1"
+                    android:layout_marginRight="8dp"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+            </RelativeLayout>
+            <TextView
+                style="@android:style/TextAppearance.Material.Notification.Info"
+                android:id="@+id/push_notification_style_1_content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="4dp"
+                android:ellipsize="end"
+                android:layout_marginTop="1dp"
+                android:maxLines="2"
+                android:textSize="13sp" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</RelativeLayout>

src/android/res/layout/push_notification.xml

@@ -4,17 +4,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="4dp"
     android:paddingTop="2dp"
-    android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    >
+    android:paddingLeft="8dp"
+    android:paddingBottom="4dp">
+
+    <FrameLayout
+        android:id="@+id/v"
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
 
-    <ImageView
-        android:id="@+id/push_notification_bg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"/>
     <RelativeLayout
         android:id="@+id/push_notification_style_default"
         android:layout_width="match_parent"
@@ -33,8 +32,9 @@
                 android:layout_width="18dp"
                 android:layout_height="18dp"
                 android:layout_marginLeft="6dp"
-                android:scaleType="centerInside"/>
+                android:scaleType="centerInside" />
             <TextView
+                style="@android:style/TextAppearance.Material.Notification.Title"
                 android:id="@+id/push_notification_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -42,27 +42,24 @@
                 android:maxLines="1"
                 android:maxWidth="200dp"
                 android:maxLength="24"
-                android:textColor="@android:color/black"
-                android:textSize="12sp"/>
+                android:textSize="12sp" />
             <TextView
+                style="@*android:style/TextAppearance.StatusBar.EventContent.Info"
                 android:id="@+id/push_notification_dot"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="4dp"
                 android:text="· "
-                android:textColor="@android:color/black"
-                android:textSize="20sp"/>
+                android:textSize="20sp" />
             <TextView
-                android:maxLines="1"
+                style="@*android:style/TextAppearance.StatusBar.EventContent.Time"
                 android:id="@+id/push_notification_date"
+                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/black"
-                android:textSize="12sp"
-                />
+                android:textSize="12sp" />
         </LinearLayout>
 
-
         <ImageView
             android:id="@+id/push_notification_big_icon"
             android:layout_width="48dp"
@@ -70,102 +67,102 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="8dp"
-            android:scaleType="centerInside"/>
+            android:scaleType="centerInside" />
 
         <TextView
+            style="@android:style/TextAppearance.Material.Notification.Title"
             android:id="@+id/push_notification_sub_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@android:color/black"
+            android:layout_marginTop="1dp"
             android:layout_below="@id/push_notification_layout_lefttop"
             android:layout_toLeftOf="@+id/push_notification_big_icon"
             android:layout_marginLeft="6dp"
             android:layout_marginRight="4dp"
-            android:visibility="gone"
-            android:layout_marginTop="1dp"
-            android:textSize="13sp"
             android:maxLines="1"
-            />
+            android:textSize="13sp"
+            android:visibility="gone" />
 
         <TextView
+            style="@*android:style/TextAppearance.StatusBar.EventContent.Info"
             android:id="@+id/push_notification_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@android:color/black"
+            android:layout_marginRight="4dp"
             android:layout_below="@id/push_notification_sub_title"
             android:layout_toLeftOf="@+id/push_notification_big_icon"
             android:layout_marginLeft="6dp"
-            android:layout_marginRight="4dp"
-            android:layout_marginTop="1dp"
-            android:textSize="13sp"
-            android:maxLines="2"
             android:ellipsize="end"
-            />
+            android:layout_marginTop="1dp"
+            android:maxLines="2"
+            android:textSize="13sp" />
         <TextView
+            style="@*android:style/TextAppearance.StatusBar.EventContent.Info"
             android:id="@+id/push_notification_content_one_line"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:textColor="@android:color/black"
-            android:layout_below="@id/push_notification_sub_title"
-            android:layout_toLeftOf="@+id/push_notification_big_icon"
-            android:layout_marginLeft="6dp"
             android:layout_marginRight="4dp"
+            android:layout_toLeftOf="@+id/push_notification_big_icon"
+            android:layout_below="@id/push_notification_sub_title"
+            android:ellipsize="end"
+            android:layout_marginLeft="6dp"
             android:layout_marginTop="1dp"
             android:textSize="13sp"
             android:maxLines="1"
-            android:ellipsize="end"
-            />
+            android:visibility="gone" />
     </RelativeLayout>
+
     <RelativeLayout
         android:id="@+id/push_notification_style_1"
-        android:visibility="gone"
+        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:visibility="gone">
         <ImageView
             android:id="@+id/push_notification_style_1_big_icon"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:scaleType="centerInside"/>
+            android:scaleType="centerInside" />
         <LinearLayout
             android:layout_marginLeft="6dp"
             android:layout_toRightOf="@+id/push_notification_style_1_big_icon"
-            android:orientation="vertical"
-            android:layout_centerVertical="true"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:orientation="vertical">
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
+                    style="@*android:style/TextAppearance.StatusBar.EventContent.Time"
                     android:id="@+id/push_notification_style_1_date"
-                    android:textSize="12sp"
+                    android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:textSize="12sp" />
                 <TextView
+                    style="@android:style/TextAppearance.Material.Notification.Title"
                     android:id="@+id/push_notification_style_1_title"
                     android:layout_alignParentLeft="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_toLeftOf="@+id/push_notification_style_1_date"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
                     android:maxLines="1"
                     android:layout_marginRight="8dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
             </RelativeLayout>
             <TextView
+                style="@*android:style/TextAppearance.StatusBar.EventContent.Info"
                 android:id="@+id/push_notification_style_1_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/black"
                 android:layout_marginRight="4dp"
+                android:ellipsize="end"
                 android:layout_marginTop="1dp"
-                android:textSize="13sp"
                 android:maxLines="2"
-                android:ellipsize="end" />
+                android:textSize="13sp" />
         </LinearLayout>
     </RelativeLayout>
 

src/ios/Plugins/JPushPlugin.m

@@ -61,7 +61,7 @@
 
 #else
 
-- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
+- (CDVPlugin*)initWithWebView:(WKWebView*)theWebView{
     NSLog(@"### initWithWebView ");
     if (self=[super initWithWebView:theWebView]) {
     }

src/ios/lib/JPUSHService.h

@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 3.2.6
+#define JPUSH_VERSION_NUMBER 3.3.3
 
 #import <Foundation/Foundation.h>
 
@@ -48,6 +48,13 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) {
     JPAuthorizationOptionAnnouncement NS_AVAILABLE_IOS(13.0) = (1 << 7) , //The ability for Siri to automatically read out messages over AirPods.
 };
 
+typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) {
+    JPAuthorizationNotDetermined    = 0,   // The user has not yet made a choice regarding whether the application may post user notifications.
+    JPAuthorizationStatusDenied,    // The application is not authorized to post user notifications.
+    JPAuthorizationStatusAuthorized,    // The application is authorized to post user notifications.
+    JPAuthorizationStatusProvisional NS_AVAILABLE_IOS(12.0),    // The application is authorized to post non-interruptive user notifications.
+};
+
 /*!
  * 通知注册实体类
  */
@@ -212,12 +219,38 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) {
 
 + (void)registerDeviceToken:(NSData *)deviceToken;
 
-
 /*!
  * @abstract 处理收到的 APNs 消息
  */
 + (void)handleRemoteNotification:(NSDictionary *)remoteInfo;
 
+/*!
+ * @abstract  向极光服务器提交Token
+ *
+ * @param voipToken 推送使用的Voip Token
+ */
++ (void)registerVoipToken:(NSData *)voipToken;
+
+
+/*!
+ * @abstract  处理收到的 Voip 消息
+ *
+ * @param remoteInfo 下发的 Voip 内容
+ */
++ (void)handleVoipNotification:(NSDictionary *)remoteInfo;
+
+
+/*!
+* @abstract 检测通知授权状态
+* @param completion 授权结果通过status值返回，详见JPAuthorizationStatus
+*/
++ (void)requestNotificationAuthorization:(void (^)(JPAuthorizationStatus status))completion;
+
+/*!
+* @abstract 跳转至系统设置页面，iOS8及以上有效
+*/
++ (void)openSettingsForNotification:(void (^)(BOOL success))completionHandler NS_AVAILABLE_IOS(8_0);
+
 /*!
  * Tags操作接口
  * 支持增加/覆盖/删除/清空/查询操作
@@ -600,6 +633,14 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) {
  */
 + (void)setLogOFF;
 
+/*!
+ * @abstract 设置SDK地理位置权限开关
+ *
+ * @discussion 关闭地理位置之后，SDK地理围栏的相关功能将受到影响，默认是开启。
+ *
+ */
++ (void)setLocationEanable:(BOOL)isEanble;
+
 ///----------------------------------------------------
 ///********************下列方法已过期********************
 ///**************请使用新版tag/alias操作接口**************
@@ -662,6 +703,13 @@ callbackSelector:(SEL)cbSelector
  */
 - (void)jpushNotificationCenter:(UNUserNotificationCenter *)center openSettingsForNotification:(UNNotification *)notification NS_AVAILABLE_IOS(12.0);
 
+/**
+ * 监测通知授权状态返回的结果
+ * @param status 授权通知状态，详见JPAuthorizationStatus
+ * @param info 更多信息，预留参数
+ */
+- (void)jpushNotificationAuthorization:(JPAuthorizationStatus)status withInfo:(NSDictionary *)info;
+
 @end
 
 @protocol JPUSHGeofenceDelegate <NSObject>