- 규칙 추가 오류 수정

OneCable/Classes/Definitions.h

@@ -32,16 +32,16 @@
 
 #ifndef PRODUCT_MODE
 
-//static NSString *kAPIServer = @"http://61.40.220.132:5007";     //개발
-static NSString *kAPIServer = @"http://61.40.220.23:7791";      //운영
-static NSString *kSocketServer = @"ws://61.40.220.23:7792";      //운영
-static NSString *kWebLinkServer = @"http://61.40.220.23:7794";      //운영
+static NSString *kAPIServer = @"http://61.40.220.23:7791";      //개발
+static NSString *kSocketServer = @"ws://61.40.220.23:7792";      //개발
+static NSString *kWebLinkServer = @"http://61.40.220.23:7794";      //개발
 
 #else //운영모드
 
-static NSString *kAPIServer = @"http://61.40.220.23:7791";      //운영
-static NSString *kSocketServer = @"ws://61.40.220.23:7792";      //운영
-static NSString *kWebLinkServer = @"http://61.40.220.23:7794";      //운영
+static NSString *kAPIServer = @"https://sp.kneet.io:7791";      //운영
+static NSString *kSocketServer = @"wss://sp.kneet.io:7792";      //운영
+static NSString *kWebLinkServer = @"https://sp.kneet.io:7794";      //운영
+
 
 #endif
 

OneCable/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.h

@@ -21,8 +21,12 @@
 
 
 @property (strong, nonatomic) IBOutletCollection(CustomCheckBox) NSArray *chkDays;
-@property (weak, nonatomic) IBOutlet CustomButton *btnHot;  // 이상 버튼
-@property (weak, nonatomic) IBOutlet CustomButton *btnCold;  // 이하 버튼
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnBelow;// 이하 버튼
+@property (weak, nonatomic) IBOutlet CustomButton *btnOver; // 이상 버튼
+@property (weak, nonatomic) IBOutlet CustomButton *btnZeroDegree;// 영상 / 영하 선택
+
+
 @property (weak, nonatomic) IBOutlet CustomLabel *lblCity;
 @property (weak, nonatomic) IBOutlet CustomLabel *lblHeat;
 @property (weak, nonatomic) IBOutlet CustomButton *btnSelect; // 지역 선택 버튼
@@ -33,7 +37,4 @@
 //methods
 - (id)initFromNib;
 
-- (IBAction)btnHotTouched:(id)sender;
-- (IBAction)btnColdTouched:(id)sender;
-
 @end

OneCable/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.m

@@ -121,8 +121,8 @@
     if (_externHeatTrigger.itemSubTypeCode && [_externHeatTrigger.itemSubTypeCode isEqualToString:ksItemSubTypeCodeHeat]) {//기존 데이터가 있을 경우,
         ItemSubModel *subItem = _externHeatTrigger.heats[0];
         
-        _btnHot.selected = [subItem.conditionTypeCode isEqualToString:ksConditionTypeCodeGreatOrEqual];
-        _btnCold.selected = !_btnHot.selected;
+        _btnOver.selected = [subItem.conditionTypeCode isEqualToString:ksConditionTypeCodeGreatOrEqual];
+        _btnBelow.selected = !_btnOver.selected;
         
         _temperature = subItem.cmdclsValue;
         _lblHeat.text = [NSString stringWithFormat:@"%@℃ 보다", _temperature];
@@ -133,7 +133,7 @@
         _externHeatTrigger.itemName = @"더울때 / 추울때";
         _externHeatTrigger.itemSubTypeCode = ksItemSubTypeCodeHeat;
         
-        _btnHot.selected = YES;
+        _btnOver.selected = YES;
         
         _temperature = @"0";
         _lblHeat.text = @"0℃ 보다";
@@ -176,7 +176,6 @@
         }
         
     } failure:^(id errorObject) {
-        
         JDErrorModel *error = (JDErrorModel *)errorObject;
         [[JDFacade facade] alert:error.errorMessage];
     }];
@@ -200,15 +199,10 @@
 }
 
 #pragma mark - UI Events
-
-- (IBAction)btnHotTouched:(id)sender {
-    _btnHot.selected = YES;
-    _btnCold.selected = NO;
-}
-
-- (IBAction)btnColdTouched:(id)sender {
-    _btnHot.selected = NO;
-    _btnCold.selected = YES;
+- (IBAction)btnActionBelowOver:(id)sender {
+    _btnBelow.selected = NO;
+    _btnOver.selected = NO;
+    ((CustomButton *)sender).selected = YES;
 }
 
 - (void)lblCityTouched:(id)sender {
@@ -267,7 +261,7 @@
     //externHeats
     subItem.sourceId = _weatherLocation.commonCode;
     subItem.sourceName = _weatherLocation.commonCodeName;
-    subItem.conditionTypeCode = _btnHot.selected ? ksConditionTypeCodeGreatOrEqual : ksConditionTypeCodeLessOrEqual;
+    subItem.conditionTypeCode = _btnOver.selected ? ksConditionTypeCodeGreatOrEqual : ksConditionTypeCodeLessOrEqual;
     subItem.cmdclsValue = _temperature;
     
     //set Days condition

OneCable/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.xib

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -54,7 +54,7 @@
                                                 <constraint firstAttribute="width" constant="25" id="LC3-nj-nYn"/>
                                             </constraints>
                                         </view>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="249" fixedFrame="YES" placeholderIntrinsicWidth="115" placeholderIntrinsicHeight="20" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9dY-hn-QRa" customClass="CustomLabel">
+                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="249" fixedFrame="YES" placeholderIntrinsicWidth="115" placeholderIntrinsicHeight="20" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9dY-hn-QRa" customClass="CustomLabel">
                                             <rect key="frame" x="226" y="18" width="56" height="20"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
@@ -193,7 +193,7 @@
                                                         </userDefinedRuntimeAttribute>
                                                     </userDefinedRuntimeAttributes>
                                                     <connections>
-                                                        <action selector="btnColdTouched:" destination="qLf-va-EAG" eventType="touchUpInside" id="jjx-o4-ViB"/>
+                                                        <action selector="btnActionBelowOver:" destination="qLf-va-EAG" eventType="touchUpInside" id="Fxg-tq-BZP"/>
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p2W-SQ-1PI" customClass="CustomButton">
@@ -219,7 +219,7 @@
                                                         </userDefinedRuntimeAttribute>
                                                     </userDefinedRuntimeAttributes>
                                                     <connections>
-                                                        <action selector="btnHotTouched:" destination="qLf-va-EAG" eventType="touchUpInside" id="h1o-rb-hZX"/>
+                                                        <action selector="btnActionBelowOver:" destination="qLf-va-EAG" eventType="touchUpInside" id="VOL-1q-AyD"/>
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lG2-aU-aoq" customClass="CustomButton">
@@ -248,7 +248,7 @@
                                                         </constraint>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="22"/>
-                                                    <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
+                                                    <textInputTraits key="textInputTraits" keyboardType="numberPad" secureTextEntry="YES"/>
                                                     <userDefinedRuntimeAttributes>
                                                         <userDefinedRuntimeAttribute type="rect" keyPath="rectForCapBackground">
                                                             <rect key="value" x="16" y="16" width="16" height="16"/>
@@ -747,12 +747,12 @@
                 </mask>
             </variation>
             <connections>
+                <outlet property="btnBelow" destination="IuS-hc-CS1" id="Wb9-qn-2Qu"/>
                 <outlet property="btnCancel" destination="EtP-9O-R3A" id="mr5-zY-bQM"/>
-                <outlet property="btnCold" destination="IuS-hc-CS1" id="Nhd-eq-761"/>
                 <outlet property="btnConfirm" destination="FKG-xS-HlM" id="zTF-29-eYq"/>
-                <outlet property="btnHot" destination="p2W-SQ-1PI" id="JWM-Ln-bgO"/>
-                <outlet property="btnPlus" destination="lG2-aU-aoq" id="gbc-ne-SoC"/>
+                <outlet property="btnOver" destination="p2W-SQ-1PI" id="mq6-gx-uVK"/>
                 <outlet property="btnSelect" destination="pKQ-To-uUX" id="6P5-5v-tYs"/>
+                <outlet property="btnZeroDegree" destination="lG2-aU-aoq" id="zdf-CP-zTY"/>
                 <outlet property="containerView" destination="3Np-sH-ysD" id="uJs-dG-r2k"/>
                 <outlet property="imgTitleBar" destination="iTm-Dl-e0z" id="xGJ-6h-kr0"/>
                 <outlet property="lblCity" destination="bQW-Tp-LY8" id="cE6-iw-bFc"/>

OneCable/Classes/ViewControllers/RuelsScreens/RulesAddViewController.m

@@ -202,6 +202,7 @@
 
 
 - (void)prepareViewDidLoad {
+    [self requestDeviceListForAction:ksItemTypeCodeTrigger];
     [self requestDeviceListForAction:ksItemTypeCodeAction];
 }
 
@@ -249,7 +250,6 @@
         }
         
     } failure:^(id errorObject) {
-        
         JDErrorModel *error = (JDErrorModel *)errorObject;
         [[JDFacade facade] alert:error.errorMessage];
     }];
@@ -326,7 +326,6 @@
             
         }
     } failure:^(id errorObject) {
-        
         JDErrorModel *error = (JDErrorModel *)errorObject;
         [[JDFacade facade] alert:error.errorMessage];
     }];
@@ -387,7 +386,6 @@
         }
         
     } failure:^(id errorObject) {
-        
         JDErrorModel *error = (JDErrorModel *)errorObject;
         [[JDFacade facade] alert:error.errorMessage];
     }];