diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 6d9fc57..bdcbf1d 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -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 = ""; }; C0C4CCFD272CDF4A00574BE8 /* UIViewController+Navgation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Navgation.m"; sourceTree = ""; }; C0C4CCFE272CDF4A00574BE8 /* UIViewController+Navgation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Navgation.h"; sourceTree = ""; }; + C0CCEF69280D08C600604601 /* XuanduoSettingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoSettingController.h; sourceTree = ""; }; + C0CCEF6A280D08C600604601 /* XuanduoSettingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XuanduoSettingController.m; sourceTree = ""; }; C0D3A1262647ED8D008E6FD6 /* ELPCircleConsoleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELPCircleConsoleView.m; sourceTree = ""; }; C0D3A1272647ED8D008E6FD6 /* ELPCircleConsoleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELPCircleConsoleView.h; sourceTree = ""; }; C0D3A12A2647ED99008E6FD6 /* UIView+Sizes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Sizes.h"; sourceTree = ""; }; @@ -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 */, diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/Contents.json new file mode 100644 index 0000000..79682c7 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/Contents.json @@ -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 + } +} diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/uv.png b/Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/uv.png new file mode 100644 index 0000000..1365980 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/uv.imageset/uv.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/功能说明 .imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/功能说明 .imageset/Contents.json new file mode 100644 index 0000000..67a2e44 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/功能说明 .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/xuanduo4f5f/功能说明 .imageset/功能说明 .png b/Ifish/Assets.xcassets/xuanduo4f5f/功能说明 .imageset/功能说明 .png new file mode 100644 index 0000000..68893fb Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/功能说明 .imageset/功能说明 .png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/加热棒.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/加热棒.imageset/Contents.json new file mode 100644 index 0000000..297b9e2 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/加热棒.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/xuanduo4f5f/加热棒.imageset/加热棒.png b/Ifish/Assets.xcassets/xuanduo4f5f/加热棒.imageset/加热棒.png new file mode 100644 index 0000000..db549d2 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/加热棒.imageset/加热棒.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/喂鱼.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/喂鱼.imageset/Contents.json new file mode 100644 index 0000000..4fd8487 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/喂鱼.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/xuanduo4f5f/喂鱼.imageset/喂鱼.png b/Ifish/Assets.xcassets/xuanduo4f5f/喂鱼.imageset/喂鱼.png new file mode 100644 index 0000000..edc0975 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/喂鱼.imageset/喂鱼.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/增氧.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/增氧.imageset/Contents.json new file mode 100644 index 0000000..ff5f26d --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/增氧.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/xuanduo4f5f/增氧.imageset/增氧.png b/Ifish/Assets.xcassets/xuanduo4f5f/增氧.imageset/增氧.png new file mode 100644 index 0000000..86f61e0 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/增氧.imageset/增氧.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/增氧泵.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/增氧泵.imageset/Contents.json new file mode 100644 index 0000000..70c834a --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/增氧泵.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/xuanduo4f5f/增氧泵.imageset/增氧泵.png b/Ifish/Assets.xcassets/xuanduo4f5f/增氧泵.imageset/增氧泵.png new file mode 100644 index 0000000..18fcfcd Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/增氧泵.imageset/增氧泵.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/定时.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/定时.imageset/Contents.json new file mode 100644 index 0000000..fe105d3 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/定时.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/xuanduo4f5f/定时.imageset/定时.png b/Ifish/Assets.xcassets/xuanduo4f5f/定时.imageset/定时.png new file mode 100644 index 0000000..55f9d83 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/定时.imageset/定时.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/循环.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/循环.imageset/Contents.json new file mode 100644 index 0000000..fb633f9 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/循环.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/xuanduo4f5f/循环.imageset/循环.png b/Ifish/Assets.xcassets/xuanduo4f5f/循环.imageset/循环.png new file mode 100644 index 0000000..f0792ea Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/循环.imageset/循环.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/循环棒.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/循环棒.imageset/Contents.json new file mode 100644 index 0000000..1233408 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/循环棒.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/xuanduo4f5f/循环棒.imageset/循环棒.png b/Ifish/Assets.xcassets/xuanduo4f5f/循环棒.imageset/循环棒.png new file mode 100644 index 0000000..4d94b89 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/循环棒.imageset/循环棒.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/护理.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/护理.imageset/Contents.json new file mode 100644 index 0000000..27cd70b --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/护理.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/xuanduo4f5f/护理.imageset/护理.png b/Ifish/Assets.xcassets/xuanduo4f5f/护理.imageset/护理.png new file mode 100644 index 0000000..55ee702 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/护理.imageset/护理.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/换水.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/换水.imageset/Contents.json new file mode 100644 index 0000000..93da620 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/换水.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/xuanduo4f5f/换水.imageset/换水.png b/Ifish/Assets.xcassets/xuanduo4f5f/换水.imageset/换水.png new file mode 100644 index 0000000..1d9ccda Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/换水.imageset/换水.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/杀菌.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/杀菌.imageset/Contents.json new file mode 100644 index 0000000..a2ef1f1 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/杀菌.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/xuanduo4f5f/杀菌.imageset/杀菌.png b/Ifish/Assets.xcassets/xuanduo4f5f/杀菌.imageset/杀菌.png new file mode 100644 index 0000000..00e95e1 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/杀菌.imageset/杀菌.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/添加设备关联.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/添加设备关联.imageset/Contents.json new file mode 100644 index 0000000..4c3669a --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/添加设备关联.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/xuanduo4f5f/添加设备关联.imageset/添加设备关联.png b/Ifish/Assets.xcassets/xuanduo4f5f/添加设备关联.imageset/添加设备关联.png new file mode 100644 index 0000000..b2b6df9 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/添加设备关联.imageset/添加设备关联.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/温度校准.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/温度校准.imageset/Contents.json new file mode 100644 index 0000000..e6f6c85 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/温度校准.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/xuanduo4f5f/温度校准.imageset/温度校准.png b/Ifish/Assets.xcassets/xuanduo4f5f/温度校准.imageset/温度校准.png new file mode 100644 index 0000000..c3b84b8 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/温度校准.imageset/温度校准.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/Contents.json new file mode 100644 index 0000000..91573dd --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/Contents.json @@ -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 + } +} diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/灯2.png b/Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/灯2.png new file mode 100644 index 0000000..3752f5d Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/灯2.imageset/灯2.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/灯光 .imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/灯光 .imageset/Contents.json new file mode 100644 index 0000000..a57a74a --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/灯光 .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/xuanduo4f5f/灯光 .imageset/灯光 .png b/Ifish/Assets.xcassets/xuanduo4f5f/灯光 .imageset/灯光 .png new file mode 100644 index 0000000..e46f38c Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/灯光 .imageset/灯光 .png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/Contents.json new file mode 100644 index 0000000..dd91fa0 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/Contents.json @@ -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 + } +} diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/灯光1.png b/Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/灯光1.png new file mode 100644 index 0000000..3707ba5 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/灯光1.imageset/灯光1.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/Contents.json new file mode 100644 index 0000000..a40b6b4 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/Contents.json @@ -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 + } +} diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/灯光2.png b/Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/灯光2.png new file mode 100644 index 0000000..dba8335 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/灯光2.imageset/灯光2.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/统计.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/统计.imageset/Contents.json new file mode 100644 index 0000000..fb1730a --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/统计.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/xuanduo4f5f/统计.imageset/统计.png b/Ifish/Assets.xcassets/xuanduo4f5f/统计.imageset/统计.png new file mode 100644 index 0000000..799abf6 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/统计.imageset/统计.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/造浪 .imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/造浪 .imageset/Contents.json new file mode 100644 index 0000000..0393692 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/造浪 .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/xuanduo4f5f/造浪 .imageset/造浪 .png b/Ifish/Assets.xcassets/xuanduo4f5f/造浪 .imageset/造浪 .png new file mode 100644 index 0000000..65f3bf0 Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/造浪 .imageset/造浪 .png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/造浪.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/造浪.imageset/Contents.json new file mode 100644 index 0000000..b936c93 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/造浪.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/xuanduo4f5f/造浪.imageset/造浪.png b/Ifish/Assets.xcassets/xuanduo4f5f/造浪.imageset/造浪.png new file mode 100644 index 0000000..3e4505c Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/造浪.imageset/造浪.png differ diff --git a/Ifish/Assets.xcassets/xuanduo4f5f/预警.imageset/Contents.json b/Ifish/Assets.xcassets/xuanduo4f5f/预警.imageset/Contents.json new file mode 100644 index 0000000..4f5dce9 --- /dev/null +++ b/Ifish/Assets.xcassets/xuanduo4f5f/预警.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/xuanduo4f5f/预警.imageset/预警.png b/Ifish/Assets.xcassets/xuanduo4f5f/预警.imageset/预警.png new file mode 100644 index 0000000..4be978a Binary files /dev/null and b/Ifish/Assets.xcassets/xuanduo4f5f/预警.imageset/预警.png differ diff --git a/Ifish/Utinitys/IfishUtils/IfishDeviceInfo.h b/Ifish/Utinitys/IfishUtils/IfishDeviceInfo.h index af59318..c958bf1 100644 --- a/Ifish/Utinitys/IfishUtils/IfishDeviceInfo.h +++ b/Ifish/Utinitys/IfishUtils/IfishDeviceInfo.h @@ -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 diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m index 376db3f..208c42d 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m @@ -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; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h new file mode 100644 index 0000000..12f4930 --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h @@ -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 diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.m new file mode 100644 index 0000000..441b005 --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.m @@ -0,0 +1,1611 @@ +// +// Xuanduo2SettingController.m +// Ifish +// +// Created by Alex on 2019/4/28. +// Copyright © 2019 lianlian. All rights reserved. +// + +#import "XuanduoSettingController.h" +#import "UINavigationBar+Background.h" +#import "TemperatureSetCell.h" +#import "ChangeWaterCell.h" +#import "Xuanduo2Model.h" +#import "TemperatureSetModel.h" +#import "setWaringTpModel.h" +#import "remindCyclePic.h" +#import "MyPickerView.h" +#import "PlusTableViewCell.h" +#import "SetTimerCell.h" +#import "XuanduoSectionHeaderView.h" +#import "XuanduoSelectHeader.h" +#import "MydatePickerView.h" +#import "SetTimerModel.h" +#import "ReadTimerModel.h" +#import "Xuanduo2DataUtility.h" +#import "Xuanduo2TimerModel.h" +#import "IfishDeviceInfo.h" +#import "NSString+Add.h" +#import "XuToControlName.h" +#import "UserExtendataArchaver.h" + +#define kBtnTag 500 +#define kSwitchBtnTag 600 +static NSString *temperatureCellid = @"TemperatureSetCell"; +static NSString *changeWaterCellid = @"ChangeWaterCell"; +static NSString *addCellid = @"PlusTableViewCell"; +static NSString *plusflag = @"plusCell"; +static NSString *setTimerflag = @"SetTimerCell"; + + +@interface XuanduoSettingController () +@property(nonatomic,strong) setRemindWaterModel *waterInfmodel; +@property(nonatomic,strong) Xuanduo2TimerModel *timerModel; +@property(nonatomic,strong) XuanduoCycleModel *cycleModel; + +@property (nonatomic,strong) NSMutableDictionary *timeDic; +@property(nonatomic,copy) NSString *nextChangeDateLabel; +@property(nonatomic,strong) MyHud *XuTohud; + +@end + +@implementation XuanduoSettingController +{ + NSString *_wenduString; + NSIndexPath *_indexPath; + MyPickerView *_mypicView; + NSArray *_titieArr; + NSArray *_imgArr; + remindCyclePic*_remindPic; + BOOL _huanShuiSwitchIsOn; + NSInteger _selectSection; + MydatePickerView*_mydatepicView; + +} + +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + if (_currentdevice) { + [IFISHHTTPTOOL getRemindWaterInfWith:_currentdevice.deviceId huishuiInfo:^(setRemindWaterModel *remindModel) { + + self.waterInfmodel=remindModel; + + NSUserDefaults*defuat=[NSUserDefaults standardUserDefaults]; + + [defuat setInteger:self.waterInfmodel.remindcycle forKey:@"xuto2picResult"]; + [defuat synchronize]; + self.nextChangeDateLabel=self.waterInfmodel.remindDate; + + [self.tableView reloadData]; + }]; + } +} + +- (void)viewDidLoad { + [super viewDidLoad]; + [self setup]; + [self connect]; +} + +- (void)viewWillDisappear:(BOOL)animated{ + [_indicatorView stopAnimating]; +} + +- (void)setup { + [self.navigationController.navigationBar resetBackgroundImage]; + + NSString*title=@"水族箱设置"; + if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]||[self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]) { + title = @"水族箱设置"; + } + else if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]) + { + title = @"宠物笼设置"; + } + + [self addTitleViewWithTitle:title]; + [self refreshWithData:self.dataModel]; + [self setupTable]; + [self creatIndicatorView]; + [Socketsingleton sharedInstance].communiteDelegate = self; +} + +- (void)refreshWithData:(Xuanduo3fModel*)model { + + NSString*low = model.miniTemp; + NSString*heigh = model.maxTemp; + UInt64 lowten = [dataContorl hexToTen:low]; + UInt64 heighten = [dataContorl hexToTen:heigh]; + float formatlow = lowten/10; + float formatheigh = heighten/10; + _wenduString = [NSString stringWithFormat:@"%.0f~%.0f°C",formatlow,formatheigh]; +} + +- (void)setupTable { + + + _titieArr = @[@"预警设置",@"喂鱼设置",@"温度校准",@"功能说明"]; + + _imgArr = @[@"定时",@"喂鱼",@"温度校准",@"功能说明"]; + + + + + + + + _selectSection = -1; + for (int i = 0; i<_titieArr.count; i++) { + NSMutableArray *dataArr = [NSMutableArray arrayWithCapacity:0]; + if (![_titieArr[i] isEqualToString:@"杀菌"]) + { + [dataArr addObject:plusflag]; + } + + [self.timeDic setObject:dataArr forKey:_titieArr[i]]; + } + self.tableView.backgroundColor=COLOR_MIAN; + self.tableView.separatorStyle=UITableViewCellSeparatorStyleNone; + [self.tableView registerNib:[UINib nibWithNibName:temperatureCellid bundle:nil] forCellReuseIdentifier:temperatureCellid]; + [self.tableView registerNib:[UINib nibWithNibName:changeWaterCellid bundle:nil] forCellReuseIdentifier:changeWaterCellid]; + [self.tableView registerNib:[UINib nibWithNibName:addCellid bundle:nil] forCellReuseIdentifier:addCellid]; + [self.tableView registerNib:[UINib nibWithNibName:setTimerflag bundle:nil] forCellReuseIdentifier:setTimerflag]; +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 2 + _titieArr.count; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + if (section == 0) { + return 1; + }else if (section == 1){ + return 2; + } + if (section - 2 < _titieArr.count) { + NSArray *dataArr = [self.timeDic objectForKey:_titieArr[section-2]]; + return dataArr.count; + } + else + { + if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]) + { + return 1; + } + } + return 0; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + if (indexPath.section == 0){ + TemperatureSetCell *cell = [tableView dequeueReusableCellWithIdentifier:temperatureCellid]; + TemperatureSetModel *model=[[TemperatureSetModel alloc]init]; + model.title = @"预警设置"; + cell.titleLabel.text = model.title; + NSLog(@"wendu str = %@",_wenduString); + model.temperatureLabel = _wenduString; + cell.temperaturelabel.text = model.temperatureLabel; + [cell.temPSwitch addTarget:self action:@selector(xuTotempSwitchAction:) forControlEvents:UIControlEventTouchUpInside]; + if (self.dataModel) { + Xuanduo2Model*model=self.dataModel; + if ([model.alarmSwitch isEqualToString:@"01"]) { + + [cell.temPSwitch setBackgroundImage:[UIImage imageNamed:@"greenbtn_big"] forState:UIControlStateNormal]; + cell.temPSwitch.selected = NO; + + }else{ + + [cell.temPSwitch setBackgroundImage:[UIImage imageNamed:@"graybtn_big"] forState:UIControlStateNormal]; + + cell.temPSwitch.selected = YES; + } + + } + + return cell; + }else if(indexPath.section == 1 && indexPath.row == 0){ + if (![self.currentdevice.waterRemind isEqual:[NSNull null]]) { + ChangeWaterCell *cell = [tableView dequeueReusableCellWithIdentifier:changeWaterCellid]; + [cell.ChangeWaterSwitch addTarget:self action:@selector(xuTochangeWaterSwitch:) forControlEvents:UIControlEventTouchUpInside]; + + if ([self.waterInfmodel.waterremind isEqualToString:@"1"]) { + [cell.ChangeWaterSwitch setBackgroundImage:[UIImage imageNamed:@"greenbtn_big"] forState:UIControlStateNormal]; + cell.ChangeWaterSwitch.selected = NO; + cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"firstSetCell"]]; + _huanShuiSwitchIsOn=YES; + }else{ + [cell.ChangeWaterSwitch setBackgroundImage:[UIImage imageNamed:@"graybtn_big"] forState:UIControlStateNormal]; + cell.ChangeWaterSwitch.selected = YES; + _huanShuiSwitchIsOn=NO; + cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"set_cellBack"]]; + } + + if (self.waterInfmodel.remindcycle == 0) { + //在未获取换水信息时暂时显示 + cell.huanshuiDaylabel.text=@"换水时间"; + if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]) + { + cell.huanshuiDaylabel.text=@"杀菌时间"; + cell.titleLabel.text=@"杀菌提醒"; + } + }else{ + + cell.huanshuiDaylabel.text=[NSString stringWithFormat:@"%ld天",(long)self.waterInfmodel.remindcycle]; + + } + + + return cell; + + } + }else if (indexPath.section==1 && indexPath.row == 1){ + + static NSString*nextHuanShuiLablecellId=@"labelcell"; + UITableViewCell*cell=[tableView dequeueReusableCellWithIdentifier:nextHuanShuiLablecellId]; + if (cell==nil) { + cell=[[UITableViewCell alloc]initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:nextHuanShuiLablecellId]; + } + if (_huanShuiSwitchIsOn) { + + cell.textLabel.text=[NSString stringWithFormat:@"下次换水时间:%@",self.waterInfmodel.remindDate]; + if (!self.waterInfmodel.remindDate) { + cell.textLabel.text=[NSString stringWithFormat:@"下次换水时间:%@",self.nextChangeDateLabel]; + } + + if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]) + { + cell.textLabel.text=[NSString stringWithFormat:@"下次杀菌时间:%@",self.waterInfmodel.remindDate]; + if (!self.waterInfmodel.remindDate) { + cell.textLabel.text=[NSString stringWithFormat:@"下次杀菌时间:%@",self.nextChangeDateLabel]; + } + + } + + cell.textLabel.font=[UIFont systemFontOfSize:15]; + [cell.textLabel sizeToFit]; + + cell.textLabel.textColor =[UIColor colorWithRed:146.0/256.0 green:146.0/256.0 blue:146.0/256.0 alpha:1]; + cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"secondSetCell"]]; + + } + else{ + cell.textLabel.text=@""; + } + cell.userInteractionEnabled = NO; + return cell; + + }else if(indexPath.section -2== _titieArr.count && indexPath.row == 0&&[self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ + TemperatureSetCell *cell = [tableView dequeueReusableCellWithIdentifier:temperatureCellid]; + TemperatureSetModel *model=[[TemperatureSetModel alloc]init]; + model.title = @"恒温设置"; + cell.titleLabel.text = model.title; + + Xuanduo3fModel*xmodel=(Xuanduo3fModel*)_dataModel; + NSString*heating = xmodel.heatingTemperature; + UInt64 heat = [dataContorl hexToTen:heating]; + + float formatheat = heat/10; + model.temperatureLabel = [NSString stringWithFormat:@"%f",formatheat]; + cell.temPSwitch.hidden=YES; + cell.temperaturelabel.frame=cell.temPSwitch.frame; + + Xuanduo3fModel*model3=self.dataModel; + int mac=[dataContorl hexToTen:model3.heatingTemperature]; + + //float TPlabel=mac/10+(mac%10)*0.1; + float temp = mac/10.0; + NSString *stringTemp = [NSString stringWithFormat:@"%.1f℃",temp]; + cell.temperaturelabel.textAlignment=NSTextAlignmentRight; + [cell.temperaturelabel setAttributedText:[NSString ls_changeFontAndColor:[UIFont systemFontOfSize:15] Color:nil TotalString:stringTemp SubStringArray:@[@"℃"]]]; + + + + + return cell; + + } + else { + if (indexPath.section - 2 < _titieArr.count && _selectSection == indexPath.section) { + NSArray *dataArr = [self.timeDic objectForKey:_titieArr[indexPath.section-2]]; + BOOL havePlus = [dataArr containsObject:plusflag]; + if (havePlus && (indexPath.row == dataArr.count-1)) { + PlusTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:addCellid forIndexPath:indexPath]; + cell.addTimerBtn.tag = kBtnTag + indexPath.section; + [cell.addTimerBtn addTarget:self action:@selector(addTimer:) forControlEvents:UIControlEventTouchUpInside]; + return cell; + }else { + SetTimerCell *cell = [tableView dequeueReusableCellWithIdentifier:setTimerflag forIndexPath:indexPath]; + cell.switchBtn.tag = kSwitchBtnTag + indexPath.row; + [cell.switchBtn addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventTouchUpInside]; + XuanduoTimerGroup *group = [dataArr objectAtIndex:havePlus?indexPath.row+1:indexPath.row]; + cell.model=group; + if ([group isKindOfClass:[XuanduoTimerGroup class]]) + { + BOOL isOn = NO; + if ([group.status isEqualToString:@"01"]) { + isOn = YES; + } + [cell configTitleLabel:[NSString stringWithFormat:@"时段%@",group.groupNumber] timer:group.time switchStatus:isOn]; + cell.selectionStyle = UITableViewCellSelectionStyleNone; + + } + else if([group isKindOfClass:[XuanduoCycleModel class]]) + { + XuanduoCycleModel*model=group; + BOOL isOn = NO; + if ([model.status isEqualToString:@"00"]) { + isOn = YES; + } + + + + [cell configTitleLabel:@"循环开关" timer:[NSString stringWithFormat:@"持续时长%d分钟",[dataContorl hexToTen:model.lastTime]] switchStatus:isOn]; + cell.selectionStyle = UITableViewCellSelectionStyleNone; + + } + return cell; + } + } + } + return [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@""]; +} + +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ + if (indexPath.section == 0) { + return 50; + }else if (indexPath.section == 1 && indexPath.row == 0){ + return 50; + }else if (indexPath.section == 1 && indexPath.row == 1){ + if (!_huanShuiSwitchIsOn) { + }else { + return 50; + } + }else if (indexPath.section - 2 <_titieArr.count) { + NSArray *dataArr = [self.timeDic objectForKey:_titieArr[indexPath.section-2]]; + BOOL havePlus = [dataArr containsObject:plusflag]; + if (_selectSection == indexPath.section) { + if (havePlus && indexPath.row == dataArr.count - 1) { + return 80; + }else{ + return 50; + } + }else { + return 0; + } + } + else if(indexPath.section - 2 ==_titieArr.count&&[self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]) + { + return 50; + } + + return 0; +} + +#pragma mark tableView 头视图和脚视图 +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ + if (section == 0) { + return 5; + }else if (section == 2){ + return 40; + }else if (section == 3){ + return 40; + }else if (section == 4){ + return 40; + }else if (section == 5){ + + return [self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]?0:40; + }else if (section == 6){ + return 40; + }else if (section == 7){ + return 40; + }else { + return CGFLOAT_MIN; + } + +} + +- (UIView*)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + if (section == 0) { + UIView *oneHeader = [[UIView alloc] init]; + oneHeader.backgroundColor = COLOR_MIAN; + return oneHeader; + }else if(section == 2){ + XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView]; + headerView.controlBtn.tag = kBtnTag + section; + if (_selectSection == section) { + headerView.controlBtn.selected = YES; + } + [headerView.controlBtn addTarget:self action:@selector(foldAction:) forControlEvents:UIControlEventTouchUpInside]; + [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; + return headerView; + }else if(section == 3){ + XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView]; + headerView.controlBtn.tag = kBtnTag + section; + if (_selectSection == section) { + headerView.controlBtn.selected = YES; + } + [headerView.controlBtn addTarget:self action:@selector(foldAction:) forControlEvents:UIControlEventTouchUpInside]; + [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; + return headerView; + }else if(section == 4){ + XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView]; + headerView.controlBtn.tag = kBtnTag + section; + if (_selectSection == section) { + headerView.controlBtn.selected = YES; + } + [headerView.controlBtn addTarget:self action:@selector(foldAction:) forControlEvents:UIControlEventTouchUpInside]; + [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; + return headerView; + }else if(section == 5){ + if ([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]) + { + UIView *oneHeader = [[UIView alloc] init]; + oneHeader.backgroundColor = COLOR_MIAN; + return oneHeader; + } + else + { + XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView]; + headerView.controlBtn.tag = kBtnTag + section; + if (_selectSection == section) { + headerView.controlBtn.selected = YES; + } + [headerView.controlBtn addTarget:self action:@selector(foldAction:) forControlEvents:UIControlEventTouchUpInside]; + [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; + return headerView; + } + + }else if(section == 6){ + XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView]; + headerView.controlBtn.tag = kBtnTag + section; + if (_selectSection == section) { + headerView.controlBtn.selected = YES; + } + [headerView.controlBtn addTarget:self action:@selector(foldAction:) forControlEvents:UIControlEventTouchUpInside]; + [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; + return headerView; + }else if(section == 7){ + XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView]; + headerView.controlBtn.tag = kBtnTag + section; + if (_selectSection == section) { + headerView.controlBtn.selected = YES; + } + [headerView.controlBtn addTarget:self action:@selector(foldAction:) forControlEvents:UIControlEventTouchUpInside]; + [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; + return headerView; + } + + return nil; +} + +#pragma mark tableView 点击事件 + +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ + _indexPath = indexPath; + if (indexPath.section==0) { + _mypicView=[[MyPickerView alloc]init]; + + _mypicView.frame=CGRectMake(0, 0, kScreenSize.width, kScreenSize.height); + [self.view.window addSubview:_mypicView]; + [_mypicView.sureButton addTarget:self action:@selector(mypicViewRemoveByDone) forControlEvents:UIControlEventTouchUpInside]; + [self temperatureMainQueue]; + + }else if (indexPath.section==1){ + //换水提醒日期选择 + _remindPic=[[remindCyclePic alloc]initWithFrame:CGRectMake(0, 0, kScreenSize.width, kScreenSize.height) type:self.currentdevice.type]; + + _remindPic.frame=CGRectMake(0, 0, kScreenSize.width, kScreenSize.height); + _remindPic.type=self.currentdevice.type; + [self.view.window addSubview:_remindPic]; + [_remindPic.sureBtn addTarget:self action:@selector(xuToremindCyclePicDone) forControlEvents:UIControlEventTouchUpInside]; + [self huanShuiMainQueue]; + }else if(indexPath.section-2==_titieArr.count){ + //恒温设置 + _remindPic=[[remindCyclePic alloc]initWithFrame:CGRectMake(0, 0, kScreenSize.width, kScreenSize.height) type:@"temp"]; + _remindPic.type=@"temp"; + + _remindPic.frame=CGRectMake(0, 0, kScreenSize.width, kScreenSize.height); + [self.view.window addSubview:_remindPic]; + [_remindPic.sureBtn addTarget:self action:@selector(xuToremindCyclePicDone) forControlEvents:UIControlEventTouchUpInside]; + [self huanShuiMainQueue]; + }else { + SetTimerCell *cell = [self.tableView cellForRowAtIndexPath:_indexPath]; + if ([cell isKindOfClass:[PlusTableViewCell class]]) { + return; + } + else if([cell isKindOfClass:[SetTimerCell class]]&&[cell.model isKindOfClass:[XuanduoCycleModel class]]) + { + //恒温设置 + _cycleModel=cell.model; + _remindPic=[[remindCyclePic alloc]initWithFrame:CGRectMake(0, 0, kScreenSize.width, kScreenSize.height) type:@"cycle"]; + _remindPic.type=@"cycle"; + + _remindPic.frame=CGRectMake(0, 0, kScreenSize.width, kScreenSize.height); + [self.view.window addSubview:_remindPic]; + [_remindPic.sureBtn addTarget:self action:@selector(xuToremindCyclePicDone) forControlEvents:UIControlEventTouchUpInside]; + [self huanShuiMainQueue]; + } + else + { + [self addTimer:nil]; + + } + } +} + +-(void)temperatureMainQueue{ + NSArray*lowArr=[_mypicView.picArr objectAtIndex:0]; + NSArray*heighArr=[_mypicView.picArr objectAtIndex:2]; + for (NSInteger i=0; i=0 && [readTimer isEqualToString:@"0116"]) { + if (!_timerModel) { + _timerModel = [[Xuanduo2TimerModel alloc] init]; + _timerModel.groupModelArr = [NSMutableArray array]; + }else { + [_timerModel.groupModelArr removeAllObjects]; + } + [Xuanduo2DataUtility readTimerSocketDataWithBackMsgModel:_timerModel addWithBackStr:string1 type:self.currentdevice.type]; + NSMutableArray *dataArr = [self.timeDic objectForKey:_titieArr[_selectSection-2]]; + [dataArr removeAllObjects]; + [dataArr addObject:plusflag]; + [dataArr addObjectsFromArray:_timerModel.groupModelArr]; + BOOL havePlus = [dataArr containsObject:plusflag]; + if (havePlus && dataArr.count > 10) { + [dataArr removeObjectAtIndex:0]; + }else if (!havePlus && dataArr.count < 10){ + [dataArr insertObject:plusflag atIndex:0]; + } + NSLog(@"dataarr.count = %ld",dataArr.count); + + + } + else if (_selectSection-2<_titieArr.count && _selectSection-2>=0 && [readTimer isEqualToString:@"0119"]) { + + _cycleModel=[[XuanduoCycleModel alloc]init]; + [Xuanduo2DataUtility readCycleSocketDataWithBackMsgModel:_cycleModel addWithBackStr:string1 type:self.currentdevice.type]; + NSMutableArray *dataArr = [self.timeDic objectForKey:_titieArr[_selectSection-2]]; + [dataArr removeAllObjects]; + + [dataArr addObject:_cycleModel]; + + + + } + if ([readTimer isEqualToString:@"0108"] || [readTimer isEqualToString:@"0105"]) { + [Xuanduo2DataUtility readSocketDataWithBackMsgModel:self.dataModel addWithBackData:data type:self.currentdevice.type]; + [self refreshWithData:self.dataModel]; + + } + [self.XuTohud hidmyHud]; + [self.indicatorView stopAnimating]; + [self.tableView reloadData]; +} + +-(void)ifishDeviceLogInFail{ + +} + +-(void)ifishDeviceLogInSuccees{ + +} + +-(void)ifishSocket:(AsyncSocket *)sock didAcceptNewSocket:(AsyncSocket *)newSocket{ + +} + + + +@end