添加华为推送

hzlgit · hzlgit · commit c1c1f48f78a0 · 2019-04-25T16:51:04.000+08:00
修改推送的配置方式
diff --git a/README.md b/README.md
@@ -75,8 +75,9 @@ public class MainActivity extends ReactActivity {
 
 ```java
 ...
-import com.netease.im.RNNeteaseImPackage;  // 在public class MainApplication之前import
+import com.netease.im.RNNeteaseImPackage;
 import com.netease.im.IMApplication;
+import com.netease.nimlib.sdk.mixpush.MixPushConfig;
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -101,9 +102,16 @@ public class MainApplication extends Application implements ReactApplication {
   }
    @Override
   public void onCreate() {
-    //初始化方法appId以及appKey在小米开放平台获取，小米推送证书名称在网易云信后台设置
-    IMApplication.setDebugAble(BuildConfig.DEBUG);
-    IMApplication.init(this, MainActivity.class,R.drawable.ic_stat_notify_msg,new    IMApplication.MiPushConfig("小米推送证书名称","小米推送appId","小米推送的appKey"));
+    // IMApplication.setDebugAble(BuildConfig.DEBUG);
+    // 推送配置，没有可传null
+    MixPushConfig config = new MixPushConfig();
+    // 小米证书配置，没有可不填
+    config.xmAppId = "";
+    config.xmAppKey = "";
+    config.xmCertificateName = "";
+    // 华为推送配置，没有可不填
+    config.hwCertificateName = "";
+    IMApplication.init(this, MainActivity.class,R.drawable.ic_stat_notify_msg, config);
    ...
   }
 }
@@ -114,14 +122,10 @@ public class MainApplication extends Application implements ReactApplication {
 #### iOS配置
 install with CocoaPods
 ```
-pod 'NIMSDK', '5.6.0'
+pod 'NIMSDK', '6.2.0'
 pod 'CocoaLumberjack', '~> 2.0.0-rc2'
 ```
-Run `pod install`
-
-在工程target的`Build Phases->Link Binary with Libraries`中加入`、libsqlite3.0.tbd、libc++.tbd、libz.tbd、CoreTelephony.framework、AVFoundation.framework、CoreMedia.framework、CoreMotion.framework`
-
-
+进入/ios目录执行 `pod install`
 
 在你工程的`AppDelegate.m`文件中添加如下代码：
 
@@ -204,18 +208,18 @@ manifestPlaceholders = [
 
     ......
 
-    <!-- SDK 权限申明, 第三方 APP 接入时，请将 com.im.demo 替换为自己的包名 -->
+    <!-- SDK 权限申明 -->
     <!-- 和下面的 uses-permission 一起加入到你的 AndroidManifest 文件中。 -->
     <permission
-        android:name="com.im.demo.permission.RECEIVE_MSG"
+        android:name="${applicationId}.permission.RECEIVE_MSG"
         android:protectionLevel="signature"/>
-    <!-- 接收 SDK 消息广播权限， 第三方 APP 接入时，请将 com.im.demo 替换为自己的包名 -->
-    <uses-permission android:name="com.im.demo.permission.RECEIVE_MSG"/>
+    <!-- 接收 SDK 消息广播权限 -->
+    <uses-permission android:name="${applicationId}.permission.RECEIVE_MSG"/>
     <!-- 小米推送 -->
     <permission
         android:name="com.im.demo.permission.MIPUSH_RECEIVE"
         android:protectionLevel="signature"/>
-    <uses-permission android:name="com.im.demo.permission.MIPUSH_RECEIVE"/>
+    <uses-permission android:name="${applicationId}.permission.MIPUSH_RECEIVE"/>
 
     ......
     < application
@@ -224,15 +228,21 @@ manifestPlaceholders = [
              <meta-data
                         android:name="com.netease.nim.appKey"
                         android:value="App Key" />
-            <!--添加新的 IPC 数据共享机制，替换不安全的多进程读写 SharedPreference-->
-            <provider
-                android:name="com.netease.nimlib.ipc.NIMContentProvider"
-                android:authorities="com.im.demo.ipc.provider"
-                android:exported="false"
-                android:process=":core" />
 
+
+```
+在`build.gradle`里，添加如下代码：
+```
+allprojects {
+    repositories {
+
+      // 添加行
+       maven {url 'http://developer.huawei.com/repo/'}
+    }
+}
 ```
 
+
 ## 如何使用
 
 ### 引入包
diff --git a/android/build.gradle b/android/build.gradle
@@ -34,5 +34,6 @@ repositories {
 dependencies {
     compile fileTree(include: '*.jar', dir: 'libs')
     compile 'com.facebook.react:react-native:+'
+    implementation 'com.huawei.android.hms:push:2.6.3.301'
 }
   
diff --git a/android/react-native-android.md b/android/react-native-android.md
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.netease.im">
 
     <!-- 加入应用需要的权限 -->
@@ -9,7 +10,8 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
 
     <!-- 手机状态 -->
     <uses-permission android:name="android.permission.GET_TASKS"/>
@@ -18,7 +20,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
 
     <!-- 读写文件 -->
@@ -30,9 +33,15 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
-    <uses-permission android:name="android.permission.CLEAR_APP_CACHE"/>
+    <uses-permission android:name="android.permission.CLEAR_APP_CACHE"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
 
+    <!--以下两处 {你的包名} 改开发者App的包名-->
+    <permission android:name="${applicationId}.permission.MIPUSH_RECEIVE"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="${applicationId}.permission.MIPUSH_RECEIVE" />
+
     <application>
 
         <!--适配 Android O 版本后台运行机制-->
@@ -138,6 +147,33 @@
                 <action android:name="com.xiaomi.mipush.ERROR"/>
             </intent-filter>
         </receiver>
+        <!--华为推送-->
+        <provider
+            android:name="com.huawei.hms.update.provider.UpdateProvider"
+            android:authorities="${applicationId}.hms.update.provider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
+        <!-- 云信华为推送消息广播 -->
+        <receiver android:name="com.netease.nimlib.mixpush.hw.HWPushReceiver">
+            <intent-filter android:priority="0x7fffffff">
+                <action android:name="com.huawei.android.push.intent.REGISTRATION" />
+                <action android:name="com.huawei.android.push.intent.RECEIVE" />
+                <action android:name="com.huawei.android.push.intent.CLICK" />
+                <action android:name="com.huawei.intent.action.PUSH_STATE" />
+            </intent-filter>
+            <meta-data
+                android:name="CS_cloud_ablitity"
+                android:value="successRateAnalytics" />
+        </receiver>
+
+        <!-- 兼容性广播 -->
+        <receiver android:name="com.huawei.hms.support.api.push.PushReceiver">
+            <intent-filter>
+                <!-- 接收通道发来的通知栏消息，兼容老版本Push -->
+                <action android:name="com.huawei.intent.action.PUSH" />
+            </intent-filter>
+        </receiver>
+        <!--网络-->
         <receiver android:name=".receiver.NetworkReceiver">
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
diff --git a/android/src/main/java/com/netease/im/IMApplication.java b/android/src/main/java/com/netease/im/IMApplication.java
@@ -44,28 +44,29 @@
 import com.netease.nimlib.sdk.uinfo.UserInfoProvider;
 import com.netease.nimlib.sdk.util.NIMUtil;
 
+
 /**
  * Created by dowin on 2017/4/28.
  */
 
 public class IMApplication {
 
 
-    public static class MiPushConfig {
-
-        public String certificate;
-        public String appID;
-        public String appKey;
-
-        /**
-         * 注册小米推送证书名称 、推送appID 以及在云信管理后台添加的appKey
-         */
-        public MiPushConfig(String certificate, String appID, String appKey) {
-            this.certificate = certificate;
-            this.appID = appID;
-            this.appKey = appKey;
-        }
-    }
+//    public static class MiPushConfig {
+//
+//        public String certificate;
+//        public String appID;
+//        public String appKey;
+//
+//        /**
+//         * 注册小米推送证书名称 、推送appID 以及在云信管理后台添加的appKey
+//         */
+//        public MiPushConfig(String certificate, String appID, String appKey) {
+//            this.certificate = certificate;
+//            this.appID = appID;
+//            this.appKey = appKey;
+//        }
+//    }
 
     // context
     private static Context context;
@@ -87,21 +88,20 @@ public MiPushConfig(String certificate, String appID, String appKey) {
     private static StatusBarNotificationConfig statusBarNotificationConfig;
     private static boolean DEBUG = false;
 
-    public static void init(Context context, Class mainActivityClass, @DrawableRes int notify_msg_drawable_id, MiPushConfig miPushConfig) {
+    public static void init(Context context, Class mainActivityClass, @DrawableRes int notify_msg_drawable_id, MixPushConfig miPushConfig) {
         IMApplication.context = context.getApplicationContext();
         IMApplication.mainActivityClass = mainActivityClass;
         IMApplication.notify_msg_drawable_id = notify_msg_drawable_id;
 
         // 注册小米推送appID 、appKey 以及在云信管理后台添加的小米推送证书名称，该逻辑放在 NIMClient init 之前
-        if (miPushConfig != null) {
-            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));
+//        if (miPushConfig != null) {
+//            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, miPushConfig));
         // crash handler
 //        AppCrashHandler.getInstance(context);
         if (NIMUtil.isMainProcess(IMApplication.context)) {
@@ -161,7 +161,7 @@ public static String getSdkStorageRooPath() {
         return Environment.getExternalStorageDirectory() + "/" + context.getPackageName() + "/nim";
     }
 
-    private static SDKOptions getOptions(Context context) {
+    private static SDKOptions getOptions(Context context, MixPushConfig miPushConfig) {
         SDKOptions options = new SDKOptions();
 
         // 如果将新消息通知提醒托管给SDK完成，需要添加以下配置。
@@ -195,6 +195,11 @@ private static SDKOptions getOptions(Context context) {
         //teamNotificationMessageMarkUnread 登录选项添加群通知消息是否计入未读数开关
         //sdkStorageRootPath 配置的外置存储缓存根目录
 
+        // 推送配置
+        if(miPushConfig!=null) {
+            options.mixPushConfig = miPushConfig;
+        }
+
         return options;
     }
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 
 {
   "name": "react-native-netease-im",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "description": "网易云信ReactNative插件",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ repositories {`
`34`	`34`	`dependencies {`
`35`	`35`	`compile fileTree(include: '*.jar', dir: 'libs')`
`36`	`36`	`compile 'com.facebook.react:react-native:+'`
	`37`	`+ implementation 'com.huawei.android.hms:push:2.6.3.301'`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`{`
`3`	`3`	`"name": "react-native-netease-im",`
`4`		`- "version": "2.0.9",`
	`4`	`+ "version": "2.1.0",`
`5`	`5`	`"description": "网易云信ReactNative插件",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"scripts": {`