github/jpush-phonegap-plugin
github/jpush-phonegap-plugin
3
0
Fork 1
mirror of https://github.com/jpush/jpush-phonegap-plugin.git synced 2025-02-07 19:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update SDK to Android v3.6.6 iOS v3.3.3

Browse Source
This commit is contained in:
JoshLi 2020-06-10 18:04:30 +08:00
parent a50bafcf3e
commit e56a05c64b
8 changed files with 225 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

8
plugin.xml
View File

@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
id="jpush-phonegap-plugin" id="jpush-phonegap-plugin"
version="3.7.5"> version="3.7.6">
<name>JPush</name> <name>JPush</name>
<description>JPush for cordova plugin</description> <description>JPush for cordova plugin</description>
@ -49,7 +49,7 @@
<source-file src="src/ios/Plugins/AppDelegate+JPush.m" /> <source-file src="src/ios/Plugins/AppDelegate+JPush.m" />
<header-file src="src/ios/lib/JPUSHService.h" /> <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" /> <resource-file src="src/ios/JPushConfig.plist" />
<framework src="CFNetwork.framework" weak="true" /> <framework src="CFNetwork.framework" weak="true" />
@ -255,7 +255,7 @@
</config-file> </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/PushService.java" target-dir="src/cn/jiguang/cordova/push" />
<source-file src="src/android/JPushPlugin.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" /> target="res/layout/jpush_webview_layout.xml" />
<resource-file src="src/android/res/layout/push_notification.xml" <resource-file src="src/android/res/layout/push_notification.xml"
target="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" <resource-file src="src/android/res/values/jpush_style.xml"
target="res/values/jpush_style.xml" /> target="res/values/jpush_style.xml" />

BIN
src/android/libs/jpush-android-3.5.8.jar
View File

Binary file not shown.

BIN
src/android/libs/jpush-android-3.6.6.jar Executable file
View File

Binary file not shown.

169
src/android/res/layout-v21/push_notification.xml Executable file
View File

@ -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>

101
src/android/res/layout/push_notification.xml
View File

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

2
src/ios/Plugins/JPushPlugin.m
View File

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

BIN
src/ios/lib/jpush-ios-3.2.6.a → src/ios/lib/jpush-ios-3.3.3.a Normal file → Executable file
View File

Binary file not shown.