diff --git a/.DS_Store b/.DS_Store index eda25fc..41700b7 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 27c777a..ea05407 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15777,7 +15777,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15852,7 +15852,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.7; + MARKETING_VERSION = 5.1.8; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", @@ -15895,7 +15895,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15970,7 +15970,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.7; + MARKETING_VERSION = 5.1.8; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-ObjC", diff --git a/Ifish/Assets.xcassets/.DS_Store b/Ifish/Assets.xcassets/.DS_Store index 91d1bd6..7596d88 100644 Binary files a/Ifish/Assets.xcassets/.DS_Store and b/Ifish/Assets.xcassets/.DS_Store differ diff --git a/Ifish/Assets.xcassets/Contents.json b/Ifish/Assets.xcassets/Contents.json index da4a164..73c0059 100644 --- a/Ifish/Assets.xcassets/Contents.json +++ b/Ifish/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Ifish/Assets.xcassets/说明书/CW2.imageset/CW2.png b/Ifish/Assets.xcassets/说明书/CW2.imageset/CW2.png new file mode 100644 index 0000000..7b20e91 Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/CW2.imageset/CW2.png differ diff --git a/Ifish/Assets.xcassets/说明书/CW2.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/CW2.imageset/Contents.json new file mode 100644 index 0000000..17467b7 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/CW2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "CW2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/Contents.json b/Ifish/Assets.xcassets/说明书/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/HX-WY01.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/HX-WY01.imageset/Contents.json new file mode 100644 index 0000000..a158936 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/HX-WY01.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "HX-WY01.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/HX-WY01.imageset/HX-WY01.png b/Ifish/Assets.xcassets/说明书/HX-WY01.imageset/HX-WY01.png new file mode 100644 index 0000000..424c25e Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/HX-WY01.imageset/HX-WY01.png differ diff --git a/Ifish/Assets.xcassets/说明书/SW10.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/SW10.imageset/Contents.json new file mode 100644 index 0000000..3e9da33 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/SW10.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "SW10.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/SW10.imageset/SW10.png b/Ifish/Assets.xcassets/说明书/SW10.imageset/SW10.png new file mode 100644 index 0000000..cfe14cf Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/SW10.imageset/SW10.png differ diff --git a/Ifish/Assets.xcassets/说明书/SW7.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/SW7.imageset/Contents.json new file mode 100644 index 0000000..72ab41a --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/SW7.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "SW7.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/SW7.imageset/SW7.png b/Ifish/Assets.xcassets/说明书/SW7.imageset/SW7.png new file mode 100644 index 0000000..6e39921 Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/SW7.imageset/SW7.png differ diff --git a/Ifish/Assets.xcassets/说明书/cameraInfo.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/cameraInfo.imageset/Contents.json new file mode 100644 index 0000000..1241d63 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/cameraInfo.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "cameraInfo.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/cameraInfo.imageset/cameraInfo.png b/Ifish/Assets.xcassets/说明书/cameraInfo.imageset/cameraInfo.png new file mode 100644 index 0000000..a5d85ed Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/cameraInfo.imageset/cameraInfo.png differ diff --git a/Ifish/Assets.xcassets/说明书/failreason.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/failreason.imageset/Contents.json new file mode 100644 index 0000000..cbb5781 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/failreason.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "failreason.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/failreason.imageset/failreason.png b/Ifish/Assets.xcassets/说明书/failreason.imageset/failreason.png new file mode 100644 index 0000000..c9d5d8d Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/failreason.imageset/failreason.png differ diff --git a/Ifish/Assets.xcassets/说明书/instruction.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/instruction.imageset/Contents.json new file mode 100644 index 0000000..11d2755 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/instruction.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "instruction.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png b/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png new file mode 100644 index 0000000..8e2f2b9 Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png differ diff --git a/Ifish/Assets.xcassets/说明书/sw1.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/sw1.imageset/Contents.json new file mode 100644 index 0000000..df2031b --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/sw1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "sw1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/sw1.imageset/sw1.png b/Ifish/Assets.xcassets/说明书/sw1.imageset/sw1.png new file mode 100644 index 0000000..83b43c3 Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/sw1.imageset/sw1.png differ diff --git a/Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m b/Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m index c01477c..de8a0e4 100644 --- a/Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m +++ b/Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m @@ -14,6 +14,8 @@ #import "IfishLoadingWebViewController.h" #import "IfishADTimerViewController.h" #import "RegistViewController.h" +#import "InfoByImageViewController.h" + @implementation IfishUserDataUnity +(IfishUserDataUnity*)shareDataInstance @@ -147,9 +149,15 @@ // }]; IfishMianTabViewController *mianVC=[[IfishMianTabViewController alloc] init]; [UIApplication sharedApplication].delegate.window.rootViewController=mianVC; - IfishLoadingWebViewController *pushVC = [[IfishLoadingWebViewController alloc] init]; - pushVC.pushlink = IFISH_DEVCEITROURL; - [mianVC.navigationController pushViewController:pushVC animated:YES]; +// IfishLoadingWebViewController *pushVC = [[IfishLoadingWebViewController alloc] init]; +// pushVC.pushlink = IFISH_DEVCEITROURL; +// [mianVC.navigationController pushViewController:pushVC animated:YES]; + + InfoByImageViewController*info=[[InfoByImageViewController alloc]init]; + info.title=NSLocalizedString(@"ifish_deviceuse", nil);;; + info.type=@"instruction"; + info.image=[UIImage imageNamed:@"instruction"]; + [mianVC.navigationController pushViewController:info animated:YES]; } break; diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.h b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.h index 0663050..33dc05e 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.h +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.h @@ -7,6 +7,7 @@ // #import +#import "InfoByImageViewController.h" @interface IfishMeViewController : UIViewController diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m index c9997f0..39c76a1 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m @@ -535,7 +535,16 @@ // webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil); // [self.navigationController pushViewController:webVC animated:YES]; // self.hidesBottomBarWhenPushed = NO; - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:IFISH_DEVCEITROURL]]; + // [[UIApplication sharedApplication] openURL:[NSURL URLWithString:IFISH_DEVCEITROURL]]; + + self.hidesBottomBarWhenPushed = YES; + 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]; + self.hidesBottomBarWhenPushed = NO; + }else if (indexPath.section == 3 && indexPath.row == 2){ //联系我们 diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.h b/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.h index b4a8d97..4c27c7d 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.h +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.h @@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN @interface InfoByImageViewController : BaseViewController +@property (nonatomic, strong) UIScrollView *scrollView; + @property (nonatomic, strong) UIImageView *imageView; @property (nonatomic, strong) UIImage *image; @property (nonatomic, strong) NSString *type; diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m index 4706408..d8af3c7 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m @@ -17,17 +17,48 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. + + self.scrollView=[[UIScrollView alloc]initWithFrame:CGRectZero]; + //self.scrollView.clipsToBounds=YES; self.imageView=[[UIImageView alloc]initWithFrame:CGRectZero]; - [self.view addSubview:self.imageView]; + // self.imageView.contentMode=UIViewContentModeCenter; + [self.scrollView addSubview:self.imageView]; + //self.scrollView.scrollEnabled=NO; + [self.view addSubview:self.scrollView]; + self.imageView.userInteractionEnabled=YES; + [ self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(0); + make.top.mas_equalTo(0); + make.bottom.mas_equalTo(0); + make.right.mas_equalTo(0); + }]; + CGFloat imageHeight=kScreenHeight-TOP_HEIGHT; + CGFloat imageWidth=kScreenWidth; + + CGFloat ratio=imageWidth/imageHeight; + if (self.image) + { + ratio=self.image.size.width/self.image.size.height; + } + + imageHeight=imageWidth/ratio; + + self.scrollView.contentSize=CGSizeMake(imageWidth, imageHeight); + [ self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); - make.top.mas_equalTo(0); - make.bottom.mas_equalTo(0); - make.right.mas_equalTo(0); + make.left.mas_equalTo(self.scrollView); + make.top.mas_equalTo(self.scrollView); + make.height.mas_equalTo(imageHeight); + make.width.mas_equalTo(imageWidth); + // make.right.mas_equalTo(self.view); + }]; + + if (self.image) { self.imageView.image=self.image; + } if (self.title) { @@ -36,12 +67,12 @@ if ([self.type isEqualToString:@"service"]) { UIButton*xuanduo=[UIButton buttonWithType:UIButtonTypeSystem]; - [self.view addSubview:xuanduo]; + [self.imageView addSubview:xuanduo]; [xuanduo mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(0); make.top.mas_equalTo(0); - make.height.mas_equalTo(self.view.frame.size.height/12); + make.height.mas_equalTo(imageHeight/12); make.right.mas_equalTo(0); }]; @@ -53,12 +84,12 @@ UIButton*reuxin=[UIButton buttonWithType:UIButtonTypeSystem]; - [self.view addSubview:reuxin]; + [self.imageView addSubview:reuxin]; [reuxin mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(0); - make.top.mas_equalTo(4*self.view.frame.size.height/12-25); - make.height.mas_equalTo(self.view.frame.size.height/12); + make.top.mas_equalTo(4*imageHeight/12); + make.height.mas_equalTo(imageHeight/12); make.right.mas_equalTo(0); }]; @@ -68,12 +99,13 @@ UIButton*songnuo=[UIButton buttonWithType:UIButtonTypeSystem]; - [self.view addSubview:songnuo]; + + [self.imageView addSubview:songnuo]; [songnuo mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(0); - make.top.mas_equalTo(8*self.view.frame.size.height/12-25); - make.height.mas_equalTo(self.view.frame.size.height/12); + make.top.mas_equalTo(8*imageHeight/12); + make.height.mas_equalTo(imageHeight/12); make.right.mas_equalTo(0); }]; @@ -82,8 +114,153 @@ [songnuo addTarget:self action:@selector(service:) forControlEvents:UIControlEventTouchUpInside]; } + else if ([self.type isEqualToString:@"instruction"])//详细说明书 + { + UIButton*camera=[UIButton buttonWithType:UIButtonTypeSystem]; + [self.imageView addSubview:camera]; + [camera mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(0); + make.top.mas_equalTo(0); + make.height.mas_equalTo(imageHeight/7); + make.right.mas_equalTo(0); + + }]; + camera.tag=1; + camera.backgroundColor=[UIColor clearColor]; + [camera addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside]; + + + UIButton*senven=[UIButton buttonWithType:UIButtonTypeSystem]; + [self.imageView addSubview:senven]; + [senven mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(0); + make.top.mas_equalTo(imageHeight/7); + make.height.mas_equalTo(1*imageHeight/7); + make.right.mas_equalTo(0); + + }]; + senven.tag=2; + senven.backgroundColor=[UIColor clearColor]; + [senven addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside]; + + UIButton*sw7=[UIButton buttonWithType:UIButtonTypeSystem]; + [self.imageView addSubview:sw7]; + [sw7 mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(0); + make.top.mas_equalTo(2*imageHeight/7); + make.height.mas_equalTo(1*imageHeight/7); + make.right.mas_equalTo(0); + + }]; + sw7.tag=3; + sw7.backgroundColor=[UIColor clearColor]; + [sw7 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside]; + + + UIButton*sw10=[UIButton buttonWithType:UIButtonTypeSystem]; + [self.imageView addSubview:sw10]; + [sw10 mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(0); + make.top.mas_equalTo(3*imageHeight/7); + make.height.mas_equalTo(1*imageHeight/7); + make.right.mas_equalTo(0); + + }]; + sw10.tag=4; + sw10.backgroundColor=[UIColor clearColor]; + [sw10 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside]; + + + UIButton*cw2=[UIButton buttonWithType:UIButtonTypeSystem]; + [self.imageView addSubview:cw2]; + [cw2 mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(0); + make.top.mas_equalTo(4*imageHeight/7); + make.height.mas_equalTo(1*imageHeight/7); + make.right.mas_equalTo(0); + + }]; + cw2.tag=5; + cw2.backgroundColor=[UIColor clearColor]; + [cw2 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside]; + + UIButton*sw1_6=[UIButton buttonWithType:UIButtonTypeSystem]; + [self.imageView addSubview:sw1_6]; + [sw1_6 mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(0); + make.top.mas_equalTo(5*imageHeight/7); + make.height.mas_equalTo(1*imageHeight/7); + make.right.mas_equalTo(0); + + }]; + sw1_6.tag=6; + sw1_6.backgroundColor=[UIColor clearColor]; + [sw1_6 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside]; + + + UIButton*hxwy01=[UIButton buttonWithType:UIButtonTypeSystem]; + [self.imageView addSubview:hxwy01]; + [hxwy01 mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(0); + make.top.mas_equalTo(6*imageHeight/7); + make.height.mas_equalTo(1*imageHeight/7); + make.right.mas_equalTo(0); + + }]; + hxwy01.tag=7; + hxwy01.backgroundColor=[UIColor clearColor]; + [hxwy01 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside]; + + } +} +-(void)instruction:(UIButton*)button +{ + self.hidesBottomBarWhenPushed = YES; + InfoByImageViewController*info=[[InfoByImageViewController alloc]init]; + + + if (button.tag==1) { + info.title=@"常见失败原因"; + info.image=[UIImage imageNamed:@"failreason"]; + } + else if (button.tag==2) { + info.title=@"小7摄像头"; + info.image=[UIImage imageNamed:@"cameraInfo"]; + } + else if (button.tag==3) { + info.title=@"绚多SW7"; + info.image=[UIImage imageNamed:@"SW7"]; + } + else if (button.tag==4) { + info.title=@"绚多SW10"; + info.image=[UIImage imageNamed:@"SW10"]; + } + else if (button.tag==5) { + info.title=@"绚多CW2"; + info.image=[UIImage imageNamed:@"CW2"]; + } + else if (button.tag==6) { + info.title=@"绚多SW1/SW6/W6"; + info.image=[UIImage imageNamed:@"sw1"]; + } + else if (button.tag==7) { + info.title=@"睿芯HX-WY01"; + info.image=[UIImage imageNamed:@"HX-WY01"]; + } + + + + + [self.navigationController pushViewController:info animated:YES]; } -(void)service:(UIButton*)button { diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m index aeacbc0..d7d1f68 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m @@ -25,7 +25,7 @@ // CFShow((__bridge CFTypeRef)(infoDic)); NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"]; NSLog(@"app_Version%@",app_Version); - app_Version=@"4.7.7"; + app_Version=@"4.7.8"; NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version]; NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"]; if (buildVersion.length > 0) { diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m index fdf9d49..3a4388d 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m @@ -27,8 +27,11 @@ [self addTitleViewWithTitle:@"更换手机号"]; //self.title = @"更换手机号"; UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"]; - NSMutableString*string=[[NSMutableString alloc]initWithString:model.phoneNumber]; - [string replaceCharactersInRange:NSMakeRange(3, 4) withString:@"***"]; + NSMutableString*string=[[NSMutableString alloc]initWithString:[CommonUtils getNotNilStr:model.phoneNumber]]; + if (string.length>7) { + [string replaceCharactersInRange:NSMakeRange(3, 4) withString:@"***"]; + + } self.yuanTelPhone.text=string; [self.timerbutton addTarget:self action:@selector(startTime) forControlEvents:UIControlEventTouchUpInside]; [self textStyle]; diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index 637b789..a0e7f7c 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -47,6 +47,7 @@ #import "StoreNameView.h" #import "ConnectingAquarVC.h" #import "SecondConnectWifiController.h" +#import "InfoByImageViewController.h" @interface IfishDeviceViewController () @property(nonatomic,strong)UITableView *tableView; @@ -1339,12 +1340,20 @@ Assign BOOL isPush; -(void)pushshuoMingView{ +// self.hidesBottomBarWhenPushed = YES; +// PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init]; +// webVC.pushlink =IFISH_DEVCEITROURL; +// //webVC.pushlink =@"http://q.eqxiu.com/s/KmmVl87l"; +// webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil); +// [self.navigationController pushViewController:webVC animated:YES]; +// self.hidesBottomBarWhenPushed = NO; + self.hidesBottomBarWhenPushed = YES; - PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init]; - webVC.pushlink =IFISH_DEVCEITROURL; - //webVC.pushlink =@"http://q.eqxiu.com/s/KmmVl87l"; - webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil); - [self.navigationController pushViewController:webVC animated:YES]; + InfoByImageViewController*info=[[InfoByImageViewController alloc]init]; + info.title=@"产品说明书"; + info.type=@"instruction"; + info.image=[UIImage imageNamed:@"instruction"]; + [self.navigationController pushViewController:info animated:YES]; self.hidesBottomBarWhenPushed = NO; } diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 37d93c9..d9d4e7a 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -32,6 +32,7 @@ #import "IfishUserDataUnity.h" #import "DeviceCameraModel.h" #import "ConAquarChooseWiFiVC.h" +#import "InfoByImageViewController.h" typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { lodingViewdissMissSuccsess=0,// default is 0 lodingViewdissMissfail, @@ -295,11 +296,18 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像 } - PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init]; - webVC.pushlink =IFISH_DEVCEITROURL; - webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);; +// PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init]; +// webVC.pushlink =IFISH_DEVCEITROURL; +// webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);; +// +// [self.navigationController pushViewController:webVC animated:YES]; - [self.navigationController pushViewController:webVC animated:YES]; + 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]; + } diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index 01f5862..1700953 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -30,6 +30,7 @@ #import #import "ConnectHotpotViewController.h" #import "ConAquarNowWiFiPwdVC.h" +#import "InfoByImageViewController.h" @interface EspTouchDelegateImpl : NSObject @end @@ -167,12 +168,18 @@ extern BOOL isfromCameraView; -(void)shuoMingShuBtnAction:(UIButton *)btn{ - PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init]; - webVC.pushlink =IFISH_DEVCEITROURL; - webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);; +// PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init]; +// webVC.pushlink =IFISH_DEVCEITROURL; +// webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);; +// +// [self.navigationController pushViewController:webVC animated:YES]; - [self.navigationController pushViewController:webVC animated:YES]; - + 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]; + }