Explorar o código

가스락 / 스마트 플러그 상태에 따른 이미지 변경로직 추가

KaRam Kim %!s(int64=8) %!d(string=hai) anos
pai
achega
ed6175d510

+ 8 - 2
OneCable/Classes/CommonUI/CommandClassControlDetailView.m

@@ -145,12 +145,18 @@ typedef void(^NodeCommandFailureBlock)(id error);
     _btnNode.userInteractionEnabled = NO;
     [_btnOn setImage:[_btnOn imageForState:_btnOn.state] forState:_btnOn.state];
 //    [_btnOff setImage:[_btnOff imageForState:_btnOff.state] forState:_btnOff.state];
+//    [_btnNode setImage:[_node imageForMandataryForState:UIControlStateNormal] forState:UIControlStateNormal];
+//    [_btnNode setImage:[_node imageForMandataryForState:UIControlStateSelected] forState:UIControlStateSelected];
+//    [_btnNode setImage:[_node imageForMandataryForState:UIControlStateDisabled] forState:UIControlStateDisabled];
+    _btnNode.selected = _isON;
+    
     if (_isON) {//OFF
-        
+//        [_btnNode setImage:[UIImage imageNamed:@"img_things_detail_06_01_plug_state_on"] forState:UIControlStateNormal];
         [_btnOn setImage:[UIImage imageNamed:@"img_things_detail_06_99_btn_off"] forState:UIControlStateNormal];
         [_btnOn addTarget:self action:@selector(btnOffTouched:) forControlEvents:UIControlEventTouchUpInside];
         
     } else {//ON
+//        [_btnNode setImage:[UIImage imageNamed:@"img_things_detail_06_01_plug_state_off"] forState:UIControlStateNormal];
         [_btnOn setImage:[UIImage imageNamed:@"img_things_detail_06_99_btn_on"] forState:UIControlStateNormal];
         [_btnOn addTarget:self action:@selector(btnOnTouched:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -243,7 +249,7 @@ typedef void(^NodeCommandFailureBlock)(id error);
     } else {
         [self valveIsLock:NO];
     }
-    
+    _btnNode.selected = _isOpened;
     [_btnClose setImage:[_btnClose imageForState:_btnClose.state] forState:_btnClose.state];
 }
 

+ 6 - 0
OneCable/Classes/CommonUI/CommandClassControlDetailView.xib

@@ -31,6 +31,8 @@
                         <constraint firstAttribute="width" constant="187" id="kJI-4Y-qt3"/>
                     </constraints>
                     <state key="normal" image="img_things_detail_06_01_plug_state_off"/>
+                    <state key="selected" image="img_things_detail_06_01_plug_state_on"/>
+                    <state key="highlighted" image="img_things_detail_06_01_plug_state_on"/>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="V7h-Sj-Ic5">
                     <rect key="frame" x="0.0" y="214" width="240" height="64"/>
@@ -198,6 +200,7 @@
                         <constraint firstAttribute="width" constant="184" id="l97-I3-WvW"/>
                     </constraints>
                     <state key="normal" image="img_things_detail_05_01_valve_state_locked"/>
+                    <state key="selected" image="img_things_detail_05_02_valve_state_unlocked"/>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DLG-gT-5sj">
                     <rect key="frame" x="0.0" y="211" width="240" height="64"/>
@@ -365,6 +368,7 @@
                         <constraint firstAttribute="width" constant="187" id="Zhy-to-73P"/>
                     </constraints>
                     <state key="normal" image="img_things_detail_05_01_valve_state_locked"/>
+                    <state key="selected" image="img_things_detail_05_02_valve_state_unlocked"/>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L8T-Es-XKx">
                     <rect key="frame" x="0.0" y="214" width="240" height="70"/>
@@ -502,7 +506,9 @@
         <image name="common_bg_list_02" width="1" height="1"/>
         <image name="img_progress_small_black_s01" width="55" height="55"/>
         <image name="img_things_detail_05_01_valve_state_locked" width="184" height="184"/>
+        <image name="img_things_detail_05_02_valve_state_unlocked" width="184" height="184"/>
         <image name="img_things_detail_06_01_plug_state_off" width="184" height="184"/>
+        <image name="img_things_detail_06_01_plug_state_on" width="184" height="184"/>
         <image name="img_things_detail_06_99_btn_off" width="60" height="60"/>
         <image name="img_things_detail_06_99_btn_off_disable" width="75" height="57"/>
         <image name="img_things_detail_06_99_btn_off_press" width="60" height="60"/>