root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: 1.适配小屏幕机型

Browse Source 
feature: 1.忘记密码新增语音和短信验证码切换功能
This commit is contained in:
jiangxuefei718
2019-03-14 08:41:00 +08:00
parent 5746d392a3
commit 91aee9dac1
35 changed files with 293 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
+11 -2
View File
@@ -61,8 +61,17 @@
fiveTapGesture.numberOfTapsRequired = 5;
[self.containerView addGestureRecognizer:fiveTapGesture];
UIImage *hamburger = [[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithImage:hamburger style:0 target:self action:@selector(clickBack)];
UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom];
back.frame = CGRectMake(0,0,48,44);
[back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
// [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
[back addTarget: self action: @selector(clickBack) forControlEvents: UIControlEventTouchUpInside];
[back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)];
back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back];
self.navigationItem.leftBarButtonItem=backItem;
}
-(void)clickBack{
Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib
+43 -30
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<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>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -29,23 +29,23 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder=" 请输入WiFi密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="pTf-KM-cQt">
<rect key="frame" x="16" y="133" width="343" height="43"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder=" 请输入WiFi密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="pTf-KM-cQt">
<rect key="frame" x="17" y="64" width="343" height="43"/>
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="zNS-Ou-3gj"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="如果连接有问题，请尝试热点连接模式" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="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"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="如果连接有问题，请尝试热点连接模式" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwN-It-iak">
<rect key="frame" x="16" y="136" width="209" height="15"/>
<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" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eDA-Ia-DAy">
<rect key="frame" x="225" y="182" width="63" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eDA-Ia-DAy">
<rect key="frame" x="225" y="130" width="50" height="27"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<state key="normal" title="点击这里"/>
<connections>
@@ -64,46 +64,59 @@
<rect key="frame" x="16" y="493" width="178" height="154"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pAw-UG-caT">
<rect key="frame" x="267" y="133" width="92" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<state key="normal" title="确定" backgroundImage="linkingdevice_botton.png"/>
<connections>
<action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="MmM-3q-5Lu"/>
</connections>
</button>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JXU-MG-jdb">
<rect key="frame" x="260" y="133" width="6" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="ssidLabel" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLX-z3-jjZ">
<rect key="frame" x="23" y="79" width="336" height="36"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ssidLabel" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLX-z3-jjZ">
<rect key="frame" x="24" y="18" width="336" height="36"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="Dw1-TT-raa"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="linkingdevice_point.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZVX-4y-CYu">
<rect key="frame" x="12" y="92" width="10" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<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="31.5" width="9" height="9"/>
</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="112" width="224" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="224" id="eda-0s-uHB"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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="64" width="93" height="44"/>
<state key="normal" title="确定" backgroundImage="linkingdevice_botton.png"/>
<connections>
<action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="MmM-3q-5Lu"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="dLX-z3-jjZ" secondAttribute="trailing" constant="15" id="4y5-BD-vSU"/>
<constraint firstItem="dwN-It-iak" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="16" id="5KQ-lk-Bh2"/>
<constraint firstAttribute="trailing" secondItem="pTf-KM-cQt" secondAttribute="trailing" constant="15" id="9Lh-op-znd"/>
<constraint firstItem="pAw-UG-caT" firstAttribute="top" secondItem="pTf-KM-cQt" secondAttribute="top" id="DIZ-dK-YeC"/>
<constraint firstItem="dLX-z3-jjZ" firstAttribute="leading" secondItem="ZVX-4y-CYu" secondAttribute="trailing" constant="2" id="DiL-E2-Ffv"/>
<constraint firstItem="pAw-UG-caT" firstAttribute="trailing" secondItem="pTf-KM-cQt" secondAttribute="trailing" id="F1u-S4-uOT"/>
<constraint firstItem="eDA-Ia-DAy" firstAttribute="centerY" secondItem="dwN-It-iak" secondAttribute="centerY" id="GhX-wp-8J9"/>
<constraint firstItem="pAw-UG-caT" firstAttribute="leading" secondItem="pTf-KM-cQt" secondAttribute="trailing" constant="-93" id="HbX-QX-BKw"/>
<constraint firstItem="dwN-It-iak" firstAttribute="top" secondItem="Djf-KM-um4" secondAttribute="bottom" constant="8" id="Jo6-Bz-XWs"/>
<constraint firstItem="Djf-KM-um4" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="23" id="Om3-mg-wDG"/>
<constraint firstItem="Djf-KM-um4" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="112" id="bPy-nD-6Ia"/>
<constraint firstItem="eDA-Ia-DAy" firstAttribute="leading" secondItem="dwN-It-iak" secondAttribute="trailing" id="UOq-SD-7bv"/>
<constraint firstItem="Djf-KM-um4" firstAttribute="top" secondItem="pTf-KM-cQt" secondAttribute="bottom" constant="5" id="ZI9-XL-QR0"/>
<constraint firstItem="pTf-KM-cQt" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="17" id="Zpq-5y-Mzb"/>
<constraint firstItem="ZVX-4y-CYu" firstAttribute="centerY" secondItem="dLX-z3-jjZ" secondAttribute="centerY" id="buo-fh-zXW"/>
<constraint firstItem="dLX-z3-jjZ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="24" id="idB-iY-9tX"/>
<constraint firstItem="pTf-KM-cQt" firstAttribute="top" secondItem="dLX-z3-jjZ" secondAttribute="bottom" constant="10" id="kgi-vi-69m"/>
<constraint firstItem="dLX-z3-jjZ" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="18" id="vxM-7Q-dY3"/>
</constraints>
<point key="canvasLocation" x="-422.5" y="214.5"/>
<nil key="simulatedTopBarMetrics"/>
<point key="canvasLocation" x="-676" y="192.95352323838082"/>
</view>
</objects>
<resources>