Commit 6be08c2166ac9ee78aa7145a609c25335eff65d7
1 parent
67294fbe
0.4.8 版本 家园入口一直显示
Showing
3 changed files
with
20 additions
and
13 deletions
CNLiveNewIMAManagerKit.podspec
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | 8 | ||
| 9 | Pod::Spec.new do |s| | 9 | Pod::Spec.new do |s| |
| 10 | s.name = 'CNLiveNewIMAManagerKit' | 10 | s.name = 'CNLiveNewIMAManagerKit' |
| 11 | - s.version = '0.4.7' | 11 | + s.version = '0.4.8' |
| 12 | s.summary = 'A short description of CNLiveNewIMAManagerKit.' | 12 | s.summary = 'A short description of CNLiveNewIMAManagerKit.' |
| 13 | 13 | ||
| 14 | #s.description = <<-DESC | 14 | #s.description = <<-DESC |
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
| @@ -185,18 +185,22 @@ | @@ -185,18 +185,22 @@ | ||
| 185 | switch ([IMAPlatform sharedInstance].platformType) { | 185 | switch ([IMAPlatform sharedInstance].platformType) { |
| 186 | case IMPlatformTypeC: | 186 | case IMPlatformTypeC: |
| 187 | { | 187 | { |
| 188 | - /**是否有创建亲情群入口，默认有，如果被删了，就不存在了*/ | ||
| 189 | - BOOL hasCreateFamily = YES; | ||
| 190 | - NSString *deletedCreateFamily = [[NSUserDefaults standardUserDefaults] objectForKey:CNDeletedCreateFamily]; | ||
| 191 | - if ([deletedCreateFamily isEqualToString:@"1"]) { | ||
| 192 | - //首页会话已经删除情亲群入口 | ||
| 193 | - hasCreateFamily = NO; | ||
| 194 | - } | ||
| 195 | - if (hasCreateFamily) { | ||
| 196 | - /**创建亲情群会话并插入会话列表第一个位置*/ | ||
| 197 | - CNCreateFamilyGroupConversation *familyGroupConversation = [[CNCreateFamilyGroupConversation alloc] init]; | ||
| 198 | - [_conversationList insertObject:familyGroupConversation atIndex:0]; | ||
| 199 | - } | 188 | + /**是否有创建亲情群入口，默认有，如果被删了，就不存在了(备注:可以一直显示了,不能删除了)*/ |
| 189 | +// BOOL hasCreateFamily = YES; | ||
| 190 | +// NSString *deletedCreateFamily = [[NSUserDefaults standardUserDefaults] objectForKey:CNDeletedCreateFamily]; | ||
| 191 | +// if ([deletedCreateFamily isEqualToString:@"1"]) { | ||
| 192 | +// //首页会话已经删除情亲群入口 | ||
| 193 | +// hasCreateFamily = NO; | ||
| 194 | +// } | ||
| 195 | +// if (hasCreateFamily) { | ||
| 196 | +// /**创建亲情群会话并插入会话列表第一个位置*/ | ||
| 197 | +// CNCreateFamilyGroupConversation *familyGroupConversation = [[CNCreateFamilyGroupConversation alloc] init]; | ||
| 198 | +// [_conversationList insertObject:familyGroupConversation atIndex:0]; | ||
| 199 | +// } | ||
| 200 | + | ||
| 201 | + /**创建家园会话并插入会话列表第一个位置*/ | ||
| 202 | + CNCreateFamilyGroupConversation *familyGroupConversation = [[CNCreateFamilyGroupConversation alloc] init]; | ||
| 203 | + [_conversationList insertObject:familyGroupConversation atIndex:0]; | ||
| 200 | 204 | ||
| 201 | if (self.isPlay) { | 205 | if (self.isPlay) { |
| 202 | IMAPlayMusicConversation *tempCon = [[IMAPlayMusicConversation alloc] init]; | 206 | IMAPlayMusicConversation *tempCon = [[IMAPlayMusicConversation alloc] init]; |
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
| @@ -220,6 +220,9 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) { | @@ -220,6 +220,9 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) { | ||
| 220 | ///家园礼物未领取 | 220 | ///家园礼物未领取 |
| 221 | CustomMsgTypeFamilyGift = 5006, | 221 | CustomMsgTypeFamilyGift = 5006, |
| 222 | 222 | ||
| 223 | + ///家园信息变更消息 | ||
| 224 | + CustomMsgTypeFamilyInfoChange = 5007, | ||
| 225 | + | ||
| 223 | CustomMsgTypeSendCurrentLocation = 8000, // 发送当前位置 | 226 | CustomMsgTypeSendCurrentLocation = 8000, // 发送当前位置 |
| 224 | 227 | ||
| 225 | // CustomMsgTypeInitiatingSharedLocation = 8001, //发起位置共享 | 228 | // CustomMsgTypeInitiatingSharedLocation = 8001, //发起位置共享 |