From 89d748b77b478905732e60f0b4c5807c274b6565 Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Thu, 29 Mar 2018 16:33:57 +0800
Subject: [PATCH] 功能优化。广告UI 设计

---
 pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m |   71 ++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
index c99daa2..8b6b514 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
@@ -61,7 +61,7 @@
 {
     [super viewDidAppear:animated];
     [[CBMoralManager sharedManager] disconnectPeripheral:[[CBMoralManager sharedManager] myPeripheral]];
-
+    
     
 }
 
@@ -114,10 +114,12 @@
     
     ic_top_bkH = 325;
     ic_search_doneH = 230;
+    CGFloat btnSearchH = 55;
     if ( IsiPhone4 || IsiPhone5 )
     {
         ic_top_bkH = 260;
         ic_search_doneH = 180;
+        btnSearchH = 40;
     }
     
     UIImageView * ic_top_bk = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, ic_top_bkH)];
@@ -134,7 +136,7 @@
     ic_searching.hidden = YES;
     
     ic_search_btn = [UIButton buttonWithType:UIButtonTypeCustom];
-    ic_search_btn.frame = CGRectMake((SCREEN_WIDTH-128)/2, ic_search_doneH+55, 128, 32);
+    ic_search_btn.frame = CGRectMake((SCREEN_WIDTH-128)/2, ic_search_doneH+btnSearchH, 128, 32);
     [ic_search_btn setBackgroundImage:[UIImage imageNamed:@"ic_search_start_btn" ] forState:UIControlStateNormal];
     ic_search_btn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
     ic_search_btn.layer.masksToBounds=YES;
@@ -204,7 +206,7 @@
             _SetTitleLabel.text = @"������������������";
             
             return cell;
-
+            
         }
         else
         {
@@ -292,10 +294,10 @@
             
             //[cell setDiscoveredPeripheralDataFromPeripheral:newPeriPheral];
             
-           return cell;
+            return cell;
         }
     }
-
+    
     return  nil;
 }
 
@@ -367,28 +369,28 @@
 
 
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-   
     
-     if (_currentStatus == 2)
-     {
-          NSInteger index = [indexPath row];
-         if (isBluetoothON)
-         {
-             [tableView deselectRowAtIndexPath:indexPath animated:YES];
-             [self connectPeripheral:indexPath.row];
-         }
-         
-         // DeviceSpareModel* model = [self.modelArray objectAtIndex:index];
-         // ������������������������
-         //HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
-         //page.bSelRoom = 2;
-         // ������������
-         //BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
-         //[self presentViewController:baseNav animated:YES completion:nil];
-         //[self showActionForPhoto];
-     }
     
-
+    if (_currentStatus == 2)
+    {
+        NSInteger index = [indexPath row];
+        if (isBluetoothON)
+        {
+            [tableView deselectRowAtIndexPath:indexPath animated:YES];
+            [self connectPeripheral:indexPath.row];
+        }
+        
+        // DeviceSpareModel* model = [self.modelArray objectAtIndex:index];
+        // ������������������������
+        //HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
+        //page.bSelRoom = 2;
+        // ������������
+        //BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
+        //[self presentViewController:baseNav animated:YES completion:nil];
+        //[self showActionForPhoto];
+    }
+    
+    
 }
 
 
@@ -449,7 +451,7 @@
                 [UserDefault setObject:bleUUID forKey:@"bleUUID"];
                 [UserDefault setObject:bleName forKey:@"bleName"];
                 
-                [UserDefault synchronize];//������synchronize���������������������������������,���������������NSUserDefaults������������������������������������ 
+                [UserDefault synchronize];//������synchronize���������������������������������,���������������NSUserDefaults������������������������������������
                 //CBPeripheralExt *selBLE = [UserDefault objectForKey:@"Peripheral"];//������������������Peripheral
                 [self backAticon];
             }
@@ -508,13 +510,14 @@
 }
 
 /*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
+ #pragma mark - Navigation
+ 
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+ }
+ */
 
 @end
+

--
Gitblit v1.8.0