From de88ae127e305e0b153c327b073645f9353cace5 Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Wed, 18 Apr 2018 16:51:07 +0800
Subject: [PATCH] 新功能修改
---
pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcschemes/pregnancy_guard.xcscheme | 4
pregnancy_guard/BaseProject/Controller/Mine/MusicSetPage.m | 320 ++++
pregnancy_guard/BaseProject/Model/MusicModel.h | 11
pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.h | 10
pregnancy_guard/BaseProject/Views/Cell/SysTipsView.h | 30
pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.m | 290 ++++
pregnancy_guard/BaseProject/Controller/Home/MinePage.m | 40
pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_musicset.png | 0
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_offline.png | 0
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b02.png | 0
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_chong.gif | 0
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b01.png | 0
pregnancy_guard/BaseProject/Model/MusicModel.m | 7
pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.m | 215 +++
pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.h | 66 +
pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m | 31
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_offline.png | 0
pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.h | 22
pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj | 210 +-
pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.m | 46
pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m | 12
pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m | 43
pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m | 57
pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h | 2
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b04.png | 0
pregnancy_guard/BaseProject/AppDelegate.m | 21
pregnancy_guard/BaseProject/Define/URLDefines.h | 44
pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_voiceset.png | 0
pregnancy_guard/BaseProject/Controller/Mine/SettingPage.m | 47
pregnancy_guard/BaseProject/Controller/Mine/FeedBackPage.m | 76
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_offline.png | 0
pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 1457 +++++++++++++++-------
/dev/null | 335 -----
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_gray.png | 0
pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m | 19
pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b03.png | 0
pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcuserdata/WindShan.xcuserdatad/UserInterfaceState.xcuserstate | 0
pregnancy_guard/BaseProject/Views/Cell/SysTipsView.m | 173 ++
pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m | 54
pregnancy_guard/BaseProject/Controller/Mine/ChangePwdPage.m | 98
pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.h | 16
pregnancy_guard/BaseProject/Model/NoticeModel.h | 7
pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist | 8
43 files changed, 2,574 insertions(+), 1,197 deletions(-)
diff --git a/pregnancy_guard/BaseProject/AppDelegate.m b/pregnancy_guard/BaseProject/AppDelegate.m
index 41d8870..7771171 100644
--- a/pregnancy_guard/BaseProject/AppDelegate.m
+++ b/pregnancy_guard/BaseProject/AppDelegate.m
@@ -97,10 +97,10 @@
// ������������������������������������BaiduMapManager
self.mapManager = [[BMKMapManager alloc]init];
- BOOL ret = [self.mapManager start:@"ZiqQxvKGjZVNbITouYn7dIwDjb1CbKcy" generalDelegate:self];
- if (!ret) {
- NSLog(@"manager start failed!");
- }
+// BOOL ret = [self.mapManager start:@"ZiqQxvKGjZVNbITouYn7dIwDjb1CbKcy" generalDelegate:self];
+// if (!ret) {
+// NSLog(@"manager start failed!");
+// }
// ������������������
self.hostReachability = [Reachability reachabilityWithHostName:@"www.baidu.com"];
@@ -110,21 +110,8 @@
[self.internetReachability startNotifier];
[self updateInterfaceWithReachability:self.internetReachability];
- // Override point for customization after application launch.
- UIUserNotificationType types = UIUserNotificationTypeBadge |
- UIUserNotificationTypeSound | UIUserNotificationTypeAlert;
- UIUserNotificationSettings *mySettings =
- [UIUserNotificationSettings settingsForTypes:types categories:nil];
- if(mySettings != nil)
- {
- [[UIApplication sharedApplication] registerUserNotificationSettings:mySettings];
- }
-
- //_currentDevice = _selectedDevice.mac;
-
-
[self showLoginPage];
//������������:NSException
diff --git a/pregnancy_guard/BaseProject/Controller/Home/AdvertisePage.h b/pregnancy_guard/BaseProject/Controller/Home/AdvertisePage.h
deleted file mode 100644
index 17fa9c4..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/AdvertisePage.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// AdvertisePage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/14.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import "MyDeviceStatus.h"
-
-@interface AdvertisePage : BaseNavPage
-
-@property (nonatomic, strong) MyDeviceStatus * currentModel;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Home/AdvertisePage.m b/pregnancy_guard/BaseProject/Controller/Home/AdvertisePage.m
deleted file mode 100644
index d568557..0000000
--- a/pregnancy_guard/BaseProject/Controller/Home/AdvertisePage.m
+++ /dev/null
@@ -1,377 +0,0 @@
-//
-// AdvertisePage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/14.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "AdvertisePage.h"
-#import "WenDuPickerView.h"
-#import "ASValueTrackingSlider.h"
-#import "GloriaLabel.h"
-#import "UITextView+Expand.h"
-#import "NetworkSingleton.h"
-#import "AdModel.h"
-
-@interface AdvertisePage ()<ASValueTrackingSliderDelegate,ASValueTrackingSliderDataSource,UITextViewDelegate>
-{
- UITextView * adContextTextView;
- UIButton * updownScrolBtn;
- UIButton * rightleftScrolBtn;
- AdModel * hotelSelModel;
-}
-
-@property (nonatomic, strong) ASValueTrackingSlider * trackingSlider;
-@property (nonatomic, strong) GloriaLabel * adContextLabel;
-@end
-
-@implementation AdvertisePage
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
- self.navigationItem.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAction)];
-
- UIImageView * ad_context_bk = [[UIImageView alloc] initWithFrame:CGRectMake(10, 20, SCREEN_WIDTH-20, 148)];
- ad_context_bk.image = [UIImage imageNamed:@"ad_context_bk"];
- ad_context_bk.userInteractionEnabled = YES;
- [self.view addSubview:ad_context_bk];
-
- UIImageView * ad_context_tag = [[UIImageView alloc] initWithFrame:CGRectMake(10, 8, 16, 16)];
- ad_context_tag.image = [UIImage imageNamed:@"ad_context_tag"];
- [ad_context_bk addSubview:ad_context_tag];
-
- _adContextLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(30, 2,100, 30)];
- _adContextLabel.font = [UIFont systemFontOfSize:14];
- _adContextLabel.textAlignment = UITextAlignmentLeft;
- _adContextLabel.textColor = kUIColorFromRGB(0x00b744);
- _adContextLabel.text = @"������������";
- [ad_context_bk addSubview:_adContextLabel];
-
- UIImageView * ad_context_line = [[UIImageView alloc] initWithFrame:CGRectMake(10, 30, ad_context_bk.frame.size.width-20, 1)];
- ad_context_line.image = [UIImage imageNamed:@"ad_context_line"];
- [ad_context_bk addSubview:ad_context_line];
-
- adContextTextView = [[UITextView alloc] initWithFrame:CGRectMake(10, 32, ad_context_bk.frame.size.width-20, 110)]; //������������������������������
- adContextTextView.textColor = [UIColor blackColor];//������textview���������������������
- adContextTextView.font = [UIFont fontWithName:@"Arial"size:14.0];//���������������������������������
- adContextTextView.delegate = self;//������������������������
- adContextTextView.backgroundColor = [UIColor whiteColor];//������������������������
- adContextTextView.keyboardType = UIKeyboardTypeDefault;//������������
- adContextTextView.scrollEnabled = YES;//������������������
- adContextTextView.placeholder = @"���������������������������";
- adContextTextView.limitLength = [[NSNumber alloc] initWithInt:200]; // ������������
- [ad_context_bk addSubview: adContextTextView];//������������������������
-
-
- UIImageView * ad_scroll_type_bk = [[UIImageView alloc] initWithFrame:CGRectMake(10, 20+148+20, SCREEN_WIDTH-20, 93)];
- ad_scroll_type_bk.image = [UIImage imageNamed:@"ad_scroll_type_bk"];
- ad_scroll_type_bk.userInteractionEnabled = YES;
- [self.view addSubview:ad_scroll_type_bk];
-
- UIImageView * ad_scroll_tag = [[UIImageView alloc] initWithFrame:CGRectMake(10, 8, 16, 16)];
- ad_scroll_tag.image = [UIImage imageNamed:@"ad_scroll_tag"];
- [ad_scroll_type_bk addSubview:ad_scroll_tag];
-
- _adContextLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(30, 2,SCREEN_WIDTH-60, 30)];
- _adContextLabel.font = [UIFont systemFontOfSize:14];
- _adContextLabel.textAlignment = UITextAlignmentLeft;
- _adContextLabel.textColor = kUIColorFromRGB(0x00b744);
- _adContextLabel.text = @"������������������������";
- [ad_scroll_type_bk addSubview:_adContextLabel];
-
- UIImageView * ad_context_line2 = [[UIImageView alloc] initWithFrame:CGRectMake(10, 30, ad_scroll_type_bk.frame.size.width-20, 1)];
- ad_context_line2.image = [UIImage imageNamed:@"ad_context_line"];
- [ad_scroll_type_bk addSubview:ad_context_line2];
-
- CGFloat scrollW = ad_scroll_type_bk.frame.size.width/2-20;
-
- updownScrolBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- updownScrolBtn.frame = CGRectMake((ad_scroll_type_bk.frame.size.width/2 - scrollW)/2, 45, scrollW, 26);
-
- [updownScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_up_down_bk1" ] forState:UIControlStateNormal];
- [updownScrolBtn setTitle:@"������������" forState:UIControlStateNormal];
- updownScrolBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [updownScrolBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- updownScrolBtn.layer.masksToBounds=YES;
- updownScrolBtn.layer.cornerRadius=8.0f;
- [updownScrolBtn addTarget:self action:@selector(updownAction) forControlEvents:UIControlEventTouchUpInside];
- [ad_scroll_type_bk addSubview:updownScrolBtn];
-
- rightleftScrolBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- rightleftScrolBtn.frame = CGRectMake(ad_scroll_type_bk.frame.size.width/2+(ad_scroll_type_bk.frame.size.width/2 - scrollW)/2, 45, scrollW, 26);
-
- [rightleftScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_right_left_bk2" ] forState:UIControlStateNormal];
- [rightleftScrolBtn setTitle:@"������������" forState:UIControlStateNormal];
- rightleftScrolBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [rightleftScrolBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- rightleftScrolBtn.layer.masksToBounds=YES;
- rightleftScrolBtn.layer.cornerRadius=8.0f;
- [rightleftScrolBtn addTarget:self action:@selector(rightleftAction) forControlEvents:UIControlEventTouchUpInside];
- [ad_scroll_type_bk addSubview:rightleftScrolBtn];
-
-
- UIImageView * ad_scroll_type_bk2 = [[UIImageView alloc] initWithFrame:CGRectMake(10, 20+148+20+93+20, SCREEN_WIDTH-20, 93)];
- ad_scroll_type_bk2.image = [UIImage imageNamed:@"ad_scroll_type_bk"];
- ad_scroll_type_bk2.userInteractionEnabled = YES;
- [self.view addSubview:ad_scroll_type_bk2];
-
- UIImageView * ad_scroll_speed_tag = [[UIImageView alloc] initWithFrame:CGRectMake(10, 8, 17, 17)];
- ad_scroll_speed_tag.image = [UIImage imageNamed:@"ad_scroll_speed_tag"];
- [ad_scroll_type_bk2 addSubview:ad_scroll_speed_tag];
-
- GloriaLabel *_adContextLabel2 = [[GloriaLabel alloc] initWithFrame:CGRectMake(30, 2,SCREEN_WIDTH-60, 30)];
- _adContextLabel2.font = [UIFont systemFontOfSize:14];
- _adContextLabel2.textAlignment = UITextAlignmentLeft;
- _adContextLabel2.textColor = kUIColorFromRGB(0x00b744);
- _adContextLabel2.text = @"������������������������";
- [ad_scroll_type_bk2 addSubview:_adContextLabel2];
-
- UIImageView * ad_context_line3 = [[UIImageView alloc] initWithFrame:CGRectMake(10, 30, ad_scroll_type_bk2.frame.size.width-20, 1)];
- ad_context_line3.image = [UIImage imageNamed:@"ad_context_line"];
- [ad_scroll_type_bk2 addSubview:ad_context_line3];
-
- _trackingSlider = [[ASValueTrackingSlider alloc]initWithFrame:CGRectMake(10, 70, ad_scroll_type_bk2.frame.size.width-20, 40)];
-
- _trackingSlider.delegate = self;
- _trackingSlider.dataSource = self;
- _trackingSlider.popUpViewCornerRadius = 5.0;
- [_trackingSlider setMaxFractionDigitsDisplayed:0];
- _trackingSlider.popUpViewColor = kUIColorFromRGB(0x00b744);
- _trackingSlider.font = [UIFont fontWithName:@"GillSans-Bold" size:12];
- _trackingSlider.textColor = [UIColor whiteColor];
- _trackingSlider.maximumValue = 100;
- _trackingSlider.minimumValue = 0;
- //_trackingSlider.formatStr = @"%@���";
- //[_trackingSlider setValue: [__wenDuStr intValue]];
- [_trackingSlider showPopUpView];
- [ad_scroll_type_bk2 addSubview:_trackingSlider];
-
-
- UIButton * fabuBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- fabuBtn.frame = CGRectMake((SCREEN_WIDTH-350)/2, 20+148+20+93+20+93+20, 350, 40);
-
- [fabuBtn setBackgroundImage:[UIImage imageNamed:@"ad_fabu_btn_bk" ] forState:UIControlStateNormal];
- [fabuBtn setTitle:@"��� ���" forState:UIControlStateNormal];
- fabuBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [fabuBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- fabuBtn.layer.masksToBounds=YES;
- fabuBtn.layer.cornerRadius=8.0f;
- [fabuBtn addTarget:self action:@selector(fabuAction) forControlEvents:UIControlEventTouchUpInside];
- [self.view addSubview:fabuBtn];
-
- [self get_device_ad];
- // Do any additional setup after loading the view.
-}
-
--(void)fabuAction
-{
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat:UPDATE_AD];
-
- //params.put("mac",mac);
- //params.put("ad_content",ad_content);
- //params.put("ad_rollmd",ad_rollmd+"");
- //params.put("ad_speed",ad_speed+"");
- //params.put("ad_mode",ad_mode+"");
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- [param setObject:_currentModel.mac forKey:@"mac"];
- [param setObject:adContextTextView.text forKey:@"ad_content"];
- [param setObject:[NSString stringWithFormat:@"%d",hotelSelModel.ad_rollmd] forKey:@"ad_rollmd"];
- [param setObject:[NSString stringWithFormat:@"%d",hotelSelModel.ad_speed] forKey:@"ad_speed"];
- [param setObject:[NSString stringWithFormat:@"%d",hotelSelModel.ad_mode] forKey:@"ad_mode"];
-
-
- 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)get_device_ad
-{
-
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:GET_DEVICE_AD,self.currentModel.mac]];
-
- //params.put("mac",mac);
- //params.put("ad_content",ad_content);
- //params.put("ad_rollmd",ad_rollmd+"");
- //params.put("ad_speed",ad_speed+"");
- //params.put("ad_mode",ad_mode+"");
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- //param setObject:<#(nonnull id)#> forKey:<#(nonnull id<NSCopying>)#>
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- if(![Global isEmptyObject:resModel.content])
- {
-
- hotelSelModel = [AdModel mj_objectWithKeyValues:resModel.content];
-
- adContextTextView.placeholderLabel.hidden = YES;
- adContextTextView.text = hotelSelModel.ad_content;
- //@property(nonatomic, strong) NSString * _id;//": "590abf002b153bee6e5b682b",
- //@property(nonatomic, strong) NSString * ad_content;//": "������������-200���������",
- //@property(nonatomic, assign) int ad_rollmd;//": 1,
- //@property(nonatomic, assign) int ad_speed;//": 50,
- //@property(nonatomic, assign) int ad_mode;//": 1
- //������������ 1���������2������
- if(hotelSelModel.ad_rollmd == 1)
- {
- [rightleftScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_right_left_bk2" ] forState:UIControlStateNormal];
- [updownScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_up_down_bk1" ] forState:UIControlStateNormal];
- }
- else if(hotelSelModel.ad_rollmd == 2)
- {
- [rightleftScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_right_left_bk1" ] forState:UIControlStateNormal];
- [updownScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_up_down_bk2" ] forState:UIControlStateNormal];
- }
-
- [_trackingSlider setValue: hotelSelModel.ad_speed];
- }
- 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)updownAction
-{
- //������������ 1���������2������
- if(hotelSelModel.ad_rollmd == 1)
- {
- [rightleftScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_right_left_bk1" ] forState:UIControlStateNormal];
- [updownScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_up_down_bk2" ] forState:UIControlStateNormal];
- }
-
- hotelSelModel.ad_rollmd = 2;
-}
-
--(void)rightleftAction
-{
- //������������ 1���������2������
- if(hotelSelModel.ad_rollmd == 2)
- {
- [rightleftScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_right_left_bk2" ] forState:UIControlStateNormal];
- [updownScrolBtn setBackgroundImage:[UIImage imageNamed:@"ad_scroll_up_down_bk1" ] forState:UIControlStateNormal];
- }
-
- hotelSelModel.ad_rollmd = 1;
-}
-
--(void)backAction
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark - ASValueTrackingSliderDelegate
-- (NSString *)slider:(ASValueTrackingSlider *)slider stringForValue:(float)value
-{
- NSString * valueStr = [NSString stringWithFormat:@"%d",(int)value];
- //self._wenDuStr = valueStr;
-
- // LOG_INFO(@"���������������������%@���",self._wenDuStr);
-
- hotelSelModel.ad_speed = (int)value;
-
- return valueStr;
-}
-
-- (void)sliderWillDisplayPopUpView:(ASValueTrackingSlider *)slider{
-
-}
-
-- (void)sliderDidHidePopUpView:(ASValueTrackingSlider *)slider{
-
-}
-
-#pragma mark disappear keyboard begin
-- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
-{
- // ���������������������������������������text
- // ������������textView������������������������������������������������������������������������
- if ([text isEqualToString:@"\n"])
- {
- [textView resignFirstResponder];
- return NO;
- }
- else
- {
- return YES;
- }
-}
-
-
-- (void)textViewDidEndEditing:(UITextView *)textView
-{
- if ([textView isFirstResponder]) {
- [textView resignFirstResponder];
- }
-}
-
--(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
- [self textViewDidEndEditing:adContextTextView];
-}
-
-/*
-#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/MinePage.m b/pregnancy_guard/BaseProject/Controller/Home/MinePage.m
index 1698153..8bb5efd 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/MinePage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/MinePage.m
@@ -7,7 +7,6 @@
//
#import "MinePage.h"
-#import "ChangeNamePage.h"
#import "ChangePwdPage.h"
#import "cameraHelper.h"
#import "BaseNaviController.h"
@@ -428,45 +427,6 @@
}
#pragma mark - custom function begin
--(void)get_straner
-{
- //[UserDefault stringForKey:@"user_id"]
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:GET_STRANER,[UserDefault stringForKey:@"user_id"]]];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingGetMethod:param urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
-
- if(resModel.code == 0)
- {
- //������������������
- if(![Global isEmptyObject:resModel.content])
- {
-
- //count = 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)exitLoginAction
diff --git a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
index ce71edc..0f32fa4 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/RadiaDetectionPage.m
@@ -75,6 +75,11 @@
NSTimer * myTimer;
NSString * myTimeInterval;
NSString * is_open_upload; // 1 ������ 0 ������
+
+ GloriaLabel* _AnquanStatustLabel;
+ UIImageView * icon_anquan;
+ UIImageView * ic_zhishu_bk;
+ UIImageView * ic_weixin_tips;
}
@end
@@ -510,7 +515,7 @@
/**
- *This method invoke after a new peripheral found.
+ *This method invoke after a new peripheral found. ������������������ ������������
*/
-(void)discoveryDidRefresh
{
@@ -741,11 +746,11 @@
UIImageView * icon_anquan = [[UIImageView alloc] initWithFrame:CGRectMake(19*scale, 10*scale, 22*scale, 22*scale)];
- icon_anquan.image = [UIImage imageNamed:@"icon_anquan"];
+ icon_anquan.image = [UIImage imageNamed:@"icon_head_offline"];
[ic_anquan_status addSubview:icon_anquan];
- GloriaLabel* _AnquanStatustLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 35*scale,60*scale, 20*scale)];
+ _AnquanStatustLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, 35*scale,60*scale, 20*scale)];
_AnquanStatustLabel.font = [UIFont systemFontOfSize:unitFontSize];
_AnquanStatustLabel.textAlignment = UITextAlignmentCenter;
_AnquanStatustLabel.textColor = kUIColorFromRGB(0x07cb5a);
@@ -753,7 +758,7 @@
[ic_anquan_status addSubview:_AnquanStatustLabel];
- UIImageView * ic_zhishu_bk = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-245*scale)/2, (66+20+292+20)*scale, 245*scale, 48*scale)];
+ ic_zhishu_bk = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-245*scale)/2, (66+20+292+20)*scale, 245*scale, 48*scale)];
ic_zhishu_bk.image = [UIImage imageNamed:@"ic_zhishu_bk"];
[self.view addSubview:ic_zhishu_bk];
@@ -777,7 +782,7 @@
_currentTipsLabel.text = @"���������������";
[ic_bottom_bg addSubview:_currentTipsLabel];
- UIImageView * ic_weixin_tips = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-34*scale)/2, -17*scale, 34*scale, 34*scale)];
+ ic_weixin_tips = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-34*scale)/2, -17*scale, 34*scale, 34*scale)];
ic_weixin_tips.image = [UIImage imageNamed:@"ic_weixin_tips"];
[ic_bottom_bg addSubview:ic_weixin_tips];
@@ -829,18 +834,32 @@
_locService.desiredAccuracy = kCLLocationAccuracyNearestTenMeters;
- [self startLocation];
+ //[self startLocation];
dataModelArr = [[NSMutableArray alloc] init];
myTimeInterval = [UserDefault stringForKey:@"refresh_frequency"];
is_open_upload = [UserDefault stringForKey:@"is_open_upload"];
+ [self offLineSet];
//myTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(function:) userInfo:nil repeats:YES];
//���1���������������function���������
}
+-(void)offLineSet
+{
+ _AnquanStatustLabel.text = @"������";
+ _AnquanStatustLabel.textColor = kUIColorFromRGB(0x848787);
+ deviceStatusLabel.text = @"���������";
+ deviceStatusLabel.textColor = kUIColorFromRGB(0x848787);
+ icon_anquan.image = [UIImage imageNamed:@"icon_head_offline"];
+ ic_anquan_status.image = [UIImage imageNamed:@"bg_corner_gray"];
+ ic_weixin_tips.image = [UIImage imageNamed:@"icon_offline"];
+ ic_zhishu_bk.image = [UIImage imageNamed:@"bt_offline"];
+ _currentTipsLabel.textColor = kUIColorFromRGB(0x848787);
+}
+
-(void)connectAction
{
SearchDevicePage* page = [[SearchDevicePage alloc] initIsFirstPage:NO];
diff --git a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
index 8b6b514..381510b 100644
--- a/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
+++ b/pregnancy_guard/BaseProject/Controller/Home/SearchDevicePage.m
@@ -15,8 +15,9 @@
#import "UIView+Toast.h"
#import "UIImage+animatedGIF.h"
#import "SearchTipsCell.h"
+#import <CoreBluetooth/CoreBluetooth.h>
-@interface SearchDevicePage ()<UITableViewDelegate,UITableViewDataSource>
+@interface SearchDevicePage ()<UITableViewDelegate,UITableViewDataSource,CBCentralManagerDelegate>
{
BOOL isBluetoothON;
UIButton* ic_search_btn;
@@ -29,12 +30,48 @@
}
@property (nonatomic, strong) UITableView * tableView;
@property (nonatomic, assign) int currentStatus; // 0 ��������� 1 ��������� 2 ������������
-
+@property (nonatomic, strong) CBCentralManager * centralManager;
@end
@implementation SearchDevicePage
+
+//-(CBCentralManager *)centralManager
+//{
+// if (_centralManager == nil) {
+// _centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil options:nil];
+// }
+// return _centralManager;
+//}
+
+-(void)centralManagerDidUpdateState:(CBCentralManager *)central
+{
+ switch (central.state) {
+ case CBCentralManagerStatePoweredOff:
+ {
+ //[mainView makeToast:@"���������������������������������������������"];
+ [Global alertMessageEx:@"���������������������������������������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+ }
+ break;
+ case CBCentralManagerStatePoweredOn:
+ NSLog(@"������������������");
+ break;
+ case CBCentralManagerStateResetting:
+ break;
+ case CBCentralManagerStateUnauthorized:
+ break;
+ case CBCentralManagerStateUnknown:
+ break;
+ case CBCentralManagerStateUnsupported:
+ NSLog(@"���������������������������");
+ [Global alertMessageEx:@"���������������������������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+ break;
+ default:
+ break;
+ }
+}
+
- (UITableView *)tableView
{
if (!_tableView)
@@ -147,6 +184,8 @@
self.tableView.hidden = NO;
// Do any additional setup after loading the view.
+ self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil options:nil];
+
[[CBMoralManager sharedManager] setCbDiscoveryDelegate:self];
}
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/ChangeNamePage.h b/pregnancy_guard/BaseProject/Controller/Mine/ChangeNamePage.h
deleted file mode 100644
index 1c30f68..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/ChangeNamePage.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ChangeNamePage.h
-// airtree
-//
-// Created by WindShan on 2016/11/11.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "BaseNavPage.h"
-
-@interface ChangeNamePage : BaseNavPage<UITextFieldDelegate>
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/ChangeNamePage.m b/pregnancy_guard/BaseProject/Controller/Mine/ChangeNamePage.m
deleted file mode 100644
index 6b0ed22..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/ChangeNamePage.m
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// ChangeNamePage.m
-// airtree
-//
-// Created by WindShan on 2016/11/11.
-// Copyright �� 2016��� Gloria. All rights reserved.
-//
-
-#import "ChangeNamePage.h"
-#import "GloriaLabel.h"
-#import "CommonReqModel.h"
-#import "NetworkSingleton.h"
-
-
-@interface ChangeNamePage ()
-{
- UITextField * userNickNameTextField;
-
- UIButton * resetUserNameBtn;
-
-
-}
-@end
-
-@implementation ChangeNamePage
-
-
-- (void)viewDidLoad {
- [super viewDidLoad];
- // Do any additional setup after loading the view.
- self.title = @"������������";
- //[self setNavigationLeft:@"������" sel:@selector(backAction)];
-
- userNickNameTextField = [[UITextField alloc] initWithFrame:CGRectMake(30, 40, SCREEN_WIDTH-60, 35)];
- userNickNameTextField.secureTextEntry = NO;
- userNickNameTextField.placeholder = @"���������������������";
- userNickNameTextField.font = [UIFont fontWithName:@"Arial" size:16];
- userNickNameTextField.delegate = self;
- userNickNameTextField.layer.borderColor = [RgbColor(213, 213, 213) CGColor];
- userNickNameTextField.layer.masksToBounds=YES;
- userNickNameTextField.layer.cornerRadius=5.0f;
- userNickNameTextField.layer.borderWidth= 1.0f;
- userNickNameTextField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
- // ������������������blankView���15.0������������View���������width���������������������������������������������������������������
- userNickNameTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(userNickNameTextField.frame.origin.x,userNickNameTextField.frame.origin.y,10.0, userNickNameTextField.frame.size.height)];
- userNickNameTextField.leftViewMode =UITextFieldViewModeAlways;
- [self.view addSubview:userNickNameTextField];
-
-
- resetUserNameBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- resetUserNameBtn.frame = CGRectMake(30,90, SCREEN_WIDTH-60, 40);
- [resetUserNameBtn setTitle:@"������������" forState:UIControlStateNormal];
- resetUserNameBtn.backgroundColor = kUIColorFromRGB(0x00b744);
- resetUserNameBtn.titleLabel.font = [UIFont systemFontOfSize: 18.0];
- [resetUserNameBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- resetUserNameBtn.layer.masksToBounds=YES;
- resetUserNameBtn.layer.cornerRadius=5.0f;
- [resetUserNameBtn addTarget:self action:@selector(resetUserNameAction) forControlEvents:UIControlEventTouchUpInside];
- [self.view addSubview:resetUserNameBtn];
-
- if (_loginUser[@"nickname"] != nil) {
- [userNickNameTextField setText:_loginUser[@"nickname"]];
- }
-
-
-}
-
--(void)backAction
-{
- [self.navigationController popViewControllerAnimated:YES];
-}
-
--(void)viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
-
- self.navigationController.navigationBarHidden = NO;
-
-}
-
--(void)viewWillDisappear:(BOOL)animated
-{
- [super viewWillDisappear:YES];
-
- resetUserNameBtn.userInteractionEnabled = YES;
- resetUserNameBtn.alpha = 1;
-}
-
-#pragma mark custom function begin
-////���������������
-# pragma mark custom function end
-
-
-#pragma mark button event begin
--(void)resetUserNameAction
-{
- // ������������������
- if(userNickNameTextField.text.length == 0)
- {
- [Global alertMessageEx:@"���������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- //, _loginUser[@"_id"]
- NSString *path = [NSString stringWithFormat:UPDATE_NAME];
-
- CommonReqModel * model = [[CommonReqModel alloc] init];
- model.userID = _loginUser[@"_id"];
- model.nickname = userNickNameTextField.text;
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:model.toDic urlName:path success:^(id responseBody)
- {
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- if(resModel.code == 0)
- {
- [_loginUser setObject:userNickNameTextField.text forKey:@"nickname"];
- [UserDefault setObject:userNickNameTextField.text forKey:@"nickname"];
- [UserDefault synchronize];
-
- [Global alertMessageEx:@"������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- // ������������������������
- [weakself.navigationController popViewControllerAnimated:YES];
- }
- 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];
- }];
- }
-}
-#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:userNickNameTextField];
-}
-
-#pragma mark disappear keyboard end
-
-
-
-- (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/ChangePwdPage.m b/pregnancy_guard/BaseProject/Controller/Mine/ChangePwdPage.m
index 2f704c0..73c6528 100644
--- a/pregnancy_guard/BaseProject/Controller/Mine/ChangePwdPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Mine/ChangePwdPage.m
@@ -120,55 +120,55 @@
#pragma mark button event begin
-(void)resetUserPwdAction
{
- // ������������������
- if(userOldPwdTextField.text.length == 0)
- {
- [Global alertMessageEx:@"������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(userNewPwdTextField.text.length == 0)
- {
- [Global alertMessageEx:@"������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
-
- }
- else if(userSurePwdTextField.text.length == 0)
- {
- [Global alertMessageEx:@"���������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else if(![userNewPwdTextField.text isEqual:userSurePwdTextField.text])
- {
- [Global alertMessageEx:@"���������������������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }
- else
- {
- NSString *path = [NSString stringWithFormat:CHANGE_PSW];
-
- CommonReqModel * model = [[CommonReqModel alloc] init];
- model.userID = _loginUser[@"_id"];
- model.password = userOldPwdTextField.text;
- model.newspassword = userNewPwdTextField.text;
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:model.toDic 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];
- [UserDefault setObject:model.newspassword forKey:@"password"];
- // ������������������������
- [weakself.navigationController popViewControllerAnimated:YES];
- }
- 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];
- }];
- }
+// // ������������������
+// if(userOldPwdTextField.text.length == 0)
+// {
+// [Global alertMessageEx:@"������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+// }
+// else if(userNewPwdTextField.text.length == 0)
+// {
+// [Global alertMessageEx:@"������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+//
+// }
+// else if(userSurePwdTextField.text.length == 0)
+// {
+// [Global alertMessageEx:@"���������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+// }
+// else if(![userNewPwdTextField.text isEqual:userSurePwdTextField.text])
+// {
+// [Global alertMessageEx:@"���������������������������������." title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+// }
+// else
+// {
+// NSString *path = [NSString stringWithFormat:CHANGE_PSW];
+//
+// CommonReqModel * model = [[CommonReqModel alloc] init];
+// model.userID = _loginUser[@"_id"];
+// model.password = userOldPwdTextField.text;
+// model.newspassword = userNewPwdTextField.text;
+//
+// MPWeakSelf(self);
+// [NetworkSingleton networkingPostMethod:model.toDic 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];
+// [UserDefault setObject:model.newspassword forKey:@"password"];
+// // ������������������������
+// [weakself.navigationController popViewControllerAnimated:YES];
+// }
+// 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];
+// }];
+// }
}
#pragma mark button event end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/FeedBackPage.m b/pregnancy_guard/BaseProject/Controller/Mine/FeedBackPage.m
index e885e9e..56d22dc 100644
--- a/pregnancy_guard/BaseProject/Controller/Mine/FeedBackPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Mine/FeedBackPage.m
@@ -82,44 +82,44 @@
}
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:[_loginUser[@"opt"] intValue] == 1?USER_FEEDBACK:WAITER_FEEDBACK,_loginUser[@"_id"]]];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
- [param setObject:feedbackTextView.text forKey:@"feedback"];
-
- MPWeakSelf(self);
- [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
- {
- HUD.hidden = YES;
-
- MPStrongSelf(self);
- BaseResModel * resModel = [Global toBaseModel:responseBody];
- if(resModel.code == 0)
- {
- feedbackTextView.text = @"";
- feedbackTextView.limitLength = [[NSNumber alloc] initWithInt:200]; // ������������
- [Global alertMessageEx:@"������������������������������������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- [self.navigationController popViewControllerAnimated:YES];
- }
- 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];
- }];
+// // ������������������
+// 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:[_loginUser[@"opt"] intValue] == 1?USER_FEEDBACK:WAITER_FEEDBACK,_loginUser[@"_id"]]];
+//
+// NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
+// [param setObject:feedbackTextView.text forKey:@"feedback"];
+//
+// MPWeakSelf(self);
+// [NetworkSingleton networkingPostMethod:param urlName:path success:^(id responseBody)
+// {
+// HUD.hidden = YES;
+//
+// MPStrongSelf(self);
+// BaseResModel * resModel = [Global toBaseModel:responseBody];
+// if(resModel.code == 0)
+// {
+// feedbackTextView.text = @"";
+// feedbackTextView.limitLength = [[NSNumber alloc] initWithInt:200]; // ������������
+// [Global alertMessageEx:@"������������������������������������������������������!" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+// [self.navigationController popViewControllerAnimated:YES];
+// }
+// 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];
+// }];
}
}
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/FileListPage.h b/pregnancy_guard/BaseProject/Controller/Mine/FileListPage.h
deleted file mode 100644
index 3cc6c3d..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/FileListPage.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// FileListPage.h
-// BaseProject
-//
-// Created by WindShan on 2016/12/9.
-// Copyright �� 2016��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-#import <QuickLook/QuickLook.h>
-
-#import "DirectoryWatcher.h"
-
-@interface FileListPage : BaseNavPage<DirectoryWatcherDelegate,
- UIDocumentInteractionControllerDelegate>
-
-@property (nonatomic, strong) DirectoryWatcher *docWatcher;
-@property (nonatomic, strong) UIDocumentInteractionController *docInteractionController;
-
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/FileListPage.m b/pregnancy_guard/BaseProject/Controller/Mine/FileListPage.m
deleted file mode 100644
index 153d4bb..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/FileListPage.m
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-// SegmentedPage.m
-// BaseProject
-//
-// Created by WindShan on 2016/12/9.
-// Copyright �� 2016��� WindShan. All rights reserved.
-//
-
-#import "FileListPage.h"
-#import "HMSegmentedControl.h"
-#import "NetworkTestPage.h"
-#import "FileStatusView.h"
-#import "BaseNaviController.h"
-#import "FileDownView.h"
-#import "LHDB.h"
-
-@interface FileListPage ()<UIScrollViewDelegate,SelectedDelegate,SelDetailDelegate,SelectedDownDelegate>
-{
- NSInteger currentPage;
-}
-@property (nonatomic, strong) UIScrollView *scrollView;
-@property (nonatomic, strong) HMSegmentedControl *segmentedControl;
-
-/*! views */
-@property (nonatomic, strong) FileDownView * views1; // ������ ���
-@property (nonatomic, strong) FileStatusView * views2; // ���������
-
-@end
-
-@implementation FileListPage
-
-#pragma mark -
-#pragma mark View Controller
-
-- (void)setupDocumentControllerWithURL:(NSURL *)url
-{
- if (self.docInteractionController == nil)
- {
- self.docInteractionController = [UIDocumentInteractionController interactionControllerWithURL:url];
- self.docInteractionController.delegate = self;
- }
- else
- {
- self.docInteractionController.URL = url;
- }
-}
-
-#pragma mark -
-#pragma mark File system support
-
-- (NSString *)applicationDocumentsDirectory
-{
- return [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
-}
-
-- (void)directoryDidChange:(DirectoryWatcher *)folderWatcher
-{
-
-}
-
-
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
-{
- return YES;
-}
-
-#pragma mark -
-#pragma mark UIDocumentInteractionControllerDelegate
-
-- (UIViewController *)documentInteractionControllerViewControllerForPreview:(UIDocumentInteractionController *)interactionController
-{
- return self;
-}
-
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
- self.navigationController.navigationBarHidden = NO;
- self.navigationItem.title = @"������������";
- [self setNavigationLeft:@"������" sel:@selector(backAction)];
- /*! ������CGRectZero��������������������������� */
- if ([self respondsToSelector:@selector(setEdgesForExtendedLayout:)])
- {
- self.edgesForExtendedLayout = UIRectEdgeNone;
- }
-
- self.view.backgroundColor = [UIColor whiteColor];
-
- [self buildSegment];
-
- // Do any additional setup after loading the view.
-}
-
--(void)backAction
-{
- [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (void)didReceiveMemoryWarning
-{
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-#pragma mark - ***** ������segment
-- (void)buildSegment
-{
- self.segmentedControl.hidden = NO;
- self.scrollView.hidden = NO;
- self.views1.hidden = NO;
- self.views2.hidden = NO;
-}
-
-
-
-- (HMSegmentedControl *)segmentedControl
-{
- if (!_segmentedControl)
- {
- _segmentedControl = [[HMSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 30)];
- /*! ������������ */
- _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 = RgbColor(23, 172, 67);
- /*! ��������������������������������� */
- _segmentedControl.selectionIndicatorHeight = 1.0f;
- /*! ��������������������������������������������� */
- _segmentedControl.selectionStyle = HMSegmentedControlSelectionStyleFullWidthStripe;
- /*! ������������������������������������������������������ */
- _segmentedControl.selectionIndicatorLocation = HMSegmentedControlSelectionIndicatorLocationDown;
- /*! ���������������������������������������NO */
- _segmentedControl.verticalDividerEnabled = YES;
- /*! ������������������������������ */
- _segmentedControl.verticalDividerColor = RgbColor(23, 172, 67);
- /*! ������������������������������ */
- _segmentedControl.verticalDividerWidth = 1.0f;
-
- [self.view addSubview:_segmentedControl];
-
- /*! ������������������ */
- BA_WEAKSELF;
- [_segmentedControl setIndexChangeBlock:^(NSInteger index)
- {
- if(index == 0 )
- {
- [weakSelf.views1 reSetView];
- }
- else if( index == 1 )
- {
- [weakSelf.views2 reSetView];
- }
-
- [weakSelf.scrollView scrollRectToVisible:CGRectMake(SCREEN_WIDTH * index, 0, SCREEN_WIDTH, weakSelf.scrollView.frame.size.height) animated:YES];
- }];
-
- //self.navigationItem.titleView = _segmentedControl;
- }
-
- return _segmentedControl;
-}
-
-
-- (UIScrollView *)scrollView
-{
- if (!_scrollView)
- {
- /*! ���������frame������������������������ */
- self.scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 30, SCREEN_WIDTH, SCREEN_HEIGHT-72-64)];
- self.scrollView.backgroundColor = [UIColor whiteColor];
- self.scrollView.pagingEnabled = YES;
- self.scrollView.showsHorizontalScrollIndicator = NO;
- self.scrollView.bounces = NO;
- self.scrollView.contentSize = CGSizeMake(SCREEN_WIDTH * 2, self.scrollView.frame.size.height);
- self.scrollView.delegate = self;
- self.scrollView.backgroundColor = [UIColor whiteColor];
- [self.scrollView scrollRectToVisible:CGRectMake(0, 0, SCREEN_WIDTH, self.scrollView.frame.size.height) animated:NO];
- [self.view addSubview:self.scrollView];
-
- }
- return _scrollView;
-}
-
-#pragma mark - ***** UIScrollViewDelegate
-
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
-{
- CGFloat pageWidth = scrollView.frame.size.width;
- currentPage = scrollView.contentOffset.x / pageWidth;
-
- LOG_INFO(@"current page:%ld",currentPage);
-
- if(currentPage == 0 )
- {
- [self.views1 reSetView];
- }
- else if( currentPage == 1 )
- {
- [self.views2 reSetView];
- }
-
- [_segmentedControl setSelectedSegmentIndex:currentPage animated:YES];
-}
-
-- (FileDownView *)views1
-{
- if (!_views1)
- {
- // start monitoring the document directory���
- self.docWatcher = [DirectoryWatcher watchFolderWithPath:[self applicationDocumentsDirectory] delegate:self];
-
- _views1 = [[FileDownView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, self.scrollView.frame.size.height)];
-
- _views1.delegate = self;
- [self.scrollView addSubview:_views1];
- }
- return _views1;
-}
-
-- (void)didSelectedDownSection:(FileStatus*)model
-{
- NSURL *fileURL = [NSURL fileURLWithPath:model.filePath];
- [self setupDocumentControllerWithURL:fileURL];
-
- CGRect navRect = self.navigationController.navigationBar.frame;
-
- navRect.size = CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT);
-
- [self.docInteractionController presentOptionsMenuFromRect:navRect inView:self.view animated:YES];
-}
-
-- (FileStatusView *)views2
-{
- if (!_views2)
- {
- _views2 = [[FileStatusView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH, 0, SCREEN_WIDTH, self.scrollView.frame.size.height)];
- _views2.delegate = self;
- _views2.detailDelegate = self;
- [self.scrollView addSubview:_views2];
- }
- return _views2;
-}
-
-- (void)didSelectedSection:(FileStatus*)model;
-{
- //DeviceDetailPage* page = [[DeviceDetailPage alloc] initIsFirstPage:NO];
-
- //page.model = model;
- // ������������
- // BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- // [self presentViewController:baseNav animated:YES completion:nil];
-
-}
-
-- (void)didDetailSection:(FileStatus*)model;
-{
- [LHDBPath instanceManagerWith:DEFAULT_PATH];
-
- [_views1 insertDataWithModel:model];
-}
-/*
-#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 5e30416..da6ff78 100644
--- a/pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Mine/HistoryRecordPage.m
@@ -183,11 +183,7 @@
[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];
-
+ [self GetNoticeInfo];
// Do any additional setup after loading the view.
}
@@ -221,6 +217,52 @@
}
}
+
+-(void)GetNoticeInfo
+{
+ //[UserDefault stringForKey:@"user_id"]
+ NSString *path = [[NSString alloc] initWithFormat:GET_NOTICE];
+
+ NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
+
+ MPWeakSelf(self);
+ [NetworkSingleton networkingGetMethod:params urlName:path success:^(id responseBody)
+ {
+ MPStrongSelf(self);
+ BaseResModel * resModel = [Global toBaseModel:responseBody];
+
+ if(resModel.code == 0)
+ {
+ //[UserDefault setObject:self.is_open_upload forKey:@"is_open_upload"];
+ [UserDefault synchronize];
+
+
+ NoticeModel * model = [NoticeModel mj_objectWithKeyValues:resModel.content];
+
+ if (self.adNoticeView == nil)
+ {
+ self.adNoticeView = [[AdNoticeView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) dataModel:model];
+ //self.adNoticeView.delegate = self;
+ [self.view addSubview:self.adNoticeView];
+ }
+ else
+ {
+ [self.adNoticeView setUIView:model];
+ }
+ }
+ 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)GetUserDataList
{
//[UserDefault stringForKey:@"user_id"]
@@ -241,7 +283,7 @@
{
//[UserDefault setObject:self.is_open_upload forKey:@"is_open_upload"];
[UserDefault synchronize];
-
+
//[self.tableView reloadData];
[Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
}
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/HotelDevicePage.h b/pregnancy_guard/BaseProject/Controller/Mine/HotelDevicePage.h
deleted file mode 100644
index 2c2a4e7..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/HotelDevicePage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// HotelDevicePage.h
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseNavPage.h"
-
-@interface HotelDevicePage : BaseNavPage
-
-@property (nonatomic, strong) NSString * hotelid;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/HotelDevicePage.m b/pregnancy_guard/BaseProject/Controller/Mine/HotelDevicePage.m
deleted file mode 100644
index db2a7cd..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/HotelDevicePage.m
+++ /dev/null
@@ -1,381 +0,0 @@
-//
-// HotelDevicePage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "HotelDevicePage.h"
-#import "NetworkSingleton.h"
-#import "DeviceSpareModel.h"
-#import "HotelDeviceCell.h"
-#import "Global.h"
-#import "BaseNaviController.h"
-#import "ChangeDeviceNamePage.h"
-
-@interface HotelDevicePage ()<UITableViewDelegate,UITableViewDataSource,updateDeviceDelegate>
-{
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) UITableView * tableView;
-
-@end
-
-@implementation HotelDevicePage
-
--(void)viewWillAppear:(BOOL)animated
-{
- [super viewWillAppear:YES];
- [self getFirstPageData];
-}
-
--(void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:YES];
- //self.navigationController.navigationBarHidden = NO;
-}
-
-- (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)updateDeviceSection:(DeviceSpareModel*)model
-{
- if( model.cmd == 1)
- {
- // ������
- //UPDATE_SPARE
- ChangeDeviceNamePage *page = [[ChangeDeviceNamePage alloc] initIsFirstPage:NO];
- page.currentModel = model;
- BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
- [self presentViewController:baseNav animated:YES completion:nil];
- }
- else if(model.cmd == 2)
- {
- // ������
- [self deleteDevice:model];
- }
-}
-
--(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) deleteDevice:(DeviceSpareModel*)model
-{
- // ������������������
- 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:DELETE_SPARE,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)
- {
- [self.modelArray removeObject:model];
- [_tableView reloadData];
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- else
- {
- [_tableView reloadData];
- [Global alertMessageEx:resModel.desc title:@"������������" okTtitle:nil cancelTitle:@"������" delegate:self];
- }
- }
- failure:^(NSString *error)
- {
- HUD.hidden = YES;
-
- _tableView.hidden = YES;
-
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
-
--(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_DEVICE_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:@"���������������������������" 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 80;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"hoteldeviceCell";
- HotelDeviceCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[HotelDeviceCell 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.navigationController popToViewController:self 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/MusicSetPage.m b/pregnancy_guard/BaseProject/Controller/Mine/MusicSetPage.m
index fb7f546..51e6925 100644
--- a/pregnancy_guard/BaseProject/Controller/Mine/MusicSetPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Mine/MusicSetPage.m
@@ -7,15 +7,16 @@
//
#import "MusicSetPage.h"
-#import "MusicPlayCell.h"
-#import "HotelAccount.h"
#import "CSAudioManager.h"
#import "NetworkSingleton.h"
+#import "MusicPlayCell.h"
+#import "MusicModel.h"
+#import "SysTipsView.h"
+#import "QWAlertView.h"
+#import "SysSoundSetPage.h"
+#import "BaseNaviController.h"
-#define kPlayID @"ID001"
-#define kPlayID2 @"ID002"
-
-@interface MusicSetPage ()<UITableViewDelegate,UITableViewDataSource,musicPlayDelegate>
+@interface MusicSetPage ()<UITableViewDelegate,UITableViewDataSource,musicPlayDelegate,SelectedActionDelegate>
{
}
@@ -23,6 +24,7 @@
@property (nonatomic,strong) CSAudioManager *csManager;
@property(nonatomic,strong) UITableView * tableView;
@property (nonatomic, strong) NSMutableArray *modelArray;
+@property (nonatomic, strong) SysTipsView * sysTipsView; // ������������
@end
@implementation MusicSetPage
@@ -49,13 +51,70 @@
return _tableView;
}
+- (SysTipsView *)sysTipsView
+{
+ if(!_sysTipsView)
+ {
+ _sysTipsView = [[SysTipsView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) tipsTitle:@"������������" tipsContext:@"���������������������������"];
+ self.sysTipsView.delegate = self;
+ }
+ else
+ {
+ [_sysTipsView setHidden:FALSE];
+ }
+
+ return _sysTipsView;
+}
+
+- (void)didSelectedAction:(NSInteger)type
+{
+ [self.sysTipsView setHidden:TRUE];
+ [[QWAlertView sharedMask] dismiss];
+
+ // ������������
+ if (type == 1)
+ {
+ [self.csManager stopAllMusic];
+ [self.modelArray removeAllObjects];
+
+ MusicModel * model1 = [[MusicModel alloc] init];
+ model1.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model1.user_id = [NSString stringWithFormat:@"%@",@"ID0001"];
+ model1.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model1.musicStatus = 0;
+ model1.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music.mp3"];
+ [self.modelArray addObject:model1];
+
+ MusicModel * model2 = [[MusicModel alloc] init];
+ model2.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model2.user_id = [NSString stringWithFormat:@"%@",@"ID0002"];
+ model2.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model2.musicStatus = 0;
+ model2.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music1.mp3"];
+ [self.modelArray addObject:model2];
+
+ MusicModel * model3 = [[MusicModel alloc] init];
+ model3.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model3.user_id = [NSString stringWithFormat:@"%@",@"ID0003"];
+ model3.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model3.musicStatus = 0;
+ model3.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music2.mp3"];
+
+ [self.modelArray addObject:model3];
+
+ [self.tableView reloadData];
+ }
+}
+
- (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view.
self.navigationItem.title = @"������������";
[self setNavigationLeft:@"������" sel:@selector(backAction)];
-
+ [self setNavigationRight:@"������" sel:@selector(resetAction)];
+
+
self.csManager = [CSAudioManager defaultManager];
self.mp3Data = nil;
@@ -81,18 +140,182 @@
self.modelArray = [[NSMutableArray alloc] init];
- for( int i =0; i<10;i++)
+// @property(nonatomic, strong) NSString * _id;
+// @property(nonatomic, strong) NSString * user_id;
+// @property(nonatomic, strong) NSString * username;
+// @property(nonatomic, strong) NSString * musicName;
+// @property(nonatomic, strong) NSString * musicUrl; // ������������
+// @property(nonatomic, strong) NSString * xuhaoIndex;
+//
+// @property(nonatomic, assign) int cmd; // 1 ������ 2 ������������
+// @property(nonatomic, assign) int playStatus; // ������0 ������������������ 1 ������������ 2 ������������
+// @property(nonatomic, assign) int musicStatus; // ������0 ������������������ 1 ������������ 2 ������������
+// @property(nonatomic, assign) NSInteger indexRow; // ������������ http://yfsapi.7drlb.com/video/music.mp3
+
+// [UserDefault stringForKey:@"username"]
+ // 0 ������ 1 ���������
+ NSInteger musicStatus1 = [UserDefault integerForKey:@"musicStatus1"];
+ NSInteger musicStatus2 = [UserDefault integerForKey:@"musicStatus2"];
+ NSInteger musicStatus3 = [UserDefault integerForKey:@"musicStatus3"];
+
+ if( musicStatus1 == 0 )
{
- HotelAccount * model = [[HotelAccount alloc] init];
- [self.modelArray addObject:model];
+ MusicModel * model1 = [[MusicModel alloc] init];
+ model1.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model1.user_id = [NSString stringWithFormat:@"%@",@"ID0001"];
+ model1.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model1.musicStatus = 0;
+ model1.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music.mp3"];
+ [self.modelArray addObject:model1];
+ }
+ else
+ {
+ MusicModel * model1 = [[MusicModel alloc] init];
+ model1.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model1.user_id = [NSString stringWithFormat:@"%@",@"ID0001"];
+ model1.musicName = [UserDefault stringForKey:@"ID0001Name"];
+ model1.musicStatus = 1;
+ model1.musicUrl = [UserDefault stringForKey:@"ID0001PATH"];
+ [self.modelArray addObject:model1];
+ }
+
+
+ if( musicStatus2 == 0 )
+ {
+ MusicModel * model2 = [[MusicModel alloc] init];
+ model2.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model2.user_id = [NSString stringWithFormat:@"%@",@"ID0002"];
+ model2.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model2.musicStatus = 0;
+ model2.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music1.mp3"];
+ [self.modelArray addObject:model2];
+ }
+ else
+ {
+ MusicModel * model2 = [[MusicModel alloc] init];
+ model2.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model2.user_id = [NSString stringWithFormat:@"%@",@"ID0002"];
+ model2.musicName = [UserDefault stringForKey:@"ID0002Name"];
+ model2.musicStatus = 1;
+ model2.musicUrl = [UserDefault stringForKey:@"ID0002PATH"];
+ [self.modelArray addObject:model2];
+ }
+
+ if( musicStatus3 == 0 )
+ {
+ MusicModel * model3 = [[MusicModel alloc] init];
+ model3.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model3.user_id = [NSString stringWithFormat:@"%@",@"ID0003"];
+ model3.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model3.musicStatus = 0;
+ model3.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music2.mp3"];
+
+ [self.modelArray addObject:model3];
+ }
+ else
+ {
+ MusicModel * model3 = [[MusicModel alloc] init];
+ model3.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model3.user_id = [NSString stringWithFormat:@"%@",@"ID0003"];
+ model3.musicName = [UserDefault stringForKey:@"ID0003Name"];
+ model3.musicStatus = 1;
+ model3.musicUrl = [UserDefault stringForKey:@"ID0003PATH"];
+
+ [self.modelArray addObject:model3];
}
self.tableView.hidden = NO;
[self.tableView reloadData];
}
+- (void)viewWillAppear:(BOOL)animated
+{
+ [super viewWillAppear:animated];
+
+ [self.modelArray removeAllObjects];
+ // 0 ������ 1 ���������
+ NSInteger musicStatus1 = [UserDefault integerForKey:@"musicStatus1"];
+ NSInteger musicStatus2 = [UserDefault integerForKey:@"musicStatus2"];
+ NSInteger musicStatus3 = [UserDefault integerForKey:@"musicStatus3"];
+
+ if( musicStatus1 == 0 )
+ {
+ MusicModel * model1 = [[MusicModel alloc] init];
+ model1.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model1.user_id = [NSString stringWithFormat:@"%@",@"ID0001"];
+ model1.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model1.musicStatus = 0;
+ model1.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music.mp3"];
+ [self.modelArray addObject:model1];
+ }
+ else
+ {
+ MusicModel * model1 = [[MusicModel alloc] init];
+ model1.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model1.user_id = [NSString stringWithFormat:@"%@",@"ID0001"];
+ model1.musicName = [UserDefault stringForKey:@"ID0001Name"];
+ model1.musicStatus = 1;
+ model1.musicUrl = [UserDefault stringForKey:@"ID0001PATH"];
+ [self.modelArray addObject:model1];
+ }
+
+
+ if( musicStatus2 == 0 )
+ {
+ MusicModel * model2 = [[MusicModel alloc] init];
+ model2.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model2.user_id = [NSString stringWithFormat:@"%@",@"ID0002"];
+ model2.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model2.musicStatus = 0;
+ model2.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music1.mp3"];
+ [self.modelArray addObject:model2];
+ }
+ else
+ {
+ MusicModel * model2 = [[MusicModel alloc] init];
+ model2.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model2.user_id = [NSString stringWithFormat:@"%@",@"ID0002"];
+ model2.musicName = [UserDefault stringForKey:@"ID0002Name"];
+ model2.musicStatus = 1;
+ model2.musicUrl = [UserDefault stringForKey:@"ID0002PATH"];
+ [self.modelArray addObject:model2];
+ }
+
+ if( musicStatus3 == 0 )
+ {
+ MusicModel * model3 = [[MusicModel alloc] init];
+ model3.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model3.user_id = [NSString stringWithFormat:@"%@",@"ID0003"];
+ model3.musicName = [NSString stringWithFormat:@"%@",@"������"];
+ model3.musicStatus = 0;
+ model3.musicUrl = [NSString stringWithFormat:@"%@",@"http://yfsapi.7drlb.com/video/music2.mp3"];
+
+ [self.modelArray addObject:model3];
+ }
+ else
+ {
+ MusicModel * model3 = [[MusicModel alloc] init];
+ model3.username = [NSString stringWithFormat:@"%@",@"������������"];
+ model3.user_id = [NSString stringWithFormat:@"%@",@"ID0003"];
+ model3.musicName = [UserDefault stringForKey:@"ID0003Name"];
+ model3.musicStatus = 1;
+ model3.musicUrl = [UserDefault stringForKey:@"ID0003PATH"];
+
+ [self.modelArray addObject:model3];
+ }
+
+ self.tableView.hidden = NO;
+ [self.tableView reloadData];
+}
+
+-(void)resetAction
+{
+ [[QWAlertView sharedMask] show:self.sysTipsView withType:(QWAlertViewStyle)QWAlertViewStyleAlert];
+}
+
-(void)backAction
{
+ [self.csManager stopAllMusic];
[self dismissViewControllerAnimated:YES completion:nil];
//[self.navigationController popViewControllerAnimated:YES];
}
@@ -129,8 +352,7 @@
cell.delegate = self;
- HotelAccount * model = [self.modelArray objectAtIndex:indexPath.row];
-
+ MusicModel * model = [self.modelArray objectAtIndex:indexPath.row];
NSInteger selIndex = [[UserDefault stringForKey:@"video"] integerValue];
if( selIndex == indexPath.row )
{
@@ -138,7 +360,6 @@
}
model.indexRow = indexPath.row;
- model.musicName = @"music.mp3";
model._id = [NSString stringWithFormat:@"judqiowu%ld",indexPath.row];
model.xuhaoIndex = [NSString stringWithFormat:@"%02ld",indexPath.row+1];
[cell setItemView:model];
@@ -163,72 +384,69 @@
//[self showActionForPhoto];
}
-- (void)musicPlaySection:(HotelAccount*)model
+- (void)musicPlaySection:(MusicModel*)model
{
if ( model.cmd == 1 )
{
if( model.playStatus == 1 )
{
// ���������������������������
- if( self.mp3Data != nil )
- {
- //������������
- [self.csManager stopMusicWithPlayID:kPlayID];
- [self.csManager disposeSoundWithPlayID:kPlayID];
- }
+// //if( self.mp3Data != nil )
+// {
+// //������������
+// [self.csManager stopMusicWithPlayID:model.user_id];
+// [self.csManager disposeSoundWithPlayID:model.user_id];
+// }
// ���������������������������
for( NSUInteger i = 0; i < self.modelArray.count;i++)
{
- HotelAccount * tempModel = [self.modelArray objectAtIndex:i];
+ MusicModel * tempModel = [self.modelArray objectAtIndex:i];
if( [tempModel._id isEqualToString:model._id] )
continue;
+ //������������
+ if(tempModel.playStatus == 1)
+ {
+ [self.csManager stopMusicWithPlayID:tempModel.user_id];
+ [self.csManager disposeSoundWithPlayID:tempModel.user_id];
+ }
tempModel.playStatus = 0;
}
- NSString *mp3Path = [[NSBundle mainBundle] pathForResource:model.musicName ofType:nil];
- NSLog(@"mp3Path : %@",mp3Path);
- self.mp3Data = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:mp3Path]];
-
- //������������
- [self.csManager playingMusicWithData:self.mp3Data playID:kPlayID];
+ if( model.musicStatus == 0 )
+ {
+ [self.csManager playingMusicWithURL:[NSURL URLWithString:model.musicUrl] playID:model.user_id];
+ }
+ else
+ {
+
+// NSString *mp3Path = [[NSBundle mainBundle] pathForResource:model.musicUrl ofType:nil];
+// NSLog(@"mp3Path : %@",mp3Path);
+ self.mp3Data = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:model.musicUrl]];
+ //������������
+ [self.csManager playingMusicWithData:self.mp3Data playID:model.user_id];
+ }
}
else if( model.playStatus == 2 )
{
//������������
- [self.csManager stopMusicWithPlayID:kPlayID];
+ [self.csManager stopMusicWithPlayID:model.user_id];
}
}
else if( model.cmd == 2 )
{
- if( model.setStatus == 1 )
- {
- //������������
- // ���������������������
- for( NSUInteger i = 0; i < self.modelArray.count;i++)
- {
- HotelAccount * tempModel = [self.modelArray objectAtIndex:i];
- if( [tempModel._id isEqualToString:model._id] )
- continue;
-
- tempModel.setStatus = 0;
- }
-
- // ������������������
- [self update_video:model];
-
- }
- else if( model.setStatus == 2 )
- {
- //������������
- [self update_video:model];
- }
+ [self.csManager stopAllMusic];
+ // ������������������������
+ SysSoundSetPage* Page = [[SysSoundSetPage alloc] initIsFirstPage:NO];
+ Page.soundIndex = [model.xuhaoIndex integerValue];
+ BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:Page];
+ [self presentViewController:baseNav animated:YES completion:nil];
}
}
--(void)update_video:(HotelAccount *)model
+-(void)update_video:(MusicModel *)model
{
//[UserDefault stringForKey:@"user_id"]
NSString *path = [[NSString alloc] initWithFormat:UPDATE_USERINFO];
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.h b/pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.h
new file mode 100644
index 0000000..bbadbbe
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.h
@@ -0,0 +1,22 @@
+//
+// PlaySystemSound.h
+// pregnancy_guard
+//
+// Created by WindShan on 2018/4/17.
+// Copyright �� 2018��� WindShan. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <AudioToolbox/AudioToolbox.h>
+
+@interface PlaySystemSound : NSObject
+{
+ SystemSoundID sound;//���������������id ������������������1000-2000
+}
+
+- (id)initSystemShake;//������ ������
+- (id)initSystemSoundWithName:(NSString *)soundName SoundType:(NSString *)soundType;//���������������������
+- (void)play;//������
+
+@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.m b/pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.m
new file mode 100644
index 0000000..e01ea73
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Controller/Mine/PlaySystemSound.m
@@ -0,0 +1,46 @@
+//
+// PlaySystemSound.m
+// pregnancy_guard
+//
+// Created by WindShan on 2018/4/17.
+// Copyright �� 2018��� WindShan. All rights reserved.
+//
+
+#import "PlaySystemSound.h"
+
+@implementation PlaySystemSound
+
+- (id)initSystemShake
+{
+ self = [super init];
+ if (self) {
+ sound = kSystemSoundID_Vibrate;//������
+ }
+ return self;
+}
+
+- (id)initSystemSoundWithName:(NSString *)soundName SoundType:(NSString *)soundType
+{
+ self = [super init];
+ if (self) {
+ NSString *path = [NSString stringWithFormat:@"/System/Library/Audio/UISounds/%@.%@",soundName,soundType];
+ //[[NSBundle bundleWithIdentifier:@"com.apple.UIKit" ]pathForResource:soundName ofType:soundType];//������������������������UIKit.framework ���������������������������������������������������
+ //[[NSBundle mainBundle] URLForResource: @"tap" withExtension: @"aif"]; ������������������������
+ if (path)
+ {
+ OSStatus error = AudioServicesCreateSystemSoundID((__bridge CFURLRef)[NSURL fileURLWithPath:path],&sound);
+
+ if (error != kAudioServicesNoError) {//���������������������������������������
+ sound = nil;
+ }
+ }
+ }
+ return self;
+}
+
+- (void)play
+{
+ AudioServicesPlaySystemSound(sound);
+}
+
+@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/RoomSelPage.h b/pregnancy_guard/BaseProject/Controller/Mine/RoomSelPage.h
deleted file mode 100644
index c0c1537..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/RoomSelPage.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 RoomSelPage : BaseNavPage
-
-@property (nonatomic, strong) NSString * hotel_id;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/RoomSelPage.m b/pregnancy_guard/BaseProject/Controller/Mine/RoomSelPage.m
deleted file mode 100644
index 809df7b..0000000
--- a/pregnancy_guard/BaseProject/Controller/Mine/RoomSelPage.m
+++ /dev/null
@@ -1,294 +0,0 @@
-//
-// HotelSelPage.m
-// istanbul
-//
-// Created by WindShan on 2017/6/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "RoomSelPage.h"
-#import "NetworkSingleton.h"
-#import "Room.h"
-#import "RoomCell.h"
-
-@interface RoomSelPage ()<UITableViewDelegate,UITableViewDataSource>
-{
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) UITableView * tableView;
-@end
-
-@implementation RoomSelPage
-
-- (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 animated:YES];
- HUD.labelText = @"���������������...";
- // ���������������������������������
- HUD.removeFromSuperViewOnHide = YES;
- // YES������������������������
- HUD.dimBackground = YES;
- }
-
-
- NSString *path = [[NSString alloc] initWithFormat:@"%@",[NSString stringWithFormat:GET_ROOM_LIST,self.hotel_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 = [Room 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";
- RoomCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == cell) {
- cell = [[RoomCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- //cell.delegate = self;
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- cell.userInteractionEnabled = YES;
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- Room * model = [self.modelArray objectAtIndex:indexPath.row];
-
- [cell setItemView:model.name];
-
- return cell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- Room * model = [self.modelArray objectAtIndex:indexPath.row];
-
- _sel_room = model;
-
- [self.navigationController popToViewController:[self.navigationController.viewControllers objectAtIndex:0] animated:YES];
-
- // [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.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/SettingPage.m b/pregnancy_guard/BaseProject/Controller/Mine/SettingPage.m
index 7b72dec..375710d 100644
--- a/pregnancy_guard/BaseProject/Controller/Mine/SettingPage.m
+++ b/pregnancy_guard/BaseProject/Controller/Mine/SettingPage.m
@@ -7,7 +7,6 @@
//
#import "SettingPage.h"
-#import "ChangeNamePage.h"
#import "ChangePwdPage.h"
//#import "CommonReqModel.h"
@@ -136,29 +135,29 @@
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
NSInteger index = [indexPath row];
- // ������������
- if(index == 0)
- {
- // ������������������������
- ChangeNamePage * page = [[ChangeNamePage alloc] initIsFirstPage:NO];
- [self.navigationController pushViewController:page animated:YES];
- }
- else if(index == 1)
- {
- // ������������������������
- ChangePwdPage * page = [[ChangePwdPage alloc] initIsFirstPage:NO];
- [self.navigationController pushViewController:page animated:YES];
- }
- else if(index == 2)
- {
- // ������������������������
- ChangePwdPage * page = [[ChangePwdPage alloc] initIsFirstPage:NO];
- [self.navigationController pushViewController:page animated:YES];
- }
- else
- {
- //TODO
- }
+// // ������������
+// if(index == 0)
+// {
+// // ������������������������
+// ChangeNamePage * page = [[ChangeNamePage alloc] initIsFirstPage:NO];
+// [self.navigationController pushViewController:page animated:YES];
+// }
+// else if(index == 1)
+// {
+// // ������������������������
+// ChangePwdPage * page = [[ChangePwdPage alloc] initIsFirstPage:NO];
+// [self.navigationController pushViewController:page animated:YES];
+// }
+// else if(index == 2)
+// {
+// // ������������������������
+// ChangePwdPage * page = [[ChangePwdPage alloc] initIsFirstPage:NO];
+// [self.navigationController pushViewController:page animated:YES];
+// }
+// else
+// {
+// //TODO
+// }
}
#pragma mark - custom function begin
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.h b/pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.h
new file mode 100644
index 0000000..ee05d09
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.h
@@ -0,0 +1,16 @@
+//
+// MusicSetPage.h
+// pregnancy_guard
+//
+// Created by WindShan on 2017/7/12.
+// Copyright �� 2017��� WindShan. All rights reserved.
+//
+
+#import "BaseNavPage.h"
+
+@interface SysSoundSetPage : BaseNavPage
+
+
+@property(nonatomic,assign) NSInteger soundIndex;
+
+@end
diff --git a/pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.m b/pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.m
new file mode 100644
index 0000000..5d25906
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Controller/Mine/SysSoundSetPage.m
@@ -0,0 +1,290 @@
+//
+// SysSoundSetPage.m
+// pregnancy_guard
+//
+// Created by WindShan on 2017/7/12.
+// Copyright �� 2017��� WindShan. All rights reserved.
+//
+
+#import "SysSoundSetPage.h"
+#import "CSAudioManager.h"
+#import "NetworkSingleton.h"
+#import "MusicPlayCell.h"
+#import "MusicModel.h"
+#import "SysTipsView.h"
+#import "QWAlertView.h"
+
+@interface SysSoundSetPage ()<UITableViewDelegate,UITableViewDataSource,musicPlayDelegate,SelectedActionDelegate>
+{
+ AVPlayerItem *playerItem;
+}
+
+@property(nonatomic,strong) UITableView * tableView;
+@property (nonatomic, strong) NSMutableArray *modelArray;
+@property (nonatomic,strong) CSAudioManager *csManager;
+@property (nonatomic,strong) NSData *mp3Data;
+@property (nonatomic, strong) AVPlayer *player;
+@end
+
+@implementation SysSoundSetPage
+
+- (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)viewDidLoad
+{
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+ self.navigationItem.title = @"������������";
+ [self setNavigationLeft:@"������" sel:@selector(backAction)];
+ //[self setNavigationRight:@"������" sel:@selector(resetAction)];
+
+ self.csManager = [CSAudioManager defaultManager];
+ self.mp3Data = nil;
+
+ MPWeakSelf(self);
+ [self.csManager setBlockPlayerStartPlay:^{
+ NSLog(@"���������-������������������");
+ [weakself.tableView reloadData];
+ }];
+
+ [self.csManager setBlockPlayerStopPlay:^{
+ NSLog(@"���������-������������������");
+ [weakself.tableView reloadData];
+ }];
+
+ [self.csManager setBlockPlayerDidFinishPlaying:^{
+ NSLog(@"���������-���������������������");
+ //[weakself.tableView reloadData];
+ }];
+
+ self.player = [[AVPlayer alloc]init];
+
+ self.modelArray = [[NSMutableArray alloc] init];
+
+// 2.���������/System/Library/Audio/UISounds ���������������������������������������������������������
+// 3���������������
+// ������
+// ReceivedMessage.caf--���������������������������������������������������
+// sms-received1.caf-------���������
+// sms-received2.caf-------���������
+// sms-received3.caf-------������
+// sms-received4.caf-------������
+// sms-received5.caf-------������
+// sms-received6.caf-------���������
+
+ NSArray *soundFileNameArr = @[@"sms-received1.caf",@"sms-received2.caf",@"sms-received3.caf",@"sms-received4.caf",@"sms-received5.caf",@"sms-received6.caf"];
+ NSArray *soundMusicNameArr = @[@"���������",@"���������",@"������",@"������",@"������",@"���������"];
+
+ // 0 ������ 1 ���������
+ for (int i = 1; i < 7; i++)
+ {
+ MusicModel * model = [[MusicModel alloc] init];
+ model.username = [NSString stringWithFormat:@"%@",soundMusicNameArr[i-1]];
+ model.user_id = [NSString stringWithFormat:@"ID000%d",i];
+ model.musicName = [NSString stringWithFormat:@"%@",soundMusicNameArr[i-1]];
+ model.musicStatus = 1;
+ model.musicUrl = [NSString stringWithFormat:@"/System/Library/Audio/UISounds/%@",soundFileNameArr[i-1]];
+ [self.modelArray addObject:model];
+ }
+
+ self.tableView.hidden = NO;
+ [self.tableView reloadData];
+}
+
+
+-(void)backAction
+{
+ [self.csManager stopAllMusic];
+ [self dismissViewControllerAnimated:YES completion:nil];
+ //[self.navigationController popViewControllerAnimated:YES];
+
+}
+
+- (void)didReceiveMemoryWarning
+{
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+ return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+ return self.modelArray.count;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ return 50.0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ static NSString *CellIdentifier = @"MusicSetCell";
+ MusicPlayCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil)
+ {
+ cell = [[MusicPlayCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:CellIdentifier];
+ }
+
+ cell.delegate = self;
+
+ MusicModel * model = [self.modelArray objectAtIndex:indexPath.row];
+ NSInteger selIndex = [[UserDefault stringForKey:@"video"] integerValue];
+ if( selIndex == indexPath.row )
+ {
+ model.setStatus = 1;
+ }
+
+ model.indexRow = indexPath.row;
+ model._id = [NSString stringWithFormat:@"judqiowu%ld",indexPath.row];
+ model.xuhaoIndex = [NSString stringWithFormat:@"%02ld",indexPath.row+1];
+ [cell setItemView:model setName:@"icon_musicset"];
+
+ return cell;
+}
+
+
+
+
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ NSInteger index = [indexPath row];
+
+ // ������������������������
+ // ������������������
+ //HotelSelPage* page = [[HotelSelPage alloc] initIsFirstPage:NO];
+ //page.bSelRoom = 2;
+ // ������������
+ //BaseNaviController *baseNav = [[BaseNaviController alloc] initWithRootViewController:page];
+ //[self presentViewController:baseNav animated:YES completion:nil];
+ //[self showActionForPhoto];
+}
+
+
+- (void)musicPlaySection:(MusicModel*)model
+{
+ if ( model.cmd == 1 )
+ {
+ if( model.playStatus == 1 )
+ {
+ // ���������������������������
+ for( NSUInteger i = 0; i < self.modelArray.count;i++)
+ {
+ MusicModel * tempModel = [self.modelArray objectAtIndex:i];
+ if( [tempModel._id isEqualToString:model._id] )
+ continue;
+ //������������
+ if(tempModel.playStatus == 1)
+ {
+ [self.csManager stopMusicWithPlayID:tempModel.user_id];
+ [self.csManager disposeSoundWithPlayID:tempModel.user_id];
+ }
+
+ tempModel.playStatus = 0;
+ }
+
+ if( model.musicStatus == 0 )
+ {
+ [self.csManager playingMusicWithURL:[NSURL URLWithString:model.musicUrl] playID:model.user_id];
+ }
+ else
+ {
+// NSString *mp3Path = [[NSBundle mainBundle] pathForResource:model.musicUrl ofType:nil];
+// NSLog(@"mp3Path : %@",mp3Path);
+ self.mp3Data = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:model.musicUrl]];
+ //������������
+ [self.csManager playingMusicWithData:self.mp3Data playID:model.user_id];
+ }
+ }
+ else if( model.playStatus == 2 )
+ {
+ //������������
+ [self.csManager stopMusicWithPlayID:model.user_id];
+ }
+ }
+ else if( model.cmd == 2 )
+ {
+ // ������������������
+ [UserDefault setInteger:1 forKey:[NSString stringWithFormat:@"musicStatus%ld",self.soundIndex]];
+ [UserDefault setObject:model.musicName forKey:[NSString stringWithFormat:@"ID000%ldName",self.soundIndex]];
+ [UserDefault setObject:model.musicUrl forKey:[NSString stringWithFormat:@"ID000%ldPATH",self.soundIndex]];
+ [UserDefault synchronize];
+ [Global alertMessageEx:@"���������������������������" title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
+ }
+}
+
+
+-(void)update_video:(MusicModel *)model
+{
+ //[UserDefault stringForKey:@"user_id"]
+ NSString *path = [[NSString alloc] initWithFormat:UPDATE_USERINFO];
+
+ NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
+
+ //['refresh_frequency', 'video', 'is_open_upload']
+ [param setValue:[UserDefault stringForKey:@"user_id"] forKey:@"user_id"];
+ [param setValue:@"video" forKey:@"field"]; // 1 ������ 0 ������
+ [param setValue:[NSString stringWithFormat:@"%ld",model.indexRow] forKey:@"value"];
+
+ MPWeakSelf(self);
+ [NetworkSingleton networkingGetMethod:param urlName:path success:^(id responseBody)
+ {
+ MPStrongSelf(self);
+ BaseResModel * resModel = [Global toBaseModel:responseBody];
+
+ if(resModel.code == 0)
+ {
+ [UserDefault setObject:[NSString stringWithFormat:@"%ld",model.indexRow] forKey:@"video"];
+ [UserDefault synchronize];
+
+ [self.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];
+ }];
+}
+
+
+/*
+#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/Define/URLDefines.h b/pregnancy_guard/BaseProject/Define/URLDefines.h
index 6d6b3e1..42ed340 100644
--- a/pregnancy_guard/BaseProject/Define/URLDefines.h
+++ b/pregnancy_guard/BaseProject/Define/URLDefines.h
@@ -35,47 +35,7 @@
#define UPDATE_USERINFO @"?service=User.UpdateUserInfo" //������������������
#define GET_DATALIST @"?service=Data.GetUserDataList" //������������
#define DATA_UPLOAD @"?service=Data.Upload" //������������
-
-// ������������
-#define REQUEST_CODE @"user/request_code" //���������������
-#define REGISTER @"user/register" //������������
-#define FORGET_PSW @"user/forget_psw" //������������
-#define LOGIN @"user/login" //������������
-#define GET_INFO @"user/get_info" //������������
-#define UPDATE_NAME @"user/update_name" //������������������
-#define CHANGE_PSW @"user/change_psw" //������������������
-
-#define GET_FILE_LIST @"file/get_list" //������������
-#define GET_DEVICE_INFO @"user/get_device_info" //������������������������
-#define GET_DEVICE_INFO_WAITER @"waiter/get_device_info" //������������������������������
-#define DEVICE_CHANGE @"device/change" //������������������
-#define UPDATE_AD @"device/update_ad" //������������
-#define GET_LATEST_LIST @"notice/get_latest_list" //������������
-#define GET_Hotel_LIST @"user/%@/get_hotel_list" //������������������������
-#define UPDATE_ADMODE @"device/update_admode" //������������
-#define GET_DEVICE_AD @"device/%@/get_ad" //������������GET
-#define GET_DEVICE_LIST @"spare/get_list" //������������������
-#define GET_IDLE_LIST @"spare/get_list2" //������������������
-#define CHANGE_DEVICE @"device/change" //������������������
-#define RETURN_BACK @"device/return_back" //������������
-#define GET_HOTEL_LIST @"user/%@/get_hotel_list" //������������������������������������
-#define GET_ROOM_LIST @"hotel/%@/get_room_list" //������������������������������
-#define SIGN_IN @"user/sign_in" //������
-#define SIGN_OUT @"user/sign_out" //������
-#define GET_SIGN_INFO @"user/get_sign_info" //������������
-#define ADD_DEVICE @"user/add_device" //������������
-#define CREATE_WAITER @"user/create_waiter" //������������������
-#define USER_FEEDBACK @"user/%@/feedback" //������������������
-#define WAITER_FEEDBACK @"waiter/%@/feedback" //������������������������
-#define GET_WAITER_LIST @"user/%@/get_waiter_list" //������������������������
-#define DELETE_WAITER @"waiter/%@/delete" //������������������������
-#define UPDATE_WAITER @"waiter/%@/update" //������������������
-#define CREATE_SPARE @"spare/create" //������������������
-#define GET_USER_INFO @"waiter/%@/get_user_info" //������������������������
-#define UPDATE_SPARE @"spare/update" //������������������
-#define DELETE_SPARE @"spare/%@/delete" //������������������
-#define GET_STRANER @"strainer_log/%@/get_count" //���������������������������������
-#define GET_STRANER_LIST @"strainer_log/%@/get_list" //���������������������������������
-#define UPDATE_STRANER @"strainer_log/%@/change" //������������������������
+#define GET_NOTICE @"?service=Ad.GetAd" //������������
+//http://yfsapi.7drlb.com/yfs/checkApiParams.php?service=Ad.GetAd
diff --git a/pregnancy_guard/BaseProject/Model/HotelAndRoom.h b/pregnancy_guard/BaseProject/Model/HotelAndRoom.h
deleted file mode 100644
index 5975838..0000000
--- a/pregnancy_guard/BaseProject/Model/HotelAndRoom.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// HotelAndRoom.h
-// istanbul
-//
-// Created by WindShan on 2017/6/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface HotelAndRoom : NSObject
-
-@property(nonatomic, strong) NSString * _id;//": "591a66002b153bee6e5b6830",
-@property(nonatomic, strong) NSString * name;//": "������������������"
-@property(nonatomic, strong) NSString * province_id;
-@property(nonatomic, strong) NSString * city_id;
-@property(nonatomic, strong) NSString * county_id;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Model/HotelAndRoom.m b/pregnancy_guard/BaseProject/Model/HotelAndRoom.m
deleted file mode 100644
index 44ff73c..0000000
--- a/pregnancy_guard/BaseProject/Model/HotelAndRoom.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// HotelAndRoom.m
-// istanbul
-//
-// Created by WindShan on 2017/6/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "HotelAndRoom.h"
-
-@implementation HotelAndRoom
-
-@end
diff --git a/pregnancy_guard/BaseProject/Model/HotelSelModel.h b/pregnancy_guard/BaseProject/Model/HotelSelModel.h
deleted file mode 100644
index 96b96f1..0000000
--- a/pregnancy_guard/BaseProject/Model/HotelSelModel.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// HotelSelModel.h
-// istanbul
-//
-// Created by WindShan on 2017/6/21.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface HotelSelModel : NSObject
-
-@property(nonatomic, strong) NSString * _id;
-@property(nonatomic, strong) NSString * city_id;
-@property(nonatomic, strong) NSString * county_id;
-@property(nonatomic, strong) NSString * name;
-@property(nonatomic, strong) NSString * province_id;
-
-@end
diff --git a/pregnancy_guard/BaseProject/Model/HotelSelModel.m b/pregnancy_guard/BaseProject/Model/HotelSelModel.m
deleted file mode 100644
index 338bc8a..0000000
--- a/pregnancy_guard/BaseProject/Model/HotelSelModel.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// HotelSelModel.m
-// istanbul
-//
-// Created by WindShan on 2017/6/21.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "HotelSelModel.h"
-
-@implementation HotelSelModel
-
-@end
diff --git a/pregnancy_guard/BaseProject/Model/HotelAccount.h b/pregnancy_guard/BaseProject/Model/MusicModel.h
similarity index 67%
rename from pregnancy_guard/BaseProject/Model/HotelAccount.h
rename to pregnancy_guard/BaseProject/Model/MusicModel.h
index de28283..91adf77 100644
--- a/pregnancy_guard/BaseProject/Model/HotelAccount.h
+++ b/pregnancy_guard/BaseProject/Model/MusicModel.h
@@ -1,5 +1,5 @@
//
-// HotelAccount.h
+// MusicModel.h
// istanbul
//
// Created by WindShan on 2017/6/13.
@@ -9,17 +9,20 @@
#import <Foundation/Foundation.h>
#import "Hotel.h"
-@interface HotelAccount : NSObject
+@interface MusicModel : NSObject
@property(nonatomic, strong) NSString * _id;
@property(nonatomic, strong) NSString * user_id;
@property(nonatomic, strong) NSString * username;
-@property(nonatomic, strong) NSString * musicName;
+@property(nonatomic, strong) NSString * musicName; // ������������
+@property(nonatomic, strong) NSString * musicUrl; // ������������
@property(nonatomic, strong) NSString * xuhaoIndex;
@property(nonatomic, assign) int cmd; // 1 ������ 2 ������������
-@property(nonatomic, assign) int playStatus; // ������0 ������������������ 1 ������������ 2 ������������
+@property(nonatomic, assign) int playStatus; // ������0 ������������������ 1 ������������ 2 ������������
+@property(nonatomic, assign) int musicStatus; // ������0 ������������������ 1 ���������������������
@property(nonatomic, assign) int setStatus; // ������0 ������������������ 1 ������������ 2 ������������
@property(nonatomic, assign) NSInteger indexRow; // ������������
@end
+
diff --git a/pregnancy_guard/BaseProject/Model/HotelAccount.m b/pregnancy_guard/BaseProject/Model/MusicModel.m
similarity index 62%
rename from pregnancy_guard/BaseProject/Model/HotelAccount.m
rename to pregnancy_guard/BaseProject/Model/MusicModel.m
index 0ab491a..6f9e1b8 100644
--- a/pregnancy_guard/BaseProject/Model/HotelAccount.m
+++ b/pregnancy_guard/BaseProject/Model/MusicModel.m
@@ -1,13 +1,14 @@
//
-// HotelAccount.m
+// MusicModel.m
// istanbul
//
// Created by WindShan on 2017/6/13.
// Copyright �� 2017��� WindShan. All rights reserved.
//
-#import "HotelAccount.h"
+#import "MusicModel.h"
-@implementation HotelAccount
+@implementation MusicModel
@end
+
diff --git a/pregnancy_guard/BaseProject/Model/NoticeModel.h b/pregnancy_guard/BaseProject/Model/NoticeModel.h
index ee642a0..0c1b4b0 100644
--- a/pregnancy_guard/BaseProject/Model/NoticeModel.h
+++ b/pregnancy_guard/BaseProject/Model/NoticeModel.h
@@ -10,10 +10,11 @@
@interface NoticeModel : NSObject
-
@property(nonatomic, strong) NSString * _id;
-@property(nonatomic, strong) NSString * title;
+@property(nonatomic, strong) NSString * name;
@property(nonatomic, strong) NSString * content;
-@property(nonatomic, strong) NSString * logoUrl;
+@property(nonatomic, strong) NSString * logo;
+@property(nonatomic, strong) NSString * create_time;
+@property(nonatomic, strong) NSString * is_open;
@end
diff --git a/pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_musicset.png b/pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_musicset.png
new file mode 100644
index 0000000..3d51b7a
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_musicset.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_voiceset.png b/pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_voiceset.png
new file mode 100755
index 0000000..c24502a
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/istanbul/personal/icon_voiceset.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_gray.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_gray.png
new file mode 100755
index 0000000..8fbf465
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bg_corner_gray.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_offline.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_offline.png
new file mode 100755
index 0000000..17f52fa
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/bt_offline.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b01.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b01.png
new file mode 100755
index 0000000..975d272
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b01.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b02.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b02.png
new file mode 100755
index 0000000..4679f51
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b02.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b03.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b03.png
new file mode 100755
index 0000000..d6855e4
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b03.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b04.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b04.png
new file mode 100755
index 0000000..662f45f
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_b04.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_chong.gif b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_chong.gif
new file mode 100755
index 0000000..eb9c7be
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_chong.gif
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_offline.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_offline.png
new file mode 100755
index 0000000..751a532
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_head_offline.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_offline.png b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_offline.png
new file mode 100755
index 0000000..a66c2bd
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Resources/images/pregnancy_guard/radiadection/icon_offline.png
Binary files differ
diff --git a/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m b/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m
index 3d353bb..2c1fcb8 100644
--- a/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m
+++ b/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m
@@ -114,12 +114,14 @@
AVAudioPlayer *player = self.musicPlayers[playID]; //������������������������������
player.delegate = self;
+ player.numberOfLoops = -1;//������������������������ -1���������������
if (!player) {
NSError *error = nil;
player = [[AVAudioPlayer alloc] initWithData:musicData error:&error];
player.delegate = self;
+ player.numberOfLoops = -1;//������������������������ -1���������������
if (![player prepareToPlay]){
NSLog(@"���������������������");
@@ -184,6 +186,7 @@
AVAudioPlayer *player=self.musicPlayers[playID];
[player stop];
+ [self.musicPlayers removeObjectForKey:playID];
if (_blockPlayerStopPlay) {
_blockPlayerStopPlay();
}
@@ -228,6 +231,7 @@
NSLog(@"���������playID");
return ;
}
+
AVAudioPlayer *player = self.musicPlayers[playID];
[player stop];
@@ -272,11 +276,24 @@
self.soundIDs[playID] = @(soundID);
}
+ // ������������������������
+ AudioServicesAddSystemSoundCompletion(soundID, NULL, NULL, soundCompleteCallback, NULL);
+ AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// ������
AudioServicesPlaySystemSound(soundID);
}
-
+//������������������������������������������
+void soundCompleteCallback(SystemSoundID soundID,void* sample)
+{
+ AudioServicesPlaySystemSound(kSystemSoundID_Vibrate); //������
+ AudioServicesPlaySystemSound(soundID);
+
+ /*��������������������������������������������� */
+// AudioServicesDisposeSystemSoundID(sample);
+// CFRelease(sample);
+// CFRunLoopStop(CFRunLoopGetCurrent());
+}
//������������
- (void)disposeSoundWithPlayID:(NSString *)playID
diff --git a/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h
index fbd96b8..334d174 100644
--- a/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h
+++ b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.h
@@ -28,5 +28,5 @@
- (instancetype)initWithFrame:(CGRect)frame dataModel:(NoticeModel*)model;
--(void)setUIView;
+-(void)setUIView:(NoticeModel*)model;
@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m
index 651f91a..f2f69ac 100644
--- a/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m
+++ b/pregnancy_guard/BaseProject/Views/Cell/AdNoticeView.m
@@ -157,23 +157,23 @@
// [self.modelArray addObject:status];
//}
// ������������
- self.model = model;
- [self setUIView];
+
+ [self setUIView:model];
}
return self;
}
--(void)setUIView
+-(void)setUIView:(NoticeModel*)model
{
//self.backgroundColor = [UIColor clearColor];
-
+ self.model = model;
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.noticeContext setText:self.model.content];
+ [self.noticeTitle setText:self.model.name];
// [self.lookDetailBtn setTitle:@"������������" forState:UIControlStateNormal];
[self.cancelLookBtn setTitle:@"��� ���" forState:UIControlStateNormal];
}
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileDownCell.h b/pregnancy_guard/BaseProject/Views/Cell/FileDownCell.h
deleted file mode 100644
index a578d84..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileDownCell.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// FileStatusCell.h
-// terminalMgr
-//
-// Created by WindShan on 2017/3/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-#import "FileStatus.h"
-
-@protocol cellHandleDelegate <NSObject>
-
-@optional
-
-- (void)didCellHandleSection:(FileStatus*)model;
-
-@end
-
-@interface FileDownCell : BaseTableViewCell
-
-@property(nonatomic, assign)id<cellHandleDelegate> delegate;
-@property(nonatomic, strong) FileStatus* model;
-
-/** ������������*/
-- (void)setItemView:(FileStatus*)model;
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileDownCell.m b/pregnancy_guard/BaseProject/Views/Cell/FileDownCell.m
deleted file mode 100644
index 66dbaa7..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileDownCell.m
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// FileDownCell.m
-// terminalMgr
-//
-// Created by WindShan on 2017/3/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "FileDownCell.h"
-#import "GloriaLabel.h"
-#import "UIImageView+WebCache.h"
-#import "commenProgressView.h"
-
-@interface FileDownCell()
-{
-
-}
-
-@property (nonatomic, strong) UIImageView * file_havedown_item_bk;
-@property (nonatomic, strong) GloriaLabel * fileName;
-@property (nonatomic, strong) GloriaLabel * fileDownTime;
-@property (nonatomic, strong) UIButton * startBtn; // ������
-@property (nonatomic, strong) UIButton * deleteBtn;
-@end
-
-@implementation FileDownCell
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-
--(void)lookAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(didCellHandleSection:)])
- {
- self.model.handleCmd = @"4";
- [_delegate didCellHandleSection:self.model];
- }
-}
-
--(void)deleteAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(didCellHandleSection:)])
- {
- self.model.handleCmd = @"3";
- [_delegate didCellHandleSection:self.model];
- }
-}
-
--(UIButton*)deleteBtn
-{
- if(!_deleteBtn)
- {
- _deleteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- _deleteBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_deleteBtn setBackgroundImage:[UIImage imageNamed:@"file_havedown_delete_btn" ] forState:UIControlStateNormal];
- [_deleteBtn setTitle:@"������" forState:UIControlStateNormal];
- [_deleteBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- //_deleteBtn.backgroundColor = [UIColor redColor]; //������������
- _deleteBtn.tag = 100;
-
- _deleteBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_deleteBtn addTarget:self action:@selector(deleteAction) forControlEvents:UIControlEventTouchUpInside];
-
- //[_deleteBtn setTintColor:RgbColor(253,137,8)];
-
- [self.contentView addSubview:_deleteBtn];
- }
-
- return _deleteBtn;
-}
-
-
--(UIButton*)startBtn
-{
- if(!_startBtn)
- {
- _startBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- _startBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_startBtn setBackgroundImage:[UIImage imageNamed:@"file_havedown_look_btn" ] forState:UIControlStateNormal];
- [_startBtn setTitle:@"������" forState:UIControlStateNormal];
- [_startBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- //_startBtn.backgroundColor = [UIColor redColor]; //������������
- _startBtn.tag = 101;
-
- _startBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_startBtn addTarget:self action:@selector(lookAction) forControlEvents:UIControlEventTouchUpInside];
-
- //[_startBtn setTintColor:RgbColor(253,137,8)];
-
- [self.contentView addSubview:_startBtn];
- }
-
- return _startBtn;
-}
-
-- (GloriaLabel *) fileName
-{
- if(!_fileName)
- {
- _fileName = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
- _fileName.font = [UIFont systemFontOfSize:14];
- _fileName.textAlignment = UITextAlignmentLeft;
- _fileName.textColor = kUIColorFromRGB(0x6e6e6e);
- [self.contentView addSubview:_fileName];
- }
-
- return _fileName;
-}
-
-- (GloriaLabel *) fileDownTime
-{
- if(!_fileDownTime)
- {
- _fileDownTime = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
- _fileDownTime.font = [UIFont systemFontOfSize:12];
- _fileDownTime.textAlignment = UITextAlignmentLeft;
- _fileDownTime.textColor = kUIColorFromRGB(0xa9a9a9);
- [self.contentView addSubview:_fileDownTime];
- }
-
- return _fileDownTime;
-}
-
-- (UIImageView *)file_havedown_item_bk
-{
- if (!_file_havedown_item_bk)
- {
- _file_havedown_item_bk = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- [self.contentView addSubview:_file_havedown_item_bk];
- }
-
- return _file_havedown_item_bk;
-}
-
-
-//@property (nonatomic, strong) UIImageView * bkImage;
-//@property (nonatomic, strong) UIImageView * iconImage;
-//@property (nonatomic, strong) UIImageView * nameCircleImage;
-//@property (nonatomic, strong) UIImageView * statusCircleImage;
-//@property (nonatomic, strong) GloriaLabel * deviceName;
-//@property (nonatomic, strong) GloriaLabel * FileStatus;
-
-- (void)layoutSubviews
-{
- [super layoutSubviews];
-
- CGFloat bkImageW = 271;
- if(IsiPhone4 || IsiPhone5)
- {
- bkImageW = 230;
- }
-
- // 271
- self.file_havedown_item_bk.frame = CGRectMake((SCREEN_WIDTH-bkImageW-45*2-4)/2, 5, bkImageW, 55);
-
- self.fileName.frame = CGRectMake((SCREEN_WIDTH-bkImageW-45*2-4)/2+10, 15, bkImageW-20, 20);
- self.fileDownTime.frame = CGRectMake((SCREEN_WIDTH-bkImageW-45*2-4)/2+10, 35, bkImageW-20, 20);
- self.startBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW-45*2-4)/2+bkImageW+1, 5, 45, 55);
- // 45
- self.deleteBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW-45*2-4)/2+bkImageW+1+1+45, 5, 45, 55);
-
-}
-
-/** ������������*/
-- (void)setItemView:(FileStatus*)model
-{
- self.model = model;
- self.contentView.backgroundColor = [UIColor clearColor];
-
- self.file_havedown_item_bk.image = [UIImage imageNamed:@"file_havedown_item_bk"];
-
- [self.fileName setText:[NSString stringWithFormat:@"������������%@",self.model.name]];
- [self.fileDownTime setText: [DateUtil stringFromLong:self.model.created]];
-}
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileDownView.h b/pregnancy_guard/BaseProject/Views/Cell/FileDownView.h
deleted file mode 100644
index 5101f33..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileDownView.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// FileDownView.h
-// GoldRich
-//
-// Created by WindShan on 2017/2/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "FileStatus.h"
-#import <QuickLook/QuickLook.h>
-
-#import "DirectoryWatcher.h"
-
-@protocol SelectedDownDelegate <NSObject>
-
-@optional
-
-- (void)didSelectedDownSection:(FileStatus*)model;
-
-@end
-
-
-@interface FileDownView : UIView
-
-@property (nonatomic, strong) UITableView * tableView;
-@property (nonatomic, strong) FileStatus * model;
-@property (nonatomic, strong) NSMutableArray * modelArray;
-
-@property(nonatomic, assign)id<SelectedDownDelegate> delegate;
-
-@property (nonatomic, strong) DirectoryWatcher *docWatcher;
-@property (nonatomic, strong) UIDocumentInteractionController *docInteractionController;
-
-- (instancetype)initWithFrame:(CGRect)frame;
-- (void) reSetView;
-- (void)insertDataWithModel:(id)model;
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileDownView.m b/pregnancy_guard/BaseProject/Views/Cell/FileDownView.m
deleted file mode 100644
index 5ecfe4a..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileDownView.m
+++ /dev/null
@@ -1,307 +0,0 @@
-//
-// FileDownView.m
-// GoldRich
-//
-// Created by WindShan on 2017/2/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "FileDownView.h"
-#import "GloriaLabel.h"
-#import "UIImageView+WebCache.h"
-#import "FileDownCell.h"
-#import "MBProgressHUD+Add.h"
-#import "NetworkSingleton.h"
-#import "LHDB.h"
-#import "JXTAlertManagerHeader.h"
-
-
-@interface FileDownView()<UITableViewDelegate,UITableViewDataSource,cellHandleDelegate,
- DirectoryWatcherDelegate,
- UIDocumentInteractionControllerDelegate>
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-{
- UIButton* deviceOpenBtn;
- NSInteger pageIndex;
- NSInteger pageSize;
-
-}
-
-@end
-
-
-@implementation FileDownView
-
-- (void)setupDocumentControllerWithURL:(NSURL *)url
-{
- if (self.docInteractionController == nil)
- {
- self.docInteractionController = [UIDocumentInteractionController interactionControllerWithURL:url];
- self.docInteractionController.delegate = self;
- }
- else
- {
- self.docInteractionController.URL = url;
- }
-}
-
-- (void)directoryDidChange:(DirectoryWatcher *)folderWatcher
-{
-
-}
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- _tableView.separatorColor = [UIColor clearColor];
-
- [self addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
- if (self = [super initWithFrame:frame])
- {
- self.tableView.frame = frame;
- self.tableView.hidden = NO;
- self.modelArray = [[NSMutableArray alloc] init];
- pageIndex = 1;
- pageSize = 20;
-
- [self createTable];
-
- [self loadDataFromDB];
-
- [self setUpTableView];
- }
-
- return self;
-}
-
-
-
-- (void)didCellHandleSection:(FileStatus*)model
-{
- //NSString * handleCmd; // ������������ 1 ������ 2 ������ 3 ������ 4 ������ 5 ������
- if([model.handleCmd intValue] == 3)
- {
- jxt_showAlertTwoButton(@"������������", @"���������������������", @"������", ^(NSInteger buttonIndex)
- {
- NSLog(@"������");
- }, @"������", ^(NSInteger buttonIndex)
- {
-
- LHPredicate* predicate = [LHPredicate predicateWithFormat:@"path = '%@'",((FileStatus*)model).path];
- [self deleteDataWithPredicate:predicate];
-
- [self loadDataFromDB];
- NSLog(@"������");
- });
- }
- else if([model.handleCmd intValue] == 4)
- {
- // ������������
- if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedDownSection:)])
- {
- [_delegate didSelectedDownSection:model];
- }
- }
-}
-
-
--(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)getFirstPageData
-{
- if (self.modelArray.count>0)
- {
- [self.modelArray removeAllObjects];
- }
-
- [LHDBPath instanceManagerWith:DEFAULT_PATH];
- NSArray* array = [self selectDataWithPredicate:nil];
- [self.modelArray addObjectsFromArray:array];
-
- [self.tableView reloadData];
-
- [self.tableView.mj_header endRefreshing];
-}
-
-- (void) reSetView
-{
- if (self.modelArray.count>0)
- {
- [self.modelArray removeAllObjects];
- }
-
- [LHDBPath instanceManagerWith:DEFAULT_PATH];
- NSArray* array = [self selectDataWithPredicate:nil];
- [self.modelArray addObjectsFromArray:array];
-
- [self.tableView reloadData];
-
-}
-
-#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 65;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"StatusCell";
- FileDownCell * statusCell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == statusCell)
- {
- statusCell = [[FileDownCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
- }
-
- statusCell.delegate = self;
- statusCell.selectionStyle = UITableViewCellSelectionStyleNone;
- statusCell.userInteractionEnabled = YES;
-
- FileStatus * model = [self.modelArray objectAtIndex:indexPath.row];
- model.row = [[NSString stringWithFormat:@"%ld",indexPath.row] integerValue];
- [statusCell setItemView:model];
-
- return statusCell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- // if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedDownSection:)])
- // {
- // FileStatus * model = [self.modelArray objectAtIndex:indexPath.row];
- // [_delegate didSelectedDownSection:model];
- // }
-}
-
-
-#pragma mark- LHDB
-- (void)loadDataFromDB
-{
- if (self.modelArray.count>0)
- {
- [self.modelArray removeAllObjects];
- }
-
- [LHDBPath instanceManagerWith:DEFAULT_PATH];
- NSArray* array = [self selectDataWithPredicate:nil];
- [self.modelArray addObjectsFromArray:array];
-
- [self.tableView reloadData];
-}
-
-
-//������
-- (void)createTable
-{
- [FileStatus createTable];
-}
-
-//������������
-- (void)insertDataWithDic:(NSDictionary*)dic
-{
- [FileStatus saveWithDic:dic];
-}
-
-- (void)insertDataWithModel:(id)model
-{
- LHPredicate* predicate = [LHPredicate predicateWithFormat:@"path = '%@'",((FileStatus*)model).path];
-
- NSArray* select = [self selectDataWithPredicate:predicate];
-
- // ������������������
- if(select.count > 0)
- {
- [self updateDataWithModel:model predicate:predicate];
- }
- else
- {
- [model save];
- }
-}
-
-//������������
-- (void)updateDataWithDic:(NSDictionary*)dic predicate:(LHPredicate*)predicate
-{
- [FileStatus updateWithDic:dic predicate:predicate];
-}
-
-- (void)updateDataWithModel:(id)model predicate:(LHPredicate*)predicate
-{
- [model updateWithPredicate:predicate];
-}
-
-//������������
-- (void)deleteDataWithPredicate:(LHPredicate*)predicate
-{
- [FileStatus deleteWithPredicate:predicate];
-}
-
-//������������
-- (NSArray*)selectDataWithPredicate:(LHPredicate*)predicate
-{
- return [FileStatus selectWithPredicate:predicate];
-}
-
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileStatusCell.h b/pregnancy_guard/BaseProject/Views/Cell/FileStatusCell.h
deleted file mode 100644
index 16e1247..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileStatusCell.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// FileStatusCell.h
-// terminalMgr
-//
-// Created by WindShan on 2017/3/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-#import "FileStatus.h"
-#import "MCDownloadManager.h"
-#import "QKYDelayButton.h"
-
-@protocol SelCellDetailDelegate <NSObject>
-
-@optional
-
-- (void)didCellDetailSection:(FileStatus*)model;
-
-@end
-
-@interface FileStatusCell : BaseTableViewCell
-
-@property(nonatomic, assign)id<SelCellDetailDelegate> delegate;
-@property(nonatomic, strong) FileStatus* model;
-
-/** ������������*/
-- (void)setItemView:(FileStatus*)model;
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileStatusCell.m b/pregnancy_guard/BaseProject/Views/Cell/FileStatusCell.m
deleted file mode 100644
index 41a4b9f..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileStatusCell.m
+++ /dev/null
@@ -1,406 +0,0 @@
-//
-// FileStatusCell.m
-// terminalMgr
-//
-// Created by WindShan on 2017/3/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "FileStatusCell.h"
-#import "GloriaLabel.h"
-#import "UIImageView+WebCache.h"
-#import "commenProgressView.h"
-
-@interface FileStatusCell()
-{
-
-}
-
-@property (nonatomic, strong) UIImageView * bkImage;
-@property (nonatomic, strong) UIImageView * file_name_tag;
-@property (nonatomic, strong) UIImageView * file_name_line;
-@property (nonatomic, strong) UIImageView * file_cmd_line;
-@property (nonatomic, strong) UIImageView * file_cmd_line2;
-@property (nonatomic, strong) GloriaLabel * fileName;
-@property (nonatomic, strong) QKYDelayButton * startBtn;
-@property (nonatomic, strong) UIButton * stopBtn;
-@property (nonatomic, strong) UIButton * deleteBtn;
-@property (nonatomic, strong) commenProgressView * rateProgressView;
-@end
-
-@implementation FileStatusCell
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-- (UIProgressView *) rateProgressView
-{
- if(!_rateProgressView)
- {
- CGFloat bkImageW = 356;
- if(IsiPhone4 || IsiPhone5)
- {
- bkImageW = 300;
- }
-
- _rateProgressView = [commenProgressView initCommenProgressView];
- _rateProgressView.frame = CGRectMake(5, 60,[UIScreen mainScreen].bounds.size.width - 10 , 20);
-
-
- _rateProgressView.progressBackGroundColor = RgbColor(182, 231, 203);
- _rateProgressView.progressTintColor = RgbColor(34, 231, 203);
-
- _rateProgressView.progressCornerRadius = 0;
- _rateProgressView.backgroundColor = [UIColor redColor];
- _rateProgressView.layer.masksToBounds = YES;
- _rateProgressView.layer.cornerRadius = 1;
- [self.contentView addSubview:_rateProgressView];
- }
-
- return _rateProgressView;
-}
-
--(void)detailAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(didCellDetailSection:)])
- {
- [_delegate didCellDetailSection:self.model];
- }
-}
-
--(UIButton*)deleteBtn
-{
- if(!_deleteBtn)
- {
- _deleteBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
- _deleteBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_deleteBtn setImage:[UIImage imageNamed:@"file_download_del"] forState:UIControlStateNormal];
- [_deleteBtn setTitle:@"��� ���" forState:UIControlStateNormal];
- [_deleteBtn setTitleColor:kUIColorFromRGB(0x5a5a5a) forState:UIControlStateNormal];
- //_deleteBtn.backgroundColor = [UIColor redColor]; //������������
-
- _deleteBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_deleteBtn addTarget:self action:@selector(deleteAction) forControlEvents:UIControlEventTouchUpInside];
-
- [_deleteBtn setTintColor:RgbColor(253,137,8)];
-
- [self.contentView addSubview:_deleteBtn];
- }
-
- return _deleteBtn;
-}
-
--(void)deleteAction
-{
- self.model.handleCmd = @"3";
- self.rateProgressView.progressValue = 0;
- [self.rateProgressView setNeedsLayout];
- [[MCDownloadManager defaultInstance] removeWithURL:self.model.path];
-}
-
--(UIButton*)stopBtn
-{
- if(!_stopBtn)
- {
- _stopBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
- _stopBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_stopBtn setImage:[UIImage imageNamed:@"file_download_stop"] forState:UIControlStateNormal];
- [_stopBtn setTitle:@"��� ���" forState:UIControlStateNormal];
- [_stopBtn setTitleColor:kUIColorFromRGB(0x5a5a5a) forState:UIControlStateNormal];
- //_stopBtn.backgroundColor = [UIColor redColor]; //������������
-
- _stopBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_stopBtn addTarget:self action:@selector(stopAction) forControlEvents:UIControlEventTouchUpInside];
-
- [_stopBtn setTintColor:RgbColor(253,137,8)];
-
- [self.contentView addSubview:_stopBtn];
- }
-
- return _stopBtn;
-}
-
--(void)stopAction
-{
- MCDownloadReceipt *receipt = [[MCDownloadManager defaultInstance] downloadReceiptForURL:self.model.path];
-
- if (receipt.state == MCDownloadStateDownloading)
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- [[MCDownloadManager defaultInstance] suspendWithDownloadReceipt:receipt];
- }
- else if (receipt.state == MCDownloadStateCompleted)
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- }
- else
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- [self download];
- }
-
-}
-
--(UIButton*)startBtn
-{
- if(!_startBtn)
- {
- _startBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
- _startBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_startBtn setImage:[UIImage imageNamed:@"file_download_start"] forState:UIControlStateNormal];
- [_startBtn setTitle:@"��� ���" forState:UIControlStateNormal];
- [_startBtn setTitleColor:kUIColorFromRGB(0x5a5a5a) forState:UIControlStateNormal];
- //_startBtn.backgroundColor = [UIColor redColor]; //������������
-
-
- _startBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_startBtn addTarget:self action:@selector(startAction) forControlEvents:UIControlEventTouchUpInside];
-
- [_startBtn setTintColor:RgbColor(253,137,8)];
-
- [self.contentView addSubview:_startBtn];
- }
-
- return _startBtn;
-}
-
--(void)startAction
-{
- MCDownloadReceipt *receipt = [[MCDownloadManager defaultInstance] downloadReceiptForURL:self.model.path];
-
- if (receipt.state == MCDownloadStateDownloading)
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- [[MCDownloadManager defaultInstance] suspendWithDownloadReceipt:receipt];
- }
- else if (receipt.state == MCDownloadStateCompleted)
- {
- self.rateProgressView.progressValue = 0;
- [self.rateProgressView setNeedsLayout];
- [[MCDownloadManager defaultInstance] removeWithURL:self.model.path];
- [self download];
- }
- else
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- [self download];
- }
-}
-
-- (GloriaLabel *) fileName
-{
- if(!_fileName)
- {
- _fileName = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
- _fileName.font = [UIFont systemFontOfSize:12];
- _fileName.textAlignment = UITextAlignmentLeft;
- _fileName.textColor = kUIColorFromRGB(0x6e6e6e);
- [self.contentView addSubview:_fileName];
- }
-
- return _fileName;
-}
-
-- (UIImageView *)file_name_tag
-{
- if (!_file_name_tag)
- {
- _file_name_tag = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- [self.contentView addSubview:_file_name_tag];
- }
-
- return _file_name_tag;
-}
-
-- (UIImageView *)bkImage
-{
- if (!_bkImage)
- {
-
- CGFloat bkImageW = 708;
- if(IsiPhone4 || IsiPhone5)
- {
- bkImageW = 620;
- }
-
- _bkImage = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-bkImageW)/2-10, 0, bkImageW-20, 80)];
- [self.contentView addSubview:_bkImage];
- }
-
- return _bkImage;
-}
-
-
-
-- (UIImageView *)file_name_line
-{
- if (!_file_name_line)
- {
- _file_name_line = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- _file_name_line.image = [UIImage imageNamed:@"file_name_line"];
- [self.contentView addSubview:_file_name_line];
- }
-
- return _file_name_line;
-}
-
-- (UIImageView *)file_cmd_line
-{
- if (!_file_cmd_line)
- {
- _file_cmd_line = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- _file_cmd_line.image = [UIImage imageNamed:@"file_cmd_line"];
- [self.contentView addSubview:_file_cmd_line];
- }
-
- return _file_cmd_line;
-}
-
-- (UIImageView *)file_cmd_line2
-{
- if (!_file_cmd_line2)
- {
- _file_cmd_line2 = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- _file_cmd_line2.image = [UIImage imageNamed:@"file_cmd_line"];
- [self.contentView addSubview:_file_cmd_line2];
- }
-
- return _file_cmd_line2;
-}
-
-
-//@property (nonatomic, strong) UIImageView * bkImage;
-//@property (nonatomic, strong) UIImageView * iconImage;
-//@property (nonatomic, strong) UIImageView * nameCircleImage;
-//@property (nonatomic, strong) UIImageView * statusCircleImage;
-//@property (nonatomic, strong) GloriaLabel * deviceName;
-//@property (nonatomic, strong) GloriaLabel * FileStatus;
-
-- (void)layoutSubviews
-{
- [super layoutSubviews];
-
- CGFloat bkImageW = 356;
- CGFloat btnW = 118;
- CGFloat leftOffX = 10;
- CGFloat lineOffX = 0;
- if(IsiPhone4 || IsiPhone5)
- {
- bkImageW = 300;
- btnW = 110;
- leftOffX = 0;
- lineOffX = 10;
- }
-
- self.bkImage.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2, 10, bkImageW, 98);
- self.file_name_tag.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+10, 21, 8, 8);
- self.file_name_line.frame = CGRectMake((SCREEN_WIDTH-bkImageW+20)/2, 40, bkImageW-20, 1);
-
- self.rateProgressView.frame = CGRectMake((SCREEN_WIDTH-bkImageW+20)/2, 50, bkImageW-20, 16);
- //_rateProgressView.transform = CGAffineTransformMakeScale(1.0f,3.0f);
-
- self.fileName.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+10+20, 10, SCREEN_WIDTH/2, 30);
- self.startBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2, 75, btnW, 30);
- self.startBtn.titleEdgeInsets = UIEdgeInsetsMake(0, leftOffX+16+5, 0, 20);
- //UIEdgeInsetsMake(CGFloat top, CGFloat left, CGFloat bottom, CGFloat right)
- self.startBtn.imageEdgeInsets = UIEdgeInsetsMake(0, leftOffX, 0, 20);
-
- self.file_cmd_line.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW-lineOffX, 80, 1, 20);
-
- self.stopBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW-lineOffX, 75, btnW, 30);
- self.stopBtn.titleEdgeInsets = UIEdgeInsetsMake(0, leftOffX+16+5, 0, 20);
- //UIEdgeInsetsMake(CGFloat top, CGFloat left, CGFloat bottom, CGFloat right)
- self.stopBtn.imageEdgeInsets = UIEdgeInsetsMake(0, leftOffX, 0, 20);
-
-
- self.file_cmd_line2.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW*2-lineOffX, 80, 1, 20);
-
- self.deleteBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW*2-lineOffX, 75, btnW, 30);
- self.deleteBtn.titleEdgeInsets = UIEdgeInsetsMake(0, leftOffX+16+5, 0, 20);
- //UIEdgeInsetsMake(CGFloat top, CGFloat left, CGFloat bottom, CGFloat right)
- self.deleteBtn.imageEdgeInsets = UIEdgeInsetsMake(0, leftOffX, 0, 20);
-}
-
-/** ������������*/
-- (void)setItemView:(FileStatus*)model
-{
- self.model = model;
- self.contentView.backgroundColor = [UIColor clearColor];
-
- self.bkImage.image = [UIImage imageNamed:@"file_download_item_bk"];
- self.file_name_tag.image = [UIImage imageNamed:@"file_name_tag"];
-
- [self.fileName setText:[NSString stringWithFormat:@"������������%@",model.name]];
-
- MCDownloadReceipt *receipt = [[MCDownloadManager defaultInstance] downloadReceiptForURL:model.path];
-
- self.rateProgressView.progressValue = 0;
- self.rateProgressView.progressValue = receipt.progress.fractionCompleted;
-
- if (receipt.state == MCDownloadStateDownloading)
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- }
- else if (receipt.state == MCDownloadStateCompleted)
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- }
- else
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- }
-
- receipt.progressBlock = ^(NSProgress * _Nonnull downloadProgress,MCDownloadReceipt *receipt)
- {
- if ([receipt.url isEqualToString:model.path])
- {
- self.rateProgressView.progressValue = downloadProgress.fractionCompleted ;
- [self.rateProgressView setNeedsLayout];
- }
- };
-
- receipt.successBlock = ^(NSURLRequest * _Nullablerequest, NSHTTPURLResponse * _Nullableresponse, NSURL * _NonnullfilePath) {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- };
-
- receipt.failureBlock = ^(NSURLRequest * _Nullable request, NSHTTPURLResponse * _Nullable response, NSError * _Nonnull error) {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- };
-}
-
-- (void)download
-{
- [[MCDownloadManager defaultInstance] downloadFileWithURL:self.model.path
- progress:^(NSProgress * _Nonnull downloadProgress, MCDownloadReceipt *receipt)
- {
- if ([receipt.url isEqualToString:self.model.path])
- {
- self.rateProgressView.progressValue = downloadProgress.fractionCompleted ;
- [self.rateProgressView setNeedsLayout];
- }
- }
- destination:nil
- success:^(NSURLRequest * _Nonnull request, NSHTTPURLResponse * _Nullable response, NSURL * _Nonnull filePath)
- {
- // ������������������
- if ( _delegate && [_delegate respondsToSelector:@selector(didCellDetailSection:)])
- {
- self.model.filePath = [[MCDownloadManager defaultInstance] getURLPath:self.model.path];
-
- [_delegate didCellDetailSection:self.model];
- }
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- }
- failure:^(NSURLRequest * _Nonnull request, NSHTTPURLResponse * _Nullable response, NSError * _Nonnull error)
- {
- [self.startBtn setTitle:@"������������" forState:UIControlStateNormal];
- }];
-
-}
-
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileStatusView.h b/pregnancy_guard/BaseProject/Views/Cell/FileStatusView.h
deleted file mode 100644
index 8a68101..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileStatusView.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// FileStatusView.h
-// GoldRich
-//
-// Created by WindShan on 2017/2/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "FileStatus.h"
-
-@protocol SelectedDelegate <NSObject>
-
-@optional
-
-- (void)didSelectedSection:(FileStatus*)model;
-
-@end
-
-@protocol SelDetailDelegate <NSObject>
-
-@optional
-
-- (void)didDetailSection:(FileStatus*)model;
-
-@end
-
-@interface FileStatusView : UIView
-
-@property (nonatomic, strong) UITableView * tableView;
-@property (nonatomic, strong) FileStatus * model;
-@property (nonatomic, strong) NSMutableArray * modelArray;
-
-@property(nonatomic, assign)id<SelectedDelegate> delegate;
-@property(nonatomic, assign)id<SelDetailDelegate> detailDelegate;
-
-- (instancetype)initWithFrame:(CGRect)frame;
-- (void) reSetView;
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/FileStatusView.m b/pregnancy_guard/BaseProject/Views/Cell/FileStatusView.m
deleted file mode 100644
index ecdbd4d..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/FileStatusView.m
+++ /dev/null
@@ -1,279 +0,0 @@
-//
-// FileStatusView.m
-// GoldRich
-//
-// Created by WindShan on 2017/2/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "FileStatusView.h"
-#import "GloriaLabel.h"
-#import "UIImageView+WebCache.h"
-#import "FileStatusCell.h"
-#import "MBProgressHUD+Add.h"
-#import "NetworkSingleton.h"
-#import "MCWiFiManager.h"
-
-@interface FileStatusView()<UITableViewDelegate,UITableViewDataSource,SelCellDetailDelegate>
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-{
- UIButton* deviceOpenBtn;
- NSInteger pageIndex;
- NSInteger pageSize;
-}
-@end
-
-
-@implementation FileStatusView
-
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- _tableView.separatorColor = [UIColor clearColor];
-
- [self addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
- if (self = [super initWithFrame:frame])
- {
- self.tableView.frame = frame;
- self.tableView.hidden = NO;
- self.modelArray = [[NSMutableArray alloc] init];
- pageIndex = 1;
- pageSize = 20;
-
- // test
- //for (int i = 0; i < 10; i++) {
- // FileStatus * status = [[FileStatus alloc] init];
- // [self.modelArray addObject:status];
- //}
-
- [self setUpTableView];
- }
-
- return self;
-}
-
--(void)getFirstPageData
-{
- pageIndex=1;
- [self getFileList:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(void) reloadData
-{
- pageIndex++;
- [self getFileList:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
--(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) getFileList:(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_FILE_LIST];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
- // tempdebug
- //[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 = [FileStatus 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];
- }];
-}
-
-- (void) reSetView
-{
- pageIndex = 1;
- [self getFileList:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
-#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 106;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"StatusCell";
- FileStatusCell * statusCell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == statusCell) {
- statusCell = [[FileStatusCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- statusCell.delegate = self;
- statusCell.selectionStyle = UITableViewCellSelectionStyleNone;
- statusCell.userInteractionEnabled = YES;
-
- FileStatus * model = [self.modelArray objectAtIndex:indexPath.row];
-
- model.row = indexPath.row;
- model.section = indexPath.section;
- [statusCell setItemView:model];
-
- return statusCell;
-}
-
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [tableView deselectRowAtIndexPath:indexPath animated:YES];
-
- if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedSection:)])
- {
- FileStatus * model = [self.modelArray objectAtIndex:indexPath.row];
- [_delegate didSelectedSection:model];
- }
-}
-
-
-// ������������������
-- (void)didCellDetailSection:(FileStatus*)model
-{
- if ( _detailDelegate && [_detailDelegate respondsToSelector:@selector(didDetailSection:)])
- {
- [_detailDelegate didDetailSection:model];
- }
-}
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.h b/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.h
index b816e12..eeebc3d 100644
--- a/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.h
+++ b/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.h
@@ -7,22 +7,24 @@
//
#import "BaseTableViewCell.h"
-#import "HotelAccount.h"
+#import "MusicModel.h"
@protocol musicPlayDelegate <NSObject>
@optional
-- (void)musicPlaySection:(HotelAccount*)model;
+- (void)musicPlaySection:(MusicModel*)model;
@end
@interface MusicPlayCell : BaseTableViewCell
@property(nonatomic, assign)id<musicPlayDelegate> delegate;
-@property(nonatomic, strong) HotelAccount* model;
+@property(nonatomic, strong) MusicModel* model;
/** ������������*/
-- (void)setItemView:(HotelAccount *) model;
+- (void)setItemView:(MusicModel *) model;
+- (void)setItemView:(MusicModel *) model setName:(NSString*)name;
@end
+
diff --git a/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m b/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m
index 942b78c..b467b51 100644
--- a/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m
+++ b/pregnancy_guard/BaseProject/Views/Cell/MusicPlayCell.m
@@ -11,11 +11,12 @@
@interface MusicPlayCell()
{
-
+
}
@property (nonatomic, strong) GloriaLabel * NumberLabel;
@property (nonatomic, strong) GloriaLabel * musicNameLabel;
+@property (nonatomic, strong) GloriaLabel * LevelsNameLabel;
@property (nonatomic, strong) UIButton * personalLikeBtn;
@property (nonatomic, strong) UIButton * userPlayBtn;
@end
@@ -23,12 +24,12 @@
@implementation MusicPlayCell
/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
+ // Only override drawRect: if you perform custom drawing.
+ // An empty implementation adversely affects performance during animation.
+ - (void)drawRect:(CGRect)rect {
+ // Drawing code
+ }
+ */
- (void)layoutSubviews
{
@@ -36,8 +37,9 @@
self.NumberLabel.frame = CGRectMake(20, 10, 40, 30);
- self.musicNameLabel.frame = CGRectMake(20+40, 10, SCREEN_WIDTH/2, 30);
-
+ self.musicNameLabel.frame = CGRectMake(20+40, 25, SCREEN_WIDTH/2, 20);
+ self.LevelsNameLabel.frame = CGRectMake(20+40, 5, SCREEN_WIDTH/2, 20);
+
self.personalLikeBtn.frame = CGRectMake(SCREEN_WIDTH-20-15, 17, 15, 15);
self.userPlayBtn.frame = CGRectMake(SCREEN_WIDTH-20-15-50-15, 17, 15, 15);
}
@@ -90,6 +92,20 @@
}
}
+- (GloriaLabel *) LevelsNameLabel
+{
+ if(!_LevelsNameLabel)
+ {
+ _LevelsNameLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
+ _LevelsNameLabel.font = [UIFont systemFontOfSize:16];
+ _LevelsNameLabel.textAlignment = UITextAlignmentLeft;
+ _LevelsNameLabel.textColor = kUIColorFromRGB(0x595959);
+ [self.contentView addSubview:_LevelsNameLabel];
+ }
+
+ return _LevelsNameLabel;
+}
+
- (GloriaLabel *) NumberLabel
{
if(!_NumberLabel)
@@ -111,21 +127,34 @@
_musicNameLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(10+50+10+80, 28,150, 14)];
_musicNameLabel.font = [UIFont systemFontOfSize:16];
_musicNameLabel.textAlignment = UITextAlignmentLeft;
- _musicNameLabel.textColor = kUIColorFromRGB(0x595959);
+ _musicNameLabel.textColor = kUIColorFromRGB(0xc4c4c4);
[self.contentView addSubview:_musicNameLabel];
}
return _musicNameLabel;
}
-- (void)setItemView:(HotelAccount*)model
+- (void)setItemView:(MusicModel*)model
{
self.model = model;
-
+ //icon_musicset
[self.userPlayBtn setBackgroundImage:[UIImage imageNamed: model.playStatus == 1 ?@"icon_play":@"icon_start" ] forState:UIControlStateNormal];
- [self.personalLikeBtn setBackgroundImage:[UIImage imageNamed: model.setStatus == 1 ?@"icon_like":@"icon_unlike" ] forState:UIControlStateNormal];
+ [self.personalLikeBtn setBackgroundImage:[UIImage imageNamed: @"icon_voiceset"] forState:UIControlStateNormal];
[self.NumberLabel setText:model.xuhaoIndex];
- [self.musicNameLabel setText:@"���������������������"];
+ [self.musicNameLabel setText:model.musicName];
+ [self.LevelsNameLabel setText:model.username];
+
}
+- (void)setItemView:(MusicModel *) model setName:(NSString*)name
+{
+ self.model = model;
+ //icon_musicset
+ [self.userPlayBtn setBackgroundImage:[UIImage imageNamed: model.playStatus == 1 ?@"icon_play":@"icon_start" ] forState:UIControlStateNormal];
+ [self.personalLikeBtn setBackgroundImage:[UIImage imageNamed: name] forState:UIControlStateNormal];
+ [self.NumberLabel setText:model.xuhaoIndex];
+ [self.musicNameLabel setText:model.musicName];
+ [self.LevelsNameLabel setText:model.username];
+}
@end
+
diff --git a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusCell.h b/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusCell.h
deleted file mode 100644
index 7ebc199..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusCell.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// MyDeviceStatusCell.h
-// terminalMgr
-//
-// Created by WindShan on 2017/3/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "BaseTableViewCell.h"
-#import "MyDeviceStatus.h"
-
-@protocol SelCellDetailDelegate <NSObject>
-
-@optional
-
-- (void)didCellDetailSection:(MyDeviceStatus*)model;
-
-@end
-
-@interface MyDeviceStatusCell : BaseTableViewCell
-
-@property(nonatomic, assign)id<SelCellDetailDelegate> delegate;
-@property(nonatomic, strong) MyDeviceStatus* model;
-
-/** ������������*/
-- (void)setItemView:(MyDeviceStatus*)model;
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusCell.m b/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusCell.m
deleted file mode 100644
index d636c76..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusCell.m
+++ /dev/null
@@ -1,371 +0,0 @@
-//
-// MyDeviceStatusCell.m
-// terminalMgr
-//
-// Created by WindShan on 2017/3/16.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "MyDeviceStatusCell.h"
-#import "GloriaLabel.h"
-#import "UIImageView+WebCache.h"
-#import "commenProgressView.h"
-
-@interface MyDeviceStatusCell()
-{
-
-}
-
-@property (nonatomic, strong) UIImageView * bkImage;
-@property (nonatomic, strong) UIImageView * file_name_tag;
-@property (nonatomic, strong) UIImageView * file_name_line;
-@property (nonatomic, strong) UIImageView * file_cmd_line;
-@property (nonatomic, strong) UIImageView * file_cmd_line2;
-@property (nonatomic, strong) GloriaLabel * fileName;
-@property (nonatomic, strong) UIButton * startBtn;
-@property (nonatomic, strong) UIButton * stopBtn;
-@property (nonatomic, strong) UIButton * deleteBtn;
-@property (nonatomic, strong) GloriaLabel * useStatus;
-@property (nonatomic, strong) GloriaLabel * room_No;
-@property (nonatomic, strong) UIImageView * lw_status;
-@property (nonatomic, strong) GloriaLabel * lw_change_status;
-
-@end
-
-@implementation MyDeviceStatusCell
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-
-- (GloriaLabel *) lw_change_status
-{
- if(!_lw_change_status)
- {
- _lw_change_status = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,50, 50)];
- _lw_change_status.font = [UIFont systemFontOfSize:8];
- _lw_change_status.textAlignment = UITextAlignmentLeft;
- _lw_change_status.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_lw_change_status];
- }
-
- return _lw_change_status;
-}
-
-
-- (UIImageView *)lw_status
-{
- if (!_lw_status)
- {
- _lw_status = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, 2, 100)];
- [self.contentView addSubview:_lw_status];
- }
-
- return _lw_status;
-}
-
-- (GloriaLabel *) useStatus
-{
- if(!_useStatus)
- {
- _useStatus = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
- _useStatus.font = [UIFont systemFontOfSize:12];
- _useStatus.textAlignment = UITextAlignmentLeft;
- _useStatus.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_useStatus];
- }
-
- return _useStatus;
-}
-
-- (GloriaLabel *) room_No
-{
- if(!_room_No)
- {
- _room_No = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
- _room_No.font = [UIFont systemFontOfSize:12];
- _room_No.textAlignment = UITextAlignmentLeft;
- _room_No.textColor = kUIColorFromRGB(0x5a5a5a);
- [self.contentView addSubview:_room_No];
- }
-
- return _room_No;
-}
-
-//NSString * btncmd; // ������������ 0 ������������ 1 ������������&������������ 2 ������������
--(void)startAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(didCellDetailSection:)])
- {
- self.model.btncmd = @"0";
- [_delegate didCellDetailSection:self.model];
- }
-}
-
--(void)stopAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(didCellDetailSection:)])
- {
- self.model.btncmd = @"2";
- [_delegate didCellDetailSection:self.model];
- }
-}
-
--(void)deleteAction
-{
- if ( _delegate && [_delegate respondsToSelector:@selector(didCellDetailSection:)])
- {
- self.model.btncmd = @"1";
- [_delegate didCellDetailSection:self.model];
- }
-}
-
--(UIButton*)deleteBtn
-{
- if(!_deleteBtn)
- {
- _deleteBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
- _deleteBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_deleteBtn setImage:[UIImage imageNamed:@"ic_open_gg_tag"] forState:UIControlStateNormal];
- [_deleteBtn setTitle:@"������������" forState:UIControlStateNormal];
- [_deleteBtn setTitleColor:kUIColorFromRGB(0x5a5a5a) forState:UIControlStateNormal];
- //_deleteBtn.backgroundColor = [UIColor redColor]; //������������
-
- _deleteBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_deleteBtn addTarget:self action:@selector(deleteAction) forControlEvents:UIControlEventTouchUpInside];
-
- [_deleteBtn setTintColor:RgbColor(253,137,8)];
- [_startBtn setTag:2];
-
- [self.contentView addSubview:_deleteBtn];
- }
-
- return _deleteBtn;
-}
-
--(UIButton*)stopBtn
-{
- if(!_stopBtn)
- {
- _stopBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
- _stopBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_stopBtn setImage:[UIImage imageNamed:@"ic_change_device_tag"] forState:UIControlStateNormal];
- [_stopBtn setTitle:@"������������" forState:UIControlStateNormal];
- [_stopBtn setTitleColor:kUIColorFromRGB(0x5a5a5a) forState:UIControlStateNormal];
- //_stopBtn.backgroundColor = [UIColor redColor]; //������������
-
- _stopBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_stopBtn addTarget:self action:@selector(stopAction) forControlEvents:UIControlEventTouchUpInside];
- [_startBtn setTag:1];
- [_stopBtn setTintColor:RgbColor(253,137,8)];
-
- [self.contentView addSubview:_stopBtn];
- }
-
- return _stopBtn;
-}
-
-
--(UIButton*)startBtn
-{
- if(!_startBtn)
- {
- _startBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
- _startBtn.frame = CGRectMake(0, SCREEN_HEIGHT-100, 118, 30);
- [_startBtn setImage:[UIImage imageNamed:@"ic_fabu_gg_tag"] forState:UIControlStateNormal];
- [_startBtn setTitle:@"������������" forState:UIControlStateNormal];
- [_startBtn setTitleColor:kUIColorFromRGB(0x5a5a5a) forState:UIControlStateNormal];
- //_startBtn.backgroundColor = [UIColor redColor]; //������������
-
- _startBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
- [_startBtn addTarget:self action:@selector(startAction) forControlEvents:UIControlEventTouchUpInside];
-
- [_startBtn setTintColor:RgbColor(253,137,8)];
- [_startBtn setTag:0];
- [self.contentView addSubview:_startBtn];
- }
-
- return _startBtn;
-}
-
-- (GloriaLabel *) fileName
-{
- if(!_fileName)
- {
- _fileName = [[GloriaLabel alloc] initWithFrame:CGRectMake(8+10+45, 5,SCREEN_WIDTH/2, 30)];
- _fileName.font = [UIFont systemFontOfSize:12];
- _fileName.textAlignment = UITextAlignmentLeft;
- _fileName.textColor = kUIColorFromRGB(0x6e6e6e);
- [self.contentView addSubview:_fileName];
- }
-
- return _fileName;
-}
-
-- (UIImageView *)file_name_tag
-{
- if (!_file_name_tag)
- {
- _file_name_tag = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, 2, 100)];
- [self.contentView addSubview:_file_name_tag];
- }
-
- return _file_name_tag;
-}
-
-- (UIImageView *)bkImage
-{
- if (!_bkImage)
- {
-
- CGFloat bkImageW = 708;
- if(IsiPhone4 || IsiPhone5)
- {
- bkImageW = 620;
- }
-
- _bkImage = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-bkImageW)/2-10, 0, bkImageW-20, 80)];
- [self.contentView addSubview:_bkImage];
- }
-
- return _bkImage;
-}
-
-
-
-- (UIImageView *)file_name_line
-{
- if (!_file_name_line)
- {
- _file_name_line = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- _file_name_line.image = [UIImage imageNamed:@"ic_device_line"];
- [self.contentView addSubview:_file_name_line];
- }
-
- return _file_name_line;
-}
-
-- (UIImageView *)file_cmd_line
-{
- if (!_file_cmd_line)
- {
- _file_cmd_line = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- _file_cmd_line.image = [UIImage imageNamed:@"file_cmd_line"];
- [self.contentView addSubview:_file_cmd_line];
- }
-
- return _file_cmd_line;
-}
-
-- (UIImageView *)file_cmd_line2
-{
- if (!_file_cmd_line2)
- {
- _file_cmd_line2 = [[UIImageView alloc] initWithFrame:CGRectMake(8, 5, SCREEN_WIDTH-16, 70)];
- _file_cmd_line2.image = [UIImage imageNamed:@"file_cmd_line"];
- [self.contentView addSubview:_file_cmd_line2];
- }
-
- return _file_cmd_line2;
-}
-
-
-//@property (nonatomic, strong) UIImageView * bkImage;
-//@property (nonatomic, strong) UIImageView * iconImage;
-//@property (nonatomic, strong) UIImageView * nameCircleImage;
-//@property (nonatomic, strong) UIImageView * statusCircleImage;
-//@property (nonatomic, strong) GloriaLabel * deviceName;
-//@property (nonatomic, strong) GloriaLabel * FileStatus;
-
-- (void)layoutSubviews
-{
- [super layoutSubviews];
-
- CGFloat bkImageW = 356;
- CGFloat btnW = 118;
- CGFloat leftOffX = 10;
- CGFloat lineOffX = 0;
- if(IsiPhone4 || IsiPhone5)
- {
- bkImageW = 300;
- btnW = 105;
- leftOffX = 0;
- lineOffX = 10;
- }
-
- self.lw_status.frame = CGRectMake(SCREEN_WIDTH-20-55, 15, 57, 57);
-
- self.bkImage.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2, 10, bkImageW, 98);
- self.file_name_tag.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+10, 17, 2, 16);
- self.file_name_line.frame = CGRectMake((SCREEN_WIDTH-bkImageW+20)/2, 40, bkImageW-self.lw_status.frame.size.width-30, 1);
-
-
- self.fileName.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+10+10, 10, SCREEN_WIDTH/2, 30);
- self.startBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2, 75, btnW, 30);
- self.startBtn.titleEdgeInsets = UIEdgeInsetsMake(0, leftOffX+16+5, 0, 20);
- //UIEdgeInsetsMake(CGFloat top, CGFloat left, CGFloat bottom, CGFloat right)
- self.startBtn.imageEdgeInsets = UIEdgeInsetsMake(0, leftOffX, 0, 20);
-
- self.file_cmd_line.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW-lineOffX, 80, 1, 20);
-
- self.stopBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW*2-lineOffX, 75, btnW, 30);
- self.stopBtn.titleEdgeInsets = UIEdgeInsetsMake(0, leftOffX+16+5, 0, 20);
- //UIEdgeInsetsMake(CGFloat top, CGFloat left, CGFloat bottom, CGFloat right)
- self.stopBtn.imageEdgeInsets = UIEdgeInsetsMake(0, leftOffX, 0, 20);
-
-
- self.file_cmd_line2.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW*2-lineOffX, 80, 1, 20);
-
- self.deleteBtn.frame = CGRectMake((SCREEN_WIDTH-bkImageW)/2+2+btnW-lineOffX, 75, btnW, 30);
- self.deleteBtn.titleEdgeInsets = UIEdgeInsetsMake(0, leftOffX+16+5, 0, 20);
- //UIEdgeInsetsMake(CGFloat top, CGFloat left, CGFloat bottom, CGFloat right)
- self.deleteBtn.imageEdgeInsets = UIEdgeInsetsMake(0, leftOffX, 0, 20);
-
- //CGRectMake((SCREEN_WIDTH-bkImageW+20)/2, 50, bkImageW-20, 16);
- self.useStatus.frame = CGRectMake((SCREEN_WIDTH-bkImageW+20)/2, 50, (bkImageW-20)/2, 20);
- self.room_No.frame = CGRectMake((SCREEN_WIDTH)/2, 50, (bkImageW-20)/2, 20);
-
-
-
- // ������������ ���������������
- self.lw_change_status.frame = CGRectMake(SCREEN_WIDTH-20-55, 15, 56, 56);
- self.lw_change_status.font = [UIFont systemFontOfSize:10];
- self.lw_change_status.numberOfLines = 0;//������������������������������
- self.lw_change_status.textAlignment = UITextAlignmentCenter;
-}
-
-/** ������������*/
-- (void)setItemView:(MyDeviceStatus*)model
-{
- self.model = model;
- self.contentView.backgroundColor = [UIColor clearColor];
-
- self.bkImage.image = [UIImage imageNamed:@"file_download_item_bk"];
- self.file_name_tag.image = [UIImage imageNamed:@"ic_devicename_tag"];
- self.lw_status.image = [UIImage imageNamed:@"lw_chaneg_bk"];
-
- [self.fileName setText:[NSString stringWithFormat:@"���������������%@",model.name]];
- [self.fileName setTextColor:kUIColorFromRGB(0x00b742)];
- //int status; 1 ������ 2 ���������������
- [self.useStatus setText:[NSString stringWithFormat:@"���������������%@",model.status == 1?@"������":@"���������������"]];
- [self.room_No setText:[NSString stringWithFormat:@"������������������%d",model.fs_count]];
- [self.stopBtn setTitle:model.status == 1?@"������������":@"������������" forState:UIControlStateNormal];
-
- //[self.lw_change_status setText:@"������\n���������"];
- //[self.lw_change_status setTextColor:kUIColorFromRGB(0xfc7411)];
- // fs_status;//0������������1������
- self.lw_status.image = [UIImage imageNamed:model.fs_status == 0 ? @"lw_normal_bk":@"lw_chaneg_bk"];
- [self.lw_change_status setText:model.fs_status == 0 ?@"������\n������":@"������\n���������"];
- [self.lw_change_status setTextColor:model.fs_status == 0 ?kUIColorFromRGB(0x00b742):kUIColorFromRGB(0xfc7411)];
-
- //int ad_mode;//": 1 ������������ 0 ������������
-
- [_deleteBtn setImage:[UIImage imageNamed:model.ad_mode == 0?@"ic_open_gg_tag":@"ic_close_gg_tag"] forState:UIControlStateNormal];
- [_deleteBtn setTitle:model.ad_mode == 0?@"������������":@"������������" forState:UIControlStateNormal];
-
-}
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusView.h b/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusView.h
deleted file mode 100644
index 352a31c..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusView.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// MyDeviceStatusView.h
-// GoldRich
-//
-// Created by WindShan on 2017/2/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "MyDeviceStatus.h"
-#import "GloriaLabel.h"
-
-@protocol SelectedDelegate <NSObject>
-
-@optional
-
-- (void)didSelectedSection:(MyDeviceStatus*)model;
-
-@end
-
-@protocol SelDetailDelegate <NSObject>
-
-@optional
-
-- (void)didDetailSection:(MyDeviceStatus*)model;
-
-@end
-
-@interface MyDeviceStatusView : UIView
-
-@property (nonatomic, strong) UITableView * tableView;
-@property (nonatomic, strong) MyDeviceStatus * model;
-@property (nonatomic, strong) NSMutableArray * modelArray;
-@property (nonatomic, strong) NSString * uid;
-@property (nonatomic, strong) NSString * type;
-@property (nonatomic, strong) NSString * key;
-@property (nonatomic, strong) NSString * hotel_id;
-
-@property (nonatomic, strong) UIButton* _loadErrorBtn;
-@property (nonatomic, strong) GloriaLabel *tipsLabel;
-
-@property(nonatomic, assign)id<SelectedDelegate> delegate;
-@property(nonatomic, assign)id<SelDetailDelegate> detailDelegate;
-
-- (instancetype)initWithFrame:(CGRect)frame userId:(NSString*)uid devicetype:(NSString*)type searchkey:(NSString*)key;
-- (void) reSetView:(NSString*)uid devicetype:(NSString*)type searchkey:(NSString*)key;
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusView.m b/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusView.m
deleted file mode 100644
index 3a37d29..0000000
--- a/pregnancy_guard/BaseProject/Views/Cell/MyDeviceStatusView.m
+++ /dev/null
@@ -1,335 +0,0 @@
-//
-// MyDeviceStatusView.m
-// GoldRich
-//
-// Created by WindShan on 2017/2/13.
-// Copyright �� 2017��� WindShan. All rights reserved.
-//
-
-#import "MyDeviceStatusView.h"
-#import "GloriaLabel.h"
-#import "UIImageView+WebCache.h"
-#import "MyDeviceStatusCell.h"
-#import "MBProgressHUD+Add.h"
-#import "NetworkSingleton.h"
-
-@interface MyDeviceStatusView()<UITableViewDelegate,UITableViewDataSource,SelCellDetailDelegate>
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
- // Drawing code
-}
-*/
-{
- UIButton* deviceOpenBtn;
- NSInteger pageIndex;
- NSInteger pageSize;
-}
-@end
-
-
-@implementation MyDeviceStatusView
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] init];
-
-
- _tableView.delegate = self;
- _tableView.dataSource = self;
- _tableView.separatorColor = [UIColor clearColor];
-
- [self addSubview:_tableView];
-
- [_tableView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.edges.mas_equalTo(UIEdgeInsetsMake(0 , 0, 0, 0));
- }];
-
- _tableView.tableFooterView = [UIView new];
- }
- return _tableView;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame userId:(NSString*)uid devicetype:(NSString*)type searchkey:(NSString*)key
-{
- if (self = [super initWithFrame:frame])
- {
- self.tableView.frame = frame;
- self.tableView.hidden = NO;
- self.modelArray = [[NSMutableArray alloc] init];
- self.uid = uid;
- self.type = type;
- self.key = key;
- pageIndex = 1;
- pageSize = 20;
-
- __loadErrorBtn = [UIButton buttonWithType:UIButtonTypeCustom];
- __loadErrorBtn.frame = CGRectMake((SCREEN_WIDTH-100)/2, SCREEN_HEIGHT/3, 100, 100);
- [__loadErrorBtn setImage:[UIImage imageNamed:@"page_icon_empty"] forState:UIControlStateNormal];
- __loadErrorBtn.layer.masksToBounds=YES;
- __loadErrorBtn.layer.cornerRadius=8.0f;
- [__loadErrorBtn addTarget:self action:@selector(getFirstPageData) forControlEvents:UIControlEventTouchUpInside];
- [self addSubview:__loadErrorBtn];
-
- _tipsLabel = [[GloriaLabel alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT/3 + 120, SCREEN_WIDTH, 60)];
- _tipsLabel.font = [UIFont systemFontOfSize:20.0];
- _tipsLabel.textColor = [UIColor blackColor];
- _tipsLabel.textAlignment = NSTextAlignmentCenter;
- _tipsLabel.text = @"���������������������������������������";
- [self addSubview:_tipsLabel];
-
- __loadErrorBtn.hidden = YES;
- _tipsLabel.hidden = YES;
-
- // test
- //for (int i = 0; i < 10; i++)
- //{
- // MyDeviceStatus * status = [[MyDeviceStatus alloc] init];
- // [self.modelArray addObject:status];
- //}
-
- [self setUpTableView];
- }
-
- return self;
-}
-
--(void)getFirstPageData
-{
- __loadErrorBtn.hidden = YES;
- _tableView.hidden = NO;
- _tipsLabel.hidden = YES;
- pageIndex=1;
- [self getDeviceList:self.uid devicetype:self.type searchkey:self.key 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)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) 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;
- }
-
- //@property (nonatomic, assign) int opt;//opt=1���������������������opt=2������������������
-
- int userOpt = [[UserDefault stringForKey:@"opt"] intValue];
-
- NSString *path = [[NSString alloc] initWithFormat:userOpt == 1? GET_DEVICE_INFO:GET_DEVICE_INFO_WAITER];
-
- NSMutableDictionary *param = [[NSMutableDictionary alloc] init];
-
- // tempdebug
- if(userOpt == 1)
- [param setObject:userID forKey:@"userID"];
- else
- [param setObject:userID forKey:@"waiterID"];
-
- [param setObject:key forKey:@"keyword"];
- [param setObject:self.hotel_id forKey:@"hotel_id"];
- [param setObject:type forKey:@"type"];
- [param setObject:page forKey:@"currentPage"];
- [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 = [MyDeviceStatus mj_objectArrayWithKeyValuesArray:resModel.content];
-
- BASE_INFO_FUN(resModel.content);
-
- [_modelArray addObjectsFromArray:modelTempArray];
-
- __loadErrorBtn.hidden = YES;
- _tipsLabel.hidden = YES;
-
- _tableView.hidden = NO;
- [_tableView reloadData];
-
- }
- else
- {
- // ������������
- if(self.modelArray.count > 0)
- {
- [self.modelArray removeAllObjects];
-
- }
-
- __loadErrorBtn.hidden = NO;
- _tipsLabel.hidden = NO;
- [_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;
- __loadErrorBtn.hidden = NO;
- _tipsLabel.hidden = NO;
-
- }
- }
- failure:^(NSString *error)
- {
- [_tableView.mj_header endRefreshing];
- [_tableView.mj_footer endRefreshing];
- if( isShow == YES)
- HUD.hidden = YES;
-
- [_tableView reloadData];
-
- _tableView.hidden = YES;
-
- __loadErrorBtn.hidden = NO;
- _tipsLabel.hidden = NO;
-
- [Global alertMessageEx:error title:@"������������" okTtitle:nil cancelTitle:@"OK" delegate:self];
- }];
-
-
-}
-
-- (void) reSetView:(NSString*)uid devicetype:(NSString*)type searchkey:(NSString*)key
-{
- if(key!=nil)
- {
- self.key = key;
-
- }
-
- pageIndex = 1;
- self.type = type;
-
- [self getDeviceList:self.uid devicetype:self.type searchkey:self.key isTips:NO pageIndex:[NSString stringWithFormat:@"%ld",pageIndex] pageSize:[NSString stringWithFormat:@"%ld",pageSize]];
-}
-
-#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 106;
-}
-
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-
- NSString * identifier = @"MyDeviceStatusCell";
- MyDeviceStatusCell * statusCell = [tableView dequeueReusableCellWithIdentifier:identifier];
- if (nil == statusCell) {
- statusCell = [[MyDeviceStatusCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-
- }
-
- statusCell.delegate = self;
- statusCell.selectionStyle = UITableViewCellSelectionStyleNone;
- statusCell.userInteractionEnabled = YES;
-
- MyDeviceStatus * model = [self.modelArray objectAtIndex:indexPath.row];
-
- [statusCell setItemView:model];
-
- return statusCell;
-}
-
--(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];
- }
-}
-
-
-- (void)didCellDetailSection:(MyDeviceStatus*)model
-{
- if ( _detailDelegate && [_detailDelegate respondsToSelector:@selector(didDetailSection:)])
- {
- [_detailDelegate didDetailSection:model];
- }
-}
-
-@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/SysTipsView.h b/pregnancy_guard/BaseProject/Views/Cell/SysTipsView.h
new file mode 100644
index 0000000..c0366d4
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Views/Cell/SysTipsView.h
@@ -0,0 +1,30 @@
+//
+// FileDownView.h
+// GoldRich
+//
+// Created by WindShan on 2017/2/13.
+// Copyright �� 2017��� WindShan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "NoticeModel.h"
+
+
+@protocol SelectedActionDelegate <NSObject>
+
+@optional
+
+- (void)didSelectedAction:(NSInteger)type;
+
+@end
+
+
+@interface SysTipsView : UIView
+
+@property(nonatomic, assign)id<SelectedActionDelegate> delegate;
+
+
+- (instancetype)initWithFrame:(CGRect)frame tipsTitle:(NSString*)title tipsContext:(NSString*)context;
+
+-(void)setUIView:(NSString*)title tipsContext:(NSString*)context;
+@end
diff --git a/pregnancy_guard/BaseProject/Views/Cell/SysTipsView.m b/pregnancy_guard/BaseProject/Views/Cell/SysTipsView.m
new file mode 100644
index 0000000..605df0c
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Views/Cell/SysTipsView.m
@@ -0,0 +1,173 @@
+//
+// SysTipsView.m
+// GoldRich
+//
+// Created by WindShan on 2017/2/13.
+// Copyright �� 2017��� WindShan. All rights reserved.
+//
+
+#import "SysTipsView.h"
+#import "GloriaLabel.h"
+
+@interface SysTipsView()<SelectedActionDelegate>
+{
+
+}
+
+@property (nonatomic, strong) UIImageView * noticeBK;
+@property (nonatomic, strong) UIImageView * noticeLogo;
+@property (nonatomic, strong) UIButton * cancelBtn;
+@property (nonatomic, strong) UIButton * sureBtn;
+@property (nonatomic, strong) GloriaLabel * noticeContext;
+@property (nonatomic, strong) GloriaLabel * noticeTitle;
+
+@end
+
+
+@implementation SysTipsView
+
+- (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*)cancelBtn
+{
+ if(!_cancelBtn)
+ {
+ _cancelBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+ _cancelBtn.frame = CGRectMake(30, 125, 76, 26);
+ [_cancelBtn setBackgroundImage:[UIImage imageNamed:@"cancel_look" ] forState:UIControlStateNormal];
+ [_cancelBtn setTitle:@"��� ���" forState:UIControlStateNormal];
+ [_cancelBtn setTitleColor:kUIColorFromRGB(0x7d7d7d) forState:UIControlStateNormal];
+ //_deleteBtn.backgroundColor = [UIColor redColor]; //������������
+
+ _cancelBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
+ [_cancelBtn addTarget:self action:@selector(CancelClickAction) forControlEvents:UIControlEventTouchUpInside];
+ [self.noticeBK addSubview:_cancelBtn];
+ }
+
+ return _cancelBtn;
+}
+
+-(UIButton*)sureBtn
+{
+ if(!_sureBtn)
+ {
+ _sureBtn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+ _sureBtn.frame = CGRectMake(258-76-30, 125, 76, 26);
+ [_sureBtn setBackgroundImage:[UIImage imageNamed:@"look_notice" ] forState:UIControlStateNormal];
+ [_sureBtn setTitle:@"������" forState:UIControlStateNormal];
+ [_sureBtn setTitleColor:kUIColorFromRGB(0xffffff) forState:UIControlStateNormal];
+ //_deleteBtn.backgroundColor = [UIColor redColor]; //������������
+
+ _sureBtn.titleLabel.font = [UIFont systemFontOfSize: 12.0];
+ [_sureBtn addTarget:self action:@selector(SureClickAction) forControlEvents:UIControlEventTouchUpInside];
+
+ [_sureBtn setTintColor:RgbColor(253,137,8)];
+
+ [self.noticeBK addSubview:_sureBtn];
+ }
+
+ return _sureBtn;
+}
+
+-(void)CancelClickAction
+{
+ [self setHidden:YES];
+ // ������������
+ if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedAction:)])
+ {
+ [_delegate didSelectedAction:0];
+ }
+}
+
+-(void)SureClickAction
+{
+ // ������������
+ if ( _delegate && [_delegate respondsToSelector:@selector(didSelectedAction:)])
+ {
+ [_delegate didSelectedAction:1];
+ }
+}
+
+- (instancetype)initWithFrame:(CGRect)frame tipsTitle:(NSString*)title tipsContext:(NSString*)context;
+{
+ if (self = [super initWithFrame:frame])
+ {
+ //������ ���������clear
+ self.backgroundColor = [UIColor clearColor];
+ self.opaque = NO;
+
+
+ [self setUIView:title tipsContext:context];
+ }
+
+ return self;
+}
+
+
+-(void)setUIView:(NSString*)title tipsContext:(NSString*)context;
+{
+ //self.backgroundColor = [UIColor clearColor];
+ self.noticeBK.image = [UIImage imageNamed:@"notice_bg"];
+ self.noticeLogo.image = [UIImage imageNamed:@"img_logo"];
+
+ [self.noticeContext setText:context];
+ [self.noticeTitle setText:title];
+ [self.sureBtn setTitle:@"��� ���" forState:UIControlStateNormal];
+ [self.cancelBtn setTitle:@"��� ���" forState:UIControlStateNormal];
+}
+
+@end
diff --git a/pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.h b/pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.h
new file mode 100755
index 0000000..e52b812
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.h
@@ -0,0 +1,66 @@
+//
+// QWAlertView.h
+// AlertTest
+//
+// Created by jonh on 2017/10/26.
+// Copyright �� 2017��� jonh. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+///������������
+typedef enum{
+ ///������ ��������������� ������
+ QWAlertViewStyleAlert = 0,
+ ///���
+ QWAlertViewStyleActionSheetDown,
+ ///���
+ QWAlertViewStyleActionSheetTop,
+ ///���
+ QWAlertViewStyleActiAlertLeft,
+ ///������
+ QWAlertViewStyleActiAlertRight,
+
+}QWAlertViewStyle;
+///������������
+typedef enum{
+ ///������������������ ������ ������������
+ CloseStyleTapClose = 0,
+ /// ������������������������ ������������������ ���������������������������
+ CloseStyleButtonClose,
+}CloseStyle;
+typedef void(^showBlock)(void);;
+typedef void(^dismissBlock)(void);
+@interface QWAlertView : NSObject
+///������������������������ ������
+@property (nonatomic, copy) showBlock showBlock;
+///������������
+@property (nonatomic, copy) dismissBlock dismissBlock;
+///������������
+@property (nonatomic, assign) CloseStyle closeStyle;
+/// ��������������� ��������� ������������������ ������������������������������ dismiss
+@property (nonatomic, assign) BOOL on;
+/// ������������ ������ 30*30
+@property (nonatomic, strong) UIImage *closeImage;
+/** ������������������ */
++ (QWAlertView *)sharedMask;
+/**
+ * show:withType: ������������
+ * @param contentView ���������������������
+ * @param style ������������
+ */
+- (void)show:(UIView *)contentView withType:(QWAlertViewStyle)style;
+/**
+ * show:withType:animationFinish:dismissHandle: ������������
+ * @param contentView ���������������������
+ * @param style ������������
+ * @param show ������������
+ * @param dismiss ������������
+ *
+ */
+- (void)show:(UIView *)contentView withType:(QWAlertViewStyle)style animationFinish:(showBlock)show dismissHandle:(dismissBlock)dismiss;
+/** ������������������ */
+- (void)dismiss;
+
+@end
+
diff --git a/pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.m b/pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.m
new file mode 100755
index 0000000..169dbe8
--- /dev/null
+++ b/pregnancy_guard/BaseProject/Views/Widget/QWAlertView/QWAlertView.m
@@ -0,0 +1,215 @@
+
+//
+// QWAlertView.m
+// AlertTest
+//
+// Created by jonh on 2017/10/26.
+// Copyright �� 2017��� jonh. All rights reserved.
+//
+
+#import "QWAlertView.h"
+///������������
+#define SCREEN_W [UIScreen mainScreen].bounds.size.width
+///������������
+#define SCREEN_H [UIScreen mainScreen].bounds.size.height
+#define KEYWINDOW [[UIApplication sharedApplication] keyWindow]
+#define ANIMATION_TIME 0.5
+@interface QWAlertView ()
+///���������
+@property (nonatomic, strong) CALayer *maskLayer;
+//���������������������
+@property (nonatomic, strong) UIControl *control;
+//������������������
+@property (nonatomic, strong) UIView *contentView;
+///������������
+@property (nonatomic, assign) QWAlertViewStyle alertStyle;
+///������������������
+@property (nonatomic, assign) CGAffineTransform starTransForm;
+///������������
+@property (nonatomic, strong) UIButton *closeBtn;
+@end
+@implementation QWAlertView
++ (QWAlertView *)sharedMask{
+ static QWAlertView *alertView;
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ if (!alertView) {
+ alertView = [[QWAlertView alloc] init];
+ }
+ });
+ return alertView;
+}
+
+- (UIControl *)control{
+
+ if(!_control){
+
+ _control = [[UIControl alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+
+ [_control addTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
+ _control.enabled = NO;
+ }
+ return _control;
+}
+- (UIButton *)closeBtn{
+
+ if(!_closeBtn){
+ //������������������
+ _closeBtn = [[UIButton alloc] init];
+ // _closeBtn.backgroundColor = [UIColor whiteColor];
+ // _closeBtn.layer.cornerRadius = 15.0;
+ [_closeBtn setImage:[UIImage imageNamed:@"close"] forState:UIControlStateNormal];
+ [_closeBtn addTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
+ _closeBtn.frame = CGRectMake(_contentView.frame.size.width - 30, 0, 30, 30);
+ [_contentView addSubview:_closeBtn];
+ }
+ return _closeBtn;
+}
+- (void)show:(UIView *)contentView withType:(QWAlertViewStyle)style{
+ //������������������������
+ CGFloat contentViewHeight = contentView.frame.size.height;
+ CGFloat contentViewWidth = contentView.frame.size.width;
+ if(contentViewHeight == 0.00||contentViewWidth == 0.00){
+ NSLog(@"������������ ������ ������������");
+ return;
+ }
+ _contentView = contentView;
+ _contentView.center = KEYWINDOW.center;
+ _alertStyle = style;
+ _on = YES;
+ if (!_maskLayer) {
+ [self addMaskLayer];
+ // ������������������ ������������
+ switch (_alertStyle) {
+ case QWAlertViewStyleAlert:
+ _starTransForm = CGAffineTransformMakeScale(0.01, 0.01);
+ break;
+ case QWAlertViewStyleActiAlertLeft:
+ _starTransForm = CGAffineTransformMakeTranslation(-SCREEN_W, 0);
+ break;
+ case QWAlertViewStyleActiAlertRight:
+ _starTransForm = CGAffineTransformMakeTranslation(SCREEN_W, 0);
+ break;
+ case QWAlertViewStyleActionSheetTop:
+
+ _starTransForm = CGAffineTransformMakeTranslation(0, -_contentView.frame.size.height);
+ break;
+ case QWAlertViewStyleActionSheetDown:
+
+ _starTransForm = CGAffineTransformMakeTranslation(0, SCREEN_H);
+ break;
+ default:
+ break;
+ }
+ [self alertAnimatedPrensent];
+
+ }else {
+
+ //
+ _maskLayer = nil;
+ }
+
+
+}
+// ������������alert���actionSheet������view���������������������
+- (void)show:(UIView *)contentView withType:(QWAlertViewStyle)style animationFinish:(showBlock)show dismissHandle:(dismissBlock)dismiss {
+ //������ ������
+ if (show) {
+ _showBlock = [show copy];
+ }
+ if(dismiss){
+ _dismissBlock = [dismiss copy];
+ }
+ [self show:contentView withType:style];
+}
+
+
+///������������
+- (void)addMaskLayer{
+ _maskLayer = [CALayer layer];
+ [_maskLayer setFrame:[[UIScreen mainScreen] bounds]];
+ [_maskLayer setBackgroundColor:[UIColor colorWithRed:0 green:0 blue:0 alpha:0.30].CGColor];
+ [[KEYWINDOW layer] addSublayer:_maskLayer];
+ //������������������
+ [self setCloseStyle:_closeStyle];
+ [KEYWINDOW addSubview:_control];
+
+}
+
+//������ ������������ ������������������������������������
+- (void)setOn:(BOOL)on{
+ _on = on;
+ _control.enabled = _on;
+ _closeBtn.hidden = !_on;
+}
+- (void)setCloseImage:(UIImage *)closeImage{
+
+ [_closeBtn setImage:closeImage forState:UIControlStateNormal];
+}
+- (void)setCloseStyle:(CloseStyle)closeStyle{
+ _closeStyle = closeStyle;
+ //������������������
+ if (_closeStyle == CloseStyleTapClose)
+ {
+ self.control.enabled = YES;
+ self.closeBtn.hidden = YES;
+ }else{
+ self.control.enabled = NO;
+ self.closeBtn.hidden = NO;
+ }
+
+}
+- (void)dismiss{
+ //���������������
+ // ������������
+ if (_maskLayer) {
+ [_maskLayer removeFromSuperlayer];
+ [_control removeFromSuperview];
+ [_closeBtn removeFromSuperview];
+ _maskLayer = nil;
+ _control = nil;
+ _closeBtn = nil;
+ }
+ //���������������
+ [self alertAnimatedOut];
+ //������������������������
+ if (_dismissBlock) {
+
+ _dismissBlock();
+ }
+
+}
+- (void)alertAnimatedPrensent{
+ _contentView.transform = _starTransForm;
+ [KEYWINDOW addSubview:_contentView];
+ [UIView animateWithDuration:ANIMATION_TIME delay:0.0 usingSpringWithDamping:0.7 initialSpringVelocity:0 options:UIViewAnimationOptionCurveEaseIn animations:^{
+ _contentView.transform = CGAffineTransformIdentity;
+ KEYWINDOW.userInteractionEnabled = NO;
+ } completion:^(BOOL finished) {
+ KEYWINDOW.userInteractionEnabled = YES;
+ if (_showBlock) {
+ //���������������������
+ _showBlock();
+ }
+ }];
+}
+- (void)addCoreAnimation{
+
+ CATransition *animation = [CATransition animation];
+ animation.type = @"rippleEffect";
+ animation.duration = ANIMATION_TIME;
+ [_contentView.layer addAnimation:animation forKey:@""];
+
+}
+- (void)alertAnimatedOut{
+ [UIView animateWithDuration:ANIMATION_TIME animations:^{
+ _contentView.transform = _starTransForm;
+ KEYWINDOW.userInteractionEnabled = NO;
+ } completion:^(BOOL finished) {
+ KEYWINDOW.userInteractionEnabled = YES;
+ [_contentView removeFromSuperview];
+ _contentView = nil;
+ }];
+
+}
+@end
diff --git a/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj b/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
index e5d29f7..0500980 100644
--- a/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
+++ b/pregnancy_guard/pregnancy_guard.xcodeproj/project.pbxproj
@@ -7,8 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- E505FBA41ECBD41A00C1B672 /* FileDownCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E505FBA11ECBD41A00C1B672 /* FileDownCell.m */; };
- E505FBA51ECBD41A00C1B672 /* FileDownView.m in Sources */ = {isa = PBXBuildFile; fileRef = E505FBA31ECBD41A00C1B672 /* FileDownView.m */; };
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 */; };
@@ -44,7 +42,6 @@
E51212FB1E52A00900AABF1E /* JHTableDataRowModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E51212EE1E52A00900AABF1E /* JHTableDataRowModel.m */; };
E51212FC1E52A00900AABF1E /* JHWaveChart.m in Sources */ = {isa = PBXBuildFile; fileRef = E51212F01E52A00900AABF1E /* JHWaveChart.m */; };
E5133A4D1E56ABCD00C89EA5 /* SettingPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5133A4C1E56ABCD00C89EA5 /* SettingPage.m */; };
- 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 */; };
E5153F3D1E5A75B500314414 /* FileStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = E5153F3C1E5A75B500314414 /* FileStatus.m */; };
@@ -261,8 +258,6 @@
E51F64141EEF75080066F95F /* Room.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64131EEF75080066F95F /* Room.m */; };
E51F64171EEF76AC0066F95F /* DeviceLw.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64161EEF76AC0066F95F /* DeviceLw.m */; };
E51F641A1EEF78060066F95F /* SignInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64191EEF78060066F95F /* SignInfo.m */; };
- E51F641D1EEF78EC0066F95F /* HotelAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F641C1EEF78EC0066F95F /* HotelAccount.m */; };
- E51F64201EEF79350066F95F /* HotelAndRoom.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F641F1EEF79350066F95F /* HotelAndRoom.m */; };
E51F64231EEF79770066F95F /* NoticeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64221EEF79770066F95F /* NoticeModel.m */; };
E51F64251EEF851C0066F95F /* ic_device_line@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E51F64241EEF851C0066F95F /* ic_device_line@2x.png */; };
E51F642D1EEF8CFF0066F95F /* HBdansLable.m in Sources */ = {isa = PBXBuildFile; fileRef = E51F64281EEF8CFF0066F95F /* HBdansLable.m */; };
@@ -314,17 +309,12 @@
E52D8C501DF790A8007D8714 /* MJWebViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E52D8C4F1DF790A8007D8714 /* MJWebViewViewController.m */; };
E52E1CCF1EEE24AA000520FB /* ico_make.png in Resources */ = {isa = PBXBuildFile; fileRef = E52E1CCC1EEE24AA000520FB /* ico_make.png */; };
E52E1CD01EEE24AA000520FB /* JSDropDownMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = E52E1CCE1EEE24AA000520FB /* JSDropDownMenu.m */; };
- E52E1CD31EEE5F35000520FB /* MyDeviceStatusCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E52E1CD21EEE5F35000520FB /* MyDeviceStatusCell.m */; };
- E52E1CD61EEE5FC2000520FB /* MyDeviceStatusView.m in Sources */ = {isa = PBXBuildFile; fileRef = E52E1CD51EEE5FC2000520FB /* MyDeviceStatusView.m */; };
E52F27CA1E4BF5E00022CA1D /* LoginPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F27C91E4BF5E00022CA1D /* LoginPage.m */; };
E52F27D01E4BFF830022CA1D /* FogetPwdPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F27CF1E4BFF830022CA1D /* FogetPwdPage.m */; };
E52F27D31E4BFF920022CA1D /* RegistPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F27D21E4BFF920022CA1D /* RegistPage.m */; };
E52F27D71E4C08B60022CA1D /* NavigationBar64@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E52F27D61E4C08B60022CA1D /* NavigationBar64@2x.png */; };
E52F58881E5C0E630084B3E2 /* MBProgressHUD+MP.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F58871E5C0E630084B3E2 /* MBProgressHUD+MP.m */; };
E52F59E11E5C17330084B3E2 /* cameraHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F59E01E5C17330084B3E2 /* cameraHelper.m */; };
- E52F83871EC9306C0069F64E /* FileListPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F83861EC9306C0069F64E /* FileListPage.m */; };
- E52F838A1EC930CC0069F64E /* FileStatusView.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F83891EC930CC0069F64E /* FileStatusView.m */; };
- E52F838D1EC9313B0069F64E /* FileStatusCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E52F838C1EC9313B0069F64E /* FileStatusCell.m */; };
E52F83991EC944860069F64E /* file_cmd_line@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E52F838F1EC944860069F64E /* file_cmd_line@2x.png */; };
E52F839A1EC944860069F64E /* file_download_del@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E52F83901EC944860069F64E /* file_download_del@2x.png */; };
E52F839B1EC944860069F64E /* file_download_item_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E52F83911EC944860069F64E /* file_download_item_bk.png */; };
@@ -386,8 +376,6 @@
E53196E61F15AE7A0020972E /* icon_play.png in Resources */ = {isa = PBXBuildFile; fileRef = E53196E21F15AE7A0020972E /* icon_play.png */; };
E53196E71F15AE7A0020972E /* icon_start.png in Resources */ = {isa = PBXBuildFile; fileRef = E53196E31F15AE7A0020972E /* icon_start.png */; };
E53196E81F15AE7A0020972E /* icon_unlike.png in Resources */ = {isa = PBXBuildFile; fileRef = E53196E41F15AE7A0020972E /* icon_unlike.png */; };
- E53196EB1F15AF0D0020972E /* MusicPlayCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E53196EA1F15AF0D0020972E /* MusicPlayCell.m */; };
- E53196EE1F15B3E50020972E /* MusicSetPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E53196ED1F15B3E50020972E /* MusicSetPage.m */; };
E5325D0E1EFA208A00F13A48 /* LHDBPath.m in Sources */ = {isa = PBXBuildFile; fileRef = E5325D051EFA208A00F13A48 /* LHDBPath.m */; };
E5325D0F1EFA208A00F13A48 /* LHModelStateMent.m in Sources */ = {isa = PBXBuildFile; fileRef = E5325D071EFA208A00F13A48 /* LHModelStateMent.m */; };
E5325D101EFA208A00F13A48 /* LHPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = E5325D091EFA208A00F13A48 /* LHPredicate.m */; };
@@ -407,9 +395,23 @@
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 */; };
+ E5371FC6206CE54400E2DCEE /* MusicSetPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FC5206CE54400E2DCEE /* MusicSetPage.m */; };
+ E5371FCC206CE65B00E2DCEE /* MusicPlayCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FCA206CE65B00E2DCEE /* MusicPlayCell.m */; };
+ E5371FCF206CE69400E2DCEE /* MusicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E5371FCE206CE69400E2DCEE /* MusicModel.m */; };
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 */; };
+ E53B6A9A2086ED360060ED03 /* SysSoundSetPage.m in Sources */ = {isa = PBXBuildFile; fileRef = E53B6A982086ED350060ED03 /* SysSoundSetPage.m */; };
+ E53B6A9C208726ED0060ED03 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E53B6A9B208726EC0060ED03 /* CoreBluetooth.framework */; };
+ E53B6AA120872B2B0060ED03 /* icon_head_offline.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6A9D20872B2A0060ED03 /* icon_head_offline.png */; };
+ E53B6AA220872B2B0060ED03 /* bt_offline.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6A9E20872B2B0060ED03 /* bt_offline.png */; };
+ E53B6AA320872B2B0060ED03 /* bg_corner_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6A9F20872B2B0060ED03 /* bg_corner_gray.png */; };
+ E53B6AA420872B2B0060ED03 /* icon_offline.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6AA020872B2B0060ED03 /* icon_offline.png */; };
+ E53B6AAA20873E5E0060ED03 /* icon_b02.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6AA520873E5C0060ED03 /* icon_b02.png */; };
+ E53B6AAB20873E5E0060ED03 /* icon_b03.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6AA620873E5D0060ED03 /* icon_b03.png */; };
+ E53B6AAC20873E5E0060ED03 /* icon_b01.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6AA720873E5D0060ED03 /* icon_b01.png */; };
+ E53B6AAD20873E5E0060ED03 /* icon_b04.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B6AA820873E5D0060ED03 /* icon_b04.png */; };
+ E53B6AAE20873E5E0060ED03 /* icon_chong.gif in Resources */ = {isa = PBXBuildFile; fileRef = E53B6AA920873E5D0060ED03 /* icon_chong.gif */; };
E53B943C1F258CDE00800478 /* icon_arraw_left@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B943A1F258CDE00800478 /* icon_arraw_left@2x.png */; };
E53B943D1F258CDE00800478 /* icon_arraw_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E53B943B1F258CDE00800478 /* icon_arraw_right@2x.png */; };
E53B94411F25C94000800478 /* CSAudioManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E53B94401F25C94000800478 /* CSAudioManager.m */; };
@@ -746,18 +748,16 @@
E56217F21EF0BD95008CE3D2 /* ad_scroll_type_bk.png in Resources */ = {isa = PBXBuildFile; fileRef = E56217E71EF0BD95008CE3D2 /* ad_scroll_type_bk.png */; };
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 */; };
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 */; };
E5761E551EF365B50037A976 /* HotelCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E5761E541EF365B50037A976 /* HotelCell.m */; };
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 */; };
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 */; };
+ E5C216EB20847D91006D1C3D /* icon_voiceset.png in Resources */ = {isa = PBXBuildFile; fileRef = E5C216EA20847D91006D1C3D /* icon_voiceset.png */; };
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 */; };
@@ -769,13 +769,15 @@
E5E06F371EF9177900012A6D /* MCURLSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = E5E06F311EF9177900012A6D /* MCURLSessionConfiguration.m */; };
E5E06F381EF9177900012A6D /* MCWiFiManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E5E06F331EF9177900012A6D /* MCWiFiManager.m */; };
E5F04E5B1E6FAE4300BBCD95 /* libstdc++.6.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E51AC4771E6F9C030052BA52 /* libstdc++.6.tbd */; };
+ E5FB29642085CC11004046B3 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5FB29632085CC11004046B3 /* MediaPlayer.framework */; };
+ E5FB29652085D6C5004046B3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5FB295B2085CB56004046B3 /* AudioToolbox.framework */; };
+ E5FB29682085D6F4004046B3 /* PlaySystemSound.m in Sources */ = {isa = PBXBuildFile; fileRef = E5FB29672085D6F4004046B3 /* PlaySystemSound.m */; };
+ E5FB296A2085EBC8004046B3 /* icon_musicset.png in Resources */ = {isa = PBXBuildFile; fileRef = E5FB29692085EBC8004046B3 /* icon_musicset.png */; };
+ E5FB296E2085EFA0004046B3 /* QWAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = E5FB296D2085EF9F004046B3 /* QWAlertView.m */; };
+ E5FB29712085F003004046B3 /* SysTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E5FB29702085F003004046B3 /* SysTipsView.m */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- E505FBA01ECBD41A00C1B672 /* FileDownCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDownCell.h; sourceTree = "<group>"; };
- E505FBA11ECBD41A00C1B672 /* FileDownCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileDownCell.m; sourceTree = "<group>"; };
- E505FBA21ECBD41A00C1B672 /* FileDownView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDownView.h; sourceTree = "<group>"; };
- E505FBA31ECBD41A00C1B672 /* FileDownView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileDownView.m; sourceTree = "<group>"; };
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>"; };
@@ -836,8 +838,6 @@
E51212F01E52A00900AABF1E /* JHWaveChart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JHWaveChart.m; sourceTree = "<group>"; };
E5133A4B1E56ABCD00C89EA5 /* SettingPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingPage.h; sourceTree = "<group>"; };
E5133A4C1E56ABCD00C89EA5 /* SettingPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingPage.m; sourceTree = "<group>"; };
- E5133A4E1E56AC7300C89EA5 /* ChangeNamePage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeNamePage.h; sourceTree = "<group>"; };
- E5133A4F1E56AC7300C89EA5 /* ChangeNamePage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ChangeNamePage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
E5133A501E56AC7300C89EA5 /* ChangePwdPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangePwdPage.h; sourceTree = "<group>"; };
E5133A511E56AC7300C89EA5 /* ChangePwdPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ChangePwdPage.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
E5133A591E56BF5400C89EA5 /* HFSmartLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HFSmartLink.h; sourceTree = "<group>"; };
@@ -1218,10 +1218,6 @@
E51F64161EEF76AC0066F95F /* DeviceLw.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceLw.m; sourceTree = "<group>"; };
E51F64181EEF78060066F95F /* SignInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignInfo.h; sourceTree = "<group>"; };
E51F64191EEF78060066F95F /* SignInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignInfo.m; sourceTree = "<group>"; };
- E51F641B1EEF78EC0066F95F /* HotelAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelAccount.h; sourceTree = "<group>"; };
- E51F641C1EEF78EC0066F95F /* HotelAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelAccount.m; sourceTree = "<group>"; };
- E51F641E1EEF79350066F95F /* HotelAndRoom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotelAndRoom.h; sourceTree = "<group>"; };
- E51F641F1EEF79350066F95F /* HotelAndRoom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelAndRoom.m; sourceTree = "<group>"; };
E51F64211EEF79770066F95F /* NoticeModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoticeModel.h; sourceTree = "<group>"; };
E51F64221EEF79770066F95F /* NoticeModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoticeModel.m; sourceTree = "<group>"; };
E51F64241EEF851C0066F95F /* ic_device_line@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_device_line@2x.png"; sourceTree = "<group>"; };
@@ -1293,10 +1289,6 @@
E52E1CCC1EEE24AA000520FB /* ico_make.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ico_make.png; sourceTree = "<group>"; };
E52E1CCD1EEE24AA000520FB /* JSDropDownMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDropDownMenu.h; sourceTree = "<group>"; };
E52E1CCE1EEE24AA000520FB /* JSDropDownMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSDropDownMenu.m; sourceTree = "<group>"; };
- E52E1CD11EEE5F35000520FB /* MyDeviceStatusCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MyDeviceStatusCell.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
- E52E1CD21EEE5F35000520FB /* MyDeviceStatusCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyDeviceStatusCell.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
- E52E1CD41EEE5FC2000520FB /* MyDeviceStatusView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MyDeviceStatusView.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
- E52E1CD51EEE5FC2000520FB /* MyDeviceStatusView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyDeviceStatusView.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
E52F27C81E4BF5E00022CA1D /* LoginPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginPage.h; sourceTree = "<group>"; };
E52F27C91E4BF5E00022CA1D /* LoginPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginPage.m; sourceTree = "<group>"; };
E52F27CE1E4BFF830022CA1D /* FogetPwdPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FogetPwdPage.h; sourceTree = "<group>"; };
@@ -1308,12 +1300,6 @@
E52F58871E5C0E630084B3E2 /* MBProgressHUD+MP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MBProgressHUD+MP.m"; sourceTree = "<group>"; };
E52F59DF1E5C17330084B3E2 /* cameraHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cameraHelper.h; sourceTree = "<group>"; };
E52F59E01E5C17330084B3E2 /* cameraHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = cameraHelper.m; sourceTree = "<group>"; };
- E52F83851EC9306C0069F64E /* FileListPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileListPage.h; sourceTree = "<group>"; };
- E52F83861EC9306C0069F64E /* FileListPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileListPage.m; sourceTree = "<group>"; };
- E52F83881EC930CC0069F64E /* FileStatusView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStatusView.h; sourceTree = "<group>"; };
- E52F83891EC930CC0069F64E /* FileStatusView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileStatusView.m; sourceTree = "<group>"; };
- E52F838B1EC9313B0069F64E /* FileStatusCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStatusCell.h; sourceTree = "<group>"; };
- E52F838C1EC9313B0069F64E /* FileStatusCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileStatusCell.m; sourceTree = "<group>"; };
E52F838F1EC944860069F64E /* file_cmd_line@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_cmd_line@2x.png"; sourceTree = "<group>"; };
E52F83901EC944860069F64E /* file_download_del@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_download_del@2x.png"; sourceTree = "<group>"; };
E52F83911EC944860069F64E /* file_download_item_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = file_download_item_bk.png; sourceTree = "<group>"; };
@@ -1384,10 +1370,6 @@
E53196E21F15AE7A0020972E /* icon_play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_play.png; sourceTree = "<group>"; };
E53196E31F15AE7A0020972E /* icon_start.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_start.png; sourceTree = "<group>"; };
E53196E41F15AE7A0020972E /* icon_unlike.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_unlike.png; sourceTree = "<group>"; };
- E53196E91F15AF0D0020972E /* MusicPlayCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicPlayCell.h; sourceTree = "<group>"; };
- E53196EA1F15AF0D0020972E /* MusicPlayCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MusicPlayCell.m; sourceTree = "<group>"; };
- E53196EC1F15B3E50020972E /* MusicSetPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicSetPage.h; sourceTree = "<group>"; };
- E53196ED1F15B3E50020972E /* MusicSetPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MusicSetPage.m; sourceTree = "<group>"; };
E531FFE81F1D8E8900625049 /* CBMoralManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBMoralManager.h; sourceTree = "<group>"; };
E531FFE91F1D8E8900625049 /* CBMoralManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBMoralManager.m; sourceTree = "<group>"; };
E531FFEA1F1D8E8900625049 /* CBPeripheralExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBPeripheralExt.h; sourceTree = "<group>"; };
@@ -1447,11 +1429,29 @@
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>"; };
+ E5371FC4206CE54400E2DCEE /* MusicSetPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicSetPage.h; sourceTree = "<group>"; };
+ E5371FC5206CE54400E2DCEE /* MusicSetPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MusicSetPage.m; sourceTree = "<group>"; };
+ E5371FCA206CE65B00E2DCEE /* MusicPlayCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MusicPlayCell.m; sourceTree = "<group>"; };
+ E5371FCB206CE65B00E2DCEE /* MusicPlayCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicPlayCell.h; sourceTree = "<group>"; };
+ E5371FCD206CE69400E2DCEE /* MusicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicModel.h; sourceTree = "<group>"; };
+ E5371FCE206CE69400E2DCEE /* MusicModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicModel.m; sourceTree = "<group>"; };
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>"; };
E539CB981F39585000D55670 /* UploadModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadModel.m; sourceTree = "<group>"; };
E539CE351F0B1EBA00634EEB /* ic_device_lw_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_device_lw_bk.png; sourceTree = "<group>"; };
+ E53B6A982086ED350060ED03 /* SysSoundSetPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SysSoundSetPage.m; sourceTree = "<group>"; };
+ E53B6A992086ED360060ED03 /* SysSoundSetPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SysSoundSetPage.h; sourceTree = "<group>"; };
+ E53B6A9B208726EC0060ED03 /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; };
+ E53B6A9D20872B2A0060ED03 /* icon_head_offline.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_head_offline.png; sourceTree = "<group>"; };
+ E53B6A9E20872B2B0060ED03 /* bt_offline.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bt_offline.png; sourceTree = "<group>"; };
+ E53B6A9F20872B2B0060ED03 /* bg_corner_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bg_corner_gray.png; sourceTree = "<group>"; };
+ E53B6AA020872B2B0060ED03 /* icon_offline.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_offline.png; sourceTree = "<group>"; };
+ E53B6AA520873E5C0060ED03 /* icon_b02.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_b02.png; sourceTree = "<group>"; };
+ E53B6AA620873E5D0060ED03 /* icon_b03.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_b03.png; sourceTree = "<group>"; };
+ E53B6AA720873E5D0060ED03 /* icon_b01.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_b01.png; sourceTree = "<group>"; };
+ E53B6AA820873E5D0060ED03 /* icon_b04.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_b04.png; sourceTree = "<group>"; };
+ E53B6AA920873E5D0060ED03 /* icon_chong.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = icon_chong.gif; sourceTree = "<group>"; };
E53B943A1F258CDE00800478 /* icon_arraw_left@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_arraw_left@2x.png"; sourceTree = "<group>"; };
E53B943B1F258CDE00800478 /* icon_arraw_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_arraw_right@2x.png"; sourceTree = "<group>"; };
E53B943F1F25C94000800478 /* CSAudioManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSAudioManager.h; sourceTree = "<group>"; };
@@ -2069,8 +2069,6 @@
E56217E71EF0BD95008CE3D2 /* ad_scroll_type_bk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ad_scroll_type_bk.png; sourceTree = "<group>"; };
E56217E81EF0BD95008CE3D2 /* ad_scroll_up_down_bk1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ad_scroll_up_down_bk1.png; sourceTree = "<group>"; };
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; };
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>"; };
@@ -2079,14 +2077,11 @@
E5761E541EF365B50037A976 /* HotelCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotelCell.m; sourceTree = "<group>"; };
E5761E561EF36CF70037A976 /* RoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomCell.h; sourceTree = "<group>"; };
E5761E571EF36CF70037A976 /* RoomCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomCell.m; sourceTree = "<group>"; };
- 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>"; };
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>"; };
+ E5C216EA20847D91006D1C3D /* icon_voiceset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_voiceset.png; 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>"; };
@@ -2105,6 +2100,19 @@
E5E06F311EF9177900012A6D /* MCURLSessionConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MCURLSessionConfiguration.m; sourceTree = "<group>"; };
E5E06F321EF9177900012A6D /* MCWiFiManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCWiFiManager.h; sourceTree = "<group>"; };
E5E06F331EF9177900012A6D /* MCWiFiManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MCWiFiManager.m; sourceTree = "<group>"; };
+ E5FB29592085CB47004046B3 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
+ E5FB295B2085CB56004046B3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+ E5FB295D2085CB6B004046B3 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; };
+ E5FB295F2085CB7B004046B3 /* libAudioStatistics.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libAudioStatistics.tbd; path = usr/lib/libAudioStatistics.tbd; sourceTree = SDKROOT; };
+ E5FB29612085CB84004046B3 /* libAudioIssueDetector.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libAudioIssueDetector.tbd; path = usr/lib/libAudioIssueDetector.tbd; sourceTree = SDKROOT; };
+ E5FB29632085CC11004046B3 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
+ E5FB29662085D6F4004046B3 /* PlaySystemSound.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaySystemSound.h; sourceTree = "<group>"; };
+ E5FB29672085D6F4004046B3 /* PlaySystemSound.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PlaySystemSound.m; sourceTree = "<group>"; };
+ E5FB29692085EBC8004046B3 /* icon_musicset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_musicset.png; sourceTree = "<group>"; };
+ E5FB296C2085EF9F004046B3 /* QWAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QWAlertView.h; sourceTree = "<group>"; };
+ E5FB296D2085EF9F004046B3 /* QWAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QWAlertView.m; sourceTree = "<group>"; };
+ E5FB296F2085F003004046B3 /* SysTipsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SysTipsView.h; sourceTree = "<group>"; };
+ E5FB29702085F003004046B3 /* SysTipsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SysTipsView.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -2112,6 +2120,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ E53B6A9C208726ED0060ED03 /* CoreBluetooth.framework in Frameworks */,
+ E5FB29652085D6C5004046B3 /* AudioToolbox.framework in Frameworks */,
+ E5FB29642085CC11004046B3 /* MediaPlayer.framework in Frameworks */,
E52142341EFB9ACE003867B8 /* libsqlite3.tbd in Frameworks */,
E51C7E831EFA03E4009B4F70 /* QuickLook.framework in Frameworks */,
E51F64541EEFB2380066F95F /* OpenGLES.framework in Frameworks */,
@@ -2734,8 +2745,6 @@
E52F9BC91E51493300A5F789 /* MinePage.m */,
E52F9BD81E514BEC00A5F789 /* HomePage.h */,
E52F9BD91E514BEC00A5F789 /* HomePage.m */,
- E56217F51EF0BED6008CE3D2 /* AdvertisePage.h */,
- E56217F61EF0BED6008CE3D2 /* AdvertisePage.m */,
);
path = Home;
sourceTree = "<group>";
@@ -2756,14 +2765,12 @@
E51CFF291DF505CE006A0462 /* Mine */ = {
isa = PBXGroup;
children = (
+ E53B6A992086ED360060ED03 /* SysSoundSetPage.h */,
+ E53B6A982086ED350060ED03 /* SysSoundSetPage.m */,
+ E5371FC4206CE54400E2DCEE /* MusicSetPage.h */,
+ E5371FC5206CE54400E2DCEE /* MusicSetPage.m */,
E51D3C011F021FAB00059FFE /* FeedBackPage.h */,
E51D3C021F021FAB00059FFE /* FeedBackPage.m */,
- E5761E591EF36DA30037A976 /* RoomSelPage.h */,
- E5761E5A1EF36DA30037A976 /* RoomSelPage.m */,
- E52F83851EC9306C0069F64E /* FileListPage.h */,
- E52F83861EC9306C0069F64E /* FileListPage.m */,
- E5133A4E1E56AC7300C89EA5 /* ChangeNamePage.h */,
- E5133A4F1E56AC7300C89EA5 /* ChangeNamePage.m */,
E5133A501E56AC7300C89EA5 /* ChangePwdPage.h */,
E5133A511E56AC7300C89EA5 /* ChangePwdPage.m */,
E5133A4B1E56ABCD00C89EA5 /* SettingPage.h */,
@@ -2772,8 +2779,8 @@
E548756C1E5D1AFA009D5EEF /* PhotosPage.m */,
E542E5881F1482C100D35387 /* HistoryRecordPage.h */,
E542E5891F1482C100D35387 /* HistoryRecordPage.m */,
- E53196EC1F15B3E50020972E /* MusicSetPage.h */,
- E53196ED1F15B3E50020972E /* MusicSetPage.m */,
+ E5FB29662085D6F4004046B3 /* PlaySystemSound.h */,
+ E5FB29672085D6F4004046B3 /* PlaySystemSound.m */,
);
path = Mine;
sourceTree = "<group>";
@@ -2827,20 +2834,16 @@
E51F64161EEF76AC0066F95F /* DeviceLw.m */,
E51F64181EEF78060066F95F /* SignInfo.h */,
E51F64191EEF78060066F95F /* SignInfo.m */,
- E51F641B1EEF78EC0066F95F /* HotelAccount.h */,
- E51F641C1EEF78EC0066F95F /* HotelAccount.m */,
- E51F641E1EEF79350066F95F /* HotelAndRoom.h */,
- E51F641F1EEF79350066F95F /* HotelAndRoom.m */,
E51F64211EEF79770066F95F /* NoticeModel.h */,
E51F64221EEF79770066F95F /* NoticeModel.m */,
- E5AB0DEC1EFA390800169298 /* HotelSelModel.h */,
- E5AB0DED1EFA390800169298 /* HotelSelModel.m */,
E51D73251F00AA8500E2476E /* DeviceSpareModel.h */,
E51D73261F00AA8500E2476E /* DeviceSpareModel.m */,
E539CB941F39580900D55670 /* DataModel.h */,
E539CB951F39580900D55670 /* DataModel.m */,
E539CB971F39585000D55670 /* UploadModel.h */,
E539CB981F39585000D55670 /* UploadModel.m */,
+ E5371FCD206CE69400E2DCEE /* MusicModel.h */,
+ E5371FCE206CE69400E2DCEE /* MusicModel.m */,
);
path = Model;
sourceTree = "<group>";
@@ -2987,32 +2990,22 @@
E51CFF6C1DF505CE006A0462 /* Cell */ = {
isa = PBXGroup;
children = (
+ E5FB296F2085F003004046B3 /* SysTipsView.h */,
+ E5FB29702085F003004046B3 /* SysTipsView.m */,
+ E5371FCB206CE65B00E2DCEE /* MusicPlayCell.h */,
+ E5371FCA206CE65B00E2DCEE /* MusicPlayCell.m */,
E5371FBC206C8AC500E2DCEE /* AdNoticeView.h */,
E5371FBB206C8AC500E2DCEE /* AdNoticeView.m */,
E55F8DF71F2C19B9009779B9 /* SearchTipsCell.h */,
E55F8DF81F2C19B9009779B9 /* SearchTipsCell.m */,
E531002E1F1D994A00625049 /* DevicesTableViewCell.h */,
E531002F1F1D994A00625049 /* DevicesTableViewCell.m */,
- E53196E91F15AF0D0020972E /* MusicPlayCell.h */,
- E53196EA1F15AF0D0020972E /* MusicPlayCell.m */,
E53196DE1F15A6380020972E /* SearchDeviceCell.h */,
E53196DF1F15A6380020972E /* SearchDeviceCell.m */,
E51984F91F0A422A00F59285 /* ChangeDeviceCell.h */,
E51984FA1F0A422A00F59285 /* ChangeDeviceCell.m */,
E51D73221F00A91200E2476E /* IdleDeviceCell.h */,
E51D73231F00A91200E2476E /* IdleDeviceCell.m */,
- E52E1CD41EEE5FC2000520FB /* MyDeviceStatusView.h */,
- E52E1CD51EEE5FC2000520FB /* MyDeviceStatusView.m */,
- E52E1CD11EEE5F35000520FB /* MyDeviceStatusCell.h */,
- E52E1CD21EEE5F35000520FB /* MyDeviceStatusCell.m */,
- E505FBA01ECBD41A00C1B672 /* FileDownCell.h */,
- E505FBA11ECBD41A00C1B672 /* FileDownCell.m */,
- E505FBA21ECBD41A00C1B672 /* FileDownView.h */,
- E505FBA31ECBD41A00C1B672 /* FileDownView.m */,
- E52F838B1EC9313B0069F64E /* FileStatusCell.h */,
- E52F838C1EC9313B0069F64E /* FileStatusCell.m */,
- E52F83881EC930CC0069F64E /* FileStatusView.h */,
- E52F83891EC930CC0069F64E /* FileStatusView.m */,
E54875651E5D1A87009D5EEF /* TZTestCell.h */,
E54875661E5D1A87009D5EEF /* TZTestCell.m */,
E51007941E5585A7008A01CE /* BaseTableViewCell.h */,
@@ -3066,6 +3059,7 @@
E51CFF771DF505CE006A0462 /* Widget */ = {
isa = PBXGroup;
children = (
+ E5FB296B2085EF9F004046B3 /* QWAlertView */,
E52142291EFB4A7A003867B8 /* JXTAlertManager */,
E51F64551EEFB9590066F95F /* MyAnimatedAnnotationView.h */,
E51F64561EEFB9590066F95F /* MyAnimatedAnnotationView.m */,
@@ -3211,6 +3205,8 @@
E51D6DCB1EC543510005B0E8 /* personal */ = {
isa = PBXGroup;
children = (
+ E5FB29692085EBC8004046B3 /* icon_musicset.png */,
+ E5C216EA20847D91006D1C3D /* icon_voiceset.png */,
E53196E11F15AE7A0020972E /* icon_like.png */,
E53196E21F15AE7A0020972E /* icon_play.png */,
E53196E31F15AE7A0020972E /* icon_start.png */,
@@ -3360,6 +3356,13 @@
E52D8C511DF798DE007D8714 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ E53B6A9B208726EC0060ED03 /* CoreBluetooth.framework */,
+ E5FB29632085CC11004046B3 /* MediaPlayer.framework */,
+ E5FB29612085CB84004046B3 /* libAudioIssueDetector.tbd */,
+ E5FB295F2085CB7B004046B3 /* libAudioStatistics.tbd */,
+ E5FB295D2085CB6B004046B3 /* CoreAudioKit.framework */,
+ E5FB295B2085CB56004046B3 /* AudioToolbox.framework */,
+ E5FB29592085CB47004046B3 /* CoreAudio.framework */,
E52142331EFB9ACE003867B8 /* libsqlite3.tbd */,
E51C7E821EFA03E4009B4F70 /* QuickLook.framework */,
E51F64531EEFB2380066F95F /* OpenGLES.framework */,
@@ -3477,6 +3480,15 @@
E530D35B1F0C7ADD00B193EC /* radiadection */ = {
isa = PBXGroup;
children = (
+ E53B6AA720873E5D0060ED03 /* icon_b01.png */,
+ E53B6AA520873E5C0060ED03 /* icon_b02.png */,
+ E53B6AA620873E5D0060ED03 /* icon_b03.png */,
+ E53B6AA820873E5D0060ED03 /* icon_b04.png */,
+ E53B6AA920873E5D0060ED03 /* icon_chong.gif */,
+ E53B6A9F20872B2B0060ED03 /* bg_corner_gray.png */,
+ E53B6A9E20872B2B0060ED03 /* bt_offline.png */,
+ E53B6A9D20872B2A0060ED03 /* icon_head_offline.png */,
+ E53B6AA020872B2B0060ED03 /* icon_offline.png */,
E53081EB1F1C415C001555FE /* ic_anquan_bk.png */,
E53081EC1F1C415C001555FE /* ic_anquan_tips.png */,
E53081ED1F1C415C001555FE /* ic_radia_bottom_bg.png */,
@@ -4658,6 +4670,15 @@
path = Networking;
sourceTree = "<group>";
};
+ E5FB296B2085EF9F004046B3 /* QWAlertView */ = {
+ isa = PBXGroup;
+ children = (
+ E5FB296C2085EF9F004046B3 /* QWAlertView.h */,
+ E5FB296D2085EF9F004046B3 /* QWAlertView.m */,
+ );
+ path = QWAlertView;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -4684,7 +4705,7 @@
E51CFEFB1DF4EC57006A0462 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0920;
+ LastUpgradeCheck = 0930;
ORGANIZATIONNAME = WindShan;
TargetAttributes = {
E51CFF021DF4EC57006A0462 = {
@@ -4721,6 +4742,7 @@
E53081FB1F1C415C001555FE /* ic_weixin_tips.png in Resources */,
E517F3B11DF5A9DE00C08331 /* dropdown_anim__0004@2x.png in Resources */,
E51F64711EEFC0E60066F95F /* sign_noout_bk.png in Resources */,
+ E53B6AAA20873E5E0060ED03 /* icon_b02.png in Resources */,
E517F3AB1DF5A9DE00C08331 /* dropdown_anim__00036@2x.png in Resources */,
E52F839A1EC944860069F64E /* file_download_del@2x.png in Resources */,
E51D4C491EF37F19006E849E /* icon_create.png in Resources */,
@@ -4732,6 +4754,7 @@
E51F64721EEFC0E60066F95F /* sign_out_bk.png in Resources */,
E55D45811EC3F04900A93E8D /* login_btn_bk.png in Resources */,
E517F3971DF5A9DE00C08331 /* dropdown_anim__00018@2x.png in Resources */,
+ E53B6AAB20873E5E0060ED03 /* icon_b03.png in Resources */,
E517F3941DF5A9DE00C08331 /* dropdown_anim__00015@2x.png in Resources */,
E51F64691EEFC0E60066F95F /* sign_address_tag@2x.png in Resources */,
E542E5871F1473F200D35387 /* icon_story@2x.png in Resources */,
@@ -4746,6 +4769,9 @@
E517F39F1DF5A9DE00C08331 /* dropdown_anim__00025@2x.png in Resources */,
E52F839F1EC944860069F64E /* file_download_stop@2x.png in Resources */,
E542E5821F1473F200D35387 /* ic_top_bk.png in Resources */,
+ E53B6AAD20873E5E0060ED03 /* icon_b04.png in Resources */,
+ E53B6AA320872B2B0060ED03 /* bg_corner_gray.png in Resources */,
+ E5FB296A2085EBC8004046B3 /* icon_musicset.png in Resources */,
E542E5861F1473F200D35387 /* icon_one.png in Resources */,
E517F3A41DF5A9DE00C08331 /* dropdown_anim__0002@2x.png in Resources */,
E53081F51F1C415C001555FE /* ic_anquan_bk.png in Resources */,
@@ -4764,6 +4790,7 @@
E542E5531F14609100D35387 /* exit_btn.png in Resources */,
E53081F71F1C415C001555FE /* ic_radia_bottom_bg.png in Resources */,
E53081F61F1C415C001555FE /* ic_anquan_tips.png in Resources */,
+ E53B6AA120872B2B0060ED03 /* icon_head_offline.png in Resources */,
E539CE361F0B1EBA00634EEB /* ic_device_lw_bk.png in Resources */,
E542E5951F14841100D35387 /* ic_line.png in Resources */,
E51F63FB1EEF6EC30066F95F /* ic_change_device_tag@2x.png in Resources */,
@@ -4798,6 +4825,7 @@
E51F64011EEF6EC30066F95F /* ic_search_edit_bk.png in Resources */,
E517F3A21DF5A9DE00C08331 /* dropdown_anim__00028@2x.png in Resources */,
E51F64031EEF6EC30066F95F /* ic_sign_tag@2x.png in Resources */,
+ E53B6AA420872B2B0060ED03 /* icon_offline.png in Resources */,
E517F3961DF5A9DE00C08331 /* dropdown_anim__00017@2x.png in Resources */,
E517F39B1DF5A9DE00C08331 /* dropdown_anim__00021@2x.png in Resources */,
E53038381F38571F003F63DE /* music.mp3 in Resources */,
@@ -4818,6 +4846,7 @@
E53081FC1F1C415C001555FE /* ic_zhishu_bk.png in Resources */,
E505FBAB1ECBD91600C1B672 /* file_havedown_look_btn.png in Resources */,
E52F9BE91E51569900A5F789 /* app_logo@2x.png in Resources */,
+ E53B6AAC20873E5E0060ED03 /* icon_b01.png in Resources */,
E51F64741EEFC0E60066F95F /* sign_user_btn_bk@2x.png in Resources */,
E517F3A91DF5A9DE00C08331 /* dropdown_anim__00034@2x.png in Resources */,
E53196E81F15AE7A0020972E /* icon_unlike.png in Resources */,
@@ -4864,6 +4893,7 @@
E51F646B1EEFC0E60066F95F /* sign_edit_bk.png in Resources */,
E51F646F1EEFC0E60066F95F /* sign_no_btn_bk.png in Resources */,
E51CFF811DF505CE006A0462 /* Assets.xcassets in Resources */,
+ E5C216EB20847D91006D1C3D /* icon_voiceset.png in Resources */,
E51F64461EEFB1E40066F95F /* mapapi.bundle in Resources */,
E542E5471F1457B300D35387 /* ic_jiance_sel@2x.png in Resources */,
E530D35F1F0C837500B193EC /* ic_pointer@2x.png in Resources */,
@@ -4891,6 +4921,7 @@
E51F64081EEF70040066F95F /* ic_open_gg_tag@2x.png in Resources */,
E51CFF821DF505CE006A0462 /* TabBarPages.plist in Resources */,
E542E5481F1457B300D35387 /* ic_jiance_unsel@2x.png in Resources */,
+ E53B6AA220872B2B0060ED03 /* bt_offline.png in Resources */,
E542E59A1F14841100D35387 /* icon_down_up_arraw.png in Resources */,
E56217F41EF0BD95008CE3D2 /* ad_scroll_up_down_bk2.png in Resources */,
E55F8E051F2C80A7009779B9 /* ServiceUUIDPList.plist in Resources */,
@@ -4903,6 +4934,7 @@
E52F83991EC944860069F64E /* file_cmd_line@2x.png in Resources */,
E505FBAA1ECBD91600C1B672 /* file_havedown_item_bk.png in Resources */,
E51F63FD1EEF6EC30066F95F /* ic_devicename_tag@2x.png in Resources */,
+ E53B6AAE20873E5E0060ED03 /* icon_chong.gif in Resources */,
E569B44C1E6E9F63008D9FB8 /* page_icon_empty@2x.png in Resources */,
E53196E61F15AE7A0020972E /* icon_play.png in Resources */,
E5371FBA206C884300E2DCEE /* look_notice.png in Resources */,
@@ -4942,7 +4974,6 @@
E5325D181EFA20B300F13A48 /* NSObject+LHModel.m in Sources */,
E548756A1E5D1A91009D5EEF /* LxGridViewFlowLayout.m in Sources */,
E51CFF7A1DF505CE006A0462 /* BaseNaviController.m in Sources */,
- E51F641D1EEF78EC0066F95F /* HotelAccount.m in Sources */,
E55670701F09CB48001B34C5 /* ZXDataMatrixSymbolInfo144.m in Sources */,
E55670021F09CB48001B34C5 /* LBXScanViewStyle.m in Sources */,
E5325D111EFA208A00F13A48 /* LHSqlite.m in Sources */,
@@ -4964,6 +4995,7 @@
E556706C1F09CB48001B34C5 /* ZXDataMatrixEncoderContext.m in Sources */,
E55670BE1F09CB48001B34C5 /* ZXPDF417ScanningDecoder.m in Sources */,
E51212D11E52968A00AABF1E /* PopoverAction.m in Sources */,
+ E5FB29682085D6F4004046B3 /* PlaySystemSound.m in Sources */,
E556708C1F09CB48001B34C5 /* ZXRSSExpandedFieldParser.m in Sources */,
E52D8C501DF790A8007D8714 /* MJWebViewViewController.m in Sources */,
E55670971F09CB48001B34C5 /* ZXRSSUtils.m in Sources */,
@@ -5017,7 +5049,6 @@
E55670161F09CB48001B34C5 /* ZXAztecWriter.m in Sources */,
E53B94411F25C94000800478 /* CSAudioManager.m in Sources */,
E5187A791DFA5C0A00E867B7 /* MASViewConstraint.m in Sources */,
- E5AB0DEE1EFA390800169298 /* HotelSelModel.m in Sources */,
E556708D1F09CB48001B34C5 /* ZXRSSExpandedGeneralAppIdDecoder.m in Sources */,
E531001E1F1D8E8900625049 /* ThermometerModel.m in Sources */,
E5187A8F1DFA7ABB00E867B7 /* view3.m in Sources */,
@@ -5027,7 +5058,6 @@
E51CFFEA1DF56334006A0462 /* AFURLRequestSerialization.m in Sources */,
E51F640B1EEF70530066F95F /* MyDeviceStatus.m in Sources */,
E52142371EFBA9A0003867B8 /* DirectoryWatcher.m in Sources */,
- E505FBA51ECBD41A00C1B672 /* FileDownView.m in Sources */,
E548755F1E5D1A47009D5EEF /* TZPhotoPickerController.m in Sources */,
E55670841F09CB48001B34C5 /* ZXAI01weightDecoder.m in Sources */,
E51212F91E52A00900AABF1E /* JHShowInfoView.m in Sources */,
@@ -5043,13 +5073,13 @@
E51C003E1DF56A52006A0462 /* MJRefreshNormalHeader.m in Sources */,
E55670011F09CB48001B34C5 /* LBXScanViewController.m in Sources */,
E51CFF9A1DF505CE006A0462 /* GloriaLabel.m in Sources */,
+ E53B6A9A2086ED360060ED03 /* SysSoundSetPage.m in Sources */,
E55670481F09CB48001B34C5 /* ZXBoolArray.m in Sources */,
E5187A7A1DFA5C0A00E867B7 /* NSArray+MASAdditions.m in Sources */,
E51CFFF51DF56334006A0462 /* UIWebView+AFNetworking.m in Sources */,
E517F3BC1DF5AB6C00C08331 /* MJChiBaoZiFooter.m in Sources */,
E5566FFC1F09CB48001B34C5 /* LBXScanNative.m in Sources */,
E51C00321DF56A52006A0462 /* MJRefreshAutoFooter.m in Sources */,
- E52F838D1EC9313B0069F64E /* FileStatusCell.m in Sources */,
E55670E11F09CB48001B34C5 /* ZXMultiFinderPatternFinder.m in Sources */,
E548755B1E5D1A47009D5EEF /* TZImageCropManager.m in Sources */,
E55670DE1F09CB48001B34C5 /* ZXQRCodeMaskUtil.m in Sources */,
@@ -5062,7 +5092,6 @@
E51F64231EEF79770066F95F /* NoticeModel.m in Sources */,
E55670351F09CB48001B34C5 /* ZXVCardResultParser.m in Sources */,
E53100181F1D8E8900625049 /* GlucoseModel.m in Sources */,
- E56217F71EF0BED6008CE3D2 /* AdvertisePage.m in Sources */,
E52F27CA1E4BF5E00022CA1D /* LoginPage.m in Sources */,
E556707B1F09CB48001B34C5 /* ZXAbstractExpandedDecoder.m in Sources */,
E55670DB1F09CB48001B34C5 /* ZXQRCode.m in Sources */,
@@ -5106,6 +5135,7 @@
E55670861F09CB48001B34C5 /* ZXRSSExpandedBlockParsedResult.m in Sources */,
E5566FFB1F09CB48001B34C5 /* LBXScanLineAnimation.m in Sources */,
E531001A1F1D8E8900625049 /* RGBModel.m in Sources */,
+ E5371FCF206CE69400E2DCEE /* MusicModel.m in Sources */,
E55670451F09CB48001B34C5 /* ZXBitArray.m in Sources */,
E556706D1F09CB48001B34C5 /* ZXDataMatrixErrorCorrection.m in Sources */,
E51F642D1EEF8CFF0066F95F /* HBdansLable.m in Sources */,
@@ -5134,16 +5164,15 @@
E51F641A1EEF78060066F95F /* SignInfo.m in Sources */,
E51984FB1F0A422A00F59285 /* ChangeDeviceCell.m in Sources */,
E55670A01F09CB48001B34C5 /* ZXEAN13Writer.m in Sources */,
+ E5371FC6206CE54400E2DCEE /* MusicSetPage.m in Sources */,
E5325D0F1EFA208A00F13A48 /* LHModelStateMent.m in Sources */,
E55670AC1F09CB48001B34C5 /* ZXUPCEANExtension2Support.m in Sources */,
E51CFF891DF505CE006A0462 /* SDWebImageDecoder.m in Sources */,
E51F64141EEF75080066F95F /* Room.m in Sources */,
- 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 */,
E51CFF7B1DF505CE006A0462 /* BaseNavPage.m in Sources */,
E531001B1F1D8E8900625049 /* RSCModel.m in Sources */,
@@ -5208,7 +5237,6 @@
E55670871F09CB48001B34C5 /* ZXRSSExpandedCurrentParsingState.m in Sources */,
E51212F61E52A00900AABF1E /* JHPieItemsView.m in Sources */,
E53100141F1D8E8900625049 /* capsenseModel.m in Sources */,
- E52F83871EC9306C0069F64E /* FileListPage.m in Sources */,
E52297911F0CB2AC00D79A31 /* NSTimer+timerBlock.m in Sources */,
E51C00451DF56A52006A0462 /* UIView+MJExtension.m in Sources */,
E55670CF1F09CB48001B34C5 /* ZXQRCodeDecoder.m in Sources */,
@@ -5288,7 +5316,6 @@
E55670191F09CB48001B34C5 /* ZXAddressBookDoCoMoResultParser.m in Sources */,
E55670921F09CB48001B34C5 /* ZXAbstractRSSReader.m in Sources */,
E517F3DC1DF5B01300C08331 /* NSObject+MJCoding.m in Sources */,
- E52E1CD61EEE5FC2000520FB /* MyDeviceStatusView.m in Sources */,
E51F642E1EEF8CFF0066F95F /* HBdansView.m in Sources */,
E55670A51F09CB48001B34C5 /* ZXITFWriter.m in Sources */,
E556705B1F09CB48001B34C5 /* ZXInvertedLuminanceSource.m in Sources */,
@@ -5305,6 +5332,7 @@
E55670951F09CB48001B34C5 /* ZXRSSFinderPattern.m in Sources */,
E5187AA31DFA86B400E867B7 /* UIImage+CompressImage.m in Sources */,
E532F6631E70D8E500B43476 /* GCDAsyncUdpSocket.m in Sources */,
+ E5FB29712085F003004046B3 /* SysTipsView.m in Sources */,
E55670991F09CB48001B34C5 /* ZXCodaBarWriter.m in Sources */,
E532F6621E70D8E500B43476 /* GCDAsyncSocket.m in Sources */,
E5153F4D1E5ABA9300314414 /* ControlViewCell.m in Sources */,
@@ -5378,7 +5406,6 @@
E55670641F09CB48001B34C5 /* ZXDataMatrixDecoder.m in Sources */,
E5187A741DFA5C0A00E867B7 /* MASCompositeConstraint.m in Sources */,
E51212F51E52A00900AABF1E /* JHPieForeBGView.m in Sources */,
- E52F838A1EC930CC0069F64E /* FileStatusView.m in Sources */,
E51C003D1DF56A52006A0462 /* MJRefreshGifHeader.m in Sources */,
E51CFFF41DF56334006A0462 /* UIRefreshControl+AFNetworking.m in Sources */,
E53196E01F15A6380020972E /* SearchDeviceCell.m in Sources */,
@@ -5398,23 +5425,21 @@
E5153F3D1E5A75B500314414 /* FileStatus.m in Sources */,
E54875601E5D1A47009D5EEF /* TZPhotoPreviewCell.m in Sources */,
E51CFF0B1DF4EC57006A0462 /* AppDelegate.m in Sources */,
- E5133A521E56AC7300C89EA5 /* ChangeNamePage.m in Sources */,
E55670551F09CB48001B34C5 /* ZXBinaryBitmap.m in Sources */,
E55670CD1F09CB48001B34C5 /* ZXQRCodeDataMask.m in Sources */,
E5325D171EFA20B300F13A48 /* LHObjectInfo.m in Sources */,
E569B44A1E6E5FB6008D9FB8 /* AddDeviceReqModel.m in Sources */,
E55670571F09CB48001B34C5 /* ZXDecodeHints.m in Sources */,
+ E5FB296E2085EFA0004046B3 /* QWAlertView.m in Sources */,
E51D6DF11EC545450005B0E8 /* ICSettingNoneItem.m in Sources */,
E55670B71F09CB48001B34C5 /* ZXPDF417BoundingBox.m in Sources */,
E51C00351DF56A52006A0462 /* MJRefreshFooter.m in Sources */,
E5187A8D1DFA7ABB00E867B7 /* view1.m in Sources */,
E5566FFE1F09CB48001B34C5 /* LBXScanResult.m in Sources */,
E55670D61F09CB48001B34C5 /* ZXQRCodeAlignmentPatternFinder.m in Sources */,
- E505FBA41ECBD41A00C1B672 /* FileDownCell.m in Sources */,
- E51F64201EEF79350066F95F /* HotelAndRoom.m in Sources */,
+ E5371FCC206CE65B00E2DCEE /* MusicPlayCell.m in Sources */,
E5761E551EF365B50037A976 /* HotelCell.m in Sources */,
E55670C41F09CB48001B34C5 /* ZXPDF417Dimensions.m in Sources */,
- E5761E5B1EF36DA30037A976 /* RoomSelPage.m in Sources */,
E53100261F1D8F6300625049 /* Utilities.m in Sources */,
E556701B1F09CB48001B34C5 /* ZXBizcardResultParser.m in Sources */,
E51CFFE91DF56334006A0462 /* AFSecurityPolicy.m in Sources */,
@@ -5438,7 +5463,6 @@
E51C00431DF56A52006A0462 /* UIScrollView+MJExtension.m in Sources */,
E51D6DF01EC545450005B0E8 /* ICSettingArrowItem.m in Sources */,
E55670601F09CB48001B34C5 /* ZXRGBLuminanceSource.m in Sources */,
- E52E1CD31EEE5F35000520FB /* MyDeviceStatusCell.m in Sources */,
E55670AF1F09CB48001B34C5 /* ZXUPCEANReader.m in Sources */,
E55670431F09CB48001B34C5 /* ZXReedSolomonDecoder.m in Sources */,
E55670221F09CB48001B34C5 /* ZXExpandedProductResultParser.m in Sources */,
@@ -5485,6 +5509,7 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -5492,6 +5517,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -5539,6 +5565,7 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -5546,6 +5573,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
diff --git a/pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/pregnancy_guard/pregnancy_guard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>
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 3c0372d..bd5c55b 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 7f15846..2702bec 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 = "543997422.300175"
+ timestampString = "545726725.230745"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "82"
@@ -2441,7 +2441,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.3008831"
+ timestampString = "545726725.231416"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "199"
@@ -2457,7 +2457,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.300933"
+ timestampString = "545726725.2314709"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "191"
@@ -2473,39 +2473,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "544005106.6270339"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "284"
- endingLineNumber = "284"
- landmarkName = "-getUserInfo"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/AppDelegate.m"
- timestampString = "544005106.627102"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "287"
- endingLineNumber = "287"
- landmarkName = "-getUserInfo"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/AppDelegate.m"
- timestampString = "544005106.6271501"
+ timestampString = "545730336.085888"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "292"
@@ -2520,13 +2488,13 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/ChangePwdPage.m"
- timestampString = "523441454.572798"
+ filePath = "BaseProject/AppDelegate.m"
+ timestampString = "545730336.085947"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "145"
- endingLineNumber = "145"
- landmarkName = "-resetUserPwdAction"
+ startingLineNumber = "295"
+ endingLineNumber = "295"
+ landmarkName = "-getUserInfo"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
@@ -2536,77 +2504,13 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/ChangePwdPage.m"
- timestampString = "523441454.572798"
+ filePath = "BaseProject/AppDelegate.m"
+ timestampString = "545730336.085989"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "147"
- endingLineNumber = "147"
- landmarkName = "-resetUserPwdAction"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/ChangePwdPage.m"
- timestampString = "523441454.572798"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "156"
- endingLineNumber = "156"
- landmarkName = "-resetUserPwdAction"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/ChangePwdPage.m"
- timestampString = "523441454.572798"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "155"
- endingLineNumber = "155"
- landmarkName = "-resetUserPwdAction"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/ChangePwdPage.m"
- timestampString = "523441454.572798"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "150"
- endingLineNumber = "150"
- landmarkName = "-resetUserPwdAction"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/ChangePwdPage.m"
- timestampString = "523441454.572798"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "151"
- endingLineNumber = "151"
- landmarkName = "-resetUserPwdAction"
+ startingLineNumber = "300"
+ endingLineNumber = "300"
+ landmarkName = "-getUserInfo"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
@@ -3096,7 +3000,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.3021851"
+ timestampString = "545726725.231855"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "43"
@@ -3112,7 +3016,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.302233"
+ timestampString = "545726725.231903"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "40"
@@ -3128,7 +3032,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.302276"
+ timestampString = "545726725.231948"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "207"
@@ -4359,22 +4263,6 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/FeedBackPage.m"
- timestampString = "520760178.70978"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "111"
- endingLineNumber = "111"
- landmarkName = "-commitAction"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
filePath = "BaseProject/Views/Cell/HotelAccountCell.m"
timestampString = "520305454.270511"
startingColumnNumber = "9223372036854775807"
@@ -4968,7 +4856,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.303828"
+ timestampString = "545726725.233296"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "215"
@@ -4984,7 +4872,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.3038729"
+ timestampString = "545726725.233346"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "202"
@@ -5006,22 +4894,6 @@
startingLineNumber = "368"
endingLineNumber = "368"
landmarkName = "-backAticon"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.316872"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "451"
- endingLineNumber = "451"
- landmarkName = "-get_straner"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
@@ -5080,7 +4952,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.303979"
+ timestampString = "545726725.233456"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "129"
@@ -5176,11 +5048,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.629452"
+ timestampString = "545730336.087775"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "398"
- endingLineNumber = "398"
+ startingLineNumber = "437"
+ endingLineNumber = "437"
landmarkName = "SearchDevicePage"
landmarkType = "3">
</BreakpointContent>
@@ -5192,11 +5064,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.629836"
+ timestampString = "545730336.087827"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "441"
- endingLineNumber = "441"
+ startingLineNumber = "480"
+ endingLineNumber = "480"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5208,11 +5080,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.630077"
+ timestampString = "545730336.087869"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "162"
- endingLineNumber = "162"
+ startingLineNumber = "201"
+ endingLineNumber = "201"
landmarkName = "-numberOfSectionsInTableView:"
landmarkType = "7">
</BreakpointContent>
@@ -5224,11 +5096,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.6303231"
+ timestampString = "545730336.087909"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "415"
- endingLineNumber = "415"
+ startingLineNumber = "454"
+ endingLineNumber = "454"
landmarkName = "SearchDevicePage"
landmarkType = "3">
</BreakpointContent>
@@ -5288,11 +5160,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.6306"
+ timestampString = "545730336.08799"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "283"
- endingLineNumber = "283"
+ startingLineNumber = "322"
+ endingLineNumber = "322"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "7">
</BreakpointContent>
@@ -5304,11 +5176,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.630816"
+ timestampString = "545730336.088032"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "293"
- endingLineNumber = "293"
+ startingLineNumber = "332"
+ endingLineNumber = "332"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "7">
</BreakpointContent>
@@ -5320,11 +5192,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.631027"
+ timestampString = "545730336.088071"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "456"
- endingLineNumber = "456"
+ startingLineNumber = "495"
+ endingLineNumber = "495"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5336,11 +5208,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.631241"
+ timestampString = "545730336.088113"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "503"
- endingLineNumber = "503"
+ startingLineNumber = "542"
+ endingLineNumber = "542"
landmarkName = "-backAticon"
landmarkType = "7">
</BreakpointContent>
@@ -5352,11 +5224,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.631457"
+ timestampString = "545730336.088151"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "452"
- endingLineNumber = "452"
+ startingLineNumber = "491"
+ endingLineNumber = "491"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5368,11 +5240,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.631673"
+ timestampString = "545733772.0954241"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "429"
- endingLineNumber = "429"
+ startingLineNumber = "434"
+ endingLineNumber = "434"
landmarkName = "-viewDidDisappear:"
landmarkType = "7">
</BreakpointContent>
@@ -5384,11 +5256,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.631736"
+ timestampString = "545733772.095889"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "436"
- endingLineNumber = "436"
+ startingLineNumber = "441"
+ endingLineNumber = "441"
landmarkName = "-viewWillAppear:"
landmarkType = "7">
</BreakpointContent>
@@ -5400,11 +5272,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.631789"
+ timestampString = "545733772.096161"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "433"
- endingLineNumber = "433"
+ startingLineNumber = "438"
+ endingLineNumber = "438"
landmarkName = "RadiaDetectionPage"
landmarkType = "3">
</BreakpointContent>
@@ -5416,11 +5288,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.6318409"
+ timestampString = "545733772.096441"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "435"
- endingLineNumber = "435"
+ startingLineNumber = "440"
+ endingLineNumber = "440"
landmarkName = "-viewWillAppear:"
landmarkType = "7">
</BreakpointContent>
@@ -5432,11 +5304,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.631893"
+ timestampString = "545733772.096706"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "144"
- endingLineNumber = "144"
+ startingLineNumber = "149"
+ endingLineNumber = "149"
landmarkName = "RadiaDetectionPage"
landmarkType = "3">
</BreakpointContent>
@@ -5448,11 +5320,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.6319439"
+ timestampString = "545733772.0969779"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "252"
- endingLineNumber = "252"
+ startingLineNumber = "257"
+ endingLineNumber = "257"
landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5464,11 +5336,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.6319931"
+ timestampString = "545733772.097279"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "371"
- endingLineNumber = "371"
+ startingLineNumber = "376"
+ endingLineNumber = "376"
landmarkName = "RadiaDetectionPage"
landmarkType = "3">
</BreakpointContent>
@@ -5480,11 +5352,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632043"
+ timestampString = "545733772.0976419"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "382"
- endingLineNumber = "382"
+ startingLineNumber = "387"
+ endingLineNumber = "387"
landmarkName = "-notifyOption"
landmarkType = "7">
</BreakpointContent>
@@ -5496,11 +5368,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632094"
+ timestampString = "545733772.098016"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "175"
- endingLineNumber = "175"
+ startingLineNumber = "180"
+ endingLineNumber = "180"
landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5512,11 +5384,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632141"
+ timestampString = "545733772.098375"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "143"
- endingLineNumber = "143"
+ startingLineNumber = "148"
+ endingLineNumber = "148"
landmarkName = "RadiaDetectionPage"
landmarkType = "3">
</BreakpointContent>
@@ -5528,11 +5400,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632189"
+ timestampString = "545733772.098665"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "265"
- endingLineNumber = "265"
+ startingLineNumber = "270"
+ endingLineNumber = "270"
landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5544,11 +5416,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632237"
+ timestampString = "545733772.098951"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "264"
- endingLineNumber = "264"
+ startingLineNumber = "269"
+ endingLineNumber = "269"
landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5560,11 +5432,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632285"
+ timestampString = "545733772.099231"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "254"
- endingLineNumber = "254"
+ startingLineNumber = "259"
+ endingLineNumber = "259"
landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5576,11 +5448,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632344"
+ timestampString = "545733772.0994869"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "167"
- endingLineNumber = "167"
+ startingLineNumber = "172"
+ endingLineNumber = "172"
landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5592,11 +5464,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632394"
+ timestampString = "545733772.099739"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "164"
- endingLineNumber = "164"
+ startingLineNumber = "169"
+ endingLineNumber = "169"
landmarkName = "-peripheral:didDiscoverCharacteristicsForService:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5608,11 +5480,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632443"
+ timestampString = "545733772.100021"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "318"
- endingLineNumber = "318"
+ startingLineNumber = "323"
+ endingLineNumber = "323"
landmarkName = "-writeOption:"
landmarkType = "7">
<Locations>
@@ -5656,11 +5528,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.6324919"
+ timestampString = "545733772.10042"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "304"
- endingLineNumber = "304"
+ startingLineNumber = "309"
+ endingLineNumber = "309"
landmarkName = "-readOption"
landmarkType = "7">
</BreakpointContent>
@@ -5672,11 +5544,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.63254"
+ timestampString = "545733772.100835"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "319"
- endingLineNumber = "319"
+ startingLineNumber = "324"
+ endingLineNumber = "324"
landmarkName = "-writeOption:"
landmarkType = "7">
</BreakpointContent>
@@ -5736,11 +5608,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632635"
+ timestampString = "545733772.101318"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "820"
- endingLineNumber = "820"
+ startingLineNumber = "825"
+ endingLineNumber = "825"
landmarkName = "-viewDidLoad"
landmarkType = "7">
</BreakpointContent>
@@ -5752,11 +5624,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.632689"
+ timestampString = "545733772.101756"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "498"
- endingLineNumber = "498"
+ startingLineNumber = "503"
+ endingLineNumber = "503"
landmarkName = "RadiaDetectionPage"
landmarkType = "3">
</BreakpointContent>
@@ -5768,11 +5640,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.6327389"
+ timestampString = "545733772.102194"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "421"
- endingLineNumber = "421"
+ startingLineNumber = "426"
+ endingLineNumber = "426"
landmarkName = "RadiaDetectionPage"
landmarkType = "3">
</BreakpointContent>
@@ -5784,11 +5656,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.63279"
+ timestampString = "545730336.093936"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "451"
- endingLineNumber = "451"
+ startingLineNumber = "490"
+ endingLineNumber = "490"
landmarkName = "-connectPeripheral:"
landmarkType = "7">
</BreakpointContent>
@@ -5800,11 +5672,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.63301"
+ timestampString = "545733772.102626"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "496"
- endingLineNumber = "496"
+ startingLineNumber = "501"
+ endingLineNumber = "501"
landmarkName = "RadiaDetectionPage"
landmarkType = "3">
</BreakpointContent>
@@ -5816,11 +5688,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633065"
+ timestampString = "545733772.103022"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "483"
- endingLineNumber = "483"
+ startingLineNumber = "488"
+ endingLineNumber = "488"
landmarkName = "-viewWillAppear:"
landmarkType = "7">
</BreakpointContent>
@@ -5832,11 +5704,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.6331151"
+ timestampString = "545733772.1034091"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "462"
- endingLineNumber = "462"
+ startingLineNumber = "467"
+ endingLineNumber = "467"
landmarkName = "-viewWillAppear:"
landmarkType = "7">
</BreakpointContent>
@@ -5848,11 +5720,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633166"
+ timestampString = "545733772.103825"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "461"
- endingLineNumber = "461"
+ startingLineNumber = "466"
+ endingLineNumber = "466"
landmarkName = "-viewWillAppear:"
landmarkType = "7">
</BreakpointContent>
@@ -5864,11 +5736,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/SearchDevicePage.m"
- timestampString = "544005106.633216"
+ timestampString = "545730336.095196"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "402"
- endingLineNumber = "402"
+ startingLineNumber = "441"
+ endingLineNumber = "441"
landmarkName = "-discoveryDidRefresh"
landmarkType = "7">
</BreakpointContent>
@@ -5880,11 +5752,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633431"
+ timestampString = "545733772.104273"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "482"
- endingLineNumber = "482"
+ startingLineNumber = "487"
+ endingLineNumber = "487"
landmarkName = "-viewWillAppear:"
landmarkType = "7">
</BreakpointContent>
@@ -5896,11 +5768,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633486"
+ timestampString = "545733772.104688"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "484"
- endingLineNumber = "484"
+ startingLineNumber = "489"
+ endingLineNumber = "489"
landmarkName = "-viewWillAppear:"
landmarkType = "7">
</BreakpointContent>
@@ -5928,11 +5800,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633556"
+ timestampString = "545733772.1051461"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "191"
- endingLineNumber = "191"
+ startingLineNumber = "196"
+ endingLineNumber = "196"
landmarkName = "-peripheral:didDiscoverDescriptorsForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5944,11 +5816,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633608"
+ timestampString = "545733772.105577"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "205"
- endingLineNumber = "205"
+ startingLineNumber = "210"
+ endingLineNumber = "210"
landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5960,11 +5832,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.6336581"
+ timestampString = "545733772.105998"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "192"
- endingLineNumber = "192"
+ startingLineNumber = "197"
+ endingLineNumber = "197"
landmarkName = "-peripheral:didDiscoverDescriptorsForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -5976,12 +5848,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "544005106.633708"
+ timestampString = "545730336.096694"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "131"
- endingLineNumber = "131"
- landmarkName = "-application:didFinishLaunchingWithOptions:"
+ startingLineNumber = "139"
+ endingLineNumber = "139"
+ landmarkName = "-updateInterfaceWithReachability:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
@@ -5992,11 +5864,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633761"
+ timestampString = "545733772.106436"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "209"
- endingLineNumber = "209"
+ startingLineNumber = "214"
+ endingLineNumber = "214"
landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:"
landmarkType = "7">
</BreakpointContent>
@@ -6008,11 +5880,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
- timestampString = "544005106.633811"
+ timestampString = "545733772.10686"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "780"
- endingLineNumber = "780"
+ startingLineNumber = "785"
+ endingLineNumber = "785"
landmarkName = "-viewDidLoad"
landmarkType = "7">
</BreakpointContent>
@@ -6024,7 +5896,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.765913"
+ timestampString = "545708344.698772"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "314"
@@ -6040,7 +5912,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.765965"
+ timestampString = "545708344.699124"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "332"
@@ -6088,7 +5960,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.7660511"
+ timestampString = "545708344.699383"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "316"
@@ -6104,7 +5976,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.766101"
+ timestampString = "545708344.699595"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "330"
@@ -6152,7 +6024,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.766187"
+ timestampString = "545708344.699841"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "317"
@@ -6168,7 +6040,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.305046"
+ timestampString = "545726725.234508"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "193"
@@ -6184,7 +6056,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.305092"
+ timestampString = "545726725.2345949"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "238"
@@ -6312,7 +6184,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.766413"
+ timestampString = "545708344.7001669"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "318"
@@ -6456,7 +6328,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 = "544005106.838861"
+ timestampString = "545733772.46828"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1323"
@@ -6471,7 +6343,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 = "544005106.840765"
+ timestampString = "545733772.471917"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1323"
@@ -6552,7 +6424,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.766571"
+ timestampString = "545708344.700536"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "283"
@@ -6568,7 +6440,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.7666219"
+ timestampString = "545708344.700762"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "280"
@@ -6600,7 +6472,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.7666841"
+ timestampString = "545708344.7010061"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "296"
@@ -6616,7 +6488,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/RegistPage.m"
- timestampString = "543910008.7667331"
+ timestampString = "545708344.7012351"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "284"
@@ -6632,7 +6504,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Login/LoginPage.m"
- timestampString = "543997422.305375"
+ timestampString = "545726725.234916"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "197"
@@ -6648,11 +6520,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.3181601"
+ timestampString = "545728722.955649"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "160"
- endingLineNumber = "160"
+ startingLineNumber = "159"
+ endingLineNumber = "159"
landmarkName = "-LHGetStartTime"
landmarkType = "7">
</BreakpointContent>
@@ -6664,55 +6536,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.31838"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "56"
- endingLineNumber = "56"
- landmarkName = "-pickView:confirmButtonClick:"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.318621"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "51"
- endingLineNumber = "51"
- landmarkName = "-pickView:confirmButtonClick:"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.318839"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "52"
- endingLineNumber = "52"
- landmarkName = "-pickView:confirmButtonClick:"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.31906"
+ timestampString = "545728722.955698"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "55"
@@ -6728,11 +6552,59 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.31928"
+ timestampString = "545728722.955741"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "114"
- endingLineNumber = "114"
+ startingLineNumber = "50"
+ endingLineNumber = "50"
+ landmarkName = "-pickView:confirmButtonClick:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/MinePage.m"
+ timestampString = "545728722.95578"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "51"
+ endingLineNumber = "51"
+ landmarkName = "-pickView:confirmButtonClick:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/MinePage.m"
+ timestampString = "545728722.955821"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "54"
+ endingLineNumber = "54"
+ landmarkName = "-pickView:confirmButtonClick:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/MinePage.m"
+ timestampString = "545728722.95586"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "113"
+ endingLineNumber = "113"
landmarkName = "-update_is_open_upload"
landmarkType = "7">
</BreakpointContent>
@@ -6744,11 +6616,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.31949"
+ timestampString = "545728722.955898"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "112"
- endingLineNumber = "112"
+ startingLineNumber = "111"
+ endingLineNumber = "111"
landmarkName = "-update_is_open_upload"
landmarkType = "7">
</BreakpointContent>
@@ -6760,11 +6632,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Home/MinePage.m"
- timestampString = "543891700.319698"
+ timestampString = "545728722.955937"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "76"
- endingLineNumber = "76"
+ startingLineNumber = "75"
+ endingLineNumber = "75"
landmarkName = "-update_refresh_frequency"
landmarkType = "7">
</BreakpointContent>
@@ -6776,11 +6648,27 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
- timestampString = "523850267.136004"
+ timestampString = "545730336.097751"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "54"
- endingLineNumber = "54"
+ startingLineNumber = "57"
+ endingLineNumber = "57"
+ landmarkName = "-sysTipsView"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.09787"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "228"
+ endingLineNumber = "228"
landmarkName = "-viewDidLoad"
landmarkType = "7">
</BreakpointContent>
@@ -6792,11 +6680,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
- timestampString = "523850513.912804"
+ timestampString = "545730336.0979691"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "124"
- endingLineNumber = "124"
+ startingLineNumber = "368"
+ endingLineNumber = "368"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "7">
</BreakpointContent>
@@ -6808,43 +6696,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
- timestampString = "523850513.912804"
+ timestampString = "545730336.098075"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "107"
- endingLineNumber = "107"
- landmarkName = "-numberOfSectionsInTableView:"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
- timestampString = "523850818.277132"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "168"
- endingLineNumber = "168"
- landmarkName = "-musicPlaySection:"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
- timestampString = "523850818.277132"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "144"
- endingLineNumber = "144"
+ startingLineNumber = "344"
+ endingLineNumber = "344"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "7">
</BreakpointContent>
@@ -6856,28 +6712,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
- timestampString = "523850818.277132"
+ timestampString = "545730336.098171"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "185"
- endingLineNumber = "185"
+ startingLineNumber = "392"
+ endingLineNumber = "392"
landmarkName = "-musicPlaySection:"
- landmarkType = "7">
- </BreakpointContent>
- </BreakpointProxy>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- shouldBeEnabled = "No"
- ignoreCount = "0"
- continueAfterRunningActions = "No"
- filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
- timestampString = "523850818.277132"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "249"
- endingLineNumber = "249"
- landmarkName = "-update_video:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
@@ -6888,11 +6728,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.634473"
+ timestampString = "545645881.9376791"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "264"
- endingLineNumber = "264"
+ startingLineNumber = "309"
+ endingLineNumber = "309"
landmarkName = "-unitMonthLogin"
landmarkType = "7">
</BreakpointContent>
@@ -6904,11 +6744,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.634533"
+ timestampString = "545645881.937732"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "280"
- endingLineNumber = "280"
+ startingLineNumber = "325"
+ endingLineNumber = "325"
landmarkName = "-unitWeekLogin"
landmarkType = "7">
</BreakpointContent>
@@ -6920,11 +6760,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.634586"
+ timestampString = "545645881.9377739"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "344"
- endingLineNumber = "344"
+ startingLineNumber = "389"
+ endingLineNumber = "389"
landmarkName = "-drawHistoryRecordLine"
landmarkType = "7">
</BreakpointContent>
@@ -6936,7 +6776,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/AppDelegate.m"
- timestampString = "544005106.634638"
+ timestampString = "545730336.09834"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
@@ -6952,11 +6792,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.6346821"
+ timestampString = "545645881.93786"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "239"
- endingLineNumber = "239"
+ startingLineNumber = "284"
+ endingLineNumber = "284"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -6968,11 +6808,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.634734"
+ timestampString = "545645881.937902"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "240"
- endingLineNumber = "240"
+ startingLineNumber = "285"
+ endingLineNumber = "285"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -6984,11 +6824,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.634787"
+ timestampString = "545645881.937943"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "237"
- endingLineNumber = "237"
+ startingLineNumber = "282"
+ endingLineNumber = "282"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -7000,11 +6840,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.634838"
+ timestampString = "545645881.937984"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "238"
- endingLineNumber = "238"
+ startingLineNumber = "283"
+ endingLineNumber = "283"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -7016,7 +6856,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Views/Cell/AdNoticeView.m"
- timestampString = "544005106.634895"
+ timestampString = "544008557.887374"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "129"
@@ -7032,7 +6872,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Views/Cell/AdNoticeView.m"
- timestampString = "544005106.634939"
+ timestampString = "544008557.8874249"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "128"
@@ -7048,11 +6888,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.634982"
+ timestampString = "545645881.938062"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "294"
- endingLineNumber = "294"
+ startingLineNumber = "339"
+ endingLineNumber = "339"
landmarkName = "-unitDayLogin"
landmarkType = "7">
</BreakpointContent>
@@ -7064,11 +6904,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.6350321"
+ timestampString = "545645881.9381059"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "289"
- endingLineNumber = "289"
+ startingLineNumber = "334"
+ endingLineNumber = "334"
landmarkName = "-unitDayLogin"
landmarkType = "7">
</BreakpointContent>
@@ -7080,12 +6920,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.63508"
+ timestampString = "545645881.938148"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "299"
- endingLineNumber = "299"
- landmarkName = "-unitDayLogin"
+ startingLineNumber = "344"
+ endingLineNumber = "344"
+ landmarkName = "-drawHistoryRecordLine"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
@@ -7116,11 +6956,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.635128"
+ timestampString = "545645881.9381911"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "235"
- endingLineNumber = "235"
+ startingLineNumber = "280"
+ endingLineNumber = "280"
landmarkName = "-GetUserDataList"
landmarkType = "7">
</BreakpointContent>
@@ -7132,14 +6972,717 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
- timestampString = "544005106.635175"
+ timestampString = "545645881.938233"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "242"
- endingLineNumber = "242"
+ startingLineNumber = "287"
+ endingLineNumber = "287"
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 = "545645881.938274"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "229"
+ endingLineNumber = "229"
+ landmarkName = "-GetNoticeInfo"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
+ timestampString = "545645881.938315"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "234"
+ endingLineNumber = "234"
+ landmarkName = "-GetNoticeInfo"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/HistoryRecordPage.m"
+ timestampString = "545645881.938356"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "291"
+ endingLineNumber = "291"
+ landmarkName = "-GetUserDataList"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Cell/MusicPlayCell.m"
+ timestampString = "545730336.0986381"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "65"
+ endingLineNumber = "65"
+ landmarkName = "-playAction"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.098713"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "394"
+ endingLineNumber = "394"
+ landmarkName = "-musicPlaySection:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.098822"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "412"
+ endingLineNumber = "412"
+ landmarkName = "-musicPlaySection:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Utility/AudioTool/CSAudioManager.m"
+ timestampString = "545730336.0989"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "235"
+ endingLineNumber = "235"
+ landmarkName = "-stopMusicWithPlayID:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/MinePage.m"
+ timestampString = "545728722.956829"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "141"
+ endingLineNumber = "141"
+ landmarkName = "-pickerView:didSelectRow:inComponent:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Login/RegistPage.m"
+ timestampString = "545708344.702037"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "60"
+ endingLineNumber = "60"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Login/RegistPage.m"
+ timestampString = "545708373.043402"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "79"
+ endingLineNumber = "79"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Login/LoginPage.m"
+ timestampString = "545726725.23588"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "59"
+ endingLineNumber = "59"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Utility/XZPickView/XZPickView.m"
+ timestampString = "545708743.386218"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "116"
+ endingLineNumber = "116"
+ landmarkName = "-dismiss"
+ landmarkType = "7">
+ <Locations>
+ <Location
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ symbolName = "-[XZPickView dismiss]"
+ moduleName = "pregnancy_guard"
+ usesParentBreakpointCondition = "Yes"
+ urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Utility/XZPickView/XZPickView.m"
+ timestampString = "545733772.498989"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "116"
+ endingLineNumber = "116"
+ offsetFromSymbolStart = "48">
+ </Location>
+ <Location
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ symbolName = "__21-[XZPickView dismiss]_block_invoke"
+ moduleName = "pregnancy_guard"
+ usesParentBreakpointCondition = "Yes"
+ urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Utility/XZPickView/XZPickView.m"
+ timestampString = "545733772.50177"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "116"
+ endingLineNumber = "116"
+ offsetFromSymbolStart = "12">
+ </Location>
+ <Location
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ symbolName = "__destroy_helper_block_.90"
+ moduleName = "pregnancy_guard"
+ usesParentBreakpointCondition = "Yes"
+ urlString = "file:///Users/WindShan/Documents/ios/oc/pregnancy_guard_ios/pregnancy_guard/BaseProject/Utility/XZPickView/XZPickView.m"
+ timestampString = "545733772.5052249"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "116"
+ endingLineNumber = "116"
+ offsetFromSymbolStart = "16">
+ </Location>
+ </Locations>
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Utility/XZPickView/XZPickView.m"
+ timestampString = "545708743.386517"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "108"
+ endingLineNumber = "108"
+ landmarkName = "-show"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Cell/SysTipsView.m"
+ timestampString = "545730336.0990289"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "132"
+ endingLineNumber = "132"
+ landmarkName = "-CancelClickAction"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Cell/SysTipsView.m"
+ timestampString = "545730336.099076"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "141"
+ endingLineNumber = "141"
+ landmarkName = "-SureClickAction"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.09912"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "71"
+ endingLineNumber = "71"
+ landmarkName = "-didSelectedAction:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.0991859"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "107"
+ endingLineNumber = "107"
+ landmarkName = "-didSelectedAction:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Widget/QWAlertView/QWAlertView.m"
+ timestampString = "545709332.59709"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "47"
+ endingLineNumber = "47"
+ landmarkName = "-control"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Widget/QWAlertView/QWAlertView.m"
+ timestampString = "545709332.597145"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "58"
+ endingLineNumber = "58"
+ landmarkName = "-closeBtn"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Views/Widget/QWAlertView/QWAlertView.m"
+ timestampString = "545709332.5971971"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "165"
+ endingLineNumber = "165"
+ landmarkName = "-dismiss"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.099293"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "161"
+ endingLineNumber = "161"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/SysSoundSetPage.m"
+ timestampString = "545730336.099355"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "110"
+ endingLineNumber = "110"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/SysSoundSetPage.m"
+ timestampString = "545730336.099417"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "102"
+ endingLineNumber = "102"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/SysSoundSetPage.m"
+ timestampString = "545730336.099476"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "101"
+ endingLineNumber = "101"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Utility/AudioTool/CSAudioManager.m"
+ timestampString = "545730336.0995359"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "296"
+ endingLineNumber = "296"
+ landmarkName = "soundCompleteCallback"
+ landmarkType = "9">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Utility/AudioTool/CSAudioManager.m"
+ timestampString = "545730336.099586"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "292"
+ endingLineNumber = "292"
+ landmarkName = "soundCompleteCallback"
+ landmarkType = "9">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Utility/AudioTool/CSAudioManager.m"
+ timestampString = "545730336.0996341"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "289"
+ endingLineNumber = "289"
+ landmarkName = "soundCompleteCallback"
+ landmarkType = "9">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Utility/AudioTool/CSAudioManager.m"
+ timestampString = "545730336.099685"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "280"
+ endingLineNumber = "280"
+ landmarkName = "-playSoundWithSoundName:PlayID:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.0997339"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "391"
+ endingLineNumber = "391"
+ landmarkName = "-musicPlaySection:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.099779"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "417"
+ endingLineNumber = "417"
+ landmarkName = "-musicPlaySection:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.099825"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "160"
+ endingLineNumber = "160"
+ landmarkName = "-viewDidLoad"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.099869"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "235"
+ endingLineNumber = "235"
+ landmarkName = "-viewWillAppear:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Mine/MusicSetPage.m"
+ timestampString = "545730336.0999089"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "241"
+ endingLineNumber = "241"
+ landmarkName = "-viewWillAppear:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.108727"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "522"
+ endingLineNumber = "522"
+ landmarkName = "-discoveryDidRefresh"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.109202"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "442"
+ endingLineNumber = "442"
+ landmarkName = "-viewWillAppear:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.109623"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "342"
+ endingLineNumber = "342"
+ landmarkName = "-writeOption:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.110036"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "331"
+ endingLineNumber = "331"
+ landmarkName = "-writeOption:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.110463"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "330"
+ endingLineNumber = "330"
+ landmarkName = "-writeOption:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.110884"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "523"
+ endingLineNumber = "523"
+ landmarkName = "-discoveryDidRefresh"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.111306"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "525"
+ endingLineNumber = "525"
+ landmarkName = "-discoveryDidRefresh"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "BaseProject/Controller/Home/RadiaDetectionPage.m"
+ timestampString = "545733772.111735"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "450"
+ endingLineNumber = "450"
+ landmarkName = "-viewWillAppear:"
+ landmarkType = "7">
+ </BreakpointContent>
+ </BreakpointProxy>
</Breakpoints>
</Bucket>
diff --git a/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcschemes/pregnancy_guard.xcscheme b/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcschemes/pregnancy_guard.xcscheme
index 1885c30..2b905b0 100644
--- a/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcschemes/pregnancy_guard.xcscheme
+++ b/pregnancy_guard/pregnancy_guard.xcodeproj/xcuserdata/WindShan.xcuserdatad/xcschemes/pregnancy_guard.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0920"
+ LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
@@ -46,7 +45,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
--
Gitblit v1.8.0