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 7f74a88..f845aa9 100644 Binary files a/Ifish/.DS_Store and b/Ifish/.DS_Store differ diff --git a/Ifish/Assets.xcassets/.DS_Store b/Ifish/Assets.xcassets/.DS_Store index 68f3c68..7211eb6 100644 Binary files a/Ifish/Assets.xcassets/.DS_Store and b/Ifish/Assets.xcassets/.DS_Store differ 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 @@