电量查询
This commit is contained in:
祝发冬
parent
e906be6c71
commit
d00aff3ccd
|
|
@ -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 = "<group>"; };
|
||||
C02ED594249E3B7300CAC37D /* InfoByImageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoByImageViewController.h; sourceTree = "<group>"; };
|
||||
C02ED595249E3B7300CAC37D /* InfoByImageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InfoByImageViewController.m; sourceTree = "<group>"; };
|
||||
C0389646284331D90073E88F /* ElectricityCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElectricityCell.h; sourceTree = "<group>"; };
|
||||
C0389647284331D90073E88F /* ElectricityCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElectricityCell.m; sourceTree = "<group>"; };
|
||||
C0389648284331D90073E88F /* ElectricityCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ElectricityCell.xib; sourceTree = "<group>"; };
|
||||
C038964C284332040073E88F /* ElectricityView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElectricityView.h; sourceTree = "<group>"; };
|
||||
C038964D284332040073E88F /* ElectricityView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElectricityView.m; sourceTree = "<group>"; };
|
||||
C0389650284332170073E88F /* ElectricityView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ElectricityView.xib; sourceTree = "<group>"; };
|
||||
C057166A282376CC004F113A /* UIButton+ImageTitleStyle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+ImageTitleStyle.h"; sourceTree = "<group>"; };
|
||||
C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+ImageTitleStyle.m"; sourceTree = "<group>"; };
|
||||
C057166E2823D652004F113A /* XuanduoTimerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoTimerListViewController.h; sourceTree = "<group>"; };
|
||||
|
|
@ -5842,6 +5856,8 @@
|
|||
C0D3A12B2647ED99008E6FD6 /* UIView+Sizes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Sizes.m"; sourceTree = "<group>"; };
|
||||
C0D3A12E2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ELPCircleRotateImageAsset.xcassets; sourceTree = "<group>"; };
|
||||
C0D451D627955E8200609928 /* Define.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Define.m; sourceTree = "<group>"; };
|
||||
C0D88D6E283E6AC500299EAB /* XuanduoElectricityController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XuanduoElectricityController.m; sourceTree = "<group>"; };
|
||||
C0D88D6F283E6AC600299EAB /* XuanduoElectricityController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoElectricityController.h; sourceTree = "<group>"; };
|
||||
C0E746D4239E4A7C001BCD6D /* wechatlogin.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wechatlogin.png; sourceTree = "<group>"; };
|
||||
C0E7D6BC23A1D11200256A10 /* WXApiRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiRequestHandler.h; sourceTree = "<group>"; };
|
||||
C0E7D6BD23A1D11200256A10 /* WXApiManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiManager.h; sourceTree = "<group>"; };
|
||||
|
|
@ -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 = "<group>";
|
||||
|
|
@ -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 */,
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
//
|
||||
// ElectricityCell.h
|
||||
// Ifish
|
||||
//
|
||||
// Created by 祝发冬 on 2022/5/29.
|
||||
// Copyright © 2022 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface ElectricityCell : UITableViewCell
|
||||
@property (weak, nonatomic) IBOutlet UILabel *monthLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *powerLabel;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina6_1" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ElectricityCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="月份" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fiK-el-5aR">
|
||||
<rect key="frame" x="10" y="0.0" width="60" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="60" id="gSe-Zy-IRT"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="13"/>
|
||||
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电量" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lKv-zE-h1a">
|
||||
<rect key="frame" x="250" y="0.0" width="60" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="60" id="6lA-3V-AB0"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="13"/>
|
||||
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="fiK-el-5aR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="1ii-kj-1NO"/>
|
||||
<constraint firstAttribute="trailing" secondItem="lKv-zE-h1a" secondAttribute="trailing" constant="10" id="FrH-oE-La2"/>
|
||||
<constraint firstAttribute="bottom" secondItem="fiK-el-5aR" secondAttribute="bottom" id="PfP-ga-uX5"/>
|
||||
<constraint firstAttribute="bottom" secondItem="lKv-zE-h1a" secondAttribute="bottom" id="WCm-7i-Gnz"/>
|
||||
<constraint firstItem="lKv-zE-h1a" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="bff-EF-afa"/>
|
||||
<constraint firstItem="fiK-el-5aR" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="fyh-nE-hWh"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
|
||||
<connections>
|
||||
<outlet property="monthLabel" destination="fiK-el-5aR" id="TVZ-fX-jr7"/>
|
||||
<outlet property="powerLabel" destination="lKv-zE-h1a" id="BhH-zm-wJ0"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="137.68115942028987" y="18.75"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
//
|
||||
// ElectricityView.h
|
||||
// Ifish
|
||||
//
|
||||
// Created by 祝发冬 on 2022/5/29.
|
||||
// Copyright © 2022 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
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
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,157 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina6_1" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
|
||||
<capability name="System colors in document resources" minToolsVersion="11.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="N2a-Po-JOp" customClass="ElectricityView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="210"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Qf-DG-52V" userLabel="backView">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="166"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pww-SJ-9UO" userLabel="h">
|
||||
<rect key="frame" x="15" y="121" width="384" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="VV7-UY-80g"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="feW-KG-pge">
|
||||
<rect key="frame" x="107" y="41" width="200" height="30"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="30" id="JYd-mR-tbg"/>
|
||||
<constraint firstAttribute="width" constant="200" id="YEK-uK-nfz"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="33"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日电量(kwh)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TlN-UU-bfn" userLabel="day">
|
||||
<rect key="frame" x="107" y="71" width="200" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="uWc-0K-bUB"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wFK-LA-M1Q" userLabel="v">
|
||||
<rect key="frame" x="206.5" y="122" width="1" height="44"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="1" id="s4e-66-efB"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="当前功率(w)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ol0-Oy-fGu" userLabel="ratingLabel">
|
||||
<rect key="frame" x="0.0" y="122" width="206.5" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="22" id="8pi-6I-czO"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="月用电量(kwh)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NGi-wj-8PK" userLabel="powerLabel">
|
||||
<rect key="frame" x="206.5" y="122" width="207.5" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="22" id="aKb-46-SkF"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="29d-RV-1qC" userLabel="rating">
|
||||
<rect key="frame" x="0.0" y="144" width="206.5" height="22"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W44-9Q-CNb" userLabel="monthPower">
|
||||
<rect key="frame" x="207.5" y="144" width="206.5" height="22"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.87058823529411766" green="0.38431372549019605" blue="0.28627450980392155" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="W44-9Q-CNb" firstAttribute="top" secondItem="NGi-wj-8PK" secondAttribute="bottom" id="3qB-Jr-QOs"/>
|
||||
<constraint firstItem="W44-9Q-CNb" firstAttribute="leading" secondItem="wFK-LA-M1Q" secondAttribute="trailing" id="5hW-oQ-GMh"/>
|
||||
<constraint firstItem="pww-SJ-9UO" firstAttribute="leading" secondItem="4Qf-DG-52V" secondAttribute="leading" constant="15" id="7Gk-Al-oGx"/>
|
||||
<constraint firstItem="ol0-Oy-fGu" firstAttribute="top" secondItem="pww-SJ-9UO" secondAttribute="bottom" id="7TK-ud-1KZ"/>
|
||||
<constraint firstItem="wFK-LA-M1Q" firstAttribute="top" secondItem="pww-SJ-9UO" secondAttribute="bottom" id="9Ka-d4-SbC"/>
|
||||
<constraint firstItem="29d-RV-1qC" firstAttribute="leading" secondItem="4Qf-DG-52V" secondAttribute="leading" id="Dfg-Zb-6Gn"/>
|
||||
<constraint firstItem="29d-RV-1qC" firstAttribute="top" secondItem="ol0-Oy-fGu" secondAttribute="bottom" id="Fgh-Ax-aZW"/>
|
||||
<constraint firstItem="TlN-UU-bfn" firstAttribute="centerX" secondItem="feW-KG-pge" secondAttribute="centerX" id="GDU-dI-mkT"/>
|
||||
<constraint firstItem="TlN-UU-bfn" firstAttribute="top" secondItem="feW-KG-pge" secondAttribute="bottom" id="KZd-Dl-RWU"/>
|
||||
<constraint firstItem="NGi-wj-8PK" firstAttribute="top" secondItem="pww-SJ-9UO" secondAttribute="bottom" id="LlM-ND-yL7"/>
|
||||
<constraint firstItem="feW-KG-pge" firstAttribute="centerX" secondItem="4Qf-DG-52V" secondAttribute="centerX" id="PF1-W6-bM3"/>
|
||||
<constraint firstItem="feW-KG-pge" firstAttribute="top" secondItem="4Qf-DG-52V" secondAttribute="top" constant="41" id="QdL-ap-84W"/>
|
||||
<constraint firstItem="wFK-LA-M1Q" firstAttribute="leading" secondItem="29d-RV-1qC" secondAttribute="trailing" id="UVW-Fy-5UD"/>
|
||||
<constraint firstItem="NGi-wj-8PK" firstAttribute="leading" secondItem="wFK-LA-M1Q" secondAttribute="leading" id="W0b-Ht-2Zi"/>
|
||||
<constraint firstAttribute="bottom" secondItem="29d-RV-1qC" secondAttribute="bottom" id="bax-hG-w5F"/>
|
||||
<constraint firstItem="wFK-LA-M1Q" firstAttribute="centerX" secondItem="4Qf-DG-52V" secondAttribute="centerX" id="bv5-4m-CbF"/>
|
||||
<constraint firstAttribute="bottom" secondItem="wFK-LA-M1Q" secondAttribute="bottom" id="hyL-I6-MhL"/>
|
||||
<constraint firstAttribute="bottom" secondItem="W44-9Q-CNb" secondAttribute="bottom" id="hya-S7-pwO"/>
|
||||
<constraint firstItem="TlN-UU-bfn" firstAttribute="width" secondItem="feW-KG-pge" secondAttribute="width" id="ikZ-x6-s11"/>
|
||||
<constraint firstAttribute="bottom" secondItem="pww-SJ-9UO" secondAttribute="bottom" constant="44" id="kSJ-Cs-Cxo"/>
|
||||
<constraint firstItem="ol0-Oy-fGu" firstAttribute="leading" secondItem="4Qf-DG-52V" secondAttribute="leading" id="ldS-pW-rYO"/>
|
||||
<constraint firstAttribute="trailing" secondItem="pww-SJ-9UO" secondAttribute="trailing" constant="15" id="tQe-Wl-U3H"/>
|
||||
<constraint firstAttribute="trailing" secondItem="W44-9Q-CNb" secondAttribute="trailing" id="toY-V9-jzu"/>
|
||||
<constraint firstItem="wFK-LA-M1Q" firstAttribute="leading" secondItem="ol0-Oy-fGu" secondAttribute="trailing" id="v8V-zk-shC"/>
|
||||
<constraint firstAttribute="trailing" secondItem="NGi-wj-8PK" secondAttribute="trailing" id="y8d-J9-NgV"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="统计" translatesAutoresizingMaskIntoConstraints="NO" id="iIQ-Ig-q8A" userLabel="icon">
|
||||
<rect key="frame" x="5" y="9" width="30" height="26"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="26" id="fQp-TK-gcR"/>
|
||||
<constraint firstAttribute="width" constant="30" id="mRo-ch-xO5"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="电量统计" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IL0-d4-Vb1">
|
||||
<rect key="frame" x="40" y="0.0" width="119" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="119" id="QRp-If-JND"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="15"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
|
||||
<constraints>
|
||||
<constraint firstItem="iIQ-Ig-q8A" firstAttribute="leading" secondItem="N2a-Po-JOp" secondAttribute="leading" constant="5" id="048-4i-pwW"/>
|
||||
<constraint firstItem="4Qf-DG-52V" firstAttribute="top" secondItem="N2a-Po-JOp" secondAttribute="top" constant="44" id="4vE-In-MaQ"/>
|
||||
<constraint firstItem="4Qf-DG-52V" firstAttribute="top" secondItem="IL0-d4-Vb1" secondAttribute="bottom" id="AK1-H2-PWG"/>
|
||||
<constraint firstItem="4Qf-DG-52V" firstAttribute="leading" secondItem="N2a-Po-JOp" secondAttribute="leading" id="XL6-3o-lKy"/>
|
||||
<constraint firstAttribute="bottom" secondItem="4Qf-DG-52V" secondAttribute="bottom" id="YIQ-w2-c7T"/>
|
||||
<constraint firstItem="iIQ-Ig-q8A" firstAttribute="centerY" secondItem="IL0-d4-Vb1" secondAttribute="centerY" id="cjv-PW-nvX"/>
|
||||
<constraint firstItem="IL0-d4-Vb1" firstAttribute="leading" secondItem="iIQ-Ig-q8A" secondAttribute="trailing" constant="5" id="kzO-42-wt4"/>
|
||||
<constraint firstAttribute="trailing" secondItem="4Qf-DG-52V" secondAttribute="trailing" id="qRU-PT-u7j"/>
|
||||
<constraint firstItem="IL0-d4-Vb1" firstAttribute="top" secondItem="N2a-Po-JOp" secondAttribute="top" id="vLB-Qu-OIC"/>
|
||||
</constraints>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="dayPowerLabel" destination="feW-KG-pge" id="4tg-my-2cF"/>
|
||||
<outlet property="monthPower" destination="W44-9Q-CNb" id="OAp-Sm-Zb8"/>
|
||||
<outlet property="rating" destination="29d-RV-1qC" id="V0l-so-Awh"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="2.8985507246376816" y="75"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="统计" width="200" height="200"/>
|
||||
<systemColor name="systemBackgroundColor">
|
||||
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</systemColor>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -39,6 +39,12 @@
|
|||
|
||||
|
||||
@end
|
||||
@implementation XuanduoElectricityModel
|
||||
|
||||
|
||||
|
||||
@end
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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"];
|
||||
|
|
|
|||
|
|
@ -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<UITableViewDelegate,UITableViewDataSource>
|
||||
|
||||
@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
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -31,6 +31,7 @@
|
|||
#import "UserExtendataArchaver.h"
|
||||
#import "XuanduoTempratueCorrectViewController.h"
|
||||
#import "XuanduoTimerListViewController.h"
|
||||
#import "XuanduoElectricityController.h"
|
||||
|
||||
#define kBtnTag 500
|
||||
#define kSwitchBtnTag 600
|
||||
|
|
|
|||
|
|
@ -196,12 +196,12 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
|
|||
}
|
||||
-(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
|
||||
{
|
||||
NSArray*array=@[@"+",@"-",@".",@"0",@"1",@"2",@"3",@"4",@"5",@"6",@"7",@"8",@"9",@""];
|
||||
if (![array containsObject:string])
|
||||
{
|
||||
[self.view makeToast:@"请输入+-或数字"];
|
||||
return NO;
|
||||
}
|
||||
// NSArray*array=@[@"+",@"-",@".",@"0",@"1",@"2",@"3",@"4",@"5",@"6",@"7",@"8",@"9",@""];
|
||||
// if (![array containsObject:string])
|
||||
// {
|
||||
// [self.view makeToast:@"请输入+-或数字"];
|
||||
// return NO;
|
||||
// }
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
|
@ -299,9 +299,10 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
|
|||
{
|
||||
prefix=@"-";
|
||||
}
|
||||
self.tempView.textField.text=[NSString stringWithFormat:@"%@%@",prefix,deltatempString];
|
||||
NSString *corrTemp = [NSString stringWithFormat:@"%.1f℃",[tempModel.deviation isEqualToString:@"02"]?(temp-deltatemp):(temp+deltatemp)];
|
||||
self.tempView.correectTempLabel.text=corrTemp;
|
||||
self.tempView.deltaLabel.text=[NSString stringWithFormat:@"校准值%@%@",prefix,deltatempString];
|
||||
|
||||
self.tempView.textField.text=corrTemp;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -354,17 +355,26 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
|
|||
|
||||
|
||||
|
||||
NSString*pureString=[self.tempView.textField.text stringByReplacingOccurrencesOfString:@"-" withString:@""];
|
||||
pureString=[pureString stringByReplacingOccurrencesOfString:@"+" withString:@""];
|
||||
NSString*pureString=self.tempView.textField.text;
|
||||
pureString=[pureString stringByReplacingOccurrencesOfString:@"℃" withString:@""];
|
||||
|
||||
float delta= pureString.floatValue;
|
||||
if (!delta)
|
||||
{
|
||||
[self.view makeToast:@"请输入校正后的温度"];
|
||||
}
|
||||
|
||||
float mac=[dataContorl hexToTen:self.tempCorrectModel.realTemp];
|
||||
|
||||
//float TPlabel=mac/10+(mac%10)*0.1;
|
||||
float temp = mac/10.0+delta;
|
||||
float detectTemp = mac/10.0;
|
||||
if (ABS(detectTemp-delta)>=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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,50 +44,21 @@
|
|||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2pv-Tc-pht">
|
||||
<rect key="frame" x="174" y="170" width="60" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="60" id="AGi-MS-Fiy"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="11"/>
|
||||
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
|
||||
<color key="value" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
|
||||
<real key="value" value="1"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="defineValue">
|
||||
<real key="value" value="1"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="校准后温度" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wKE-qN-OPf">
|
||||
<rect key="frame" x="74" y="170" width="100" height="20"/>
|
||||
<rect key="frame" x="69" y="170" width="100" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="11"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Stf-9K-Vtb">
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Stf-9K-Vtb" userLabel="line">
|
||||
<rect key="frame" x="10" y="99.5" width="224" height="1"/>
|
||||
<color key="backgroundColor" systemColor="systemGray2Color"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="9xP-a6-ibF"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="tlB-Qi-mvx">
|
||||
<rect key="frame" x="122" y="79.5" width="50" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="50" id="A0g-vd-yrY"/>
|
||||
<constraint firstAttribute="height" constant="20" id="DHM-iB-dEw"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
|
||||
</textField>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="校准温度" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UAM-uW-zwv">
|
||||
<rect key="frame" x="72" y="79.5" width="50" height="20"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="校准值" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UAM-uW-zwv" userLabel="deltaLabel">
|
||||
<rect key="frame" x="97" y="79.5" width="50" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="scj-ny-6pE"/>
|
||||
<constraint firstAttribute="width" constant="50" id="tvn-he-WQh"/>
|
||||
|
|
@ -96,6 +67,15 @@
|
|||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="tlB-Qi-mvx">
|
||||
<rect key="frame" x="169" y="170" width="65" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="65" id="A0g-vd-yrY"/>
|
||||
<constraint firstAttribute="height" constant="20" id="DHM-iB-dEw"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
|
||||
</textField>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="DJa-9i-S0t"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
|
|
@ -105,31 +85,28 @@
|
|||
<constraint firstAttribute="trailing" secondItem="eZR-Ff-N9f" secondAttribute="trailing" constant="10" id="5ab-XC-dFT"/>
|
||||
<constraint firstItem="lNj-YX-wf8" firstAttribute="leading" secondItem="eTc-I0-xrM" secondAttribute="leading" id="7vR-O8-blu"/>
|
||||
<constraint firstItem="lNj-YX-wf8" firstAttribute="width" secondItem="eTc-I0-xrM" secondAttribute="width" id="FCX-r9-RmP"/>
|
||||
<constraint firstItem="2pv-Tc-pht" firstAttribute="bottom" secondItem="lNj-YX-wf8" secondAttribute="bottom" id="IRp-dE-BfP"/>
|
||||
<constraint firstItem="2pv-Tc-pht" firstAttribute="trailing" secondItem="eZR-Ff-N9f" secondAttribute="trailing" id="KCi-JG-Lj0"/>
|
||||
<constraint firstItem="wKE-qN-OPf" firstAttribute="trailing" secondItem="2pv-Tc-pht" secondAttribute="leading" id="LAK-dc-8E0"/>
|
||||
<constraint firstItem="tlB-Qi-mvx" firstAttribute="bottom" secondItem="wKE-qN-OPf" secondAttribute="bottom" id="KLY-Hz-ZWf"/>
|
||||
<constraint firstItem="wKE-qN-OPf" firstAttribute="bottom" secondItem="lNj-YX-wf8" secondAttribute="bottom" id="LwB-xN-V0k"/>
|
||||
<constraint firstItem="Stf-9K-Vtb" firstAttribute="top" secondItem="UAM-uW-zwv" secondAttribute="bottom" id="Mnp-sZ-5r2"/>
|
||||
<constraint firstItem="2pv-Tc-pht" firstAttribute="height" secondItem="lNj-YX-wf8" secondAttribute="height" id="QED-df-WAt"/>
|
||||
<constraint firstItem="UAM-uW-zwv" firstAttribute="bottom" secondItem="tlB-Qi-mvx" secondAttribute="bottom" id="SG0-B0-jvm"/>
|
||||
<constraint firstItem="Stf-9K-Vtb" firstAttribute="leading" secondItem="DJa-9i-S0t" secondAttribute="leading" constant="10" id="WG8-b7-TFf"/>
|
||||
<constraint firstItem="tlB-Qi-mvx" firstAttribute="trailing" secondItem="eZR-Ff-N9f" secondAttribute="trailing" id="ZIs-iH-Gig"/>
|
||||
<constraint firstItem="wKE-qN-OPf" firstAttribute="width" secondItem="lNj-YX-wf8" secondAttribute="width" id="aVX-zi-E9e"/>
|
||||
<constraint firstItem="eZR-Ff-N9f" firstAttribute="width" secondItem="eTc-I0-xrM" secondAttribute="width" multiplier="0.9" id="akQ-uf-l8S"/>
|
||||
<constraint firstItem="eTc-I0-xrM" firstAttribute="leading" secondItem="DJa-9i-S0t" secondAttribute="leading" constant="10" id="hcQ-6T-XJu"/>
|
||||
<constraint firstItem="wKE-qN-OPf" firstAttribute="trailing" secondItem="tlB-Qi-mvx" secondAttribute="leading" id="lRh-vo-kNg"/>
|
||||
<constraint firstItem="wKE-qN-OPf" firstAttribute="height" secondItem="lNj-YX-wf8" secondAttribute="height" id="lZH-Lf-c2W"/>
|
||||
<constraint firstItem="eTc-I0-xrM" firstAttribute="top" secondItem="2c8-dl-t76" secondAttribute="top" constant="10" id="mZ3-zX-X38"/>
|
||||
<constraint firstItem="eZR-Ff-N9f" firstAttribute="height" secondItem="eTc-I0-xrM" secondAttribute="height" multiplier="0.9" id="njJ-Xg-nZV"/>
|
||||
<constraint firstItem="tlB-Qi-mvx" firstAttribute="leading" secondItem="UAM-uW-zwv" secondAttribute="trailing" id="qKW-8X-Jdb"/>
|
||||
<constraint firstItem="Stf-9K-Vtb" firstAttribute="centerX" secondItem="2c8-dl-t76" secondAttribute="centerX" id="qaD-6J-CIh"/>
|
||||
<constraint firstItem="UAM-uW-zwv" firstAttribute="centerX" secondItem="2c8-dl-t76" secondAttribute="centerX" constant="-25" id="rsP-yf-UVU"/>
|
||||
<constraint firstItem="UAM-uW-zwv" firstAttribute="centerX" secondItem="2c8-dl-t76" secondAttribute="centerX" id="rsP-yf-UVU"/>
|
||||
<constraint firstItem="DJa-9i-S0t" firstAttribute="trailing" secondItem="Stf-9K-Vtb" secondAttribute="trailing" constant="10" id="rsc-LH-byn"/>
|
||||
<constraint firstItem="DJa-9i-S0t" firstAttribute="bottom" secondItem="lNj-YX-wf8" secondAttribute="bottom" constant="10" id="wlC-yW-gQi"/>
|
||||
</constraints>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="cancelBtn" destination="eZR-Ff-N9f" id="PPd-sa-6YL"/>
|
||||
<outlet property="correectTempLabel" destination="2pv-Tc-pht" id="ukG-tt-i95"/>
|
||||
<outlet property="realTempLabel" destination="lNj-YX-wf8" id="fUK-QZ-LCX"/>
|
||||
<outlet property="deltaLabel" destination="UAM-uW-zwv" id="qBB-sB-GPz"/>
|
||||
<outlet property="realTempLabel" destination="lNj-YX-wf8" id="GAV-uq-TRE"/>
|
||||
<outlet property="textField" destination="tlB-Qi-mvx" id="aZk-GW-RxM"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-1346.376811594203" y="-94.419642857142847"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue