Merge branch 'master' of https://github.com/reactnativecomponent/react-native-netease-im

Author: hzlgit

README.md

@@ -5,9 +5,6 @@ React Native的网易云信插件
 [react-native-chat-demo](https://github.com/reactnativecomponent/react-native-chat-demo)
 
 #### 注意事项: 
-
-##### 1.react-native版本需要0.47.0及以上NIMSDK对应版本4.7.0
-
 ##### 2.普通帐号不要使用5位数，因为5位数设定是系统帐号，尽量使用6位或者6位以上
 
 ## 如何安装
@@ -117,11 +114,8 @@ public class MainApplication extends Application implements ReactApplication {
 #### iOS配置
 install with CocoaPods
 ```
-pod 'NIMSDK', '4.9.0'
-pod 'SSZipArchive', '~> 1.2'
-pod 'Reachability', '~> 3.1.1'
+pod 'NIMSDK', '5.6.0'
 pod 'CocoaLumberjack', '~> 2.0.0-rc2'
-pod 'FMDB', '~>2.5' 
 ```
 Run `pod install`
 
@@ -197,10 +191,13 @@ UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTy
 ```
 
 #### Android配置
-
 在`android/app/build.gradle`里，defaultConfig栏目下添加如下代码：
-
-
+```
+manifestPlaceholders = [
+	// 如果有多项，每一项之间需要用逗号分隔
+    NIM_KEY: "云信的APPID"    //在此修改云信APPID
+]
+```
 在`AndroidManifest.xml`里，添加如下代码：
 ```
 < manifest

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-slate

android/build.gradle

@@ -4,7 +4,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+//    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 16

android/libs/MiPush_SDK_Client_3_6_2.jar

@@ -36,6 +36,7 @@
     <application>
 
         <!--适配 Android O 版本后台运行机制-->
+        <!-- 网易云通信进程间通信service -->
         <service android:name="com.netease.nimlib.service.ResponseService" />
         <!-- 声明网易云通信后台服务，如需保持后台推送，使用独立进程效果会更好。 -->
         <service
@@ -69,9 +70,6 @@
         <!-- 网易云通信进程间通信 Receiver -->
         <receiver android:name="com.netease.nimlib.service.ResponseReceiver" />
 
-        <!-- 网易云通信进程间通信service -->
-        <service android:name="com.netease.nimlib.service.ResponseService" />
-
         <!-- 安卓保活配置 -->
         <service
             android:name="com.netease.cosine.core.CosineService"
@@ -146,6 +144,11 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
+        <provider
+            android:name="com.netease.nimlib.ipc.NIMContentProvider"
+            android:authorities="${applicationId}.ipc.provider"
+            android:exported="false"
+            android:process=":core" />
     </application>
 </manifest>
 

android/libs/mi_push_sdk_3.2.2.jar

@@ -32,6 +32,7 @@
 import com.netease.nimlib.sdk.SDKOptions;
 import com.netease.nimlib.sdk.StatusBarNotificationConfig;
 import com.netease.nimlib.sdk.auth.LoginInfo;
+import com.netease.nimlib.sdk.mixpush.MixPushConfig;
 import com.netease.nimlib.sdk.mixpush.MixPushService;
 import com.netease.nimlib.sdk.mixpush.NIMPushClient;
 import com.netease.nimlib.sdk.msg.MessageNotifierCustomization;
@@ -93,7 +94,11 @@ public static void init(Context context, Class mainActivityClass, @DrawableRes i
 
         // 注册小米推送appID 、appKey 以及在云信管理后台添加的小米推送证书名称，该逻辑放在 NIMClient init 之前
         if (miPushConfig != null) {
-            NIMPushClient.registerMiPush(context, miPushConfig.certificate, miPushConfig.appID, miPushConfig.appKey);
+            MixPushConfig mixPushConfig = new MixPushConfig();
+            mixPushConfig.xmCertificateName = miPushConfig.certificate;
+            mixPushConfig.xmAppId = miPushConfig.appID;
+            mixPushConfig.xmAppKey = miPushConfig.appKey;
+            NIMPushClient.initPush(new MixPushConfig());
         }
 
         NIMClient.init(context, getLoginInfo(), getOptions(context));