Merge branch 'master' of github.com:reactnativecomponent/react-native-netease-im

xhp · xhp · commit 36de63c3040b · 2017-07-04T17:07:12.000+08:00
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m b/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m
@@ -352,8 +352,9 @@ -(void)sendMessage:(NSString *)mess andApnsMembers:(NSArray *)members{
 }
 //发送图片
 -(void)sendImageMessages:(  NSString *)path  displayName:(  NSString *)displayName{
-    
-    NIMMessage *message = [NIMMessageMaker msgWithImagePath:path];
+    UIImage *img = [[UIImage alloc]initWithContentsOfFile:path];
+    NIMMessage *message = [NIMMessageMaker msgWithImage:img];
+//    NIMMessage *message = [NIMMessageMaker msgWithImagePath:path];
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -352,8 +352,9 @@ -(void)sendMessage:(NSString )mess andApnsMembers:(NSArray )members{`
`352`	`352`	`}`
`353`	`353`	`//发送图片`
`354`	`354`	`-(void)sendImageMessages:( NSString )path displayName:( NSString )displayName{`
`355`		`-`
`356`		`- NIMMessage *message = [NIMMessageMaker msgWithImagePath:path];`
	`355`	`+ UIImage *img = [[UIImage alloc]initWithContentsOfFile:path];`
	`356`	`+ NIMMessage *message = [NIMMessageMaker msgWithImage:img];`
	`357`	`+// NIMMessage *message = [NIMMessageMaker msgWithImagePath:path];`
`357`	`358`	`[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];`
`358`	`359`	`}`
`359`	`360`