Merge pull request #7 from jpush/dev

update to 2.0.0-beta

Author: huangminlinux

.gitignore

@@ -1,10 +1,12 @@
-# OSX
-#
-.DS_Store
-
 # Xcode
 #
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData/
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -13,14 +15,52 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
-*.xccheckout
+xcuserdata/
+
+## Other
 *.moved-aside
-DerivedData
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
-*.xcuserstate
-project.xcworkspace
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
 
 # Android/IJ
 #
@@ -32,3 +72,24 @@ local.properties
 #
 node_modules/
 npm-debug.log
+
+
+
+.qshell
+*.qshel
+*.DS_Store
+example/node_modules/
+*.gradle/
+gradle.properties
+build/
+build-res/
+/*/build/
+*.iml
+*.idea/
+*.DS_Store
+*.log
+.qshell
+*.qshell
+example/node_modules/*
+example/npm-debug*
+

README.md

@@ -1,174 +1,41 @@
-# jmessage-react-plugin （iOS 尚未支持）
-## Android
+# jmessage-react-plugin 
 
-#### 这是一个使用 JMessage-sdk 的 React Native 插件，目前实现了收发文字消息。
+极光官方开发的[极光 IM](https://docs.jiguang.cn/jmessage/guideline/jmessage_guide/) react-native 插件，同时支持 文字、图片、语言、文件和自定义消息。同时支持 iOS 和 Android 平台。
+
+## 安装
 
-#### 安装
 ```
 npm install jmessage-react-plugin --save
+npm install jcore-react-native --save
 react-native link
 ```
-安装完毕后，在 MainApplication 中加上 JMessagePackage 即可。
-```
-        @Override
-        protected List<ReactPackage> getPackages() {
-            return Arrays.<ReactPackage>asList(
-                    new MainReactPackage(),
-                    new JMessageReactPackage(),
-            );
-        }
-```
-
-#### example 使用
-```
-npm install react-native-jchat-demo
-react-native run-android
-```
- 
-关于 jmessage-sdk 的相关接口说明可以参考：
-##### [极光 IM Android SDK 概述](http://docs.jpush.io/client/im_sdk_android/)
-
-##### [IM Android SDK Java docs](http://docs.jpush.io/client/im_android_api_docs/)
 
-#### jmessage-react-plugin Android 的项目结构说明
-##### JS 部分
-除了入口 index.android.js 之外，都放在 react-native-android 文件夹下
- 
-##### Native部分
-- entity 根据需求抽象出的一些实体类，主要是为了使用 Gson 转换为 json 字符串传到 JS（如果是纯 React Native 应用，则不需要如此，直接请求服务端即可）
-- tools 主要是一些工具类
-- 其他 包括 Native 入口类以及 NativeModule 等
+## 配置
 
-#### 接口调用
+#### Android
 
-##### 在 JS 中调用 jmessage-sdk 的接口详情
-```
-const JMessageModule = NativeModules.JMessageModule;
-```
-－ 加载 conversations：
-```
-JMessageModule.getConvList().then((list) => {
-            _convList = JSON.parse(list);
-            this.setState({
-                dataSource: _ds.cloneWithRows(_convList),
-                fetching: false
-            });
-        }).catch((e) => {
-            console.log(e);
-            this.setState({
-                fetching: false
-            });
-        });
-```
-- 接收消息
-```
-const RECEIVE_MSG_EVENT = "receiveMsgEvent";
+#### 这是一个使用 JMessage-sdk 的 React Native 插件，支持文字、图片、语言、文件消息。
 
-componentDidMount() {
-        DeviceEventEmitter.addListener(RECEIVE_MSG_EVENT, (map) => {
-            console.log("收到消息： " + map.message);
-            let conversation = JSON.parse(map.conversation);
-            for (let conv in _convList) {
-                if (conv.username === conversation.username || conv.groupId === conversation.groupId) {
-                    conv = conversation;
-                }
-            }
-            let newData = JSON.parse(JSON.stringify(_convList));
-            newData.sort(this.by("date"));
-            this.setState({
-                dataSource: _ds.cloneWithRows(newData)
-            });
-            _convList = newData;
-        });
-    }
-```
-- 发送消息
-```
-const {username, appKey, groupId} = this.props;
-		JMessageModule.sendTxtMsg(username, appKey, groupId, this.state.inputContent)
-			.then((msg) => {
-				console.log("Sending text message: " + msg);
-				this.msgArr.push(JSON.parse(msg));
-				console.log("msgArr: " + this.msgArr);
-				this.setState({
-					dataSource: this.state.ds.cloneWithRows(this.msgArr),
-					inputContent: ""
-				});
-				if (this.listView !== null) {
-					this.listView.scrollToEnd();
-				}
-			}).catch((e) => {
-				console.log(e);
-				this.setState({
-					inputContent: ""
-				});
-			});
-```
-发送消息后还需要监听发送状态：
 
+安装完毕后，在 MainApplication 中加上 JMessagePackage 即可。
 ```
-const SEND_MSG_RESULT = "sendMsgResult";
-DeviceEventEmitter.addListener(SEND_MSG_RESULT, this.sendMsgResult);
-sendMsgResult = (msg) => {
-		var message = JSON.parse(msg);
-		for (var i = this.msgArr.length - 1; i >= 0; i--) {
-			if (this.msgArr[i].msgId === message.msgId) {
-				this.msgArr[i].sendState = message.sendState;
-			}
-		}
-		let newData = JSON.parse(JSON.stringify(this.msgArr));
-		this.setState({
-			dataSource: this.state.ds.cloneWithRows(newData)
-		});
-		this.msgArr = newData;
-	};
+@Override
+protected List<ReactPackage> getPackages() {
+    return Arrays.<ReactPackage>asList(
+            new MainReactPackage(),
+            new JMessageReactPackage(),
+    );
+}
 ```
 
-- 分页加载消息
-
-```
-JMessageModule.getMessageFromNewest(username, appKey, groupId, this.START, this.PAGE_MSG_COUNT)
-			.then((result) => {
-				if ("" === result) {
-					console.log("No last page");
-					this.setState({
-						fetching: false
-					});
-					return;
-				}
-				let msgData = JSON.parse(result);
-				msgData.reverse();
-				this.msgArr = this.msgArr.concat(msgData);
-				this.MSG_OFFSET = this.START + msgData.length;
-				this.START = this.MSG_OFFSET;
-				this.setState({
-					fetching: false,
-					dataSource: this.state.ds.cloneWithRows(this.msgArr)
-				});
-			}).catch((e) => {
-				console.log(e);
-				this.setState({
-					fetching: false
-				});
-			});
-```
+## API
 
-- 进入会话（进入会话后，通知栏不会展示此会话中收到的消息）
+[API doc](./document/API.md)
 
-```
-JMessageModule.enterConversation(username, appKey, groupId);
-```
-- 添加好友（无好友模式）
+## 更多
 
-```
-JMessageModule.addFriend(inputTxt).then((result) => {
-            var newDs = JSON.parse(result);
-            _convList = [newDs, ..._convList];
-            this.setState({
-                dataSource: _ds.cloneWithRows(_convList)
-            });
-        }).catch((e) => {
-            console.log(e);
-        });
-```
+- QQ 群：553406342
+- [极光官网文档](http://docs.jiguang.cn/guideline/jmessage_guide/)
+- 插件问题可以直接提 [issue](https://github.com/jpush/jmessage-react-plugin/issues)
+- 有问题可访问[极光社区](http://community.jiguang.cn/)搜索和提问。
 

android/build.gradle

@@ -4,15 +4,15 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 16
@@ -42,5 +42,5 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.facebook.react:react-native:0.41.0"
+    compile "com.facebook.react:react-native:+"
 }