宠物笼间距处理和开关

Ifish.xcodeproj/project.pbxproj

@@ -16025,7 +16025,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16145,7 +16145,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m

@@ -201,6 +201,7 @@ static NSString *setTimerflag = @"SetTimerCell";
         NSLog(@"wendu str = %@",_wenduString);
         model.temperatureLabel = _wenduString;
         cell.temperaturelabel.text = model.temperatureLabel;
+        cell.temPSwitch.hidden=NO;
         [cell.temPSwitch addTarget:self action:@selector(xuTotempSwitchAction:) forControlEvents:UIControlEventTouchUpInside];
         if (self.dataModel) {
             Xuanduo2Model*model=self.dataModel;

Ifish/views/IfishPopView/PopCell.xib

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
-        <adaptation id="fullscreen"/>
-    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,11 +13,11 @@
             <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="43.5"/>
+                <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="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kSk-h6-YnO">
-                        <rect key="frame" x="64" y="11" width="127" height="21"/>
+                        <rect key="frame" x="56" y="11.5" width="127" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="127" id="81y-2B-Zb0"/>
                             <constraint firstAttribute="height" constant="21" id="hzd-lm-Qp7"/>
@@ -30,7 +27,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eA3-VM-svP">
-                        <rect key="frame" x="25" y="12" width="20" height="20"/>
+                        <rect key="frame" x="17" y="12" width="20" height="20"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="20" id="Gcl-bS-iVm"/>
                             <constraint firstAttribute="height" constant="20" id="TNA-4E-6bt"/>
@@ -40,7 +37,7 @@
                 <constraints>
                     <constraint firstItem="eA3-VM-svP" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="22t-bo-yZL"/>
                     <constraint firstItem="kSk-h6-YnO" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="6OQ-XM-Ijh"/>
-                    <constraint firstItem="eA3-VM-svP" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="17" id="J0p-V3-NNz"/>
+                    <constraint firstItem="eA3-VM-svP" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="17" id="J0p-V3-NNz"/>
                     <constraint firstItem="kSk-h6-YnO" firstAttribute="leading" secondItem="eA3-VM-svP" secondAttribute="trailing" constant="19" id="PPL-Zu-wLP"/>
                 </constraints>
             </tableViewCellContentView>