From 2197e837490f5083d18d9fdb97265d1e0f04832a Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Fri, 20 Apr 2018 12:01:38 +0800
Subject: [PATCH] no message

---
 pregnancy_guard/BaseProject/Model/MusicModel.h                                                                               |    1 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_zhongfu.png                              |    0 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_yanzhong.png                                  |    0 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_qingwei.png                              |    0 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_zhuanpan_bk@2x.png                              |    0 
 pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m                                                             |  331 +++++++++--
 pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj                                                                    |   60 +
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b00.png                                       |    0 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_zise.png                                 |    0 
 pregnancy_guard/BaseProject/Model/UploadModel.h                                                                              |   23 
 pregnancy_guard/BaseProject/Model/DataModel.h                                                                                |    6 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_zise.png                                        |    0 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_zhongdu.png                                   |    0 
 pregnancy_guard/BaseProject/Define/Defines.h                                                                                 |   14 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_yanzhong_tips.png                               |    0 
 pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist               | 1004 ++++++++++++++++++++++-------------
 pregnancy_guard/BaseProject/Model/MyDeviceStatus.h                                                                           |    2 
 /dev/null                                                                                                                    |  203 -------
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_green.png                                       |    0 
 pregnancy_guard/BaseProject/Global/Global.h                                                                                  |    2 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_full.png                                      |    0 
 pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcuserdata/WindShan.xcuserdatad/UserInterfaceState.xcuserstate |    0 
 pregnancy_guard/BaseProject/Global/Global.m                                                                                  |    1 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_qingwei.png                                   |    0 
 pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_blue.png                                 |    0 
 25 files changed, 973 insertions(+), 674 deletions(-)

diff --git a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
index 0f32fa4..d0cf052 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
@@ -27,7 +27,7 @@
 #import <BaiduMapAPI_Location/BMKLocationComponent.h>
 #import<BaiduMapAPI_Search/BMKPoiSearchType.h>
 #import "DataModel.h"
-
+#import "UIImage+animatedGIF.h"
 @interface RadiaDetectionPage ()<ASValueTrackingSliderDelegate,ASValueTrackingSliderDataSource,cbCharacteristicManagerDelegate,BMKMapViewDelegate,BMKLocationServiceDelegate>
 {
     ZZCircleProgress *circle3;
@@ -72,14 +72,17 @@
     CLLocationDegrees longitude;
     
     NSMutableArray *  dataModelArr;
-    NSTimer * myTimer;
+    NSTimer * myTimer; // ���������������������
     NSString * myTimeInterval;
     NSString * is_open_upload; // 1 ������ 0 ������
+    
+    NSTimer * myScanTimer; // ���������������������
     
     GloriaLabel* _AnquanStatustLabel;
     UIImageView * icon_anquan;
     UIImageView * ic_zhishu_bk;
     UIImageView * ic_weixin_tips;
+    UIImageView * ic_dianyuan;
 }
 @end
 
@@ -197,6 +200,17 @@
     }
 }
 
+
+-(void)peripheral:(CBPeripheral *)peripheral didUpdateValueForDescriptor:(CBDescriptor *)descriptor error:(NSError *)error
+{
+    if (error)
+    {
+        [Utilities logDataWithService:[ResourceHandler getServiceNameForUUID:descriptor.characteristic.service.UUID] characteristic:[ResourceHandler getCharacteristicNameForUUID:descriptor.characteristic.UUID] descriptor:[Utilities getDiscriptorNameForUUID:descriptor.UUID] operation:[NSString stringWithFormat:@"%@- %@%@",READ_RESPONSE,READ_ERROR,[error.userInfo objectForKey:NSLocalizedDescriptionKey]]];
+    }
+    
+}
+
+
 /*!
  *@Method Notify Read Indicate options result return
  * ������������������������
@@ -208,71 +222,171 @@
         
         if( receiveHexValue.length == 40 )
         {
-            //16���������10������
-           NSString * shishiStr = [receiveHexValue substringWithRange:NSMakeRange(24,4)];
-           NSString * leijiStr = [receiveHexValue substringWithRange:NSMakeRange(28,8)];
-            
-           NSString * shishiValue = [NSString stringWithFormat:@"%lu",strtoul([shishiStr UTF8String],0,16)];
-           NSString * leijiValue = [NSString stringWithFormat:@"%lu",strtoul([leijiStr UTF8String],0,16)];
-          
-           if( leijiValue.length >= 6)
-           {
-               _JiliangNumLabel.text = [NSString stringWithFormat:@"%.1f",[leijiValue floatValue]*0.10];
-           }
-            else
-                _JiliangNumLabel.text = [NSString stringWithFormat:@"%.3f",[leijiValue floatValue]*0.10];
-            
-            _BiaozhunJiliangNumLabel.text = [NSString stringWithFormat:@"%.3f",([shishiValue floatValue]-45)/10.0*0.10];
-            
-            
-            //dataModelArr
-            DataModel * model = [[DataModel alloc]init];
-            model.value = _BiaozhunJiliangNumLabel.text;
-            model.time  = [DateUtil stringFromDateYMD:[NSDate date]];
-            [dataModelArr addObject:model];
-            
-            circle3.progress = ([leijiValue floatValue]/FUSHE_MAX_VALUE)*100;
-            [_trackingSlider setValue:circle3.progress];
-            [self setGaugeValue:circle3.progress animation:NO];
-            
+            // ������������������
+            NSString * baoTouStr = [receiveHexValue substringWithRange:NSMakeRange(0,2)];
+            if( [baoTouStr isEqualToString: @"5A"])
+            {
+                //������������������ 0 ������������ 1 ��������� 2������
+                NSString * chargeStatusStr = [receiveHexValue substringWithRange:NSMakeRange(6,2)];
+                //������������  4���4������ 3���3������ 2���2������ 1���1������ 0���������������
+                NSString * dianLiangStr = [receiveHexValue substringWithRange:NSMakeRange(12,2)];
+                // 16���������10������
+                NSString * chargeStatusValue = [NSString stringWithFormat:@"%lu",strtoul([chargeStatusStr UTF8String],0,16)];
+                NSString * dianLiangValue = [NSString stringWithFormat:@"%lu",strtoul([dianLiangStr UTF8String],0,16)];
+                
+                // ������������������
+                [ic_dianyuan setHidden:NO];
+                switch ([chargeStatusValue intValue]) {
+                    case 0:
+                    {
+                        NSString * imageName = [NSString stringWithFormat:@"icon_b0%d",[dianLiangValue intValue] ];
+                        ic_dianyuan.image = [UIImage imageNamed:imageName];
+                    }
+                        break;
+                    case 1:
+                         [ic_dianyuan setImage:[UIImage animatedImageWithAnimatedGIFURL:[[NSBundle mainBundle] URLForResource:@"icon_chong" withExtension:@"gif"]]];
+                        break;
+                    case 2:
+                        ic_dianyuan.image = [UIImage imageNamed:@"icon_full"];
+                        break;
+                    default:
+                        break;
+                }
+                
+                //16���������10������
+                NSString * shishiStr = [receiveHexValue substringWithRange:NSMakeRange(24,4)];
+                NSString * leijiStr = [receiveHexValue substringWithRange:NSMakeRange(28,8)];
+                
+                
+                NSString * shishiValue = [NSString stringWithFormat:@"%lu",strtoul([shishiStr UTF8String],0,16)];
+                NSString * leijiValue = [NSString stringWithFormat:@"%lu",strtoul([leijiStr UTF8String],0,16)];
+                
+                if( leijiValue.length >= 6)
+                {
+                    _JiliangNumLabel.text = [NSString stringWithFormat:@"%.1f",[leijiValue floatValue]*0.001];
+                }
+                else
+                    _JiliangNumLabel.text = [NSString stringWithFormat:@"%.3f",[leijiValue floatValue]*0.001];
+                
+                _BiaozhunJiliangNumLabel.text = [NSString stringWithFormat:@"%.3f",[shishiValue floatValue]*0.001];
+                
+                
+                //dataModelArr
+                DataModel * model = [[DataModel alloc]init];
+                model.value = [_BiaozhunJiliangNumLabel.text floatValue];
+                model.time  = [DateUtil stringFromDateYMD:[NSDate date]];
+                model.type = 0;
+                model.is_warn = 0;
+                
+                if(model.value < 0.16)
+                {
+                    // 100
+                    circle3.progress = model.value*100;
+                    _currentShuziTipsLabel.text = @"������������������";
+                    _currentTipsLabel.textColor = RgbColor(64, 159, 252);
+                    _currentTipsLabel.text = @"������������������������������\n ������������������������������������������������";
+                    
+//                    _AnquanStatustLabel.text = @"������";
+//                    _AnquanStatustLabel.textColor = kUIColorFromRGB(0x07cb5a);
+//                    icon_anquan.image = [UIImage imageNamed:@"icon_anquan"];
+//                    ic_anquan_status.image = [UIImage imageNamed:@"ic_anquan_bk"];
+//                    ic_weixin_tips.image = [UIImage imageNamed:@"ic_anquan_tips"];
+//                    ic_zhishu_bk.image = [UIImage imageNamed:@"bt_green"];
+//                    _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
 
-            if( [shishiValue intValue] < FUSHE_SAFE_VALUE )
-            {
-                _currentShuziTipsLabel.text = @"������������������";
-                _currentTipsLabel.textColor = RgbColor(64, 159, 252);
-                _currentTipsLabel.text = @"������������������������������\n ������������������������������������������������";
+                }
+                else if(model.value >= 0.16 && model.value  < 0.8)
+                {
+                    // 100
+                    float tempValue = model.value;
+                    if(tempValue > 0.50)
+                        tempValue = 0.50;
+                    
+                    circle3.progress = tempValue*100;
+                    _currentShuziTipsLabel.text = @"���������������������������";
+                    _currentTipsLabel.textColor = RgbColor(64, 159, 252);
+                    _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
+                    model.is_warn = 1;
+                    
+                    _AnquanStatustLabel.text = @"������";
+                    _AnquanStatustLabel.textColor = kUIColorFromRGB(0x0d95fe);
+                    icon_anquan.image = [UIImage imageNamed:@"icon_head_qingwei"];
+                    ic_anquan_status.image = [UIImage imageNamed:@"bg_corner_blue"];
+                    ic_weixin_tips.image = [UIImage imageNamed:@"icon_qingwei"];
+                    ic_zhishu_bk.image = [UIImage imageNamed:@"ic_zhishu_bk"];
+                    _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
+                }
+                else if(model.value >= 0.8 && model.value < 2)
+                {
+                    // 264
+                    float tempValue = (model.value*100)/266;
+                    if(tempValue <= 0.50)
+                        tempValue = 0.51;
+                    
+                    circle3.progress = tempValue*100;
+                    _currentShuziTipsLabel.text = @"���������������������������";
+                    _currentTipsLabel.textColor = RgbColor(252, 80,		 84);
+                    _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
+                    model.is_warn = 1;
+                    
+                    _AnquanStatustLabel.text = @"������";
+                    _AnquanStatustLabel.textColor = kUIColorFromRGB(0xc240ff);
+                    icon_anquan.image = [UIImage imageNamed:@"icon_head_zhongfu"];
+                    ic_anquan_status.image = [UIImage imageNamed:@"bg_corner_zise"];
+                    ic_weixin_tips.image = [UIImage imageNamed:@"icon_zhongdu"];
+                    ic_zhishu_bk.image = [UIImage imageNamed:@"bt_zise"];
+                    _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
+                }
+                else if(model.value >2)
+                {
+                    // 400
+                    
+                    float tempValue = (model.value*100)/400;
+                    if(tempValue <= 0.75)
+                        tempValue = 0.76;
+                    
+                    circle3.progress = tempValue*100;
+                    
+                    _currentShuziTipsLabel.text = @"������������������������������";
+                    _currentTipsLabel.textColor = RgbColor(252, 80, 84);
+                    _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
+                    model.is_warn = 1;
+                    
+                    _AnquanStatustLabel.text = @"������";
+                    _AnquanStatustLabel.textColor = kUIColorFromRGB(0xff4e63);
+                    icon_anquan.image = [UIImage imageNamed:@"icon_weixian"];
+                    ic_anquan_status.image = [UIImage imageNamed:@"ic_weixian_bk"];
+                    ic_weixin_tips.image = [UIImage imageNamed:@"icon_yanzhong"];
+                    ic_zhishu_bk.image = [UIImage imageNamed:@"ic_yanzhong_tips"];
+                    _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
+                }
+                
+                [_trackingSlider setValue:circle3.progress];
+                [self setGaugeValue:circle3.progress animation:NO];
+                
+                [dataModelArr addObject:model];
             }
-            else if ( [shishiValue intValue] < FUSHE_GOOD_VALUE)
+        }
+        else if(receiveHexValue.length == 16 )
+        {
+            // ������������������
+            NSString * baoTouStr = [receiveHexValue substringWithRange:NSMakeRange(0,2)];
+            if( [baoTouStr isEqualToString: @"7A"])
             {
-                _currentShuziTipsLabel.text = @"���������������������������";
-                _currentTipsLabel.textColor = RgbColor(64, 159, 252);
-                _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
+                NSString * timeValueStr = [receiveHexValue substringWithRange:NSMakeRange(2,8)];
+                //dataModelArr
+                DataModel * model = [[DataModel alloc]init];
+                model.value = [timeValueStr floatValue];
+                model.time  = [DateUtil stringFromDateYMD:[NSDate date]];
+                model.type = 1;
+                model.is_warn = 0;
+                
+                [dataModelArr addObject:model];
             }
-            else if ( [shishiValue intValue] < FUSHE_CHA_VALUE)
-            {
-                _currentShuziTipsLabel.text = @"������������������������";
-                _currentTipsLabel.textColor = RgbColor(252, 80, 84);
-                _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
-            }
-            else if ( [shishiValue intValue] < FUSHE_DANGER_VALUE)
-            {
-                _currentShuziTipsLabel.text = @"���������������������������";
-                _currentTipsLabel.textColor = RgbColor(252, 80, 84);
-                _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
-            }
-            else if ( [shishiValue intValue] < FUSHE_MAX_VALUE)
-            {
-                _currentShuziTipsLabel.text = @"���������������������������";
-                _currentTipsLabel.textColor = RgbColor(252, 80, 84);
-                _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
-            }
-            else
-            {
-                _currentShuziTipsLabel.text = @"���������������������������";
-                _currentTipsLabel.textColor = RgbColor(252, 80, 84);
-                _currentTipsLabel.text = @"������������������������������\n ���������������������������������������������������";
-            }
-            
+        }
+        else
+        {
+            //NSString * shishiStr = [receiveHexValue substringWithRange:NSMakeRange(0,4)];
         }
         
         //NSString *ASCIIValue = [[NSString alloc]initWithData:characteristic.value encoding:NSASCIIStringEncoding];
@@ -434,6 +548,10 @@
     //���������������
     if(myTimer)
         [myTimer setFireDate:[NSDate distantFuture]];
+    
+    //���������������
+    if(myScanTimer)
+        [myScanTimer setFireDate:[NSDate distantFuture]];
 }
 
 -(void)viewWillAppear:(BOOL)animated
@@ -485,15 +603,37 @@
             //[[CBMoralManager sharedManager] disconnectPeripheral:[[CBMoralManager sharedManager] myPeripheral]];
             [[CBMoralManager sharedManager] setCbDiscoveryDelegate:self];
             [[CBMoralManager sharedManager] startScanning];
-            [self performSelector:@selector(stopScanning) withObject:nil afterDelay:3.0f];
+            [self performSelector:@selector(stopScanning2) withObject:nil afterDelay:3.0f];
         }
         
     }
 }
 
+-(void)stopScanning2
+{
+    [[CBMoralManager sharedManager]stopScanning];
+    
+    // ������������������������������
+    if(_bConnectSuccess == NO)
+    {
+        if (myScanTimer == nil)
+            myScanTimer =  [NSTimer scheduledTimerWithTimeInterval:10.0 target:self selector:@selector(continueScanning) userInfo:nil repeats:YES];
+        else
+            //���������������
+            [myScanTimer setFireDate:[NSDate distantPast]];
+    }
+}
+
+
 -(void)stopScanning
 {
     [[CBMoralManager sharedManager]stopScanning];
+}
+
+-(void)continueScanning
+{
+    [[CBMoralManager sharedManager] startScanning];
+    [self performSelector:@selector(stopScanning) withObject:nil afterDelay:3.0f];
 }
 
 #pragma mark - BlueTooth Turned Off Delegate
@@ -510,7 +650,32 @@
     isBluetoothON = state;
     
     // ������������������������
-    
+    if(isBluetoothON == NO)
+    {
+         [Global alertMessageEx:@"���������������������������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+        // ������������������������������
+        if(_bConnectSuccess == YES)
+        {
+            //���������������������������
+            if(myTimer)
+                [myTimer setFireDate:[NSDate distantFuture]];
+            
+            [self offLineSet];
+        }
+        
+    }
+    else
+    {
+        // ������������������������������
+        if(_bConnectSuccess == NO)
+        {
+            if (myScanTimer == nil)
+                myScanTimer =  [NSTimer scheduledTimerWithTimeInterval:10.0 target:self selector:@selector(continueScanning) userInfo:nil repeats:YES];
+            else
+                //���������������
+                [myScanTimer setFireDate:[NSDate distantPast]];
+        }
+    }
 }
 
 
@@ -537,6 +702,12 @@
                  {
                     if(success)
                     {
+                        //��������������� ������������
+                        if(myScanTimer)
+                            [myScanTimer setFireDate:[NSDate distantFuture]];
+                        
+                        [self onLineSet];
+                        
                         deviceStstaus = 1;
                         deviceStatusLabel.text = @"���������";
                         
@@ -702,6 +873,12 @@
     ic_anquan_status.image = [UIImage imageNamed:@"ic_anquan_bk"];
     [ic_head_bg addSubview:ic_anquan_status];
 
+    ic_dianyuan = [[UIImageView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH-40-ic_anquan_status.frame.size.width/2, 44*scale + 40, 40, 40)];
+    //ic_dianyuan.image = [UIImage imageNamed:@"icon_b04"];
+    [ic_dianyuan setImage:[UIImage animatedImageWithAnimatedGIFURL:[[NSBundle mainBundle] URLForResource:@"icon_chong" withExtension:@"gif"]]];
+    [ic_dianyuan setHidden:YES];
+    [self.view  addSubview:ic_dianyuan];
+    
     UIImageView * ic_line = [[UIImageView alloc] initWithFrame:CGRectMake(ic_head_bg.frame.size.width/2, 13*scale, 1, 40*scale)];
     ic_line.image = [UIImage imageNamed:@"ic_line"];
     [ic_head_bg addSubview:ic_line];
@@ -745,7 +922,7 @@
     [ic_head_bg addSubview:_BiaozhunJiliangNumLabel];
     
     
-    UIImageView * icon_anquan = [[UIImageView alloc] initWithFrame:CGRectMake(19*scale, 10*scale, 22*scale, 22*scale)];
+    icon_anquan = [[UIImageView alloc] initWithFrame:CGRectMake(19*scale, 10*scale, 22*scale, 22*scale)];
     icon_anquan.image = [UIImage imageNamed:@"icon_head_offline"];
     [ic_anquan_status addSubview:icon_anquan];
     
@@ -798,8 +975,8 @@
     circle3.reduceValue = 72;
     circle3.increaseFromLast = YES;
     circle3.pointImage = [UIImage imageNamed:@"test_point"];
-    circle3.progress = ((float)850/FUSHE_MAX_VALUE);
-    //circle3.progress = 0;
+    //circle3.progress = ((float)850/FUSHE_MAX_VALUE);
+    circle3.progress = 0;
     circle3.showProgressText = NO;
     circle3.userInteractionEnabled = NO;
     [ic_zhuanpan_bkBtn addSubview:circle3];
@@ -830,10 +1007,9 @@
     {
         self.navigationController.navigationBar.translucent = NO;
     }
-    _locService = [[BMKLocationService alloc]init];
     
-    _locService.desiredAccuracy = kCLLocationAccuracyNearestTenMeters;
-    
+    //_locService = [[BMKLocationService alloc]init];
+    //_locService.desiredAccuracy = kCLLocationAccuracyNearestTenMeters;
     //[self startLocation];
     
     dataModelArr = [[NSMutableArray alloc] init];
@@ -860,6 +1036,19 @@
     _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
 }
 
+-(void)onLineSet
+{
+    deviceStatusLabel.textColor =  RgbColor(64, 159, 252);
+    _AnquanStatustLabel.text = @"������";
+    _AnquanStatustLabel.textColor = kUIColorFromRGB(0x07cb5a);
+    icon_anquan.image = [UIImage imageNamed:@"icon_anquan"];
+    ic_anquan_status.image = [UIImage imageNamed:@"ic_anquan_bk"];
+    ic_weixin_tips.image = [UIImage imageNamed:@"ic_anquan_tips"];
+    ic_zhishu_bk.image = [UIImage imageNamed:@"bt_green"];
+    _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
+    
+}
+
 -(void)connectAction
 {
     SearchDevicePage* page = [[SearchDevicePage alloc] initIsFirstPage:NO];
diff --git a/pregnancy_guard/BaseProject/Define/Defines.h b/pregnancy_guard/BaseProject/Define/Defines.h
index 63ca0ea..9ce6fec 100644
--- a/pregnancy_guard/BaseProject/Define/Defines.h
+++ b/pregnancy_guard/BaseProject/Define/Defines.h
@@ -191,10 +191,14 @@
 #define LISTON_DEVICE_UUID    @"0003CDD1-0000-1000-8000-00805F9B0131" // ������
 #define WRITE_DEVICE_UUID     @"0003CDD2-0000-1000-8000-00805F9B0131" // ���������
 
+//                < 0.25������
+//                >= 0.25 &&  < 0.8������
+//                >= 0.8 && < 2������
+//                >= 2������
+
 #define FUSHE_MIN_VALUE      0
-#define FUSHE_SAFE_VALUE	 130 // ������
-#define FUSHE_GOOD_VALUE	 260 // ������
-#define FUSHE_CHA_VALUE	     390 // ������
-#define FUSHE_DANGER_VALUE	 520 // ������
-#define FUSHE_MAX_VALUE	     650 // ������
+#define FUSHE_SAFE_VALUE	 250 // ������
+#define FUSHE_SLIGHT_VALUE	 800 // ������
+#define FUSHE_MODERATE_VALUE 2000 // ������
+#define FUSHE_MAX_VALUE	     4000 // ������
 
diff --git a/pregnancy_guard/BaseProject/Global/Global.h b/pregnancy_guard/BaseProject/Global/Global.h
index b098d74..664860c 100644
--- a/pregnancy_guard/BaseProject/Global/Global.h
+++ b/pregnancy_guard/BaseProject/Global/Global.h
@@ -9,7 +9,6 @@
 #import <Foundation/Foundation.h>
 #import "BaseResModel.h"
 #import "DeviceSpareModel.h"
-#import "Hotel.h"
 #import "Room.h"
 
 @interface Global : NSObject
@@ -43,7 +42,6 @@
 extern NSMutableDictionary * _loginUser;
 extern DeviceSpareModel * _selectedDevice;
 extern NSString * _curDeviceName;
-extern Hotel * _curHotel_Id;
 extern Room * _sel_room;
 extern BOOL  _bConnectSuccess;
 extern NSString * _curReceiveHexValue;
diff --git a/pregnancy_guard/BaseProject/Global/Global.m b/pregnancy_guard/BaseProject/Global/Global.m
index c9c0795..cac843c 100644
--- a/pregnancy_guard/BaseProject/Global/Global.m
+++ b/pregnancy_guard/BaseProject/Global/Global.m
@@ -14,7 +14,6 @@
 NSMutableDictionary * _loginUser;
 DeviceSpareModel * _selectedDevice;
 NSString * _curDeviceName;
-Hotel * _curHotel_Id;
 Room * _sel_room;
 int  _curPage;
 BOOL  _bConnectSuccess;
diff --git a/pregnancy_guard/BaseProject/Model/DataModel.h b/pregnancy_guard/BaseProject/Model/DataModel.h
index 54b8bd5..ab4581a 100644
--- a/pregnancy_guard/BaseProject/Model/DataModel.h
+++ b/pregnancy_guard/BaseProject/Model/DataModel.h
@@ -10,7 +10,9 @@
 
 @interface DataModel : NSObject
 
-@property(nonatomic, strong) NSString * time;
-@property(nonatomic, strong) NSString * value;
+@property(nonatomic, assign) int  is_warn;// 0 ������������ 1 ������������
+@property(nonatomic, strong) NSString * time;//������
+@property(nonatomic, assign) int  type;//������ 0 ������������ 1 ������������
+@property(nonatomic, assign) float  value;//������������������
 
 @end
diff --git a/pregnancy_guard/BaseProject/Model/Hotel.h b/pregnancy_guard/BaseProject/Model/Hotel.h
deleted file mode 100644
index 4adbad6..0000000
--- a/pregnancy_guard/BaseProject/Model/Hotel.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  Hotel.h
-//  istanbul
-//
-//  Created by WindShan on 2017/6/13.
-//  Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface Hotel : NSObject
-
-
-@property(nonatomic, strong) NSString * _id;//": "591a66002b153bee6e5b6830",
-@property(nonatomic, strong) NSString * name;//": "������������������"
-
-@end
diff --git a/pregnancy_guard/BaseProject/Model/Hotel.m b/pregnancy_guard/BaseProject/Model/Hotel.m
deleted file mode 100644
index 5f440be..0000000
--- a/pregnancy_guard/BaseProject/Model/Hotel.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  Hotel.m
-//  istanbul
-//
-//  Created by WindShan on 2017/6/13.
-//  Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "Hotel.h"
-
-@implementation Hotel
-
-@end
diff --git a/pregnancy_guard/BaseProject/Model/MusicModel.h b/pregnancy_guard/BaseProject/Model/MusicModel.h
index 91adf77..28e39b2 100644
--- a/pregnancy_guard/BaseProject/Model/MusicModel.h
+++ b/pregnancy_guard/BaseProject/Model/MusicModel.h
@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Hotel.h"
 
 @interface MusicModel : NSObject
 
diff --git a/pregnancy_guard/BaseProject/Model/MyDeviceStatus.h b/pregnancy_guard/BaseProject/Model/MyDeviceStatus.h
index 66872a2..cfdb277 100644
--- a/pregnancy_guard/BaseProject/Model/MyDeviceStatus.h
+++ b/pregnancy_guard/BaseProject/Model/MyDeviceStatus.h
@@ -8,7 +8,6 @@
 
 #import <Foundation/Foundation.h>
 #import "Room.h"
-#import "Hotel.h"
 
 @interface MyDeviceStatus : NSObject
 
@@ -16,7 +15,6 @@
 @property(nonatomic, strong) NSString * mac;//": "accf123412e3",
 @property(nonatomic, strong) NSString * name;//": "������������2",
 @property(nonatomic, strong) Room *  room_id;
-@property(nonatomic, strong) Hotel * hotel_id;
 
 @property(nonatomic, assign) int status;// status 1������  2   ���������������
 @property(nonatomic, assign) int fs_status;//0������������1������
diff --git a/pregnancy_guard/BaseProject/Model/UploadModel.h b/pregnancy_guard/BaseProject/Model/UploadModel.h
index 117056f..d80e577 100644
--- a/pregnancy_guard/BaseProject/Model/UploadModel.h
+++ b/pregnancy_guard/BaseProject/Model/UploadModel.h
@@ -10,7 +10,28 @@
 #import "BaseReqModel.h"
 
 @interface UploadModel : BaseReqModel
-
+//{
+//    "address": "���������������������������������������������413���",
+//    "data": [{
+//        "is_warn": 0,
+//        "time": "2018-04-18 11:17:54",
+//        "type": 0,
+//        "value": 0.09
+//    }, {
+//        "is_warn": 0,
+//        "time": "2018-04-18 11:17:58",
+//        "type": 0,
+//        "value": 0.09
+//    }, {
+//        "is_warn": 0,
+//        "time": "2018-04-18 11:18:01",
+//        "type": 0,
+//        "value": 0.09
+//    }],
+//    "lat": 31.42807,
+//    "lon": 120.984392,
+//    "userid": "597bf6a1a0e6d23f5c3c9869"
+//}
 @property(nonatomic, strong) NSMutableArray * modelArray; // DataModel
 @property(nonatomic, strong) NSString * address;
 @property(nonatomic, strong) NSString * lat;//"lat": 31.430284,
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_blue.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_blue.png
new file mode 100755
index 0000000..b86a1c5
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_blue.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_zise.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_zise.png
new file mode 100755
index 0000000..ed2ba34
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_zise.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_green.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_green.png
new file mode 100755
index 0000000..5b1bbb3
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_green.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_zise.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_zise.png
new file mode 100755
index 0000000..8c12af2
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_zise.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_yanzhong_tips.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_yanzhong_tips.png
new file mode 100755
index 0000000..09a1c1b
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_yanzhong_tips.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_zhuanpan_bk@2x.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_zhuanpan_bk@2x.png
old mode 100755
new mode 100644
index 1db9ae2..ef3e048
--- a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_zhuanpan_bk@2x.png
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/ic_zhuanpan_bk@2x.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b00.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b00.png
new file mode 100755
index 0000000..7ea55a9
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b00.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_full.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_full.png
new file mode 100755
index 0000000..63d1ba5
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_full.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_qingwei.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_qingwei.png
new file mode 100755
index 0000000..7177bac
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_qingwei.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_zhongfu.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_zhongfu.png
new file mode 100755
index 0000000..22d9ccd
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_zhongfu.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_qingwei.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_qingwei.png
new file mode 100755
index 0000000..c329cbe
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_qingwei.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_yanzhong.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_yanzhong.png
new file mode 100755
index 0000000..294894f
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_yanzhong.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_zhongdu.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_zhongdu.png
new file mode 100755
index 0000000..2ead7a8
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_zhongdu.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Views/Cell/ChangeDeviceCell.h b/pregnancy_guard/BaseProject/Views/Cell/ChangeDeviceCell.h
deleted file mode 100644
index e93b829..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/ChangeDeviceCell.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  MyDeviceStatusCell.h
-//  terminalMgr
-//
-//  Created by WindShan on 2017/3/16.
-//  Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-#import "DeviceLw.h"
-
-@protocol SelCellDetailDelegate <NSObject>
-
-@optional
-
-- (void)didCellDetailSection:(DeviceLw*)model;
-
-@end
-
-@interface ChangeDeviceCell : BaseTableViewCell
-
-@property(nonatomic, assign)id<SelCellDetailDelegate>            delegate;
-@property(nonatomic, strong) DeviceLw*   modelLW;
-
-/** ������������*/
-- (void)setItemView:(DeviceLw*)model;
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/ChangeDeviceCell.m b/pregnancy_guard/BaseProject/Views/Cell/ChangeDeviceCell.m
deleted file mode 100644
index 6b7850b..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/ChangeDeviceCell.m
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-//  MyDeviceStatusCell.m
-//  terminalMgr
-//
-//  Created by WindShan on 2017/3/16.
-//  Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "ChangeDeviceCell.h"
-#import "GloriaLabel.h"
-#import "UIImageView+WebCache.h"
-#import "commenProgressView.h"
-
-@interface ChangeDeviceCell()
-{
-
-}
-
-@property (nonatomic, strong)     UIImageView * bkImage;
-@property (nonatomic, strong)     UIImageView * file_name_tag;
-@property (nonatomic, strong)     UIImageView * file_name_line;
-@property (nonatomic, strong)     GloriaLabel * fileName;
-@property (nonatomic, strong)     GloriaLabel * room_No;
-@property (nonatomic, strong)     UIImageView * lw_status;
-@property (nonatomic, strong)     GloriaLabel * lw_change_status;
-
-@end
-
-@implementation ChangeDeviceCell
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-- (GloriaLabel *) lw_change_status
-{
-    if(!_lw_change_status)
-    {
-        _lw_change_status = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,50, 50)];
-        _lw_change_status.font = [UIFont systemFontOfSize:8];
-        _lw_change_status.textAlignment = UITextAlignmentLeft;
-        _lw_change_status.textColor = kUIColorFromRGB(0x5a5a5a);
-        [self.contentView addSubview:_lw_change_status];
-    }
-    
-    return _lw_change_status;
-}
-
-
-- (UIImageView *)lw_status
-{
-    if (!_lw_status)
-    {
-        _lw_status =  [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, 2, 60)];
-        [self.contentView addSubview:_lw_status];
-    }
-    
-    return _lw_status;
-}
-
-- (GloriaLabel *) room_No
-{
-    if(!_room_No)
-    {
-        _room_No = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
-        _room_No.font = [UIFont systemFontOfSize:12];
-        _room_No.textAlignment = UITextAlignmentLeft;
-        _room_No.textColor = kUIColorFromRGB(0x5a5a5a);
-        [self.contentView addSubview:_room_No];
-    }
-    
-    return _room_No;
-}
-
-
-- (GloriaLabel *) fileName
-{
-    if(!_fileName)
-    {
-        _fileName = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
-        _fileName.font = [UIFont systemFontOfSize:12];
-        _fileName.textAlignment = UITextAlignmentLeft;
-        _fileName.textColor = kUIColorFromRGB(0x6e6e6e);
-        [self.contentView addSubview:_fileName];
-    }
-    
-    return _fileName;
-}
-
-- (UIImageView *)file_name_tag
-{
-    if (!_file_name_tag)
-    {
-        _file_name_tag =  [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, 2, 60)];
-        [self.contentView addSubview:_file_name_tag];
-    }
-    
-    return _file_name_tag;
-}
-
-- (UIImageView *)bkImage
-{
-    if (!_bkImage)
-    {
-        
-        CGFloat bkImageW = 708;
-        if(IsiPhone4 || IsiPhone5)
-        {
-            bkImageW = 620;
-        }
-        
-        _bkImage =  [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-bkImageW)/2-10, 0, bkImageW-20, 60)];
-        [self.contentView addSubview:_bkImage];
-    }
-    
-    return _bkImage;
-}
-
-
-
-- (UIImageView *)file_name_line
-{
-    if (!_file_name_line)
-    {
-        _file_name_line =  [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 60)];
-        _file_name_line.image = [UIImage imageNamed:@"ic_device_line"];
-        [self.contentView addSubview:_file_name_line];
-    }
-    
-    return _file_name_line;
-}
-
-//@property (nonatomic, strong)     UIImageView * bkImage;
-//@property (nonatomic, strong)     UIImageView * iconImage;
-//@property (nonatomic, strong)     UIImageView * nameCircleImage;
-//@property (nonatomic, strong)     UIImageView * statusCircleImage;
-//@property (nonatomic, strong)     GloriaLabel * deviceName;
-//@property (nonatomic, strong)     GloriaLabel * FileStatus;
-
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-    
-    CGFloat bkImageW = 356;
-    CGFloat btnW = 118;
-    CGFloat leftOffX = 10;
-    CGFloat lineOffX = 0;
-    if(IsiPhone4 || IsiPhone5)
-    {
-        bkImageW = 300;
-        btnW = 105;
-        leftOffX = 0;
-        lineOffX = 10;
-    }
-    
-    self.lw_status.frame = CGRectMake(SCREEN_WIDTH-20-55, 15, 55, 55);
-    
-    self.bkImage.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2, 10, bkImageW, 70	);
-    self.file_name_tag.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+10, 17, 2, 16);
-    self.file_name_line.frame = CGRectMake((SCREEN_WIDTH-bkImageW+20)/2, 40, bkImageW-self.lw_status.frame.size.width-30, 1);
-    
-    self.fileName.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+10+10, 10, SCREEN_WIDTH/2, 30);
-    self.room_No.frame = CGRectMake(20, 45, bkImageW-20, 20);
-            
-    // ������������ ���������������
-    self.lw_change_status.frame = CGRectMake(SCREEN_WIDTH-20-55, 15, 54, 54);
-    self.lw_change_status.font = [UIFont systemFontOfSize:10];
-    self.lw_change_status.numberOfLines = 0;//������������������������������
-    self.lw_change_status.textAlignment = UITextAlignmentCenter;
-}
-
-/** ������������*/
-- (void)setItemView:(DeviceLw*)model
-{
-    self.modelLW = model;
-    self.contentView.backgroundColor = [UIColor clearColor];
-    
-    self.bkImage.image = [UIImage imageNamed:@"ic_device_lw_bk"];
-    //self.bkImage.backgroundColor = [UIColor redColor];
-    self.file_name_tag.image = [UIImage imageNamed:@"ic_devicename_tag"];
-    self.lw_status.image = [UIImage imageNamed:@"lw_chaneg_bk"];
-    
-    [self.fileName setText:[NSString stringWithFormat:@"���������������%@",model.device_id.name]];
-    [self.fileName setTextColor:kUIColorFromRGB(0x00b742)];
-    
-    //@property(nonatomic, strong) NSString * name;//": "������������������"
-    //self.modelLW.device_id.room_id.name;
-    [self.room_No setText:[NSString stringWithFormat:@"���������������%@ %@������",self.modelLW.device_id.hotel_id.name,self.modelLW.device_id.room_id.name]];
-    
-    //[self.lw_change_status setText:@"������\n���������"];
-    //[self.lw_change_status setTextColor:kUIColorFromRGB(0xfc7411)];
-    // fs_status;//0������������1������
-    self.lw_status.image = [UIImage imageNamed:model.status == 0 ? @"lw_normal_bk":@"lw_chaneg_bk"];
-    [self.lw_change_status setText:model.status == 0 ?@"������\n������":@"������\n���������"];
-    [self.lw_change_status setTextColor:model.status == 0 ?kUIColorFromRGB(0x00b742):kUIColorFromRGB(0xfc7411)];
-    
-    
-}
-@end
diff --git a/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj b/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
index 0500980..9c3b4df 100644
--- a/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
+++ b/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
@@ -131,7 +131,6 @@
 		E5187AB31DFA8AEB00E867B7 /* GCDSemaphore.m in Sources */ = {isa = PBXBuildFile; fileRef = E5187AAE1DFA8AEB00E867B7 /* GCDSemaphore.m */; };
 		E5187AB41DFA8AEB00E867B7 /* GCDTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = E5187AB01DFA8AEB00E867B7 /* GCDTimer.m */; };
 		E5187AB71DFA8C9800E867B7 /* NetworkUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = E5187AB61DFA8C9800E867B7 /* NetworkUnit.m */; };
-		E51984FB1F0A422A00F59285 /* ChangeDeviceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E51984FA1F0A422A00F59285 /* ChangeDeviceCell.m */; };
 		E51AC4761E6F9BF40052BA52 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E51AC4751E6F9BF40052BA52 /* libstdc++.tbd */; };
 		E51B8E7C1DF8EE7100D0AC45 /* BaseResModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E51B8E7B1DF8EE7100D0AC45 /* BaseResModel.m */; };
 		E51B8E841DF9331E00D0AC45 /* UIImage+RoundedCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = E51B8E811DF9331E00D0AC45 /* UIImage+RoundedCorner.m */; };
@@ -254,7 +253,6 @@
 		E51F64081EEF70040066F95F /* ic_open_gg_tag@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E51F64071EEF70040066F95F /* ic_open_gg_tag@2x.png */; };
 		E51F640B1EEF70530066F95F /* MyDeviceStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F640A1EEF70530066F95F /* MyDeviceStatus.m */; };
 		E51F640E1EEF73E90066F95F /* AdModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F640D1EEF73E90066F95F /* AdModel.m */; };
-		E51F64111EEF74B50066F95F /* Hotel.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64101EEF74B50066F95F /* Hotel.m */; };
 		E51F64141EEF75080066F95F /* Room.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64131EEF75080066F95F /* Room.m */; };
 		E51F64171EEF76AC0066F95F /* DeviceLw.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64161EEF76AC0066F95F /* DeviceLw.m */; };
 		E51F641A1EEF78060066F95F /* SignInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64191EEF78060066F95F /* SignInfo.m */; };
@@ -398,6 +396,16 @@
 		E5371FC6206CE54400E2DCEE /* MusicSetPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FC5206CE54400E2DCEE /* MusicSetPage.m */; };
 		E5371FCC206CE65B00E2DCEE /* MusicPlayCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FCA206CE65B00E2DCEE /* MusicPlayCell.m */; };
 		E5371FCF206CE69400E2DCEE /* MusicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FCE206CE69400E2DCEE /* MusicModel.m */; };
+		E538F5112089986300933E4A /* bg_corner_zise.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F5082089986200933E4A /* bg_corner_zise.png */; };
+		E538F5122089986300933E4A /* bt_zise.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F5092089986200933E4A /* bt_zise.png */; };
+		E538F5132089986300933E4A /* icon_head_zhongfu.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F50A2089986200933E4A /* icon_head_zhongfu.png */; };
+		E538F5142089986300933E4A /* icon_qingwei.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F50B2089986200933E4A /* icon_qingwei.png */; };
+		E538F5152089986300933E4A /* icon_head_qingwei.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F50C2089986200933E4A /* icon_head_qingwei.png */; };
+		E538F5162089986300933E4A /* bg_corner_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F50D2089986200933E4A /* bg_corner_blue.png */; };
+		E538F5172089986300933E4A /* bt_green.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F50E2089986200933E4A /* bt_green.png */; };
+		E538F5182089986300933E4A /* icon_yanzhong.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F50F2089986300933E4A /* icon_yanzhong.png */; };
+		E538F5192089986300933E4A /* icon_zhongdu.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F5102089986300933E4A /* icon_zhongdu.png */; };
+		E538F51B20899D0300933E4A /* ic_yanzhong_tips.png in Resources */ = {isa = PBXBuildFile; fileRef = E538F51A20899D0300933E4A /* ic_yanzhong_tips.png */; };
 		E539CB961F39580900D55670 /* DataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E539CB951F39580900D55670 /* DataModel.m */; };
 		E539CB991F39585000D55670 /* UploadModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E539CB981F39585000D55670 /* UploadModel.m */; };
 		E539CE361F0B1EBA00634EEB /* ic_device_lw_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E539CE351F0B1EBA00634EEB /* ic_device_lw_bk.png */; };
@@ -751,6 +759,8 @@
 		E569B44A1E6E5FB6008D9FB8 /* AddDeviceReqModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E569B4491E6E5FB6008D9FB8 /* AddDeviceReqModel.m */; };
 		E569B44C1E6E9F63008D9FB8 /* page_icon_empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E569B44B1E6E9F63008D9FB8 /* page_icon_empty@2x.png */; };
 		E56BCC051F131311004FF320 /* regist_btn_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E56BCC041F131311004FF320 /* regist_btn_bk.png */; };
+		E5707D4120882F6A001714FD /* icon_full.png in Resources */ = {isa = PBXBuildFile; fileRef = E5707D4020882F6A001714FD /* icon_full.png */; };
+		E5707D432088308B001714FD /* icon_b00.png in Resources */ = {isa = PBXBuildFile; fileRef = E5707D422088308B001714FD /* icon_b00.png */; };
 		E5761E551EF365B50037A976 /* HotelCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5761E541EF365B50037A976 /* HotelCell.m */; };
 		E5761E581EF36CF70037A976 /* RoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5761E571EF36CF70037A976 /* RoomCell.m */; };
 		E5761E5D1EF36E960037A976 /* ic_notice_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E5761E5C1EF36E960037A976 /* ic_notice_bk.png */; };
@@ -982,8 +992,6 @@
 		E5187AB01DFA8AEB00E867B7 /* GCDTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDTimer.m; sourceTree = "<group>"; };
 		E5187AB51DFA8C9800E867B7 /* NetworkUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkUnit.h; sourceTree = "<group>"; };
 		E5187AB61DFA8C9800E867B7 /* NetworkUnit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkUnit.m; sourceTree = "<group>"; };
-		E51984F91F0A422A00F59285 /* ChangeDeviceCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeDeviceCell.h; sourceTree = "<group>"; };
-		E51984FA1F0A422A00F59285 /* ChangeDeviceCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChangeDeviceCell.m; sourceTree = "<group>"; };
 		E51AC4731E6F9BD90052BA52 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		E51AC4751E6F9BF40052BA52 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
 		E51AC4771E6F9C030052BA52 /* libstdc++.6.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.6.tbd"; path = "usr/lib/libstdc++.6.tbd"; sourceTree = SDKROOT; };
@@ -1210,8 +1218,6 @@
 		E51F640A1EEF70530066F95F /* MyDeviceStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyDeviceStatus.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		E51F640C1EEF73E90066F95F /* AdModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdModel.h; sourceTree = "<group>"; };
 		E51F640D1EEF73E90066F95F /* AdModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdModel.m; sourceTree = "<group>"; };
-		E51F640F1EEF74B50066F95F /* Hotel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hotel.h; sourceTree = "<group>"; };
-		E51F64101EEF74B50066F95F /* Hotel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Hotel.m; sourceTree = "<group>"; };
 		E51F64121EEF75080066F95F /* Room.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Room.h; sourceTree = "<group>"; };
 		E51F64131EEF75080066F95F /* Room.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Room.m; sourceTree = "<group>"; };
 		E51F64151EEF76AC0066F95F /* DeviceLw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceLw.h; sourceTree = "<group>"; };
@@ -1435,6 +1441,16 @@
 		E5371FCB206CE65B00E2DCEE /* MusicPlayCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicPlayCell.h; sourceTree = "<group>"; };
 		E5371FCD206CE69400E2DCEE /* MusicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicModel.h; sourceTree = "<group>"; };
 		E5371FCE206CE69400E2DCEE /* MusicModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicModel.m; sourceTree = "<group>"; };
+		E538F5082089986200933E4A /* bg_corner_zise.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bg_corner_zise.png; sourceTree = "<group>"; };
+		E538F5092089986200933E4A /* bt_zise.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bt_zise.png; sourceTree = "<group>"; };
+		E538F50A2089986200933E4A /* icon_head_zhongfu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_head_zhongfu.png; sourceTree = "<group>"; };
+		E538F50B2089986200933E4A /* icon_qingwei.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_qingwei.png; sourceTree = "<group>"; };
+		E538F50C2089986200933E4A /* icon_head_qingwei.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_head_qingwei.png; sourceTree = "<group>"; };
+		E538F50D2089986200933E4A /* bg_corner_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bg_corner_blue.png; sourceTree = "<group>"; };
+		E538F50E2089986200933E4A /* bt_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bt_green.png; sourceTree = "<group>"; };
+		E538F50F2089986300933E4A /* icon_yanzhong.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_yanzhong.png; sourceTree = "<group>"; };
+		E538F5102089986300933E4A /* icon_zhongdu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zhongdu.png; sourceTree = "<group>"; };
+		E538F51A20899D0300933E4A /* ic_yanzhong_tips.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_yanzhong_tips.png; sourceTree = "<group>"; };
 		E539CB941F39580900D55670 /* DataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataModel.h; sourceTree = "<group>"; };
 		E539CB951F39580900D55670 /* DataModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataModel.m; sourceTree = "<group>"; };
 		E539CB971F39585000D55670 /* UploadModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UploadModel.h; sourceTree = "<group>"; };
@@ -2073,6 +2089,8 @@
 		E569B4491E6E5FB6008D9FB8 /* AddDeviceReqModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddDeviceReqModel.m; sourceTree = "<group>"; };
 		E569B44B1E6E9F63008D9FB8 /* page_icon_empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "page_icon_empty@2x.png"; sourceTree = "<group>"; };
 		E56BCC041F131311004FF320 /* regist_btn_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = regist_btn_bk.png; sourceTree = "<group>"; };
+		E5707D4020882F6A001714FD /* icon_full.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_full.png; sourceTree = "<group>"; };
+		E5707D422088308B001714FD /* icon_b00.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_b00.png; sourceTree = "<group>"; };
 		E5761E531EF365B50037A976 /* HotelCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelCell.h; sourceTree = "<group>"; };
 		E5761E541EF365B50037A976 /* HotelCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelCell.m; sourceTree = "<group>"; };
 		E5761E561EF36CF70037A976 /* RoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomCell.h; sourceTree = "<group>"; };
@@ -2826,8 +2844,6 @@
 				E5153F3C1E5A75B500314414 /* FileStatus.m */,
 				E51F640C1EEF73E90066F95F /* AdModel.h */,
 				E51F640D1EEF73E90066F95F /* AdModel.m */,
-				E51F640F1EEF74B50066F95F /* Hotel.h */,
-				E51F64101EEF74B50066F95F /* Hotel.m */,
 				E51F64121EEF75080066F95F /* Room.h */,
 				E51F64131EEF75080066F95F /* Room.m */,
 				E51F64151EEF76AC0066F95F /* DeviceLw.h */,
@@ -3002,8 +3018,6 @@
 				E531002F1F1D994A00625049 /* DevicesTableViewCell.m */,
 				E53196DE1F15A6380020972E /* SearchDeviceCell.h */,
 				E53196DF1F15A6380020972E /* SearchDeviceCell.m */,
-				E51984F91F0A422A00F59285 /* ChangeDeviceCell.h */,
-				E51984FA1F0A422A00F59285 /* ChangeDeviceCell.m */,
 				E51D73221F00A91200E2476E /* IdleDeviceCell.h */,
 				E51D73231F00A91200E2476E /* IdleDeviceCell.m */,
 				E54875651E5D1A87009D5EEF /* TZTestCell.h */,
@@ -3480,6 +3494,18 @@
 		E530D35B1F0C7ADD00B193EC /* radiadection */ = {
 			isa = PBXGroup;
 			children = (
+				E538F51A20899D0300933E4A /* ic_yanzhong_tips.png */,
+				E538F50D2089986200933E4A /* bg_corner_blue.png */,
+				E538F5082089986200933E4A /* bg_corner_zise.png */,
+				E538F50E2089986200933E4A /* bt_green.png */,
+				E538F5092089986200933E4A /* bt_zise.png */,
+				E538F50C2089986200933E4A /* icon_head_qingwei.png */,
+				E538F50A2089986200933E4A /* icon_head_zhongfu.png */,
+				E538F50B2089986200933E4A /* icon_qingwei.png */,
+				E538F50F2089986300933E4A /* icon_yanzhong.png */,
+				E538F5102089986300933E4A /* icon_zhongdu.png */,
+				E5707D422088308B001714FD /* icon_b00.png */,
+				E5707D4020882F6A001714FD /* icon_full.png */,
 				E53B6AA720873E5D0060ED03 /* icon_b01.png */,
 				E53B6AA520873E5C0060ED03 /* icon_b02.png */,
 				E53B6AA620873E5D0060ED03 /* icon_b03.png */,
@@ -4758,6 +4784,7 @@
 				E517F3941DF5A9DE00C08331 /* dropdown_anim__00015@2x.png in Resources */,
 				E51F64691EEFC0E60066F95F /* sign_address_tag@2x.png in Resources */,
 				E542E5871F1473F200D35387 /* icon_story@2x.png in Resources */,
+				E538F5192089986300933E4A /* icon_zhongdu.png in Resources */,
 				E51F64061EEF6EC30066F95F /* sign_btn_bk.png in Resources */,
 				E54875711E5D2927009D5EEF /* photo_delete@2x.png in Resources */,
 				E517F3B31DF5A9DE00C08331 /* dropdown_anim__0006@2x.png in Resources */,
@@ -4827,8 +4854,10 @@
 				E51F64031EEF6EC30066F95F /* ic_sign_tag@2x.png in Resources */,
 				E53B6AA420872B2B0060ED03 /* icon_offline.png in Resources */,
 				E517F3961DF5A9DE00C08331 /* dropdown_anim__00017@2x.png in Resources */,
+				E538F5122089986300933E4A /* bt_zise.png in Resources */,
 				E517F39B1DF5A9DE00C08331 /* dropdown_anim__00021@2x.png in Resources */,
 				E53038381F38571F003F63DE /* music.mp3 in Resources */,
+				E5707D432088308B001714FD /* icon_b00.png in Resources */,
 				E5914F08206B469A009AB768 /* NavigationBar128@2x.png in Resources */,
 				E517F39C1DF5A9DE00C08331 /* dropdown_anim__00022@2x.png in Resources */,
 				E52F839C1EC944860069F64E /* file_download_process.png in Resources */,
@@ -4861,15 +4890,19 @@
 				E542E5851F1473F200D35387 /* icon-two.png in Resources */,
 				E517F3B61DF5A9DE00C08331 /* dropdown_anim__0009@2x.png in Resources */,
 				E542E5971F14841100D35387 /* ic_time_item_bk.png in Resources */,
+				E5707D4120882F6A001714FD /* icon_full.png in Resources */,
 				E51212C61E52963B00AABF1E /* right_menu_addFri@2x.png in Resources */,
 				E517F3951DF5A9DE00C08331 /* dropdown_anim__00016@2x.png in Resources */,
 				E58272711EF2217200878643 /* ic_change_device_btn_bk.png in Resources */,
 				E530D35D1F0C7ADD00B193EC /* ic_zhuanpan_bk@2x.png in Resources */,
 				E55D457E1EC3EF5500A93E8D /* edit_code_tag.png in Resources */,
+				E538F5182089986300933E4A /* icon_yanzhong.png in Resources */,
 				E56217F01EF0BD95008CE3D2 /* ad_scroll_speed_tag.png in Resources */,
 				E542E5961F14841100D35387 /* ic_time_bk.png in Resources */,
 				E53081FD1F1C415C001555FE /* icon_anquan.png in Resources */,
+				E538F5162089986300933E4A /* bg_corner_blue.png in Resources */,
 				E55D45791EC3EF5500A93E8D /* edit_line.png in Resources */,
+				E538F5142089986300933E4A /* icon_qingwei.png in Resources */,
 				E56217F11EF0BD95008CE3D2 /* ad_scroll_tag.png in Resources */,
 				E53081FE1F1C415C001555FE /* icon_weixian.png in Resources */,
 				E5CFD36B1F02481200737872 /* icon_dianhua@2x.png in Resources */,
@@ -4885,6 +4918,7 @@
 				E55D457A1EC3EF5500A93E8D /* edit_name_tag.png in Resources */,
 				E53B943D1F258CDE00800478 /* icon_arraw_right@2x.png in Resources */,
 				E517F3B71DF5A9DE00C08331 /* dropdown_loading_01@2x.png in Resources */,
+				E538F5132089986300933E4A /* icon_head_zhongfu.png in Resources */,
 				E542E5551F14609100D35387 /* icon_data.png in Resources */,
 				E542E5941F14841100D35387 /* ic_bottom_bg@2x.png in Resources */,
 				E51F646A1EEFC0E60066F95F /* sign_daka_bk.png in Resources */,
@@ -4905,7 +4939,9 @@
 				E517F3AF1DF5A9DE00C08331 /* dropdown_anim__0003@2x.png in Resources */,
 				E53081F91F1C415C001555FE /* ic_line.png in Resources */,
 				E5CFD36A1F02481200737872 /* icon_bianji@2x.png in Resources */,
+				E538F5172089986300933E4A /* bt_green.png in Resources */,
 				E542E5581F14609100D35387 /* icon_refresh.png in Resources */,
+				E538F5112089986300933E4A /* bg_corner_zise.png in Resources */,
 				E56217F31EF0BD95008CE3D2 /* ad_scroll_up_down_bk1.png in Resources */,
 				E51F64731EEFC0E60066F95F /* sign_prove_tag@2x.png in Resources */,
 				E55F8E021F2C80A7009779B9 /* CharacteristicFormatPList.plist in Resources */,
@@ -4951,12 +4987,14 @@
 				E55D458E1EC40E3C00A93E8D /* top_bar_bk.png in Resources */,
 				E52F839E1EC944860069F64E /* file_download_start@2x.png in Resources */,
 				E51C7E8F1EFA04E3009B4F70 /* Text Document.txt in Resources */,
+				E538F51B20899D0300933E4A /* ic_yanzhong_tips.png in Resources */,
 				E517F39D1DF5A9DE00C08331 /* dropdown_anim__00023@2x.png in Resources */,
 				E542E54C1F1457B300D35387 /* ic_shop_unsel@2x.png in Resources */,
 				E517F3AE1DF5A9DE00C08331 /* dropdown_anim__00039@2x.png in Resources */,
 				E55670091F09CB48001B34C5 /* COPYING in Resources */,
 				E52F9BEB1E515A8D00A5F789 /* ic_more@2x.png in Resources */,
 				E5566FFA1F09CB48001B34C5 /* CodeScan.bundle in Resources */,
+				E538F5152089986300933E4A /* icon_head_qingwei.png in Resources */,
 				E51212C71E52963B00AABF1E /* right_menu_multichat@2x.png in Resources */,
 				E517F3AC1DF5A9DE00C08331 /* dropdown_anim__00037@2x.png in Resources */,
 				E51C00401DF56A52006A0462 /* MJRefresh.bundle in Resources */,
@@ -5162,7 +5200,6 @@
 				E548755C1E5D1A47009D5EEF /* TZImageManager.m in Sources */,
 				E5E06F281EF911FA00012A6D /* QKYDelayButton.m in Sources */,
 				E51F641A1EEF78060066F95F /* SignInfo.m in Sources */,
-				E51984FB1F0A422A00F59285 /* ChangeDeviceCell.m in Sources */,
 				E55670A01F09CB48001B34C5 /* ZXEAN13Writer.m in Sources */,
 				E5371FC6206CE54400E2DCEE /* MusicSetPage.m in Sources */,
 				E5325D0F1EFA208A00F13A48 /* LHModelStateMent.m in Sources */,
@@ -5320,7 +5357,6 @@
 				E55670A51F09CB48001B34C5 /* ZXITFWriter.m in Sources */,
 				E556705B1F09CB48001B34C5 /* ZXInvertedLuminanceSource.m in Sources */,
 				E51CFF8D1DF505CE006A0462 /* SDWebImagePrefetcher.m in Sources */,
-				E51F64111EEF74B50066F95F /* Hotel.m in Sources */,
 				E54875591E5D1A47009D5EEF /* TZAssetModel.m in Sources */,
 				E51212FB1E52A00900AABF1E /* JHTableDataRowModel.m in Sources */,
 				E54875671E5D1A87009D5EEF /* TZTestCell.m in Sources */,
diff --git a/pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcuserdata/WindShan.xcuserdatad/UserInterfaceState.xcuserstate b/pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcuserdata/WindShan.xcuserdatad/UserInterfaceState.xcuserstate
index bd5c55b..8d3b36a 100644
--- a/pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcuserdata/WindShan.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcuserdata/WindShan.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 2702bec..ed4239a 100644
--- a/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -5048,7 +5048,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.087775"
+            timestampString = "545889617.96293"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "437"
@@ -5064,7 +5064,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.087827"
+            timestampString = "545889617.9629869"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "480"
@@ -5080,7 +5080,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.087869"
+            timestampString = "545889617.963028"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "201"
@@ -5096,7 +5096,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.087909"
+            timestampString = "545889617.963066"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "454"
@@ -5128,7 +5128,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
-            timestampString = "522819699.842463"
+            timestampString = "545889070.554985"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "147"
@@ -5144,7 +5144,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
-            timestampString = "522818057.954847"
+            timestampString = "545889070.555053"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "84"
@@ -5160,7 +5160,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.08799"
+            timestampString = "545889617.9631571"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "322"
@@ -5176,7 +5176,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.088032"
+            timestampString = "545889617.963197"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "332"
@@ -5192,7 +5192,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.088071"
+            timestampString = "545889617.9632339"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "495"
@@ -5208,7 +5208,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.088113"
+            timestampString = "545889617.963272"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "542"
@@ -5224,7 +5224,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.088151"
+            timestampString = "545889617.963308"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "491"
@@ -5240,60 +5240,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.0954241"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "434"
-            endingLineNumber = "434"
-            landmarkName = "-viewDidDisappear:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.095889"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "441"
-            endingLineNumber = "441"
-            landmarkName = "-viewWillAppear:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.096161"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "438"
-            endingLineNumber = "438"
-            landmarkName = "RadiaDetectionPage"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.096441"
+            timestampString = "545889617.963349"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "440"
             endingLineNumber = "440"
-            landmarkName = "-viewWillAppear:"
+            landmarkName = "-writeOption:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5304,11 +5256,59 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.096706"
+            timestampString = "545889617.963776"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "149"
-            endingLineNumber = "149"
+            startingLineNumber = "447"
+            endingLineNumber = "447"
+            landmarkName = "-writeOption:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.964065"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "444"
+            endingLineNumber = "444"
+            landmarkName = "-writeOption:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.9643461"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "446"
+            endingLineNumber = "446"
+            landmarkName = "-writeOption:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.964636"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "152"
+            endingLineNumber = "152"
             landmarkName = "RadiaDetectionPage"
             landmarkType = "3">
          </BreakpointContent>
@@ -5320,11 +5320,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.0969779"
+            timestampString = "545889617.964939"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "257"
-            endingLineNumber = "257"
+            startingLineNumber = "382"
+            endingLineNumber = "382"
             landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
             landmarkType = "7">
          </BreakpointContent>
@@ -5336,28 +5336,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.097279"
+            timestampString = "545889617.965223"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "376"
-            endingLineNumber = "376"
-            landmarkName = "RadiaDetectionPage"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.0976419"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "387"
-            endingLineNumber = "387"
-            landmarkName = "-notifyOption"
+            startingLineNumber = "393"
+            endingLineNumber = "393"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5368,11 +5352,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.098016"
+            timestampString = "545889617.96551"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "180"
-            endingLineNumber = "180"
+            startingLineNumber = "183"
+            endingLineNumber = "183"
             landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
             landmarkType = "7">
          </BreakpointContent>
@@ -5384,11 +5368,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.098375"
+            timestampString = "545889617.965793"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "148"
-            endingLineNumber = "148"
+            startingLineNumber = "151"
+            endingLineNumber = "151"
             landmarkName = "RadiaDetectionPage"
             landmarkType = "3">
          </BreakpointContent>
@@ -5400,12 +5384,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.098665"
+            timestampString = "545889617.966084"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "270"
-            endingLineNumber = "270"
-            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            startingLineNumber = "175"
+            endingLineNumber = "175"
+            landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5416,39 +5400,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.098951"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "269"
-            endingLineNumber = "269"
-            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.099231"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "259"
-            endingLineNumber = "259"
-            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.0994869"
+            timestampString = "545889617.9663661"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "172"
@@ -5463,104 +5415,8 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.099739"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "169"
-            endingLineNumber = "169"
-            landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.100021"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "323"
-            endingLineNumber = "323"
-            landmarkName = "-writeOption:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[RadiaDetectionPage writeOption:]"
-                  moduleName = "pregnancy_guard"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m"
-                  timestampString = "523154770.065211"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "226"
-                  endingLineNumber = "226"
-                  offsetFromSymbolStart = "468">
-               </Location>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__34-[RadiaDetectionPage writeOption:]_block_invoke"
-                  moduleName = "pregnancy_guard"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m"
-                  timestampString = "523154770.06679"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "227"
-                  endingLineNumber = "227"
-                  offsetFromSymbolStart = "56">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.10042"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "309"
-            endingLineNumber = "309"
-            landmarkName = "-readOption"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.100835"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "324"
-            endingLineNumber = "324"
-            landmarkName = "-writeOption:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
             filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
-            timestampString = "523155419.46686"
+            timestampString = "545889070.558535"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "299"
@@ -5576,7 +5432,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
-            timestampString = "523155662.190468"
+            timestampString = "545889070.558587"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "277"
@@ -5592,7 +5448,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
-            timestampString = "523155682.38609"
+            timestampString = "545889070.558634"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "283"
@@ -5608,11 +5464,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.101318"
+            timestampString = "545889617.9667031"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "825"
-            endingLineNumber = "825"
+            startingLineNumber = "893"
+            endingLineNumber = "893"
             landmarkName = "-viewDidLoad"
             landmarkType = "7">
          </BreakpointContent>
@@ -5624,13 +5480,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.101756"
+            timestampString = "545889617.966998"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "503"
-            endingLineNumber = "503"
-            landmarkName = "RadiaDetectionPage"
-            landmarkType = "3">
+            startingLineNumber = "509"
+            endingLineNumber = "509"
+            landmarkName = "-notifyOption"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5640,11 +5496,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.102194"
+            timestampString = "545889617.967278"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "426"
-            endingLineNumber = "426"
+            startingLineNumber = "432"
+            endingLineNumber = "432"
             landmarkName = "RadiaDetectionPage"
             landmarkType = "3">
          </BreakpointContent>
@@ -5656,7 +5512,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.093936"
+            timestampString = "545889617.967571"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "490"
@@ -5672,11 +5528,27 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.102626"
+            timestampString = "545889617.967615"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "501"
-            endingLineNumber = "501"
+            startingLineNumber = "507"
+            endingLineNumber = "507"
+            landmarkName = "-notifyOption"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.967893"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "494"
+            endingLineNumber = "494"
             landmarkName = "RadiaDetectionPage"
             landmarkType = "3">
          </BreakpointContent>
@@ -5688,13 +5560,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.103022"
+            timestampString = "545889617.968178"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "488"
-            endingLineNumber = "488"
-            landmarkName = "-viewWillAppear:"
-            landmarkType = "7">
+            startingLineNumber = "473"
+            endingLineNumber = "473"
+            landmarkName = "RadiaDetectionPage"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5704,29 +5576,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.1034091"
+            timestampString = "545889617.968464"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "467"
-            endingLineNumber = "467"
-            landmarkName = "-viewWillAppear:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.103825"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "466"
-            endingLineNumber = "466"
-            landmarkName = "-viewWillAppear:"
-            landmarkType = "7">
+            startingLineNumber = "472"
+            endingLineNumber = "472"
+            landmarkName = "RadiaDetectionPage"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5736,7 +5592,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
-            timestampString = "545730336.095196"
+            timestampString = "545889617.968752"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "441"
@@ -5752,13 +5608,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.104273"
+            timestampString = "545889617.9687949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "487"
-            endingLineNumber = "487"
-            landmarkName = "-viewWillAppear:"
-            landmarkType = "7">
+            startingLineNumber = "493"
+            endingLineNumber = "493"
+            landmarkName = "RadiaDetectionPage"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5768,13 +5624,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.104688"
+            timestampString = "545889617.969082"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "489"
-            endingLineNumber = "489"
-            landmarkName = "-viewWillAppear:"
-            landmarkType = "7">
+            startingLineNumber = "495"
+            endingLineNumber = "495"
+            landmarkName = "RadiaDetectionPage"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5800,11 +5656,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.1051461"
+            timestampString = "545889617.9694051"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "196"
-            endingLineNumber = "196"
+            startingLineNumber = "199"
+            endingLineNumber = "199"
             landmarkName = "-peripheral:didDiscoverDescriptorsForCharacteristic:error:"
             landmarkType = "7">
          </BreakpointContent>
@@ -5816,11 +5672,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.105577"
+            timestampString = "545889617.96975"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "210"
-            endingLineNumber = "210"
+            startingLineNumber = "224"
+            endingLineNumber = "224"
             landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
             landmarkType = "7">
          </BreakpointContent>
@@ -5832,11 +5688,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.105998"
+            timestampString = "545889617.970031"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "197"
-            endingLineNumber = "197"
+            startingLineNumber = "200"
+            endingLineNumber = "200"
             landmarkName = "-peripheral:didDiscoverDescriptorsForCharacteristic:error:"
             landmarkType = "7">
          </BreakpointContent>
@@ -5864,27 +5720,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.106436"
+            timestampString = "545889617.970333"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "214"
-            endingLineNumber = "214"
-            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.10686"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "785"
-            endingLineNumber = "785"
+            startingLineNumber = "853"
+            endingLineNumber = "853"
             landmarkName = "-viewDidLoad"
             landmarkType = "7">
          </BreakpointContent>
@@ -6328,12 +6168,12 @@
                   moduleName = "pregnancy_guard"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/ThirdClass/AFNetworking/AFNetworking/AFURLRequestSerialization.m"
-                  timestampString = "545733772.46828"
+                  timestampString = "545889618.213554"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1323"
                   endingLineNumber = "1323"
-                  offsetFromSymbolStart = "94">
+                  offsetFromSymbolStart = "84">
                </Location>
                <Location
                   shouldBeEnabled = "Yes"
@@ -6343,12 +6183,12 @@
                   moduleName = "pregnancy_guard"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/ThirdClass/AFNetworking/AFNetworking/AFURLRequestSerialization.m"
-                  timestampString = "545733772.471917"
+                  timestampString = "545889618.215185"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1323"
                   endingLineNumber = "1323"
-                  offsetFromSymbolStart = "129">
+                  offsetFromSymbolStart = "140">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -6520,7 +6360,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.955649"
+            timestampString = "545884547.349215"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "159"
@@ -6536,7 +6376,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.955698"
+            timestampString = "545884547.349263"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "55"
@@ -6552,7 +6392,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.955741"
+            timestampString = "545884547.349303"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "50"
@@ -6568,7 +6408,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.95578"
+            timestampString = "545884547.349341"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "51"
@@ -6584,7 +6424,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.955821"
+            timestampString = "545884547.3493789"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "54"
@@ -6600,7 +6440,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.95586"
+            timestampString = "545884547.3494149"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "113"
@@ -6616,7 +6456,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.955898"
+            timestampString = "545884547.349452"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "111"
@@ -6632,7 +6472,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.955937"
+            timestampString = "545884547.349488"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "75"
@@ -7100,7 +6940,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/MinePage.m"
-            timestampString = "545728722.956829"
+            timestampString = "545884547.3498091"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "141"
@@ -7180,12 +7020,12 @@
                   moduleName = "pregnancy_guard"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Utility/XZPickView/XZPickView.m"
-                  timestampString = "545733772.498989"
+                  timestampString = "545889618.2301"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "116"
                   endingLineNumber = "116"
-                  offsetFromSymbolStart = "48">
+                  offsetFromSymbolStart = "64">
                </Location>
                <Location
                   shouldBeEnabled = "Yes"
@@ -7195,12 +7035,12 @@
                   moduleName = "pregnancy_guard"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Utility/XZPickView/XZPickView.m"
-                  timestampString = "545733772.50177"
+                  timestampString = "545889618.231949"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "116"
-                  endingLineNumber = "116"
-                  offsetFromSymbolStart = "12">
+                  startingLineNumber = "117"
+                  endingLineNumber = "117"
+                  offsetFromSymbolStart = "28">
                </Location>
                <Location
                   shouldBeEnabled = "Yes"
@@ -7210,12 +7050,12 @@
                   moduleName = "pregnancy_guard"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Utility/XZPickView/XZPickView.m"
-                  timestampString = "545733772.5052249"
+                  timestampString = "545889618.2336349"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "116"
                   endingLineNumber = "116"
-                  offsetFromSymbolStart = "16">
+                  offsetFromSymbolStart = "20">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -7563,12 +7403,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.108727"
+            timestampString = "545889617.9719909"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "522"
-            endingLineNumber = "522"
-            landmarkName = "-discoveryDidRefresh"
+            startingLineNumber = "528"
+            endingLineNumber = "528"
+            landmarkName = "-UUIDArray:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -7579,11 +7419,411 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.109202"
+            timestampString = "545889617.972281"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "442"
-            endingLineNumber = "442"
+            startingLineNumber = "448"
+            endingLineNumber = "448"
+            landmarkName = "-writeOption:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.9725569"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "529"
+            endingLineNumber = "529"
+            landmarkName = "-UUIDArray:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.972895"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "531"
+            endingLineNumber = "531"
+            landmarkName = "-UUIDArray:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.9731849"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "456"
+            endingLineNumber = "456"
+            landmarkName = "-writeOption:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.973461"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "223"
+            endingLineNumber = "223"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.973742"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "360"
+            endingLineNumber = "360"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.974022"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "226"
+            endingLineNumber = "226"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.974303"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "227"
+            endingLineNumber = "227"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.974589"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "358"
+            endingLineNumber = "358"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.974871"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "221"
+            endingLineNumber = "221"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.975148"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "230"
+            endingLineNumber = "230"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.975425"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.9757071"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "238"
+            endingLineNumber = "238"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.975988"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "241"
+            endingLineNumber = "241"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.976267"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "242"
+            endingLineNumber = "242"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.976548"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "243"
+            endingLineNumber = "243"
+            landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.568767"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "182"
+            endingLineNumber = "182"
+            landmarkName = "-timeOutMethodForConnect"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.5688159"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "242"
+            endingLineNumber = "242"
+            landmarkName = "-disconnectPeripheral:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.568861"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
+            landmarkName = "-centralManager:didDisconnectPeripheral:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.568905"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "462"
+            endingLineNumber = "462"
+            landmarkName = "-centralManagerDidUpdateState:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.568948"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "469"
+            endingLineNumber = "469"
+            landmarkName = "-centralManagerDidUpdateState:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.5689909"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "477"
+            endingLineNumber = "477"
+            landmarkName = "-centralManagerDidUpdateState:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.569034"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "484"
+            endingLineNumber = "484"
+            landmarkName = "-centralManagerDidUpdateState:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.569077"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "482"
+            endingLineNumber = "482"
+            landmarkName = "-centralManagerDidUpdateState:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.569119"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "490"
+            endingLineNumber = "490"
+            landmarkName = "-centralManagerDidUpdateState:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.976974"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "602"
+            endingLineNumber = "602"
             landmarkName = "-viewWillAppear:"
             landmarkType = "7">
          </BreakpointContent>
@@ -7591,16 +7831,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.109623"
+            timestampString = "545889617.9772609"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "342"
-            endingLineNumber = "342"
-            landmarkName = "-writeOption:"
+            startingLineNumber = "180"
+            endingLineNumber = "180"
+            landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -7611,12 +7851,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.110036"
+            timestampString = "545889617.977541"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "331"
-            endingLineNumber = "331"
-            landmarkName = "-writeOption:"
+            startingLineNumber = "651"
+            endingLineNumber = "651"
+            landmarkName = "-bluetoothStateUpdatedToState:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -7627,12 +7867,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.110463"
+            timestampString = "545889617.977813"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "330"
-            endingLineNumber = "330"
-            landmarkName = "-writeOption:"
+            startingLineNumber = "206"
+            endingLineNumber = "206"
+            landmarkName = "-peripheral:didUpdateValueForDescriptor:error:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -7643,28 +7883,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.110884"
+            timestampString = "545889617.978076"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "523"
-            endingLineNumber = "523"
-            landmarkName = "-discoveryDidRefresh"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.111306"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "525"
-            endingLineNumber = "525"
-            landmarkName = "-discoveryDidRefresh"
+            startingLineNumber = "192"
+            endingLineNumber = "192"
+            landmarkName = "-peripheral:didDiscoverDescriptorsForCharacteristic:error:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -7675,12 +7899,44 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
-            timestampString = "545733772.111735"
+            timestampString = "545889617.978334"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "450"
-            endingLineNumber = "450"
-            landmarkName = "-viewWillAppear:"
+            startingLineNumber = "159"
+            endingLineNumber = "159"
+            landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+            timestampString = "545889617.978588"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "400"
+            endingLineNumber = "400"
+            landmarkName = "-peripheral:didWriteValueForCharacteristic:error:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "BaseProject/ThirdClass/CBManager/CBMoralManager.m"
+            timestampString = "545889070.571007"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "476"
+            endingLineNumber = "476"
+            landmarkName = "-centralManagerDidUpdateState:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

--
Gitblit v1.8.0