移除重启设备功能

This commit is contained in:
xuemh 2018-08-08 20:20:35 +08:00
parent 4a4194a6f4
commit f8009af9c0
6 changed files with 2 additions and 228 deletions

View File

@ -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 = "<group>"; };
E51D7D5A208CF4E7001FF053 /* RuiMeiInputViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiInputViewController.m; sourceTree = "<group>"; };
E521222B21075C0C00BA24C5 /* tip.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tip.png; sourceTree = "<group>"; };
E521222D2107609500BA24C5 /* RestartViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RestartViewController.h; sourceTree = "<group>"; };
E521222E2107609500BA24C5 /* RestartViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RestartViewController.m; sourceTree = "<group>"; };
E521222F2107609500BA24C5 /* RestartViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RestartViewController.xib; sourceTree = "<group>"; };
E5212232210760A600BA24C5 /* SettingResetViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SettingResetViewController.h; sourceTree = "<group>"; };
E5212233210760A600BA24C5 /* SettingResetViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SettingResetViewController.m; sourceTree = "<group>"; };
E5212234210760A600BA24C5 /* SettingResetViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SettingResetViewController.xib; sourceTree = "<group>"; };
@ -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 */,

View File

@ -13,7 +13,6 @@
#import "ChangeSecretCodeController.h"
#define TUICHUAlertTAg 4100
#import "IfishUserDefaultHelper.h"
#import "RestartViewController.h"
#import "SettingResetViewController.h"
@interface IfishSetViewController ()<UITableViewDelegate,UITableViewDataSource,UIAlertViewDelegate>
@ -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;

View File

@ -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

View File

@ -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 ()<IFishHotpotUDPHelperDelegate>
@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

View File

@ -1,153 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RestartViewController">
<connections>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BWu-i5-5cz">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AUh-Mz-d0M">
<rect key="frame" x="0.0" y="35" width="375" height="183"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" image="hotspotconnect" translatesAutoresizingMaskIntoConstraints="NO" id="Jxl-Be-0Xs">
<rect key="frame" x="21" y="20" width="16" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="bgX-uM-xHh"/>
<constraint firstAttribute="width" constant="16" id="gIv-g4-dYs"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="特别提醒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z7A-1k-qZh">
<rect key="frame" x="50" y="18.5" width="69.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xee-7X-jVQ" customClass="UIImageView">
<rect key="frame" x="38" y="61" width="299" height="1"/>
<color key="backgroundColor" red="0.77127617390000003" green="0.77127617390000003" blue="0.77127617390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="isE-Hc-pcb"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1.请将手机连接至wifi:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Co-3E-wck">
<rect key="frame" x="50" y="78" width="145.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ifish-xxxx" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DGq-5e-qqU">
<rect key="frame" x="203" y="78" width="62" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2.设备重启后将会自动连接,若不能连接成功则可以采用断电重启的方式再进行重连" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KxN-8O-gKZ">
<rect key="frame" x="50" y="109" width="273" height="54"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b2e-0b-mNW">
<rect key="frame" x="269" y="71.5" width="62" height="30"/>
<color key="backgroundColor" red="0.08235294118" green="0.66274509800000003" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="点击连接">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="tipBtnClicke:" destination="-1" eventType="touchUpInside" id="wzt-ee-PRc"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="KxN-8O-gKZ" firstAttribute="top" secondItem="7Co-3E-wck" secondAttribute="bottom" constant="13" id="AlC-Re-njC"/>
<constraint firstItem="b2e-0b-mNW" firstAttribute="leading" secondItem="DGq-5e-qqU" secondAttribute="trailing" constant="4" id="CJn-O2-790"/>
<constraint firstItem="DGq-5e-qqU" firstAttribute="centerY" secondItem="7Co-3E-wck" secondAttribute="centerY" id="DVw-Cu-qa2"/>
<constraint firstAttribute="trailing" secondItem="xee-7X-jVQ" secondAttribute="trailing" constant="38" id="HUd-hO-GvJ"/>
<constraint firstItem="KxN-8O-gKZ" firstAttribute="leading" secondItem="7Co-3E-wck" secondAttribute="leading" id="HdJ-13-Knr"/>
<constraint firstItem="xee-7X-jVQ" firstAttribute="top" secondItem="Z7A-1k-qZh" secondAttribute="bottom" constant="22" id="Jrt-g4-wbO"/>
<constraint firstItem="DGq-5e-qqU" firstAttribute="leading" secondItem="7Co-3E-wck" secondAttribute="trailing" constant="8" id="KtF-fP-YDI"/>
<constraint firstItem="Jxl-Be-0Xs" firstAttribute="top" secondItem="AUh-Mz-d0M" secondAttribute="top" constant="20" id="Ppv-Eg-B2S"/>
<constraint firstItem="7Co-3E-wck" firstAttribute="leading" secondItem="Z7A-1k-qZh" secondAttribute="leading" id="RXi-gk-QUk"/>
<constraint firstAttribute="trailing" secondItem="KxN-8O-gKZ" secondAttribute="trailing" constant="52" id="bSS-Qo-bV5"/>
<constraint firstItem="7Co-3E-wck" firstAttribute="top" secondItem="xee-7X-jVQ" secondAttribute="bottom" constant="16" id="bsV-RT-2jI"/>
<constraint firstItem="xee-7X-jVQ" firstAttribute="leading" secondItem="AUh-Mz-d0M" secondAttribute="leading" constant="38" id="cb2-qt-VKu"/>
<constraint firstAttribute="bottom" secondItem="KxN-8O-gKZ" secondAttribute="bottom" constant="20" id="dFN-2r-FVX"/>
<constraint firstItem="b2e-0b-mNW" firstAttribute="centerY" secondItem="DGq-5e-qqU" secondAttribute="centerY" id="gus-rH-2HW"/>
<constraint firstItem="Z7A-1k-qZh" firstAttribute="centerY" secondItem="Jxl-Be-0Xs" secondAttribute="centerY" id="pIy-tA-XHX"/>
<constraint firstItem="Z7A-1k-qZh" firstAttribute="leading" secondItem="Jxl-Be-0Xs" secondAttribute="trailing" constant="13" id="rw3-lv-3Xk"/>
<constraint firstItem="Jxl-Be-0Xs" firstAttribute="leading" secondItem="AUh-Mz-d0M" secondAttribute="leading" constant="21" id="u4n-vO-BI6"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oZt-aX-ebt">
<rect key="frame" x="36" y="236" width="303" height="30"/>
<color key="backgroundColor" red="0.08235294118" green="0.66274509800000003" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="bZX-oR-Uzz"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="确定重启"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="restart:" destination="-1" eventType="touchUpInside" id="JAB-MM-NYi"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="oZt-aX-ebt" firstAttribute="leading" secondItem="BWu-i5-5cz" secondAttribute="leading" constant="36" id="3Sh-Ix-iyK"/>
<constraint firstItem="AUh-Mz-d0M" firstAttribute="top" secondItem="BWu-i5-5cz" secondAttribute="top" constant="35" id="Chj-oJ-2tc"/>
<constraint firstItem="oZt-aX-ebt" firstAttribute="top" secondItem="AUh-Mz-d0M" secondAttribute="bottom" constant="18" id="G01-zo-Gm4"/>
<constraint firstItem="AUh-Mz-d0M" firstAttribute="leading" secondItem="BWu-i5-5cz" secondAttribute="leading" id="LTN-I3-JgD"/>
<constraint firstItem="oZt-aX-ebt" firstAttribute="top" secondItem="AUh-Mz-d0M" secondAttribute="bottom" constant="18" id="PNM-xq-Lbb"/>
<constraint firstItem="oZt-aX-ebt" firstAttribute="leading" secondItem="BWu-i5-5cz" secondAttribute="leading" constant="36" id="SIO-hO-czP"/>
<constraint firstItem="oZt-aX-ebt" firstAttribute="centerX" secondItem="BWu-i5-5cz" secondAttribute="centerX" id="SpR-8W-y8Q"/>
<constraint firstAttribute="bottom" secondItem="oZt-aX-ebt" secondAttribute="bottom" constant="20" id="Yhj-fM-aF9"/>
<constraint firstAttribute="bottom" secondItem="oZt-aX-ebt" secondAttribute="bottom" constant="20" id="abp-AB-4qS"/>
<constraint firstAttribute="trailing" secondItem="oZt-aX-ebt" secondAttribute="trailing" constant="36" id="bAW-di-XNz"/>
<constraint firstAttribute="trailing" secondItem="oZt-aX-ebt" secondAttribute="trailing" constant="36" id="kG4-nu-KiQ"/>
<constraint firstAttribute="trailing" secondItem="AUh-Mz-d0M" secondAttribute="trailing" id="sRc-WW-b3R"/>
</constraints>
</scrollView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="BWu-i5-5cz" secondAttribute="bottom" id="Iv9-Ud-DFi"/>
<constraint firstItem="BWu-i5-5cz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="W44-WN-qL4"/>
<constraint firstItem="BWu-i5-5cz" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="djT-4V-2UP"/>
<constraint firstAttribute="trailing" secondItem="BWu-i5-5cz" secondAttribute="trailing" id="gmf-Ia-RbP"/>
<constraint firstItem="AUh-Mz-d0M" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="yZI-6x-OTt"/>
</constraints>
<point key="canvasLocation" x="24.5" y="51.5"/>
</view>
</objects>
<resources>
<image name="hotspotconnect" width="19" height="17"/>
</resources>
</document>

View File

@ -188,7 +188,6 @@
[self.view makeToast:@"该设备已存在"];
}else{
[self bindDeviceWithSsid:_deviceBssid];
}