Merge remote-tracking branch 'leancloud/master'

# Conflicts: # ChatKit-OC/Podfile.lock # ChatKit-OC/Pods/Manifest.lock # ChatKit-OC/Pods/Pods.xcodeproj/project.pbxproj
tang3w · Dec 6, 2016 · aa1dc0e · aa1dc0e
2 parents af0d6bf + dffe423
commit aa1dc0e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 33 deletions.
diff --git a/ChatKit-OC/Example/Class/Module/Redpacket/Tool/RedpacketConfig.m b/ChatKit-OC/Example/Class/Module/Redpacket/Tool/RedpacketConfig.m
@@ -52,7 +52,7 @@ - (RedpacketUserInfo *)redpacketUserInfo {
     }
     RedpacketUserInfo *user = [[RedpacketUserInfo alloc] init];
     user.userId = clientId;
-    user.userNickname = userName;
+    user.userNickname = userName.length?userName:clientId;
     user.userAvatar = avatarURL;
     return user;
 }

diff --git a/ChatKit-OC/Example/Class/Module/Redpacket/View/RedPacketInputViewPlugin.m b/ChatKit-OC/Example/Class/Module/Redpacket/View/RedPacketInputViewPlugin.m
@@ -105,7 +105,6 @@ - (void)sendRedpacketMessage:(RedpacketMessageModel *)redpacket {
 }
 
 - (void)getGroupMemberListCompletionHandle:(void (^)(NSArray<RedpacketUserInfo *> *))completionHandle {
-    __weak typeof(self) weakSlef = self;
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         AVIMConversation *conversation = [self.conversationViewController getConversationIfExists];
         NSArray *allPersonIds;

diff --git a/ChatKit-OC/Example/Class/Module/Redpacket/View/RedpacketMessageCell.m b/ChatKit-OC/Example/Class/Module/Redpacket/View/RedpacketMessageCell.m
@@ -139,7 +139,7 @@ - (void)redpacketClicked {
                 if ([message.rpModel.redpacketSender.userId isEqualToString:obj.clientId]) {
                     RedpacketUserInfo * userInfo = [RedpacketUserInfo new];
                     userInfo.userId = obj.clientId;
-                    userInfo.userNickname = obj.name?obj.name:obj.clientId;
+                    userInfo.userNickname = obj.name.length?obj.name:obj.clientId;
                     userInfo.userAvatar = obj.avatarURL.absoluteString;
                     message.rpModel.redpacketSender = userInfo;
                 }

diff --git a/ChatKit-OC/Pods/Local Podspecs/RedpacketLib.podspec.json b/ChatKit-OC/Pods/Local Podspecs/RedpacketLib.podspec.json
diff --git a/ChatKit-OC/Pods/Pods.xcodeproj/project.pbxproj b/ChatKit-OC/Pods/Pods.xcodeproj/project.pbxproj