use new API to add lastMessage

Author: ChenYilong

ChatKit-OC/ChatKit-OC.xcodeproj/project.pbxproj

@@ -70,21 +70,48 @@
 		9AC3A4DD1DF9C8BD00F3405F /* LCCKUserGroupCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AC3A4DA1DF9C8BD00F3405F /* LCCKUserGroupCell.m */; };
 		9AC3A4DE1DF9C8BD00F3405F /* LCCKUserGroupItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AC3A4DC1DF9C8BD00F3405F /* LCCKUserGroupItemCell.m */; };
 		9AC3A4E21DF9CE0300F3405F /* LCCKChatDetailHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AC3A4E11DF9CE0300F3405F /* LCCKChatDetailHelper.m */; };
+		9AC4522A1E151E9E00619112 /* ChatKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC452271E151E8700619112 /* ChatKit.framework */; };
+		9AC4522B1E151E9E00619112 /* ChatKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC452271E151E8700619112 /* ChatKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		9AD665CC1D2277830040A4E3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0B721B1CED662D004FDACC /* SystemConfiguration.framework */; };
 		9AD665CD1D22778B0040A4E3 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0B721D1CED6637004FDACC /* MobileCoreServices.framework */; };
 		9AD665CE1D2277920040A4E3 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0B721F1CED6644004FDACC /* CoreTelephony.framework */; };
 		9AD665CF1D22779A0040A4E3 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0B72211CED664D004FDACC /* CoreLocation.framework */; };
-		D3428C5E46A30AC6F89DB697 /* libPods-ChatKit-OC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D62193C0ECACB72DC928AD70 /* libPods-ChatKit-OC.a */; };
+		D6B21DCFEA88FFA0694238EC /* libPods-ChatKit-OC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D62193C0ECACB72DC928AD70 /* libPods-ChatKit-OC.a */; };
 		E7586C4F1D630681000C18B4 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7586C4E1D630681000C18B4 /* CoreMotion.framework */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		9AC452261E151E8700619112 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9AC452211E151E8600619112 /* ChatKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9A6060821CEC831800D14D73;
+			remoteInfo = ChatKit;
+		};
+		9AC452281E151E9600619112 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9AC452211E151E8600619112 /* ChatKit.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 9A6060811CEC831800D14D73;
+			remoteInfo = ChatKit;
+		};
+		9AC4522C1E151E9E00619112 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9AC452211E151E8600619112 /* ChatKit.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 9A6060811CEC831800D14D73;
+			remoteInfo = ChatKit;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		9A1AD17B1CEDE640000FF26E /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				9AC4522B1E151E9E00619112 /* ChatKit.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -216,6 +243,7 @@
 		9AC3A4DC1DF9C8BD00F3405F /* LCCKUserGroupItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCCKUserGroupItemCell.m; sourceTree = "<group>"; };
 		9AC3A4E01DF9CE0300F3405F /* LCCKChatDetailHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCCKChatDetailHelper.h; sourceTree = "<group>"; };
 		9AC3A4E11DF9CE0300F3405F /* LCCKChatDetailHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCCKChatDetailHelper.m; sourceTree = "<group>"; };
+		9AC452211E151E8600619112 /* ChatKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ChatKit.xcodeproj; path = ../ChatKit/ChatKit.xcodeproj; sourceTree = "<group>"; };
 		D62193C0ECACB72DC928AD70 /* libPods-ChatKit-OC.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ChatKit-OC.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E55D34EC8F162DB5443587B0 /* Pods-ChatKit-OC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChatKit-OC.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ChatKit-OC/Pods-ChatKit-OC.debug.xcconfig"; sourceTree = "<group>"; };
 		E7586C4E1D630681000C18B4 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
@@ -229,9 +257,10 @@
 				E7586C4F1D630681000C18B4 /* CoreMotion.framework in Frameworks */,
 				9AD665CF1D22779A0040A4E3 /* CoreLocation.framework in Frameworks */,
 				9AD665CE1D2277920040A4E3 /* CoreTelephony.framework in Frameworks */,
+				9AC4522A1E151E9E00619112 /* ChatKit.framework in Frameworks */,
 				9AD665CD1D22778B0040A4E3 /* MobileCoreServices.framework in Frameworks */,
 				9AD665CC1D2277830040A4E3 /* SystemConfiguration.framework in Frameworks */,
-				D3428C5E46A30AC6F89DB697 /* libPods-ChatKit-OC.a in Frameworks */,
+				D6B21DCFEA88FFA0694238EC /* libPods-ChatKit-OC.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -570,6 +599,7 @@
 		9A754D421CECAC3E000967F1 = {
 			isa = PBXGroup;
 			children = (
+				9AC452211E151E8600619112 /* ChatKit.xcodeproj */,
 				9A4CBADB1DB87F2000E61C92 /* ChatKit-OC.entitlements */,
 				9A4730281CECAEC500AEB86F /* Example */,
 				9A754D4C1CECAC3E000967F1 /* Products */,
@@ -706,6 +736,14 @@
 			path = ChatDetailHelper;
 			sourceTree = "<group>";
 		};
+		9AC452221E151E8600619112 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				9AC452271E151E8700619112 /* ChatKit.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		DA96A2E70997437673F17F60 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -745,6 +783,8 @@
 			buildRules = (
 			);
 			dependencies = (
+				9AC452291E151E9600619112 /* PBXTargetDependency */,
+				9AC4522D1E151E9E00619112 /* PBXTargetDependency */,
 			);
 			name = "ChatKit-OC";
 			productName = "ChatKit-OC";
@@ -762,7 +802,7 @@
 				TargetAttributes = {
 					9A754D4A1CECAC3E000967F1 = {
 						CreatedOnToolsVersion = 7.3;
-						DevelopmentTeam = PUEB48NTQQ;
+						DevelopmentTeam = Y6X8P44TM5;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.Push = {
@@ -784,13 +824,29 @@
 			mainGroup = 9A754D421CECAC3E000967F1;
 			productRefGroup = 9A754D4C1CECAC3E000967F1 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 9AC452221E151E8600619112 /* Products */;
+					ProjectRef = 9AC452211E151E8600619112 /* ChatKit.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				9A754D4A1CECAC3E000967F1 /* ChatKit-OC */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		9AC452271E151E8700619112 /* ChatKit.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = ChatKit.framework;
+			remoteRef = 9AC452261E151E8700619112 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		9A754D491CECAC3E000967F1 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -997,6 +1053,19 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		9AC452291E151E9600619112 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = ChatKit;
+			targetProxy = 9AC452281E151E9600619112 /* PBXContainerItemProxy */;
+		};
+		9AC4522D1E151E9E00619112 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = ChatKit;
+			targetProxy = 9AC4522C1E151E9E00619112 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		9A4730561CECAEC500AEB86F /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -1108,7 +1177,7 @@
 				CODE_SIGN_ENTITLEMENTS = "ChatKit-OC.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = PUEB48NTQQ;
+				DEVELOPMENT_TEAM = Y6X8P44TM5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Example/Class/Module/Other/Info.plist";
@@ -1138,7 +1207,7 @@
 					"\"$(SRCROOT)/../../RedpacketStaticLib/AlipayLib\"/**",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.redpacket.leancloud;
+				PRODUCT_BUNDLE_IDENTIFIER = com.chatkit.leancloud;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1155,7 +1224,7 @@
 				CODE_SIGN_ENTITLEMENTS = "ChatKit-OC.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = PUEB48NTQQ;
+				DEVELOPMENT_TEAM = Y6X8P44TM5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Example/Class/Module/Other/Info.plist";
@@ -1185,7 +1254,7 @@
 					"\"$(SRCROOT)/../../RedpacketStaticLib/AlipayLib\"/**",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.redpacket.leancloud;
+				PRODUCT_BUNDLE_IDENTIFIER = com.chatkit.leancloud;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";

ChatKit-OC/Example/Class/Module/ConversationDetail/Controller/LCCKGroupConversationDetailViewController.m

@@ -236,18 +236,19 @@ - (void)addAndCacheMembersWithClientIds:(NSArray *)clientIds callback:(LCCKBoole
 
 - (void)profileNameDidChanged:(NSString *)name {
     [[self class] lcck_showHUD];
-    [self.conversation setObject:name forKey:@"name"];
-    [self.conversation updateWithCallback:^(BOOL succeeded, NSError * _Nullable error) {
-        [[self class] lcck_hideHUD];
-        if (succeeded) {
-            [[self class] lcck_showSuccess:@"修改成功"];
-            self.data = nil;
-            [self.tableView reloadData];
-            [[LCCKConversationService sharedInstance] removeCacheForConversationId:self.conversation.conversationId];
-        } else {
-            [[self class] lcck_showError:@"修改失败"];
-        }
-    }];
+    //FIXME:
+//    [self.conversation setObject:name forKey:@"name"];
+//    [self.conversation updateWithCallback:^(BOOL succeeded, NSError * _Nullable error) {
+//        [[self class] lcck_hideHUD];
+//        if (succeeded) {
+//            [[self class] lcck_showSuccess:@"修改成功"];
+//            self.data = nil;
+//            [self.tableView reloadData];
+//            [[LCCKConversationService sharedInstance] removeCacheForConversationId:self.conversation.conversationId];
+//        } else {
+//            [[self class] lcck_showError:@"修改失败"];
+//        }
+//    }];
 
 }
 

ChatKit-OC/Example/Class/Module/Other/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.9</string>
+	<string>0.4.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ChatKit-OC/Example/LCChatKitExample+Setting.m

@@ -630,8 +630,7 @@ - (void)lcck_exampleMarkBadgeWithTotalUnreadCount:(NSInteger)totalUnreadCount
 + (void)lcck_exampleChangeGroupAvatarURLsForConversationId:(NSString *)conversationId
                                               shouldInsert:(BOOL)shouldInsert {
     [self lcck_showMessage:@"正在设置群头像"];
-    [[LCCKConversationService sharedInstance]
-     fecthConversationWithConversationId:conversationId
+    [[LCCKConversationService sharedInstance] fetchConversationWithConversationId:conversationId
      callback:^(AVIMConversation *conversation, NSError *error) {
          [conversation
           lcck_setObject:
@@ -692,7 +691,7 @@ - (NSArray *)lcck_rightButtonsAtIndexPath:(NSIndexPath *)indexPath
     actionItemMore.backgroundColor = [UIColor colorWithRed:0.78f green:0.78f blue:0.8f alpha:1.0];
     UITableViewRowAction *actionItemDelete = [UITableViewRowAction
                                               rowActionWithStyle:UITableViewRowActionStyleDefault
-                                              title:LCCKLocalizedStrings(@"Delete")
+                                              title:@"删除"
                                               handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) {
                                                   [[LCChatKit sharedInstance] deleteRecentConversationWithConversationId:conversation.conversationId];
                                               }];
@@ -767,6 +766,7 @@ + (void)lcck_tryPresentViewControllerViewController:(UIViewController *)viewCont
             rootViewController =
             [(UINavigationController *)rootViewController visibleViewController];
         }
+        [rootViewController dismissViewControllerAnimated:NO completion:nil];
         [rootViewController presentViewController:viewController animated:YES completion:nil];
     }
 }

ChatKit-OC/Podfile

@@ -6,13 +6,13 @@ inhibit_all_warnings!
 #=========================================================
 #======================== Lib Dependency =================
 #=========================================================
-pod 'ChatKit', :path => '../'
+#pod 'ChatKit', :path => '../'
 
 #=========================================================
 #======================== Demo Dependency ================
 #=========================================================
 
-pod "CYLTabBarController", "~> 1.8.0"
+pod "CYLTabBarController", "~> 1.9.0"
 pod "CYLTableViewRowAction", "1.0.0"
 pod 'TWMessageBarManager'
 pod 'MLPAutoCompleteTextField'

ChatKit-OC/Podfile.lock

@@ -1,59 +1,15 @@
 PODS:
-  - AVOSCloud (3.8.2)
-  - AVOSCloudIM (3.8.2):
-    - AVOSCloud (= 3.8.2)
-    - AVOSCloudIM/_ARC (= 3.8.2)
-    - AVOSCloudIM/_NOARC (= 3.8.2)
-  - AVOSCloudIM/_ARC (3.8.2):
-    - AVOSCloud (= 3.8.2)
-    - AVOSCloudIM/_NOARC (= 3.8.2)
-  - AVOSCloudIM/_NOARC (3.8.2):
-    - AVOSCloud (= 3.8.2)
-  - ChatKit (0.8.10):
-    - AVOSCloud (~> 3.8.2)
-    - AVOSCloudIM (~> 3.8.2)
-    - CYLDeallocBlockExecutor (~> 1.1.2)
-    - DACircularProgress (~> 2.3.1)
-    - FDStackView (~> 1.0)
-    - FMDB (~> 2.6.2)
-    - Masonry (~> 1.0.1)
-    - MJRefresh (~> 3.1.9)
-    - MLLabel (~> 1.9.2)
-    - MWPhotoBrowser (~> 2.1.2)
-    - pop (~> 1.0.9)
-    - SDWebImage (~> 3.8.0)
-    - UITableView+FDTemplateLayoutCell (~> 1.5.beta)
-  - CYLDeallocBlockExecutor (1.1.2)
   - CYLTabBarController (1.8.0)
   - CYLTableViewRowAction (1.0.0)
-  - DACircularProgress (2.3.1)
-  - FDStackView (1.0)
-  - FMDB (2.6.2):
-    - FMDB/standard (= 2.6.2)
-  - FMDB/standard (2.6.2)
   - FTPopOverMenu (1.3.1)
   - FXForms (1.2.14)
-  - Masonry (1.0.2)
-  - MBProgressHUD (0.9.2)
-  - MJRefresh (3.1.12)
-  - MLLabel (1.9.2)
   - MLPAutoCompleteTextField (1.5)
-  - MWPhotoBrowser (2.1.2):
-    - DACircularProgress (~> 2.3)
-    - MBProgressHUD (~> 0.9)
-    - SDWebImage (!= 3.7.2, ~> 3.7)
-  - pop (1.0.9)
   - RedPacketAlipay (15.0.2)
   - RedpacketLib (3.4.0):
     - RedPacketAlipay
-  - SDWebImage (3.8.2):
-    - SDWebImage/Core (= 3.8.2)
-  - SDWebImage/Core (3.8.2)
   - TWMessageBarManager (1.8.1)
-  - UITableView+FDTemplateLayoutCell (1.5.beta)
 
 DEPENDENCIES:
-  - ChatKit (from `../`)
   - CYLTabBarController (~> 1.8.0)
   - CYLTableViewRowAction (= 1.0.0)
   - FTPopOverMenu
@@ -62,35 +18,16 @@ DEPENDENCIES:
   - RedpacketLib (~> 3.4.0)
   - TWMessageBarManager
 
-EXTERNAL SOURCES:
-  ChatKit:
-    :path: ../
-
 SPEC CHECKSUMS:
-  AVOSCloud: fc3a1ae341a1421b66f8828fbc9850ddb6eaaa7c
-  AVOSCloudIM: 7c8ba883afde0f0bceabd5aa9856d407bb4b06ee
-  ChatKit: 0b2c5079782f8829a6ae08e7834b02ce530b798b
-  CYLDeallocBlockExecutor: ecf39e45dcead9e120f460df5668b8f5093d178e
   CYLTabBarController: 3b6befc12bccc2fd29a4d69e3ad7f9c4aaaf4506
   CYLTableViewRowAction: 66bd3f7478b46894ff40b74d892fc85aed41656b
-  DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71
-  FDStackView: 3a4bbe0ce9c35e974246a585168b9da8c32213f1
-  FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
   FTPopOverMenu: 11e8277cf11bbd51e1c4cbd140ab62a26dafb50a
   FXForms: 724500c0c3f3eb3ba1004b3b83abcee55d3daf18
-  Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
-  MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
-  MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
-  MLLabel: df58127ce0bd1f87890ecc3232db77a85ce4cd97
   MLPAutoCompleteTextField: ba4d507bbff2bd4f139d4197814fc8dd39caf77e
-  MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5
-  pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce
   RedPacketAlipay: a5de6db2e2671fc9255d6d396be869e3ba2f0489
   RedpacketLib: ac4c0e8892bf4559dd55b32d7256e216724dd4a8
-  SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   TWMessageBarManager: fd84e7948ba7968a2b5d9454859135761214ec56
-  UITableView+FDTemplateLayoutCell: 02b508ab1cb4cea16a8c17ac83d2cd1fd72124f9
 
-PODFILE CHECKSUM: d1efe8d2d1ca285e64cc555a56dc43f9d9c39cdf
+PODFILE CHECKSUM: 8426e746f4f23a6038f3765a32cdabb5688deaf4
 
 COCOAPODS: 1.1.1