diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 0e0d8d2..c14a5c7 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15829,7 +15829,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15904,7 +15904,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.18; + MARKETING_VERSION = 5.1.19; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", @@ -15947,7 +15947,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -16022,7 +16022,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.18; + MARKETING_VERSION = 5.1.19; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-ObjC", diff --git a/Ifish/Assets.xcassets/.DS_Store b/Ifish/Assets.xcassets/.DS_Store index 7ff9bf7..68f3c68 100644 Binary files a/Ifish/Assets.xcassets/.DS_Store and b/Ifish/Assets.xcassets/.DS_Store differ diff --git a/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png b/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png index 03601f1..d305b57 100644 Binary files a/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png and b/Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png differ diff --git a/Ifish/Assets.xcassets/说明书/roleCa.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/roleCa.imageset/Contents.json new file mode 100644 index 0000000..a50e6fc --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/roleCa.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "roleCa.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/roleCa.imageset/roleCa.png b/Ifish/Assets.xcassets/说明书/roleCa.imageset/roleCa.png new file mode 100644 index 0000000..f7b50e3 Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/roleCa.imageset/roleCa.png differ diff --git a/Ifish/Assets.xcassets/说明书/songnuo.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/songnuo.imageset/Contents.json new file mode 100644 index 0000000..e5cc6e7 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/songnuo.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "songnuo.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/songnuo.imageset/songnuo.png b/Ifish/Assets.xcassets/说明书/songnuo.imageset/songnuo.png new file mode 100644 index 0000000..5c12d29 Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/songnuo.imageset/songnuo.png differ diff --git a/Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/Contents.json b/Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/Contents.json new file mode 100644 index 0000000..2221bc9 --- /dev/null +++ b/Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "摇头机说明书.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/摇头机说明书.png b/Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/摇头机说明书.png new file mode 100644 index 0000000..ef31374 Binary files /dev/null and b/Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/摇头机说明书.png differ diff --git a/Ifish/Base.lproj/LaunchScreen.storyboard b/Ifish/Base.lproj/LaunchScreen.storyboard index a2980ee..db1fb40 100644 --- a/Ifish/Base.lproj/LaunchScreen.storyboard +++ b/Ifish/Base.lproj/LaunchScreen.storyboard @@ -1,18 +1,16 @@ - - - - + + - + - + @@ -22,7 +20,7 @@ - + diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m index d8af3c7..0cd7b27 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m @@ -7,9 +7,51 @@ // #import "InfoByImageViewController.h" +@interface InstructionCell : UITableViewCell +@property (nonatomic, strong) NSDictionary *model; +@property (nonatomic, strong) UIImageView *icon; +@end -@interface InfoByImageViewController () +@implementation InstructionCell +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ + self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; + if (self) + { + UIImageView*imageView=[[UIImageView alloc]initWithFrame:CGRectZero]; + [self.contentView addSubview:imageView]; + imageView.contentMode=UIViewContentModeScaleToFill; + [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); }]; + self.icon=imageView; + + + } + + return self; +} + +- (void)setModel:(NSDictionary *)model +{ + _model=model; + UIImage*image=[UIImage imageNamed:model[@"image"]]; + if (image) + { + self.icon.image=image; + } + else + { + self.icon.image=nil; + } +} +@end +@interface InfoByImageViewController () +@property (nonatomic, strong) UITableView *tableView; +@property (nonatomic, strong) NSArray *dataArray; +@property (nonatomic, assign) CGFloat rowHeight; @end @implementation InfoByImageViewController @@ -116,6 +158,28 @@ } else if ([self.type isEqualToString:@"instruction"])//详细说明书 { +// [self getTableData]; +// [self creatTab]; +// return; + NSInteger count =9; + CGFloat itemHeight=imageHeight/count; + for (int i=0; i 0) { diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index cf34afc..1785966 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -20,6 +20,7 @@ #import "Contact.h" #import "LocalDevice.h"//rtsp监控界面弹出修改 #import "CustomTopBar.h" +#import "UINavigationBar+Background.h" #define MAX_VIDEO_RES_SIZE ((1920+32)*1088) #define DeviceId @"3157838" #define DevicePw @"616657769" @@ -461,7 +462,7 @@ Strong UIImage *screenShotImage;//截图 //导航栏 NSString *deviceName = [NSString stringWithFormat:@"%@",self.contact.showName]; - [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; + [self.navigationController.navigationBar resetBackgroundImage]; UIButton*leftBtn = [UIButton buttonWithType:UIButtonTypeCustom]; leftBtn.frame = CGRectMake(0, 0, 47,44); [leftBtn setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; diff --git a/Ifish/controllers/logAddRegistController/LBLaunchImageAd/LBLaunchImageAdView.m b/Ifish/controllers/logAddRegistController/LBLaunchImageAd/LBLaunchImageAdView.m index 08ba4ee..1a68c47 100755 --- a/Ifish/controllers/logAddRegistController/LBLaunchImageAd/LBLaunchImageAdView.m +++ b/Ifish/controllers/logAddRegistController/LBLaunchImageAd/LBLaunchImageAdView.m @@ -221,7 +221,7 @@ } self.aDImgView.userInteractionEnabled = YES; self.skipBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - self.skipBtn.frame = CGRectMake(mainWidth - 70, 20, 60, 30); + self.skipBtn.frame = CGRectMake(mainWidth - 70, [[UIApplication sharedApplication] statusBarFrame].size.height, 60, 30); //self.skipBtn.backgroundColor = [UIColor brownColor]; self.skipBtn.titleLabel.font = [UIFont systemFontOfSize:14]; [self.skipBtn addTarget:self action:@selector(skipBtnClick) forControlEvents:UIControlEventTouchUpInside];