Merge pull request #751 from jpush/dev

更新readme

Author: TC130精神扰乱装置

README.md

@@ -2,8 +2,8 @@
 
 ## ChangeLog
 
-1. 从RN-JCore1.6.0开始，Android集成插件时不需要在AndroidManifest.xml中添加配置代码
-2. 从RN-JPush2.7.5开始，重新支持TypeScript
+1. 从RN-JPush2.7.5开始，重新支持TypeScript
+2. 由于RN-JCore1.6.0存在编译问题，从RN-JCore1.7.0开始，还是需要在AndroidManifest.xml中添加配置代码，具体参考 配置-2.1 Android
 
 
 ## 1. 安装
@@ -54,6 +54,17 @@ npm install jpush-react-native --save
   project(':jcore-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jcore-react-native/android')
   ```
 
+* AndroidManifest.xml
+
+  ```
+  <meta-data
+  	android:name="JPUSH_CHANNEL"
+  	android:value="${JPUSH_CHANNEL}" />
+  <meta-data
+  	android:name="JPUSH_APPKEY"
+  	android:value="${JPUSH_APPKEY}" />    
+  ```
+
 ### 2.2 iOS
 
 ### 2.2.1 pod

example/android/app/src/main/AndroidManifest.xml

@@ -20,8 +20,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
+        <meta-data
+            android:name="JPUSH_CHANNEL"
+            android:value="${JPUSH_CHANNEL}" />
+        <meta-data
+            android:name="JPUSH_APPKEY"
+            android:value="${JPUSH_APPKEY}" />        
+
     </application>
 
     <uses-permission android:name="android.permission.INTERNET" />

example/package.json

@@ -7,7 +7,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "jcore-react-native": "1.6.0",
+    "jcore-react-native": "1.7.0",
     "jpush-react-native": "2.7.5",
     "react": "16.8.6",
     "react-native": "0.60.5"