Skip to content
This repository has been archived by the owner on Jul 2, 2019. It is now read-only.

Commit

Permalink
Merge pull request #372 from zapcannon87/master
Browse files Browse the repository at this point in the history
Release v2.0.2
  • Loading branch information
zapcannon87 authored Dec 25, 2017
2 parents c4a447c + 40fa3bc commit cf81306
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 37 deletions.
32 changes: 16 additions & 16 deletions ChatKit-OC/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
PODS:
- AVOSCloud (8.0.4)
- AVOSCloudIM (8.0.4):
- AVOSCloud (= 8.0.4)
- AVOSCloudIM/_ARC (= 8.0.4)
- AVOSCloudIM/_NOARC (= 8.0.4)
- AVOSCloudIM/_ARC (8.0.4):
- AVOSCloud (= 8.0.4)
- AVOSCloudIM/_NOARC (= 8.0.4)
- AVOSCloudIM/_NOARC (8.0.4):
- AVOSCloud (= 8.0.4)
- ChatKit (2.0.0):
- AVOSCloud (~> 8.0.4)
- AVOSCloudIM (~> 8.0.4)
- AVOSCloud (8.0.6)
- AVOSCloudIM (8.0.6):
- AVOSCloud (= 8.0.6)
- AVOSCloudIM/_ARC (= 8.0.6)
- AVOSCloudIM/_NOARC (= 8.0.6)
- AVOSCloudIM/_ARC (8.0.6):
- AVOSCloud (= 8.0.6)
- AVOSCloudIM/_NOARC (= 8.0.6)
- AVOSCloudIM/_NOARC (8.0.6):
- AVOSCloud (= 8.0.6)
- ChatKit (2.0.2):
- AVOSCloud (~> 8.0.6)
- AVOSCloudIM (~> 8.0.6)
- CYLDeallocBlockExecutor (~> 1.1.2)
- DACircularProgress (~> 2.3.1)
- FDStackView (~> 1.0)
Expand Down Expand Up @@ -65,9 +65,9 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
AVOSCloud: 645f20b77cdcc0622a45c663c1a5735a17d1df27
AVOSCloudIM: 182e93f9e6e3ad165c6fd67d8c01d15f561a7538
ChatKit: 5c1e12b04919974ed4eeb7455d45861d99212390
AVOSCloud: 3fc5837eb4019f75eecd3064ed79d92656cbe2b5
AVOSCloudIM: b2d2e57025c2d78030e562cd78325e362615b251
ChatKit: fd773c000315d135d3c4949f52d32e005445408a
CYLDeallocBlockExecutor: ecf39e45dcead9e120f460df5668b8f5093d178e
CYLTabBarController: 8d99fccf22866fe18c978c5ff863dc6051da45ff
DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71
Expand Down
6 changes: 3 additions & 3 deletions ChatKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ChatKit"
s.version = "2.0.1"
s.version = "2.0.2"
s.summary = "An IM App Framework, support sending text, pictures, audio, video, location messaging, managing address book, more interesting features."
s.homepage = "https://github.com/LeanCloud/ChatKit-OC"
s.license = { :type => 'MIT', :file => 'LICENSE' }
Expand All @@ -13,8 +13,8 @@ Pod::Spec.new do |s|
s.resources = 'ChatKit/Class/Resources/*', 'ChatKit/**/*.xib'

s.requires_arc = true
s.dependency "AVOSCloud" , "~> 8.0.4"
s.dependency "AVOSCloudIM", "~> 8.0.4"
s.dependency "AVOSCloud" , "~> 8.0.6"
s.dependency "AVOSCloudIM", "~> 8.0.6"
s.dependency "MJRefresh" , "~> 3.1.9"
s.dependency "Masonry" , "~> 1.0.1"
s.dependency "SDWebImage" , "~> 3.8.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@
*/
- (NSString *)lcck_title;

- (void)lcck_setObject:(id)object forKey:(NSString *)key callback:(LCCKBooleanResultBlock)callback;

- (void)lcck_removeObjectForKey:(NSString *)key callback:(LCCKBooleanResultBlock)callback;

- (void)lcck_setConversationWithMute:(BOOL)mute callback:(LCCKBooleanResultBlock)callback;
- (BOOL)lcck_isCreaterForCurrentUser;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,6 @@ - (NSString *)lcck_title {
}
}

- (void)lcck_setObject:(id)object forKey:(NSString *)key callback:(LCCKBooleanResultBlock)callback {
AVIMConversationUpdateBuilder *updateBuilder = [self newUpdateBuilder] ;
updateBuilder.attributes = self.attributes;
[updateBuilder setObject:object forKey:key];
[self update:[updateBuilder dictionary] callback:callback];
}

- (void)lcck_removeObjectForKey:(NSString *)key callback:(LCCKBooleanResultBlock)callback {
AVIMConversationUpdateBuilder *updateBuilder = [self newUpdateBuilder] ;
updateBuilder.attributes = self.attributes;
[updateBuilder removeObjectForKey:key];
[self update:[updateBuilder dictionary] callback:callback];
}

- (void)lcck_setConversationWithMute:(BOOL)mute callback:(LCCKBooleanResultBlock)callback {
if (mute) {
[self muteWithCallback:^(BOOL succeeded, NSError * _Nullable error) {
Expand Down

0 comments on commit cf81306

Please sign in to comment.