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

更换说明书

This commit is contained in:
kai60 2021-11-02 10:15:18 +08:00
parent 6029a5eb67
commit 7b7faab5ce
14 changed files with 225 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ifish.xcodeproj/project.pbxproj
View File

@ -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",

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

Binary file not shown.

BIN
Ifish/Assets.xcassets/说明书/instruction.imageset/instruction.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 252 KiB

21
Ifish/Assets.xcassets/说明书/roleCa.imageset/Contents.json vendored Normal file
View File

@ -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
}
}

BIN
Ifish/Assets.xcassets/说明书/roleCa.imageset/roleCa.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

21
Ifish/Assets.xcassets/说明书/songnuo.imageset/Contents.json vendored Normal file
View File

@ -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
}
}

BIN
Ifish/Assets.xcassets/说明书/songnuo.imageset/songnuo.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 208 KiB

21
Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "摇头机说明书.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Ifish/Assets.xcassets/说明书/摇头机说明书.imageset/摇头机说明书.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 318 KiB

12
Ifish/Base.lproj/LaunchScreen.storyboard
View File

@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<viewController wantsFullScreenLayout="YES" id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
@ -22,7 +20,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchImage-1" translatesAutoresizingMaskIntoConstraints="NO" id="xcR-bi-fW8">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

154
Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m
View File

@ -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 ()<UITableViewDelegate,UITableViewDataSource>
@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<count; i++)
{
UIButton*camera=[UIButton buttonWithType:UIButtonTypeSystem];
[self.imageView addSubview:camera];
[camera mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(0);
make.top.mas_equalTo(i*itemHeight);
make.height.mas_equalTo(itemHeight);
make.right.mas_equalTo(0);
}];
camera.tag=i+1;
camera.backgroundColor=[UIColor clearColor];
[camera addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
}
return;
UIButton*camera=[UIButton buttonWithType:UIButtonTypeSystem];
[self.imageView addSubview:camera];
[camera mas_makeConstraints:^(MASConstraintMaker *make) {
@ -222,6 +286,47 @@
}
-(void)getTableData{
NSArray*array=@[@{@"image":@"roleCa",@"title":@"常见失败原因",@"instructionImage":@"failreason"}];
self.dataArray=array;
}
-(void)creatTab{
self.automaticallyAdjustsScrollViewInsets = NO;
if (self.tableView==nil) {
UITableView*table=[[UITableView alloc]initWithFrame:CGRectMake(0,0, kScreenSize.width, kScreenSize.height) style:UITableViewStylePlain];
table.dataSource=self;
if (@available(iOS 15.0, *)) {
table.sectionHeaderTopPadding=0;
}
table.delegate=self;
table.separatorStyle=UITableViewCellSeparatorStyleNone;
self.tableView=table;
self.tableView.showsVerticalScrollIndicator=NO;
self.tableView.backgroundColor = TABLE_HEADER_COLOR;
[self.view addSubview:self.tableView];
if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
[self.tableView setSeparatorInset:UIEdgeInsetsMake(0,50, 0,0)];
[self.tableView setSeparatorColor:TABLE_SEPRETLINE_COLOR];
}
}
}
-(void)instruction:(UIButton*)button
{
self.hidesBottomBarWhenPushed = YES;
@ -237,25 +342,33 @@
info.image=[UIImage imageNamed:@"cameraInfo"];
}
else if (button.tag==3) {
info.title=@"摇头摄像机";
info.image=[UIImage imageNamed:@"摇头机说明书"];
}
else if (button.tag==4) {
info.title=@"绚多SW7";
info.image=[UIImage imageNamed:@"SW7"];
}
else if (button.tag==4) {
else if (button.tag==5) {
info.title=@"绚多SW10";
info.image=[UIImage imageNamed:@"SW10"];
}
else if (button.tag==5) {
else if (button.tag==6) {
info.title=@"绚多CW2";
info.image=[UIImage imageNamed:@"CW2"];
}
else if (button.tag==6) {
else if (button.tag==7) {
info.title=@"绚多SW1/SW6/W6";
info.image=[UIImage imageNamed:@"sw1"];
}
else if (button.tag==7) {
else if (button.tag==8) {
info.title=@"睿芯HX-WY01";
info.image=[UIImage imageNamed:@"HX-WY01"];
}
else if (button.tag==9) {
info.title=@"松诺";
info.image=[UIImage imageNamed:@"songnuo"];
}
@ -287,6 +400,37 @@
}
}
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return self.dataArray.count;
}
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
return 124;
}
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
NSString*identiy=@"InstructionCell";
InstructionCell*cell=[tableView dequeueReusableCellWithIdentifier:identiy];
if (!cell)
{
cell=[[InstructionCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identiy];
}
[cell setModel:self.dataArray[indexPath.row]];
return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
self.hidesBottomBarWhenPushed = YES;
InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
NSDictionary*model=self.dataArray[indexPath.row];
info.title=model[@"title"];
info.image=[UIImage imageNamed:model[@"instructionImage"]];
[self.navigationController pushViewController:info animated:YES];
}
/*
#pragma mark - Navigation

2
Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m
View File

@ -25,7 +25,7 @@
// CFShow((__bridge CFTypeRef)(infoDic));
NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"];
NSLog(@"app_Version%@",app_Version);
app_Version=@"4.7.18";
app_Version=@"4.7.19";
NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
if (buildVersion.length > 0) {

3
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
View File

@ -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];

2
Ifish/controllers/logAddRegistController/LBLaunchImageAd/LBLaunchImageAdView.m
View File

@ -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];