From f8009af9c0e47a2933060769df57f44b6f8d9273 Mon Sep 17 00:00:00 2001 From: xuemh Date: Wed, 8 Aug 2018 20:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=87=8D=E5=90=AF=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 10 -- .../mineControllers/IfishSetViewController.m | 10 +- .../mineControllers/RestartViewController.h | 13 -- .../mineControllers/RestartViewController.m | 43 ----- .../mineControllers/RestartViewController.xib | 153 ------------------ .../ConnectHotpotViewController.m | 1 - 6 files changed, 2 insertions(+), 228 deletions(-) delete mode 100644 Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.h delete mode 100644 Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.m delete mode 100644 Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.xib diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 279fbd8..7baa2ca 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2460,8 +2460,6 @@ E51D7D58208CE121001FF053 /* CustomModeSetCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E51D7D57208CE120001FF053 /* CustomModeSetCell.xib */; }; E51D7D5B208CF4E7001FF053 /* RuiMeiInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D7D5A208CF4E7001FF053 /* RuiMeiInputViewController.m */; }; E521222C21075C0D00BA24C5 /* tip.png in Resources */ = {isa = PBXBuildFile; fileRef = E521222B21075C0C00BA24C5 /* tip.png */; }; - E52122302107609500BA24C5 /* RestartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E521222E2107609500BA24C5 /* RestartViewController.m */; }; - E52122312107609500BA24C5 /* RestartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E521222F2107609500BA24C5 /* RestartViewController.xib */; }; E5212235210760A600BA24C5 /* SettingResetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E5212233210760A600BA24C5 /* SettingResetViewController.m */; }; E5212236210760A700BA24C5 /* SettingResetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E5212234210760A600BA24C5 /* SettingResetViewController.xib */; }; E52B400521042ED2003BBA3E /* ConnectHotspotTipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */; }; @@ -6259,9 +6257,6 @@ E51D7D59208CF4E7001FF053 /* RuiMeiInputViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuiMeiInputViewController.h; sourceTree = ""; }; E51D7D5A208CF4E7001FF053 /* RuiMeiInputViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiInputViewController.m; sourceTree = ""; }; E521222B21075C0C00BA24C5 /* tip.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tip.png; sourceTree = ""; }; - E521222D2107609500BA24C5 /* RestartViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RestartViewController.h; sourceTree = ""; }; - E521222E2107609500BA24C5 /* RestartViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RestartViewController.m; sourceTree = ""; }; - E521222F2107609500BA24C5 /* RestartViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RestartViewController.xib; sourceTree = ""; }; E5212232210760A600BA24C5 /* SettingResetViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SettingResetViewController.h; sourceTree = ""; }; E5212233210760A600BA24C5 /* SettingResetViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SettingResetViewController.m; sourceTree = ""; }; E5212234210760A600BA24C5 /* SettingResetViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SettingResetViewController.xib; sourceTree = ""; }; @@ -9213,9 +9208,6 @@ 883E76E91D48A5E50030E075 /* pushSetControllrs */, 88D0F27B1EA6F53E00286022 /* IfishSetViewController.h */, 88D0F27C1EA6F53E00286022 /* IfishSetViewController.m */, - E521222D2107609500BA24C5 /* RestartViewController.h */, - E521222E2107609500BA24C5 /* RestartViewController.m */, - E521222F2107609500BA24C5 /* RestartViewController.xib */, E5212232210760A600BA24C5 /* SettingResetViewController.h */, E5212233210760A600BA24C5 /* SettingResetViewController.m */, E5212234210760A600BA24C5 /* SettingResetViewController.xib */, @@ -14718,7 +14710,6 @@ 882956BE1DBDA3A200E9DDD7 /* userIcon3.png in Resources */, 881671E01EA5DE2B00BEBF23 /* UMComUserTableViewCell.xib in Resources */, 882956FE1DBDA3A300E9DDD7 /* NewPiFu_beiyongoff.png in Resources */, - E52122312107609500BA24C5 /* RestartViewController.xib in Resources */, 88696FD51E9C8B4A005D4AFB /* MemberEditeViewLocationCell.xib in Resources */, 881A1D291DD2C31500BA1AF4 /* kankanlook_icon_attention.png in Resources */, 882956291DBDA3A200E9DDD7 /* neves0044.png in Resources */, @@ -16132,7 +16123,6 @@ 885928C71E67C20600E0011E /* MineDengJi.m in Sources */, 881478371E712E3A00BFB79C /* TaskKindViewCell.m in Sources */, 8829582B1DC18CD100E9DDD7 /* AFNOHeaderHttpTool.m in Sources */, - E52122302107609500BA24C5 /* RestartViewController.m in Sources */, 886185CD1EF255F900459AD1 /* XuToControlNameViewController.m in Sources */, E5317A1321188F170014AFDD /* ResetDeviceModel.m in Sources */, 881671FC1EA5DE2B00BEBF23 /* UMAssetsCollectionCheckMarkView.m in Sources */, diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m index 0035072..a1bdaad 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m @@ -13,7 +13,6 @@ #import "ChangeSecretCodeController.h" #define TUICHUAlertTAg 4100 #import "IfishUserDefaultHelper.h" -#import "RestartViewController.h" #import "SettingResetViewController.h" @interface IfishSetViewController () @@ -35,8 +34,8 @@ extern BOOL firstLogIn; } -(void)loadData{ - self.titles=@[@[@"更换手机",@"修改密码",@"设备重启",@"恢复出厂模式"],@[@"切换账号"]]; - self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"setting-restart",@"setting-reset"],@[@"personal_iocn_switch"]]; + self.titles=@[@[@"更换手机",@"修改密码",@"恢复出厂模式"],@[@"切换账号"]]; + self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"setting-reset"],@[@"personal_iocn_switch"]]; } -(void)creatTab{ @@ -120,11 +119,6 @@ extern BOOL firstLogIn; [self.navigationController pushViewController:secretVC animated:YES]; } else if (indexPath.section == 0 && indexPath.row == 2) { - self.hidesBottomBarWhenPushed = YES; - RestartViewController *vc = [[RestartViewController alloc] initWithNibName:@"RestartViewController" bundle:nil]; - vc.hidesBottomBarWhenPushed = YES; - [self.navigationController pushViewController:vc animated:YES]; - } else if (indexPath.section == 0 && indexPath.row == 3) { self.hidesBottomBarWhenPushed = YES; SettingResetViewController *vc = [[SettingResetViewController alloc] initWithNibName:@"SettingResetViewController" bundle:nil]; vc.hidesBottomBarWhenPushed = YES; diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.h b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.h deleted file mode 100644 index 216ba44..0000000 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// RestartViewController.h -// Ifish -// -// Created by Minghao Xue on 2018/7/24. -// Copyright © 2018年 lianlian. All rights reserved. -// - -#import "BaseVIewContorller.h" - -@interface RestartViewController : BaseVIewContorller - -@end diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.m deleted file mode 100644 index 16d7780..0000000 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.m +++ /dev/null @@ -1,43 +0,0 @@ -// -// RestartViewController.m -// Ifish -// -// Created by Minghao Xue on 2018/7/24. -// Copyright © 2018年 lianlian. All rights reserved. -// - -#import "RestartViewController.h" -#import "IFishHotpotUDPHelper.h" -#import "ConnectHotspotTipViewController.h" - -@interface RestartViewController () - -@end - -@implementation RestartViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = @"重启设备"; -} - -- (IBAction)restart:(id)sender { - [IFishHotpotUDPHelper sharedInstance].delegate = self; - [[IFishHotpotUDPHelper sharedInstance] broadCastRestartCommand]; -} -- (IBAction)tipBtnClicke:(id)sender { - ConnectHotspotTipViewController *vc = [[ConnectHotspotTipViewController alloc] initWithNibName:nil bundle:nil]; - [self.navigationController pushViewController:vc animated:YES]; -} - -#pragma mark - IFishHotpotUDPHelperDelegate - -- (void)udpHelperCommandExecutedSuccess:(IFishUDPHelperBackMsgModel *)backModel { - [self.view makeToast:@"设备即将重启"]; -} - -- (void)udpHelperMessage:(NSString *)msg { - [self.view makeToast:msg]; -} - -@end diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.xib b/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.xib deleted file mode 100644 index cbc59f0..0000000 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/RestartViewController.xib +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m index 645307c..057eeae 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -188,7 +188,6 @@ [self.view makeToast:@"该设备已存在"]; }else{ - [self bindDeviceWithSsid:_deviceBssid]; }