iOS Team / CNLiveCommuntyModule · Commits

Commit 4e7c769155a973398678ba65ffdddc9a8fda19b8

Authored by liushiyu
1 parent 46987641

0.1.7

Inline Side-by-side
Showing 5 changed files with 5 additions and 5 deletions
CNLiveCommuntyModule.podspec
  View file @4e7c769
@@ -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 = 'CNLiveCommuntyModule' 10 s.name = 'CNLiveCommuntyModule'
11 - s.version = '0.1.6' 11 + s.version = '0.1.7'
12 s.summary = 'A short description of CNLiveCommuntyModule.' 12 s.summary = 'A short description of CNLiveCommuntyModule.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntViewController.m
  View file @4e7c769
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image]; 72 [weakSelf addChildViewController:vc noralImage:nomal_image selectImage:select_image];
73 }else{ 73 }else{
74 if ([homeModel.type isEqualToString:@"3"]) {//生活服务界面 原生 74 if ([homeModel.type isEqualToString:@"3"]) {//生活服务界面 原生
75 - if ([homeModel.cmsPageType isEqualToString:@"4"]) { 75 + if ([homeModel.cmsPageType isEqualToString:@"1"]) {
76 CNLiveCommuntActiviViewController * vc = [[CNLiveCommuntActiviViewController alloc] initWithWebUrl:homeModel.cmsPageUrl isRootVC:YES Type:@"1"]; 76 CNLiveCommuntActiviViewController * vc = [[CNLiveCommuntActiviViewController alloc] initWithWebUrl:homeModel.cmsPageUrl isRootVC:YES Type:@"1"];
77 vc.title = homeModel.columnName; 77 vc.title = homeModel.columnName;
78 vc.view.backgroundColor = [UIColor whiteColor]; 78 vc.view.backgroundColor = [UIColor whiteColor];
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
  View file @4e7c769
@@ -304,7 +304,7 @@ @@ -304,7 +304,7 @@
304 if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) return 3; 304 if (self.showType == CNLiveCommuntyOrderShowTypeListCompletOrder) return 3;
305 if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) return 2; 305 if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) return 2;
306 if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder) return 1; 306 if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder) return 1;
307 - if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) return 2; 307 + if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) return [self.createMdoel.repairId isNotBlank] && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]?1:2;
308 if (self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) return 1; 308 if (self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) return 1;
309 } 309 }
310 return 0; 310 return 0;
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
  View file @4e7c769
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 [IQKeyboardManager sharedManager].enable = YES; 24 [IQKeyboardManager sharedManager].enable = YES;
25 [IQKeyboardManager sharedManager].enableAutoToolbar = YES; 25 [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
26 26
27 - [CNUserInfoManager manager].userInfoModel.uid = @"145680";//@"10458139";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671" 27 + [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
28 28
29 // [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"]; 29 // [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
30 // [[NSUserDefaults standardUserDefaults] synchronize]; 30 // [[NSUserDefaults standardUserDefaults] synchronize];
Example/CNLiveCommuntyModule/main.m
  View file @4e7c769
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 int main(int argc, char * argv[]) 12 int main(int argc, char * argv[])
13 { 13 {
14 @autoreleasepool { 14 @autoreleasepool {
15 - [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore]; 15 + [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveProductionAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore];
16 return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class])); 16 return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
17 } 17 }
18 } 18 }