From 08acb8e7efd8f92531a0148452d8c2c68f8c2c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Wed, 17 Apr 2024 20:44:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=93=BE=E6=8E=A5=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 5 ++- Ifish/.DS_Store | Bin 22532 -> 22532 bytes Ifish/Assets.xcassets/.DS_Store | Bin 10244 -> 10244 bytes .../ConfigWifiViewController.m | 17 +++++----- .../ConfigWifiViewController.xib | 30 +++++++++--------- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index f820918..90cf6e4 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -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", diff --git a/Ifish/.DS_Store b/Ifish/.DS_Store index 7f74a88e92ad9ff87c86d142cdc48fd0c0eab113..f845aa9c4c5a30b0c873d9e3a34ad2159777376f 100644 GIT binary patch delta 56 zcmZqKz}T{Zaf62-J-5hLipOtw*0K;Sf LCaKN-W?K~j8RHT! delta 56 zcmZqKz}T{Zaf62-qxs}QL9xm4f-y`B7=TQX%@+leInIXOg?^{s>AvvYFu n^1Fbh0RbZ;gl6D{(lDwUXtmDf27&2(o7ok9v1}F;VP*yZhy)=d delta 36 scmZn(XbG6$&nUeyU^hRb^kg1^lFbEz)A=SgeAvvc@QY>hM^R>G0Pm0u9{>OV diff --git a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.m b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.m index de95d10..d75e17c 100644 --- a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.m +++ b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.m @@ -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) { }]; diff --git a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib index c2f7ff4..274a638 100644 --- a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib +++ b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib @@ -114,7 +114,7 @@