From d00aff3ccdf2f087ba080c712f68f9c2e3faf997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Sun, 29 May 2022 18:05:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E9=87=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 32 + Ifish/Utinitys/Define.h | 3 +- .../XuTo/ElectricityCell.h | 19 + .../XuTo/ElectricityCell.m | 24 + .../XuTo/ElectricityCell.xib | 56 + .../XuTo/ElectricityView.h | 20 + .../XuTo/ElectricityView.m | 21 + .../XuTo/ElectricityView.xib | 157 ++ .../XuTo/Xuanduo2TimerModel.h | 14 + .../XuTo/Xuanduo2TimerModel.m | 6 + .../XuTo/Xuanduo2fController.m | 10 +- .../XuTo/XuanduoElectricityController.h | 28 + .../XuTo/XuanduoElectricityController.m | 1339 +++++++++++++++++ .../XuTo/XuanduoSettingController.m | 1 + .../XuanduoTempratueCorrectViewController.m | 34 +- .../XuTo/XuanduoTempratureCorrectView.h | 2 +- .../XuTo/XuanduoTempratureCorrectView.m | 4 +- .../XuTo/XuanduoTempratureCorrectView.xib | 61 +- 18 files changed, 1771 insertions(+), 60 deletions(-) create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.h create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.m create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.xib create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.h create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.m create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.xib create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.h create mode 100644 Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.m diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 5fb3d8e..7f978be 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2295,6 +2295,12 @@ C02D9E562794011300BBBF8D /* AlicloudHttpDNS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C02D9E4F2794011100BBBF8D /* AlicloudHttpDNS.framework */; }; C02ED596249E3B7300CAC37D /* InfoByImageViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C02ED594249E3B7300CAC37D /* InfoByImageViewController.h */; }; C02ED597249E3B7300CAC37D /* InfoByImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C02ED595249E3B7300CAC37D /* InfoByImageViewController.m */; }; + C0389649284331D90073E88F /* ElectricityCell.h in Headers */ = {isa = PBXBuildFile; fileRef = C0389646284331D90073E88F /* ElectricityCell.h */; }; + C038964A284331D90073E88F /* ElectricityCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C0389647284331D90073E88F /* ElectricityCell.m */; }; + C038964B284331D90073E88F /* ElectricityCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0389648284331D90073E88F /* ElectricityCell.xib */; }; + C038964E284332040073E88F /* ElectricityView.h in Headers */ = {isa = PBXBuildFile; fileRef = C038964C284332040073E88F /* ElectricityView.h */; }; + C038964F284332040073E88F /* ElectricityView.m in Sources */ = {isa = PBXBuildFile; fileRef = C038964D284332040073E88F /* ElectricityView.m */; }; + C0389651284332170073E88F /* ElectricityView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0389650284332170073E88F /* ElectricityView.xib */; }; C057166C282376CC004F113A /* UIButton+ImageTitleStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = C057166A282376CC004F113A /* UIButton+ImageTitleStyle.h */; }; C057166D282376CC004F113A /* UIButton+ImageTitleStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */; }; C05716702823D653004F113A /* XuanduoTimerListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C057166E2823D652004F113A /* XuanduoTimerListViewController.h */; }; @@ -2334,6 +2340,8 @@ C0D3A12D2647ED99008E6FD6 /* UIView+Sizes.m in Sources */ = {isa = PBXBuildFile; fileRef = C0D3A12B2647ED99008E6FD6 /* UIView+Sizes.m */; }; C0D3A12F2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C0D3A12E2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets */; }; C0D451D727955E8200609928 /* Define.m in Sources */ = {isa = PBXBuildFile; fileRef = C0D451D627955E8200609928 /* Define.m */; }; + C0D88D70283E6AC600299EAB /* XuanduoElectricityController.m in Sources */ = {isa = PBXBuildFile; fileRef = C0D88D6E283E6AC500299EAB /* XuanduoElectricityController.m */; }; + C0D88D71283E6AC600299EAB /* XuanduoElectricityController.h in Headers */ = {isa = PBXBuildFile; fileRef = C0D88D6F283E6AC600299EAB /* XuanduoElectricityController.h */; }; C0E746D5239E4A7D001BCD6D /* wechatlogin.png in Resources */ = {isa = PBXBuildFile; fileRef = C0E746D4239E4A7C001BCD6D /* wechatlogin.png */; }; C0E7D6C023A1D11500256A10 /* WXApiRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = C0E7D6BC23A1D11200256A10 /* WXApiRequestHandler.h */; }; C0E7D6C123A1D11500256A10 /* WXApiManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C0E7D6BD23A1D11200256A10 /* WXApiManager.h */; }; @@ -5803,6 +5811,12 @@ C02D9E4F2794011100BBBF8D /* AlicloudHttpDNS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlicloudHttpDNS.framework; sourceTree = ""; }; C02ED594249E3B7300CAC37D /* InfoByImageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoByImageViewController.h; sourceTree = ""; }; C02ED595249E3B7300CAC37D /* InfoByImageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InfoByImageViewController.m; sourceTree = ""; }; + C0389646284331D90073E88F /* ElectricityCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElectricityCell.h; sourceTree = ""; }; + C0389647284331D90073E88F /* ElectricityCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElectricityCell.m; sourceTree = ""; }; + C0389648284331D90073E88F /* ElectricityCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ElectricityCell.xib; sourceTree = ""; }; + C038964C284332040073E88F /* ElectricityView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElectricityView.h; sourceTree = ""; }; + C038964D284332040073E88F /* ElectricityView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElectricityView.m; sourceTree = ""; }; + C0389650284332170073E88F /* ElectricityView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ElectricityView.xib; sourceTree = ""; }; C057166A282376CC004F113A /* UIButton+ImageTitleStyle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+ImageTitleStyle.h"; sourceTree = ""; }; C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+ImageTitleStyle.m"; sourceTree = ""; }; C057166E2823D652004F113A /* XuanduoTimerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoTimerListViewController.h; sourceTree = ""; }; @@ -5842,6 +5856,8 @@ C0D3A12B2647ED99008E6FD6 /* UIView+Sizes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Sizes.m"; sourceTree = ""; }; C0D3A12E2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ELPCircleRotateImageAsset.xcassets; sourceTree = ""; }; C0D451D627955E8200609928 /* Define.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Define.m; sourceTree = ""; }; + C0D88D6E283E6AC500299EAB /* XuanduoElectricityController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XuanduoElectricityController.m; sourceTree = ""; }; + C0D88D6F283E6AC600299EAB /* XuanduoElectricityController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoElectricityController.h; sourceTree = ""; }; C0E746D4239E4A7C001BCD6D /* wechatlogin.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wechatlogin.png; sourceTree = ""; }; C0E7D6BC23A1D11200256A10 /* WXApiRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiRequestHandler.h; sourceTree = ""; }; C0E7D6BD23A1D11200256A10 /* WXApiManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiManager.h; sourceTree = ""; }; @@ -9736,6 +9752,8 @@ C0F6E1BF243B0A840071ECB9 /* xuanduo3fModel.m */, FAA732D6227C1DA80062C252 /* Xuanduo2TimerModel.h */, C00E7B1B282FBE19000A1E86 /* XuanduoTempratureCorrectView.h */, + C0D88D6F283E6AC600299EAB /* XuanduoElectricityController.h */, + C0D88D6E283E6AC500299EAB /* XuanduoElectricityController.m */, C00E7B1C282FBE19000A1E86 /* XuanduoTempratureCorrectView.m */, C00E7B21282FBE99000A1E86 /* XuanduoTempratureCorrectView.xib */, FAA732D7227C1DA80062C252 /* Xuanduo2TimerModel.m */, @@ -9790,6 +9808,12 @@ C00E7B252830DB70000A1E86 /* CycleTimerCell.xib */, FAFC08212279CB5900B5A07B /* SetTimerCell.m */, FAFC08222279CB5900B5A07B /* SetTimerCell.xib */, + C0389646284331D90073E88F /* ElectricityCell.h */, + C038964C284332040073E88F /* ElectricityView.h */, + C0389650284332170073E88F /* ElectricityView.xib */, + C038964D284332040073E88F /* ElectricityView.m */, + C0389647284331D90073E88F /* ElectricityCell.m */, + C0389648284331D90073E88F /* ElectricityCell.xib */, ); path = XuTo; sourceTree = ""; @@ -13051,6 +13075,7 @@ FA0893012275D9AB0084A609 /* XuanduoSectionHeaderView.h in Headers */, CB484E1622B8C8C90075F050 /* vda.h in Headers */, 3D1C50C5221A9EE00096AE43 /* UDManager.h in Headers */, + C038964E284332040073E88F /* ElectricityView.h in Headers */, CBA6164C228F993B00ED380D /* BaseYYModel.h in Headers */, 3D1C510F221A9EE00096AE43 /* IfishP2PPlayBackListViewController.h in Headers */, CB484E0D22B8C8C80075F050 /* avformat.h in Headers */, @@ -13200,6 +13225,7 @@ 3D1C5088221A9EDF0096AE43 /* KTThumbsView.h in Headers */, C0F6E1C0243B0A840071ECB9 /* xuanduo3fModel.h in Headers */, 3D1C513F221A9EE10096AE43 /* FishControlThreedViewCell.h in Headers */, + C0389649284331D90073E88F /* ElectricityCell.h in Headers */, FA0892F52270BED00084A609 /* XuanduoHuliModel.h in Headers */, C024B79F2379668B00509424 /* AvoidCrash.h in Headers */, C024B7AE2379668B00509424 /* NSObject+AvoidCrash.h in Headers */, @@ -13319,6 +13345,7 @@ CB484E1022B8C8C90075F050 /* avcodec.h in Headers */, CB0F4E8822951A130091C76D /* SVProgressHUD.h in Headers */, 3D1C511B221A9EE00096AE43 /* ShootImgDataSource.h in Headers */, + C0D88D71283E6AC600299EAB /* XuanduoElectricityController.h in Headers */, 3D1C5132221A9EE10096AE43 /* CameraRecordViewController.h in Headers */, CB48208B2334E99700A50C92 /* IQKeyboardManager.h in Headers */, 2AC8750626874F7500B6161C /* ESPUDPSocketServer.h in Headers */, @@ -13601,6 +13628,7 @@ 889C14F41EA7397B00470F50 /* personal_iocn_set@2x.png in Resources */, 8829568F1DBDA3A200E9DDD7 /* mine_header_back.png in Resources */, 88C1B2251DCC5A1400C2C99A /* replace_iocn_code@3x.png in Resources */, + C0389651284332170073E88F /* ElectricityView.xib in Resources */, 881478231E712A2700BFB79C /* task_openShareCamera@2x.png in Resources */, 8864843F1EE171D30046C3BD /* redact_line_last.png in Resources */, 8869B3AB1E6967DF0010F099 /* levelUp_yashark.png in Resources */, @@ -14042,6 +14070,7 @@ 882957561DBDA3A300E9DDD7 /* swimmingfish0069.png in Resources */, 886CB9591E63F35C00BCB892 /* home_iocn_gold@2x.png in Resources */, 881F0F551D73DF680091507E /* BaoGaoViewSecondCell.xib in Resources */, + C038964B284331D90073E88F /* ElectricityCell.xib in Resources */, 881671B41EA5DE2B00BEBF23 /* UMComRegisterViewController.xib in Resources */, 885FBDCB1E4C0CB400E0D7D1 /* explore_iocn_community@2x.png in Resources */, 886537461E24B70400E3C87F /* explore_new_label.png in Resources */, @@ -14859,6 +14888,7 @@ C0EA8A1F23AF74F4003DC53B /* SDWebImagePrefetcher.m in Sources */, C0B2F55E244D5577001079AA /* StoreNameView.m in Sources */, 883E78561D48A5E50030E075 /* IfishBlackListCenterViewController.m in Sources */, + C0D88D70283E6AC600299EAB /* XuanduoElectricityController.m in Sources */, CB484E1A22B8C8C90075F050 /* RtspInterface.mm in Sources */, 883A3D181EC44EF300DA84FF /* IfishUsersActivityListController.m in Sources */, 883E78EB1D48A5E50030E075 /* ConnectErrorViewController.m in Sources */, @@ -15097,6 +15127,7 @@ 3D1C5080221A9EDF0096AE43 /* KTThumbsView.m in Sources */, 883E76381D4897570030E075 /* DeviceOnlineModel.m in Sources */, C0E7D6CF23A1D16D00256A10 /* GetMessageFromWXResp+responseWithTextOrMediaMessage.mm in Sources */, + C038964F284332040073E88F /* ElectricityView.m in Sources */, 882C85B61EB08295001CC414 /* DiscountCoupon.m in Sources */, 881477D61E6FE9D300BFB79C /* IfishGoldAndExpTostView.m in Sources */, 883E784C1D48A5E50030E075 /* songNuoLightModel.m in Sources */, @@ -15703,6 +15734,7 @@ 883E785A1D48A5E50030E075 /* XuToLightModel.m in Sources */, 883E785E1D48A5E50030E075 /* CenterViewController.m in Sources */, 883283641EAF224700A47157 /* IfishGoldCoastDetailViewController.m in Sources */, + C038964A284331D90073E88F /* ElectricityCell.m in Sources */, CBA6168B228F9AB100ED380D /* MASViewConstraint.m in Sources */, 3D1C5131221A9EE10096AE43 /* IfishCameraRecordThirdCell.m in Sources */, CB4820952334E99700A50C92 /* IQUIViewController+Additions.m in Sources */, diff --git a/Ifish/Utinitys/Define.h b/Ifish/Utinitys/Define.h index 90e5313..16f4cde 100644 --- a/Ifish/Utinitys/Define.h +++ b/Ifish/Utinitys/Define.h @@ -255,7 +255,8 @@ alpha:1.0] //商家商品图片 #define kGetShopVideoImg [NSString stringWithFormat:@"%@/commodity/",JIEKOUPORTHTTP] - +// 查询电量 +#define kdevicePowers [NSString stringWithFormat:@"%@/api/user/devicePowers.do",JIEKOUPORT] // 扫二维码纪录激活量 #define kSweepQRCode [NSString stringWithFormat:@"%@/api/user/sweepQRCode.do",JIEKOUPORT] diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.h new file mode 100644 index 0000000..cb35e9d --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.h @@ -0,0 +1,19 @@ +// +// ElectricityCell.h +// Ifish +// +// Created by 祝发冬 on 2022/5/29. +// Copyright © 2022 lianlian. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ElectricityCell : UITableViewCell +@property (weak, nonatomic) IBOutlet UILabel *monthLabel; +@property (weak, nonatomic) IBOutlet UILabel *powerLabel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.m new file mode 100644 index 0000000..2cbb997 --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.m @@ -0,0 +1,24 @@ +// +// ElectricityCell.m +// Ifish +// +// Created by 祝发冬 on 2022/5/29. +// Copyright © 2022 lianlian. All rights reserved. +// + +#import "ElectricityCell.h" + +@implementation ElectricityCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +@end diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.xib new file mode 100644 index 0000000..b6763de --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityCell.xib @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.h new file mode 100644 index 0000000..002ed2d --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.h @@ -0,0 +1,20 @@ +// +// ElectricityView.h +// Ifish +// +// Created by 祝发冬 on 2022/5/29. +// Copyright © 2022 lianlian. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ElectricityView : UIView +@property (weak, nonatomic) IBOutlet UILabel *rating; +@property (weak, nonatomic) IBOutlet UILabel *monthPower; +@property (weak, nonatomic) IBOutlet UILabel *dayPowerLabel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.m new file mode 100644 index 0000000..a17cebe --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.m @@ -0,0 +1,21 @@ +// +// ElectricityView.m +// Ifish +// +// Created by 祝发冬 on 2022/5/29. +// Copyright © 2022 lianlian. All rights reserved. +// + +#import "ElectricityView.h" + +@implementation ElectricityView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +@end diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.xib new file mode 100644 index 0000000..adb4841 --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/ElectricityView.xib @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.h index 0d86519..407ef6c 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.h +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.h @@ -105,4 +105,18 @@ NS_ASSUME_NONNULL_BEGIN @end +@interface XuanduoElectricityModel : NSObject + +/// 当天电量 +@property (nonatomic, strong) NSString *dayPower; +//当前功率 +@property (nonatomic, strong) NSString *PowerRating; + +//当前月电量 +@property (nonatomic, strong) NSString *monthPower; + + + +@end + NS_ASSUME_NONNULL_END diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.m index 1f9fcc0..7caf77a 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2TimerModel.m @@ -39,6 +39,12 @@ @end +@implementation XuanduoElectricityModel + + + +@end + diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m index e324469..2adcf80 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m @@ -29,6 +29,7 @@ #import "PetStoresViewController.h" #import "UIImage+WaterMark.h" #import "XuanduoSettingController.h" +#import "XuanduoElectricityController.h" #define kBtnTag 100 @@ -453,11 +454,14 @@ #pragma mark -- actions -- - (IBAction)cameraBtnClick:(id)sender { - + //XuanduoElectricityController if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F])//一键喂鱼 { - - } + XuanduoElectricityController *_settingVC = [[XuanduoElectricityController alloc] init]; + _settingVC.currentdevice = self.currentDevice; + _settingVC.dataModel = self.dataModel; + [self.navigationController pushViewController:_settingVC animated:YES]; + } else if([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]) { NSMutableArray *guanxiiArr= [[DataCenter defaultDtacenter] valueForKey:@"devicamerArr"]; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.h new file mode 100644 index 0000000..abdf832 --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.h @@ -0,0 +1,28 @@ +// +// Xuanduo2SettingController.h +// Ifish +// +// Created by Alex on 2019/4/28. +// Copyright © 2019 lianlian. All rights reserved. +// + +#import "FatherController.h" +#import "IfishDeviceInfo.h" +#import "xuanduo3fModel.h" +#import "ReadTimerModel.h" +#import "XuanduoTimerSettingViewController.h" +NS_ASSUME_NONNULL_BEGIN + +@class Xuanduo2Model; + +@interface XuanduoElectricityController : BaseViewController + +@property (nonatomic,strong) UIActivityIndicatorView*indicatorView; +@property (nonatomic ,strong) id dataModel; +@property(nonatomic,strong) DeviceModel* currentdevice; +@property (nonatomic, strong) ReadTimerModel *readMode; +- (void)refreshWithData:(id)model; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.m new file mode 100644 index 0000000..237ba51 --- /dev/null +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoElectricityController.m @@ -0,0 +1,1339 @@ +// +// Xuanduo2SettingController.m +// Ifish +// +// Created by Alex on 2019/4/28. +// Copyright © 2019 lianlian. All rights reserved. +// + +#import "XuanduoElectricityController.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" +#import "TimerTypeTableViewCell.h" +#import "ElectricityCell.h" +#import "ElectricityView.h" + +#define kBtnTag 500 +#define kSwitchBtnTag 600 +static NSString *ElectricityCellid = @"ElectricityCell"; +static NSString *changeWaterCellid = @"ChangeWaterCell"; +static NSString *addCellid = @"PlusTableViewCell"; +static NSString *plusflag = @"plusCell"; +static NSString *setTimerflag = @"SetTimerCell"; +static NSString *timerTypeFlag = @"TimerTypeTableViewCell"; + + + +@interface XuanduoElectricityController () +@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; +@property(nonatomic,strong)UITableView*tableView; +@property(nonatomic,strong)ElectricityView*headerView; +@property(nonatomic,strong)NSDictionary*dataDict; +@property(nonatomic,strong)NSArray*sortedArray; +@end + +@implementation XuanduoElectricityController +{ + 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]; + [Socketsingleton sharedInstance].communiteDelegate = self; + //关闭打开的section + _selectSection = -1; + [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=@"电量统计"; + + [self addTitleViewWithTitle:title]; + [self refreshWithData:self.dataModel]; + [self setupTable]; + [self requestData]; + [self creatIndicatorView]; + [Socketsingleton sharedInstance].communiteDelegate = self; +} +-(void)requestData +{ + [AFHttpTool requestWihtMethod:RequestMethodTypePost url:kdevicePowers params:@{} success:^(id response) { + + + + NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil]; +// resultDic=@{@"result":@"100",@"data":@{@"history":@{@"2022":@{@"1":@"100",@"4":@"344",@"2":@"23"},@"2021":@{@"3":@"100",@"4":@"344",@"2":@"23"}}}}; + NSString*result=resultDic[@"result"]; + + + if ([resultDic[@"result"] isEqualToString:@"100"]) + { + NSDictionary*data=resultDic[@"data"]; + NSDictionary*his=data[@"history"]; + self.dataDict=his; + self.sortedArray= [his.allKeys sortedArrayUsingComparator:^NSComparisonResult(NSString* number1, NSString* number2){ + + if ([number1 integerValue] > [number2 integerValue]){ + return NSOrderedAscending; + }else if([number1 integerValue] < [number2 integerValue]){ + return NSOrderedDescending; + } + else{ + return NSOrderedSame; + } + }]; + [self.tableView reloadData]; + } + else + { + [self.view makeToast:result]; + } + + + } failure:^(NSError *err) { + }]; +} +- (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 { + + self.tableView=[[UITableView alloc]initWithFrame:self.view.bounds style:UITableViewCellStyleDefault]; + self.tableView.delegate=self; + self.tableView.dataSource=self; + self.tableView.backgroundColor=COLOR_MIAN; + ElectricityView*header=[ElectricityView viewFromXib]; + self.tableView.tableHeaderView=header; + self.headerView=header; + self.view.backgroundColor=COLOR_MIAN; + + if (@available(iOS 15.0, *)) { + self.tableView.sectionHeaderTopPadding=0; + } else { + // Fallback on earlier versions + } + + + self.tableView.separatorStyle=UITableViewCellSeparatorStyleSingleLine; + self.tableView.separatorInset=UIEdgeInsetsMake(0, 15, 0, 15); + + [self.tableView registerNib:[UINib nibWithNibName:ElectricityCellid bundle:nil] forCellReuseIdentifier:ElectricityCellid]; + [self.view addSubview:self.tableView]; + +} +-(NSString*)getMonthByNumberString:(NSString*)number +{ + + NSDictionary*months=@{@"1":@"一",@"2":@"二",@"3":@"三",@"4":@"四",@"5":@"五",@"6":@"六",@"7":@"七",@"8":@"八",@"9":@"九",@"10":@"十",@"11":@"十一",@"12":@"十二"}; + + return months[number]?:@""; + +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + + + + + + return self.sortedArray.count; + + + +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + NSString*key=self.sortedArray[section]; + NSDictionary*dic=self.dataDict[key]; + return dic.count; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + ElectricityCell *cell = [tableView dequeueReusableCellWithIdentifier:ElectricityCellid]; + cell.accessoryType=UITableViewCellAccessoryDisclosureIndicator; + NSString*key=self.sortedArray[indexPath.section]; + NSDictionary*dic=self.dataDict[key]; + NSArray*array=[dic.allKeys sortedArrayUsingComparator:^NSComparisonResult(NSString* number1, NSString* number2){ + + if ([number1 integerValue] > [number2 integerValue]){ + return NSOrderedDescending; + }else if([number1 integerValue] < [number2 integerValue]){ + return NSOrderedAscending; + } + else{ + return NSOrderedSame; + } + }]; + NSString*month=array[indexPath.row]; + NSString*power=dic[month]; + cell.monthLabel.text=[NSString stringWithFormat:@"%@月",[self getMonthByNumberString:month]]; + cell.powerLabel.text=power; + + + return cell; +} + +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ + return 44;; +} + +#pragma mark tableView 头视图和脚视图 +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 44; +} + +- (UIView*)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section +{ + NSString*year=self.sortedArray[section]; + UIView *oneHeader = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 44)]; + oneHeader.backgroundColor = [UIColor whiteColor]; + UILabel*label=[[UILabel alloc]initWithFrame:CGRectMake(10, 0, 60, 44)]; + label.text=[NSString stringWithFormat:@"%@年",year]; + label.textColor=[UIColor lightGrayColor]; + [oneHeader addSubview:label]; + return oneHeader; +} + +#pragma mark tableView 点击事件 + +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ + [tableView deselectRowAtIndexPath:indexPath animated:YES]; +} + +-(void)temperatureMainQueue{ + NSArray*lowArr=[_mypicView.picArr objectAtIndex:0]; + NSArray*heighArr=[_mypicView.picArr objectAtIndex:2]; + for (NSInteger i=0; i=5&&!cancelCorrect) + { + [self.view makeToast:@"校准超过5℃请更换探头!"]; + + } - NSString*rightTemp =[dataContorl leftAddZero:4 andStr:[dataContorl ToHex:temp*10]]; + NSString*rightTemp =[dataContorl leftAddZero:4 andStr:[dataContorl ToHex:delta*10]]; if (cancelCorrect) { rightTemp=@"0000"; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.h index 7d88fd7..3617c65 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.h +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.h @@ -11,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN @interface XuanduoTempratureCorrectView : UIView -@property (weak, nonatomic) IBOutlet UILabel *correectTempLabel; @property (weak, nonatomic) IBOutlet UILabel *realTempLabel; +@property (weak, nonatomic) IBOutlet UILabel *deltaLabel; @property (weak, nonatomic) IBOutlet UITextField *textField; @property (weak, nonatomic) IBOutlet UIButton *cancelBtn; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.m index dab9c79..bd921e9 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.m @@ -22,7 +22,9 @@ [super awakeFromNib]; self.cancelBtn.layer.masksToBounds=YES; self.cancelBtn.layer.cornerRadius=8; - self.correectTempLabel.layer.cornerRadius=8; + self.textField.layer.borderColor=[UIColor redColor].CGColor; + self.textField.layer.borderWidth=1.0; + self.textField.layer.cornerRadius=8; } diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.xib index 7b64a98..9677117 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.xib +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTempratureCorrectView.xib @@ -44,50 +44,21 @@ - - + - - - - - - - - - -