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

资源文件添加控制器创建

This commit is contained in:
kai60 2022-05-03 11:10:37 +08:00
parent 27b8ee3653
commit 75a7f09cac
50 changed files with 2125 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ifish.xcodeproj/project.pbxproj
View File

@ -2301,6 +2301,8 @@
C0B2F560244D568E001079AA /* StoreNameView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0B2F55F244D568E001079AA /* StoreNameView.xib */; };
C0C4CCFF272CDF4A00574BE8 /* UIViewController+Navgation.m in Sources */ = {isa = PBXBuildFile; fileRef = C0C4CCFD272CDF4A00574BE8 /* UIViewController+Navgation.m */; };
C0C4CD00272CDF4A00574BE8 /* UIViewController+Navgation.h in Headers */ = {isa = PBXBuildFile; fileRef = C0C4CCFE272CDF4A00574BE8 /* UIViewController+Navgation.h */; };
C0CCEF6B280D08C600604601 /* XuanduoSettingController.h in Headers */ = {isa = PBXBuildFile; fileRef = C0CCEF69280D08C600604601 /* XuanduoSettingController.h */; };
C0CCEF6C280D08C600604601 /* XuanduoSettingController.m in Sources */ = {isa = PBXBuildFile; fileRef = C0CCEF6A280D08C600604601 /* XuanduoSettingController.m */; };
C0D3A1282647ED8E008E6FD6 /* ELPCircleConsoleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0D3A1262647ED8D008E6FD6 /* ELPCircleConsoleView.m */; };
C0D3A1292647ED8E008E6FD6 /* ELPCircleConsoleView.h in Headers */ = {isa = PBXBuildFile; fileRef = C0D3A1272647ED8D008E6FD6 /* ELPCircleConsoleView.h */; };
C0D3A12C2647ED99008E6FD6 /* UIView+Sizes.h in Headers */ = {isa = PBXBuildFile; fileRef = C0D3A12A2647ED99008E6FD6 /* UIView+Sizes.h */; };
@ -5782,6 +5784,8 @@
C0B2F55F244D568E001079AA /* StoreNameView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StoreNameView.xib; sourceTree = "<group>"; };
C0C4CCFD272CDF4A00574BE8 /* UIViewController+Navgation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Navgation.m"; sourceTree = "<group>"; };
C0C4CCFE272CDF4A00574BE8 /* UIViewController+Navgation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Navgation.h"; sourceTree = "<group>"; };
C0CCEF69280D08C600604601 /* XuanduoSettingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoSettingController.h; sourceTree = "<group>"; };
C0CCEF6A280D08C600604601 /* XuanduoSettingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XuanduoSettingController.m; sourceTree = "<group>"; };
C0D3A1262647ED8D008E6FD6 /* ELPCircleConsoleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELPCircleConsoleView.m; sourceTree = "<group>"; };
C0D3A1272647ED8D008E6FD6 /* ELPCircleConsoleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELPCircleConsoleView.h; sourceTree = "<group>"; };
C0D3A12A2647ED99008E6FD6 /* UIView+Sizes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Sizes.h"; sourceTree = "<group>"; };
@ -9691,6 +9695,8 @@
FA0892F42270BED00084A609 /* XuanduoHuliModel.m */,
883E76A81D48A5E50030E075 /* XuToSetViewController.h */,
883E76A91D48A5E50030E075 /* XuToSetViewController.m */,
C0CCEF69280D08C600604601 /* XuanduoSettingController.h */,
C0CCEF6A280D08C600604601 /* XuanduoSettingController.m */,
FA0892FB2275A1B30084A609 /* Xuanduo2SettingController.h */,
FA0892FC2275A1B30084A609 /* Xuanduo2SettingController.m */,
883E76AA1D48A5E50030E075 /* XuToSoketBackMsgDataUnity.h */,
@ -12962,6 +12968,7 @@
3D1C510C221A9EE00096AE43 /* CameraNoParyBackVideoView.h in Headers */,
CB484DEC22B8C8C80075F050 /* crc.h in Headers */,
3D1C50BE221A9EE00096AE43 /* Constants.h in Headers */,
C0CCEF6B280D08C600604601 /* XuanduoSettingController.h in Headers */,
CB4820862334E99700A50C92 /* IQTitleBarButtonItem.h in Headers */,
CB48204423347D4400A50C92 /* ConAquarMethodVC.h in Headers */,
CB7D6ABC229660370014E5C7 /* IfishConnectUsViewController.h in Headers */,
@ -14869,6 +14876,7 @@
883E78531D48A5E50030E075 /* TwoControlNinetyninebiteViewController.m in Sources */,
CB484CFA22B8B0AC0075F050 /* GCDAsyncSocket.m in Sources */,
3D1C513B221A9EE10096AE43 /* FishControlThreedViewCell.m in Sources */,
C0CCEF6C280D08C600604601 /* XuanduoSettingController.m in Sources */,
3D1C50CD221A9EE00096AE43 /* MPNotificationView.m in Sources */,
88F5EFC51D48D08100CC7CAF /* JHRefreshCommonAniView.m in Sources */,
3D1C50CA221A9EE00096AE43 /* GetContactMessageResult.m in Sources */,

6
Ifish/Assets.xcassets/xuanduo4f5f/Contents.json Normal file
View File

@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}

21
Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "uv.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/uv.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/功能说明 .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/xuanduo4f5f/功能说明 .imageset/功能说明 .png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/加热棒.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/xuanduo4f5f/加热棒.imageset/加热棒.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/喂鱼.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/xuanduo4f5f/喂鱼.imageset/喂鱼.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/增氧.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/xuanduo4f5f/增氧.imageset/增氧.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/增氧泵.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/xuanduo4f5f/增氧泵.imageset/增氧泵.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/定时.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/xuanduo4f5f/定时.imageset/定时.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/循环.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/xuanduo4f5f/循环.imageset/循环.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/循环棒.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/xuanduo4f5f/循环棒.imageset/循环棒.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/护理.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/xuanduo4f5f/护理.imageset/护理.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/换水.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/xuanduo4f5f/换水.imageset/换水.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/杀菌.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/xuanduo4f5f/杀菌.imageset/杀菌.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/添加设备关联.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/xuanduo4f5f/添加设备关联.imageset/添加设备关联.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/温度校准.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/xuanduo4f5f/温度校准.imageset/温度校准.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "灯2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/灯2.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/灯光 .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/xuanduo4f5f/灯光 .imageset/灯光 .png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "灯光1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/灯光1.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.9 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "灯光2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/灯光2.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/统计.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/xuanduo4f5f/统计.imageset/统计.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/造浪 .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/xuanduo4f5f/造浪 .imageset/造浪 .png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/造浪.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/xuanduo4f5f/造浪.imageset/造浪.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

21
Ifish/Assets.xcassets/xuanduo4f5f/预警.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/xuanduo4f5f/预警.imageset/预警.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

2
Ifish/Utinitys/IfishUtils/IfishDeviceInfo.h
View File

@ -32,6 +32,8 @@
#define DECICE_TYPE_XUANDUO1F @"1f" //0x1f//有屏幕
#define DECICE_TYPE_XUANDUO2F @"2f" //新设备
#define DECICE_TYPE_XUANDUO3F @"3f" //宠物笼
#define DECICE_TYPE_XUANDUO4F @"4f" //绚多升级版，淡水鱼缸
#define DECICE_TYPE_XUANDUO5F @"5f" //绚多升级版，淡水鱼缸
//可丽爱
#define DECICE_TYPE_KELIAI @"aa" //0xaa

10
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
View File

@ -28,6 +28,7 @@
#import "searchDeviceModel.h"
#import "PetStoresViewController.h"
#import "UIImage+WaterMark.h"
#import "XuanduoSettingController.h"
#define kBtnTag 100
@ -1038,7 +1039,14 @@
#pragma mark -设置页面 -
- (void)setting {
if (self.dataModel.gasPump.length) {
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F])
{
XuanduoSettingController *_settingVC = [[XuanduoSettingController alloc] init];
_settingVC.currentdevice = self.currentDevice;
_settingVC.dataModel = self.dataModel;
[self.navigationController pushViewController:_settingVC animated:YES];
}
else if (self.dataModel.gasPump.length) {
Xuanduo2SettingController *_settingVC = [[Xuanduo2SettingController alloc] init];
_settingVC.currentdevice = self.currentDevice;
_settingVC.dataModel = self.dataModel;

27
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h Normal file
View File

@ -0,0 +1,27 @@
//
// Xuanduo2SettingController.h
// Ifish
//
// Created by Alex on 2019/4/28.
// Copyright © 2019 lianlian. All rights reserved.
//
#import "FatherController.h"
#import "IfishDeviceInfo.h"
#include "xuanduo3fModel.h"
NS_ASSUME_NONNULL_BEGIN
@class Xuanduo2Model;
@interface XuanduoSettingController : FatherController
@property (nonatomic,strong) UIActivityIndicatorView*indicatorView;
@property (nonatomic ,strong) id dataModel;
@property(nonatomic,strong) DeviceModel* currentdevice;
- (void)refreshWithData:(id)model;
@end
NS_ASSUME_NONNULL_END

1611
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.m Normal file
View File

File diff suppressed because it is too large Load Diff