文字描述修改，去除AP模式第二次wifi跳转
This commit is contained in:
kai
@@ -18,6 +18,7 @@
|
||||
- (IBAction)makeSureButton:(id)sender;
|
||||
|
||||
- (IBAction)lickHereBtnClicked:(id)sender;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *attentionLabel;
|
||||
|
||||
@property(nonatomic,strong)NSString*ssid;
|
||||
@property(nonatomic,strong)NSString*bssid;
|
||||
|
||||
@@ -146,8 +146,11 @@ extern BOOL isfromCameraView;
|
||||
}
|
||||
self.nodImg.frame = CGRectMake(12, yOffset, 10, 10);
|
||||
self.wifiNamelabel.frame = CGRectMake(23, yOffset - 18 + 5, 336, 36);
|
||||
self.attentionLabel.frame=CGRectMake(30, CGRectGetMidY(self.waveProgressView.frame), kScreenWidth-60, 130);
|
||||
[self.view bringSubviewToFront:self.attentionLabel];
|
||||
[self.view bringSubviewToFront:self.connectTipLbl];
|
||||
[self.view bringSubviewToFront:self.connectBtn];
|
||||
|
||||
}
|
||||
|
||||
-(void)viewWillAppear:(BOOL)animated{
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
|
||||
<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="attentionLabel" destination="A0g-TD-kzl" id="L5B-mU-nX8"/>
|
||||
<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"/>
|
||||
@@ -76,7 +75,7 @@
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="linkingdevice_point.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZVX-4y-CYu">
|
||||
<rect key="frame" x="13" y="24" width="9" height="9"/>
|
||||
<rect key="frame" x="3" y="24" width="19" height="19"/>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(暂不支持5G网络，请使用2.4G网络）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Djf-KM-um4">
|
||||
<rect key="frame" x="23" y="96.5" width="224" height="16"/>
|
||||
@@ -85,12 +84,23 @@
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pAw-UG-caT">
|
||||
<rect key="frame" x="267" y="48.5" width="93" height="44"/>
|
||||
<rect key="frame" x="267" y="48.5" width="93" height="88"/>
|
||||
<state key="normal" title="确定" backgroundImage="linkingdevice_botton.png"/>
|
||||
<connections>
|
||||
<action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="MmM-3q-5Lu"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A0g-TD-kzl" userLabel="attentionLabel">
|
||||
<rect key="frame" x="10" y="245" width="355" height="80"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<string key="text">1、请将插排通电，长按复位键或开关绑定键（指示灯开始闪烁为复位成功）。
|
||||
2、若Wifi名称有中文，请改成英文字母加数字。
|
||||
3、Wifi密码不能包含特殊符号（如,.!@等）。
|
||||
4、若多次智能连接未成功，请尝试热点模式连接。</string>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="13"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
@@ -117,8 +127,8 @@
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="linkingdevice_botton.png" width="84" height="44"/>
|
||||
<image name="linkingdevice_point.png" width="9" height="9"/>
|
||||
<image name="linkingdevice_setting.png" width="360" height="404"/>
|
||||
<image name="linkingdevice_botton.png" width="84.5" height="44"/>
|
||||
<image name="linkingdevice_point.png" width="9.5" height="9.5"/>
|
||||
<image name="linkingdevice_setting.png" width="360" height="404.5"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
||||
Reference in New Issue
Block a user