diff --git a/package.json b/package.json index 4ef1410..8ec66fd 100644 --- a/package.json +++ b/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", diff --git a/plugin.xml b/plugin.xml index 2683aa0..7bd5c61 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="3.7.6"> JPush JPush for cordova plugin @@ -49,7 +49,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -278,6 +278,8 @@ target="res/layout/jpush_webview_layout.xml" /> + diff --git a/src/android/libs/jpush-android-3.5.8.jar b/src/android/libs/jpush-android-3.5.8.jar deleted file mode 100644 index dc788eb..0000000 Binary files a/src/android/libs/jpush-android-3.5.8.jar and /dev/null differ diff --git a/src/android/libs/jpush-android-3.6.6.jar b/src/android/libs/jpush-android-3.6.6.jar new file mode 100755 index 0000000..a43ba9c Binary files /dev/null and b/src/android/libs/jpush-android-3.6.6.jar differ diff --git a/src/android/res/layout-v21/push_notification.xml b/src/android/res/layout-v21/push_notification.xml new file mode 100755 index 0000000..b9fb2aa --- /dev/null +++ b/src/android/res/layout-v21/push_notification.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/res/layout/push_notification.xml b/src/android/res/layout/push_notification.xml index 299ea09..611e3ae 100755 --- a/src/android/res/layout/push_notification.xml +++ b/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"> + + - + android:scaleType="centerInside" /> + android:textSize="12sp" /> + android:textSize="20sp" /> + android:textSize="12sp" /> - + android:scaleType="centerInside" /> + android:textSize="13sp" + android:visibility="gone" /> + android:layout_marginTop="1dp" + android:maxLines="2" + android:textSize="13sp" /> + android:visibility="gone" /> + + android:visibility="gone"> + android:scaleType="centerInside" /> + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:orientation="vertical"> + android:textSize="12sp" /> + android:textSize="12sp" + android:textStyle="bold" /> + android:textSize="13sp" /> diff --git a/src/ios/Plugins/JPushPlugin.m b/src/ios/Plugins/JPushPlugin.m index 33229a5..a5baf29 100644 --- a/src/ios/Plugins/JPushPlugin.m +++ b/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]) { } diff --git a/src/ios/lib/jpush-ios-3.2.6.a b/src/ios/lib/jpush-ios-3.3.3.a old mode 100644 new mode 100755 similarity index 60% rename from src/ios/lib/jpush-ios-3.2.6.a rename to src/ios/lib/jpush-ios-3.3.3.a index 0faba55..b7c837d Binary files a/src/ios/lib/jpush-ios-3.2.6.a and b/src/ios/lib/jpush-ios-3.3.3.a differ