搜索框优化~

cjddny · cjddny · commit 8dbb5af42361 · 2015-11-23T11:39:49.000+08:00
diff --git a/Coding_iOS.xcodeproj/project.pbxproj b/Coding_iOS.xcodeproj/project.pbxproj
@@ -934,6 +934,8 @@
 		D0C447AF1C02A42C00DC1C4B /* filterBtn_selected_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0C447AD1C02A42C00DC1C4B /* filterBtn_selected_Nav@2x.png */; };
 		D0C447B01C02A42C00DC1C4B /* filtertBtn_normal_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0C447AE1C02A42C00DC1C4B /* filtertBtn_normal_Nav@2x.png */; };
 		D0C447B21C02A44200DC1C4B /* addBtn_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0C447B11C02A44200DC1C4B /* addBtn_Nav@2x.png */; };
+		D0C447B41C02B1DE00DC1C4B /* btn_fliter_down@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0C447B31C02B1DE00DC1C4B /* btn_fliter_down@2x.png */; };
+		D0C447B61C02B7C000DC1C4B /* icon_search_searchbar@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0C447B51C02B7C000DC1C4B /* icon_search_searchbar@2x.png */; };
 		E7A046A01A47279E00528C12 /* Helper.m in Sources */ = {isa = PBXBuildFile; fileRef = E7A0469F1A47279E00528C12 /* Helper.m */; };
 /* End PBXBuildFile section */
 
@@ -2363,6 +2365,8 @@
 		D0C447AD1C02A42C00DC1C4B /* filterBtn_selected_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "filterBtn_selected_Nav@2x.png"; sourceTree = "<group>"; };
 		D0C447AE1C02A42C00DC1C4B /* filtertBtn_normal_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "filtertBtn_normal_Nav@2x.png"; sourceTree = "<group>"; };
 		D0C447B11C02A44200DC1C4B /* addBtn_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "addBtn_Nav@2x.png"; sourceTree = "<group>"; };
+		D0C447B31C02B1DE00DC1C4B /* btn_fliter_down@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_fliter_down@2x.png"; sourceTree = "<group>"; };
+		D0C447B51C02B7C000DC1C4B /* icon_search_searchbar@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_search_searchbar@2x.png"; sourceTree = "<group>"; };
 		E7A0469E1A47279E00528C12 /* Helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Helper.h; sourceTree = "<group>"; };
 		E7A0469F1A47279E00528C12 /* Helper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Helper.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -4059,6 +4063,8 @@
 				7E8E59781B6F91C40083CA02 /* bubble */,
 				8EA6CF5F19E240C40076D59C /* btn_delete_tweetimage@2x.png */,
 				8B3516541B6CF69E0049BC45 /* icon_search_clock@2x.png */,
+				D0C447B51C02B7C000DC1C4B /* icon_search_searchbar@2x.png */,
+				D0C447B31C02B1DE00DC1C4B /* btn_fliter_down@2x.png */,
 				D09E6ACD1BF9CCCF009D37F8 /* fliter_square@2x.png */,
 				D09E6ABF1BF82DC6009D37F8 /* btn_setFrequent@2x.png */,
 				8EA6CF6319E240C40076D59C /* commentOrLikeBeginImg@2x.png */,
@@ -5146,6 +5152,7 @@
 				4EACB4411A2C448F0097ABB3 /* button_file_move_unable@2x.png in Resources */,
 				4E0BD8851B6C7F0A0061CAA6 /* mock_topicAdlist.geojson in Resources */,
 				8EA6D17419E240C40076D59C /* placeholder_coding_square_55@2x.png in Resources */,
+				D0C447B61C02B7C000DC1C4B /* icon_search_searchbar@2x.png in Resources */,
 				D09E6ADF1BF9DDDD009D37F8 /* info_Nav@2x.png in Resources */,
 				8E8F7B3119EF6306006BA8BD /* btn_privateMsg_stranger@2x.png in Resources */,
 				4E03AC9A1A5BDDF9002B000B /* STARTIMAGE.jpg in Resources */,
@@ -5242,6 +5249,7 @@
 				4EF17EE21B3C3112003CDD2D /* intro_tip_3@2x.png in Resources */,
 				4E6383D51B32665700D98648 /* project_item_mr_pr@2x.png in Resources */,
 				8E80296D19F4E23100A470A2 /* creator_image@2x.png in Resources */,
+				D0C447B41C02B1DE00DC1C4B /* btn_fliter_down@2x.png in Resources */,
 				8EA6D16719E240C40076D59C /* nav_project_activity@2x.png in Resources */,
 				4EFE8DAD1B394A0D004B7559 /* file_changeType_RENAME@2x.png in Resources */,
 				B9A00D7F1ACA3A05008BA008 /* ProjectSetting.storyboard in Resources */,
diff --git a/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m
@@ -107,6 +107,9 @@ - (void)viewDidLoad
             [searchBar.layer setBorderColor:[UIColor whiteColor].CGColor];  //设置边框为白色
             [searchBar sizeToFit];
             searchBar.delegate = self;
+//            UITextField *searchField=[[[[searchBar subviews] firstObject] subviews] lastObject];
+//            [(UIImageView*)searchField.leftView setImage:[UIImage imageNamed:@"icon_seach_searchbar"]];
+            [searchBar setImage:[UIImage imageNamed:@"icon_search_searchbar"] forSearchBarIcon:UISearchBarIconSearch state:UIControlStateNormal];
             [searchBar setPlaceholder:@"项目、任务、讨论等"];
             [searchBar setTintColor:[UIColor whiteColor]];
             [searchBar insertBGColor:[UIColor colorWithHexString:@"0x28303b"]];
diff --git a/Coding_iOS/Controllers/SearchViewController.m b/Coding_iOS/Controllers/SearchViewController.m
@@ -79,6 +79,9 @@ -(void)buildUI{
         [searchBar sizeToFit];
         [searchBar setTintColor:[UIColor whiteColor]];
         [searchBar insertBGColor:[UIColor colorWithHexString:@"0xffffff"]];
+//        [searchBar setImage:nil forSearchBarIcon:UISearchBarIconSearch state:UIControlStateNormal];
+//        [searchBar setPositionAdjustment:UIOffsetMake(-10,0) forSearchBarIcon:UISearchBarIconSearch];
+//        searchBar.searchTextPositionAdjustment=UIOffsetMake(10,0);
         [searchBar setHeight:30];
         searchBar;
     });
@@ -117,7 +120,6 @@ -(void)buildUI{
     if (!_searchDisplayVC) {
         _searchDisplayVC = ({
             AllSearchDisplayVC *searchVC = [[AllSearchDisplayVC alloc] initWithSearchBar:_mySearchBar contentsController:self];
-            
             //自定义uisearchbar 要在这里重新申明
             //需要重新调整下大小
             searchVC.searchBar.frame=CGRectMake(20,7, kScreen_Width-75, 30);
@@ -135,7 +137,6 @@ -(void)buildUI{
             searchVC;
         });
     }
-    
     self.navigationItem.rightBarButtonItem=[[UIBarButtonItem alloc]initWithTitle:@"取消" style:UIBarButtonItemStylePlain target:self action:@selector(popToMainVCAction)];
     
     
diff --git a/Coding_iOS/Images/btn_fliter_down@2x.png b/Coding_iOS/Images/btn_fliter_down@2x.png
diff --git a/Coding_iOS/Images/icon_search_searchbar@2x.png b/Coding_iOS/Images/icon_search_searchbar@2x.png
diff --git a/Coding_iOS/Views/Search/CategorySearchBar.m b/Coding_iOS/Views/Search/CategorySearchBar.m
@@ -10,7 +10,8 @@
 
 @interface CategorySearchBar ()
 @property (copy,nonatomic)SelectBlock curBlock;
-@property (strong, nonatomic) UIButton *categoryBtn;
+@property (strong, nonatomic)UIButton *categoryBtn;
+@property (strong, nonatomic)UIButton *iconBtn;
 @end
 
 
@@ -21,14 +22,15 @@ -(void)layoutSubviews
     self.autoresizesSubviews = YES;
     //找到输入框  右移
     UITextField *searchField=[[[[self subviews] firstObject] subviews] lastObject];
-    [searchField setFrame:CGRectMake(55,5,230,20)];
-    
+    searchField.textAlignment=NSTextAlignmentLeft;
+    [searchField setFrame:CGRectMake(58,5,225,20)];
     //
-//    [(UIImageView*)searchField.leftView setImage:[UIImage imageNamed:@"tips_menu_icon_status"]];
+    [(UIImageView*)searchField.leftView setFrame:CGRectZero];
 }
 
 -(void)patchWithCategoryWithSelectBlock:(SelectBlock)block{
     [self addSubview:self.categoryBtn];
+    [self addSubview:self.iconBtn];
     _curBlock=block;
 }
 
@@ -44,6 +46,16 @@ -(UIButton*)categoryBtn{
     return _categoryBtn;
 }
 
+-(UIButton*)iconBtn{
+    if (!_iconBtn) {
+        _iconBtn=[[UIButton alloc] initWithFrame:CGRectMake(50, 11, 8, 8)];
+        [_iconBtn addTarget:self action:@selector(selectCategoryAction) forControlEvents:UIControlEventTouchUpInside];
+        [_iconBtn setBackgroundImage:[UIImage imageNamed:@"btn_fliter_down"] forState:UIControlStateNormal];
+    }
+    return _iconBtn;
+}
+
+
 
 #pragma mark -- event
 -(void)selectCategoryAction{
