Merge pull request #532 from zapcannon87/master

Release v11.4.6
leancloud · Oct 29, 2018 · f2f473e · f2f473e
2 parents f29d4ea + c9f51e3
commit f2f473e
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 29 deletions.
diff --git a/AVOS/AVOSCloud/UserAgent.h b/AVOS/AVOSCloud/UserAgent.h
@@ -1 +1 @@
-#define SDK_VERSION @"v11.4.5"
+#define SDK_VERSION @"v11.4.6"
diff --git a/AVOS/AVOSCloudIM/Client/AVIMClient.m b/AVOS/AVOSCloudIM/Client/AVIMClient.m
@@ -1938,30 +1938,6 @@ - (AVIMConversation *)conversationWithKeyedConversation:(AVIMKeyedConversation *
         if (keyedConversation.updateAt) {
             rawDataDic[AVIMConversationKeyUpdatedAt] = keyedConversation.updateAt;
         }
-        if (keyedConversation.lastMessage) {
-            AVIMMessage *message = keyedConversation.lastMessage;
-            if (message.content) {
-                rawDataDic[AVIMConversationKeyLastMessageContent] = message.content;
-            }
-            if (message.messageId) {
-                rawDataDic[AVIMConversationKeyLastMessageId] = message.messageId;
-            }
-            if (message.clientId) {
-                rawDataDic[AVIMConversationKeyLastMessageFrom] = message.clientId;
-            }
-            if (message.sendTimestamp) {
-                rawDataDic[AVIMConversationKeyLastMessageTimestamp] = @(message.sendTimestamp);
-            }
-            if (message.updatedAt) {
-                rawDataDic[AVIMConversationKeyLastMessagePatchTimestamp] = @(message.updatedAt.timeIntervalSince1970 * 1000.0);
-            }
-            if (message.mentionAll) {
-                rawDataDic[AVIMConversationKeyLastMessageMentionAll] = @(message.mentionAll);
-            }
-            if (message.mentionList) {
-                rawDataDic[AVIMConversationKeyLastMessageMentionPids] = message.mentionList;
-            }
-        }
         if (keyedConversation.name) {
             rawDataDic[AVIMConversationKeyName] = keyedConversation.name;
         }
@@ -1993,6 +1969,39 @@ - (AVIMConversation *)conversationWithKeyedConversation:(AVIMKeyedConversation *
             rawDataDic[AVIMConversationKeyMutedMembers] = @(keyedConversation.muted);
         }
     }
+    if (keyedConversation.lastMessage) {
+        AVIMMessage *message = keyedConversation.lastMessage;
+        [rawDataDic removeObjectsForKeys:({
+            @[AVIMConversationKeyLastMessageContent,
+              AVIMConversationKeyLastMessageId,
+              AVIMConversationKeyLastMessageFrom,
+              AVIMConversationKeyLastMessageTimestamp,
+              AVIMConversationKeyLastMessagePatchTimestamp,
+              AVIMConversationKeyLastMessageMentionAll,
+              AVIMConversationKeyLastMessageMentionPids];
+        })];
+        if (message.content) {
+            rawDataDic[AVIMConversationKeyLastMessageContent] = message.content;
+        }
+        if (message.messageId) {
+            rawDataDic[AVIMConversationKeyLastMessageId] = message.messageId;
+        }
+        if (message.clientId) {
+            rawDataDic[AVIMConversationKeyLastMessageFrom] = message.clientId;
+        }
+        if (message.sendTimestamp) {
+            rawDataDic[AVIMConversationKeyLastMessageTimestamp] = @(message.sendTimestamp);
+        }
+        if (message.updatedAt) {
+            rawDataDic[AVIMConversationKeyLastMessagePatchTimestamp] = @(message.updatedAt.timeIntervalSince1970 * 1000.0);
+        }
+        if (message.mentionAll) {
+            rawDataDic[AVIMConversationKeyLastMessageMentionAll] = @(message.mentionAll);
+        }
+        if (message.mentionList) {
+            rawDataDic[AVIMConversationKeyLastMessageMentionPids] = message.mentionList;
+        }
+    }
     if (!conversationId) {
         return nil;
     }

diff --git a/AVOS/AVOSCloudIMTests/Swift/AVIMConversationTestCase.swift b/AVOS/AVOSCloudIMTests/Swift/AVIMConversationTestCase.swift
@@ -307,7 +307,7 @@ class AVIMConversationTestCase: LCIMTestBase {
                         }
                     })
                 } else {
-                    semaphore.decrement()
+                    semaphore.decrement(2)
                     XCTFail()
                 }
             })

diff --git a/AVOSCloud.podspec b/AVOSCloud.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloud'
-  s.version  = '11.4.5'
+  s.version  = '11.4.6'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud Objective-C SDK'
   s.authors  = 'LeanCloud'

diff --git a/AVOSCloudIM.podspec b/AVOSCloudIM.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudIM'
-  s.version  = '11.4.5'
+  s.version  = '11.4.6'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud IM Objective-C SDK'
   s.authors  = 'LeanCloud'

diff --git a/AVOSCloudLiveQuery.podspec b/AVOSCloudLiveQuery.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudLiveQuery'
-  s.version  = '11.4.5'
+  s.version  = '11.4.6'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud LiveQuery Objective-C SDK'
   s.authors  = 'LeanCloud'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define SDK_VERSION @"v11.4.5"
		#define SDK_VERSION @"v11.4.6"