Skip to content

Commit 7d2f6b8

Browse files
guangyaoguangyao
authored andcommitted
fix 空数据的问题
1 parent a3054b6 commit 7d2f6b8

File tree

1 file changed

+33
-15
lines changed

1 file changed

+33
-15
lines changed

ios/RNNeteaseIm/RNNeteaseIm/NIMModel.m

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,34 @@ +(instancetype)initShareMD{
2626
//}
2727

2828
- (void)setRecentDict:(NSDictionary *)recentDict{
29-
if (_recentDict != recentDict) {
29+
if ((_recentDict != recentDict)&&(recentDict.count)) {
3030
_recentDict = recentDict;
3131
self.myBlock(1, recentDict);
3232
}
3333
}
3434

3535
-(void)setNetStatus:(NSString *)NetStatus{
36-
if (_NetStatus != NetStatus) {
36+
if ((_NetStatus != NetStatus)&&(NetStatus.length)) {
3737
_NetStatus = NetStatus;
3838
self.myBlock(0, NetStatus);
3939
}
4040
}
4141
-(void)setNIMKick:(NSString *)NIMKick{
42-
if (_NIMKick != NIMKick) {
42+
if ((_NIMKick != NIMKick)&&(NIMKick.length)) {
4343
_NIMKick = NIMKick;
4444
self.myBlock(2, NIMKick);
4545
}
4646
}
4747
-(void)setContactList:(NSMutableDictionary *)contactList{
48-
if (_contactList != contactList) {
48+
if ((_contactList != contactList)&&(contactList.count)) {
4949
_contactList = contactList;
5050
self.myBlock(3, contactList);
5151
}
5252
}
5353
-(void)setNotiArr:(NSMutableArray *)notiArr{
54-
self.myBlock(5, notiArr);
54+
if (notiArr.count) {
55+
self.myBlock(5, notiArr);
56+
}
5557
}
5658
-(void)setTeamArr:(NSMutableArray *)teamArr{
5759
if (teamArr.count) {
@@ -64,42 +66,58 @@ -(void)setUnreadCount:(NSInteger)unreadCount{
6466
}
6567
//
6668
-(void)setResorcesArr:(NSMutableArray *)ResorcesArr{
67-
self.myBlock(7, ResorcesArr);
69+
if (ResorcesArr.count) {
70+
self.myBlock(7, ResorcesArr);
71+
}
6872
}
6973
//开始发送
7074
-(void)setStartSend:(NSDictionary *)startSend{
71-
self.myBlock(8, startSend);
75+
if (startSend.count) {
76+
self.myBlock(8, startSend);
77+
}
7278
}
7379
//结束发送
7480
-(void)setEndSend:(NSDictionary *)endSend{
75-
self.myBlock(9, endSend);
81+
if (endSend.count) {
82+
self.myBlock(9, endSend);
83+
}
7684
}
7785
//发送进度(图片等附件)
7886
-(void)setProcessSend:(NSDictionary *)processSend{
79-
self.myBlock(10, processSend);
87+
if (processSend.count) {
88+
self.myBlock(10, processSend);
89+
}
8090
}
8191
//已读通知
8292
-(void)setReceipt:(NSString *)receipt{
83-
self.myBlock(11, receipt);
93+
if (receipt.length) {
94+
self.myBlock(11, receipt);
95+
}
8496
}
8597
//发送消息
8698
-(void)setSendState:(NSMutableArray *)sendState{
87-
if (_sendState != sendState) {
99+
if ((_sendState != sendState)&&(sendState.count)) {
88100
self.myBlock(12, sendState);
89101
}
90102
}
91103
//黑名单列表
92104
-(void)setBankList:(NSMutableArray *)bankList{
93-
self.myBlock(13, bankList);
105+
if (bankList.count) {
106+
self.myBlock(13, bankList);
107+
}
94108
}
109+
95110
//录音进度
96111
-(void)setAudioDic:(NSDictionary *)audioDic{
97-
98-
self.myBlock(14, audioDic);
112+
if (audioDic.count) {
113+
self.myBlock(14, audioDic);
114+
}
99115
}
100116

101117
- (void)setDeleteMessDict:(NSDictionary *)deleteMessDict{
102-
self.myBlock(15, deleteMessDict);
118+
if (deleteMessDict.count) {
119+
self.myBlock(15, deleteMessDict);
120+
}
103121
}
104122

105123
@end

0 commit comments

Comments
 (0)