Merge pull request #89 from jpush/dev

Dev
jpush · Nov 14, 2018 · b166833 · b166833
2 parents d564819 + f6848bb
commit b166833
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -11,10 +11,10 @@
 
 >注意：从 v3.4.0 开始支持 cordova-android 7.0.0，因 cordova-android 7.0.0 修改了 Android 项目结构，因此不兼容之前的版本，升级前请务必注意。
 >
->如果需要安装之前版本的插件，请先安装 v1.2.0 以下版本（建议安装 v1.1.12）的 [cordova-plugin-jcore](https://github.com/jpush/cordova-plugin-jcore)，再安装旧版插件（建议v3.2.0），否则运行会报错。
->
 >如果需要在cordova-android 7.0.0之前版本集成最新插件，参照[这篇文章](https://www.jianshu.com/p/23b117ca27a6)
 >
+>如果需要安装之前版本的插件，请先安装 v1.2.0 以下版本（建议安装 v1.1.12）的 [cordova-plugin-jcore](https://github.com/jpush/cordova-plugin-jcore)，再安装旧版插件（建议v3.2.0），否则运行会报错。
+>
 >[Cordova Android版本与原生版本对应表](http://cordova.apache.org/docs/en/latest/guide/platforms/android/index.html#requirements-and-support)
 
 ## Full Documentation

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jmessage-phonegap-plugin",
-    "version": "3.5.3",
+    "version": "3.6.0",
     "description": "JMessage Cordova Plugin.",
     "cordova": {
         "id": "jmessage-phonegap-plugin",

diff --git a/plugin.xml b/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="jmessage-phonegap-plugin"
-        version="3.5.3">
+        version="3.6.0">
 
     <name>JMessage</name>
     <description>集成极光 IM 和推送功能</description>
@@ -110,8 +110,7 @@
             <!-- Required Push SDK核心功能-->
             <receiver
                 android:name="cn.jpush.android.service.PushReceiver"
-                android:enabled="true"
-                android:exported="false">
+                android:enabled="true">
                 <intent-filter android:priority="1000">
                     <!--Required  显示通知栏 -->
                     <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
@@ -130,9 +129,7 @@
             </receiver>
 
             <!-- Required Push SDK核心功能 -->
-            <receiver
-                android:name="cn.jpush.android.service.AlarmReceiver"
-                android:exported="false" />
+            <receiver android:name="cn.jpush.android.service.AlarmReceiver"/>
 
             <!-- IM Required IM SDK核心功能-->
             <receiver
@@ -163,11 +160,11 @@
             <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
         </config-file>
 
-        <lib-file src="src/android/libs/jmessage-sdk-android-2.6.1.jar" />
+        <lib-file src="src/android/libs/jmessage-sdk-android-2.7.1.jar" />
 
-        <source-file src="src/android/JMessagePlugin.java" target-dir="app/src/main/java/cn/jiguang/cordova/im"/>
-        <source-file src="src/android/JMessageUtils.java" target-dir="app/src/main/java/cn/jiguang/cordova/im"/>
-        <source-file src="src/android/JsonUtils.java" target-dir="app/src/main/java/cn/jiguang/cordova/im"/>
-        <source-file src="src/android/ChatRoomHandler.java" target-dir="app/src/main/java/cn/jiguang/cordova/im"/>
+        <source-file src="src/android/JMessagePlugin.java" target-dir="src/cn/jiguang/cordova/im"/>
+        <source-file src="src/android/JMessageUtils.java" target-dir="src/cn/jiguang/cordova/im"/>
+        <source-file src="src/android/JsonUtils.java" target-dir="src/cn/jiguang/cordova/im"/>
+        <source-file src="src/android/ChatRoomHandler.java" target-dir="src/cn/jiguang/cordova/im"/>
     </platform>
 </plugin>