merge conflict

Author: KenChoi

example/app/routes/FriendInfo/index.js

@@ -48,23 +48,36 @@ const {
 export default class MyNotificationsScreen extends React.Component {
     static navigationOptions = {
       title: "好友详情",
+      avatarPath: "",
     };
     constructor(props) {
       super(props)
       this.state = {
         userInfo: this.props.navigation.state.params.user
-      }  
+      }
+      
+      // JMessage.downloadOriginalUserAvatar({'username': this.state.userInfo.username}, (result) => {
+      //   this.setState({avatarPath: result.filePath})
+      // }, (eror) => {
+      //   Alert.alert('error',JSON.stringify(error))
+      // })
+
+      JMessage.downloadThumbUserAvatar({'username': this.state.userInfo.username}, (result) => {
+        this.setState({avatarPath: result.filePath})
+      }, (eror) => {
+        Alert.alert('error',JSON.stringify(error))
+      })
     }
 
     render() {
-      if (this.state.userInfo.avatarThumbPath === "") {
+      if (this.state.avatarPath === "") {
         this.avatar = <Image
           source={require('../../resource/group-icon.png')}
           style={styles.avatar}>
         </Image>
       } else {
         this.avatar = <Image
-        source={{isStatic:true,uri:this.state.userInfo.avatarThumbPath, scale:1}}
+        source={{isStatic:true,uri:this.state.avatarPath, scale:1}}
         style={styles.avatar}>
       </Image>
       }

index.js

@@ -15,6 +15,7 @@ const syncRoamingMessage = "JMessage.SyncRoamingMessage" // 同步漫游消息
 const messageRetract = "JMessage.MessageRetract" // 消息撤回事件
 const contactNotify = "JMessage.ContactNotify" // 收到好友请求消息事件
 const uploadProgress = "JMessage.UploadProgress" // 收到好友请求消息事件
+const conversationChange = "JMessage.conversationChange" // 会话变更事件
 
 export default class JMessage {
 
@@ -897,5 +898,4 @@ export default class JMessage {
         listeners[listener].remove();
         listeners[listener] = null;
     }
-
 }

ios/RCTJMessageModule/RCTJMessageModule.h

@@ -18,6 +18,7 @@
 
 
 #define receiveMsgEvent @"JMessage.ReceiveMsgEvent" // 接收到消息事件
+#define conversationChangeEvent @"JMessage.conversationChange" // 会话变更事件
 #define loginStateChangedEvent @"JMessage.LoginStateChanged" //
 #define clickMessageNotificationEvent @"JMessage.ClickMessageNotification" // 点击推送 Android Only
 #define syncOfflineMessageEvent @"JMessage.SyncOfflineMessage" // 同步离线消息事件

ios/RCTJMessageModule/RCTJMessageModule.m

@@ -65,10 +65,10 @@ -(void)initNotifications {
                         name:kJJMessageReceiveMessage
                       object:nil];
 
-//  [defaultCenter addObserver:self
-//                    selector:@selector(conversationChanged:)
-//                        name:kJJMessageConversationChanged
-//                      object:nil];
+  [defaultCenter addObserver:self
+                    selector:@selector(conversationChanged:)
+                        name:kJJMessageConversationChanged
+                      object:nil];
   // have
   [defaultCenter addObserver:self
                     selector:@selector(didSendMessage:)
@@ -182,6 +182,10 @@ - (void)didReceiveJMessageMessage:(NSNotification *)notification {
   [self.bridge.eventDispatcher sendAppEventWithName:receiveMsgEvent body:notification.object];
 }
 
+- (void)conversationChanged:(NSNotification *)notification {
+  [self.bridge.eventDispatcher sendAppEventWithName:conversationChangeEvent body:notification.object];
+}
+
 //#pragma mark IM - User