Merge remote-tracking branch 'refs/remotes/origin/dev'

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin)
 [![QQ Group](https://img.shields.io/badge/QQ%20Group-413602425-red.svg)]()
-[![release](https://img.shields.io/badge/release-2.2.4-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-2.2.7-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
 [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jpush-phonegap-plugin)
 [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jpush-phonegap-plugin",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "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="2.2.6">
+  version="2.2.7">
 
     <name>JPush Plugin</name>
     <description>JPush for cordova plugin</description>
@@ -81,7 +81,9 @@
         </config-file>
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <!-- Required SDK核心功能-->
-            <activity android:name="cn.jpush.android.ui.PushActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar" android:configChanges="orientation|keyboardHidden">
+            <activity android:name="cn.jpush.android.ui.PushActivity"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                android:configChanges="orientation|keyboardHidden">
                 <intent-filter>
                     <action android:name="cn.jpush.android.ui.PushActivity" />
                     <category android:name="android.intent.category.DEFAULT" />
@@ -90,7 +92,9 @@
             </activity>
 
             <!-- Rich push 核心功能 since 2.0.6-->
-            <activity android:name="cn.jpush.android.ui.PopWinActivity" android:theme="@style/MyDialogStyle" android:exported="false">
+            <activity android:name="cn.jpush.android.ui.PopWinActivity"
+                android:theme="@style/MyDialogStyle"
+                android:exported="false">
             </activity>
 
             <!-- Required  SDK核心功能-->
@@ -168,25 +172,26 @@
             <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY" />
         </config-file>
 
-        <source-file src="src/android/jpush-android-2.1.9.jar" target-dir="libs" />
-        <source-file src="src/android/armeabi/libjpush219.so" target-dir="libs/armeabi" />
-        <source-file src="src/android/armeabi-v7a/libjpush219.so" target-dir="libs/armeabi-v7a" />
-        <source-file src="src/android/arm64-v8a/libjpush219.so" target-dir="libs/arm64-v8a" />
-        <source-file src="src/android/x86/libjpush219.so" target-dir="libs/x86" />
-        <source-file src="src/android/x86_64/libjpush219.so" target-dir="libs/x86_64" />
+        <source-file src="src/android/libs/jpush-android-2.2.0.jar" target-dir="libs" />
+        <source-file src="src/android/libs/armeabi/libjpush220.so" target-dir="libs/armeabi" />
+        <source-file src="src/android/libs/armeabi-v7a/libjpush220.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="src/android/libs/arm64-v8a/libjpush220.so" target-dir="libs/arm64-v8a" />
+        <source-file src="src/android/libs/x86/libjpush220.so" target-dir="libs/x86" />
+        <source-file src="src/android/libs/x86_64/libjpush220.so" target-dir="libs/x86_64" />
 
         <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap" />
         <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap" />
-        <source-file src="src/android/test_notification_layout.xml" target-dir="res/layout" />
-        <source-file src="src/android/jpush_notification_icon.png" target-dir="res/drawable" />
 
-        <!-- Rich Push resources  -->
-        <source-file src="src/android/ic_richpush_actionbar_back.png" target-dir="res/drawable" />
-        <source-file src="src/android/ic_richpush_actionbar_divider.png" target-dir="res/drawable" />
-        <source-file src="src/android/richpush_btn_selector.xml" target-dir="res/drawable" />
-        <source-file src="src/android/jpush_popwin_layout.xml" target-dir="res/layout" />
-        <source-file src="src/android/jpush_webview_layout.xml" target-dir="res/layout" />
-        <source-file src="src/android/jpush_style.xml" target-dir="res/values" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml" target-dir="res/drawable" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml" target-dir="res/drawable" />
 
+        <source-file src="src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png" target-dir="res/drawable-hdpi" />
+        <source-file src="src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png" target-dir="res/drawable-hdpi" />
+
+        <source-file src="src/android/res/layout/jpush_popwin_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/res/layout/jpush_webview_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/res/layout/test_notification_layout.xml" target-dir="res/layout" />
+
+        <source-file src="src/android/res/values/jpush_style.xml" target-dir="res/values" />
     </platform>
 </plugin>

src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml

@@ -5,7 +5,7 @@
         android:state_focused="true" 
         android:state_enabled="true" 
         android:state_pressed="false" 
-        android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+        android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
      <!-- 按下时的背景图片 --> 
     <item 
         android:state_enabled="true" 
@@ -17,5 +17,5 @@
         android:state_checked="true" 
         android:drawable="@android:color/darker_gray" /> 
     <!-- 默认时的背景图片 --> 
-    <item android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+    <item android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
 </selector> 

src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- 背景  gradient是渐变,corners定义的是圆角 -->
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#ffffff" />
+        </shape>
+    </item>
+    
+    <!-- 进度条 -->
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="#4393ea" />
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>

src/android/res/layout/jpush_webview_layout.xml

@@ -18,7 +18,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="9dp"
             android:layout_marginRight="10dp"
-            android:background="@drawable/richpush_btn_selector" />
+            android:background="@drawable/jpush_richpush_btn_selector" />
 
         <ImageView
             android:id="@+id/imgView"
@@ -27,7 +27,7 @@
             android:layout_centerVertical="true"
             android:layout_toRightOf="@id/imgRichpushBtnBack"
             android:clickable="false"
-            android:src="@drawable/ic_richpush_actionbar_divider" />
+            android:src="@drawable/jpush_ic_richpush_actionbar_divider" />
 
         <TextView
             android:id="@+id/tvRichpushTitle"
@@ -35,6 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="7dp"
+            android:layout_marginRight="5dp"
             android:layout_toRightOf="@id/imgView"
             android:clickable="false"
             android:text=" "
@@ -42,6 +43,13 @@
             android:textColor="#ffffff" />
     </RelativeLayout>
 
+    <ProgressBar
+        android:id="@+id/pushPrograssBar"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:progress="0"
+        android:progressDrawable="@drawable/jpush_richpush_progressbar"
+        style="?android:attr/progressBarStyleHorizontal" />
     <WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"