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

间距调整

This commit is contained in:
祝发冬 2023-12-06 14:45:11 +08:00
parent 0a13ae3810
commit 86a82a3b02
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ifish.xcodeproj/project.pbxproj
View File

@ -16101,7 +16101,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 15;
CURRENT_PROJECT_VERSION = 17;
DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;
@ -16222,7 +16222,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 15;
CURRENT_PROJECT_VERSION = 17;
DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;

4
Ifish/controllers/leftcontrollers/ConfigWifiViewController.m
View File

@ -233,9 +233,9 @@ extern BOOL isfromCameraView;
NSString*airkisTitle = @"一键联网";
NSString*smartTitle = @"快捷联网";
NSString*apTitle = @"AP联网";
NSString*airkisTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键3秒，松手后红灯绿灯同时 闪烁,再点确定按钮。\n3、如多次尝试一键联网都不成功，可切换其他 联网方式，每次重新连接时插座需断一次电然后重新复位连接。\n\n提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
NSString*airkisTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键3秒，松手后红灯绿灯同时 闪烁,再点确定按钮。\n3、如多次尝试一键联网都不成功，可切换其他 联网方式，每次重新连接时插座需断一次电然后重新复位连接。\n提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
NSString*smartTips = airkisTips;
NSString*apTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭,只有绿灯偶尔闪烁，再点下一步。\n\n提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
NSString*apTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭,只有绿灯偶尔闪烁，再点下一步。\n提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
NSMutableAttributedString*attair = [[NSMutableAttributedString alloc]initWithString:airkisTips attributes:@{NSForegroundColorAttributeName:[UIColor blackColor],NSFontAttributeName:[UIFont systemFontOfSize:16]}];
[attair addAttributes:@{NSForegroundColorAttributeName:[UIColor redColor]} range:[airkisTips rangeOfString:red]];
[attair addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:11]} range:[airkisTips rangeOfString:tips]];

52
Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib
View File

@ -114,7 +114,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5UF-8K-mpU" userLabel="connectTipLbl">
<rect key="frame" x="40" y="268" width="240" height="275.5"/>
<rect key="frame" x="40" y="268" width="270" height="253.5"/>
<attributedString key="attributedText">
<fragment content="1">
<attributes>
@ -126,7 +126,7 @@
<fragment content="、插座仅支持">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -141,7 +141,7 @@
<fragment content="的">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -156,7 +156,7 @@
<fragment content="网络，不支持">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -171,7 +171,7 @@
<fragment content="及">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -186,7 +186,7 @@
<fragment content="双频合一的网络">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -201,7 +201,7 @@
<fragment content="需在路由器设置中分开">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -225,7 +225,7 @@
<fragment content="、先长按插座复位键">
<attributes>
<color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -240,7 +240,7 @@
<fragment content="秒，松手后红灯绿灯同时">
<attributes>
<color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -255,7 +255,7 @@
<fragment content="闪烁">
<attributes>
<color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -270,7 +270,7 @@
<fragment content="再点确定按钮。">
<attributes>
<color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -287,7 +287,7 @@
<fragment content="、如多次尝试一键联网都不成功，可切换其他">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -302,7 +302,7 @@
<fragment content="联网方式，每次重新连接时插座需断一次电">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -320,16 +320,16 @@ Cg
<fragment content="然后重新复位连接。">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="


">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="提示">
@ -337,14 +337,14 @@ Cg
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content=":">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="由于新版">
@ -352,14 +352,14 @@ Cg
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="APP">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="升级，产品包装盒内的说明书可能与新版">
@ -367,14 +367,14 @@ Cg
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="APP">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="联网方式不同，请以">
@ -382,14 +382,14 @@ Cg
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="APP">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="界面提示内容为准，也可查看右上角视频教程。">
@ -397,7 +397,7 @@ Cg
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
@ -547,7 +547,7 @@ Cg
<constraint firstItem="D54-Zo-SRM" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="10" id="ns7-Yx-wip"/>
<constraint firstItem="KU2-2N-7iz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="obb-p1-4XH"/>
<constraint firstItem="504-kU-hp3" firstAttribute="top" secondItem="O5l-oe-jwK" secondAttribute="bottom" id="oyF-cp-igt"/>
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="5UF-8K-mpU" secondAttribute="trailing" constant="40" id="qdx-A1-MzN"/>
<constraint firstItem="5UF-8K-mpU" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" constant="-10" id="qdx-A1-MzN"/>
<constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="kvd-IO-pFg" secondAttribute="bottom" constant="30" id="sHh-eQ-MJM"/>
<constraint firstItem="bau-WU-WAP" firstAttribute="leading" secondItem="d6V-cd-toE" secondAttribute="leading" id="tSj-er-HwA"/>
<constraint firstItem="HuT-1B-gI8" firstAttribute="bottom" secondItem="kvd-IO-pFg" secondAttribute="top" constant="-15" id="v1E-Ff-HYR"/>