添加热点连接入口
This commit is contained in:
xuemh
parent
c61eac1c49
commit
054c00392f
|
|
@ -2464,6 +2464,8 @@
|
|||
E54787102073192E0060C2C2 /* introlImage_iphonex_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */; };
|
||||
E54787112073192E0060C2C2 /* introlImage_iphonex_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */; };
|
||||
E548F39720A557B7004CF1BC /* JiaReBang.png in Resources */ = {isa = PBXBuildFile; fileRef = E548F39620A557B5004CF1BC /* JiaReBang.png */; };
|
||||
E56A746220FCDBFC000129C9 /* ConnectHotpotViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E56A746020FCDBFC000129C9 /* ConnectHotpotViewController.m */; };
|
||||
E56A746320FCDBFC000129C9 /* ConnectHotpotViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */; };
|
||||
E58C9980208189780004C42B /* back_btn_1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E58C997F208189780004C42B /* back_btn_1@2x.png */; };
|
||||
E58C9984208195640004C42B /* RuiMeiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C9983208195640004C42B /* RuiMeiViewController.m */; };
|
||||
E58C99872081A3BA0004C42B /* RuiMeiProtocolModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C99862081A3BA0004C42B /* RuiMeiProtocolModel.m */; };
|
||||
|
|
@ -6243,6 +6245,9 @@
|
|||
E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_2.jpg; sourceTree = "<group>"; };
|
||||
E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_3.jpg; sourceTree = "<group>"; };
|
||||
E548F39620A557B5004CF1BC /* JiaReBang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JiaReBang.png; sourceTree = "<group>"; };
|
||||
E56A745F20FCDBFC000129C9 /* ConnectHotpotViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ConnectHotpotViewController.h; sourceTree = "<group>"; };
|
||||
E56A746020FCDBFC000129C9 /* ConnectHotpotViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConnectHotpotViewController.m; sourceTree = "<group>"; };
|
||||
E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConnectHotpotViewController.xib; sourceTree = "<group>"; };
|
||||
E58C997F208189780004C42B /* back_btn_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_btn_1@2x.png"; sourceTree = "<group>"; };
|
||||
E58C9982208195640004C42B /* RuiMeiViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuiMeiViewController.h; sourceTree = "<group>"; };
|
||||
E58C9983208195640004C42B /* RuiMeiViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiViewController.m; sourceTree = "<group>"; };
|
||||
|
|
@ -9592,6 +9597,9 @@
|
|||
883E781E1D48A5E50030E075 /* SelectDeviceViewController.m */,
|
||||
883E781F1D48A5E50030E075 /* SetViewController.h */,
|
||||
883E78201D48A5E50030E075 /* SetViewController.m */,
|
||||
E56A745F20FCDBFC000129C9 /* ConnectHotpotViewController.h */,
|
||||
E56A746020FCDBFC000129C9 /* ConnectHotpotViewController.m */,
|
||||
E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */,
|
||||
);
|
||||
path = leftcontrollers;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -15017,6 +15025,7 @@
|
|||
88613F751E5C1E86008D2C69 /* P2PShareViewFeedMessageCell.xib in Resources */,
|
||||
8829574E1DBDA3A300E9DDD7 /* swimmingfish0061.png in Resources */,
|
||||
882957531DBDA3A300E9DDD7 /* swimmingfish0066.png in Resources */,
|
||||
E56A746320FCDBFC000129C9 /* ConnectHotpotViewController.xib in Resources */,
|
||||
883283991EAF4BF800A47157 /* explore_iocn_messages@3x.png in Resources */,
|
||||
88602F2B1E12002500F3DB5D /* NTESTeamListViewController.xib in Resources */,
|
||||
886FB1901E5A9A0500256332 /* explore_iocn_doctor@2x.png in Resources */,
|
||||
|
|
@ -15416,6 +15425,7 @@
|
|||
88883B221EF0FFB600CAC0AE /* SongNuo128Name.m in Sources */,
|
||||
8815D1321DFAADC300BEA2DA /* IfishCameraRecordThirdCell.m in Sources */,
|
||||
887001CF1D794D7B00668C8C /* KanHuViewLastCell.m in Sources */,
|
||||
E56A746220FCDBFC000129C9 /* ConnectHotpotViewController.m in Sources */,
|
||||
886D15831E605EEF0085F7D6 /* CustomeLabel.m in Sources */,
|
||||
E51D7D55208CE08D001FF053 /* CustomModeSetCell.m in Sources */,
|
||||
8860286E1E10BB1100F3DB5D /* NSBundle+CTAssetsPickerController.m in Sources */,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// ConnectHotpotViewController.h
|
||||
// Ifish
|
||||
//
|
||||
// Created by Minghao Xue on 2018/7/16.
|
||||
// Copyright © 2018年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
@interface ConnectHotpotViewController : UIViewController
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
//
|
||||
// ConnectHotpotViewController.m
|
||||
// Ifish
|
||||
//
|
||||
// Created by Minghao Xue on 2018/7/16.
|
||||
// Copyright © 2018年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "ConnectHotpotViewController.h"
|
||||
|
||||
@interface ConnectHotpotViewController ()
|
||||
|
||||
@end
|
||||
|
||||
@implementation ConnectHotpotViewController
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
self.title = @"热点连接";
|
||||
}
|
||||
|
||||
- (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
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?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" useSafeAreas="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="ConnectHotpotViewController">
|
||||
<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"/>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
- (IBAction)makeSureButton:(id)sender;
|
||||
|
||||
- (IBAction)lickHereBtnClicked:(id)sender;
|
||||
|
||||
@property(nonatomic,strong)NSString*ssid;
|
||||
@property(nonatomic,strong)NSString*bssid;
|
||||
|
|
@ -25,6 +26,8 @@
|
|||
|
||||
@property (weak, nonatomic) IBOutlet UIButton *shuoMingShuBtn;
|
||||
@property (weak, nonatomic) IBOutlet UIImageView *nodImg;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *connectTipLbl;
|
||||
@property (weak, nonatomic) IBOutlet UIButton *connectBtn;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@
|
|||
#import "IfishConnectingView.h"
|
||||
#import "PushMasssageWebViewController.h"
|
||||
#import "IfishUserObsever.h"
|
||||
|
||||
#import "ConnectHotpotViewController.h"
|
||||
|
||||
@interface EspTouchDelegateImpl : NSObject<ESPTouchDelegate>
|
||||
|
||||
@end
|
||||
|
|
@ -146,6 +149,8 @@ extern BOOL isfromCameraView;
|
|||
}
|
||||
self.nodImg.frame = CGRectMake(12, yOffset, 10, 10);
|
||||
self.wifiNamelabel.frame = CGRectMake(23, yOffset - 18 + 5, 336, 36);
|
||||
[self.view bringSubviewToFront:self.connectTipLbl];
|
||||
[self.view bringSubviewToFront:self.connectBtn];
|
||||
}
|
||||
|
||||
-(void)viewWillAppear:(BOOL)animated{
|
||||
|
|
@ -198,6 +203,8 @@ extern BOOL isfromCameraView;
|
|||
[self.view addSubview:connectingView];
|
||||
self.wifiNamelabel.hidden = NO;
|
||||
self.wifiTextFiled.hidden = NO;
|
||||
self.connectTipLbl.hidden = NO;
|
||||
self.connectBtn.hidden = NO;
|
||||
self.shareButton.hidden = NO;
|
||||
self.nodImg.hidden = NO;
|
||||
|
||||
|
|
@ -213,6 +220,8 @@ extern BOOL isfromCameraView;
|
|||
[self.connectingView.textChangeView stopAnimation];
|
||||
self.wifiNamelabel.hidden = NO;
|
||||
self.wifiTextFiled.hidden = NO;
|
||||
self.connectTipLbl.hidden = NO;
|
||||
self.connectBtn.hidden = NO;
|
||||
self.shareButton.hidden = NO;
|
||||
self.nodImg.hidden = NO;
|
||||
|
||||
|
|
@ -238,6 +247,8 @@ extern BOOL isfromCameraView;
|
|||
|
||||
self.wifiNamelabel.hidden = YES;
|
||||
self.wifiTextFiled.hidden = YES;
|
||||
self.connectTipLbl.hidden = YES;
|
||||
self.connectBtn.hidden = YES;
|
||||
self.shareButton.hidden = YES;
|
||||
self.nodImg.hidden = YES;
|
||||
|
||||
|
|
@ -406,6 +417,11 @@ extern BOOL isfromCameraView;
|
|||
|
||||
}
|
||||
|
||||
- (IBAction)lickHereBtnClicked:(id)sender {
|
||||
ConnectHotpotViewController *vc = [[ConnectHotpotViewController alloc] initWithNibName:@"ConnectHotpotViewController" bundle:nil];
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
}
|
||||
|
||||
- (IBAction)commandbackBtn:(id)sender {
|
||||
SaySomethingViewController*say=[[SaySomethingViewController alloc]init];
|
||||
[self.navigationController pushViewController:say animated:YES];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
|
||||
<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="SecondConnectWifiController">
|
||||
<connections>
|
||||
<outlet property="connectBtn" destination="eDA-Ia-DAy" id="twz-Z9-3oO"/>
|
||||
<outlet property="connectTipLbl" destination="dwN-It-iak" id="hMH-hE-W8C"/>
|
||||
<outlet property="nodImg" destination="ZVX-4y-CYu" id="XQa-yT-9oP"/>
|
||||
<outlet property="shareButton" destination="pAw-UG-caT" id="1p5-yY-6Wq"/>
|
||||
<outlet property="shuoMingShuBtn" destination="38a-MZ-Nbp" id="g7n-n1-KcQ"/>
|
||||
|
|
@ -33,6 +35,22 @@
|
|||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<textInputTraits key="textInputTraits"/>
|
||||
</textField>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="如果连接有问题，请尝试热点连接模式" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dwN-It-iak">
|
||||
<rect key="frame" x="16" y="182" width="217" height="21"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="eDA-Ia-DAy">
|
||||
<rect key="frame" x="225" y="182" width="63" height="21"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<state key="normal" title="点击这里"/>
|
||||
<connections>
|
||||
<action selector="lickHereBtnClicked:" destination="-1" eventType="touchUpInside" id="YeL-tw-ThH"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" misplaced="YES" id="rxi-ML-YUX" customClass="LXWaveProgressView">
|
||||
<rect key="frame" x="0.0" y="184" width="375" height="61"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
|
|
@ -79,9 +97,4 @@
|
|||
<image name="linkingdevice_point.png" width="9" height="9"/>
|
||||
<image name="linkingdevice_setting.png" width="360" height="404"/>
|
||||
</resources>
|
||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
||||
<simulatedStatusBarMetrics key="statusBar"/>
|
||||
<simulatedOrientationMetrics key="orientation"/>
|
||||
<simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
|
||||
</simulatedMetricsContainer>
|
||||
</document>
|
||||
|
|
|
|||
Loading…
Reference in New Issue