iOS Team / ScioLive · Commits

Commit 62e467042d90c601809c6c526609d96f3b510818

Authored by 张旭
2 parents 5a2102c9 5a5164da

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive

Inline Side-by-side
Showing 2 changed files with 26 additions and 10 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @62e4670
@@ -3610,7 +3610,7 @@ @@ -3610,7 +3610,7 @@
3610 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3610 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3611 CODE_SIGN_IDENTITY = "Apple Development"; 3611 CODE_SIGN_IDENTITY = "Apple Development";
3612 CODE_SIGN_STYLE = Automatic; 3612 CODE_SIGN_STYLE = Automatic;
3613 - CURRENT_PROJECT_VERSION = 367; 3613 + CURRENT_PROJECT_VERSION = 368;
3614 DEVELOPMENT_TEAM = 94X49GG3ZW; 3614 DEVELOPMENT_TEAM = 94X49GG3ZW;
3615 ENABLE_BITCODE = NO; 3615 ENABLE_BITCODE = NO;
3616 FRAMEWORK_SEARCH_PATHS = ( 3616 FRAMEWORK_SEARCH_PATHS = (
@@ -3645,7 +3645,7 @@ @@ -3645,7 +3645,7 @@
3645 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", 3645 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3646 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", 3646 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3647 ); 3647 );
3648 - MARKETING_VERSION = 3.5.7; 3648 + MARKETING_VERSION = 3.5.8;
3649 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3649 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3650 PRODUCT_NAME = "$(TARGET_NAME)"; 3650 PRODUCT_NAME = "$(TARGET_NAME)";
3651 PROVISIONING_PROFILE_SPECIFIER = ""; 3651 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3662,7 +3662,7 @@ @@ -3662,7 +3662,7 @@
3662 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3662 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3663 CODE_SIGN_IDENTITY = "Apple Development"; 3663 CODE_SIGN_IDENTITY = "Apple Development";
3664 CODE_SIGN_STYLE = Automatic; 3664 CODE_SIGN_STYLE = Automatic;
3665 - CURRENT_PROJECT_VERSION = 367; 3665 + CURRENT_PROJECT_VERSION = 368;
3666 DEVELOPMENT_TEAM = 94X49GG3ZW; 3666 DEVELOPMENT_TEAM = 94X49GG3ZW;
3667 ENABLE_BITCODE = NO; 3667 ENABLE_BITCODE = NO;
3668 FRAMEWORK_SEARCH_PATHS = ( 3668 FRAMEWORK_SEARCH_PATHS = (
@@ -3697,7 +3697,7 @@ @@ -3697,7 +3697,7 @@
3697 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", 3697 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3698 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", 3698 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3699 ); 3699 );
3700 - MARKETING_VERSION = 3.5.7; 3700 + MARKETING_VERSION = 3.5.8;
3701 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3701 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3702 PRODUCT_NAME = "$(TARGET_NAME)"; 3702 PRODUCT_NAME = "$(TARGET_NAME)";
3703 PROVISIONING_PROFILE_SPECIFIER = ""; 3703 PROVISIONING_PROFILE_SPECIFIER = "";
CNLiveScioLive/Pages/Home/高级搜索/Controller/CNLiveAdvancedSearchViewController.m
  View file @62e4670
@@ -58,12 +58,28 @@ @@ -58,12 +58,28 @@
58 self.searchBar.barTintColor = [UIColor whiteColor]; 58 self.searchBar.barTintColor = [UIColor whiteColor];
59 self.searchBar.searchBarStyle =UISearchBarStyleMinimal; 59 self.searchBar.searchBarStyle =UISearchBarStyleMinimal;
60 60
61 - UITextField *searchField = [_searchBar valueForKey:@"_searchField"];  
62 - searchField.layer.cornerRadius = 10.0f;  
63 - searchField.layer.borderColor = HEXCOLOR(0xC4C5C8).CGColor;  
64 - searchField.layer.borderWidth = 1;  
65 - searchField.font = [UIFont systemFontOfSize:13];  
66 - [self.view addSubview:self.searchBar]; 61 + NSString *version = [UIDevice currentDevice].systemVersion;
  62 + if (version.doubleValue >= 13.0) {
  63 + UITextField *searchField;
  64 + NSUInteger Views = [self.searchBar.subviews count];
  65 + for(int i = 0; i < Views; i++) {
  66 + if([[self.searchBar.subviews objectAtIndex:i] isKindOfClass:[UITextField class]]) {
  67 + searchField = [self.searchBar.subviews objectAtIndex:i];
  68 + }
  69 + }
  70 + searchField.layer.cornerRadius = 10.0f;
  71 + searchField.layer.borderColor = HEXCOLOR(0xC4C5C8).CGColor;
  72 + searchField.layer.borderWidth = 1;
  73 + searchField.font = [UIFont systemFontOfSize:13];
  74 + [self.view addSubview:self.searchBar];
  75 + } else {
  76 + UITextField *searchField = [self.searchBar valueForKey:@"_searchField"];
  77 + searchField.layer.cornerRadius = 10.0f;
  78 + searchField.layer.borderColor = HEXCOLOR(0xC4C5C8).CGColor;
  79 + searchField.layer.borderWidth = 1;
  80 + searchField.font = [UIFont systemFontOfSize:13];
  81 + [self.view addSubview:self.searchBar];
  82 + }
67 83
68 self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 50, MainScreenWidth, MainScreenHeight - 50)]; 84 self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 50, MainScreenWidth, MainScreenHeight - 50)];
69 self.tableView.backgroundColor = HEXCOLOR(0xF7F6F6); 85 self.tableView.backgroundColor = HEXCOLOR(0xF7F6F6);