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

替换链接，修改按钮颜色

This commit is contained in:
祝发冬 2024-04-17 20:44:45 +08:00
parent ff61c9863e
commit 08acb8e7ef
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ifish.xcodeproj/project.pbxproj
View File

@ -16178,7 +16178,7 @@
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
);
MARKETING_VERSION = 5.1.25;
MARKETING_VERSION = 5.1.26;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
@ -16220,7 +16220,6 @@
CLANG_CXX_LIBRARY = "compiler-default";
CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = WFX8GD5HFX;
@ -16299,7 +16298,7 @@
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
);
MARKETING_VERSION = 5.1.25;
MARKETING_VERSION = 5.1.26;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-ObjC",

BIN
Ifish/.DS_Store vendored
View File

Binary file not shown.

BIN
Ifish/Assets.xcassets/.DS_Store vendored
View File

Binary file not shown.

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

@ -166,7 +166,7 @@ extern BOOL isfromCameraView;
// [self addTitleViewWithTitle:self.vcTitle];
[self.connectTypeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
self.rightButton = [UIButton buttonWithType:UIButtonTypeCustom];
self.rightButton.frame = CGRectMake(0, 0, 50, 44);
@ -275,7 +275,7 @@ extern BOOL isfromCameraView;
SPAlertAction*ap =[SPAlertAction actionWithTitle:apTitle style:SPAlertActionStyleDefault handler:^(SPAlertAction * _Nonnull action) {
[weakSelf connectNormalView];
weakSelf.connectType = ConnectTypeAP;
weakSelf.shuoMingShuBtn.hidden = YES;
weakSelf.shuoMingShuBtn.hidden = NO;
weakSelf.connectTypeTitle.text = apTitle;
weakSelf.connectTipLbl.text = nil;
weakSelf.connectTipLbl.attributedText = attap;
@ -302,13 +302,12 @@ extern BOOL isfromCameraView;
-(IBAction)shuoMingShuBtnAction:(UIButton *)btn{
// InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
// info.title=NSLocalizedString(@"ifish_deviceuse", nil);;;
// info.type=@"instruction";
// info.image=[UIImage imageNamed:@"instruction"];
// [self.navigationController pushViewController:info animated:YES];
NSURL*url = [NSURL URLWithString:@"https://www.ifish7.com/download/20231205193033.mp4"];
NSString*videourl = @"https://www.ifish7.com/download/s3.mp4";
if(self.connectType == ConnectTypeAP)
{
videourl = @"https://www.ifish7.com/download/s4.mp4";
}
NSURL*url = [NSURL URLWithString:videourl];
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
}];

30
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="270" height="253.5"/>
<rect key="frame" x="40" y="268" width="270" height="256.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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<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" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -320,7 +320,7 @@ Cg
<fragment content="然后重新复位连接。">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="16" name=".PingFangSC-Regular"/>
<font key="NSFont" metaFont="system" size="16"/>
<font key="NSOriginalFont" metaFont="system" size="16"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
@ -524,7 +524,7 @@ Cg
<constraint firstItem="kvd-IO-pFg" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="ItS-yz-iS6"/>
<constraint firstItem="Dv9-sQ-6QZ" firstAttribute="top" secondItem="GWP-4K-9X8" secondAttribute="bottom" id="JdG-rw-7pj"/>
<constraint firstItem="GWP-4K-9X8" firstAttribute="top" secondItem="bau-WU-WAP" secondAttribute="bottom" id="Jud-yA-Dhw"/>
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="HuT-1B-gI8" secondAttribute="trailing" constant="30" id="Jwb-UH-UZV"/>
<constraint firstItem="HuT-1B-gI8" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" constant="-30" id="Jwb-UH-UZV"/>
<constraint firstItem="504-kU-hp3" firstAttribute="top" secondItem="GWP-4K-9X8" secondAttribute="bottom" constant="56" id="NlV-Pp-gJe"/>
<constraint firstItem="GWP-4K-9X8" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Nn7-ML-5NQ"/>
<constraint firstItem="GWP-4K-9X8" firstAttribute="top" secondItem="jcI-qI-bgh" secondAttribute="bottom" id="PMc-8l-dZ5"/>