From 89d748b77b478905732e60f0b4c5807c274b6565 Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Thu, 29 Mar 2018 16:33:57 +0800
Subject: [PATCH] 功能优化。广告UI 设计
---
pregnancy_guard/BaseProject/AppDelegate.m | 2
pregnancy_guard/BaseProject/Resources/images/istanbul/search/icon_story@2x.png | 0
pregnancy_guard/BaseProject/Resources/images/common/look_notice.png | 0
pregnancy_guard/BaseProject/Resources/images/common/cancel_look.png | 0
pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 360 +++++++++++++++-------
pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.h | 2
pregnancy_guard/BaseProject/Resources/images/common/notice_bg.png | 0
/dev/null | 89 -----
pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m | 4
pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj | 142 +-------
pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m | 181 +++++++++++
pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcuserdata/WindShan.xcuserdatad/UserInterfaceState.xcuserstate | 0
pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m | 42 ++
pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m | 71 ++--
pregnancy_guard/BaseProject/Model/NoticeModel.h | 8
pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m | 1
pregnancy_guard/BaseProject/Resources/images/common/img_logo.png | 0
pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h | 32 ++
18 files changed, 569 insertions(+), 365 deletions(-)
diff --git a/pregnancy_guard/BaseProject/AppDelegate.m b/pregnancy_guard/BaseProject/AppDelegate.m
index 1505425..41d8870 100644
--- a/pregnancy_guard/BaseProject/AppDelegate.m
+++ b/pregnancy_guard/BaseProject/AppDelegate.m
@@ -125,7 +125,7 @@
//_currentDevice = _selectedDevice.mac;
- [self showHomePage];
+ [self showLoginPage];
//������������:NSException
//���������������������������������
diff --git a/pregnancy_guard/BaseProject/Controller/Home/ChangeDevicePage.h b/pregnancy_guard/BaseProject/Controller/Home/ChangeDevicePage.h
deleted file mode 100644
index 0f4eda6..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/ChangeDevicePage.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// ChangeDevicePage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/15.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import "MyDeviceStatus.h"
-//#import "DeviceSpareModel.h"
-
-@interface ChangeDevicePage : BaseNavPage
-
-@property (nonatomic, strong) MyDeviceStatus * currentModel;
-//@property (nonatomic, strong) DeviceSpareModel * spareModel;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Home/ChangeDevicePage.m b/pregnancy_guard/BaseProject/Controller/Home/ChangeDevicePage.m
deleted file mode 100644
index 226532c..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/ChangeDevicePage.m
+++ /dev/null
@@ -1,537 +0,0 @@
-//
-// ChangeDevicePage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/15.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "ChangeDevicePage.h"
-#import "HMSegmentedControl.h"
-#import "GloriaLabel.h"
-#import "BaseNaviController.h"
-#import "DeviceSelPage.h"
-#import "DeviceSpareModel.h"
-#import "Global.h"
-#import "NetworkSingleton.h"
-
-@interface ChangeDevicePage ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
-{
- int tableViewrowCount;
- UITextField * sucessReasonTF;
- UITextField * failedReasonTF;
- NSString * failOrSuccess; // 1 sucess 2 failed
-}
-@property (nonatomic, strong) HMSegmentedControl *segmentedControl;
-@property (nonatomic, strong) UITableView * tableView;
-
-@end
-
-@implementation ChangeDevicePage
-
--(void)viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- if( _selectedDevice != nil)
- {
- [self.tableView reloadData];
- }
-}
-
--(void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
- //self.navigationController.navigationBarHidden = NO;
-}
-
-
--(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
-{
- NSInteger textLength = 0;
-
- if ([string isEqualToString:@""]) {
- textLength = textField.text.length-1;
- }
- else
- {
- textLength = textField.text.length+1;
- }
-
- return YES;
-}
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder])
- {
- [textField resignFirstResponder];
- }
- return YES;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:sucessReasonTF];
- [self textFieldShouldReturn:failedReasonTF];
-}
-
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
- _tableView.backgroundColor = [UIColor clearColor];
- //_tableView.userInteractionEnabled = NO;
- //[_tableView setSeparatorInset:UIEdgeInsetsZero];
- //[_tableView setLayoutMargins:UIEdgeInsetsZero];
- _tableView.frame = CGRectMake(0, 40, SCREEN_WIDTH, 208);
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 80;
-}
-
-- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section // custom view for footer. will be adjusted to default or
-{
- UIView * pView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 80)];
-
- if(pView)
- {
- UIButton* changeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- changeBtn.frame = CGRectMake((SCREEN_WIDTH-350)/2, 20, 350, 40);
-
- [changeBtn setBackgroundImage:[UIImage imageNamed:@"ic_change_device_btn_bk" ] forState:UIControlStateNormal];
- [changeBtn setTitle:@"��� ���" forState:UIControlStateNormal];
- changeBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [changeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- changeBtn.layer.masksToBounds=YES;
- changeBtn.layer.cornerRadius=8.0f;
- [changeBtn addTarget:self action:@selector(changeCommitAction) forControlEvents:UIControlEventTouchUpInside];
- [pView addSubview:changeBtn];
- }
-
-
- return pView;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return tableViewrowCount;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- switch (indexPath.row) {
- case 0:
- {
- return 44;
- }
- break;
- case 1:
- {
- return 44;
- }
- break;
- case 2:
- {
- return 40;
- }
- break;
- case 3:
- {
- return 40;
- }
- break;
- case 4:
- {
- return 80;
- }
- break;
- case 5:
- {
- return 80;
- }
- break;
- default:
- break;
- }
-
- return 35;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"changeCell";
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- //cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
-
-
- switch (indexPath.row) {
- case 0:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
-
- GloriaLabel* deviceNameTips = [[GloriaLabel alloc] initWithFrame:CGRectMake(48, 0, (SCREEN_WIDTH-48)/2, 44)];
- deviceNameTips.font = FONT16;
- deviceNameTips.textAlignment = NSTextAlignmentLeft;
- deviceNameTips.userInteractionEnabled = NO;
- deviceNameTips.textColor = kUIColorFromRGB(0x6e6e6e);
- deviceNameTips.text = @"������������";
- [cell.contentView addSubview:deviceNameTips];
-
- GloriaLabel* deviceName = [[GloriaLabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH/2, 0, (SCREEN_WIDTH-48)/2, 44)];
- deviceName.font = FONT16;
- deviceName.textAlignment = NSTextAlignmentLeft;
- deviceName.userInteractionEnabled = NO;
- deviceName.textColor = kUIColorFromRGB(0x6e6e6e);
- deviceName.text = _currentModel.name;
- [cell.contentView addSubview:deviceName];
-
- }
- break;
- case 1:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- GloriaLabel* hotelRoomNameTips = [[GloriaLabel alloc] initWithFrame:CGRectMake(48, 0, SCREEN_WIDTH/4, 44)];
- hotelRoomNameTips.font = FONT16;
- hotelRoomNameTips.textAlignment = NSTextAlignmentLeft;
- hotelRoomNameTips.userInteractionEnabled = NO;
- hotelRoomNameTips.textColor = kUIColorFromRGB(0x6e6e6e);
- hotelRoomNameTips.text = @"������������";
- [cell.contentView addSubview:hotelRoomNameTips];
-
- GloriaLabel* hotelRoomName = [[GloriaLabel alloc] initWithFrame:CGRectMake(48+SCREEN_WIDTH/4+10, 0, SCREEN_WIDTH/3, 44)];
- hotelRoomName.font = FONT16;
- hotelRoomName.textAlignment = NSTextAlignmentLeft;
- hotelRoomName.userInteractionEnabled = NO;
- hotelRoomName.textColor = kUIColorFromRGB(0x6e6e6e);
- hotelRoomName.text = _currentModel.hotel_id.name;
- [cell.contentView addSubview:hotelRoomName];
-
- GloriaLabel* hotelRoomNo = [[GloriaLabel alloc] initWithFrame:CGRectMake((SCREEN_WIDTH*2)/3, 0, SCREEN_WIDTH/3, 44)];
- hotelRoomNo.font = FONT16;
- hotelRoomNo.textAlignment = NSTextAlignmentLeft;
- hotelRoomNo.userInteractionEnabled = NO;
- hotelRoomNo.textColor = kUIColorFromRGB(0x6e6e6e);
- hotelRoomNo.text = [NSString stringWithFormat:@"%@������",_currentModel.room_id.name];
- [cell.contentView addSubview:hotelRoomNo];
- }
- break;
- case 2:
- {
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- GloriaLabel* hotelRoomNameTips = [[GloriaLabel alloc] initWithFrame:CGRectMake(48, 0, SCREEN_WIDTH-80, 44)];
- hotelRoomNameTips.font = FONT16;
- hotelRoomNameTips.textAlignment = NSTextAlignmentLeft;
- hotelRoomNameTips.userInteractionEnabled = NO;
- hotelRoomNameTips.textColor = kUIColorFromRGB(0x6e6e6e);
- hotelRoomNameTips.text = @"������������";
- [cell.contentView addSubview:hotelRoomNameTips];
-
- GloriaLabel* hotelRoomName = [[GloriaLabel alloc] initWithFrame:CGRectMake(48+SCREEN_WIDTH/2, 0, SCREEN_WIDTH-80, 44)];
- hotelRoomName.font = FONT16;
- hotelRoomName.textAlignment = NSTextAlignmentLeft;
- hotelRoomName.userInteractionEnabled = NO;
- hotelRoomName.textColor = kUIColorFromRGB(0x6e6e6e);
- hotelRoomName.text = _selectedDevice != nil?_selectedDevice.name:@"";
- [cell.contentView addSubview:hotelRoomName];
-
- }
- break;
- case 3:
- {
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- if(_segmentedControl == nil)
- {
- _segmentedControl = [[HMSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, cell.frame.size.width, cell.frame.size.height-4)];
- /*! ������������ */
- _segmentedControl.sectionTitles = @[@"������������",@"������������"];
- /*! ������������������������������������������������ */
- _segmentedControl.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth;
- /*! ���������������0���view */
- _segmentedControl.selectedSegmentIndex = 0;
- /*! ������������������ */
- _segmentedControl.backgroundColor = [UIColor clearColor];
- /*! ������������������������ */
- _segmentedControl.titleTextAttributes = @{NSForegroundColorAttributeName : RgbColor(25, 31, 35), NSFontAttributeName: BA_FontSize(16)};
- /*! ������������������������ */
- _segmentedControl.selectedTitleTextAttributes = @{NSForegroundColorAttributeName : RgbColor(23, 172, 67), NSFontAttributeName: BA_FontSize(18)};
- /*! ��������������������������������� */
- _segmentedControl.selectionIndicatorColor = [UIColor clearColor];
- /*! ��������������������������������� */
- _segmentedControl.selectionIndicatorHeight = 1.0f;
- /*! ��������������������������������������������� */
- _segmentedControl.selectionStyle = HMSegmentedControlSelectionStyleFullWidthStripe;
- /*! ������������������������������������������������������ */
- _segmentedControl.selectionIndicatorLocation = HMSegmentedControlSelectionIndicatorLocationDown;
- /*! ���������������������������������������NO */
- _segmentedControl.verticalDividerEnabled = YES;
- /*! ������������������������������ */
- _segmentedControl.verticalDividerColor = RgbColor(23, 172, 67);
- /*! ������������������������������ */
- _segmentedControl.verticalDividerWidth = 1.0f;
-
-
- [cell.contentView addSubview:_segmentedControl];
-
- /*! ������������������ */
- BA_WEAKSELF;
- [_segmentedControl setIndexChangeBlock:^(NSInteger index)
- {
- if(index == 0 )
- {
- tableViewrowCount = 5;
- [weakSelf.tableView reloadData];
- failOrSuccess = @"1";
- //weakSelf.views1.type = @"2";
- //[weakSelf.views1 reSetView:[UserDefault stringForKey:@"user_id"] devicetype:weakSelf.views1.type searchkey:@""];
- }
- else if( index == 1 )
- {
- failOrSuccess = @"2";
- tableViewrowCount = 6;
- [weakSelf.tableView reloadData];
- //weakSelf.views2.type = @"1";
- // [weakSelf.views2 reSetView:[UserDefault stringForKey:@"user_id"] devicetype:weakSelf.views1.type searchkey:@""];
- }
- }];
-
- }
-
- }
- break;
- case 4:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(sucessReasonTF==nil)
- {
- sucessReasonTF = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-48, cell.frame.size.height)];
- sucessReasonTF.font = [UIFont fontWithName:@"Arial" size:16];
- sucessReasonTF.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"���������������������"attributes:@{ NSForegroundColorAttributeName:kUIColorFromRGB(0x6e6e6e)}];
- sucessReasonTF.delegate = self;
- [sucessReasonTF setValue:kUIColorFromRGB(0x00b744) forKeyPath:@"_placeholderLabel.textColor"];
- //userPhoneTextField.layer.borderColor = [RgbColor(213, 213, 213) CGColor];
- sucessReasonTF.textColor = kUIColorFromRGB(0x00b744);
- //zhengmingNameTF.keyboardType = UIKeyboardTypeNumberPad;
- sucessReasonTF.textAlignment = NSTextAlignmentLeft;
- sucessReasonTF.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- UIView *blankView = [[UIView alloc] initWithFrame:CGRectMake(sucessReasonTF.frame.origin.x,sucessReasonTF.frame.origin.y,10.0, sucessReasonTF.frame.size.height)];
- sucessReasonTF.leftView = blankView;
- sucessReasonTF.leftViewMode =UITextFieldViewModeAlways;
- sucessReasonTF.userInteractionEnabled = YES;
- [cell.contentView addSubview:sucessReasonTF];
- }
- }
- break;
- case 5:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(failedReasonTF==nil)
- {
- failedReasonTF = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-48, cell.frame.size.height)];
- failedReasonTF.font = [UIFont fontWithName:@"Arial" size:16];
- failedReasonTF.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"���������������������"attributes:@{ NSForegroundColorAttributeName:kUIColorFromRGB(0x6e6e6e)}];
- failedReasonTF.delegate = self;
- [failedReasonTF setValue:kUIColorFromRGB(0x00b744) forKeyPath:@"_placeholderLabel.textColor"];
- //failedReasonTF = [RgbColor(213, 213, 213) CGColor];
- failedReasonTF.textColor = kUIColorFromRGB(0x00b744);
- //failedReasonTF.keyboardType = UIKeyboardTypeNumberPad;
- failedReasonTF.textAlignment = NSTextAlignmentLeft;
- failedReasonTF.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- UIView *blankView = [[UIView alloc] initWithFrame:CGRectMake(failedReasonTF.frame.origin.x,failedReasonTF.frame.origin.y,10.0, failedReasonTF.frame.size.height)];
- failedReasonTF.leftView = blankView;
- failedReasonTF.leftViewMode =UITextFieldViewModeAlways;
- failedReasonTF.userInteractionEnabled = YES;
- [cell.contentView addSubview:failedReasonTF];
- }
- }
- break;
- default:
- break;
- }
-
-
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- [self.view endEditing:YES];
- if(indexPath.row == 2)
- {
- // ������������������
- // ������������
- DeviceSelPage* page = [[DeviceSelPage alloc] initIsFirstPage:NO];
-
- page.hotelid = _currentModel.hotel_id._id;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
- }
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
- self.navigationItem.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAction)];
-
- //self.segmentedControl.hidden = NO;
- tableViewrowCount = 5;
- failOrSuccess = @"1";
- self.tableView.hidden = NO;
- // Do any additional setup after loading the view.
-}
-
--(void)backAction
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
--(void)changeCommitAction
-{
- if(failedReasonTF.text.length == 0 && [failOrSuccess intValue] == 2)
- {
- [Global alertMessageEx:@"���������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- return;
- }
-
- if(sucessReasonTF.text.length == 0 )
- {
- [Global alertMessageEx:@"���������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- return;
- }
-
- if(_selectedDevice == nil )
- {
- [Global alertMessageEx:@"���������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- return;
- }
-
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat:CHANGE_DEVICE];
-
- //params.put("userID", MainApp.userId);
- //params.put("deviceID", TextUtils.isEmpty(deviceID)?"":deviceID);
- //params.put("roomID", TextUtils.isEmpty(roomID)?"":roomID);
- //params.put("hotelID", TextUtils.isEmpty(hotelID)?"":hotelID);
- //params.put("spareID", TextUtils.isEmpty(spareId)?"":spareId);
- //params.put("reason", TextUtils.isEmpty(reason)?"":reason);
- //params.put("result", result+"");
- //params.put("fail", TextUtils.isEmpty(fail)?"":fail);
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- [param setObject:[UserDefault stringForKey:@"user_id"] forKey:@"userID"];
- [param setObject:_currentModel._id forKey:@"deviceID"];
- [param setObject:_currentModel.room_id._id forKey:@"roomID"];
- [param setObject:_currentModel.hotel_id._id forKey:@"hotelID"];
- [param setObject:_selectedDevice._id forKey:@"spareID"];
- [param setObject:sucessReasonTF.text forKey:@"reason"];
- [param setObject:failOrSuccess forKey:@"result"];
- [param setObject:[failOrSuccess intValue] == 2?failedReasonTF.text:@"" forKey:@"fail"];
-
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- [self dismissViewControllerAnimated:YES completion:nil];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Home/DeviceListMgrPage.h b/pregnancy_guard/BaseProject/Controller/Home/DeviceListMgrPage.h
deleted file mode 100644
index aaeebcc..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/DeviceListMgrPage.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// DeviceListMgrPage.h
-// istanbul
-//
-// Created by WindShan on 2017/5/17.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-
-@interface DeviceListMgrPage : BaseNavPage
-
-@property (nonatomic, assign) BOOL bReload;
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Home/DeviceListMgrPage.m b/pregnancy_guard/BaseProject/Controller/Home/DeviceListMgrPage.m
deleted file mode 100644
index 4205e6f..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/DeviceListMgrPage.m
+++ /dev/null
@@ -1,676 +0,0 @@
-//
-// DeviceListMgrPage.m
-// istanbul
-//
-// Created by WindShan on 2017/5/17.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "DeviceListMgrPage.h"
-#import "JSDropDownMenu.h"
-#import "MyDeviceStatusView.h"
-#import "HBdansView.h"
-#import "CommonReqModel.h"
-#import "NetworkSingleton.h"
-#import "HotelSelModel.h"
-#import "NoticeModel.h"
-#import "AdvertisePage.h"
-#import "BaseNaviController.h"
-#import "JXTAlertManagerHeader.h"
-#import "UserSignPage.h"
-#import "ChangeDevicePage.h"
-#import "AddDevicePage.h"
-
-
-@interface DeviceListMgrPage ()<UITextFieldDelegate,JSDropDownMenuDataSource,JSDropDownMenuDelegate,SelectedDelegate,SelDetailDelegate>
-{
- UIButton * sign_btn;
- UITextField * searchEdit;
-
- NSMutableArray *_data2;
- NSMutableArray *_data3;
-
- NSInteger _currentData2Index;
- NSInteger _currentData3Index;
-
- HBdansView *_dansView;
- JSDropDownMenu *menu;
-
-}
-
-@property (nonatomic, strong) MyDeviceStatusView * myFileViewList;
-@property (nonatomic, assign) int roleType; // 1 ������������ 2 ������������
-
-@end
-
-@implementation DeviceListMgrPage
-
-
--(void)viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- HotelSelModel * hotelSelModel = [_data2 objectAtIndex:_currentData2Index];
- self.myFileViewList.hotel_id = hotelSelModel._id;
- [self.myFileViewList reSetView: [UserDefault stringForKey:@"user_id"] devicetype: [NSString stringWithFormat:@"%ld",_currentData3Index] searchkey:searchEdit.text];
-
-
-}
-
--(void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
- //self.navigationController.navigationBarHidden = NO;
-
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
- [self setNavigationRight:@"������" sel:@selector(signAction)];
-
- // Do any additional setup after loading the view.
- CGFloat bkWith = 285;
- CGFloat labaBLW = 351;
- if( IsiPhone4 || IsiPhone5 )
- {
- bkWith = 250;
- labaBLW = 300;
- }
-
- self.roleType = [_loginUser[@"opt"] intValue];
-
- if( self.roleType == 1 )
- {
- [self setNavigationLeft:@"add_device_btn.png" sel:@selector(addAction)];
- }
-
- UIImageView * ic_laba_scroll_bk = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-labaBLW)/2, 20, labaBLW, 42)];
- ic_laba_scroll_bk.image = [UIImage imageNamed:@"ic_laba_scroll_bk"];
- //ic_laba_scroll_bk.userInteractionEnabled = YES;
- [self.view addSubview:ic_laba_scroll_bk];
-
- UIImageView * ic_laba_tag = [[UIImageView alloc] initWithFrame:CGRectMake(10, 19, 14, 14)];
- ic_laba_tag.image = [UIImage imageNamed:@"ic_laba_tag"];
- //ic_laba_scroll_bk.userInteractionEnabled = YES;
- [ic_laba_scroll_bk addSubview:ic_laba_tag];
-
- UIImageView * ic_search_edit_bk = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-bkWith-62-2)/2, 2, bkWith, 33)];
- ic_search_edit_bk.image = [UIImage imageNamed:@"ic_search_edit_bk"];
- ic_search_edit_bk.userInteractionEnabled = YES;
- [self.view addSubview:ic_search_edit_bk];
-
- UIImageView * ic_search_tag = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 13, 13)];
- ic_search_tag.image = [UIImage imageNamed:@"ic_search_tag"];
- [ic_search_edit_bk addSubview:ic_search_tag];
-
- searchEdit = [[UITextField alloc] initWithFrame:CGRectMake(20, 0, bkWith-20, 33)];
- searchEdit.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"���������������������"attributes:@{ NSForegroundColorAttributeName:kUIColorFromRGB(0xa0a0a0)}];
- //searchEdit.secureTextEntry = YES;
- searchEdit.font = [UIFont fontWithName:@"Arial" size:16];
- searchEdit.delegate = self;
- //[searchEdit setValue:kUIColorFromRGB(0x00b744) forKeyPath:@"_placeholderLabel.textColor"];
- searchEdit.layer.borderColor = [RgbColor(213, 213, 213) CGColor];
- // searchEdit.textColor = RgbColor(213, 213, 213);
- searchEdit.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- UIView *blankView2 = [[UIView alloc] initWithFrame:CGRectMake(ic_search_edit_bk.frame.origin.x,ic_search_edit_bk.frame.origin.y,10.0, ic_search_edit_bk.frame.size.height)];
- searchEdit.leftView = blankView2;
- searchEdit.leftViewMode =UITextFieldViewModeAlways;
-
- searchEdit.returnKeyType = UIReturnKeySearch;
- [ic_search_edit_bk addSubview:searchEdit];
-
- sign_btn = [UIButton buttonWithType:UIButtonTypeCustom];
- [sign_btn setBackgroundImage:[UIImage imageNamed:@"sign_btn_bk" ] forState:UIControlStateNormal];
- [sign_btn setTitle:@"������" forState:UIControlStateNormal];
- [sign_btn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- //sign_btn.backgroundColor = [UIColor redColor]; //������������
- sign_btn.titleLabel.font = [UIFont systemFontOfSize: 14.0];
- [sign_btn addTarget:self action:@selector(searchAction) forControlEvents:UIControlEventTouchUpInside];
-
- [self.view addSubview:sign_btn];
-
- sign_btn.frame = CGRectMake((SCREEN_WIDTH-bkWith-62-2)/2 + bkWith+2, 2, 63, 33);
- //[sign_btn setTintColor:[UIColor whiteColor]];
- //sign_btn.titleEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0);
- //UIEdgeInsetsMake(CGFloat top, CGFloat left, CGFloat bottom, CGFloat right)
- //sign_btn.imageEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 10);
-
- HotelSelModel *selModel = [[HotelSelModel alloc] init];
- selModel._id = @"";
- selModel.name = @"������������";
-
- _data2 = [NSMutableArray arrayWithObjects:selModel, nil];
- _data3 = [NSMutableArray arrayWithObjects:@"������������", @"������������������", @"������������������", nil];
-
- menu = [[JSDropDownMenu alloc] initWithOrigin:CGPointMake(0, 65) andHeight:35];
- menu.indicatorColor = [UIColor colorWithRed:175.0f/255.0f green:175.0f/255.0f blue:175.0f/255.0f alpha:1.0];
- menu.separatorColor = [UIColor colorWithRed:210.0f/255.0f green:210.0f/255.0f blue:210.0f/255.0f alpha:1.0];
- menu.textColor = [UIColor colorWithRed:83.f/255.0f green:83.f/255.0f blue:83.f/255.0f alpha:1.0f];
- menu.dataSource = self;
- menu.delegate = self;
-
- [self.view addSubview:menu];
-
- //[menu reloadInputViews];
-
- self.myFileViewList.hidden = NO;
-
- _dansView = [[HBdansView alloc] initDansViewFrame:CGRectMake(10+28, 30, SCREEN_WIDTH-30-28, 30)];
- _dansView.backgroundColor = [UIColor clearColor];
- _dansView.textColor = [UIColor redColor];
- [self.view addSubview:_dansView];
-
- //[_dansView starDans];
-
- [self get_hotel_list];
- [self get_latest_list];
-
-
-}
-
--(void)addAction
-{
- AddDevicePage* page = [[AddDevicePage alloc] initIsFirstPage:NO];
-
- //page.currentModel = model;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
-
- //[self.navigationController pushViewController:page animated:YES];
-}
-
--(void)get_device_list:(NSString*)keyword hotel_id:(NSString*)hotel_id type:(NSString*)type
-{
-
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat: GET_LATEST_LIST];
-
- CommonReqModel * model = [[CommonReqModel alloc] init];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:model.toDic urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [NoticeModel mj_objectArrayWithKeyValuesArray:resModel.content];
-
- [_dansView.randomMutableArray addObjectsFromArray:modelTempArray];
-
- [_dansView starDans];
-
- //HotelSelModel * hotelSelModel = [HotelSelModel mj_objectWithKeyValues:resModel.content];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-}
-
--(void)get_latest_list
-{
-
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat: GET_LATEST_LIST];
-
- CommonReqModel * model = [[CommonReqModel alloc] init];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:model.toDic urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [NoticeModel mj_objectArrayWithKeyValuesArray:resModel.content];
-
- [_dansView.randomMutableArray addObjectsFromArray:modelTempArray];
-
- [_dansView starDans];
-
- //HotelSelModel * hotelSelModel = [HotelSelModel mj_objectWithKeyValues:resModel.content];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-}
-
--(void)get_hotel_list
-{
-
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat: @"%@", [NSString stringWithFormat:GET_Hotel_LIST, [UserDefault stringForKey:@"user_id"]]];
-
- CommonReqModel * model = [[CommonReqModel alloc] init];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:model.toDic urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [HotelSelModel mj_objectArrayWithKeyValuesArray:resModel.content];
- [_data2 addObjectsFromArray:modelTempArray];
- //HotelSelModel * hotelSelModel = [HotelSelModel mj_objectWithKeyValues:resModel.content];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-}
-
-- (MyDeviceStatusView *)myFileViewList
-{
- if (!_myFileViewList)
- {
- _myFileViewList = [[MyDeviceStatusView alloc] initWithFrame:CGRectMake(0, 100, SCREEN_WIDTH, SCREEN_HEIGHT-100-64) userId:[UserDefault stringForKey:@"user_id"] devicetype:@"0" searchkey:@""];
- _myFileViewList.delegate = self;
- _myFileViewList.detailDelegate = self;
- _myFileViewList.hotel_id = @"";
- [self.view addSubview:_myFileViewList];
- }
- return _myFileViewList;
-}
-
-- (void)didSelectedSection:(MyDeviceStatus*)model
-{
- //DeviceDetailPage* page = [[DeviceDetailPage alloc] initIsFirstPage:NO];
-
- //page.model = model;
- // ������������
- // BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- // [self presentViewController:baseNav animated:YES completion:nil];
-
-}
-
--(void)update_RETURN_BACK:(MyDeviceStatus*)model
-{
-
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat: RETURN_BACK];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
- [param setObject:model._id forKey:@"deviceID"];
-
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- [_myFileViewList.tableView reloadData];
- //������������������
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-}
-
--(void)update_admode:(MyDeviceStatus*)model
-{
-
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat: UPDATE_ADMODE];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
- [param setObject:model.mac forKey:@"mac"];
- // ad_mode 0������ 1������
- [param setObject:[NSString stringWithFormat:@"%d",model.ad_mode] forKey:@"ad_mode"];
- [param setObject:[NSString stringWithFormat:@"%d",model.ad_speed] forKey:@"ad_speed"];
- [param setObject:[NSString stringWithFormat:@"%d",model.ad_rollmd] forKey:@"ad_rollmd"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- [_myFileViewList.tableView reloadData];
- //������������������
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-}
-
-- (void)didDetailSection:(MyDeviceStatus*)model;
-{
- //NSString * btncmd; // ������������ 0 ������������ 1 ������������&������������ 2 ������������
-
- switch ([model.btncmd intValue]) {
- case 0:
- {
- AdvertisePage* page = [[AdvertisePage alloc] initIsFirstPage:NO];
-
- page.currentModel = model;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
- }
- break;
- case 1:
- {
- //int ad_mode;//": 1 ������������ 0 ������������
-
- if( model.ad_mode == 1 )
- {
- jxt_showAlertTwoButton(@"������������", @"���������������������", @"������", ^(NSInteger buttonIndex)
- {
- NSLog(@"������");
- }, @"������", ^(NSInteger buttonIndex)
- {
- model.ad_mode = 0;
- [self update_admode:model];
- NSLog(@"������");
- });
- }
- else if( model.ad_mode == 0 )
- {
- jxt_showAlertTwoButton(@"������������", @"���������������������", @"������", ^(NSInteger buttonIndex)
- {
- NSLog(@"������");
- }, @"������", ^(NSInteger buttonIndex)
- {
- model.ad_mode = 1;
- [self update_admode:model];
- NSLog(@"������");
- });
- }
- }
- break;
- case 2:
- {
- if(model.status == 1)
- {
- // ������������
- ChangeDevicePage* page = [[ChangeDevicePage alloc] initIsFirstPage:NO];
- _selectedDevice = nil;
- page.currentModel = model;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
- }
- else
- {
- // ������������
- jxt_showAlertTwoButton(@"������������", @"������������������", @"������", ^(NSInteger buttonIndex)
- {
- NSLog(@"������");
- }, @"������", ^(NSInteger buttonIndex)
- {
- model.status = 1;
- [self update_RETURN_BACK:model];
- NSLog(@"������");
- });
-
- }
- }
- break;
- default:
- break;
- }
-
-}
-
-#pragma mark - begin
-- (NSInteger)numberOfColumnsInMenu:(JSDropDownMenu *)menu {
-
- return 2;
-}
-
--(BOOL)displayByCollectionViewInColumn:(NSInteger)column{
-
- return NO;
-}
-
--(BOOL)haveRightTableViewInColumn:(NSInteger)column
-{
- return NO;
-}
-
--(CGFloat)widthRatioOfLeftColumn:(NSInteger)column{
- return 1;
-}
-
--(NSInteger)currentLeftSelectedRow:(NSInteger)column{
-
- if (column==0)
- {
- return _currentData2Index;
- }
- else if (column==1)
- {
- return _currentData3Index;
- }
-
- return 0;
-}
-
-- (NSInteger)menu:(JSDropDownMenu *)menu numberOfRowsInColumn:(NSInteger)column leftOrRight:(NSInteger)leftOrRight leftRow:(NSInteger)leftRow{
-
- if (column==0)
- {
- return _data2.count;
- }
- else if (column==1)
- {
- return _data3.count;
- }
-
- return 0;
-}
-
-- (NSString *)menu:(JSDropDownMenu *)menu titleForColumn:(NSInteger)column{
-
- switch (column)
- {
- case 0:
- {
- HotelSelModel * hotelSelModel = [HotelSelModel mj_objectWithKeyValues:_data2[0]];
- if(hotelSelModel)
- return hotelSelModel.name;
- else
- return @"";
- }
- break;
- case 1: return _data3[0];
- break;
- default:
- return nil;
- break;
- }
-}
-
-- (NSString *)menu:(JSDropDownMenu *)menu titleForRowAtIndexPath:(JSIndexPath *)indexPath {
-
- if (indexPath.column==0)
- {
- HotelSelModel * hotelSelModel = [HotelSelModel mj_objectWithKeyValues:_data2[indexPath.row]];
- if(hotelSelModel)
- return hotelSelModel.name;
- else
- return @"";
- }
- else
- {
- return _data3[indexPath.row];
- }
-}
-
-- (void)menu:(JSDropDownMenu *)menu didSelectRowAtIndexPath:(JSIndexPath *)indexPath {
-
- if(indexPath.column == 0)
- {
- _currentData2Index = indexPath.row;
- }
- else
- {
- _currentData3Index = indexPath.row;
- }
-
- HotelSelModel * hotelSelModel = [_data2 objectAtIndex:_currentData2Index];
- self.myFileViewList.hotel_id = hotelSelModel._id;
- [self.myFileViewList reSetView: [UserDefault stringForKey:@"user_id"] devicetype: [NSString stringWithFormat:@"%ld",_currentData3Index] searchkey:searchEdit.text];
-
-}
-#pragma mark - end
-
--(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
-{
- NSInteger textLength = 0;
-
- if ([string isEqualToString:@""]) {
- textLength = textField.text.length-1;
- }
- else
- {
- textLength = textField.text.length+1;
- }
-
- BOOL flag = NO;
-
- flag = YES;
- if (flag)
- {
- // [loginBtn setBackgroundColor:BLUECOLOR];
- // loginBtn.userInteractionEnabled = YES;
- }
- else
- {
- // loginBtn.backgroundColor = [UIColor lightGrayColor];
- // loginBtn.userInteractionEnabled = NO;
- }
-
- return flag;
-}
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder]) {
- [textField resignFirstResponder];
- }
- return YES;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:searchEdit];
-}
-
--(void)signAction
-{
- UserSignPage* page = [[UserSignPage alloc] initIsFirstPage:NO];
-
- //page.model = model;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
-}
-
--(void)searchAction
-{
- if(searchEdit.text.length == 0)
- {
- [Global alertMessageEx:@"���������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- return;
- }
-
- HotelSelModel * hotelSelModel = [_data2 objectAtIndex:_currentData2Index];
- self.myFileViewList.hotel_id = hotelSelModel._id;
- [self.myFileViewList reSetView: [UserDefault stringForKey:@"user_id"] devicetype: [NSString stringWithFormat:@"%ld",_currentData3Index] searchkey:searchEdit.text];
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
index 5522fb7..ce71edc 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
@@ -16,12 +16,12 @@
#import "Constants.h"
#import "UIView+Toast.h"
#import "CBMoralManager.h"
-#import "SearchDevicePage.h"
#import "BaseNaviController.h"
#import "HistoryRecordPage.h"
#import "NetworkSingleton.h"
#import "UploadModel.h"
#import "NetworkSingleton.h"
+#import "SearchDevicePage.h"
#import <BaiduMapAPI_Map/BMKMapComponent.h>
#import <BaiduMapAPI_Location/BMKLocationComponent.h>
@@ -844,7 +844,7 @@
-(void)connectAction
{
SearchDevicePage* page = [[SearchDevicePage alloc] initIsFirstPage:NO];
-
+
BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
[self presentViewController:baseNav animated:YES completion:nil];
}
diff --git a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.h b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.h
index 41d9b61..b963563 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.h
+++ b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.h
@@ -13,3 +13,5 @@
@interface SearchDevicePage : BaseNavPage<cbDiscoveryManagerDelegate>
@end
+
+
diff --git a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
index c99daa2..8b6b514 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
@@ -61,7 +61,7 @@
{
[super viewDidAppear:animated];
[[CBMoralManager sharedManager] disconnectPeripheral:[[CBMoralManager sharedManager] myPeripheral]];
-
+
}
@@ -114,10 +114,12 @@
ic_top_bkH = 325;
ic_search_doneH = 230;
+ CGFloat btnSearchH = 55;
if ( IsiPhone4 || IsiPhone5 )
{
ic_top_bkH = 260;
ic_search_doneH = 180;
+ btnSearchH = 40;
}
UIImageView * ic_top_bk = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, ic_top_bkH)];
@@ -134,7 +136,7 @@
ic_searching.hidden = YES;
ic_search_btn = [UIButton buttonWithType:UIButtonTypeCustom];
- ic_search_btn.frame = CGRectMake((SCREEN_WIDTH-128)/2, ic_search_doneH+55, 128, 32);
+ ic_search_btn.frame = CGRectMake((SCREEN_WIDTH-128)/2, ic_search_doneH+btnSearchH, 128, 32);
[ic_search_btn setBackgroundImage:[UIImage imageNamed:@"ic_search_start_btn" ] forState:UIControlStateNormal];
ic_search_btn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
ic_search_btn.layer.masksToBounds=YES;
@@ -204,7 +206,7 @@
_SetTitleLabel.text = @"������������������";
return cell;
-
+
}
else
{
@@ -292,10 +294,10 @@
//[cell setDiscoveredPeripheralDataFromPeripheral:newPeriPheral];
- return cell;
+ return cell;
}
}
-
+
return nil;
}
@@ -367,28 +369,28 @@
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-
- if (_currentStatus == 2)
- {
- NSInteger index = [indexPath row];
- if (isBluetoothON)
- {
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
- [self connectPeripheral:indexPath.row];
- }
-
- // DeviceSpareModel* model = [self.modelArray objectAtIndex:index];
- // ������������������������
- //HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
- //page.bSelRoom = 2;
- // ������������
- //BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- //[self presentViewController:baseNav animated:YES completion:nil];
- //[self showActionForPhoto];
- }
-
+ if (_currentStatus == 2)
+ {
+ NSInteger index = [indexPath row];
+ if (isBluetoothON)
+ {
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+ [self connectPeripheral:indexPath.row];
+ }
+
+ // DeviceSpareModel* model = [self.modelArray objectAtIndex:index];
+ // ������������������������
+ //HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
+ //page.bSelRoom = 2;
+ // ������������
+ //BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
+ //[self presentViewController:baseNav animated:YES completion:nil];
+ //[self showActionForPhoto];
+ }
+
+
}
@@ -449,7 +451,7 @@
[UserDefault setObject:bleUUID forKey:@"bleUUID"];
[UserDefault setObject:bleName forKey:@"bleName"];
- [UserDefault synchronize];//������synchronize���������������������������������,���������������NSUserDefaults������������������������������������
+ [UserDefault synchronize];//������synchronize���������������������������������,���������������NSUserDefaults������������������������������������
//CBPeripheralExt *selBLE = [UserDefault objectForKey:@"Peripheral"];//������������������Peripheral
[self backAticon];
}
@@ -508,13 +510,14 @@
}
/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
+ #pragma mark - Navigation
+
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+ }
+ */
@end
+
diff --git a/pregnancy_guard/BaseProject/Controller/Home/UserSignPage.h b/pregnancy_guard/BaseProject/Controller/Home/UserSignPage.h
deleted file mode 100644
index 6397242..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/UserSignPage.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// UserSignPage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import <BaiduMapAPI_Map/BMKMapComponent.h>
-#import <BaiduMapAPI_Location/BMKLocationComponent.h>
-#import<BaiduMapAPI_Search/BMKPoiSearchType.h>
-#import<BaiduMapAPI_Search/BMKGeocodeSearch.h>
-
-@interface UserSignPage : BaseNavPage
-{
- BMKMapView* _mapView;
- BMKLocationService* _locService;
- BMKGeoCodeSearch *_geocodesearch; //������������������������������������������������������
-}
-
-
--(void)startLocation;
--(void)stopLocation;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Home/UserSignPage.m b/pregnancy_guard/BaseProject/Controller/Home/UserSignPage.m
deleted file mode 100644
index 66b6ea2..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/UserSignPage.m
+++ /dev/null
@@ -1,1075 +0,0 @@
-//
-// UserSignPage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "UserSignPage.h"
-#import "GloriaLabel.h"
-#import "MyAnimatedAnnotationView.h"
-#import "BaseNaviController.h"
-#import "HotelSelPage.h"
-#import "NetworkSingleton.h"
-#import "SignInfo.h"
-
-@interface UserSignPage ()<BMKMapViewDelegate,BMKLocationServiceDelegate,BMKGeoCodeSearchDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
-{
-
-
- CLLocationDegrees locateLatitude;
- CLLocationDegrees locateLongitude;
-
- BMKPointAnnotation* pointAnnotation;
- BMKPointAnnotation* animatedAnnotation;
- NSString * currentAdress;
- NSString * currentzhengmingName;
- NSString * currentzhengmingTel;
-
- UITextField * zhengmingNameTF;
- UITextField * zhengmingTelTF;
- GloriaLabel* addressLabel;
-
- GloriaLabel* signInTime;
- GloriaLabel* signOutTime;
- GloriaLabel* signInDistrib;
- GloriaLabel* signOutDistrib;
-
- UIButton * sign_in_btn;
- UIButton * sign_out_btn;
-
-}
-
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation UserSignPage
-
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
- [self.view endEditing:YES];
-}
-
--(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
-{
- NSInteger textLength = 0;
-
- if ([string isEqualToString:@""]) {
- textLength = textField.text.length-1;
- }
- else
- {
- textLength = textField.text.length+1;
- }
-
- BOOL flag = NO;
- if( textField == zhengmingTelTF )
- {
- // ���������������������������
- if( textLength == 11 && [StringUtil isMobile:[zhengmingTelTF.text stringByAppendingString:string]] == NO)
- {
- [Global alertMessage:@"������������������������������������������"];
- }
-
- // ������11������������������
- if( textLength > 11 )
- return NO;
- }
-
- flag = YES;
- if (flag)
- {
- // [loginBtn setBackgroundColor:BLUECOLOR];
- // loginBtn.userInteractionEnabled = YES;
- }
- else
- {
- // loginBtn.backgroundColor = [UIColor lightGrayColor];
- // loginBtn.userInteractionEnabled = NO;
- }
-
- return flag;
-}
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder]) {
- [textField resignFirstResponder];
- }
- return YES;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:zhengmingNameTF];
- [self textFieldShouldReturn:zhengmingTelTF];
-}
-
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- _tableView.separatorColor = [UIColor clearColor];
- _tableView.backgroundColor = [UIColor clearColor];
- //_tableView.userInteractionEnabled = NO;
-
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 0;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return 5;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- if( indexPath.row < 4)
- return 35;
- else
- return 200;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"signCell";
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
- CGFloat xxx;
- switch (indexPath.row) {
- case 0:
- {
- cell.accessoryType=UITableViewCellAccessoryDisclosureIndicator;
- cell.image = [UIImage imageNamed:@"icon_green_call"];
- cell.text = _curHotel_Id != nil?_curHotel_Id.name:@"������������";
- cell.textColor = kUIColorFromRGB(0x00b744);
- xxx = cell.imageView.frame.origin.x;
- }
- break;
- case 1:
- {
- cell.image = [UIImage imageNamed:@"sign_address_tag"];
- //cell.text = currentAdress;
- if(addressLabel==nil)
- {
- addressLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(38+10, 0, SCREEN_WIDTH-cell.textLabel.frame.origin.x, 40)];
- addressLabel.font = FONT14;
- addressLabel.textAlignment = NSTextAlignmentLeft;
- addressLabel.userInteractionEnabled = NO;
- addressLabel.textColor = kUIColorFromRGB(0x00b744);
- [cell.contentView addSubview:addressLabel];
- }
-
- addressLabel.text = currentAdress;
- }
- break;
- case 2:
- {
- cell.image = [UIImage imageNamed:@"sign_prove_tag"];
- if(zhengmingNameTF==nil)
- {
- zhengmingNameTF = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-cell.textLabel.frame.origin.x, 40)];
- zhengmingNameTF.font = [UIFont fontWithName:@"Arial" size:16];
- zhengmingNameTF.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"������������������"attributes:@{ NSForegroundColorAttributeName:kUIColorFromRGB(0x6e6e6e)}];
- zhengmingNameTF.delegate = self;
- [zhengmingNameTF setValue:kUIColorFromRGB(0x00b744) forKeyPath:@"_placeholderLabel.textColor"];
- //userPhoneTextField.layer.borderColor = [RgbColor(213, 213, 213) CGColor];
- zhengmingNameTF.textColor = kUIColorFromRGB(0x00b744);
- //zhengmingNameTF.keyboardType = UIKeyboardTypeNumberPad;
- zhengmingNameTF.textAlignment = NSTextAlignmentLeft;
- zhengmingNameTF.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- UIView *blankView = [[UIView alloc] initWithFrame:CGRectMake(zhengmingNameTF.frame.origin.x,zhengmingNameTF.frame.origin.y,10.0, zhengmingNameTF.frame.size.height)];
- zhengmingNameTF.leftView = blankView;
- zhengmingNameTF.leftViewMode =UITextFieldViewModeAlways;
- zhengmingNameTF.userInteractionEnabled = YES;
- //zhengmingNameTF.returnKeyType = UIReturnKeyDone;//������������������
- [cell.contentView addSubview:zhengmingNameTF];
- }
-
- if(![currentzhengmingName isEqualToString:@""])
- {
- zhengmingNameTF.text = currentzhengmingName;
- }
- }
- break;
- case 3:
- {
- cell.image = [UIImage imageNamed:@"icon_green_call"];
- if(zhengmingTelTF==nil)
- {
- zhengmingTelTF = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-cell.textLabel.frame.origin.x, 40)];
- zhengmingTelTF.font = [UIFont fontWithName:@"Arial" size:16];
- zhengmingTelTF.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"���������������������������"attributes:@{ NSForegroundColorAttributeName:kUIColorFromRGB(0x6e6e6e)}];
- zhengmingTelTF.delegate = self;
- [zhengmingTelTF setValue:kUIColorFromRGB(0x00b744) forKeyPath:@"_placeholderLabel.textColor"];
- //zhengmingTelTF.layer.borderColor = [RgbColor(213, 213, 213) CGColor];
- zhengmingTelTF.textColor = kUIColorFromRGB(0x00b744);
- zhengmingTelTF.keyboardType = UIKeyboardTypeNumberPad;
- zhengmingTelTF.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- UIView *blankView = [[UIView alloc] initWithFrame:CGRectMake(zhengmingTelTF.frame.origin.x,zhengmingTelTF.frame.origin.y,10.0, zhengmingTelTF.frame.size.height)];
- zhengmingTelTF.leftView = blankView;
- zhengmingTelTF.leftViewMode =UITextFieldViewModeAlways;
- zhengmingTelTF.textAlignment = NSTextAlignmentLeft;
- //zhengmingTelTF.returnKeyType = UIReturnKeyDone;//������������������
- [cell.contentView addSubview:zhengmingTelTF];
- }
-
- if(![currentzhengmingTel isEqualToString:@""])
- {
- zhengmingTelTF.text = currentzhengmingTel;
- }
- }
- break;
- default:
- break;
- }
-
- cell.backgroundColor = [UIColor clearColor];
- cell.alpha = 0.5;
- if( indexPath.row != 4)
- {
- UIView * _pline = [[UIView alloc] initWithFrame:CGRectMake(0, 35, SCREEN_WIDTH, 1)];
- _pline.backgroundColor = [UIColor grayColor];
- [cell.contentView addSubview:_pline];
- }
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- [self.view endEditing:YES];
-
- if(indexPath.row == 0)
- {
- // ������������������
- HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
-
- page.bSelRoom = 0;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
-
- }
-}
-
--(void)viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
- [_mapView viewWillAppear];
- _mapView.delegate = self;
- _locService.delegate = self;
- _geocodesearch.delegate = self;
-
- if(_curHotel_Id != nil)
- {
- [self getusersign];
- }
-}
-
--(void)viewWillDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
-
- [_mapView viewWillDisappear];
- _mapView.delegate = nil; // ���������������nil
- _locService.delegate = nil;
- _geocodesearch.delegate = nil;
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
- // Do any additional setup after loading the view.
- self.navigationItem.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAction)];
- [self setNavigationRight:@"������" sel:@selector(startLocation)];
-
- //������ios7
- if( ([[[UIDevice currentDevice] systemVersion] doubleValue]>=7.0))
- {
- self.navigationController.navigationBar.translucent = NO;
- }
-
-
- [self initMap];
- [self startLocation];
- currentzhengmingName = @"";
- currentAdress = @"";
- currentzhengmingTel = @"";
- self.tableView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 140);
-
- CGFloat _bottomBkH = 230;
- CGFloat _offW = 0;
- CGFloat _offH = 0;
- if(IsiPhone4 || IsiPhone5)
- {
- _bottomBkH = 200;
- _offW = 20;
- _offH = 15;
- }
-
- UIImageView * _bottomBk = [[UIImageView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT-_bottomBkH, SCREEN_WIDTH, _bottomBkH)];
- _bottomBk.image = [UIImage imageNamed:@"sign_user_btn_bk"];
- _bottomBk.userInteractionEnabled = YES;
- [self.view addSubview:_bottomBk];
-
- // ������
- UIImageView * sign_daka_bk1 = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH/2-140+_offW)/2, (_bottomBkH-120)/3, 140-_offW, 120)];
- sign_daka_bk1.image = [UIImage imageNamed:@"sign_daka_bk"];
- sign_daka_bk1.userInteractionEnabled = YES;
- [_bottomBk addSubview:sign_daka_bk1];
-
- UIImageView * sign_no_in_bk = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH/2-140+_offW)/2, -20, 94-_offW, 94-_offW)];
- sign_no_in_bk.image = [UIImage imageNamed:@"sign_no_in_bk"];
- [sign_daka_bk1 addSubview:sign_no_in_bk];
-
- signInTime = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 40-_offH, 94-_offW, 40)];
- signInTime.font = [UIFont boldSystemFontOfSize:14];
- signInTime.textAlignment = NSTextAlignmentCenter;
- signInTime.textColor = [UIColor whiteColor];
- signInTime.text = @"08:30";
- [sign_no_in_bk addSubview:signInTime];
-
- signInDistrib = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 60-_offH, 140-_offW, 40)];
- signInDistrib.font = FONT14;
- signInDistrib.textAlignment = NSTextAlignmentCenter;
- signInDistrib.textColor = kUIColorFromRGB(0x6e6e6e);
- signInDistrib.text = @"������������";
- [sign_daka_bk1 addSubview:signInDistrib];
-
- sign_in_btn = [UIButton buttonWithType:UIButtonTypeCustom];
- sign_in_btn.frame = CGRectMake((140-100-_offW)/2, 90-_offH, 100, 21);
- [sign_in_btn setBackgroundImage:[UIImage imageNamed:@"sign_no_btn_bk" ] forState:UIControlStateNormal];
- [sign_in_btn setTitle:@"������������������" forState:UIControlStateNormal];
- sign_in_btn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [sign_in_btn setTitleColor:kUIColorFromRGB(0x00b744) forState:UIControlStateNormal];
- [sign_in_btn addTarget:self action:@selector(usersign_in_action) forControlEvents:UIControlEventTouchUpInside];
- [sign_daka_bk1 addSubview:sign_in_btn];
-
- // ������
- UIImageView * sign_daka_bk2 = [[UIImageView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH/2+(SCREEN_WIDTH/2-140+_offW)/2, (_bottomBkH-120)/3, 140-_offW, 120)];
- sign_daka_bk2.image = [UIImage imageNamed:@"sign_daka_bk"];
- sign_daka_bk2.userInteractionEnabled = YES;
- [_bottomBk addSubview:sign_daka_bk2];
-
- UIImageView * sign_out_bk = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH/2-140+_offW)/2, -20, 94-_offW, 94-_offW)];
- sign_out_bk.image = [UIImage imageNamed:@"sign_out_bk"];
-
- [sign_daka_bk2 addSubview:sign_out_bk];
-
- signOutTime = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 40-_offH, 94-_offW, 40)];
- signOutTime.font = [UIFont boldSystemFontOfSize:14];
- signOutTime.textAlignment = NSTextAlignmentCenter;
- signOutTime.textColor = [UIColor whiteColor];
- signOutTime.text = @"17:30";
- [sign_out_bk addSubview:signOutTime];
-
- signOutDistrib = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 60-_offH, 140-_offW, 40)];
- signOutDistrib.font = FONT14;
- signOutDistrib.textAlignment = NSTextAlignmentCenter;
- signOutDistrib.textColor = kUIColorFromRGB(0x6e6e6e);
- signOutDistrib.text = @"���������";
- [sign_daka_bk2 addSubview:signOutDistrib];
-
- sign_out_btn = [UIButton buttonWithType:UIButtonTypeCustom];
- sign_out_btn.frame = CGRectMake((140-100-_offW)/2, 90-_offH, 100, 21);
- [sign_out_btn setBackgroundImage:[UIImage imageNamed:@"sign_in_btn_bk" ] forState:UIControlStateNormal];
- [sign_out_btn setTitle:@"���������" forState:UIControlStateNormal];
- sign_out_btn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [sign_out_btn setTitleColor:kUIColorFromRGB(0xff8b00) forState:UIControlStateNormal];
- [sign_out_btn addTarget:self action:@selector(usersign_out_action) forControlEvents:UIControlEventTouchUpInside];
- [sign_daka_bk2 addSubview:sign_out_btn];
-
- signInDistrib.text = @"������������";
- [sign_in_btn setTitle:@"������������������" forState:UIControlStateNormal];
- signOutDistrib.text = @"������������";
- [sign_out_btn setTitle:@"������������������" forState:UIControlStateNormal];
-
-}
-
-// ������������������
--(void)getusersign
-{
- //params.put("userID", MainApp.userId);
- //params.put("hotelID", hotelid);
- NSString *path = [[NSString alloc] initWithFormat:GET_SIGN_INFO];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- [param setObject:[UserDefault stringForKey:@"user_id"] forKey:@"userID"];
- [param setObject:_curHotel_Id._id forKey:@"hotelID"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [SignInfo mj_objectArrayWithKeyValuesArray:resModel.content];
-
- BASE_INFO_FUN(resModel.content);
-
- if(modelTempArray.count > 0)
- {
- for( int i = 0; i < modelTempArray.count; i++ )
- {
- SignInfo * model = [modelTempArray objectAtIndex:i];
- if(model.type == 1)
- {
- [sign_in_btn setTitle:@"���������" forState:UIControlStateNormal];
- }
- else if(model.type == 2)
- {
- [sign_out_btn setTitle:@"���������" forState:UIControlStateNormal];
- }
- }
- }
- else
- {
- signInDistrib.text = @"������������";
- [sign_in_btn setTitle:@"������������������" forState:UIControlStateNormal];
- signOutDistrib.text = @"������������";
- [sign_out_btn setTitle:@"������������������" forState:UIControlStateNormal];
- }
-
- [self.tableView reloadData];
-
- //[_modelArray addObjectsFromArray:modelTempArray];
- //hotelSelModel = [AdModel mj_objectWithKeyValues:resModel.content];
-
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-}
-
--(void)usersign_in_action
-{
- if(currentAdress == nil)
- {
- [Global alertMessageEx:@"������������������������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(zhengmingNameTF.text.length == 0)
- {
- [Global alertMessageEx:@"������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(zhengmingTelTF.text.length == 0)
- {
- [Global alertMessageEx:@"������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(_curHotel_Id == nil)
- {
- [Global alertMessageEx:@"���������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- NSString *path = [[NSString alloc] initWithFormat:SIGN_IN];
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- [param setObject:[UserDefault stringForKey:@"user_id"] forKey:@"userID"];
- [param setObject:currentAdress forKey:@"address"];
- //lat 37.785834,long -122.406417 %.8f
- [param setObject:[NSString stringWithFormat:@"%.8f",locateLatitude] forKey:@"lat"];
- [param setObject:[NSString stringWithFormat:@"%.8f",locateLongitude] forKey:@"lng"];
- [param setObject:zhengmingNameTF.text forKey:@"cert_name"];
- [param setObject:zhengmingTelTF.text forKey:@"cert_tel"];
- [param setObject:_curHotel_Id._id forKey:@"hotelID"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
-
-}
-
--(void)usersign_out_action
-{
- if(currentAdress == nil)
- {
- [Global alertMessageEx:@"������������������������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(zhengmingNameTF.text.length == 0)
- {
- [Global alertMessageEx:@"������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(zhengmingTelTF.text.length == 0)
- {
- [Global alertMessageEx:@"������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(_curHotel_Id == nil)
- {
- [Global alertMessageEx:@"���������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- NSString *path = [[NSString alloc] initWithFormat:SIGN_OUT];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- [param setObject:[UserDefault stringForKey:@"user_id"] forKey:@"userID"];
- [param setObject:currentAdress forKey:@"address"];
- //lat 37.785834,long -122.406417 %.8f
- [param setObject:[NSString stringWithFormat:@"%.8f",locateLatitude] forKey:@"lat"];
- [param setObject:[NSString stringWithFormat:@"%.8f",locateLongitude] forKey:@"lng"];
- [param setObject:zhengmingNameTF.text forKey:@"cert_name"];
- [param setObject:zhengmingTelTF.text forKey:@"cert_tel"];
- [param setObject:_curHotel_Id._id forKey:@"hotelID"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
-}
-
--(void) initMap
-{
- //���������������
- _mapView = [[BMKMapView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
- _mapView.showsUserLocation = YES;//������������������
- _mapView.showMapScaleBar=YES;
- _mapView.zoomLevel=18.0;
- _mapView.mapType = BMKMapTypeStandard;
- [self.view addSubview:_mapView];
-
- // BMKLocationViewDisplayParam *param = [[BMKLocationViewDisplayParam alloc] init];
- // param.accuracyCircleStrokeColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:0.5];
- // param.accuracyCircleFillColor = [UIColor colorWithRed:0 green:1 blue:0 alpha:0.3];
- // param.isAccuracyCircleShow =true;//���������������������
- // [_mapView updateLocationViewWithParam:param];
-
- _locService = [[BMKLocationService alloc]init];
- _locService.desiredAccuracy = kCLLocationAccuracyBest;
-
- _mapView.delegate = self; // ������������������������������������nil������������������������������
- _locService.delegate = self;
-
- NSLog(@"���������������������");
- [_locService startUserLocationService];
- _mapView.showsUserLocation = NO;//������������������������������
- _mapView.userTrackingMode = BMKUserTrackingModeFollow;//���������������������
- _mapView.showsUserLocation = YES;//������������������
-
- _geocodesearch = [[BMKGeoCodeSearch alloc] init];
-
- _geocodesearch.delegate = self;
-}
-
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
--(void)backAction
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
--(void)startLocation
-{
- currentzhengmingTel = zhengmingTelTF.text;
- currentzhengmingName = zhengmingNameTF.text;
-
- [_locService startUserLocationService];
-
- _mapView.showsUserLocation = NO;
- _mapView.userTrackingMode = BMKUserTrackingModeFollow;
- _mapView.showsUserLocation = YES;
-
-
-}
-
-
-//������������
--(void)stopLocation
-{
- [_locService stopUserLocationService];
- _mapView.showsUserLocation = YES;//������������������
-}
-
--(void)onGetReverseGeoCodeResult:(BMKGeoCodeSearch *)searcher result:(BMKReverseGeoCodeResult *)result errorCode:(BMKSearchErrorCode)error
-{
-
- NSLog(@"address:%@----%@",result.addressDetail,result.address);
-
- currentAdress = result.address;
-
- [self.tableView reloadData];
-
- [self stopLocation];
- //[locateAddressLabel setText:[NSString stringWithFormat:@"���������%@",result.address]];
-
- //addressDetail: ���������������������
-
- //address: ������������
-
- //businessCircle: ������������
-
- // location: ������������
-
- // poiList: ������������POI������������������������BMKPoiInfo
-
-}
-
-#pragma mark - Navigation
-
-/**
- *���������View������������������������������������������
- *@param mapView ������View
- */
-- (void)willStartLocatingUser
-{
- NSLog(@"start locate");
-}
-
-
-/**
- *������������������������������������������
- *@param userLocation ������������������
- */
-//- (void)didUpdateUserHeading:(BMKUserLocation *)userLocation
-//{
-// [_mapView updateLocationData:userLocation];
-// NSLog(@"heading is %@",userLocation.heading);
-
-
-// locateLatitude = userLocation.location.coordinate.latitude;
-// locateLongitude = userLocation.location.coordinate.longitude;
-
- //[latitudeLabel setText:[NSString stringWithFormat:@"���������%lf",userLocation.location.coordinate.longitude]];
- //[longitudeLabel setText:[NSString stringWithFormat:@"���������%lf",userLocation.location.coordinate.latitude]];
-
- //[_mapView updateLocationData:userLocation];
-
- //_mapView.centerCoordinate = userLocation.location.coordinate; //���������������������������������
-
- //���������������
-
- //BMKReverseGeoCodeOption *reverseGeocodeSearchOption = [[BMKReverseGeoCodeOption alloc]init];
-
- // reverseGeocodeSearchOption.reverseGeoPoint = userLocation.location.coordinate;
-
- // BOOL flag = [_geocodesearch reverseGeoCode:reverseGeocodeSearchOption];
-
- //if(flag)
- //{
-
- // NSLog(@"���geo������������������");
-
- //[_locService stopUserLocationService];
-
- // }
- // else
- //{
-
- // NSLog(@"���geo������������������");
- // }
-//}
-
-/**
- *���������View������������������������������������
- *@param mapView ������View
- */
-- (void)didStopLocatingUser
-{
- NSLog(@"stop locate");
-}
-
-/**
- *������������������������������������
- *@param mapView ������View
- *@param error ������������������CLError.h���������������������
- */
-- (void)didFailToLocateUserWithError:(NSError *)error
-{
- NSLog(@"location error");
-}
-
-/**
- *������������������������������������������
- *@param userLocation ������������������
- */
-- (void)didUpdateBMKUserLocation:(BMKUserLocation *)userLocation
-{
- NSLog(@"didUpdateUserLocation lat %f,long %f",userLocation.location.coordinate.latitude,userLocation.location.coordinate.longitude);
-
- // latitude = userLocation.location.coordinate.latitude;
- // longitude = userLocation.location.coordinate.longitude;
-
- locateLatitude = userLocation.location.coordinate.latitude;
- locateLongitude = userLocation.location.coordinate.longitude;
-
- [_mapView updateLocationData:userLocation];
-
- _mapView.centerCoordinate = userLocation.location.coordinate; //���������������������������������
-
- //���������������
-
- BMKReverseGeoCodeOption *reverseGeocodeSearchOption = [[BMKReverseGeoCodeOption alloc]init];
-
- reverseGeocodeSearchOption.reverseGeoPoint = userLocation.location.coordinate;
-
- BOOL flag = [_geocodesearch reverseGeoCode:reverseGeocodeSearchOption];
-
- if(flag)
- {
-
- NSLog(@"���geo������������������");
-
- //[latitudeLabel setText:[NSString stringWithFormat:@"���������%lf",longitude]];
- // [longitudeLabel setText:[NSString stringWithFormat:@"���������%lf",latitude]];
-
- [_mapView removeAnnotations:_mapView.annotations];
- //[self addPointAnnotation];
-
- //[_locService stopUserLocationService];
-
- }
- else
- {
-
- NSLog(@"���geo������������������");
-
- }
-
-}
-
-#pragma mark ������������������
-/**
- *���������������������������������������
- *@param mapview ������View
- *@param mapPoi ���������������
- */
-- (void)mapView:(BMKMapView *)mapView onClickedMapPoi:(BMKMapPoi*)mapPoi
-{
- NSLog(@"onClickedMapPoi-%@",mapPoi.text);
- NSString* showmeg = [NSString stringWithFormat:@"������������������������:%@,\r\n������������:%f,������������:%f,\r\nZoomLevel=%d;RotateAngle=%d;OverlookAngle=%d", mapPoi.text,mapPoi.pt.longitude,mapPoi.pt.latitude, (int)_mapView.zoomLevel,_mapView.rotation,_mapView.overlooking];
-
- //latitude = mapPoi.pt.latitude;
- //longitude = mapPoi.pt.longitude;
-
-
- _mapView.centerCoordinate = mapPoi.pt; //���������������������������������
- //���������������
- BMKReverseGeoCodeOption *reverseGeocodeSearchOption = [[BMKReverseGeoCodeOption alloc]init];
- reverseGeocodeSearchOption.reverseGeoPoint = mapPoi.pt;
- BOOL flag = [_geocodesearch reverseGeoCode:reverseGeocodeSearchOption];
-
- if(flag)
- {
-
- NSLog(@"���geo������������������");
-
- //[latitudeLabel setText:[NSString stringWithFormat:@"���������%lf",longitude]];
- //[longitudeLabel setText:[NSString stringWithFormat:@"���������%lf",latitude]];
-
- [_mapView removeOverlays:_mapView.overlays];
- [_mapView removeAnnotations:_mapView.annotations];
- //[self addPointAnnotation];
-
- //[_locService stopUserLocationService];
-
- }
- else
- {
- NSLog(@"���geo������������������");
-
- }
-
- NSLog(showmeg);
-}
-/**
- *���������������������������������������
- *@param mapview ������View
- *@param coordinate ������������������������������
- */
-- (void)mapView:(BMKMapView *)mapView onClickedMapBlank:(CLLocationCoordinate2D)coordinate
-{
- NSLog(@"onClickedMapBlank-latitude==%f,longitude==%f",coordinate.latitude,coordinate.longitude);
- NSString* showmeg = [NSString stringWithFormat:@"���������������������������(blank click).\r\n������������:%f,������������:%f,\r\nZoomLevel=%d;RotateAngle=%d;OverlookAngle=%d", coordinate.longitude,coordinate.latitude,
- (int)_mapView.zoomLevel,_mapView.rotation,_mapView.overlooking];
-
- //latitude = coordinate.latitude;
- //longitude = coordinate.longitude;
-
- _mapView.centerCoordinate = coordinate; //���������������������������������
- //���������������
- BMKReverseGeoCodeOption *reverseGeocodeSearchOption = [[BMKReverseGeoCodeOption alloc]init];
- reverseGeocodeSearchOption.reverseGeoPoint = coordinate;
- BOOL flag = [_geocodesearch reverseGeoCode:reverseGeocodeSearchOption];
-
- if(flag)
- {
-
- NSLog(@"���geo������������������");
-
- //[latitudeLabel setText:[NSString stringWithFormat:@"���������%lf",longitude]];
- //[longitudeLabel setText:[NSString stringWithFormat:@"���������%lf",latitude]];
-
- [_mapView removeAnnotations:_mapView.annotations];
- //[self addPointAnnotation];
-
- //[_locService stopUserLocationService];
-
- }
- else
- {
- NSLog(@"���geo������������������");
-
- }
-
- NSLog(showmeg);
-}
-
-/**
- *���������������������������������
- *@param mapview ������View
- *@param coordinate ������������������������������������
- */
-- (void)mapview:(BMKMapView *)mapView onDoubleClick:(CLLocationCoordinate2D)coordinate
-{
- NSLog(@"onDoubleClick-latitude==%f,longitude==%f",coordinate.latitude,coordinate.longitude);
- NSString* showmeg = [NSString stringWithFormat:@"������������������(double click).\r\n������������:%f,������������:%f,\r\nZoomLevel=%d;RotateAngle=%d;OverlookAngle=%d", coordinate.longitude,coordinate.latitude,
- (int)_mapView.zoomLevel,_mapView.rotation,_mapView.overlooking];
-
-
- // latitude = coordinate.latitude;
- // longitude = coordinate.longitude;
- //
- // [_mapView removeOverlays:_mapView.overlays];
- // [_mapView removeAnnotations:_mapView.annotations];
- // [self addPointAnnotation];
- // [self addAnimatedAnnotation];
- NSLog(showmeg);
-}
-
-/**
- *���������������������������������
- *@param mapview ������View
- *@param coordinate ���������������������������������������
- */
-- (void)mapview:(BMKMapView *)mapView onLongClick:(CLLocationCoordinate2D)coordinate
-{
- NSLog(@"onLongClick-latitude==%f,longitude==%f",coordinate.latitude,coordinate.longitude);
- NSString* showmeg = [NSString stringWithFormat:@"������������������(long pressed).\r\n������������:%f,������������:%f,\r\nZoomLevel=%d;RotateAngle=%d;OverlookAngle=%d", coordinate.longitude,coordinate.latitude,
- (int)_mapView.zoomLevel,_mapView.rotation,_mapView.overlooking];
-
- // latitude = coordinate.latitude;
- // longitude = coordinate.longitude;
- // [_mapView removeOverlays:_mapView.overlays];
- // [_mapView removeAnnotations:_mapView.annotations];
- // [self addPointAnnotation];
- // [self addAnimatedAnnotation];
- NSLog(showmeg);
-
-}
-- (void)mapView:(BMKMapView *)mapView regionDidChangeAnimated:(BOOL)animated
-{
- NSString* showmeg = [NSString stringWithFormat:@"���������������������������(x=%d,y=%d,\r\nwidth=%d,height=%d).\r\nZoomLevel=%d;RotateAngle=%d;OverlookAngle=%d",(int)_mapView.visibleMapRect.origin.x,(int)_mapView.visibleMapRect.origin.y,(int)_mapView.visibleMapRect.size.width,(int)_mapView.visibleMapRect.size.height,(int)_mapView.zoomLevel,_mapView.rotation,_mapView.overlooking];
-
- // latitude = coordinate.latitude;
- // longitude = coordinate.longitude;
-
-
- NSLog(showmeg);
-
-}
-
-
-#pragma mark implement BMKMapViewDelegate
-
-// ������anntation���������������View
-- (BMKAnnotationView *)mapView:(BMKMapView *)mapView viewForAnnotation:(id <BMKAnnotation>)annotation
-{
- //������annotation
- if ( annotation == pointAnnotation)
- {
- NSString *AnnotationViewID = @"renameMark";
- BMKPinAnnotationView *annotationView = (BMKPinAnnotationView *)[mapView dequeueReusableAnnotationViewWithIdentifier:AnnotationViewID];
- if (annotationView == nil)
- {
- annotationView = [[BMKPinAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:AnnotationViewID];
- // ������������
- annotationView.pinColor = BMKPinAnnotationColorPurple;
- // ���������������������
- annotationView.animatesDrop = NO;
- // ���������������
- annotationView.draggable = YES;
-
- annotationView.image = [UIImage imageNamed:@"addressAnnota"];
- }
- return annotationView;
- }
-
- //������annotation
- NSString *AnnotationViewID = @"AnimatedAnnotation";
- MyAnimatedAnnotationView *annotationView = nil;
-
- if (annotationView == nil)
- {
- annotationView = [[MyAnimatedAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:AnnotationViewID];
- }
-
- NSMutableArray *images = [NSMutableArray array];
-
- for (int i = 1; i < 4; i++)
- {
- UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"poi_%d.png", i]];
- [images addObject:image];
- }
-
- annotationView.annotationImages = images;
- return annotationView;
-
-}
-
-// ���������annotation view������������������������������������
-- (void)mapView:(BMKMapView *)mapView annotationViewForBubble:(BMKAnnotationView *)view;
-{
- CLLocationCoordinate2D coordinate;
- coordinate.latitude = locateLatitude;
- coordinate.longitude = locateLongitude;
-
- _mapView.centerCoordinate = coordinate; //���������������������������������
- //���������������
- BMKReverseGeoCodeOption *reverseGeocodeSearchOption = [[BMKReverseGeoCodeOption alloc]init];
- reverseGeocodeSearchOption.reverseGeoPoint = coordinate;
- BOOL flag = [_geocodesearch reverseGeoCode:reverseGeocodeSearchOption];
-
- if(flag)
- {
-
- NSLog(@"���geo������������������");
-
- //[latitudeLabel setText:[NSString stringWithFormat:@"���������%lf",locateLongitude]];
- // [longitudeLabel setText:[NSString stringWithFormat:@"���������%lf",locateLatitude]];
-
- [_mapView removeAnnotations:_mapView.annotations];
- //[self addPointAnnotation];
-
- //[_locService stopUserLocationService];
-
- }
- else
- {
- NSLog(@"���geo������������������");
-
- }
-
- NSLog(@"paopaoclick");
-}
-
-- (void)dealloc
-{
- if (_mapView) {
- _mapView = nil;
- }
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/AddDevicePage.h b/pregnancy_guard/BaseProject/Controller/Mine/AddDevicePage.h
deleted file mode 100644
index e7fd877..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/AddDevicePage.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// AddDevicePage.h
-// airtree
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import <CoreLocation/CoreLocation.h>
-
-@interface AddDevicePage : BaseNavPage
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/AddDevicePage.m b/pregnancy_guard/BaseProject/Controller/Mine/AddDevicePage.m
deleted file mode 100644
index acf17be..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/AddDevicePage.m
+++ /dev/null
@@ -1,516 +0,0 @@
-//
-// AddDevicePage.m
-// airtree
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "AddDevicePage.h"
-#import "smartlinklib_7x.h"
-#import "HFSmartLink.h"
-#import "HFSmartLinkDeviceInfo.h"
-#import <SystemConfiguration/CaptiveNetwork.h>
-#import "GloriaLabel.h"
-#import "AddDeviceReqModel.h"
-#import "NetworkSingleton.h"
-#import "HotelSelPage.h"
-#import "BaseNaviController.h"
-
-@interface AddDevicePage ()<UITextFieldDelegate,UITableViewDelegate,UITableViewDataSource>
-{
- GloriaLabel * wifiSSIDLabel; // wifi ������
- UITextField * wifiPwdTextField; // wifi������
- UIButton * connectBtn;
-
- NSString * wifiSSID;
- NSString * hotel_room;
- //UIProgressView *connectProgressView; // ������������
- //UISwitch *oneDeviceSwitch;
- BOOL isconnecting;
-#ifdef USE_SmartLink
- HFSmartLink * smtlk;
-#endif
-}
-
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation AddDevicePage
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
- _tableView.backgroundColor = [UIColor clearColor];
- //_tableView.userInteractionEnabled = NO;
- //[_tableView setSeparatorInset:UIEdgeInsetsZero];
- //[_tableView setLayoutMargins:UIEdgeInsetsZero];
- _tableView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 208);
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 80;
-}
-
-- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section // custom view for footer. will be adjusted to default or
-{
- UIView * pView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 80)];
-
- if(pView)
- {
- UIButton* changeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- changeBtn.frame = CGRectMake((SCREEN_WIDTH-350)/2, 20, 350, 40);
-
- [changeBtn setBackgroundImage:[UIImage imageNamed:@"ic_change_device_btn_bk" ] forState:UIControlStateNormal];
- [changeBtn setTitle:@"������������" forState:UIControlStateNormal];
- changeBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [changeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- changeBtn.layer.masksToBounds=YES;
- changeBtn.layer.cornerRadius=8.0f;
- [changeBtn addTarget:self action:@selector(connectAction) forControlEvents:UIControlEventTouchUpInside];
- [pView addSubview:changeBtn];
- }
-
-
- return pView;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return 3;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 50;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"addDeviceCell";
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- //cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
-
-
- switch (indexPath.row) {
- case 0:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(wifiSSIDLabel==nil)
- {
- wifiSSIDLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(48, 0, SCREEN_WIDTH-60, 50)];
- wifiSSIDLabel.font = [UIFont systemFontOfSize:16.0];
- wifiSSIDLabel.textAlignment = UITextAlignmentLeft;
- wifiSSIDLabel.text = wifiSSID != nil? wifiSSID:@"������������wifi";
- [cell.contentView addSubview:wifiSSIDLabel];
- }
- }
- break;
- case 1:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(wifiPwdTextField==nil)
- {
- wifiPwdTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //wifiPwdTextField.secureTextEntry = YES;
- wifiPwdTextField.placeholder = @"���������wifi������";
- wifiPwdTextField.font = [UIFont fontWithName:@"Arial" size:16];
- wifiPwdTextField.delegate = self;
- wifiPwdTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- wifiPwdTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(wifiPwdTextField.frame.origin.x,wifiPwdTextField.frame.origin.y,10.0, wifiPwdTextField.frame.size.height)];
- wifiPwdTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:wifiPwdTextField];
-
-
- }
- wifiPwdTextField.text = [self getspwdByssid:wifiSSIDLabel.text];
- }
- break;
- case 2:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- cell.textLabel.text = hotel_room != nil? hotel_room:@"������������������";
- }
- break;
- default:
- break;
- }
-
-
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- if(indexPath.row == 2)
- {
- // ������������������
- // ������������������
- HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
-
- page.bSelRoom = 1;
- // ������������
- //BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- //[self presentViewController:baseNav animated:YES completion:nil];
-
- [self.navigationController pushViewController:page animated:YES];
- }
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
-#ifdef USE_SmartLink
- smtlk = [HFSmartLink shareInstence];
- smtlk.isConfigOneDevice = true;
- smtlk.waitTimers = 30;
-#endif
-
- self.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
-
- isconnecting = false;
-
- [self.tableView reloadData];
-
- // ������ssid������������
- [self showWifiSsid];
-
-
-
- // Do any additional setup after loading the view.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- //[self.navigationController popToViewController:self animated:YES];
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
--(void)connectAction
-{
- NSString * ssidStr = wifiSSIDLabel.text;
- NSString * pswdStr = wifiPwdTextField.text;
-
- [self savePswd];
- //connectProgressView.progress = 0.0;
- if(!isconnecting)
- {
- MBProgressHUD *HUD = nil;
- HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
-
- isconnecting = true;
-#ifdef USE_SmartLink
- [smtlk startWithSSID:ssidStr Key:pswdStr withV3x:true
- processblock: ^(NSInteger pro)
- {
- //connectProgressView.progress = (float)(pro)/100.0;
-
- }
- successBlock:^(HFSmartLinkDeviceInfo *dev)
- {
- NSString *path = [[NSString alloc] initWithFormat:ADD_DEVICE];
-
- AddDeviceReqModel *model = [[AddDeviceReqModel alloc] init];
- model.mac = dev.mac;
- model.userID = _loginUser[@"_id"];
- model.hotelID = _curHotel_Id._id;
- model.roomID = _sel_room._id;
-
- //params.put("userID", MainApp.userId);
- //params.put("mac", TextUtils.isEmpty(mac)?"":mac);
- //params.put("hotelID", TextUtils.isEmpty(hotelID)?"":hotelID);
- // params.put("roomID", TextUtils.isEmpty(roomID)?"":roomID);
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:model.toDic urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- HUD.hidden = YES;
- if(resModel.code == 0)
- {
- if(![Global isEmptyObject:resModel.content])
- {
- if([[resModel.content objectForKey:@"status"] integerValue] == 4)
- {
- [Global alertMessageEx:@"���������������������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- [Global alertMessageEx:@"���������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- [self dismissViewControllerAnimated:YES completion:nil];
- }
- }
- else
- {
- isconnecting = false;
- [self setButTitle:@"������������"];
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- else
- {
- isconnecting = false;
- [self setButTitle:@"������������"];
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- HUD.hidden = YES;
- isconnecting = false;
- [self setButTitle:@"������������"];
- //LOG_INFO(@"���������������%@",error);
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
- failBlock:^(NSString *failmsg)
- {
- HUD.hidden = YES;
- //LOG_INFO(@"���������������%@",failmsg);
- isconnecting = false;
- [self setButTitle:@"������������"];
- [Global alertMessageEx:@"���������������������������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- endBlock:^(NSDictionary *deviceDic)
- {
- HUD.hidden = YES;
- isconnecting = false;
-
- [self setButTitle:@"������������"];
- }];
-#endif
- [self setButTitle:@"������������..."];
-
- }
- else
- {
-
-#ifdef USE_SmartLink
- [smtlk stopWithBlock:^(NSString *stopMsg, BOOL isOk)
- {
- if(isOk)
- {
- isconnecting = false;
- [self setButTitle:@"������������"];
- [Global alertMessageEx:@"������������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- [Global alertMessageEx:@"������������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }];
-#endif
-
- }
-
-}
-
-//-(void)switchAction:(id)sender
-//{
-// UISwitch *switchBtn = (UISwitch *)sender;
-//
-// if(switchBtn.on)
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = true;
-//#endif
-// }
-// else
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = false;
-//#endif
-// }
-//
-//}
-#pragma mark end
-
-#pragma mark custom function begin
-
--(void)savePswd
-{
- [UserDefault setObject:wifiPwdTextField.text forKey:wifiSSIDLabel.text];
-}
-
--(NSString *)getspwdByssid:(NSString * )mssid
-{
- return [UserDefault objectForKey:mssid];
-}
-
-- (void)showWifiSsid
-{
- BOOL wifiOK = FALSE;
- NSDictionary *ifs;
- NSString *ssid;
-
- if (!wifiOK)
- {
- ifs = [self fetchSSIDInfo];
- ssid = [ifs objectForKey:@"SSID"];
-
- if (ssid != nil)
- {
- wifiOK= TRUE;
- wifiSSID = ssid;
- }
- else
- {
- [Global alertMessageEx:[NSString stringWithFormat:@"������������Wi-Fi"] title:@"������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- }
-}
-
-
-- (id)fetchSSIDInfo
-{
- NSArray *ifs = (__bridge_transfer id)CNCopySupportedInterfaces();
- LOG_INFO(@"Supported interfaces: %@", ifs);
- id info = nil;
-
- for (NSString *ifnam in ifs)
- {
- info = (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge CFStringRef)ifnam);
- LOG_INFO(@"%@ => %@", ifnam, info);
- if (info && [info count]) { break; }
- }
-
- return info;
-}
-
-- (void) setButTitle:(NSString *) title
-{
- NSAttributedString *attributedTitle = [connectBtn attributedTitleForState:UIControlStateNormal];
- NSMutableAttributedString *butTitle = [[NSMutableAttributedString alloc] initWithAttributedString:attributedTitle];
- [butTitle.mutableString setString:title];
- [connectBtn setAttributedTitle:butTitle forState:UIControlStateNormal];
-
-}
-
-#pragma mark end
-
--(void) viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- if( _curHotel_Id != nil && _sel_room != nil )
- {
- hotel_room = [NSString stringWithFormat:@"%@ %@������",_curHotel_Id.name,_sel_room.name];
- [self.tableView reloadData];
- }
-}
-
-- (void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
-#ifdef USE_SmartLink
- [smtlk stopWithBlock:^(NSString *stopMsg, BOOL isOk) {
- isconnecting = false;
- [self setButTitle:@"������������"];
- }];
-#endif
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder]) {
- [textField resignFirstResponder];
- }
- return YES;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:wifiPwdTextField];
-}
-
-
-/*
-
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelAccountPage.h b/pregnancy_guard/BaseProject/Controller/Mine/AddHotelAccountPage.h
deleted file mode 100644
index 82474a0..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelAccountPage.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// AddHotelAccountPage
-//
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import <CoreLocation/CoreLocation.h>
-
-@interface AddHotelAccountPage : BaseNavPage
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelAccountPage.m b/pregnancy_guard/BaseProject/Controller/Mine/AddHotelAccountPage.m
deleted file mode 100644
index 6bab792..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelAccountPage.m
+++ /dev/null
@@ -1,443 +0,0 @@
-//
-// AddHotelAccountPage
-//
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "AddHotelAccountPage.h"
-#import "GloriaLabel.h"
-#import "AddDeviceReqModel.h"
-#import "NetworkSingleton.h"
-#import "HotelSelPage.h"
-#import "BaseNaviController.h"
-
-@interface AddHotelAccountPage ()<UITextFieldDelegate,UITableViewDelegate,UITableViewDataSource>
-{
-
- UITextField * nicknameTextField; // ������
- UITextField * mobileTextField; // ���������
- UITextField * passwdTextField; // ������
-
- UIButton * createBtn;
-
- NSString * hotel_room;
-}
-
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation AddHotelAccountPage
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
- _tableView.backgroundColor = [UIColor clearColor];
- //_tableView.userInteractionEnabled = NO;
- //[_tableView setSeparatorInset:UIEdgeInsetsZero];
- //[_tableView setLayoutMargins:UIEdgeInsetsZero];
- _tableView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 208);
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 80;
-}
-
-- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section // custom view for footer. will be adjusted to default or
-{
- UIView * pView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 80)];
-
- if(pView)
- {
- createBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- createBtn.frame = CGRectMake((SCREEN_WIDTH-350)/2, 20, 350, 40);
-
- [createBtn setBackgroundImage:[UIImage imageNamed:@"ic_change_device_btn_bk" ] forState:UIControlStateNormal];
- [createBtn setTitle:@"������" forState:UIControlStateNormal];
- createBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [createBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- createBtn.layer.masksToBounds=YES;
- createBtn.layer.cornerRadius=8.0f;
- [createBtn addTarget:self action:@selector(createAction) forControlEvents:UIControlEventTouchUpInside];
- [pView addSubview:createBtn];
- }
-
-
- return pView;
-}
-
--(void)createAction
-{
- [self createHotelAccount];
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return 4;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 50;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"addHotelAccountCell";
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell)
- {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- //cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
-
-
- switch (indexPath.row) {
- case 0:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(nicknameTextField==nil)
- {
- nicknameTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //nicknameTextField.secureTextEntry = YES;
- nicknameTextField.placeholder = @"���������������";
- nicknameTextField.font = [UIFont fontWithName:@"Arial" size:16];
- nicknameTextField.delegate = self;
- nicknameTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- nicknameTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(nicknameTextField.frame.origin.x,nicknameTextField.frame.origin.y,10.0, nicknameTextField.frame.size.height)];
- nicknameTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:nicknameTextField];
- }
- }
- break;
- case 1:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(mobileTextField==nil)
- {
- mobileTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //mobileTextField.secureTextEntry = YES;
- mobileTextField.placeholder = @"���������������������";
- mobileTextField.font = [UIFont fontWithName:@"Arial" size:16];
- mobileTextField.delegate = self;
- mobileTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- mobileTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(mobileTextField.frame.origin.x,mobileTextField.frame.origin.y,10.0, mobileTextField.frame.size.height)];
- mobileTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:mobileTextField];
- }
-
- }
- break;
- case 2:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- cell.textLabel.text = _curHotel_Id!= nil? _curHotel_Id.name:@"������������";
- }
- break;
- case 3:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(passwdTextField==nil)
- {
- passwdTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //passwdTextField.secureTextEntry = YES;
- passwdTextField.placeholder = @"���������������";
- passwdTextField.font = [UIFont fontWithName:@"Arial" size:16];
- passwdTextField.delegate = self;
- passwdTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- passwdTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(passwdTextField.frame.origin.x,passwdTextField.frame.origin.y,10.0, passwdTextField.frame.size.height)];
- passwdTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:passwdTextField];
- }
-
- }
- break;
- default:
- break;
- }
-
-
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- if(indexPath.row == 2)
- {
- // ������������������
- // ������������������
- HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
-
- page.bSelRoom = 0;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
-
- //[self.navigationController pushViewController:page animated:YES];
- }
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat
-{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
-
- self.title = @"������������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
-
-
- [self.tableView reloadData];
-
- // Do any additional setup after loading the view.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- //[self.navigationController popToViewController:self animated:YES];
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-
--(void) createHotelAccount
-{
- if(_curHotel_Id ==nil)
- {
- [Global alertMessageEx:@"���������������������������" title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- else if(mobileTextField.text.length == 0)
- {
- [Global alertMessageEx:@"������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(passwdTextField.text.length == 0)
- {
- [Global alertMessageEx:@"���������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(nicknameTextField.text.length == 0)
- {
- [Global alertMessageEx:@"���������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- // ������������������
- MBProgressHUD *HUD = nil;
- HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
-
- NSString *path = [[NSString alloc] initWithFormat:CREATE_WAITER];
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- [param setObject:[UserDefault stringForKey:@"user_id"] forKey:@"userID"];
- [param setObject:mobileTextField.text forKey:@"username"];
- [param setObject:nicknameTextField.text forKey:@"nickname"];
- [param setObject:passwdTextField.text forKey:@"password"];
- [param setObject:_curHotel_Id != nil?_curHotel_Id._id:@"0" forKey:@"hotelID"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- HUD.hidden = YES;
-
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- if(resModel.code == 0)
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- [self dismissViewControllerAnimated:YES completion:nil];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- HUD.hidden = YES;
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
-
-}
-//-(void)switchAction:(id)sender
-//{
-// UISwitch *switchBtn = (UISwitch *)sender;
-//
-// if(switchBtn.on)
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = true;
-//#endif
-// }
-// else
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = false;
-//#endif
-// }
-//
-//}
-#pragma mark end
-
-
--(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
-{
- NSInteger textLength = 0;
-
- if ([string isEqualToString:@""]) {
- textLength = textField.text.length-1;
- }
- else
- {
- textLength = textField.text.length+1;
- }
-
- BOOL flag = NO;
- if( textField == mobileTextField )
- {
- // ���������������������������
- if( textLength == 11 && [StringUtil isMobile:[mobileTextField.text stringByAppendingString:string]] == NO)
- {
- [Global alertMessage:@"������������������������������������������"];
- }
-
- // ������11������������������
- if( textLength > 11 )
- return NO;
- }
-
- flag = YES;
- if (flag)
- {
- // [loginBtn setBackgroundColor:BLUECOLOR];
- // loginBtn.userInteractionEnabled = YES;
- }
- else
- {
- // loginBtn.backgroundColor = [UIColor lightGrayColor];
- // loginBtn.userInteractionEnabled = NO;
- }
-
- return flag;
-}
-
-
--(void) viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- if( _curHotel_Id != nil )
- {
- [self.tableView reloadData];
- }
-}
-
-- (void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
-}
-
-- (void)didReceiveMemoryWarning
-{
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder])
- {
- [textField resignFirstResponder];
- }
- return YES;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:mobileTextField];
- [self textFieldShouldReturn:passwdTextField];
- [self textFieldShouldReturn:nicknameTextField];
-}
-
-
-/*
-
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelDevicePage.h b/pregnancy_guard/BaseProject/Controller/Mine/AddHotelDevicePage.h
deleted file mode 100644
index 76b9cc6..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelDevicePage.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// AddHotelAccountPage
-//
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import <CoreLocation/CoreLocation.h>
-
-@interface AddHotelDevicePage : BaseNavPage
-
-@property (nonatomic, strong) NSString * hotel_id;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelDevicePage.m b/pregnancy_guard/BaseProject/Controller/Mine/AddHotelDevicePage.m
deleted file mode 100644
index 836e849..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/AddHotelDevicePage.m
+++ /dev/null
@@ -1,380 +0,0 @@
-//
-// AddHotelAccountPage
-//
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "AddHotelDevicePage.h"
-#import "GloriaLabel.h"
-#import "AddDeviceReqModel.h"
-#import "NetworkSingleton.h"
-#import "HotelSelPage.h"
-#import "BaseNaviController.h"
-
-@interface AddHotelDevicePage ()<UITextFieldDelegate,UITableViewDelegate,UITableViewDataSource>
-{
- UITextField * deviceNameTextField; // ������������
-
- UIButton * createBtn;
- NSString * hotel_room;
-}
-
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation AddHotelDevicePage
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
- _tableView.backgroundColor = [UIColor clearColor];
- //_tableView.userInteractionEnabled = NO;
- //[_tableView setSeparatorInset:UIEdgeInsetsZero];
- //[_tableView setLayoutMargins:UIEdgeInsetsZero];
- _tableView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 208);
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 80;
-}
-
-- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section // custom view for footer. will be adjusted to default or
-{
- UIView * pView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 80)];
-
- if(pView)
- {
- createBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- createBtn.frame = CGRectMake((SCREEN_WIDTH-350)/2, 20, 350, 40);
-
- [createBtn setBackgroundImage:[UIImage imageNamed:@"ic_change_device_btn_bk" ] forState:UIControlStateNormal];
- [createBtn setTitle:@"������" forState:UIControlStateNormal];
- createBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [createBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- createBtn.layer.masksToBounds=YES;
- createBtn.layer.cornerRadius=8.0f;
- [createBtn addTarget:self action:@selector(createAction) forControlEvents:UIControlEventTouchUpInside];
- [pView addSubview:createBtn];
- }
-
-
- return pView;
-}
-
--(void)createAction
-{
- [self createHotelAccount];
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return 2;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 50;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"addHotelDeviceCell";
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell)
- {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- //cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
-
-
- switch (indexPath.row) {
- case 0:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(deviceNameTextField==nil)
- {
- deviceNameTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //deviceNameTextField.secureTextEntry = YES;
- deviceNameTextField.placeholder = @"���������������������";
- deviceNameTextField.font = [UIFont fontWithName:@"Arial" size:16];
- deviceNameTextField.delegate = self;
- deviceNameTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- deviceNameTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(deviceNameTextField.frame.origin.x,deviceNameTextField.frame.origin.y,10.0, deviceNameTextField.frame.size.height)];
- deviceNameTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:deviceNameTextField];
- }
- }
- break;
- case 1:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- cell.textLabel.text = _curHotel_Id!= nil? _curHotel_Id.name:@"������������";
- }
- break;
- default:
- break;
- }
-
-
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- if(indexPath.row == 1)
- {
- // ������������������
- HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
-
- page.bSelRoom = 0;
- // ������������
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
-
- //[self.navigationController pushViewController:page animated:YES];
- }
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat
-{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
-
- self.title = @"������������������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
-
-
- [self.tableView reloadData];
-
- // Do any additional setup after loading the view.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- //[self.navigationController popToViewController:self animated:YES];
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-
--(void) createHotelAccount
-{
- if(_curHotel_Id ==nil)
- {
- [Global alertMessageEx:@"���������������������" title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- else if(deviceNameTextField.text.length == 0)
- {
- [Global alertMessageEx:@"���������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- // ������������������
- MBProgressHUD *HUD = nil;
- HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
-
- NSString *path = [[NSString alloc] initWithFormat:CREATE_SPARE];
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- [param setObject:[UserDefault stringForKey:@"user_id"] forKey:@"user_id"];
- [param setObject:deviceNameTextField.text forKey:@"name"];
- [param setObject:_curHotel_Id._id forKey:@"hotel_id"];
-
- //params.put("user_id", MainApp.userId);
- //params.put("name", TextUtils.isEmpty(nickname)?"":nickname);
- //params.put("hotel_id", TextUtils.isEmpty(hotelID)?"":hotelID);
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- HUD.hidden = YES;
-
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- if(resModel.code == 0)
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- [self dismissViewControllerAnimated:YES completion:nil];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- HUD.hidden = YES;
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
-
-}
-//-(void)switchAction:(id)sender
-//{
-// UISwitch *switchBtn = (UISwitch *)sender;
-//
-// if(switchBtn.on)
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = true;
-//#endif
-// }
-// else
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = false;
-//#endif
-// }
-//
-//}
-#pragma mark end
-
-
--(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
-{
- NSInteger textLength = 0;
-
- if ([string isEqualToString:@""]) {
- textLength = textField.text.length-1;
- }
- else
- {
- textLength = textField.text.length+1;
- }
-
- BOOL flag = NO;
-
- flag = YES;
- if (flag)
- {
- // [loginBtn setBackgroundColor:BLUECOLOR];
- // loginBtn.userInteractionEnabled = YES;
- }
- else
- {
- // loginBtn.backgroundColor = [UIColor lightGrayColor];
- // loginBtn.userInteractionEnabled = NO;
- }
-
- return flag;
-}
-
-
--(void) viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- if( _curHotel_Id != nil )
- {
- [self.tableView reloadData];
- }
-}
-
-- (void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
-}
-
-- (void)didReceiveMemoryWarning
-{
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder])
- {
- [textField resignFirstResponder];
- }
- return YES;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:deviceNameTextField];
-}
-
-
-/*
-
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceLWPage.h b/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceLWPage.h
deleted file mode 100644
index f686690..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceLWPage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// HotelSelPage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-
-@interface ChangeDeviceLWPage : BaseNavPage
-
-@property (nonatomic, strong) NSString * hotel_id;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceLWPage.m b/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceLWPage.m
deleted file mode 100644
index 88d6dff..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceLWPage.m
+++ /dev/null
@@ -1,328 +0,0 @@
-//
-// HotelSelPage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "ChangeDeviceLWPage.h"
-#import "NetworkSingleton.h"
-#import "DeviceLw.h"
-#import "ChangeDeviceCell.h"
-#import "JXTAlertManagerHeader.h"
-
-@interface ChangeDeviceLWPage ()<UITableViewDelegate,UITableViewDataSource>
-{
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation ChangeDeviceLWPage
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- _tableView.separatorColor = [UIColor clearColor];
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
--(void)setUpTableView
-{
- //���������������������������
- // ���������������������������������������������������target���action������������������self���loadNewData���������
- self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(getFirstPageData)];
-
- // ������������������������
- [_tableView.mj_header beginRefreshing];
-
-
- // ���������������������������������������������������target���action������������������self���loadMoreData���������
- _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(reloadData)];
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
- self.title = @"���������������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
- pageIndex = 1;
- pageSize = 20;
-
- self.modelArray = [[NSMutableArray alloc] init];
-
-
- self.tableView.hidden = NO;
- [self setUpTableView];
- // Do any additional setup after loading the view.
-}
-
--(void)getFirstPageData
-{
- pageIndex=1;
-
- [self getRoomList:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) reloadData
-{
- //pageIndex++;
- [self getRoomList:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) getRoomList:(BOOL) isShow pageIndex:(NSString *)page pageSize:(NSString *)size
-{
- // ������������������
- MBProgressHUD *HUD = nil;
- if( isShow == YES)
- {
- HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
- }
-
-
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:GET_STRANER_LIST,[UserDefault stringForKey:@"user_id"]]];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- if( isShow == YES)
- HUD.hidden = YES;
-
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
-
- if(pageIndex == 1)
- {
- [_modelArray removeAllObjects];
- }
-
- if(resModel.code == 0)
- {
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [DeviceLw mj_objectArrayWithKeyValuesArray:resModel.content];
-
- BASE_INFO_FUN(resModel.content);
-
- [_modelArray addObjectsFromArray:modelTempArray];
-
- _tableView.hidden = NO;
- [_tableView reloadData];
-
- }
- else
- {
- // ������������
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
- [Global alertMessageEx:@"������������������!" title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
-
- }
- else
- {
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
-
- }
- }
- failure:^(NSString *error)
- {
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- if( isShow == YES)
- HUD.hidden = YES;
-
- _tableView.hidden = YES;
-
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
--(void) updateDeviceLw:(DeviceLw*)model
-{
- // ������������������
- MBProgressHUD *HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
-
-
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:UPDATE_STRANER,model._id]];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- HUD.hidden = YES;
-
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- [self.modelArray removeObject:model];
-
- [_tableView reloadData];
- }
- else
- {
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- }
-
- [_tableView reloadData];
- }
- }
- failure:^(NSString *error)
- {
-
- HUD.hidden = YES;
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 0;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return self.modelArray.count;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 70;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"changeDeviceCell";
- ChangeDeviceCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[ChangeDeviceCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
- cell.accessoryType = UITableViewCellAccessoryNone;
- DeviceLw * model = [self.modelArray objectAtIndex:indexPath.row];
-
- [cell setItemView:model];
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- DeviceLw * model = [self.modelArray objectAtIndex:indexPath.row];
-
- jxt_showAlertTwoButton(@"������������", @"������������������������������������������������", @"������", ^(NSInteger buttonIndex)
- {
- NSLog(@"������");
- }, @"������", ^(NSInteger buttonIndex)
- {
- [self updateDeviceLw:model];
- NSLog(@"������");
- });
-}
-
-
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-
-
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- //[self.navigationController popToViewController:[self.navigationController.viewControllers objectAtIndex:1] animated:YES];
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceNamePage.h b/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceNamePage.h
deleted file mode 100644
index 638e58e..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceNamePage.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// ChangeDeviceNamePage.h
-// airtree
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import "DeviceSpareModel.h"
-
-@interface ChangeDeviceNamePage : BaseNavPage
-
-@property (nonatomic, strong) DeviceSpareModel * currentModel;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceNamePage.m b/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceNamePage.m
deleted file mode 100644
index 4c5a5e1..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/ChangeDeviceNamePage.m
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// ChangeDeviceNamePage.m
-// airtree
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "ChangeDeviceNamePage.h"
-#import "CommonReqModel.h"
-#import "NetworkSingleton.h"
-
-
-@interface ChangeDeviceNamePage ()<UITextFieldDelegate>
-{
- UITextField * deviceNameTextField;
-
- UIButton * resetDeviceNameBtn;
-}
-
-@end
-
-@implementation ChangeDeviceNamePage
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
-
- self.title = @"������������������";
- [self setNavigationLeft:@"������" sel:@selector(backAction)];
-
- deviceNameTextField = [[UITextField alloc] initWithFrame:CGRectMake(30, 40, SCREEN_WIDTH-60, 35)];
- deviceNameTextField.secureTextEntry = NO;
- deviceNameTextField.placeholder = @"���������������������";
- deviceNameTextField.font = [UIFont fontWithName:@"Arial" size:16];
- deviceNameTextField.delegate = self;
- deviceNameTextField.layer.borderColor = [RgbColor(213, 213, 213) CGColor];
- deviceNameTextField.layer.masksToBounds=YES;
- deviceNameTextField.layer.cornerRadius=5.0f;
- deviceNameTextField.layer.borderWidth= 1.0f;
- deviceNameTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- deviceNameTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(deviceNameTextField.frame.origin.x,deviceNameTextField.frame.origin.y,10.0, deviceNameTextField.frame.size.height)];
- deviceNameTextField.leftViewMode =UITextFieldViewModeAlways;
- [self.view addSubview:deviceNameTextField];
- deviceNameTextField.text = self.currentModel.name;
-
- //[deviceNameTextField setText:_selectedDevice.name];
-
- resetDeviceNameBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- resetDeviceNameBtn.frame = CGRectMake(30,90, SCREEN_WIDTH-60, 40);
- [resetDeviceNameBtn setBackgroundImage:[UIImage imageNamed:@"login_btn_bk" ] forState:UIControlStateNormal];
- [resetDeviceNameBtn setTitle:@"��� ���" forState:UIControlStateNormal];
- resetDeviceNameBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [resetDeviceNameBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- resetDeviceNameBtn.layer.masksToBounds=YES;
- resetDeviceNameBtn.layer.cornerRadius=5.0f;
- [resetDeviceNameBtn addTarget:self action:@selector(resetDeviceNameAction) forControlEvents:UIControlEventTouchUpInside];
- [self.view addSubview:resetDeviceNameBtn];
-
-}
-
--(void)viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- self.navigationController.navigationBarHidden = NO;
-
-}
-
--(void)viewWillDisappear:(BOOL)animated
-{
- [super viewWillDisappear:YES];
-
- resetDeviceNameBtn.userInteractionEnabled = YES;
- resetDeviceNameBtn.alpha = 1;
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark button event begin
--(void)backAction
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
--(void)resetDeviceNameAction
-{
- if(deviceNameTextField.text.length == 0)
- {
- [Global alertMessageEx:@"���������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- //_loginUser[@"_id"], _selectedDevice[@"_id"]
- NSString *path = [NSString stringWithFormat:UPDATE_SPARE];
-
- NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
-
- [params setObject:self.currentModel._id forKey:@"spare_id"];
- [params setObject:deviceNameTextField.text forKey:@"name"];
- [params setObject:[NSString stringWithFormat:@"%d",self.currentModel.status] forKey:@"status"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:params urlName:path success:^(id responseBody)
- {
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- LOG_INFO(@"���������%@",error);
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
-}
-#pragma mark button event end
-
-#pragma mark disappear keyboard begin
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder]) {
- [textField resignFirstResponder];
- }
- return true;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:deviceNameTextField];
-}
-
-#pragma mark disappear keyboard end
-
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/DeviceDetailsPage.h b/pregnancy_guard/BaseProject/Controller/Mine/DeviceDetailsPage.h
deleted file mode 100644
index c737253..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/DeviceDetailsPage.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// DeviceDetailsPage.h
-// airtree
-//
-// Created by if on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "BaseNavPage.h"
-
-@interface DeviceDetailsPage : BaseNavPage
-
-@property(nonatomic, strong) NSString * mac;
-@property(nonatomic, strong) NSString * name; // ������������
-@property(nonatomic, strong) NSString * _id;
-@property(nonatomic, assign) int currentPage;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/DeviceDetailsPage.m b/pregnancy_guard/BaseProject/Controller/Mine/DeviceDetailsPage.m
deleted file mode 100644
index d535ecd..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/DeviceDetailsPage.m
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-// DeviceDetailsPage.m
-// airtree
-//
-// Created by if on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "DeviceDetailsPage.h"
-#import "ChangeDeviceNamePage.h"
-#import "DateTimePicker.h"
-#import "MyDeviceStatus.h"
-#import "CommonReqModel.h"
-#import "NetworkSingleton.h"
-
-@interface DeviceDetailsPage ()<UITableViewDataSource,UITableViewDelegate,UIAlertViewDelegate>
-{
- UITableView *_tableView;
- //NSTimer *timer;
- NSString *checkStatus;
-
-}
-
-@end
-
-@implementation DeviceDetailsPage
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
- // Do any additional setup after loading the view.
- self.navigationItem.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAction)];
-
- self.view.backgroundColor = [UIColor whiteColor];
-
-// UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 80)];
-// view.userInteractionEnabled = YES;
-// UIButton *quitLoginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-// quitLoginBtn.frame =CGRectMake(20, 50, SCREEN_WIDTH-40, 40);
-// [quitLoginBtn.layer setMasksToBounds:YES];
-// [quitLoginBtn.layer setCornerRadius:5.0]; //������������������������������
-// quitLoginBtn.backgroundColor = BLUE_BUTTON_COLOR;
-// [quitLoginBtn setTitle:@"���������������" forState:UIControlStateNormal];
-// [quitLoginBtn addTarget:self action:@selector(unBindDevice) forControlEvents:UIControlEventTouchUpInside];
-// [view addSubview:quitLoginBtn];
-
-
- _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-40) style:UITableViewStyleGrouped];
- _tableView.dataSource = self;
- _tableView.delegate = self;
- //_tableView.tableFooterView = view;
- [self.view addSubview:_tableView];
-
-
-// if([device[@"type"] integerValue] == 1)
-// {
-// [self loadDeviceInfoList];
-// }
-
-// //���������������������������������
-// [self loadDeviceInfoList];
-
-}
-
--(void) viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- [_tableView reloadData];
-}
-
-- (void)viewDidDisappear:(BOOL)animated {
- [super viewDidDisappear:YES];
-
-}
-
-
--(void)backAction
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-
--(void)unBindDevice
-{
- [Global alertMessageEx:@"������������������������" title:@"������������" okTtitle:@"������" cancelTitle:@"������" delegate:self];
-}
-
-- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
-{
- // buttonIndex 0 ������ 1 ������
- switch (buttonIndex) {
- case 0:
- {
-
- }
- break;
- case 1:
- {
- NSString *path = [NSString stringWithFormat:Moral_Unbind_Url];
-
- CommonReqModel * model = [[CommonReqModel alloc] init];
- model.userID = _loginUser[@"_id"];
- model.deviceID = self._id;
- model.name = _curDeviceName;
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:model.toDic urlName:path success:^(id responseBody)
- {
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- if(resModel.code == 0)
- {
- [Global alertMessageEx:@"������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- [weakself dismissViewControllerAnimated:YES completion:nil];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
- break;
- default:
- break;
- }
-}
-
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return 3;
-}
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 60;
-}
--(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-{
- return 1;
-}
-
-//��������������������� ��������� footerview
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 80;
-}
-
--(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
-{
- UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 80)];
-
- UIButton *quitLoginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- quitLoginBtn.frame =CGRectMake(20, 50, SCREEN_WIDTH-40, 40);
- [quitLoginBtn.layer setMasksToBounds:YES];
- [quitLoginBtn.layer setCornerRadius:5.0]; //������������������������������
- quitLoginBtn.backgroundColor = RgbColor(85, 81, 168);
- [quitLoginBtn setTitle:@"���������������" forState:UIControlStateNormal];
- [quitLoginBtn addTarget:self action:@selector(unBindDevice) forControlEvents:UIControlEventTouchUpInside];
- [view addSubview:quitLoginBtn];
-
-
- return view;
-}
-
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- NSString * identifier = @"deviceManage";
- UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:identifier];
-
- }
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- switch (indexPath.row)
- {
- case 0:
- {
- cell.textLabel.text = @"������������";
- cell.textLabel.font = FONT16;
- cell.textLabel.textColor = BLACKTEXTCOLOR_TITLE;
-
- cell.detailTextLabel.text = self._id;
- cell.detailTextLabel.font = FONT14;
- cell.detailTextLabel.textColor = BLACKTEXTCOLOR_SUB;
-
- }
- break;
- case 1:
- {
- cell.textLabel.text = @"MAC������";
- cell.textLabel.font = FONT16;
- cell.textLabel.textColor = BLACKTEXTCOLOR_TITLE;
-
- cell.detailTextLabel.text = self.mac;
- cell.detailTextLabel.font = FONT14;
- cell.detailTextLabel.textColor = BLACKTEXTCOLOR_SUB;
-
- }
- break;
- case 2:
- {
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-
- cell.textLabel.text = @"������������";
- cell.textLabel.font = FONT16;
- cell.textLabel.textColor = BLACKTEXTCOLOR_TITLE;
- cell.userInteractionEnabled = YES;
- cell.detailTextLabel.text = _curDeviceName;
- cell.detailTextLabel.font = FONT14;
- cell.detailTextLabel.textColor = BLACKTEXTCOLOR_SUB;
-
- }
- break;
- default:
- break;
- }
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
- switch (indexPath.row) {
- case 0:
- {
-
-
- }
- break;
- case 1:
- {
-
-
- }
- break;
- case 2:
- {
-
- ChangeDeviceNamePage *page = [[ChangeDeviceNamePage alloc] initIsFirstPage:NO];
- //page.currentPage = self.currentPage;
- [self.navigationController pushViewController:page animated:YES];
- }
- break;
- default:
- break;
- }
-
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-/*
- #pragma mark - Navigation
-
- // In a storyboard-based application, you will often want to do a little preparation before navigation
- - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
- }
- */
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/DeviceSelPage.h b/pregnancy_guard/BaseProject/Controller/Mine/DeviceSelPage.h
deleted file mode 100644
index c54d909..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/DeviceSelPage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// DeviceSelPage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-
-@interface DeviceSelPage : BaseNavPage
-
-@property (nonatomic, strong) NSString * hotelid;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/DeviceSelPage.m b/pregnancy_guard/BaseProject/Controller/Mine/DeviceSelPage.m
deleted file mode 100644
index b2a115f..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/DeviceSelPage.m
+++ /dev/null
@@ -1,298 +0,0 @@
-//
-// DeviceSelPage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "DeviceSelPage.h"
-#import "NetworkSingleton.h"
-#import "DeviceSpareModel.h"
-#import "IdleDeviceCell.h"
-#import "Global.h"
-@interface DeviceSelPage ()<UITableViewDelegate,UITableViewDataSource>
-{
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) UITableView * tableView;
-
-@end
-
-@implementation DeviceSelPage
-
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
-
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
--(void)setUpTableView
-{
- //���������������������������
- // ���������������������������������������������������target���action������������������self���loadNewData���������
- self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(getFirstPageData)];
-
- // ������������������������
- [_tableView.mj_header beginRefreshing];
-
-
- // ���������������������������������������������������target���action������������������self���loadMoreData���������
- _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(reloadData)];
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
- self.title = @"������������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
- pageIndex = 1;
- pageSize = 20;
-
- self.modelArray = [[NSMutableArray alloc] init];
-
-
- self.tableView.hidden = NO;
- [self setUpTableView];
- // Do any additional setup after loading the view.
-}
-
--(void)getFirstPageData
-{
- pageIndex=1;
-
- [self.tableView reloadData];
-
- [self getDeviceList:self.hotelid isTips:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) reloadData
-{
- pageIndex++;
- [self getDeviceList:self.hotelid isTips:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) getDeviceList:(NSString *) hotelid isTips:(BOOL) isShow pageIndex:(NSString *)page pageSize:(NSString *)size
-{
- // ������������������
- MBProgressHUD *HUD = nil;
- if( isShow == YES)
- {
- HUD = [MBProgressHUD showHUDAddedTo:self animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
- }
-
-
- NSString *path = [[NSString alloc] initWithFormat:GET_IDLE_LIST];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
- // tempdebug
- [param setObject:hotelid forKey:@"hotel_id"];
- //[param setObject:page forKey:@"pageIndex"];
- //[param setObject:size forKey:@"pageSize"];
-
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- if( isShow == YES)
- HUD.hidden = YES;
-
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
-
- if(pageIndex == 1)
- {
- [_modelArray removeAllObjects];
- }
-
- if(resModel.code == 0)
- {
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [DeviceSpareModel mj_objectArrayWithKeyValuesArray:resModel.content];
-
- BASE_INFO_FUN(resModel.content);
-
- [_modelArray addObjectsFromArray:modelTempArray];
-
- _tableView.hidden = NO;
- [_tableView reloadData];
-
- }
- else
- {
- // ������������
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- }
-
- [_tableView reloadData];
- _tableView.hidden = YES;
-
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
-
- }
- else
- {
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
-
- }
- }
- failure:^(NSString *error)
- {
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- if( isShow == YES)
- HUD.hidden = YES;
-
- _tableView.hidden = YES;
-
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 0;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return self.modelArray.count;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 60;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"deviceCell";
- IdleDeviceCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[IdleDeviceCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
- cell.accessoryType = UITableViewCellAccessoryNone;
- DeviceSpareModel * model = [self.modelArray objectAtIndex:indexPath.row];
-
- [cell setItemView:model];
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
- DeviceSpareModel * model = [self.modelArray objectAtIndex:indexPath.row];
-
- [Global setCurrentDevice:model];
-
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-
-
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m b/pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m
index 50621ba..5e30416 100644
--- a/pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m
@@ -9,6 +9,8 @@
#import "HistoryRecordPage.h"
#import "GloriaLabel.h"
#import "NetworkSingleton.h"
+#import "AdNoticeView.h"
+#import "NoticeModel.h"
@interface HistoryRecordPage ()
{
@@ -23,7 +25,12 @@
NSDate *initialDate;
GloriaLabel* _BeginTimesLabel;
GloriaLabel* _EndTimesLabel;
+ NSString * _beginTimeStr;
+ NSString * _EndTimeStr;
}
+
+@property (nonatomic, strong) AdNoticeView * adNoticeView; // ������������
+
@end
@implementation HistoryRecordPage
@@ -129,6 +136,9 @@
_BeginTimesLabel.text = [DateUtil stringFromOffDateYMD:CurrentDate dayCount:-currentUnit];
[self.view addSubview:_BeginTimesLabel];
+ _beginTimeStr = _BeginTimesLabel.text;
+ _EndTimeStr = _beginTimeStr;
+
GloriaLabel* _TimesLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 20,SCREEN_WIDTH, 20)];
_TimesLabel.font = [UIFont boldSystemFontOfSize:14];
_TimesLabel.textAlignment = UITextAlignmentCenter;
@@ -159,8 +169,7 @@
[_arraw_rightBtn setTitleColor:kUIColorFromRGB(0xfebead) forState:UIControlStateNormal];
[_arraw_rightBtn addTarget:self action:@selector(rightLogin) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:_arraw_rightBtn];
-
-
+
modelArray = [[NSMutableArray alloc] init];
[self drawHistoryRecordLine];
@@ -169,10 +178,16 @@
_UnitTipsLabel.font = [UIFont boldSystemFontOfSize:14];
_UnitTipsLabel.textAlignment = UITextAlignmentCenter;
_UnitTipsLabel.textColor = RgbColor(0, 146, 252);
- _UnitTipsLabel.text = @"���������(������)";
+ _UnitTipsLabel.text = @"���������(������)";
[self.view addSubview:_UnitTipsLabel];
[self GetUserDataList];
+
+ NoticeModel * model = [[NoticeModel alloc] init];
+ self.adNoticeView = [[AdNoticeView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) dataModel:model];
+ //self.adNoticeView.delegate = self;
+ [self.view addSubview:self.adNoticeView];
+
// Do any additional setup after loading the view.
}
@@ -181,6 +196,17 @@
CurrentDate = [DateUtil dateFromStringYMD:[DateUtil stringFromOffDateYMD:CurrentDate dayCount:-(currentUnit+1)]];
_BeginTimesLabel.text = [DateUtil stringFromOffDateYMD:CurrentDate dayCount:-currentUnit];
_EndTimesLabel.text = [DateUtil stringFromDateYMD:CurrentDate];
+
+ _beginTimeStr = [NSString stringWithFormat:@"%@",_BeginTimesLabel.text];
+ if(currentUnit == 1)
+ {
+ _EndTimeStr = _BeginTimesLabel.text ;
+ }
+ else
+ {
+ _EndTimeStr = _EndTimesLabel.text;
+ }
+
[self GetUserDataList];
}
@@ -195,7 +221,6 @@
}
}
-
-(void)GetUserDataList
{
//[UserDefault stringForKey:@"user_id"]
@@ -203,8 +228,8 @@
NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
[params setValue:[UserDefault stringForKey:@"user_id"] forKey:@"user_id"];
- [params setValue:_BeginTimesLabel.text forKey:@"start_time"];
- [params setValue:_EndTimesLabel.text forKey:@"end_time"];
+ [params setValue:_beginTimeStr forKey:@"start_time"];
+ [params setValue:_EndTimeStr forKey:@"end_time"];
MPWeakSelf(self);
[NetworkSingleton networkingGetMethod:params urlName:path success:^(id responseBody)
@@ -243,6 +268,7 @@
_BeginTimesLabel.text = [DateUtil stringFromOffDateYMD:CurrentDate dayCount:-currentUnit];
_EndTimesLabel.text = [DateUtil stringFromDateYMD:CurrentDate];
[self GetUserDataList];
+ _UnitTipsLabel.text = @"���������(������)";
}
-(void)unitWeekLogin
@@ -255,6 +281,7 @@
_BeginTimesLabel.text = [DateUtil stringFromOffDateYMD:CurrentDate dayCount:-currentUnit];
_EndTimesLabel.text = [DateUtil stringFromDateYMD:CurrentDate];
[self GetUserDataList];
+ _UnitTipsLabel.text = @"���������(������)";
}
-(void)unitDayLogin
@@ -266,6 +293,9 @@
CurrentDate = [DateUtil dateFromStringYMD:[DateUtil stringFromOffDateYMD:[NSDate date] dayCount:-1]];
_BeginTimesLabel.text = [DateUtil stringFromOffDateYMD:CurrentDate dayCount:-currentUnit];
_EndTimesLabel.text = [DateUtil stringFromDateYMD:CurrentDate];
+ _beginTimeStr = [NSString stringWithFormat:@"%@",_BeginTimesLabel.text];
+ _EndTimeStr = _BeginTimesLabel.text ;
+ _UnitTipsLabel.text = @"���������(������)";
[self GetUserDataList];
}
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/HotelAccounPage.h b/pregnancy_guard/BaseProject/Controller/Mine/HotelAccounPage.h
deleted file mode 100644
index c42ce57..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/HotelAccounPage.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// HotelAccounPage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-
-@interface HotelAccounPage : BaseNavPage
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/HotelAccounPage.m b/pregnancy_guard/BaseProject/Controller/Mine/HotelAccounPage.m
deleted file mode 100644
index 4790330..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/HotelAccounPage.m
+++ /dev/null
@@ -1,336 +0,0 @@
-//
-// HotelAccounPage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "HotelAccounPage.h"
-#import "NetworkSingleton.h"
-#import "HotelAccount.h"
-#import "HotelAccountCell.h"
-#import "UpdateHotelAccountPage.h"
-#import "NetworkSingleton.h"
-
-@interface HotelAccounPage ()<UITableViewDelegate,UITableViewDataSource,updateAccountDelegate>
-{
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation HotelAccounPage
-
-- (void)updateAccountSection:(HotelAccount*)model
-{
- if( model.cmd == 1 )
- {
- //������������������
- UpdateHotelAccountPage* page = [[UpdateHotelAccountPage alloc] initIsFirstPage:NO];
- page.model = model;
- [self.navigationController pushViewController:page animated:YES];
- }
- else if( model.cmd == 2 )
- {
- [self delHotelAccount:model];
- }
-}
-
--(void)delHotelAccount:(HotelAccount*)model
-{
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:DELETE_WAITER,model._id]];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- if(resModel.code == 0)
- {
- [Global alertMessageEx:@"������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- [_modelArray removeObject:model];
- [self.tableView reloadData];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- [Global alertMessageEx:error title:@"������������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-}
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
-
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
--(void)setUpTableView
-{
- //���������������������������
- // ���������������������������������������������������target���action������������������self���loadNewData���������
- self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(getFirstPageData)];
-
- // ������������������������
- [_tableView.mj_header beginRefreshing];
-
-
- // ���������������������������������������������������target���action������������������self���loadMoreData���������
- _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(reloadData)];
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
- self.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
- pageIndex = 1;
- pageSize = 20;
-
- self.modelArray = [[NSMutableArray alloc] init];
-
-
- self.tableView.hidden = NO;
- [self setUpTableView];
- // Do any additional setup after loading the view.
-}
-
--(void)getFirstPageData
-{
- pageIndex=1;
-
- [self get_waiter_list:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) reloadData
-{
- //pageIndex++;
- [self get_waiter_list:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) get_waiter_list:(BOOL) isShow pageIndex:(NSString *)page pageSize:(NSString *)size
-{
- // ������������������
- MBProgressHUD *HUD = nil;
- if( isShow == YES)
- {
- HUD = [MBProgressHUD showHUDAddedTo:self animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
- }
-
-
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:GET_WAITER_LIST,[UserDefault stringForKey:@"user_id"]]];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:param urlName:path success:^(id responseBody)
- {
- if( isShow == YES)
- HUD.hidden = YES;
-
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
-
- if(pageIndex == 1)
- {
- [_modelArray removeAllObjects];
- }
-
- if(resModel.code == 0)
- {
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [HotelAccount mj_objectArrayWithKeyValuesArray:resModel.content];
-
- BASE_INFO_FUN(resModel.content);
-
- [_modelArray addObjectsFromArray:modelTempArray];
-
- _tableView.hidden = NO;
- [_tableView reloadData];
-
- }
- else
- {
- // ������������
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
- [UserDefault setObject:@"0" forKey:@"isLogin"];
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
-
- }
- else
- {
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
-
- }
- }
- failure:^(NSString *error)
- {
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- if( isShow == YES)
- HUD.hidden = YES;
-
- _tableView.hidden = YES;
-
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 0;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return self.modelArray.count;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 120;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"hotelAccountCell";
- HotelAccountCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell)
- {
- cell = [[HotelAccountCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
- }
-
- cell.delegate = self;
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
- //cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- HotelAccount * model = [self.modelArray objectAtIndex:indexPath.row];
- [cell setItemView:model];
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- //if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedSection:)])
- {
- //MyDeviceStatus * model = [self.modelArray objectAtIndex:indexPath.row];
- //[_delegate didSelectedSection:model];
- }
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-
-
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/HotelSelPage.h b/pregnancy_guard/BaseProject/Controller/Mine/HotelSelPage.h
deleted file mode 100644
index 1934567..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/HotelSelPage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// HotelSelPage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-
-@interface HotelSelPage : BaseNavPage
-
-@property(nonatomic,assign) int bSelRoom; // ������������������������ 0 ��������������� 1 ������������������ 2 ������������������������
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/HotelSelPage.m b/pregnancy_guard/BaseProject/Controller/Mine/HotelSelPage.m
deleted file mode 100644
index fe611ee..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/HotelSelPage.m
+++ /dev/null
@@ -1,331 +0,0 @@
-//
-// HotelSelPage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "HotelSelPage.h"
-#import "NetworkSingleton.h"
-#import "Hotel.h"
-#import "HotelCell.h"
-#import "BaseNaviController.h"
-#import "RoomSelPage.h"
-#import "HotelDevicePage.h"
-#import "Room.h"
-#import "RoomCell.h"
-
-@interface HotelSelPage ()<UITableViewDelegate,UITableViewDataSource>
-{
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation HotelSelPage
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
-
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
--(void)setUpTableView
-{
- //���������������������������
- // ���������������������������������������������������target���action������������������self���loadNewData���������
- self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(getFirstPageData)];
-
- // ������������������������
- [_tableView.mj_header beginRefreshing];
-
-
- // ���������������������������������������������������target���action������������������self���loadMoreData���������
- _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(reloadData)];
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
- self.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
- pageIndex = 1;
- pageSize = 20;
-
- self.modelArray = [[NSMutableArray alloc] init];
-
-
- self.tableView.hidden = NO;
- [self setUpTableView];
- // Do any additional setup after loading the view.
-}
-
--(void)getFirstPageData
-{
- pageIndex=1;
-
- [self getHotelList:[UserDefault stringForKey:@"user_id"] isTips:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) reloadData
-{
- //pageIndex++;
- [self getHotelList:[UserDefault stringForKey:@"user_id"] isTips:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) getHotelList:(NSString *) userID isTips:(BOOL) isShow pageIndex:(NSString *)page pageSize:(NSString *)size
-{
- // ������������������
- MBProgressHUD *HUD = nil;
- if( isShow == YES)
- {
- HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
- }
-
-
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:GET_HOTEL_LIST,userID]];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:param urlName:path success:^(id responseBody)
- {
- if( isShow == YES)
- HUD.hidden = YES;
-
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
-
- if(pageIndex == 1)
- {
- [_modelArray removeAllObjects];
- }
-
- if(resModel.code == 0)
- {
- if(![Global isEmptyObject:resModel.content])
- {
- NSMutableArray *modelTempArray = [Hotel mj_objectArrayWithKeyValuesArray:resModel.content];
-
- BASE_INFO_FUN(resModel.content);
-
- [_modelArray addObjectsFromArray:modelTempArray];
-
- _tableView.hidden = NO;
- [_tableView reloadData];
-
- }
- else
- {
- // ������������
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
-
- }
- else
- {
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
-
- }
- }
- failure:^(NSString *error)
- {
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- if( isShow == YES)
- HUD.hidden = YES;
-
- _tableView.hidden = YES;
-
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 0;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return self.modelArray.count;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 60;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"hotelCell";
- HotelCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[HotelCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- Hotel * model = [self.modelArray objectAtIndex:indexPath.row];
-
- [cell setItemView:model.name];
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- if(self.bSelRoom == 0)
- {
- Hotel * model = [self.modelArray objectAtIndex:indexPath.row];
- _curHotel_Id = model;
-
- [self dismissViewControllerAnimated:YES completion:nil];
- }
- else if(self.bSelRoom == 1)
- {
- //������������������������
- RoomSelPage* page = [[RoomSelPage alloc] initIsFirstPage:NO];
- Hotel * model = [self.modelArray objectAtIndex:indexPath.row];
- page.hotel_id = model._id;
- _curHotel_Id = model;
- [self.navigationController pushViewController:page animated:YES];
- }
- else if(self.bSelRoom == 2)
- {
- //������������������������������
- HotelDevicePage* page = [[HotelDevicePage alloc] initIsFirstPage:NO];
- Hotel * model = [self.modelArray objectAtIndex:indexPath.row];
- page.hotelid = model._id;
- _curHotel_Id = model;
- [self.navigationController pushViewController:page animated:YES];
- }
-
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-
-
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- if(self.bSelRoom == 0)
- {
- [self dismissViewControllerAnimated:YES completion:nil];
- }
- else if(self.bSelRoom == 1)
- {
- [self.navigationController popToViewController:[self.navigationController.viewControllers objectAtIndex:0] animated:YES];
- }
- else if(self.bSelRoom == 2)
- {
- [self dismissViewControllerAnimated:YES completion:nil];
- }
-
-
- //[self dismissViewControllerAnimated:YES completion:nil];
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/NoticePage.h b/pregnancy_guard/BaseProject/Controller/Mine/NoticePage.h
deleted file mode 100644
index c3d38f4..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/NoticePage.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// HotelSelPage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-
-@interface NoticePage : BaseNavPage
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/NoticePage.m b/pregnancy_guard/BaseProject/Controller/Mine/NoticePage.m
deleted file mode 100644
index cd490d8..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/NoticePage.m
+++ /dev/null
@@ -1,307 +0,0 @@
-//
-// HotelSelPage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "NoticePage.h"
-#import "NetworkSingleton.h"
-#import "NoticeModel.h"
-#import "NoticeCell.h"
-
-@interface NoticePage ()<UITableViewDelegate,UITableViewDataSource>
-{
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation NoticePage
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
-
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
--(void)setUpTableView
-{
- //���������������������������
- // ���������������������������������������������������target���action������������������self���loadNewData���������
- self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(getFirstPageData)];
-
- // ������������������������
- [_tableView.mj_header beginRefreshing];
-
-
- // ���������������������������������������������������target���action������������������self���loadMoreData���������
- _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(reloadData)];
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
- self.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
- pageIndex = 1;
- pageSize = 20;
-
- self.modelArray = [[NSMutableArray alloc] init];
-
-
- self.tableView.hidden = NO;
- [self setUpTableView];
- // Do any additional setup after loading the view.
-}
-
--(void)getFirstPageData
-{
- pageIndex=1;
- // test
- for (int i = 0; i < 10; i++)
- {
- NoticeModel * status = [[NoticeModel alloc] init];
- status.created = 1494820487026;
- status.title = @"������������������������������������������������";
- [self.modelArray addObject:status];
- }
- [self.tableView reloadData];
-
- //[self getDeviceList:@"" devicetype:@"" searchkey:@"" isTips:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) reloadData
-{
- pageIndex++;
- //[self getDeviceList:self.uid devicetype:self.type searchkey:self.key isTips:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) getDeviceList:(NSString *) userID devicetype:(NSString*)type searchkey:(NSString*)key isTips:(BOOL) isShow pageIndex:(NSString *)page pageSize:(NSString *)size
-{
- // ������������������
- MBProgressHUD *HUD = nil;
- if( isShow == YES)
- {
- HUD = [MBProgressHUD showHUDAddedTo:self animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
- }
-
-
- NSString *path = [[NSString alloc] initWithFormat:@"dsidj"];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
- // tempdebug
- [param setObject:userID forKey:@"uid"];
- [param setObject:type forKey:@"type"];
- [param setObject:key forKey:@"key"];
- [param setObject:page forKey:@"pageIndex"];
- [param setObject:size forKey:@"pageSize"];
-
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:param urlName:path success:^(id responseBody)
- {
- if( isShow == YES)
- HUD.hidden = YES;
-
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
-
- if(pageIndex == 1)
- {
- [_modelArray removeAllObjects];
- }
-
- if(resModel.code == 0)
- {
- if(![Global isEmptyObject:resModel.content])
- {
- //NSMutableArray *modelTempArray = [MyDeviceStatus mj_objectArrayWithKeyValuesArray:resModel.content];
-
- BASE_INFO_FUN(resModel.content);
-
- //[_modelArray addObjectsFromArray:modelTempArray];
-
- _tableView.hidden = NO;
- [_tableView reloadData];
-
- }
- else
- {
- // ������������
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
- [UserDefault setObject:@"0" forKey:@"isLogin"];
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
-
- }
- else
- {
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
- [_tableView reloadData];
- }
-
- _tableView.hidden = YES;
-
-
- }
- }
- failure:^(NSString *error)
- {
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- if( isShow == YES)
- HUD.hidden = YES;
-
- _tableView.hidden = YES;
-
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 0;
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return self.modelArray.count;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 60;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"hotelCell";
- NoticeCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[NoticeCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- NoticeModel * model = [self.modelArray objectAtIndex:indexPath.row];
-
- [cell setItemView:model];
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- //if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedSection:)])
- {
- //MyDeviceStatus * model = [self.modelArray objectAtIndex:indexPath.row];
- //[_delegate didSelectedSection:model];
- }
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
-
-
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/UpdateHotelAccountPage.h b/pregnancy_guard/BaseProject/Controller/Mine/UpdateHotelAccountPage.h
deleted file mode 100644
index d22717a..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/UpdateHotelAccountPage.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// AddHotelAccountPage
-//
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import <CoreLocation/CoreLocation.h>
-#import "HotelAccount.h"
-
-@interface UpdateHotelAccountPage : BaseNavPage
-
-@property (nonatomic, strong) HotelAccount * model;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/UpdateHotelAccountPage.m b/pregnancy_guard/BaseProject/Controller/Mine/UpdateHotelAccountPage.m
deleted file mode 100644
index 496c680..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/UpdateHotelAccountPage.m
+++ /dev/null
@@ -1,419 +0,0 @@
-//
-// AddHotelAccountPage
-//
-//
-// Created by WindShan on 2016/11/18.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "UpdateHotelAccountPage.h"
-#import "GloriaLabel.h"
-#import "AddDeviceReqModel.h"
-#import "NetworkSingleton.h"
-#import "HotelSelPage.h"
-#import "BaseNaviController.h"
-
-@interface UpdateHotelAccountPage ()<UITextFieldDelegate,UITableViewDelegate,UITableViewDataSource>
-{
-
- UITextField * nicknameTextField; // ������
- UITextField * mobileTextField; // ���������
- UITextField * passwdTextField; // ������
-
- UIButton * createBtn;
-
- NSString * hotel_room;
-}
-
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation UpdateHotelAccountPage
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- //_tableView.separatorColor = [UIColor clearColor];
- _tableView.backgroundColor = [UIColor clearColor];
- //_tableView.userInteractionEnabled = NO;
- //[_tableView setSeparatorInset:UIEdgeInsetsZero];
- //[_tableView setLayoutMargins:UIEdgeInsetsZero];
- _tableView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 208);
- [self.view addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-
-#pragma mark - UITableViewDelegate&UITableViewDataSource
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-//-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-//{
-// return 0;
-//}
-//
--(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
- return 80;
-}
-
-- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section // custom view for footer. will be adjusted to default or
-{
- UIView * pView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 80)];
-
- if(pView)
- {
- createBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- createBtn.frame = CGRectMake((SCREEN_WIDTH-350)/2, 20, 350, 40);
-
- [createBtn setBackgroundImage:[UIImage imageNamed:@"ic_change_device_btn_bk" ] forState:UIControlStateNormal];
- [createBtn setTitle:@"������������" forState:UIControlStateNormal];
- createBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [createBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- createBtn.layer.masksToBounds=YES;
- createBtn.layer.cornerRadius=8.0f;
- [createBtn addTarget:self action:@selector(createAction) forControlEvents:UIControlEventTouchUpInside];
- [pView addSubview:createBtn];
- }
-
-
- return pView;
-}
-
--(void)createAction
-{
- [self createHotelAccount];
-}
-
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return 3;
-}
-
-
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return 50;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"addHotelAccountCell";
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell)
- {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- //cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
-
-
- switch (indexPath.row) {
- case 0:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(nicknameTextField==nil)
- {
- nicknameTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //nicknameTextField.secureTextEntry = YES;
- nicknameTextField.placeholder = @"���������������";
- nicknameTextField.font = [UIFont fontWithName:@"Arial" size:16];
- nicknameTextField.delegate = self;
- nicknameTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- nicknameTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(nicknameTextField.frame.origin.x,nicknameTextField.frame.origin.y,10.0, nicknameTextField.frame.size.height)];
- nicknameTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:nicknameTextField];
- }
-
- //nicknameTextField.text = self.model.nickname;
- }
- break;
- case 1:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(mobileTextField==nil)
- {
- mobileTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //mobileTextField.secureTextEntry = YES;
- mobileTextField.placeholder = @"���������������������";
- mobileTextField.font = [UIFont fontWithName:@"Arial" size:16];
- mobileTextField.delegate = self;
- mobileTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- mobileTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(mobileTextField.frame.origin.x,mobileTextField.frame.origin.y,10.0, mobileTextField.frame.size.height)];
- mobileTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:mobileTextField];
- }
-
- mobileTextField.text = self.model.username;
- }
- break;
- case 2:
- {
- cell.image = [UIImage imageNamed:@"ic_device_change"];
- if(passwdTextField==nil)
- {
- passwdTextField = [[UITextField alloc] initWithFrame:CGRectMake(38, 0, SCREEN_WIDTH-60, cell.frame.size.height)];
- //passwdTextField.secureTextEntry = YES;
- passwdTextField.placeholder = @"���������������";
- passwdTextField.font = [UIFont fontWithName:@"Arial" size:16];
- passwdTextField.delegate = self;
- passwdTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- passwdTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(passwdTextField.frame.origin.x,passwdTextField.frame.origin.y,10.0, passwdTextField.frame.size.height)];
- passwdTextField.leftViewMode =UITextFieldViewModeAlways;
- [cell.contentView addSubview:passwdTextField];
- }
-
- }
- break;
- default:
- break;
- }
-
-
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-}
-
-#pragma mark - ���������������������������
-- (void)viewDidLayoutSubviews {
- if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
- [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-
- }
- if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)]) {
- [self.tableView setLayoutMargins:UIEdgeInsetsZero];
- }
-}
-
-
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat
-{
- if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
- [cell setLayoutMargins:UIEdgeInsetsZero];
- }
- if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
- [cell setSeparatorInset:UIEdgeInsetsZero];
- }
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
-
- self.title = @"������������������";
- [self setNavigationLeft:@"������" sel:@selector(backAticon)];
-
-
- [self.tableView reloadData];
-
- // Do any additional setup after loading the view.
-}
-
-#pragma mark custom action begin
--(void)backAticon
-{
- //[self.navigationController popToViewController:self animated:YES];
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-
--(void) createHotelAccount
-{
- if(mobileTextField.text.length == 0)
- {
- [Global alertMessageEx:@"������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(nicknameTextField.text.length == 0)
- {
- [Global alertMessageEx:@"���������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- // ������������������
- MBProgressHUD *HUD = nil;
- HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
-
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:UPDATE_WAITER,_model._id]];
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- //params.put("username", TextUtils.isEmpty(username)?"":username);
- //params.put("nickname", TextUtils.isEmpty(nickname)?"":nickname);
- //params.put("password", TextUtils.isEmpty(password)?"":password);
-
- [param setObject:mobileTextField.text forKey:@"username"];
- [param setObject:nicknameTextField.text forKey:@"nickname"];
- [param setObject:passwdTextField.text.length == 0?@"":passwdTextField.text forKey:@"password"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- HUD.hidden = YES;
-
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- if(resModel.code == 0)
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- [self dismissViewControllerAnimated:YES completion:nil];
- }
- else
- {
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- HUD.hidden = YES;
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
- }
-
-}
-//-(void)switchAction:(id)sender
-//{
-// UISwitch *switchBtn = (UISwitch *)sender;
-//
-// if(switchBtn.on)
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = true;
-//#endif
-// }
-// else
-// {
-//#ifdef USE_SmartLink
-// smtlk.isConfigOneDevice = false;
-//#endif
-// }
-//
-//}
-#pragma mark end
-
-
--(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
-{
- NSInteger textLength = 0;
-
- if ([string isEqualToString:@""]) {
- textLength = textField.text.length-1;
- }
- else
- {
- textLength = textField.text.length+1;
- }
-
- BOOL flag = NO;
- if( textField == mobileTextField )
- {
- // ���������������������������
- if( textLength == 11 && [StringUtil isMobile:[mobileTextField.text stringByAppendingString:string]] == NO)
- {
- [Global alertMessage:@"������������������������������������������"];
- }
-
- // ������11������������������
- if( textLength > 11 )
- return NO;
- }
-
- flag = YES;
- if (flag)
- {
- // [loginBtn setBackgroundColor:BLUECOLOR];
- // loginBtn.userInteractionEnabled = YES;
- }
- else
- {
- // loginBtn.backgroundColor = [UIColor lightGrayColor];
- // loginBtn.userInteractionEnabled = NO;
- }
-
- return flag;
-}
-
-
--(void) viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- if( _curHotel_Id != nil )
- {
- [self.tableView reloadData];
- }
-}
-
-- (void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
-}
-
-- (void)didReceiveMemoryWarning
-{
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
- if ([textField isFirstResponder])
- {
- [textField resignFirstResponder];
- }
- return YES;
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textFieldShouldReturn:mobileTextField];
- [self textFieldShouldReturn:passwdTextField];
- [self textFieldShouldReturn:nicknameTextField];
-}
-
-
-/*
-
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/pregnancy_guard/BaseProject/Model/NoticeModel.h b/pregnancy_guard/BaseProject/Model/NoticeModel.h
index 688e4f7..ee642a0 100644
--- a/pregnancy_guard/BaseProject/Model/NoticeModel.h
+++ b/pregnancy_guard/BaseProject/Model/NoticeModel.h
@@ -11,9 +11,9 @@
@interface NoticeModel : NSObject
-@property(nonatomic, strong) NSString * _id;//": "5919267a2b153bee6e5b682d",
-@property(nonatomic, strong) NSString * title;//": "������������1",
-@property(nonatomic, strong) NSString * content;//": "������������111",
-@property(nonatomic, assign) long created;//": 1494820487026
+@property(nonatomic, strong) NSString * _id;
+@property(nonatomic, strong) NSString * title;
+@property(nonatomic, strong) NSString * content;
+@property(nonatomic, strong) NSString * logoUrl;
@end
diff --git a/pregnancy_guard/BaseProject/Resources/images/common/cancel_look.png b/pregnancy_guard/BaseProject/Resources/images/common/cancel_look.png
new file mode 100755
index 0000000..50ee48d
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/common/cancel_look.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/common/img_logo.png b/pregnancy_guard/BaseProject/Resources/images/common/img_logo.png
new file mode 100755
index 0000000..ac4567f
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/common/img_logo.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/common/look_notice.png b/pregnancy_guard/BaseProject/Resources/images/common/look_notice.png
new file mode 100755
index 0000000..655edef
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/common/look_notice.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/common/notice_bg.png b/pregnancy_guard/BaseProject/Resources/images/common/notice_bg.png
new file mode 100755
index 0000000..bdb79ce
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/common/notice_bg.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/istanbul/search/icon_story@2x.png b/pregnancy_guard/BaseProject/Resources/images/istanbul/search/icon_story@2x.png
index efc4181..8c53678 100755
--- a/pregnancy_guard/BaseProject/Resources/images/istanbul/search/icon_story@2x.png
+++ b/pregnancy_guard/BaseProject/Resources/images/istanbul/search/icon_story@2x.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h
new file mode 100644
index 0000000..fbd96b8
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h
@@ -0,0 +1,32 @@
+//
+// FileDownView.h
+// GoldRich
+//
+// Created by WindShan on 2017/2/13.
+// Copyright �� 2017��� WindShan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "NoticeModel.h"
+
+
+@protocol SelectedNoticeDelegate <NSObject>
+
+@optional
+
+- (void)didSelectedNoticeSection:(NoticeModel*)model;
+
+@end
+
+
+@interface AdNoticeView : UIView
+
+@property (nonatomic, strong) NoticeModel * model;
+
+@property(nonatomic, assign)id<SelectedNoticeDelegate> delegate;
+
+
+- (instancetype)initWithFrame:(CGRect)frame dataModel:(NoticeModel*)model;
+
+-(void)setUIView;
+@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m
new file mode 100644
index 0000000..651f91a
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m
@@ -0,0 +1,181 @@
+//
+// FileDownView.m
+// GoldRich
+//
+// Created by WindShan on 2017/2/13.
+// Copyright �� 2017��� WindShan. All rights reserved.
+//
+
+#import "AdNoticeView.h"
+#import "GloriaLabel.h"
+
+@interface AdNoticeView()<SelectedNoticeDelegate>
+{
+
+}
+
+@property (nonatomic, strong) UIImageView * noticeBK;
+@property (nonatomic, strong) UIImageView * noticeLogo;
+@property (nonatomic, strong) UIButton * cancelLookBtn;
+//@property (nonatomic, strong) UIButton * lookDetailBtn;
+@property (nonatomic, strong) GloriaLabel * noticeContext;
+@property (nonatomic, strong) GloriaLabel * noticeTitle;
+
+@end
+
+
+@implementation AdNoticeView
+
+- (UIImageView *)noticeLogo
+{
+ if (!_noticeLogo)
+ {
+ _noticeLogo = [[UIImageView alloc] initWithFrame:CGRectMake((258-32)/2, 50, 32, 12)];
+ [self.noticeBK addSubview:_noticeLogo];
+ }
+
+ return _noticeLogo;
+}
+
+
+- (UIImageView *)noticeBK
+{
+ if (!_noticeBK)
+ {
+ _noticeBK = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-258)/2, (SCREEN_HEIGHT-168)/2-64, 258, 168)];
+ [self.noticeBK setUserInteractionEnabled:YES];
+ [self addSubview:_noticeBK];
+ }
+
+ return _noticeBK;
+}
+
+- (GloriaLabel *) noticeTitle
+{
+ if(!_noticeTitle)
+ {
+ _noticeTitle = [[GloriaLabel alloc] initWithFrame:CGRectMake(0,10,258, 20)];
+ _noticeTitle.font = [UIFont systemFontOfSize:16];
+ _noticeTitle.textAlignment = UITextAlignmentCenter;
+ _noticeTitle.textColor = kUIColorFromRGB(0xffffff);
+ [self.noticeBK addSubview:_noticeTitle];
+ }
+
+ return _noticeTitle;
+}
+
+- (GloriaLabel *) noticeContext
+{
+ if(!_noticeContext)
+ {
+ _noticeContext = [[GloriaLabel alloc] initWithFrame:CGRectMake(20, 80,258-40, 40)];
+ _noticeContext.font = [UIFont systemFontOfSize:14];
+ _noticeContext.textAlignment = UITextAlignmentCenter;
+ //������������������
+ _noticeContext.lineBreakMode = UILineBreakModeWordWrap;
+ _noticeContext.numberOfLines = 0;
+ _noticeContext.textColor = kUIColorFromRGB(0x414141);
+ [self.noticeBK addSubview:_noticeContext];
+ }
+
+ return _noticeContext;
+}
+
+
+-(UIButton*)cancelLookBtn
+{
+ if(!_cancelLookBtn)
+ {
+ _cancelLookBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+ _cancelLookBtn.frame = CGRectMake((258-76)/2, 130, 76, 26);
+ [_cancelLookBtn setBackgroundImage:[UIImage imageNamed:@"cancel_look" ] forState:UIControlStateNormal];
+ [_cancelLookBtn setTitle:@"��� ���" forState:UIControlStateNormal];
+ [_cancelLookBtn setTitleColor:kUIColorFromRGB(0x7d7d7d) forState:UIControlStateNormal];
+ //_deleteBtn.backgroundColor = [UIColor redColor]; //������������
+
+ _cancelLookBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
+ [_cancelLookBtn addTarget:self action:@selector(CancelClickAction) forControlEvents:UIControlEventTouchUpInside];
+ [self.noticeBK addSubview:_cancelLookBtn];
+ }
+
+ return _cancelLookBtn;
+}
+
+//-(UIButton*)lookDetailBtn
+//{
+// if(!_lookDetailBtn)
+// {
+// _lookDetailBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+// _lookDetailBtn.frame = CGRectMake(258-40-76, 168-52, 76, 26);
+// [_lookDetailBtn setBackgroundImage:[UIImage imageNamed:@"look_notice" ] forState:UIControlStateNormal];
+// [_lookDetailBtn setTitle:@"������������" forState:UIControlStateNormal];
+// [_lookDetailBtn setTitleColor:kUIColorFromRGB(0xffffff) forState:UIControlStateNormal];
+// //_deleteBtn.backgroundColor = [UIColor redColor]; //������������
+//
+// _lookDetailBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
+// [_lookDetailBtn addTarget:self action:@selector(LookClickAction) forControlEvents:UIControlEventTouchUpInside];
+//
+// [_lookDetailBtn setTintColor:RgbColor(253,137,8)];
+//
+// [self.noticeBK addSubview:_lookDetailBtn];
+// }
+//
+// return _cancelLookBtn;
+//}
+
+-(void)CancelClickAction
+{
+ [self setHidden:YES];
+// // ������������
+// if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedNoticeSection:)])
+// {
+// [_delegate didSelectedNoticeSection:self.model];
+// }
+}
+
+-(void)LookClickAction
+{
+ // ������������
+ if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedNoticeSection:)])
+ {
+ [_delegate didSelectedNoticeSection:self.model];
+ }
+}
+
+- (instancetype)initWithFrame:(CGRect)frame dataModel:(NoticeModel*)model
+{
+ if (self = [super initWithFrame:frame])
+ {
+ //������ ���������clear
+ self.backgroundColor = [UIColor clearColor];
+ self.opaque = NO;
+
+ // test
+ //for (int i = 0; i < 10; i++)
+ //{
+ // MyDeviceStatus * status = [[MyDeviceStatus alloc] init];
+ // [self.modelArray addObject:status];
+ //}
+ // ������������
+ self.model = model;
+ [self setUIView];
+ }
+
+ return self;
+}
+
+
+-(void)setUIView
+{
+ //self.backgroundColor = [UIColor clearColor];
+
+ self.noticeBK.image = [UIImage imageNamed:@"notice_bg"];
+ self.noticeLogo.image = [UIImage imageNamed:@"img_logo"];
+
+ [self.noticeContext setText:[NSString stringWithFormat:@"���������PM2.5������������\n������������������������������"]];
+ [self.noticeTitle setText:[NSString stringWithFormat:@"���������������������"]];
+ // [self.lookDetailBtn setTitle:@"������������" forState:UIControlStateNormal];
+ [self.cancelLookBtn setTitle:@"��� ���" forState:UIControlStateNormal];
+}
+
+@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/HotelAccountCell.h b/pregnancy_guard/BaseProject/Views/Cell/HotelAccountCell.h
deleted file mode 100644
index 8c7f459..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/HotelAccountCell.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// HotelAccountCell.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-#import "HotelAccount.h"
-
-@protocol updateAccountDelegate <NSObject>
-
-@optional
-
-- (void)updateAccountSection:(HotelAccount*)model;
-
-@end
-
-@interface HotelAccountCell : BaseTableViewCell
-
-@property(nonatomic, assign)id<updateAccountDelegate> delegate;
-@property(nonatomic, strong) HotelAccount* model;
-
-/** ������������*/
-- (void)setItemView:(HotelAccount *) model;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/HotelAccountCell.m b/pregnancy_guard/BaseProject/Views/Cell/HotelAccountCell.m
deleted file mode 100644
index c357ef6..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/HotelAccountCell.m
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// HotelAccountCell.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "HotelAccountCell.h"
-#import "GloriaLabel.h"
-#import "UpdateHotelAccountPage.h"
-
-@interface HotelAccountCell()
-{
- UIWebView *callWebview;
-}
-
-@property (nonatomic, strong) GloriaLabel * nicknameLabel;
-@property (nonatomic, strong) GloriaLabel * usernameLabel;
-@property (nonatomic, strong) GloriaLabel * hotelnameLabel;
-@property (nonatomic, strong) UIButton * nicknameChangeBtn;
-@property (nonatomic, strong) UIButton * telBtn;
-@property (nonatomic, strong) UIButton * deleteBtn;
-@end
-
-@implementation HotelAccountCell
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-
-- (void)layoutSubviews
-{
- [super layoutSubviews];
-
- self.nicknameLabel.frame = CGRectMake(20, 0, SCREEN_WIDTH/2, 40);
- self.usernameLabel.frame = CGRectMake(20, 40, SCREEN_WIDTH/2, 40);
- self.hotelnameLabel.frame = CGRectMake(20, 80, SCREEN_WIDTH/2, 40);
-
- self.nicknameChangeBtn.frame = CGRectMake(SCREEN_WIDTH-30-20, 5, 30, 30);
- self.telBtn.frame = CGRectMake(SCREEN_WIDTH-30-20, 45, 30, 30);
- self.deleteBtn.frame = CGRectMake(SCREEN_WIDTH-30-20, 85, 30, 30);
-}
-
--(UIButton*)telBtn
-{
- if(!_telBtn)
- {
- _telBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- _telBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_telBtn setBackgroundImage:[UIImage imageNamed:@"icon_dianhua" ] forState:UIControlStateNormal];
- [_telBtn addTarget:self action:@selector(telAction) forControlEvents:UIControlEventTouchUpInside];
- [self.contentView addSubview:_telBtn];
- }
-
- return _telBtn;
-}
-
--(void)telAction
-{
- NSMutableString *str = [[NSMutableString alloc] initWithFormat:@"tel:%@",self.usernameLabel.text];
- if(callWebview==nil)
- {
- callWebview = [[UIWebView alloc] init];
- [self addSubview:callWebview];
- }
-
- [callWebview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:str]]];
-}
-
--(UIButton*)deleteBtn
-{
- if(!_deleteBtn)
- {
- _deleteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- _deleteBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_deleteBtn setBackgroundImage:[UIImage imageNamed:@"icon_shanchu" ] forState:UIControlStateNormal];
- [_deleteBtn addTarget:self action:@selector(deleteAction) forControlEvents:UIControlEventTouchUpInside];
- [self.contentView addSubview:_deleteBtn];
- }
-
- return _deleteBtn;
-}
-
--(void)deleteAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(updateAccountSection:)])
- {
- self.model.cmd = 2;
- [_delegate updateAccountSection:self.model];
- }
-}
-
--(UIButton*)nicknameChangeBtn
-{
- if(!_nicknameChangeBtn)
- {
- _nicknameChangeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- _nicknameChangeBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_nicknameChangeBtn setBackgroundImage:[UIImage imageNamed:@"icon_bianji" ] forState:UIControlStateNormal];
- [_nicknameChangeBtn addTarget:self action:@selector(changeAction) forControlEvents:UIControlEventTouchUpInside];
- [self.contentView addSubview:_nicknameChangeBtn];
- }
-
- return _nicknameChangeBtn;
-}
-
--(void)changeAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(updateAccountSection:)])
- {
- self.model.cmd = 1;
- [_delegate updateAccountSection:self.model];
- }
-}
-
-- (GloriaLabel *) hotelnameLabel
-{
- if(!_hotelnameLabel)
- {
- _hotelnameLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
- _hotelnameLabel.font = [UIFont systemFontOfSize:16];
- _hotelnameLabel.textAlignment = UITextAlignmentLeft;
- _hotelnameLabel.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_hotelnameLabel];
- }
-
- return _hotelnameLabel;
-}
-
-- (GloriaLabel *) nicknameLabel
-{
- if(!_nicknameLabel)
- {
- _nicknameLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
- _nicknameLabel.font = [UIFont systemFontOfSize:16];
- _nicknameLabel.textAlignment = UITextAlignmentLeft;
- _nicknameLabel.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_nicknameLabel];
- }
-
- return _nicknameLabel;
-}
-
-- (GloriaLabel *) usernameLabel
-{
- if(!_usernameLabel)
- {
- _usernameLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
- _usernameLabel.font = [UIFont systemFontOfSize:16];
- _usernameLabel.textAlignment = UITextAlignmentLeft;
- _usernameLabel.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_usernameLabel];
- }
-
- return _usernameLabel;
-}
-
-- (void)setItemView:(HotelAccount*)model
-{
- self.model = model;
- //[self.hotelnameLabel setText:model.hotel_id.name];
- //[self.usernameLabel setText:model.username];
- //[self.nicknameLabel setText:model.nickname];
-}
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/HotelDeviceCell.h b/pregnancy_guard/BaseProject/Views/Cell/HotelDeviceCell.h
deleted file mode 100644
index f46eed5..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/HotelDeviceCell.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// HotelAccountCell.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-#import "DeviceSpareModel.h"
-
-@protocol updateDeviceDelegate <NSObject>
-
-@optional
-
-- (void)updateDeviceSection:(DeviceSpareModel*)model;
-
-@end
-
-@interface HotelDeviceCell : BaseTableViewCell
-
-@property(nonatomic, assign)id<updateDeviceDelegate> delegate;
-@property(nonatomic, strong) DeviceSpareModel* model;
-
-/** ������������*/
-- (void)setItemView:(DeviceSpareModel *) model;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/HotelDeviceCell.m b/pregnancy_guard/BaseProject/Views/Cell/HotelDeviceCell.m
deleted file mode 100644
index a06fa48..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/HotelDeviceCell.m
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// HotelAccountCell.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "HotelDeviceCell.h"
-#import "GloriaLabel.h"
-#import "UpdateHotelAccountPage.h"
-
-@interface HotelDeviceCell()
-{
- UIWebView *callWebview;
-}
-
-@property (nonatomic, strong) GloriaLabel * devicenameLabel;
-@property (nonatomic, strong) GloriaLabel * statusLabel;
-@property (nonatomic, strong) UIButton * nicknameChangeBtn;
-@property (nonatomic, strong) UIButton * deleteBtn;
-@property (nonatomic, strong) UIImageView * imageTag;
-@end
-
-@implementation HotelDeviceCell
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-
-- (void)layoutSubviews
-{
- [super layoutSubviews];
-
- self.devicenameLabel.frame = CGRectMake(20, 20, SCREEN_WIDTH/2, 40);
- self.statusLabel.frame = CGRectMake(20+SCREEN_WIDTH/2, 20, SCREEN_WIDTH/3, 40);
-
- self.imageTag.frame = CGRectMake(20+SCREEN_WIDTH/2-30, 28, 24, 24);
- self.nicknameChangeBtn.frame = CGRectMake(SCREEN_WIDTH-30-20, 5, 30, 30);
- self.deleteBtn.frame = CGRectMake(SCREEN_WIDTH-30-20, 45, 30, 30);
-}
-
-- (UIImageView *)imageTag
-{
- if (!_imageTag)
- {
- _imageTag = [[UIImageView alloc] initWithFrame:CGRectMake(10, 0, SCREEN_WIDTH-20, 60)];
- [self.contentView addSubview:_imageTag];
- }
-
- return _imageTag;
-}
-
--(UIButton*)deleteBtn
-{
- if(!_deleteBtn)
- {
- _deleteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- _deleteBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_deleteBtn setBackgroundImage:[UIImage imageNamed:@"icon_shanchu" ] forState:UIControlStateNormal];
- [_deleteBtn addTarget:self action:@selector(deleteAction) forControlEvents:UIControlEventTouchUpInside];
- [self.contentView addSubview:_deleteBtn];
- }
-
- return _deleteBtn;
-}
-
--(void)deleteAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(updateDeviceSection:)])
- {
- self.model.cmd = 2;
- [_delegate updateDeviceSection:self.model];
- }
-}
-
--(UIButton*)nicknameChangeBtn
-{
- if(!_nicknameChangeBtn)
- {
- _nicknameChangeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- _nicknameChangeBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_nicknameChangeBtn setBackgroundImage:[UIImage imageNamed:@"icon_bianji" ] forState:UIControlStateNormal];
- [_nicknameChangeBtn addTarget:self action:@selector(changeAction) forControlEvents:UIControlEventTouchUpInside];
- [self.contentView addSubview:_nicknameChangeBtn];
- }
-
- return _nicknameChangeBtn;
-}
-
--(void)changeAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(updateDeviceSection:)])
- {
- self.model.cmd = 1;
- [_delegate updateDeviceSection:self.model];
- }
-}
-
-- (GloriaLabel *) devicenameLabel
-{
- if(!_devicenameLabel)
- {
- _devicenameLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
- _devicenameLabel.font = [UIFont systemFontOfSize:16];
- _devicenameLabel.textAlignment = UITextAlignmentLeft;
- _devicenameLabel.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_devicenameLabel];
- }
-
- return _devicenameLabel;
-}
-
-- (GloriaLabel *) statusLabel
-{
- if(!_statusLabel)
- {
- _statusLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
- _statusLabel.font = [UIFont systemFontOfSize:16];
- _statusLabel.textAlignment = UITextAlignmentLeft;
- _statusLabel.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_statusLabel];
- }
-
- return _statusLabel;
-}
-
-- (void)setItemView:(DeviceSpareModel*)model
-{
- self.model = model;
-
- [self.devicenameLabel setText:model.name];
- self.imageTag.image = [UIImage imageNamed:model.status == 0?@"spare1":@"spare2"];
- [self.statusLabel setText:model.status == 0?@"������":@"������"];
-}
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m b/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m
index 46bc282..942b78c 100644
--- a/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m
+++ b/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m
@@ -8,7 +8,6 @@
#import "MusicPlayCell.h"
#import "GloriaLabel.h"
-#import "UpdateHotelAccountPage.h"
@interface MusicPlayCell()
{
diff --git a/pregnancy_guard/BaseProject/Views/Cell/NoticeCell.h b/pregnancy_guard/BaseProject/Views/Cell/NoticeCell.h
deleted file mode 100644
index 7916727..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/NoticeCell.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// HotelCell.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-#import "NoticeModel.h"
-
-@interface NoticeCell : BaseTableViewCell
-
-
-/** ������������*/
-- (void)setItemView:(NoticeModel*)model;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/NoticeCell.m b/pregnancy_guard/BaseProject/Views/Cell/NoticeCell.m
deleted file mode 100644
index 44b060f..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/NoticeCell.m
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// HotelCell.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "NoticeCell.h"
-#import "GloriaLabel.h"
-
-@interface NoticeCell()
-{
-
-}
-
-@property (nonatomic, strong) GloriaLabel * noticeLabel;
-@property (nonatomic, strong) GloriaLabel * timeLabel;
-@property (nonatomic, strong) UIImageView * bkImage;
-@end
-
-@implementation NoticeCell
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-
-- (void)layoutSubviews
-{
- [super layoutSubviews];
-
- self.noticeLabel.frame = CGRectMake(20, 5, SCREEN_WIDTH-40, 20);
- self.timeLabel.frame = CGRectMake(20, 25, SCREEN_WIDTH-40, 30);
- self.bkImage.frame = CGRectMake(10, 0, SCREEN_WIDTH-20, 60);
-}
-
-- (UIImageView *)bkImage
-{
- if (!_bkImage)
- {
- _bkImage = [[UIImageView alloc] initWithFrame:CGRectMake(10, 0, SCREEN_WIDTH-20, 60)];
- [self.contentView addSubview:_bkImage];
- }
-
- return _bkImage;
-}
-
-- (GloriaLabel *) timeLabel
-{
- if(!_timeLabel)
- {
- _timeLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
- _timeLabel.font = [UIFont systemFontOfSize:16];
- _timeLabel.textAlignment = UITextAlignmentLeft;
- _timeLabel.textColor = kUIColorFromRGB(0xa9a9a9);
- [self.contentView addSubview:_timeLabel];
- }
-
- return _timeLabel;
-}
-
-- (GloriaLabel *) noticeLabel
-{
- if(!_noticeLabel)
- {
- _noticeLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
- _noticeLabel.font = [UIFont systemFontOfSize:16];
- _noticeLabel.textAlignment = UITextAlignmentLeft;
- _noticeLabel.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_noticeLabel];
- }
-
- return _noticeLabel;
-}
-
-- (void)setItemView:(NoticeModel*)model
-{
- self.bkImage.image = [UIImage imageNamed:@"ic_notice_bk"];
- //self.contentView.backgroundColor = [UIColor blueColor];
- [self.noticeLabel setText:model.title];
-
- [self.timeLabel setText:[DateUtil stringFromLong:model.created]];
-}
-
-@end
diff --git a/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj b/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
index 6cd6ea4..e5d29f7 100644
--- a/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
+++ b/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
E505FBA91ECBD91600C1B672 /* file_havedown_delete_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = E505FBA61ECBD91600C1B672 /* file_havedown_delete_btn.png */; };
E505FBAA1ECBD91600C1B672 /* file_havedown_item_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E505FBA71ECBD91600C1B672 /* file_havedown_item_bk.png */; };
E505FBAB1ECBD91600C1B672 /* file_havedown_look_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = E505FBA81ECBD91600C1B672 /* file_havedown_look_btn.png */; };
- E505FBB71ECBE48500C1B672 /* DeviceListMgrPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E505FBB61ECBE48500C1B672 /* DeviceListMgrPage.m */; };
E50EA1B31E53E1060076A3BE /* RadioButton.m in Sources */ = {isa = PBXBuildFile; fileRef = E50EA1B21E53E1060076A3BE /* RadioButton.m */; };
E50EA1E51E5431E60076A3BE /* NSDate+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = E50EA1E21E5431E60076A3BE /* NSDate+Extension.m */; };
E50EA1E61E5431E60076A3BE /* UIView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = E50EA1E41E5431E60076A3BE /* UIView+Extension.m */; };
@@ -48,9 +47,6 @@
E5133A521E56AC7300C89EA5 /* ChangeNamePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5133A4F1E56AC7300C89EA5 /* ChangeNamePage.m */; };
E5133A531E56AC7300C89EA5 /* ChangePwdPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5133A511E56AC7300C89EA5 /* ChangePwdPage.m */; };
E5133A5D1E56BF5400C89EA5 /* libSmartLink7.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5133A5B1E56BF5400C89EA5 /* libSmartLink7.3.a */; };
- E5133A661E56C02000C89EA5 /* AddDevicePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5133A5F1E56C02000C89EA5 /* AddDevicePage.m */; };
- E5133A671E56C02000C89EA5 /* ChangeDeviceNamePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5133A611E56C02000C89EA5 /* ChangeDeviceNamePage.m */; };
- E5133A681E56C02000C89EA5 /* DeviceDetailsPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5133A631E56C02000C89EA5 /* DeviceDetailsPage.m */; };
E5153F3D1E5A75B500314414 /* FileStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = E5153F3C1E5A75B500314414 /* FileStatus.m */; };
E5153F4D1E5ABA9300314414 /* ControlViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5153F4C1E5ABA9300314414 /* ControlViewCell.m */; };
E5169C631DF63FD50015B6FE /* JZMerchantCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5169C621DF63FD50015B6FE /* JZMerchantCell.m */; };
@@ -138,9 +134,7 @@
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 */; };
- E51984F51F0A0E9200F59285 /* HotelSelPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E51984F41F0A0E9200F59285 /* HotelSelPage.m */; };
E51984FB1F0A422A00F59285 /* ChangeDeviceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E51984FA1F0A422A00F59285 /* ChangeDeviceCell.m */; };
- E51984FE1F0A427900F59285 /* ChangeDeviceLWPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E51984FD1F0A427900F59285 /* ChangeDeviceLWPage.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 */; };
@@ -243,7 +237,6 @@
E51D6DF01EC545450005B0E8 /* ICSettingArrowItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D6DE61EC545450005B0E8 /* ICSettingArrowItem.m */; };
E51D6DF11EC545450005B0E8 /* ICSettingNoneItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D6DE81EC545450005B0E8 /* ICSettingNoneItem.m */; };
E51D6DF21EC545450005B0E8 /* ICSettingSwitchItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D6DEA1EC545450005B0E8 /* ICSettingSwitchItem.m */; };
- E51D73211F00A36100E2476E /* DeviceSelPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D73201F00A36100E2476E /* DeviceSelPage.m */; };
E51D73241F00A91200E2476E /* IdleDeviceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D73231F00A91200E2476E /* IdleDeviceCell.m */; };
E51D73271F00AA8500E2476E /* DeviceSpareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D73261F00AA8500E2476E /* DeviceSpareModel.m */; };
E51D732A1F00ADE800E2476E /* spare1.png in Resources */ = {isa = PBXBuildFile; fileRef = E51D73281F00ADE800E2476E /* spare1.png */; };
@@ -275,7 +268,6 @@
E51F642D1EEF8CFF0066F95F /* HBdansLable.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64281EEF8CFF0066F95F /* HBdansLable.m */; };
E51F642E1EEF8CFF0066F95F /* HBdansView.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F642A1EEF8CFF0066F95F /* HBdansView.m */; };
E51F642F1EEF8CFF0066F95F /* UIView+WHB.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F642C1EEF8CFF0066F95F /* UIView+WHB.m */; };
- E51F64321EEFB09A0066F95F /* UserSignPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64311EEFB09A0066F95F /* UserSignPage.m */; };
E51F643F1EEFB1E40066F95F /* BaiduMapAPI_Base.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E51F64341EEFB1E40066F95F /* BaiduMapAPI_Base.framework */; };
E51F64401EEFB1E40066F95F /* BaiduMapAPI_Cloud.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E51F64351EEFB1E40066F95F /* BaiduMapAPI_Cloud.framework */; };
E51F64411EEFB1E40066F95F /* BaiduMapAPI_Location.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E51F64361EEFB1E40066F95F /* BaiduMapAPI_Location.framework */; };
@@ -409,6 +401,12 @@
E532F66F1E70D8F000B43476 /* ReconnectControl.m in Sources */ = {isa = PBXBuildFile; fileRef = E532F6691E70D8F000B43476 /* ReconnectControl.m */; };
E532F6701E70D8F000B43476 /* Socket.m in Sources */ = {isa = PBXBuildFile; fileRef = E532F66B1E70D8F000B43476 /* Socket.m */; };
E532F6751E70E78F00B43476 /* NSString+HexToBytes.m in Sources */ = {isa = PBXBuildFile; fileRef = E532F6741E70E78F00B43476 /* NSString+HexToBytes.m */; };
+ E5371FB7206C884300E2DCEE /* cancel_look.png in Resources */ = {isa = PBXBuildFile; fileRef = E5371FB3206C884200E2DCEE /* cancel_look.png */; };
+ E5371FB8206C884300E2DCEE /* notice_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = E5371FB4206C884300E2DCEE /* notice_bg.png */; };
+ E5371FB9206C884300E2DCEE /* img_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = E5371FB5206C884300E2DCEE /* img_logo.png */; };
+ E5371FBA206C884300E2DCEE /* look_notice.png in Resources */ = {isa = PBXBuildFile; fileRef = E5371FB6206C884300E2DCEE /* look_notice.png */; };
+ E5371FBD206C8AC500E2DCEE /* AdNoticeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FBB206C8AC500E2DCEE /* AdNoticeView.m */; };
+ E5371FC3206CDA0E00E2DCEE /* SearchDevicePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FC2206CDA0E00E2DCEE /* SearchDevicePage.m */; };
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 */; };
@@ -428,7 +426,6 @@
E542E5571F14609100D35387 /* icon_police.png in Resources */ = {isa = PBXBuildFile; fileRef = E542E5511F14609100D35387 /* icon_police.png */; };
E542E5581F14609100D35387 /* icon_refresh.png in Resources */ = {isa = PBXBuildFile; fileRef = E542E5521F14609100D35387 /* icon_refresh.png */; };
E542E5691F1460D100D35387 /* ic_item_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E542E5681F1460D100D35387 /* ic_item_bk.png */; };
- E542E56C1F14711400D35387 /* SearchDevicePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E542E56B1F14711400D35387 /* SearchDevicePage.m */; };
E542E57B1F1473F100D35387 /* gif_searching.gif in Resources */ = {isa = PBXBuildFile; fileRef = E542E56E1F1473F100D35387 /* gif_searching.gif */; };
E542E57C1F1473F100D35387 /* ic_back_arraw@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E542E56F1F1473F100D35387 /* ic_back_arraw@2x.png */; };
E542E57D1F1473F100D35387 /* ic_line.png in Resources */ = {isa = PBXBuildFile; fileRef = E542E5701F1473F100D35387 /* ic_line.png */; };
@@ -750,11 +747,6 @@
E56217F31EF0BD95008CE3D2 /* ad_scroll_up_down_bk1.png in Resources */ = {isa = PBXBuildFile; fileRef = E56217E81EF0BD95008CE3D2 /* ad_scroll_up_down_bk1.png */; };
E56217F41EF0BD95008CE3D2 /* ad_scroll_up_down_bk2.png in Resources */ = {isa = PBXBuildFile; fileRef = E56217E91EF0BD95008CE3D2 /* ad_scroll_up_down_bk2.png */; };
E56217F71EF0BED6008CE3D2 /* AdvertisePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E56217F61EF0BED6008CE3D2 /* AdvertisePage.m */; };
- E5676B511F0338E800B19E0F /* UpdateHotelAccountPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5676B501F0338E800B19E0F /* UpdateHotelAccountPage.m */; };
- E5676B541F03393400B19E0F /* AddHotelDevicePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5676B531F03393400B19E0F /* AddHotelDevicePage.m */; };
- E5676B571F03395800B19E0F /* AddHotelAccountPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5676B561F03395800B19E0F /* AddHotelAccountPage.m */; };
- E5676B5A1F03434F00B19E0F /* HotelDeviceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5676B591F03434F00B19E0F /* HotelDeviceCell.m */; };
- E5676B5D1F0347AA00B19E0F /* HotelDevicePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5676B5C1F0347AA00B19E0F /* HotelDevicePage.m */; };
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 */; };
@@ -762,18 +754,13 @@
E5761E581EF36CF70037A976 /* RoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5761E571EF36CF70037A976 /* RoomCell.m */; };
E5761E5B1EF36DA30037A976 /* RoomSelPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5761E5A1EF36DA30037A976 /* RoomSelPage.m */; };
E5761E5D1EF36E960037A976 /* ic_notice_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E5761E5C1EF36E960037A976 /* ic_notice_bk.png */; };
- E5761E601EF36EC50037A976 /* NoticeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5761E5F1EF36EC50037A976 /* NoticeCell.m */; };
- E5761E631EF3701F0037A976 /* NoticePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5761E621EF3701F0037A976 /* NoticePage.m */; };
- E582726D1EF20E4500878643 /* ChangeDevicePage.m in Sources */ = {isa = PBXBuildFile; fileRef = E582726C1EF20E4500878643 /* ChangeDevicePage.m */; };
E582726F1EF212A000878643 /* ic_device_change.png in Resources */ = {isa = PBXBuildFile; fileRef = E582726E1EF212A000878643 /* ic_device_change.png */; };
E58272711EF2217200878643 /* ic_change_device_btn_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E58272701EF2217200878643 /* ic_change_device_btn_bk.png */; };
E5914F08206B469A009AB768 /* NavigationBar128@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5914F07206B4699009AB768 /* NavigationBar128@2x.png */; };
E5AB0DEE1EFA390800169298 /* HotelSelModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E5AB0DED1EFA390800169298 /* HotelSelModel.m */; };
- E5CFD3661F02382300737872 /* HotelAccountCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5CFD3651F02382300737872 /* HotelAccountCell.m */; };
E5CFD36A1F02481200737872 /* icon_bianji@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5CFD3671F02481200737872 /* icon_bianji@2x.png */; };
E5CFD36B1F02481200737872 /* icon_dianhua@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5CFD3681F02481200737872 /* icon_dianhua@2x.png */; };
E5CFD36C1F02481200737872 /* icon_shanchu@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5CFD3691F02481200737872 /* icon_shanchu@2x.png */; };
- E5CFD36F1F024A8500737872 /* HotelAccounPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5CFD36E1F024A8500737872 /* HotelAccounPage.m */; };
E5E06F251EF9113000012A6D /* MCDownloadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E5E06F241EF9113000012A6D /* MCDownloadManager.m */; };
E5E06F281EF911FA00012A6D /* QKYDelayButton.m in Sources */ = {isa = PBXBuildFile; fileRef = E5E06F271EF911FA00012A6D /* QKYDelayButton.m */; };
E5E06F341EF9177900012A6D /* MCURLRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E5E06F2B1EF9177900012A6D /* MCURLRequest.m */; };
@@ -792,8 +779,6 @@
E505FBA61ECBD91600C1B672 /* file_havedown_delete_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = file_havedown_delete_btn.png; sourceTree = "<group>"; };
E505FBA71ECBD91600C1B672 /* file_havedown_item_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = file_havedown_item_bk.png; sourceTree = "<group>"; };
E505FBA81ECBD91600C1B672 /* file_havedown_look_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = file_havedown_look_btn.png; sourceTree = "<group>"; };
- E505FBB51ECBE48500C1B672 /* DeviceListMgrPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceListMgrPage.h; sourceTree = "<group>"; };
- E505FBB61ECBE48500C1B672 /* DeviceListMgrPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DeviceListMgrPage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
E50EA1B11E53E1060076A3BE /* RadioButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RadioButton.h; sourceTree = "<group>"; };
E50EA1B21E53E1060076A3BE /* RadioButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RadioButton.m; sourceTree = "<group>"; };
E50EA1E11E5431E60076A3BE /* NSDate+Extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDate+Extension.h"; path = "BaseProject/Views/UIExpand/NSDate+Extension.h"; sourceTree = SOURCE_ROOT; };
@@ -859,12 +844,6 @@
E5133A5A1E56BF5400C89EA5 /* HFSmartLinkDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HFSmartLinkDeviceInfo.h; sourceTree = "<group>"; };
E5133A5B1E56BF5400C89EA5 /* libSmartLink7.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSmartLink7.3.a; sourceTree = "<group>"; };
E5133A5C1E56BF5400C89EA5 /* smartlinklib_7x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smartlinklib_7x.h; sourceTree = "<group>"; };
- E5133A5E1E56C02000C89EA5 /* AddDevicePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddDevicePage.h; sourceTree = "<group>"; };
- E5133A5F1E56C02000C89EA5 /* AddDevicePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AddDevicePage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
- E5133A601E56C02000C89EA5 /* ChangeDeviceNamePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeDeviceNamePage.h; sourceTree = "<group>"; };
- E5133A611E56C02000C89EA5 /* ChangeDeviceNamePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ChangeDeviceNamePage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
- E5133A621E56C02000C89EA5 /* DeviceDetailsPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceDetailsPage.h; sourceTree = "<group>"; };
- E5133A631E56C02000C89EA5 /* DeviceDetailsPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DeviceDetailsPage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
E5153F3B1E5A75B500314414 /* FileStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStatus.h; sourceTree = "<group>"; };
E5153F3C1E5A75B500314414 /* FileStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileStatus.m; sourceTree = "<group>"; };
E5153F4B1E5ABA9300314414 /* ControlViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ControlViewCell.h; sourceTree = "<group>"; };
@@ -1003,12 +982,8 @@
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>"; };
- E51984F31F0A0E9200F59285 /* HotelSelPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelSelPage.h; sourceTree = "<group>"; };
- E51984F41F0A0E9200F59285 /* HotelSelPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelSelPage.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>"; };
- E51984FC1F0A427900F59285 /* ChangeDeviceLWPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeDeviceLWPage.h; sourceTree = "<group>"; };
- E51984FD1F0A427900F59285 /* ChangeDeviceLWPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ChangeDeviceLWPage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
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; };
@@ -1211,8 +1186,6 @@
E51D6DE81EC545450005B0E8 /* ICSettingNoneItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICSettingNoneItem.m; sourceTree = "<group>"; };
E51D6DE91EC545450005B0E8 /* ICSettingSwitchItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICSettingSwitchItem.h; sourceTree = "<group>"; };
E51D6DEA1EC545450005B0E8 /* ICSettingSwitchItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICSettingSwitchItem.m; sourceTree = "<group>"; };
- E51D731F1F00A36100E2476E /* DeviceSelPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceSelPage.h; sourceTree = "<group>"; };
- E51D73201F00A36100E2476E /* DeviceSelPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DeviceSelPage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
E51D73221F00A91200E2476E /* IdleDeviceCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdleDeviceCell.h; sourceTree = "<group>"; };
E51D73231F00A91200E2476E /* IdleDeviceCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdleDeviceCell.m; sourceTree = "<group>"; };
E51D73251F00AA8500E2476E /* DeviceSpareModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceSpareModel.h; sourceTree = "<group>"; };
@@ -1258,8 +1231,6 @@
E51F642A1EEF8CFF0066F95F /* HBdansView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBdansView.m; sourceTree = "<group>"; };
E51F642B1EEF8CFF0066F95F /* UIView+WHB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+WHB.h"; sourceTree = "<group>"; };
E51F642C1EEF8CFF0066F95F /* UIView+WHB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+WHB.m"; sourceTree = "<group>"; };
- E51F64301EEFB09A0066F95F /* UserSignPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserSignPage.h; sourceTree = "<group>"; };
- E51F64311EEFB09A0066F95F /* UserSignPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserSignPage.m; sourceTree = "<group>"; };
E51F64341EEFB1E40066F95F /* BaiduMapAPI_Base.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BaiduMapAPI_Base.framework; sourceTree = "<group>"; };
E51F64351EEFB1E40066F95F /* BaiduMapAPI_Cloud.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BaiduMapAPI_Cloud.framework; sourceTree = "<group>"; };
E51F64361EEFB1E40066F95F /* BaiduMapAPI_Location.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BaiduMapAPI_Location.framework; sourceTree = "<group>"; };
@@ -1468,6 +1439,14 @@
E532F66B1E70D8F000B43476 /* Socket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Socket.m; sourceTree = "<group>"; };
E532F6731E70E78F00B43476 /* NSString+HexToBytes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+HexToBytes.h"; sourceTree = "<group>"; };
E532F6741E70E78F00B43476 /* NSString+HexToBytes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+HexToBytes.m"; sourceTree = "<group>"; };
+ E5371FB3206C884200E2DCEE /* cancel_look.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cancel_look.png; sourceTree = "<group>"; };
+ E5371FB4206C884300E2DCEE /* notice_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = notice_bg.png; sourceTree = "<group>"; };
+ E5371FB5206C884300E2DCEE /* img_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = img_logo.png; sourceTree = "<group>"; };
+ E5371FB6206C884300E2DCEE /* look_notice.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = look_notice.png; sourceTree = "<group>"; };
+ E5371FBB206C8AC500E2DCEE /* AdNoticeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdNoticeView.m; sourceTree = "<group>"; };
+ E5371FBC206C8AC500E2DCEE /* AdNoticeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdNoticeView.h; sourceTree = "<group>"; };
+ E5371FC1206CDA0E00E2DCEE /* SearchDevicePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchDevicePage.h; sourceTree = "<group>"; };
+ E5371FC2206CDA0E00E2DCEE /* SearchDevicePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchDevicePage.m; 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>"; };
@@ -1490,8 +1469,6 @@
E542E5511F14609100D35387 /* icon_police.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_police.png; sourceTree = "<group>"; };
E542E5521F14609100D35387 /* icon_refresh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_refresh.png; sourceTree = "<group>"; };
E542E5681F1460D100D35387 /* ic_item_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_item_bk.png; sourceTree = "<group>"; };
- E542E56A1F14711400D35387 /* SearchDevicePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchDevicePage.h; sourceTree = "<group>"; };
- E542E56B1F14711400D35387 /* SearchDevicePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchDevicePage.m; sourceTree = "<group>"; };
E542E56E1F1473F100D35387 /* gif_searching.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = gif_searching.gif; sourceTree = "<group>"; };
E542E56F1F1473F100D35387 /* ic_back_arraw@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_back_arraw@2x.png"; sourceTree = "<group>"; };
E542E5701F1473F100D35387 /* ic_line.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_line.png; sourceTree = "<group>"; };
@@ -2094,16 +2071,6 @@
E56217E91EF0BD95008CE3D2 /* ad_scroll_up_down_bk2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ad_scroll_up_down_bk2.png; sourceTree = "<group>"; };
E56217F51EF0BED6008CE3D2 /* AdvertisePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvertisePage.h; sourceTree = "<group>"; };
E56217F61EF0BED6008CE3D2 /* AdvertisePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AdvertisePage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
- E5676B4F1F0338E800B19E0F /* UpdateHotelAccountPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateHotelAccountPage.h; sourceTree = "<group>"; };
- E5676B501F0338E800B19E0F /* UpdateHotelAccountPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpdateHotelAccountPage.m; sourceTree = "<group>"; };
- E5676B521F03393400B19E0F /* AddHotelDevicePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddHotelDevicePage.h; sourceTree = "<group>"; };
- E5676B531F03393400B19E0F /* AddHotelDevicePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AddHotelDevicePage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
- E5676B551F03395800B19E0F /* AddHotelAccountPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddHotelAccountPage.h; sourceTree = "<group>"; };
- E5676B561F03395800B19E0F /* AddHotelAccountPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AddHotelAccountPage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
- E5676B581F03434F00B19E0F /* HotelDeviceCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelDeviceCell.h; sourceTree = "<group>"; };
- E5676B591F03434F00B19E0F /* HotelDeviceCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelDeviceCell.m; sourceTree = "<group>"; };
- E5676B5B1F0347AA00B19E0F /* HotelDevicePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelDevicePage.h; sourceTree = "<group>"; };
- E5676B5C1F0347AA00B19E0F /* HotelDevicePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelDevicePage.m; sourceTree = "<group>"; };
E569B4481E6E5FB6008D9FB8 /* AddDeviceReqModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddDeviceReqModel.h; sourceTree = "<group>"; };
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>"; };
@@ -2115,24 +2082,14 @@
E5761E591EF36DA30037A976 /* RoomSelPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomSelPage.h; sourceTree = "<group>"; };
E5761E5A1EF36DA30037A976 /* RoomSelPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomSelPage.m; sourceTree = "<group>"; };
E5761E5C1EF36E960037A976 /* ic_notice_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_notice_bk.png; sourceTree = "<group>"; };
- E5761E5E1EF36EC50037A976 /* NoticeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoticeCell.h; sourceTree = "<group>"; };
- E5761E5F1EF36EC50037A976 /* NoticeCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoticeCell.m; sourceTree = "<group>"; };
- E5761E611EF3701F0037A976 /* NoticePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoticePage.h; sourceTree = "<group>"; };
- E5761E621EF3701F0037A976 /* NoticePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoticePage.m; sourceTree = "<group>"; };
- E582726B1EF20E4500878643 /* ChangeDevicePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeDevicePage.h; sourceTree = "<group>"; };
- E582726C1EF20E4500878643 /* ChangeDevicePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ChangeDevicePage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
E582726E1EF212A000878643 /* ic_device_change.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_device_change.png; sourceTree = "<group>"; };
E58272701EF2217200878643 /* ic_change_device_btn_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_change_device_btn_bk.png; sourceTree = "<group>"; };
E5914F07206B4699009AB768 /* NavigationBar128@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "NavigationBar128@2x.png"; sourceTree = "<group>"; };
E5AB0DEC1EFA390800169298 /* HotelSelModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelSelModel.h; sourceTree = "<group>"; };
E5AB0DED1EFA390800169298 /* HotelSelModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelSelModel.m; sourceTree = "<group>"; };
- E5CFD3641F02382300737872 /* HotelAccountCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelAccountCell.h; sourceTree = "<group>"; };
- E5CFD3651F02382300737872 /* HotelAccountCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelAccountCell.m; sourceTree = "<group>"; };
E5CFD3671F02481200737872 /* icon_bianji@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_bianji@2x.png"; sourceTree = "<group>"; };
E5CFD3681F02481200737872 /* icon_dianhua@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_dianhua@2x.png"; sourceTree = "<group>"; };
E5CFD3691F02481200737872 /* icon_shanchu@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_shanchu@2x.png"; sourceTree = "<group>"; };
- E5CFD36D1F024A8500737872 /* HotelAccounPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelAccounPage.h; sourceTree = "<group>"; };
- E5CFD36E1F024A8500737872 /* HotelAccounPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelAccounPage.m; sourceTree = "<group>"; };
E5E06F221EF9113000012A6D /* MCDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCDefine.h; sourceTree = "<group>"; };
E5E06F231EF9113000012A6D /* MCDownloadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCDownloadManager.h; sourceTree = "<group>"; };
E5E06F241EF9113000012A6D /* MCDownloadManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MCDownloadManager.m; sourceTree = "<group>"; };
@@ -2769,22 +2726,16 @@
E51CFF271DF505CE006A0462 /* Home */ = {
isa = PBXGroup;
children = (
+ E5371FC1206CDA0E00E2DCEE /* SearchDevicePage.h */,
+ E5371FC2206CDA0E00E2DCEE /* SearchDevicePage.m */,
E55F8DFA1F2C283D009779B9 /* RadiaDetectionPage.h */,
E55F8DFB1F2C283D009779B9 /* RadiaDetectionPage.m */,
E52F9BC81E51493300A5F789 /* MinePage.h */,
E52F9BC91E51493300A5F789 /* MinePage.m */,
E52F9BD81E514BEC00A5F789 /* HomePage.h */,
E52F9BD91E514BEC00A5F789 /* HomePage.m */,
- E505FBB51ECBE48500C1B672 /* DeviceListMgrPage.h */,
- E505FBB61ECBE48500C1B672 /* DeviceListMgrPage.m */,
- E51F64301EEFB09A0066F95F /* UserSignPage.h */,
- E51F64311EEFB09A0066F95F /* UserSignPage.m */,
E56217F51EF0BED6008CE3D2 /* AdvertisePage.h */,
E56217F61EF0BED6008CE3D2 /* AdvertisePage.m */,
- E582726B1EF20E4500878643 /* ChangeDevicePage.h */,
- E582726C1EF20E4500878643 /* ChangeDevicePage.m */,
- E542E56A1F14711400D35387 /* SearchDevicePage.h */,
- E542E56B1F14711400D35387 /* SearchDevicePage.m */,
);
path = Home;
sourceTree = "<group>";
@@ -2805,34 +2756,12 @@
E51CFF291DF505CE006A0462 /* Mine */ = {
isa = PBXGroup;
children = (
- E5676B5B1F0347AA00B19E0F /* HotelDevicePage.h */,
- E5676B5C1F0347AA00B19E0F /* HotelDevicePage.m */,
- E5676B551F03395800B19E0F /* AddHotelAccountPage.h */,
- E5676B561F03395800B19E0F /* AddHotelAccountPage.m */,
- E5676B521F03393400B19E0F /* AddHotelDevicePage.h */,
- E5676B531F03393400B19E0F /* AddHotelDevicePage.m */,
- E5676B4F1F0338E800B19E0F /* UpdateHotelAccountPage.h */,
- E5676B501F0338E800B19E0F /* UpdateHotelAccountPage.m */,
- E5CFD36D1F024A8500737872 /* HotelAccounPage.h */,
- E5CFD36E1F024A8500737872 /* HotelAccounPage.m */,
E51D3C011F021FAB00059FFE /* FeedBackPage.h */,
E51D3C021F021FAB00059FFE /* FeedBackPage.m */,
- E51D731F1F00A36100E2476E /* DeviceSelPage.h */,
- E51D73201F00A36100E2476E /* DeviceSelPage.m */,
- E5761E611EF3701F0037A976 /* NoticePage.h */,
- E5761E621EF3701F0037A976 /* NoticePage.m */,
- E51984FC1F0A427900F59285 /* ChangeDeviceLWPage.h */,
- E51984FD1F0A427900F59285 /* ChangeDeviceLWPage.m */,
E5761E591EF36DA30037A976 /* RoomSelPage.h */,
E5761E5A1EF36DA30037A976 /* RoomSelPage.m */,
E52F83851EC9306C0069F64E /* FileListPage.h */,
E52F83861EC9306C0069F64E /* FileListPage.m */,
- E5133A5E1E56C02000C89EA5 /* AddDevicePage.h */,
- E5133A5F1E56C02000C89EA5 /* AddDevicePage.m */,
- E5133A601E56C02000C89EA5 /* ChangeDeviceNamePage.h */,
- E5133A611E56C02000C89EA5 /* ChangeDeviceNamePage.m */,
- E5133A621E56C02000C89EA5 /* DeviceDetailsPage.h */,
- E5133A631E56C02000C89EA5 /* DeviceDetailsPage.m */,
E5133A4E1E56AC7300C89EA5 /* ChangeNamePage.h */,
E5133A4F1E56AC7300C89EA5 /* ChangeNamePage.m */,
E5133A501E56AC7300C89EA5 /* ChangePwdPage.h */,
@@ -2841,8 +2770,6 @@
E5133A4C1E56ABCD00C89EA5 /* SettingPage.m */,
E548756B1E5D1AFA009D5EEF /* PhotosPage.h */,
E548756C1E5D1AFA009D5EEF /* PhotosPage.m */,
- E51984F31F0A0E9200F59285 /* HotelSelPage.h */,
- E51984F41F0A0E9200F59285 /* HotelSelPage.m */,
E542E5881F1482C100D35387 /* HistoryRecordPage.h */,
E542E5891F1482C100D35387 /* HistoryRecordPage.m */,
E53196EC1F15B3E50020972E /* MusicSetPage.h */,
@@ -3060,6 +2987,8 @@
E51CFF6C1DF505CE006A0462 /* Cell */ = {
isa = PBXGroup;
children = (
+ E5371FBC206C8AC500E2DCEE /* AdNoticeView.h */,
+ E5371FBB206C8AC500E2DCEE /* AdNoticeView.m */,
E55F8DF71F2C19B9009779B9 /* SearchTipsCell.h */,
E55F8DF81F2C19B9009779B9 /* SearchTipsCell.m */,
E531002E1F1D994A00625049 /* DevicesTableViewCell.h */,
@@ -3070,14 +2999,8 @@
E53196DF1F15A6380020972E /* SearchDeviceCell.m */,
E51984F91F0A422A00F59285 /* ChangeDeviceCell.h */,
E51984FA1F0A422A00F59285 /* ChangeDeviceCell.m */,
- E5676B581F03434F00B19E0F /* HotelDeviceCell.h */,
- E5676B591F03434F00B19E0F /* HotelDeviceCell.m */,
- E5CFD3641F02382300737872 /* HotelAccountCell.h */,
- E5CFD3651F02382300737872 /* HotelAccountCell.m */,
E51D73221F00A91200E2476E /* IdleDeviceCell.h */,
E51D73231F00A91200E2476E /* IdleDeviceCell.m */,
- E5761E5E1EF36EC50037A976 /* NoticeCell.h */,
- E5761E5F1EF36EC50037A976 /* NoticeCell.m */,
E52E1CD41EEE5FC2000520FB /* MyDeviceStatusView.h */,
E52E1CD51EEE5FC2000520FB /* MyDeviceStatusView.m */,
E52E1CD11EEE5F35000520FB /* MyDeviceStatusCell.h */,
@@ -3506,6 +3429,10 @@
E52F9BE71E51569900A5F789 /* common */ = {
isa = PBXGroup;
children = (
+ E5371FB3206C884200E2DCEE /* cancel_look.png */,
+ E5371FB5206C884300E2DCEE /* img_logo.png */,
+ E5371FB6206C884300E2DCEE /* look_notice.png */,
+ E5371FB4206C884300E2DCEE /* notice_bg.png */,
E569B44B1E6E9F63008D9FB8 /* page_icon_empty@2x.png */,
E54875701E5D2927009D5EEF /* photo_delete@2x.png */,
E548756E1E5D2704009D5EEF /* AlbumAddBtn@2x.png */,
@@ -4925,12 +4852,14 @@
E51F63FF1EEF6EC30066F95F /* ic_laba_scroll_bk.png in Resources */,
E53196DD1F15A58C0020972E /* icon_lanya_tag.png in Resources */,
E542E5841F1473F200D35387 /* icon-three.png in Resources */,
+ E5371FB7206C884300E2DCEE /* cancel_look.png in Resources */,
E55D457A1EC3EF5500A93E8D /* edit_name_tag.png in Resources */,
E53B943D1F258CDE00800478 /* icon_arraw_right@2x.png in Resources */,
E517F3B71DF5A9DE00C08331 /* dropdown_loading_01@2x.png in Resources */,
E542E5551F14609100D35387 /* icon_data.png in Resources */,
E542E5941F14841100D35387 /* ic_bottom_bg@2x.png in Resources */,
E51F646A1EEFC0E60066F95F /* sign_daka_bk.png in Resources */,
+ E5371FB8206C884300E2DCEE /* notice_bg.png in Resources */,
E542E54A1F1457B300D35387 /* ic_set_unsel@2x.png in Resources */,
E51F646B1EEFC0E60066F95F /* sign_edit_bk.png in Resources */,
E51F646F1EEFC0E60066F95F /* sign_no_btn_bk.png in Resources */,
@@ -4976,11 +4905,13 @@
E51F63FD1EEF6EC30066F95F /* ic_devicename_tag@2x.png in Resources */,
E569B44C1E6E9F63008D9FB8 /* page_icon_empty@2x.png in Resources */,
E53196E61F15AE7A0020972E /* icon_play.png in Resources */,
+ E5371FBA206C884300E2DCEE /* look_notice.png in Resources */,
E51F63FC1EEF6EC30066F95F /* ic_close_gg_tag@2x.png in Resources */,
E53081F81F1C415C001555FE /* ic_head_bg.png in Resources */,
E517F3B91DF5A9DF00C08331 /* dropdown_loading_03@2x.png in Resources */,
E5566FF81F09CB48001B34C5 /* LICENSE in Resources */,
E51C7E8E1EFA04E3009B4F70 /* PDF Document.pdf in Resources */,
+ E5371FB9206C884300E2DCEE /* img_logo.png in Resources */,
E55D45771EC3EF5500A93E8D /* edit_tel_no_tag.png in Resources */,
E55D45751EC3EF5500A93E8D /* edit_new_pwd_tag.png in Resources */,
E51D6DEC1EC545450005B0E8 /* App_rightArrow@3x.png in Resources */,
@@ -5018,7 +4949,6 @@
E5566FF61F09CB48001B34C5 /* UIAlertView+LBXAlertAction.m in Sources */,
E55670271F09CB48001B34C5 /* ZXParsedResult.m in Sources */,
E55670B21F09CB48001B34C5 /* ZXModulusGF.m in Sources */,
- E5133A681E56C02000C89EA5 /* DeviceDetailsPage.m in Sources */,
E55670C91F09CB48001B34C5 /* ZXPDF417ResultMetadata.m in Sources */,
E55F8DFC1F2C283D009779B9 /* RadiaDetectionPage.m in Sources */,
E55670881F09CB48001B34C5 /* ZXRSSExpandedDecodedChar.m in Sources */,
@@ -5036,7 +4966,6 @@
E51212D11E52968A00AABF1E /* PopoverAction.m in Sources */,
E556708C1F09CB48001B34C5 /* ZXRSSExpandedFieldParser.m in Sources */,
E52D8C501DF790A8007D8714 /* MJWebViewViewController.m in Sources */,
- E5761E631EF3701F0037A976 /* NoticePage.m in Sources */,
E55670971F09CB48001B34C5 /* ZXRSSUtils.m in Sources */,
E539CB991F39585000D55670 /* UploadModel.m in Sources */,
E51212FC1E52A00900AABF1E /* JHWaveChart.m in Sources */,
@@ -5058,7 +4987,6 @@
E55670461F09CB48001B34C5 /* ZXBitMatrix.m in Sources */,
E55670421F09CB48001B34C5 /* ZXGenericGFPoly.m in Sources */,
E510078E1E554B76008A01CE /* ASValueTrackingSlider.m in Sources */,
- E51D73211F00A36100E2476E /* DeviceSelPage.m in Sources */,
E55670301F09CB48001B34C5 /* ZXTelResultParser.m in Sources */,
E51CFFE71DF56334006A0462 /* AFHTTPSessionManager.m in Sources */,
E55670AA1F09CB48001B34C5 /* ZXUPCAReader.m in Sources */,
@@ -5085,7 +5013,6 @@
E55670051F09CB48001B34C5 /* ZXingWrapper.m in Sources */,
E556706A1F09CB48001B34C5 /* ZXDataMatrixDefaultPlacement.m in Sources */,
E531001D1F1D8E8900625049 /* TemperatureModel.m in Sources */,
- E5133A661E56C02000C89EA5 /* AddDevicePage.m in Sources */,
E517F3DA1DF5B01300C08331 /* MJPropertyType.m in Sources */,
E55670161F09CB48001B34C5 /* ZXAztecWriter.m in Sources */,
E53B94411F25C94000800478 /* CSAudioManager.m in Sources */,
@@ -5129,7 +5056,6 @@
E51212D31E52968A00AABF1E /* PopoverViewCell.m in Sources */,
E54875611E5D1A47009D5EEF /* TZPhotoPreviewController.m in Sources */,
E51CFF7D1DF505CE006A0462 /* BaseWebPage.m in Sources */,
- E582726D1EF20E4500878643 /* ChangeDevicePage.m in Sources */,
E55670CB1F09CB48001B34C5 /* ZXQRCodeBitMatrixParser.m in Sources */,
E556708E1F09CB48001B34C5 /* ZXBitArrayBuilder.m in Sources */,
E55670A21F09CB48001B34C5 /* ZXEAN8Writer.m in Sources */,
@@ -5150,7 +5076,6 @@
E52F58881E5C0E630084B3E2 /* MBProgressHUD+MP.m in Sources */,
E5761E581EF36CF70037A976 /* RoomCell.m in Sources */,
E55670261F09CB48001B34C5 /* ZXISBNResultParser.m in Sources */,
- E51984FE1F0A427900F59285 /* ChangeDeviceLWPage.m in Sources */,
E5566FF71F09CB48001B34C5 /* LBXAlertAction.m in Sources */,
E556702D1F09CB48001B34C5 /* ZXSMSTOMMSTOResultParser.m in Sources */,
E51CFF7F1DF505CE006A0462 /* BaseInfo.m in Sources */,
@@ -5180,7 +5105,6 @@
E556703E1F09CB48001B34C5 /* ZXMathUtils.m in Sources */,
E55670861F09CB48001B34C5 /* ZXRSSExpandedBlockParsedResult.m in Sources */,
E5566FFB1F09CB48001B34C5 /* LBXScanLineAnimation.m in Sources */,
- E5676B571F03395800B19E0F /* AddHotelAccountPage.m in Sources */,
E531001A1F1D8E8900625049 /* RGBModel.m in Sources */,
E55670451F09CB48001B34C5 /* ZXBitArray.m in Sources */,
E556706D1F09CB48001B34C5 /* ZXDataMatrixErrorCorrection.m in Sources */,
@@ -5198,7 +5122,6 @@
E556705A1F09CB48001B34C5 /* ZXErrors.m in Sources */,
E55670791F09CB48001B34C5 /* ZXByQuadrantReader.m in Sources */,
E52E1CD01EEE24AA000520FB /* JSDropDownMenu.m in Sources */,
- E5676B5D1F0347AA00B19E0F /* HotelDevicePage.m in Sources */,
E531001C1F1D8E8900625049 /* SensorHubModel.m in Sources */,
E51F642F1EEF8CFF0066F95F /* UIView+WHB.m in Sources */,
E556704C1F09CB48001B34C5 /* ZXDefaultGridSampler.m in Sources */,
@@ -5218,10 +5141,10 @@
E53196EE1F15B3E50020972E /* MusicSetPage.m in Sources */,
E51CFF971DF505CE006A0462 /* Reachability.m in Sources */,
E55670961F09CB48001B34C5 /* ZXRSSPair.m in Sources */,
+ E5371FBD206C8AC500E2DCEE /* AdNoticeView.m in Sources */,
E55670291F09CB48001B34C5 /* ZXProductResultParser.m in Sources */,
E53196EB1F15AF0D0020972E /* MusicPlayCell.m in Sources */,
E55670D41F09CB48001B34C5 /* ZXQRCodeVersion.m in Sources */,
- E5761E601EF36EC50037A976 /* NoticeCell.m in Sources */,
E51CFF7B1DF505CE006A0462 /* BaseNavPage.m in Sources */,
E531001B1F1D8E8900625049 /* RSCModel.m in Sources */,
E556704A1F09CB48001B34C5 /* ZXCharacterSetECI.m in Sources */,
@@ -5257,7 +5180,6 @@
E5274A681F33182600E3883C /* XZPickView.m in Sources */,
E55670901F09CB48001B34C5 /* ZXRSSExpandedReader.m in Sources */,
E55670D21F09CB48001B34C5 /* ZXQRCodeFormatInformation.m in Sources */,
- E5CFD36F1F024A8500737872 /* HotelAccounPage.m in Sources */,
E556701C1F09CB48001B34C5 /* ZXBookmarkDoCoMoResultParser.m in Sources */,
E517F3D81DF5B01300C08331 /* MJProperty.m in Sources */,
E51CFF9B1DF505CE006A0462 /* UILabel+DynamicFrame.m in Sources */,
@@ -5282,7 +5204,6 @@
E51F64171EEF76AC0066F95F /* DeviceLw.m in Sources */,
E556702C1F09CB48001B34C5 /* ZXSMSParsedResult.m in Sources */,
E51CFF841DF505CE006A0462 /* MBProgressHUD.m in Sources */,
- E5676B541F03393400B19E0F /* AddHotelDevicePage.m in Sources */,
E5E06F381EF9177900012A6D /* MCWiFiManager.m in Sources */,
E55670871F09CB48001B34C5 /* ZXRSSExpandedCurrentParsingState.m in Sources */,
E51212F61E52A00900AABF1E /* JHPieItemsView.m in Sources */,
@@ -5298,7 +5219,6 @@
E5187AB71DFA8C9800E867B7 /* NetworkUnit.m in Sources */,
E55670C71F09CB48001B34C5 /* ZXPDF417Common.m in Sources */,
E51212FA1E52A00900AABF1E /* JHTableChart.m in Sources */,
- E5CFD3661F02382300737872 /* HotelAccountCell.m in Sources */,
E53100151F1D8E8900625049 /* CSCModel.m in Sources */,
E51D6DED1EC545450005B0E8 /* ICCommonGroup.m in Sources */,
E556709D1F09CB48001B34C5 /* ZXCode39Writer.m in Sources */,
@@ -5329,6 +5249,7 @@
E556709B1F09CB48001B34C5 /* ZXCode128Writer.m in Sources */,
E556704E1F09CB48001B34C5 /* ZXGlobalHistogramBinarizer.m in Sources */,
E517F3D91DF5B01300C08331 /* MJPropertyKey.m in Sources */,
+ E5371FC3206CDA0E00E2DCEE /* SearchDevicePage.m in Sources */,
E55670661F09CB48001B34C5 /* ZXDataMatrixDetector.m in Sources */,
E55670E81F09CB48001B34C5 /* UIImageView+CornerRadius.m in Sources */,
E542E58A1F1482C100D35387 /* HistoryRecordPage.m in Sources */,
@@ -5360,12 +5281,10 @@
E55670B01F09CB48001B34C5 /* ZXUPCEANWriter.m in Sources */,
E51CFF991DF505CE006A0462 /* GloriaButton.m in Sources */,
E54875581E5D1A47009D5EEF /* TZAssetCell.m in Sources */,
- E5133A671E56C02000C89EA5 /* ChangeDeviceNamePage.m in Sources */,
E52F59E11E5C17330084B3E2 /* cameraHelper.m in Sources */,
E5187AA11DFA86B400E867B7 /* BANetManager.m in Sources */,
E51B8E8C1DF9418900D0AC45 /* DemoVC2.m in Sources */,
E5566FF91F09CB48001B34C5 /* README.md in Sources */,
- E51984F51F0A0E9200F59285 /* HotelSelPage.m in Sources */,
E55670191F09CB48001B34C5 /* ZXAddressBookDoCoMoResultParser.m in Sources */,
E55670921F09CB48001B34C5 /* ZXAbstractRSSReader.m in Sources */,
E517F3DC1DF5B01300C08331 /* NSObject+MJCoding.m in Sources */,
@@ -5388,7 +5307,6 @@
E532F6631E70D8E500B43476 /* GCDAsyncUdpSocket.m in Sources */,
E55670991F09CB48001B34C5 /* ZXCodaBarWriter.m in Sources */,
E532F6621E70D8E500B43476 /* GCDAsyncSocket.m in Sources */,
- E542E56C1F14711400D35387 /* SearchDevicePage.m in Sources */,
E5153F4D1E5ABA9300314414 /* ControlViewCell.m in Sources */,
E55670911F09CB48001B34C5 /* ZXRSSExpandedRow.m in Sources */,
E55670DC1F09CB48001B34C5 /* ZXQRCodeBlockPair.m in Sources */,
@@ -5435,8 +5353,6 @@
E55670721F09CB48001B34C5 /* ZXDataMatrixX12Encoder.m in Sources */,
E51CFF851DF505CE006A0462 /* MKAnnotationView+WebCache.m in Sources */,
E5187A7C1DFA5C0A00E867B7 /* View+MASAdditions.m in Sources */,
- E505FBB71ECBE48500C1B672 /* DeviceListMgrPage.m in Sources */,
- E51F64321EEFB09A0066F95F /* UserSignPage.m in Sources */,
E51C00411DF56A52006A0462 /* MJRefreshConst.m in Sources */,
E556702A1F09CB48001B34C5 /* ZXResultParser.m in Sources */,
E52F27D01E4BFF830022CA1D /* FogetPwdPage.m in Sources */,
@@ -5519,7 +5435,6 @@
E55670E41F09CB48001B34C5 /* ZXQRCodeWriter.m in Sources */,
E52142321EFB4A7A003867B8 /* JXTAlertView.m in Sources */,
E55670AE1F09CB48001B34C5 /* ZXUPCEANExtensionSupport.m in Sources */,
- E5676B511F0338E800B19E0F /* UpdateHotelAccountPage.m in Sources */,
E51C00431DF56A52006A0462 /* UIScrollView+MJExtension.m in Sources */,
E51D6DF01EC545450005B0E8 /* ICSettingArrowItem.m in Sources */,
E55670601F09CB48001B34C5 /* ZXRGBLuminanceSource.m in Sources */,
@@ -5546,7 +5461,6 @@
E556703F1F09CB48001B34C5 /* ZXMonochromeRectangleDetector.m in Sources */,
E55670441F09CB48001B34C5 /* ZXReedSolomonEncoder.m in Sources */,
E50EA1E61E5431E60076A3BE /* UIView+Extension.m in Sources */,
- E5676B5A1F03434F00B19E0F /* HotelDeviceCell.m in Sources */,
E55670C61F09CB48001B34C5 /* ZXPDF417HighLevelEncoder.m in Sources */,
E52D8C441DF78F5F007D8714 /* MJExampleViewController.m in Sources */,
E5325D121EFA208A00F13A48 /* NSObject+LHDB.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 79bd57d..3c0372d 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 b2a50b1..7f15846 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
@@ -1641,7 +1641,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.753916"
+ timestampString = "543997422.300175"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "82"
@@ -2441,7 +2441,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.754603"
+ timestampString = "543997422.3008831"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "199"
@@ -2457,7 +2457,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.754655"
+ timestampString = "543997422.300933"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "191"
@@ -2473,7 +2473,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "523954164.796338"
+ timestampString = "544005106.6270339"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "284"
@@ -2489,7 +2489,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "523954164.796338"
+ timestampString = "544005106.627102"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "287"
@@ -2505,7 +2505,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "523954164.796338"
+ timestampString = "544005106.6271501"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "292"
@@ -3096,7 +3096,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.755159"
+ timestampString = "543997422.3021851"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "43"
@@ -3112,7 +3112,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.75521"
+ timestampString = "543997422.302233"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "40"
@@ -3128,7 +3128,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.7552561"
+ timestampString = "543997422.302276"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "207"
@@ -3181,8 +3181,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "315"
endingLineNumber = "315"
- landmarkName = "-get_hotel_list"
- landmarkType = "7">
+ landmarkName = "DeviceListMgrPage"
+ landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
@@ -3453,8 +3453,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "491"
endingLineNumber = "491"
- landmarkName = "-didDetailSection:"
- landmarkType = "7">
+ landmarkName = "DeviceListMgrPage"
+ landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
@@ -3624,7 +3624,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/FileListPage.m"
- timestampString = "519811737.723642"
+ timestampString = "544005106.628063"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "271"
@@ -3736,7 +3736,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Views/Cell/FileDownCell.m"
- timestampString = "519806627.579689"
+ timestampString = "543996015.51421"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "47"
@@ -3832,12 +3832,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/FileListPage.m"
- timestampString = "519811389.940675"
+ timestampString = "544005106.628273"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "30"
endingLineNumber = "30"
- landmarkName = "@implementation FileListPage"
+ landmarkName = "FileListPage"
landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
@@ -3848,7 +3848,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/FileListPage.m"
- timestampString = "519811729.243741"
+ timestampString = "544005106.628317"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "234"
@@ -4968,7 +4968,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.756717"
+ timestampString = "543997422.303828"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "215"
@@ -4984,7 +4984,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.756768"
+ timestampString = "543997422.3038729"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "202"
@@ -5080,7 +5080,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.756881"
+ timestampString = "543997422.303979"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "129"
@@ -5176,11 +5176,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.756996"
+ timestampString = "544005106.629452"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "396"
- endingLineNumber = "396"
+ startingLineNumber = "398"
+ endingLineNumber = "398"
landmarkName = "SearchDevicePage"
landmarkType = "3">
</BreakpointContent>
@@ -5192,11 +5192,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.757044"
+ timestampString = "544005106.629836"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "439"
- endingLineNumber = "439"
+ startingLineNumber = "441"
+ endingLineNumber = "441"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5208,11 +5208,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.7570879"
+ timestampString = "544005106.630077"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "160"
- endingLineNumber = "160"
+ startingLineNumber = "162"
+ endingLineNumber = "162"
landmarkName = "-numberOfSectionsInTableView:"
landmarkType = "7">
</BreakpointContent>
@@ -5224,11 +5224,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.757129"
+ timestampString = "544005106.6303231"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "413"
- endingLineNumber = "413"
+ startingLineNumber = "415"
+ endingLineNumber = "415"
landmarkName = "SearchDevicePage"
landmarkType = "3">
</BreakpointContent>
@@ -5288,11 +5288,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.757215"
+ timestampString = "544005106.6306"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "281"
- endingLineNumber = "281"
+ startingLineNumber = "283"
+ endingLineNumber = "283"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "7">
</BreakpointContent>
@@ -5304,11 +5304,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.7572581"
+ timestampString = "544005106.630816"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "291"
- endingLineNumber = "291"
+ startingLineNumber = "293"
+ endingLineNumber = "293"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "7">
</BreakpointContent>
@@ -5320,11 +5320,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.757303"
+ timestampString = "544005106.631027"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "454"
- endingLineNumber = "454"
+ startingLineNumber = "456"
+ endingLineNumber = "456"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5336,11 +5336,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.757345"
+ timestampString = "544005106.631241"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "501"
- endingLineNumber = "501"
+ startingLineNumber = "503"
+ endingLineNumber = "503"
landmarkName = "-backAticon"
landmarkType = "7">
</BreakpointContent>
@@ -5352,11 +5352,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.757387"
+ timestampString = "544005106.631457"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "450"
- endingLineNumber = "450"
+ startingLineNumber = "452"
+ endingLineNumber = "452"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5368,7 +5368,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.7574331"
+ timestampString = "544005106.631673"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "429"
@@ -5384,7 +5384,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.75779"
+ timestampString = "544005106.631736"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "436"
@@ -5400,7 +5400,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.758057"
+ timestampString = "544005106.631789"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "433"
@@ -5416,7 +5416,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.758335"
+ timestampString = "544005106.6318409"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "435"
@@ -5432,7 +5432,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.758604"
+ timestampString = "544005106.631893"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "144"
@@ -5448,7 +5448,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.758878"
+ timestampString = "544005106.6319439"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "252"
@@ -5464,7 +5464,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.759148"
+ timestampString = "544005106.6319931"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "371"
@@ -5480,7 +5480,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.7594219"
+ timestampString = "544005106.632043"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "382"
@@ -5496,7 +5496,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.759691"
+ timestampString = "544005106.632094"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "175"
@@ -5512,7 +5512,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.759955"
+ timestampString = "544005106.632141"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "143"
@@ -5528,7 +5528,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.760232"
+ timestampString = "544005106.632189"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "265"
@@ -5544,7 +5544,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.760488"
+ timestampString = "544005106.632237"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "264"
@@ -5560,7 +5560,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.760743"
+ timestampString = "544005106.632285"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
@@ -5576,7 +5576,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.760995"
+ timestampString = "544005106.632344"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "167"
@@ -5592,7 +5592,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.761248"
+ timestampString = "544005106.632394"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "164"
@@ -5608,7 +5608,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.761495"
+ timestampString = "544005106.632443"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "318"
@@ -5656,7 +5656,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.761744"
+ timestampString = "544005106.6324919"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "304"
@@ -5672,7 +5672,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.761992"
+ timestampString = "544005106.63254"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "319"
@@ -5736,7 +5736,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.7622859"
+ timestampString = "544005106.632635"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "820"
@@ -5752,7 +5752,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.762545"
+ timestampString = "544005106.632689"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "498"
@@ -5768,7 +5768,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.762808"
+ timestampString = "544005106.6327389"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "421"
@@ -5784,11 +5784,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.763065"
+ timestampString = "544005106.63279"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "449"
- endingLineNumber = "449"
+ startingLineNumber = "451"
+ endingLineNumber = "451"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5800,7 +5800,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.763115"
+ timestampString = "544005106.63301"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "496"
@@ -5816,7 +5816,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.763366"
+ timestampString = "544005106.633065"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "483"
@@ -5832,7 +5832,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.763615"
+ timestampString = "544005106.6331151"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "462"
@@ -5848,7 +5848,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.763863"
+ timestampString = "544005106.633166"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "461"
@@ -5864,11 +5864,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "543910008.764109"
+ timestampString = "544005106.633216"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "400"
- endingLineNumber = "400"
+ startingLineNumber = "402"
+ endingLineNumber = "402"
landmarkName = "-discoveryDidRefresh"
landmarkType = "7">
</BreakpointContent>
@@ -5880,7 +5880,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.7641571"
+ timestampString = "544005106.633431"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "482"
@@ -5896,7 +5896,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.764402"
+ timestampString = "544005106.633486"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "484"
@@ -5928,7 +5928,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.764663"
+ timestampString = "544005106.633556"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "191"
@@ -5944,7 +5944,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.764906"
+ timestampString = "544005106.633608"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "205"
@@ -5960,7 +5960,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.765148"
+ timestampString = "544005106.6336581"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "192"
@@ -5976,7 +5976,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "523954164.796338"
+ timestampString = "544005106.633708"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "131"
@@ -5992,7 +5992,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.765407"
+ timestampString = "544005106.633761"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "209"
@@ -6008,7 +6008,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "543910008.765656"
+ timestampString = "544005106.633811"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "780"
@@ -6168,7 +6168,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.76624"
+ timestampString = "543997422.305046"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "193"
@@ -6184,7 +6184,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.766291"
+ timestampString = "543997422.305092"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "238"
@@ -6456,7 +6456,7 @@
moduleName = "pregnancy_guard"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/ThirdClass/AFNetworking/AFNetworking/AFURLRequestSerialization.m"
- timestampString = "543910008.978935"
+ timestampString = "544005106.838861"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1323"
@@ -6471,7 +6471,7 @@
moduleName = "pregnancy_guard"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/ThirdClass/AFNetworking/AFNetworking/AFURLRequestSerialization.m"
- timestampString = "543910008.98087"
+ timestampString = "544005106.840765"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1323"
@@ -6632,7 +6632,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543910008.766781"
+ timestampString = "543997422.305375"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "197"
@@ -6888,11 +6888,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "543910008.767019"
+ timestampString = "544005106.634473"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "239"
- endingLineNumber = "239"
+ startingLineNumber = "264"
+ endingLineNumber = "264"
landmarkName = "-unitMonthLogin"
landmarkType = "7">
</BreakpointContent>
@@ -6904,11 +6904,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "543910008.767071"
+ timestampString = "544005106.634533"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "254"
- endingLineNumber = "254"
+ startingLineNumber = "280"
+ endingLineNumber = "280"
landmarkName = "-unitWeekLogin"
landmarkType = "7">
</BreakpointContent>
@@ -6920,11 +6920,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "543910008.767118"
+ timestampString = "544005106.634586"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "314"
- endingLineNumber = "314"
+ startingLineNumber = "344"
+ endingLineNumber = "344"
landmarkName = "-drawHistoryRecordLine"
landmarkType = "7">
</BreakpointContent>
@@ -6936,7 +6936,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "523954164.796338"
+ timestampString = "544005106.634638"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
@@ -6952,11 +6952,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "543910008.76718"
+ timestampString = "544005106.6346821"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "214"
- endingLineNumber = "214"
+ startingLineNumber = "239"
+ endingLineNumber = "239"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -6968,11 +6968,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "543910008.767228"
+ timestampString = "544005106.634734"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "215"
- endingLineNumber = "215"
+ startingLineNumber = "240"
+ endingLineNumber = "240"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -6984,11 +6984,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "543910008.767276"
+ timestampString = "544005106.634787"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "212"
- endingLineNumber = "212"
+ startingLineNumber = "237"
+ endingLineNumber = "237"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -7000,11 +7000,143 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "543910008.767323"
+ timestampString = "544005106.634838"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "213"
- endingLineNumber = "213"
+ startingLineNumber = "238"
+ endingLineNumber = "238"
+ landmarkName = "-GetUserDataList"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Cell/AdNoticeView.m"
+ timestampString = "544005106.634895"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "129"
+ endingLineNumber = "129"
+ landmarkName = "-CancelClickAction"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Cell/AdNoticeView.m"
+ timestampString = "544005106.634939"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "128"
+ endingLineNumber = "128"
+ landmarkName = "-CancelClickAction"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
+ timestampString = "544005106.634982"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "294"
+ endingLineNumber = "294"
+ landmarkName = "-unitDayLogin"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
+ timestampString = "544005106.6350321"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "289"
+ endingLineNumber = "289"
+ landmarkName = "-unitDayLogin"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
+ timestampString = "544005106.63508"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "299"
+ endingLineNumber = "299"
+ landmarkName = "-unitDayLogin"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.AddressBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ symbolName = "*0x10bf65e7b">
+ <Locations>
+ <Location
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ symbolName = "-[UIControl touchesEnded:withEvent:]"
+ moduleName = "UIKit"
+ usesParentBreakpointCondition = "Yes"
+ offsetFromSymbolStart = "607">
+ </Location>
+ </Locations>
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
+ timestampString = "544005106.635128"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "235"
+ endingLineNumber = "235"
+ landmarkName = "-GetUserDataList"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
+ timestampString = "544005106.635175"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "242"
+ endingLineNumber = "242"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
--
Gitblit v1.8.0