diff --git a/plugin.xml b/plugin.xml
index f183fbc..6c56e87 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -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>
diff --git a/src/android/arm64-v8a/libjpush219.so b/src/android/arm64-v8a/libjpush219.so
deleted file mode 100644
index 909b68e..0000000
Binary files a/src/android/arm64-v8a/libjpush219.so and /dev/null differ
diff --git a/src/android/armeabi-v7a/libjpush219.so b/src/android/armeabi-v7a/libjpush219.so
deleted file mode 100644
index 9003c28..0000000
Binary files a/src/android/armeabi-v7a/libjpush219.so and /dev/null differ
diff --git a/src/android/armeabi/libjpush219.so b/src/android/armeabi/libjpush219.so
deleted file mode 100644
index 85b7cb5..0000000
Binary files a/src/android/armeabi/libjpush219.so and /dev/null differ
diff --git a/src/android/jpush-android-2.1.9.jar b/src/android/jpush-android-2.1.9.jar
deleted file mode 100644
index 554f732..0000000
Binary files a/src/android/jpush-android-2.1.9.jar and /dev/null differ
diff --git a/src/android/jpush_notification_icon.png b/src/android/jpush_notification_icon.png
deleted file mode 100644
index bbb2340..0000000
Binary files a/src/android/jpush_notification_icon.png and /dev/null differ
diff --git a/src/android/libs/arm64-v8a/libjpush220.so b/src/android/libs/arm64-v8a/libjpush220.so
new file mode 100644
index 0000000..671f52d
Binary files /dev/null and b/src/android/libs/arm64-v8a/libjpush220.so differ
diff --git a/src/android/libs/armeabi-v7a/libjpush220.so b/src/android/libs/armeabi-v7a/libjpush220.so
new file mode 100644
index 0000000..b7e43a8
Binary files /dev/null and b/src/android/libs/armeabi-v7a/libjpush220.so differ
diff --git a/src/android/libs/armeabi/libjpush220.so b/src/android/libs/armeabi/libjpush220.so
new file mode 100644
index 0000000..ebcaa16
Binary files /dev/null and b/src/android/libs/armeabi/libjpush220.so differ
diff --git a/src/android/libs/jpush-android-2.2.0.jar b/src/android/libs/jpush-android-2.2.0.jar
new file mode 100644
index 0000000..10aa826
Binary files /dev/null and b/src/android/libs/jpush-android-2.2.0.jar differ
diff --git a/src/android/libs/x86/libjpush220.so b/src/android/libs/x86/libjpush220.so
new file mode 100644
index 0000000..d805da5
Binary files /dev/null and b/src/android/libs/x86/libjpush220.so differ
diff --git a/src/android/libs/x86_64/libjpush220.so b/src/android/libs/x86_64/libjpush220.so
new file mode 100644
index 0000000..6b2fe14
Binary files /dev/null and b/src/android/libs/x86_64/libjpush220.so differ
diff --git a/src/android/ic_richpush_actionbar_back.png b/src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png
similarity index 100%
rename from src/android/ic_richpush_actionbar_back.png
rename to src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png
diff --git a/src/android/ic_richpush_actionbar_divider.png b/src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png
similarity index 100%
rename from src/android/ic_richpush_actionbar_divider.png
rename to src/android/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png
diff --git a/src/android/richpush_btn_selector.xml b/src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml
similarity index 82%
rename from src/android/richpush_btn_selector.xml
rename to src/android/res/drawable-hdpi/jpush_richpush_btn_selector.xml
index 4750de9..c6dd002 100644
--- a/src/android/richpush_btn_selector.xml
+++ b/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> 
\ No newline at end of file
diff --git a/src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml b/src/android/res/drawable-hdpi/jpush_richpush_progressbar.xml
new file mode 100644
index 0000000..a1d9b8f
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/android/jpush_popwin_layout.xml b/src/android/res/layout/jpush_popwin_layout.xml
similarity index 100%
rename from src/android/jpush_popwin_layout.xml
rename to src/android/res/layout/jpush_popwin_layout.xml
diff --git a/src/android/jpush_webview_layout.xml b/src/android/res/layout/jpush_webview_layout.xml
similarity index 78%
rename from src/android/jpush_webview_layout.xml
rename to src/android/res/layout/jpush_webview_layout.xml
index 19faa43..bebdd61 100644
--- a/src/android/jpush_webview_layout.xml
+++ b/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"
diff --git a/src/android/test_notification_layout.xml b/src/android/res/layout/test_notification_layout.xml
similarity index 100%
rename from src/android/test_notification_layout.xml
rename to src/android/res/layout/test_notification_layout.xml
diff --git a/src/android/jpush_style.xml b/src/android/res/values/jpush_style.xml
similarity index 100%
rename from src/android/jpush_style.xml
rename to src/android/res/values/jpush_style.xml
diff --git a/src/android/x86/libjpush219.so b/src/android/x86/libjpush219.so
deleted file mode 100644
index 282ec5d..0000000
Binary files a/src/android/x86/libjpush219.so and /dev/null differ
diff --git a/src/android/x86_64/libjpush219.so b/src/android/x86_64/libjpush219.so
deleted file mode 100644
index 5302dbe..0000000
Binary files a/src/android/x86_64/libjpush219.so and /dev/null differ