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

绚多45f界面初步开发

This commit is contained in:
kai60 2022-05-05 10:07:20 +08:00
parent 75a7f09cac
commit 134f8a192b
33 changed files with 1959 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Ifish.xcodeproj/project.pbxproj
View File

@ -2293,6 +2293,15 @@
C0837A57244FF5510034FEC5 /* EGOCache.m in Sources */ = {isa = PBXBuildFile; fileRef = C0837A55244FF5500034FEC5 /* EGOCache.m */; };
C0837A58244FF5510034FEC5 /* EGOCache.h in Headers */ = {isa = PBXBuildFile; fileRef = C0837A56244FF5500034FEC5 /* EGOCache.h */; };
C089767E281BCB3A0098B5FA /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C089767D281BCB3A0098B5FA /* NetworkExtension.framework */; };
C08976AC282110280098B5FA /* arrow_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AB282110280098B5FA /* arrow_right@2x.png */; };
C08976B0282117930098B5FA /* 矩形.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AD282117920098B5FA /* 矩形.png */; };
C08976B1282117930098B5FA /* 矩形@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AE282117920098B5FA /* 矩形@2x.png */; };
C08976B2282117930098B5FA /* 矩形@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C08976AF282117930098B5FA /* 矩形@3x.png */; };
C08976B5282119310098B5FA /* XuanduoTimerSettingViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C08976B3282119300098B5FA /* XuanduoTimerSettingViewController.h */; };
C08976B6282119310098B5FA /* XuanduoTimerSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C08976B4282119300098B5FA /* XuanduoTimerSettingViewController.m */; };
C08976BA2821384A0098B5FA /* TimerTypeTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = C08976B72821384A0098B5FA /* TimerTypeTableViewCell.h */; };
C08976BB2821384A0098B5FA /* TimerTypeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C08976B82821384A0098B5FA /* TimerTypeTableViewCell.m */; };
C08976BC2821384A0098B5FA /* TimerTypeTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C08976B92821384A0098B5FA /* TimerTypeTableViewCell.xib */; };
C0B2F541244C6FE3001079AA /* PetStoresViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B2F53E244C6FE3001079AA /* PetStoresViewController.h */; };
C0B2F542244C6FE3001079AA /* PetStoresViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C0B2F53F244C6FE3001079AA /* PetStoresViewController.m */; };
C0B2F543244C6FE3001079AA /* PetStoresViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0B2F540244C6FE3001079AA /* PetStoresViewController.xib */; };
@ -5776,6 +5785,15 @@
C0837A55244FF5500034FEC5 /* EGOCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EGOCache.m; sourceTree = "<group>"; };
C0837A56244FF5500034FEC5 /* EGOCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EGOCache.h; sourceTree = "<group>"; };
C089767D281BCB3A0098B5FA /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
C08976AB282110280098B5FA /* arrow_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrow_right@2x.png"; path = "../../../../../arrow_right@2x.png"; sourceTree = "<group>"; };
C08976AD282117920098B5FA /* 矩形.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "矩形.png"; sourceTree = "<group>"; };
C08976AE282117920098B5FA /* 矩形@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "矩形@2x.png"; sourceTree = "<group>"; };
C08976AF282117930098B5FA /* 矩形@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "矩形@3x.png"; sourceTree = "<group>"; };
C08976B3282119300098B5FA /* XuanduoTimerSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoTimerSettingViewController.h; sourceTree = "<group>"; };
C08976B4282119300098B5FA /* XuanduoTimerSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XuanduoTimerSettingViewController.m; sourceTree = "<group>"; };
C08976B72821384A0098B5FA /* TimerTypeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TimerTypeTableViewCell.h; sourceTree = "<group>"; };
C08976B82821384A0098B5FA /* TimerTypeTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TimerTypeTableViewCell.m; sourceTree = "<group>"; };
C08976B92821384A0098B5FA /* TimerTypeTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TimerTypeTableViewCell.xib; sourceTree = "<group>"; };
C0B2F53E244C6FE3001079AA /* PetStoresViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PetStoresViewController.h; sourceTree = "<group>"; };
C0B2F53F244C6FE3001079AA /* PetStoresViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PetStoresViewController.m; sourceTree = "<group>"; };
C0B2F540244C6FE3001079AA /* PetStoresViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PetStoresViewController.xib; sourceTree = "<group>"; };
@ -8992,8 +9010,12 @@
882955A01DBDA3A100E9DDD7 /* ifishSetCell_back.png */,
FA08931D2275FCF10084A609 /* light_big@2x.png */,
FA0893092275DD770084A609 /* shajun_big@2x.png */,
C08976AB282110280098B5FA /* arrow_right@2x.png */,
882955A11DBDA3A100E9DDD7 /* secondSetCell.png */,
882955A21DBDA3A100E9DDD7 /* set_cellBack.png */,
C08976AD282117920098B5FA /* 矩形.png */,
C08976AE282117920098B5FA /* 矩形@2x.png */,
C08976AF282117930098B5FA /* 矩形@3x.png */,
FA0893052275DD4C0084A609 /* arrow_down@2x.png */,
FA0893192275FCEC0084A609 /* gas_big@2x.png */,
FA08931B2275FCEE0084A609 /* wave_big@2x.png */,
@ -9696,6 +9718,8 @@
883E76A81D48A5E50030E075 /* XuToSetViewController.h */,
883E76A91D48A5E50030E075 /* XuToSetViewController.m */,
C0CCEF69280D08C600604601 /* XuanduoSettingController.h */,
C08976B3282119300098B5FA /* XuanduoTimerSettingViewController.h */,
C08976B4282119300098B5FA /* XuanduoTimerSettingViewController.m */,
C0CCEF6A280D08C600604601 /* XuanduoSettingController.m */,
FA0892FB2275A1B30084A609 /* Xuanduo2SettingController.h */,
FA0892FC2275A1B30084A609 /* Xuanduo2SettingController.m */,
@ -9714,6 +9738,9 @@
FA0893142275F7CF0084A609 /* XuanduoSelectHeader.m */,
FA0893172275F7DF0084A609 /* XuanduoSelectHeader.xib */,
FA08930B2275F03F0084A609 /* PlusTableViewCell.h */,
C08976B72821384A0098B5FA /* TimerTypeTableViewCell.h */,
C08976B82821384A0098B5FA /* TimerTypeTableViewCell.m */,
C08976B92821384A0098B5FA /* TimerTypeTableViewCell.xib */,
FA08930C2275F03F0084A609 /* PlusTableViewCell.m */,
FA08930D2275F03F0084A609 /* PlusTableViewCell.xib */,
FAFC08202279CB5900B5A07B /* SetTimerCell.h */,
@ -12962,6 +12989,7 @@
CB484E0422B8C8C80075F050 /* bprint.h in Headers */,
FAFC08232279CB5900B5A07B /* SetTimerCell.h in Headers */,
CB7D6AA122953BEB0014E5C7 /* YYKVStorage.h in Headers */,
C08976BA2821384A0098B5FA /* TimerTypeTableViewCell.h in Headers */,
CB484DE522B8C8C80075F050 /* rational.h in Headers */,
CB484DE922B8C8C80075F050 /* avutil.h in Headers */,
3D1C508C221A9EDF0096AE43 /* Utils.h in Headers */,
@ -12982,6 +13010,7 @@
CB4820492334B46100A50C92 /* ConAquarNowWiFiPwdVC.h in Headers */,
3D1C5116221A9EE00096AE43 /* KTPhotoView+SDWebImage.h in Headers */,
3D1C50BB221A9EE00096AE43 /* RegisterResult.h in Headers */,
C08976B5282119310098B5FA /* XuanduoTimerSettingViewController.h in Headers */,
CBA6167F228F9AB100ED380D /* MASViewConstraint.h in Headers */,
C024B7A22379668B00509424 /* NSAttributedString+AvoidCrash.h in Headers */,
CB8B6468230F7F980032EB24 /* IfishMainInfoCell.h in Headers */,
@ -13452,6 +13481,7 @@
881477CA1E6F9D8500BFB79C /* signin_popup_obtain_button.png in Resources */,
88C1B2131DCC5A1400C2C99A /* personal_iocn_about@3x.png in Resources */,
88C1B21F1DCC5A1400C2C99A /* personal_iocn_scan@3x.png in Resources */,
C08976B1282117930098B5FA /* 矩形@2x.png in Resources */,
882956681DBDA3A200E9DDD7 /* minelook_bind.png in Resources */,
887492441E7A90D000CDA284 /* fishdoctor_iocn_price.png in Resources */,
882958181DC04ED200E9DDD7 /* equipment_longpoint@2x.png in Resources */,
@ -13588,6 +13618,7 @@
FAB3721322619DB70051E107 /* Xuanduo2fController.xib in Resources */,
CB4820892334E99700A50C92 /* IQKeyboardManager.bundle in Resources */,
889C14F31EA7397B00470F50 /* personal_iocn_set.png in Resources */,
C08976AC282110280098B5FA /* arrow_right@2x.png in Resources */,
883E78ED1D48A5E50030E075 /* ConnectWifiViewController.xib in Resources */,
8807074B1DDD40B40076F65A /* P2PShareViewsec2Cell.xib in Resources */,
8869B3AD1E6967DF0010F099 /* levelUp_yashark@3x.png in Resources */,
@ -13860,6 +13891,7 @@
887492371E7A90D000CDA284 /* fishdoctor_iocn_default_gold@3x.png in Resources */,
88645B221E83CF3500234DB4 /* Ifishbanner_shouye.jpg in Resources */,
88645B231E83CF3500234DB4 /* Ifishbanner_zixun.jpg in Resources */,
C08976BC2821384A0098B5FA /* TimerTypeTableViewCell.xib in Resources */,
881A1D2B1DD2C31500BA1AF4 /* kankanlook_icon_attention@3x.png in Resources */,
8867F5D51E656F9100AF021C /* rank_iocn_mark.png in Resources */,
88C1B1E21DC9AF3700C2C99A /* home_iocn_add@2x.png in Resources */,
@ -14165,6 +14197,7 @@
882956CE1DBDA3A300E9DDD7 /* ifishnav_dropview_list.png in Resources */,
CB48209A2335CB2200A50C92 /* SDK使用说明 in Resources */,
882956101DBDA3A100E9DDD7 /* neves0019.png in Resources */,
C08976B0282117930098B5FA /* 矩形.png in Resources */,
887492391E7A90D000CDA284 /* fishdoctor_iocn_default_twentygold@2x.png in Resources */,
882957291DBDA3A300E9DDD7 /* swimmingfish0024.png in Resources */,
88742C2F1D63F9AB0074F1F8 /* CertifyListViewFirstCell.xib in Resources */,
@ -14203,6 +14236,7 @@
882957A21DBDA3A400E9DDD7 /* xutobtn4_on@3x.png in Resources */,
3D3512DC2159C172009DDB0F /* IfishHotBarModifyNameVc.xib in Resources */,
8829577D1DBDA3A400E9DDD7 /* set_co2_off.png in Resources */,
C08976B2282117930098B5FA /* 矩形@3x.png in Resources */,
883283AB1EAF4E8200A47157 /* goldconvert_recordline@3x.png in Resources */,
8829581B1DC04ED200E9DDD7 /* equipment_point@2x.png in Resources */,
8867F5D71E656F9100AF021C /* rank_iocn_mark@3x.png in Resources */,
@ -15403,6 +15437,7 @@
C0EA8A1E23AF74F4003DC53B /* SDWebImageCompat.m in Sources */,
88F5EFAB1D48D08100CC7CAF /* AFHTTPSessionManager.m in Sources */,
886EAC581E2DC5BE00A4DF27 /* IFishShopsViewCell.m in Sources */,
C08976BB2821384A0098B5FA /* TimerTypeTableViewCell.m in Sources */,
88F5EFD21D48D08100CC7CAF /* MMProgressHUD+Class.m in Sources */,
3D1C510E221A9EE00096AE43 /* P2PPlayingbackVC.m in Sources */,
88F5EFB51D48D08100CC7CAF /* UIButton+AFNetworking.m in Sources */,
@ -15600,6 +15635,7 @@
8868FE561E66C8BC002F7F33 /* DengJiShuoMingViewTopCell.m in Sources */,
88F5EFB91D48D08100CC7CAF /* UIWebView+AFNetworking.m in Sources */,
C0D451D727955E8200609928 /* Define.m in Sources */,
C08976B6282119310098B5FA /* XuanduoTimerSettingViewController.m in Sources */,
8867F5B41E654DFD00AF021C /* DengJiView0Cell.m in Sources */,
883E785A1D48A5E50030E075 /* XuToLightModel.m in Sources */,
883E785E1D48A5E50030E075 /* CenterViewController.m in Sources */,

6
Ifish/Assets.xcassets/绚多设备/Contents.json
View File

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

23
Ifish/Assets.xcassets/绚多设备/normalImage.imageset/Contents.json vendored Normal file
View File

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

BIN
Ifish/Assets.xcassets/绚多设备/normalImage.imageset/normalImage.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 221 B

BIN
Ifish/Assets.xcassets/绚多设备/normalImage.imageset/normalImage@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

BIN
Ifish/Assets.xcassets/绚多设备/normalImage.imageset/normalImage@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 409 B

23
Ifish/Assets.xcassets/绚多设备/selectedImage.imageset/Contents.json vendored Normal file
View File

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

BIN
Ifish/Assets.xcassets/绚多设备/selectedImage.imageset/selectedImage.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 211 B

BIN
Ifish/Assets.xcassets/绚多设备/selectedImage.imageset/selectedImage@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 B

BIN
Ifish/Assets.xcassets/绚多设备/selectedImage.imageset/selectedImage@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 403 B

2
Ifish/Utinitys/IfishUtils/UINavigationBar+Background.m
View File

@ -164,7 +164,7 @@ static char overlayKey;
if (@available(iOS 15.0, *)) {
UINavigationBarAppearance *apperar = [self getNavgationAppearanceWithNavgationController:self];
apperar.backgroundImage = image;
apperar.backgroundImageContentMode=UIViewContentModeScaleAspectFill;
// apperar.backgroundImageContentMode=UIViewContentModeScaleAspectFill;
self.standardAppearance = apperar;
self.scrollEdgeAppearance = apperar;
}else{

4
Ifish/controllers/BaseVIewContorller/FatherController.m
View File

@ -17,7 +17,9 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.edgesForExtendedLayout=UIRectEdgeNone;
if (@available(iOS 15.0, *)) {
self.tableView.sectionHeaderTopPadding = 0;
}
[self setNav];

BIN
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/.DS_Store vendored
View File

Binary file not shown.

21
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/TimerTypeTableViewCell.h Normal file
View File

@ -0,0 +1,21 @@
//
// TimerTypeTableViewCell.h
// Ifish
//
// Created by 祝发冬 on 2022/5/3.
// Copyright © 2022 lianlian. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface TimerTypeTableViewCell : UITableViewCell
@property (weak, nonatomic) IBOutlet UIButton *timerbtn;
@property (weak, nonatomic) IBOutlet UIButton *recoverybtn;
@property (weak, nonatomic) IBOutlet UIButton *cyclebtn;
@end
NS_ASSUME_NONNULL_END

31
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/TimerTypeTableViewCell.m Normal file
View File

@ -0,0 +1,31 @@
//
// TimerTypeTableViewCell.m
// Ifish
//
// Created by 祝发冬 on 2022/5/3.
// Copyright © 2022 lianlian. All rights reserved.
//
#import "TimerTypeTableViewCell.h"
@implementation TimerTypeTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
[self.timerbtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(0);
make.top.mas_equalTo(0);
make.bottom.mas_equalTo(0);
make.width.mas_equalTo(120); }];
self.timerbtn.titleEdgeInsets=UIEdgeInsetsMake(10, -90, 10, 0);
self.timerbtn.titleLabel.font=[UIFont systemFontOfSize:15];
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end

55
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/TimerTypeTableViewCell.xib Normal file
View File

@ -0,0 +1,55 @@
<?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" rowHeight="40" id="KGk-i7-Jjw" customClass="TimerTypeTableViewCell">
<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>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N2e-hF-SlL" userLabel="timerbtn">
<rect key="frame" x="10" y="2" width="136" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" image="selectedImage" title="定时模式" titleAlignment="automatic"/>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xbU-qP-hXX" userLabel="recoverybtn">
<rect key="frame" x="203" y="-2" width="136" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" image="selectedImage" title="自恢复模式" titleAlignment="automatic"/>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yqV-t4-x09" userLabel="cyclebtn">
<rect key="frame" x="113" y="5" width="136" height="35"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" image="selectedImage" title="循环模式" titleAlignment="automatic"/>
</button>
</subviews>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<connections>
<outlet property="cyclebtn" destination="yqV-t4-x09" id="Ptm-mX-wAk"/>
<outlet property="recoverybtn" destination="xbU-qP-hXX" id="AG5-Cy-9Th"/>
<outlet property="timerbtn" destination="N2e-hF-SlL" id="6Nb-dL-mwl"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="68.973214285714278"/>
</tableViewCell>
</objects>
<resources>
<image name="selectedImage" width="30" height="30"/>
</resources>
</document>

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

@ -1047,7 +1047,7 @@
[self.navigationController pushViewController:_settingVC animated:YES];
}
else if (self.dataModel.gasPump.length) {
Xuanduo2SettingController *_settingVC = [[Xuanduo2SettingController alloc] init];
XuanduoSettingController *_settingVC = [[XuanduoSettingController alloc] init];
_settingVC.currentdevice = self.currentDevice;
_settingVC.dataModel = self.dataModel;
[self.navigationController pushViewController:_settingVC animated:YES];

16
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSectionHeaderView.xib
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<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="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<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>
@ -54,6 +52,7 @@
<state key="selected" backgroundImage="arrow_down.png"/>
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="Bqd-cM-emS" secondAttribute="trailing" id="6hx-ql-dN8"/>
@ -74,7 +73,6 @@
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="xEr-D1-d32" secondAttribute="bottom" id="yIp-jd-b3J"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<connections>
<outlet property="arrowBtn" destination="QEn-72-fxs" id="s69-z7-3MO"/>
<outlet property="titleLabel" destination="lXr-Qa-yTh" id="in6-uN-RA7"/>
@ -83,10 +81,10 @@
</view>
</objects>
<resources>
<image name="arrow_down.png" width="75" height="75"/>
<image name="arrow_up.png" width="75" height="75"/>
<image name="arrow_down.png" width="108" height="108"/>
<image name="arrow_up.png" width="108" height="108"/>
<image name="firstSetCell.png" width="1080" height="152"/>
<image name="ifishSetCell_back.png" width="1080" height="140"/>
<image name="xunhuan_big.png" width="75" height="75"/>
<image name="xunhuan_big.png" width="108" height="108"/>
</resources>
</document>

3
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.h
View File

@ -10,10 +10,11 @@
NS_ASSUME_NONNULL_BEGIN
@interface XuanduoSelectHeader : UIView
@interface XuanduoSelectHeader : UIImageView
+ (instancetype)shareHeaderView;
@property (weak, nonatomic) IBOutlet UIButton *controlBtn;
@property (weak, nonatomic) IBOutlet UIImageView *backImageView;
- (void)configWithImageName:(NSString *)name labelName:(NSString *)labelName;
@end

6
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.m
View File

@ -20,7 +20,11 @@
return [[NSBundle mainBundle] loadNibNamed:NSStringFromClass([XuanduoSelectHeader class]) owner:nil options:nil].lastObject;
}
-(void)awakeFromNib
{
self.userInteractionEnabled=YES;
}
- (void)configWithImageName:(NSString *)name labelName:(NSString *)labelName {
self.imageView.image = [UIImage imageNamed:name];
self.label.text = labelName;

17
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.xib
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<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="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<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>
@ -42,6 +40,7 @@
</constraints>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="AWf-ci-ZDG" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="K05-ks-Nmu"/>
@ -57,8 +56,8 @@
<constraint firstItem="FHB-eh-cwx" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="7" id="yuy-HW-myD"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<connections>
<outlet property="backImageView" destination="Y79-yA-YK5" id="fhz-RY-RVO"/>
<outlet property="controlBtn" destination="AWf-ci-ZDG" id="00H-o4-Evv"/>
<outlet property="imageView" destination="FHB-eh-cwx" id="6dI-4d-28Q"/>
<outlet property="label" destination="15T-Hk-end" id="rtd-jg-ouc"/>
@ -67,9 +66,9 @@
</view>
</objects>
<resources>
<image name="arrow_down.png" width="75" height="75"/>
<image name="arrow_up.png" width="75" height="75"/>
<image name="arrow_down.png" width="108" height="108"/>
<image name="arrow_up.png" width="108" height="108"/>
<image name="ifishSetCell_back.png" width="1080" height="140"/>
<image name="shajun_big.png" width="75" height="75"/>
<image name="shajun_big.png" width="108" height="108"/>
</resources>
</document>

210
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.m
View File

@ -28,6 +28,7 @@
#import "NSString+Add.h"
#import "XuToControlName.h"
#import "UserExtendataArchaver.h"
#import "XuanduoTimerSettingViewController.h"
#define kBtnTag 500
#define kSwitchBtnTag 600
@ -124,9 +125,9 @@ static NSString *setTimerflag = @"SetTimerCell";
- (void)setupTable {
_titieArr = @[@"预警设置",@"喂鱼设置",@"温度校准",@"功能说明"];
_titieArr = @[@"定时设置",@"喂鱼设置",@"温度校准",@"功能说明"];
_imgArr = @[@"定时",@"喂鱼",@"温度校准",@"功能说明"];
_imgArr = @[@"定时",@"喂鱼",@"温度校准",@"功能说明 "];
@ -144,8 +145,15 @@ static NSString *setTimerflag = @"SetTimerCell";
[self.timeDic setObject:dataArr forKey:_titieArr[i]];
}
self.tableView.backgroundColor=COLOR_MIAN;
self.tableView.estimatedRowHeight=0;
self.tableView.estimatedSectionFooterHeight=0;
self.tableView.estimatedSectionHeaderHeight=0;
self.tableView.separatorStyle=UITableViewCellSeparatorStyleNone;
self.tableView.separatorInset=UIEdgeInsetsMake(0, 15, 0, 15);
[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];
@ -165,16 +173,9 @@ static NSString *setTimerflag = @"SetTimerCell";
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 1;
}
return 0;
}
@ -183,6 +184,9 @@ static NSString *setTimerflag = @"SetTimerCell";
TemperatureSetCell *cell = [tableView dequeueReusableCellWithIdentifier:temperatureCellid];
TemperatureSetModel *model=[[TemperatureSetModel alloc]init];
model.title = @"预警设置";
cell.icon.hidden=NO;
cell.icon.image=[UIImage imageNamed:@"预警"];
cell.titileLabelLayout.constant=40;
cell.titleLabel.text = model.title;
NSLog(@"wendu str = %@",_wenduString);
model.temperatureLabel = _wenduString;
@ -235,7 +239,9 @@ static NSString *setTimerflag = @"SetTimerCell";
cell.huanshuiDaylabel.text=[NSString stringWithFormat:@"%ld天",(long)self.waterInfmodel.remindcycle];
}
cell.icon.hidden=NO;
cell.icon.image=[UIImage imageNamed:@"换水"];
cell.titileLabelLayout.constant=40;
return cell;
@ -363,22 +369,10 @@ static NSString *setTimerflag = @"SetTimerCell";
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;
}
return 0;
}
@ -386,22 +380,11 @@ static NSString *setTimerflag = @"SetTimerCell";
#pragma mark tableView 头视图和脚视图
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
if (section == 0) {
return 5;
}else if (section == 2){
return 0;
}else if (section >1){
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;
}else{
return 0;
}
}
@ -411,75 +394,42 @@ static NSString *setTimerflag = @"SetTimerCell";
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){
}else if(section > 1){
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;
}
[headerView.controlBtn setImage:[UIImage imageNamed:@"arrow_right"] forState:UIControlStateNormal];
// headerView.backImageView.image=[UIImage imageNamed:@"矩形"];
[headerView.controlBtn addTarget:self action:@selector(foldAction:) forControlEvents:UIControlEventTouchUpInside];
[headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]];
return headerView;
}else
{
UIView *oneHeader = [[UIView alloc] init];
oneHeader.backgroundColor = COLOR_MIAN;
return oneHeader;
}
return nil;
}
-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
{
CGFloat height=0;
if (section==1)
{
height=40;
}
return height;
}
- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
{
UIView *oneHeader = [[UIView alloc] init];
oneHeader.backgroundColor = COLOR_MIAN;
return oneHeader;
}
#pragma mark tableView 点击事件
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
@ -571,64 +521,12 @@ static NSString *setTimerflag = @"SetTimerCell";
}
#pragma mark - cell的折叠
- (void)foldAction:(UIButton *)btn {
if (_selectSection == btn.tag - kBtnTag) {
_selectSection = -1;
[self.tableView reloadData];
}else {
_selectSection = btn.tag - kBtnTag;
ReadTimerModel *readModel = [[ReadTimerModel alloc] init];
//杀菌不定时
if([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F]&&(_selectSection - 2)==2)
{
readModel.functionCode=@"19";//读取
}
else
{
readModel.functionCode=@"16";
}
readModel.sendmacId =self.currentdevice.macAddress;
readModel.resavemacId = self.currentdevice.macAddress;
readModel.crc16str=@"0000";
switch (_selectSection - 2) {
case 0: //循环泵 或 照明
readModel.selectorNumber = @"04";
if([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
{
readModel.selectorNumber=@"01";
}
break;
case 1: //增氧
readModel.selectorNumber = @"01";
if([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
{
readModel.selectorNumber=@"02";
}
break;
case 2: //灯光1
readModel.selectorNumber = @"02";
if([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
{
readModel.selectorNumber=@"03";
}
break;
case 3: //灯光2
readModel.selectorNumber = @"03";
break;
case 4: //造浪泵
readModel.selectorNumber = @"06";
break;
case 5: // 杀菌灯
readModel.selectorNumber = @"05";
break;
default:
break;
}
NSString*readString=[NSString stringWithFormat:@"%@%@%@",readModel.description,readModel.selectorNumber,readModel.crc16str];
NSData*readData=[dataContorl stringToHexData:readString];
[[Socketsingleton sharedInstance] soketWriteData:readData];
[_indicatorView startAnimating];
}
- (void)foldAction:(UIButton *)btn
{
XuanduoTimerSettingViewController *_settingVC = [[XuanduoTimerSettingViewController alloc] init];
_settingVC.currentdevice = self.currentdevice;
_settingVC.dataModel = self.dataModel;
[self.navigationController pushViewController:_settingVC animated:YES];
}
- (void)switchAction:(UIButton *)btn {

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

@ -0,0 +1,27 @@
//
// Xuanduo2SettingController.h
// Ifish
//
// Created by Alex on 2019/4/28.
// Copyright © 2019 lianlian. All rights reserved.
//
#import "FatherController.h"
#import "IfishDeviceInfo.h"
#include "xuanduo3fModel.h"
NS_ASSUME_NONNULL_BEGIN
@class Xuanduo2Model;
@interface XuanduoTimerSettingViewController : 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

1621
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Ifish/ifishImgSouce/.DS_Store vendored
View File

Binary file not shown.

BIN
Ifish/ifishImgSouce/XuToImg/矩形.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
Ifish/ifishImgSouce/XuToImg/矩形@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Ifish/ifishImgSouce/XuToImg/矩形@3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Ifish/views/.DS_Store vendored
View File

Binary file not shown.

2
Ifish/views/setViewCell/ChangeWaterCell.h
View File

@ -13,6 +13,8 @@
@property (weak, nonatomic) IBOutlet UILabel *huanshuiDaylabel;
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
@property (weak, nonatomic) IBOutlet UIButton *ChangeWaterSwitch;
@property (weak, nonatomic) IBOutlet UIImageView *icon;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *titileLabelLayout;
@end

21
Ifish/views/setViewCell/ChangeWaterCell.xib
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -15,7 +13,7 @@
<rect key="frame" x="0.0" y="0.0" width="329" height="48"/>
<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="329" height="47.5"/>
<rect key="frame" x="0.0" y="0.0" width="329" height="48"/>
<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="Mjj-aG-rUn">
@ -24,6 +22,13 @@
<color key="textColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bPu-W6-hDN" userLabel="icon">
<rect key="frame" x="18" y="11" width="30" height="26"/>
<constraints>
<constraint firstAttribute="height" constant="26" id="DHw-X9-Q02"/>
<constraint firstAttribute="width" constant="30" id="pvn-WA-1rq"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="设置换水周期" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B34-8H-MOY">
<rect key="frame" x="144" y="15.5" width="84" height="17"/>
<constraints>
@ -44,7 +49,9 @@
</subviews>
<constraints>
<constraint firstItem="hLN-Fh-Sqa" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="6qq-34-vRm"/>
<constraint firstItem="bPu-W6-hDN" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="7Mm-fk-9Zw"/>
<constraint firstItem="Mjj-aG-rUn" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="Bf2-uk-zoA"/>
<constraint firstItem="bPu-W6-hDN" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="18" id="In1-QK-w7N"/>
<constraint firstItem="B34-8H-MOY" firstAttribute="leading" secondItem="Mjj-aG-rUn" secondAttribute="trailing" constant="41" id="aXj-ot-8vV"/>
<constraint firstAttribute="trailingMargin" secondItem="hLN-Fh-Sqa" secondAttribute="trailing" constant="5" id="dd0-Ro-5Sl"/>
<constraint firstItem="hLN-Fh-Sqa" firstAttribute="leading" secondItem="B34-8H-MOY" secondAttribute="trailing" constant="20" id="o6f-MO-pkf"/>
@ -55,6 +62,8 @@
<connections>
<outlet property="ChangeWaterSwitch" destination="hLN-Fh-Sqa" id="lmL-w1-THT"/>
<outlet property="huanshuiDaylabel" destination="B34-8H-MOY" id="kZD-uO-VMn"/>
<outlet property="icon" destination="bPu-W6-hDN" id="eNc-Qh-bjW"/>
<outlet property="titileLabelLayout" destination="wcw-Bh-YPu" id="baa-Nn-Ljl"/>
<outlet property="titleLabel" destination="Mjj-aG-rUn" id="yhO-z2-3Pc"/>
</connections>
<point key="canvasLocation" x="480.80000000000001" y="280.65967016491754"/>

3
Ifish/views/setViewCell/TemperatureSetCell.h
View File

@ -16,5 +16,6 @@
//@property (weak, nonatomic) IBOutlet UISwitch *tempSwitch;
@property (weak, nonatomic) IBOutlet UIButton *temPSwitch;
@property (weak, nonatomic) IBOutlet UIImageView *icon;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *titileLabelLayout;
@end

30
Ifish/views/setViewCell/TemperatureSetCell.xib
View File

@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -16,17 +13,17 @@
<rect key="frame" x="0.0" y="0.0" width="336" height="51"/>
<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="336" height="50.5"/>
<rect key="frame" x="0.0" y="0.0" width="336" height="51"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ldH-Zi-Nv3">
<rect key="frame" x="197" y="14" width="38" height="18"/>
<rect key="frame" x="197" y="16" width="38" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.45490196078431372" green="0.45490196078431372" blue="0.45490196078431372" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0CU-uJ-mzK">
<rect key="frame" x="26" y="17" width="87" height="15"/>
<rect key="frame" x="26" y="17" width="87" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="87" id="uWM-a2-TdU"/>
</constraints>
@ -35,7 +32,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U9D-Nd-wVC">
<rect key="frame" x="255" y="8" width="60" height="33"/>
<rect key="frame" x="255" y="9" width="60" height="33"/>
<constraints>
<constraint firstAttribute="height" constant="33" id="QNA-2E-zkO"/>
<constraint firstAttribute="width" constant="60" id="jL2-Td-vJx"/>
@ -44,23 +41,34 @@
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hEW-4g-UYf" userLabel="icon">
<rect key="frame" x="18" y="12.5" width="30" height="26"/>
<constraints>
<constraint firstAttribute="height" constant="26" id="AJh-Gc-iCL"/>
<constraint firstAttribute="width" constant="30" id="ObA-ca-lzx"/>
</constraints>
</imageView>
</subviews>
<constraints>
<constraint firstAttribute="trailingMargin" secondItem="U9D-Nd-wVC" secondAttribute="trailing" constant="5" id="8FH-S6-oHu"/>
<constraint firstItem="0CU-uJ-mzK" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" constant="6" id="HxQ-9E-mPT"/>
<constraint firstItem="U9D-Nd-wVC" firstAttribute="leading" secondItem="ldH-Zi-Nv3" secondAttribute="trailing" constant="20" id="KiI-X3-nhs"/>
<constraint firstItem="U9D-Nd-wVC" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="U9v-iC-LZg"/>
<constraint firstItem="hEW-4g-UYf" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="eoc-KF-Con"/>
<constraint firstItem="0CU-uJ-mzK" firstAttribute="centerY" secondItem="U9D-Nd-wVC" secondAttribute="centerY" id="iGh-2k-hkq"/>
<constraint firstItem="hEW-4g-UYf" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="18" id="kiJ-Wg-QWq"/>
<constraint firstItem="0CU-uJ-mzK" firstAttribute="baseline" secondItem="ldH-Zi-Nv3" secondAttribute="baseline" id="tae-WZ-xS7"/>
<constraint firstItem="0CU-uJ-mzK" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="10" id="vt1-8R-3pK"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="icon" destination="hEW-4g-UYf" id="8Q2-e9-cwD"/>
<outlet property="temPSwitch" destination="U9D-Nd-wVC" id="JR3-5b-l1R"/>
<outlet property="temperaturelabel" destination="ldH-Zi-Nv3" id="eg6-Cm-jgD"/>
<outlet property="titileLabelLayout" destination="vt1-8R-3pK" id="CaU-Jo-Ukd"/>
<outlet property="titleLabel" destination="0CU-uJ-mzK" id="xFm-He-KNJ"/>
</connections>
<point key="canvasLocation" x="405" y="317.5"/>
<point key="canvasLocation" x="585.60000000000002" y="211.84407796101951"/>
</tableViewCell>
</objects>
<resources>