170626 장치추가 ui 수정 중단

OneCable/Base.lproj/Rules.storyboard

@@ -505,7 +505,7 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TitleCellIdentifier" rowHeight="122" id="npa-uF-Yf4" customClass="RulesAddTitleTableViewCell">
-                                        <rect key="frame" x="0.0" y="55.5" width="320" height="122"/>
+                                        <rect key="frame" x="0.0" y="56" width="320" height="122"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="npa-uF-Yf4" id="w8Q-3D-60g">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="122"/>
@@ -618,7 +618,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TextCellIdentifier" rowHeight="122" id="UWu-XG-xCL" customClass="RulesAddTextTableViewCell">
-                                        <rect key="frame" x="0.0" y="177.5" width="320" height="122"/>
+                                        <rect key="frame" x="0.0" y="178" width="320" height="122"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UWu-XG-xCL" id="ELd-g1-RtG">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="122"/>
@@ -746,7 +746,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" reuseIdentifier="HeaderCellIdentifier" rowHeight="56" id="GQf-8g-8Yg" customClass="RulesAddHeaderTableViewCell">
-                                        <rect key="frame" x="0.0" y="299.5" width="320" height="56"/>
+                                        <rect key="frame" x="0.0" y="300" width="320" height="56"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GQf-8g-8Yg" id="FQR-fe-9TV">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="56"/>
@@ -825,7 +825,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="RulesCellIdentifier" rowHeight="80" id="vaP-ac-Z9g" userLabel="RulesCellIdentifier" customClass="RulesAddTableViewCell">
-                                        <rect key="frame" x="0.0" y="355.5" width="320" height="80"/>
+                                        <rect key="frame" x="0.0" y="356" width="320" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vaP-ac-Z9g" id="xBd-u0-d5d">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
@@ -943,7 +943,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ConditionHeaderCellIdentifier" rowHeight="56" id="etR-vE-hXf" userLabel="ConditionHeaderCellIdentifier" customClass="RulesAddConditionHeaderTableViewCell">
-                                        <rect key="frame" x="0.0" y="435.5" width="320" height="56"/>
+                                        <rect key="frame" x="0.0" y="436" width="320" height="56"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="etR-vE-hXf" id="Crb-BW-Ktg">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="56"/>
@@ -1026,7 +1026,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ConditionCellIdentifier" rowHeight="255" id="EfN-Wc-PbR" customClass="RulesAddConditionTableViewCell">
-                                        <rect key="frame" x="0.0" y="491.5" width="320" height="255"/>
+                                        <rect key="frame" x="0.0" y="492" width="320" height="255"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EfN-Wc-PbR" id="fkq-bd-sDg">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="255"/>
@@ -1053,7 +1053,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="FooterCellIdentifier" rowHeight="15" id="51C-7z-DOS" customClass="RulesAddFooterTableViewCell">
-                                        <rect key="frame" x="0.0" y="746.5" width="320" height="15"/>
+                                        <rect key="frame" x="0.0" y="747" width="320" height="15"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="51C-7z-DOS" id="xfZ-9V-Zbc">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="15"/>
@@ -1106,7 +1106,7 @@
                                         </state>
                                         <state key="highlighted" backgroundImage="common_button_left_bg_press"/>
                                         <connections>
-                                            <action selector="btnCancelTouched:" destination="Xxr-u0-LpV" eventType="touchUpInside" id="0gp-AF-N6I"/>
+                                            <action selector="btnCancelTouched:" destination="Xxr-u0-LpV" eventType="touchUpInside" id="6QA-gq-on9"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="160" placeholderIntrinsicHeight="70" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dJO-5a-BHI" customClass="CustomButton">
@@ -1920,7 +1920,7 @@
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <prototypes>
                                         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TitleCellIdentifier" rowHeight="122" id="2vg-Jc-Ptb" customClass="RulesAddTitleTableViewCell">
-                                            <rect key="frame" x="0.0" y="55.5" width="320" height="122"/>
+                                            <rect key="frame" x="0.0" y="56" width="320" height="122"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2vg-Jc-Ptb" id="wI5-yQ-NDE">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="121"/>
@@ -2058,7 +2058,7 @@
                                             </connections>
                                         </tableViewCell>
                                         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" reuseIdentifier="HeaderCellIdentifier" rowHeight="56" id="2gQ-5v-Yr8" customClass="RulesAddHeaderTableViewCell">
-                                            <rect key="frame" x="0.0" y="177.5" width="320" height="56"/>
+                                            <rect key="frame" x="0.0" y="178" width="320" height="56"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2gQ-5v-Yr8" id="nvH-bb-CMO">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
@@ -2160,7 +2160,7 @@
                                             </connections>
                                         </tableViewCell>
                                         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="RulesCellIdentifier" rowHeight="80" id="WRQ-1A-MiC" userLabel="RulesCellIdentifier" customClass="RulesAddTableViewCell">
-                                            <rect key="frame" x="0.0" y="233.5" width="320" height="80"/>
+                                            <rect key="frame" x="0.0" y="234" width="320" height="80"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WRQ-1A-MiC" id="JdM-QU-1yd">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="79"/>
@@ -2278,7 +2278,7 @@
                                             </connections>
                                         </tableViewCell>
                                         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PushCellIdentifier" rowHeight="123" id="bGg-87-WJD" customClass="RulesAddPushTableViewCell">
-                                            <rect key="frame" x="0.0" y="313.5" width="320" height="123"/>
+                                            <rect key="frame" x="0.0" y="314" width="320" height="123"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bGg-87-WJD" id="qtQ-5d-iIO">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="122"/>
@@ -2384,7 +2384,7 @@
                                             </connections>
                                         </tableViewCell>
                                         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ConditionHeaderCellIdentifier" rowHeight="56" id="OK8-qT-Hdq" userLabel="ConditionHeaderCellIdentifier" customClass="RulesAddConditionHeaderTableViewCell">
-                                            <rect key="frame" x="0.0" y="436.5" width="320" height="56"/>
+                                            <rect key="frame" x="0.0" y="437" width="320" height="56"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OK8-qT-Hdq" id="VUw-8W-37b">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
@@ -2491,7 +2491,7 @@
                                             </connections>
                                         </tableViewCell>
                                         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ConditionCellIdentifier" rowHeight="255" id="4cR-rN-9YB" customClass="RulesAddConditionTableViewCell">
-                                            <rect key="frame" x="0.0" y="492.5" width="320" height="255"/>
+                                            <rect key="frame" x="0.0" y="493" width="320" height="255"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4cR-rN-9YB" id="1ad-ts-3Nv">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="254"/>
@@ -2518,7 +2518,7 @@
                                             </connections>
                                         </tableViewCell>
                                         <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="FooterCellIdentifier" rowHeight="15" id="vqF-0S-exC" customClass="RulesAddFooterTableViewCell">
-                                            <rect key="frame" x="0.0" y="747.5" width="320" height="15"/>
+                                            <rect key="frame" x="0.0" y="748" width="320" height="15"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vqF-0S-exC" id="94x-P2-Jjl">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="14"/>
@@ -3742,7 +3742,7 @@
                                                                     <state key="normal" image="img_rule_list_playbtn_active"/>
                                                                 </button>
                                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AaP-dC-mWc">
-                                                                    <rect key="frame" x="248" y="11.5" width="56" height="32"/>
+                                                                    <rect key="frame" x="248" y="12" width="56" height="32"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="32" id="TMX-zt-Vpu"/>
                                                                         <constraint firstAttribute="width" constant="54" id="nTi-dr-Efd"/>

OneCable/Classes/JDFacade.m

@@ -940,6 +940,8 @@ static NSString *const ksKeychainArchiveData = @"_archiveData";
         }
     }
     
+    NSLog(@"getUrlWithCustAndGroupID str : %@, arr : %@", str, arr);
+    
     return [self getUrlWithArr:str arguments:arr];
 }
 

OneCable/Classes/ViewControllers/RuelsScreens/RulesAddViewController.m

@@ -211,7 +211,7 @@
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
-    [self viewWillDisappear:animated];
+    [super viewWillDisappear:animated];
     
     [self removeObserverKeyboard] ;
 }
@@ -1398,6 +1398,7 @@
      CustomButton *btnDelete = (CustomButton *)sender;
     
     ItemModel *item = btnDelete.value;
+    
     if ([item.itemSubTypeCode isEqualToString:ksItemSubTypeCodeDevice]) {//장치일 경우
         ItemSubModel *subItem = [item.subItems matchedObjectName:ksCustomRadioButtonStatus condition:YES];
         if (subItem) {
@@ -1498,6 +1499,12 @@
 
 
 
+- (IBAction)btnCancelTouched:(id)sender {
+    
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+
 
 #pragma mark - UI Events
 - (IBAction)btnConfirmTouched:(id)sender {
@@ -1577,10 +1584,6 @@
     }];
 }
 
-- (IBAction)btnCancelTouched:(id)sender {
-    [self dismissViewControllerAnimated:YES completion:nil];
-}
-
 #pragma mark - MemoryWarning
 - (void)didReceiveMemoryWarning
 {