Merge pull request #35 from jpush/dev

Dev

Author: KenChoi1992

README.md

@@ -14,8 +14,32 @@ react-native link
 
 #### Android
 
+- 配置 AndroidManifest，加入 `meta-data` 部分
+```
+...
+<meta-data android:name="JPUSH_CHANNEL" android:value="${APP_CHANNEL}" />
+<meta-data android:name="JPUSH_APPKEY" android:value="${JPUSH_APPKEY}" />
+...
+```
+- 配置 build.gradle，将下列配置部分替换成自己的。
+```
+defaultConfig {
+        applicationId "你的 application id"
+        minSdkVersion 16
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
+        manifestPlaceholders = [
+                JPUSH_APPKEY: "你的 appKey",	//在此替换你的APPKey
+                APP_CHANNEL: "developer-default"		//应用渠道号
+        ]
+    }
+```
 
-安装完毕后，在 MainApplication 中加上 JMessagePackage 即可，JMessagePackage 有一个参数，设置是否弹出 toast。
+在 MainApplication 中加上 JMessagePackage 即可，JMessagePackage 有一个参数，设置是否弹出 toast。
 ```
 // 如果设置为 true，则不弹出 toast。
 private boolean shutdownToast = false;

android/src/io/jchat/android/JMessageModule.java

@@ -173,7 +173,7 @@ public void gotResult(int status, String desc) {
 
     // 注册
     @ReactMethod
-    public void register(ReadableMap map, final Callback success, final Callback fail) {
+    public void userRegister(ReadableMap map, final Callback success, final Callback fail) {
         mContext = getCurrentActivity();
         String username = map.getString(Constant.USERNAME);
         String password = map.getString(Constant.PASSWORD);

example/android/app/src/com/sample/application/MainApplication.java

@@ -50,6 +50,6 @@ public void onCreate() {
         SoLoader.init(this, /* native exopackage */ false);
         Log.i("MainApplication", "Init JMessageClient");
         JMessageClient.setDebugMode(true);
-        JMessageClient.init(getApplicationContext());
+        JMessageClient.init(this);
     }
 }

example/app/routes/Chat/index.js

@@ -53,6 +53,7 @@ export default class Chat extends Component {
       inputLayoutHeight: initHeight,
       messageListLayout: {},
       inputViewLayout: { width: window.width, height: initHeight, },
+      menuContainerHeight: 625,
     };
 
     this.updateLayout = this.updateLayout.bind(this);

example/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "aurora-imui-react-native": "^0.6.0",
     "jcore-react-native": "^1.2.1",
-    "jmessage-react-plugin": "^2.1.0",
+    "jmessage-react-plugin": "^2.1.2",
     "react": "16.0.0-alpha.12",
     "react-native": "^0.50.0",
     "react-native-fs": "^2.8.5",