Skip to content

Commit 0cad9f6

Browse files
xhpxhp
committed
Merge branch 'master' of github.com:reactnativecomponent/react-native-netease-im
2 parents 54acc4c + 543e59e commit 0cad9f6

File tree

1 file changed

+34
-18
lines changed

1 file changed

+34
-18
lines changed

‎ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,18 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
120120
NSString *strAlias = messageUser.alias;
121121
if (strAlias.length) {
122122
[fromUser setObject:strAlias forKey:@"name"];
123-
}else{
123+
}else if(messageUser.userInfo.nickName.length){
124124
[fromUser setObject:[NSString stringWithFormat:@"%@",messageUser.userInfo.nickName] forKey:@"name"];
125+
}else{
126+
[fromUser setObject:[NSString stringWithFormat:@"%@",messageUser.userId] forKey:@"name"];
125127
}
126128
[fromUser setObject:[NSString stringWithFormat:@"%@", message.from] forKey:@"_id"];
129+
NSArray *key = [fromUser allKeys];
130+
for (NSString *tem in key) {
131+
if ([[fromUser objectForKey:tem] isEqualToString:@"(null)"]) {
132+
[fromUser setObject:@"" forKey:tem];
133+
}
134+
}
127135
[dic setObject:[NSString stringWithFormat:@"%@", message.text] forKey:@"text"];
128136
[dic setObject:[NSString stringWithFormat:@"%@", message.session.sessionId] forKey:@"sessionId"];
129137
[dic setObject:[NSString stringWithFormat:@"%ld", message.session.sessionType] forKey:@"sessionType"];
@@ -159,7 +167,7 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
159167
[imgObj setObject:[NSString stringWithFormat:@"%@",[object displayName] ] forKey:@"displayName"];
160168
[imgObj setObject:[NSString stringWithFormat:@"%f",[object size].height] forKey:@"imageHeight"];
161169
[imgObj setObject:[NSString stringWithFormat:@"%f",[object size].width] forKey:@"imageWidth"];
162-
[dic setObject:imgObj forKey:@"imgObj"];
170+
[dic setObject:imgObj forKey:@"extend"];
163171
}
164172
if(message.messageType == NIMMessageTypeAudio){
165173
[dic setObject:@"voice" forKey:@"msgType"];
@@ -171,7 +179,7 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
171179
[voiceObj setObject:[NSString stringWithFormat:@"%@", [object url]] forKey:@"url"];
172180
[voiceObj setObject:[NSString stringWithFormat:@"%zd",(object.duration/1000)] forKey:@"duration"];
173181
[voiceObj setObject:[NSNumber numberWithBool:message.isPlayed] forKey:@"isPlayed"];
174-
[dic setObject:voiceObj forKey:@"voiceObj"];
182+
[dic setObject:voiceObj forKey:@"extend"];
175183
}
176184
if(message.messageType == NIMMessageTypeVideo ){
177185
[dic setObject:@"video" forKey:@"msgType"];
@@ -214,14 +222,14 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
214222
[locationObj setObject:[NSString stringWithFormat:@"%f", object.latitude ] forKey:@"latitude"];
215223
[locationObj setObject:[NSString stringWithFormat:@"%f", object.longitude ] forKey:@"longitude"];
216224
[locationObj setObject:[NSString stringWithFormat:@"%@", object.title ] forKey:@"title"];
217-
[dic setObject:locationObj forKey:@"locationObj"];
225+
[dic setObject:locationObj forKey:@"extend"];
218226

219227
}
220228
if(message.messageType == NIMMessageTypeTip){//提醒类消息
221229
[dic setObject:@"notification" forKey:@"msgType"];
222230
NSMutableDictionary *notiObj = [NSMutableDictionary dictionary];
223231
[notiObj setObject:message.text forKey:@"tipMsg"];
224-
[dic setObject:notiObj forKey:@"notiObj"];
232+
[dic setObject:notiObj forKey:@"extend"];
225233
}
226234
if (message.messageType == NIMMessageTypeNotification) {
227235
[dic setObject:@"notification" forKey:@"msgType"];
@@ -244,7 +252,7 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
244252
default:
245253
break;
246254
}
247-
[dic setObject:notiObj forKey:@"notiObj"];
255+
[dic setObject:notiObj forKey:@"extend"];
248256

249257
}
250258

@@ -255,14 +263,14 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
255263
switch (obj.custType) {
256264
case CustomMessgeTypeRedpacket: //红包
257265
{
258-
[dic setObject:obj.dataDict forKey:@"redPacketObj"];
266+
[dic setObject:obj.dataDict forKey:@"extend"];
259267
// [dic setObject:@"redpacket" forKey:@"custType"];
260268
[dic setObject:@"redpacket" forKey:@"msgType"];
261269
}
262270
break;
263271
case CustomMessgeTypeBankTransfer: //转账
264272
{
265-
[dic setObject:obj.dataDict forKey:@"bankTransferObj"];
273+
[dic setObject:obj.dataDict forKey:@"extend"];
266274
// [dic setObject:@"transfer" forKey:@"custType"];
267275
[dic setObject:@"transfer" forKey:@"msgType"];
268276
}
@@ -271,7 +279,7 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
271279
{
272280
NSDictionary *dataDict = [self dealWithData:obj.dataDict];
273281
if (dataDict) {
274-
[dic setObject:dataDict forKey:@"redpacketOpenObj"];
282+
[dic setObject:dataDict forKey:@"extend"];
275283
// [dic setObject:@"redpacketOpen" forKey:@"custType"];
276284
[dic setObject:@"redpacketOpen" forKey:@"msgType"];
277285
}else{
@@ -755,10 +763,18 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from isStart:(BOOL)
755763
NSString *strAlias = user.alias;
756764
if (strAlias.length) {
757765
[fromUser setObject:strAlias forKey:@"name"];
758-
}else{
766+
}else if(user.userInfo.nickName.length){
759767
[fromUser setObject:[NSString stringWithFormat:@"%@",user.userInfo.nickName] forKey:@"name"];
768+
}else{
769+
[fromUser setObject:[NSString stringWithFormat:@"%@",user.userId] forKey:@"name"];
760770
}
761771
[fromUser setObject:[NSString stringWithFormat:@"%@", message.from] forKey:@"_id"];
772+
NSArray *key = [fromUser allKeys];
773+
for (NSString *tem in key) {
774+
if ([[fromUser objectForKey:tem] isEqualToString:@"(null)"]) {
775+
[fromUser setObject:@"" forKey:tem];
776+
}
777+
}
762778
[dic2 setObject:[NSString stringWithFormat:@"%@", message.text] forKey:@"text"];
763779
[dic2 setObject:[NSString stringWithFormat:@"%@", message.session.sessionId] forKey:@"sessionId"];
764780
[dic2 setObject:[NSString stringWithFormat:@"%ld", message.session.sessionType] forKey:@"sessionType"];
@@ -795,7 +811,7 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from isStart:(BOOL)
795811
[imgObj setObject:[NSString stringWithFormat:@"%@",[object displayName] ] forKey:@"displayName"];
796812
[imgObj setObject:[NSString stringWithFormat:@"%f",[object size].height] forKey:@"imageHeight"];
797813
[imgObj setObject:[NSString stringWithFormat:@"%f",[object size].width] forKey:@"imageWidth"];
798-
[dic2 setObject:imgObj forKey:@"imgObj"];
814+
[dic2 setObject:imgObj forKey:@"extend"];
799815
}
800816
if(message.messageType == NIMMessageTypeAudio){
801817
[dic2 setObject:@"voice" forKey:@"msgType"];
@@ -807,7 +823,7 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from isStart:(BOOL)
807823
[voiceObj setObject:[NSString stringWithFormat:@"%@", [object url]] forKey:@"url"];
808824
[voiceObj setObject:[NSString stringWithFormat:@"%zd",(object.duration/1000)] forKey:@"duration"];
809825
[voiceObj setObject:[NSNumber numberWithBool:message.isPlayed] forKey:@"isPlayed"];
810-
[dic2 setObject:voiceObj forKey:@"voiceObj"];
826+
[dic2 setObject:voiceObj forKey:@"extend"];
811827
}
812828
if(message.messageType == NIMMessageTypeVideo ){
813829
[dic2 setObject:@"video" forKey:@"msgType"];
@@ -850,14 +866,14 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from isStart:(BOOL)
850866
[locationObj setObject:[NSString stringWithFormat:@"%f", object.latitude ] forKey:@"latitude"];
851867
[locationObj setObject:[NSString stringWithFormat:@"%f", object.longitude ] forKey:@"longitude"];
852868
[locationObj setObject:[NSString stringWithFormat:@"%@", object.title ] forKey:@"title"];
853-
[dic2 setObject:locationObj forKey:@"locationObj"];
869+
[dic2 setObject:locationObj forKey:@"extend"];
854870

855871
}
856872
if(message.messageType == NIMMessageTypeTip){//提醒类消息
857873
[dic2 setObject:@"notification" forKey:@"msgType"];
858874
NSMutableDictionary *notiObj = [NSMutableDictionary dictionary];
859875
[notiObj setObject:message.text forKey:@"tipMsg"];
860-
[dic2 setObject:notiObj forKey:@"notiObj"];
876+
[dic2 setObject:notiObj forKey:@"extend"];
861877
}
862878
if (message.messageType == NIMMessageTypeNotification) {
863879
[dic2 setObject:@"notification" forKey:@"msgType"];
@@ -880,7 +896,7 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from isStart:(BOOL)
880896
default:
881897
break;
882898
}
883-
[dic2 setObject:notiObj forKey:@"notiObj"];
899+
[dic2 setObject:notiObj forKey:@"extend"];
884900

885901
}
886902
if (message.messageType == NIMMessageTypeCustom) {
@@ -891,21 +907,21 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from isStart:(BOOL)
891907
switch (obj.custType) {
892908
case CustomMessgeTypeRedpacket: //红包
893909
{
894-
[dic2 setObject:obj.dataDict forKey:@"redPacketObj"];
910+
[dic2 setObject:obj.dataDict forKey:@"extend"];
895911
[dic2 setObject:@"redpacket" forKey:@"msgType"];
896912
}
897913
break;
898914
case CustomMessgeTypeBankTransfer: //转账
899915
{
900-
[dic2 setObject:obj.dataDict forKey:@"bankTransferObj"];
916+
[dic2 setObject:obj.dataDict forKey:@"extend"];
901917
[dic2 setObject:@"transfer" forKey:@"msgType"];
902918
}
903919
break;
904920
case CustomMessgeTypeRedPacketOpenMessage: //拆红包消息
905921
{
906922
NSDictionary *dataDict = [self dealWithData:obj.dataDict];
907923
if (dataDict) {
908-
[dic2 setObject:dataDict forKey:@"redpacketOpenObj"];
924+
[dic2 setObject:dataDict forKey:@"extend"];
909925
[dic2 setObject:@"redpacketOpen" forKey:@"msgType"];
910926
}else{
911927
return;

0 commit comments

Comments
 (0)