Merge pull request #8 from jpush/dev

Dev

Author: huangminlinux

example/app/routes/Chat/index.js

@@ -40,7 +40,7 @@ export default class Chat extends Component {
 
     this.updateLayout = this.updateLayout.bind(this);
     this.conversation = this.props.navigation.state.params.conversation
-
+    Alert.alert("the conversation ",JSON.stringify(this.conversation))
     JMessage.getMyInfo((myInfo) => {
       this.myInfo = myInfo
     })
@@ -197,6 +197,7 @@ export default class Chat extends Component {
   onSendText = (text) => {
 
     var message = this.getNormalMessage()
+    
     message.text = text
     JMessage.sendTextMessage(message, (message) => {
       var auroraMsg = this.convertJMessageToAuroraMsg(message)

example/app/routes/ConversationList/index.js

@@ -53,11 +53,18 @@ var count = 0
                                 var item
                                 if (conversaion.conversationType === 'single') {
                                      item = {key: conversaion.target.username}
+                                     item.conversationType = 'single'
                                 } else {
                                     item = {key: conversaion.target.id}
+                                    item.conversationType = 'group'
                                     Alert.alert('conversaion', JSON.stringify(conversaion))
                                 }
 
+                                if (conversaion.latestMessage === undefined) {
+                                    item.latestMessageString = ""
+                                    return item
+                                }
+
                                 item.conversationType = conversaion.conversationType
                                 if (conversaion.latestMessage.type === 'text') {    
                                     item.latestMessageString = conversaion.latestMessage.text 
@@ -84,6 +91,21 @@ var count = 0
     }
 
     _onPress() {
+        Alert.alert("click","fasdf")
+        JMessage.createConversation({type: 'single', username: '0002'}, (conv) => {
+            var item
+            if (conv.conversationType === 'single') {
+                 item = {key: conv.target.username}
+                 item.conversationType = 'single'
+            } else {
+                item = {key: conv.target.id}
+                item.conversationType = 'group'
+                Alert.alert('conversaion', JSON.stringify(conv))
+            }
+            this.props.navigation.navigate('Chat', {conversation: item})
+        }, (error) => {
+            Alert.alert('error', JSON.stringify(error))
+        })
     }
 
     render() {

example/app/routes/Login/index.js

@@ -27,8 +27,11 @@ const {
     }
 
     onPress() {
+        const { navigate } = this.props.navigation
+
         JMessage.login({username: this.state.username, password: this.state.password}, () => {
             Alert.alert('login success')
+            navigate('ConversationList')
         }, (error) => {
             Alert.alert('login success', JSON.stringify(error))
         })
@@ -46,7 +49,7 @@ const {
                 onChangeText = { (e) => { this.setState({password: e}) } }>
             </TextInput>
             <FormButton 
-                title="lala"
+                title="登录"
                 onPress={this.onPress}
                 >
             </FormButton> 

example/ios/JMessageDemo/AppDelegate.m

@@ -19,7 +19,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   NSURL *jsCodeLocation;
 
   jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
-
+//  jsCodeLocation = [NSURL URLWithString:@"http://192.168.10.73:8081/index.ios.bundle?platform=ios&dev=true"];
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"ReactJChat"
                                                initialProperties:nil

ios/RCTJMessageModule/RCTJMessageModule.m

@@ -148,7 +148,10 @@ - (void)onSyncRoamingMessage: (NSNotification *) notification {
 -(void)didSendMessage:(NSNotification *)notification {
   NSDictionary *response = notification.object;
 
-//  CDVPluginResult *result = nil;
+  if (!response[@"message"]) {
+    return;
+  }
+  
     NSDictionary *msgDic = response[@"message"];
     NSArray *callBacks = self.SendMsgCallbackDic[msgDic[@"id"]];
   if (response[@"error"] == nil) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "1.0.2",
+  "version": "2.0.0-beta",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {
@@ -17,5 +17,29 @@
   "bugs": {
     "url": "https://github.com/jpush/jmessage-react-plugin/issues"
   },
+  "peerDependencies": {
+    "jcore-react-native": ">= 1.1.8"
+  },
+  "rnpm": {
+    "ios": {
+      "sharedLibraries": [
+        "libz",
+        "UserNotifications",
+        "CoreTelephony",
+        "Security",
+        "CFNetwork",
+        "CoreFoundation",
+        "SystemConfiguration",
+        "Foundation",
+        "UIKit",
+        "libresolv",
+        "CoreGraphics",
+        "CoreAudio",
+        "AudioToolbox",
+        "MobileCoreServices",
+        "libsqlite3.0"
+      ]
+    }
+  },
   "homepage": "https://github.com/jpush/jmessage-react-plugin#readme"
 }