Преглед изворни кода

- 장치 추가, 삭제 UI 수정

TaeHyun пре 8 година
родитељ
комит
bfa5d08d19

+ 52 - 30
OneCable/Base.lproj/Things.storyboard

@@ -1414,7 +1414,7 @@
                                                 <rect key="frame" x="0.0" y="768" width="320" height="63"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4Vp-TW-mCg" id="Gxj-Z0-xe2">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="62.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SpF-Bb-9qN" userLabel="View - container">
@@ -1524,7 +1524,7 @@
                                                 <rect key="frame" x="0.0" y="831" width="320" height="31"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="O2N-bm-Hvc" id="k2Z-gW-HLc">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="31"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="30.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k8h-3L-ehd">
@@ -1785,7 +1785,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="320" height="154"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eAC-dN-TM9" id="wmw-7q-Ee8">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="154"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="153.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="afL-97-7bS">
@@ -2476,7 +2476,7 @@
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HOn-en-Nai">
                                                 <rect key="frame" x="0.0" y="160" width="276" height="177"/>
                                                 <subviews>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_01_smartgasvalve" translatesAutoresizingMaskIntoConstraints="NO" id="8yv-wM-F3e" customClass="CustomImageView">
+                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_01_smartgasvalve_wait" translatesAutoresizingMaskIntoConstraints="NO" id="8yv-wM-F3e" customClass="CustomImageView">
                                                         <rect key="frame" x="50" y="0.0" width="177" height="177"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="177" id="Ddu-N7-OTT"/>
@@ -2811,7 +2811,7 @@
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S32-YC-c26">
                                                 <rect key="frame" x="0.0" y="160" width="276" height="177"/>
                                                 <subviews>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_01_smartgasvalve" translatesAutoresizingMaskIntoConstraints="NO" id="vMA-0J-Eme" customClass="CustomImageView">
+                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_01_smartgasvalve_wait" translatesAutoresizingMaskIntoConstraints="NO" id="vMA-0J-Eme" customClass="CustomImageView">
                                                         <rect key="frame" x="50" y="0.0" width="177" height="177"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="177" id="9gU-v2-ajs"/>
@@ -3475,20 +3475,9 @@
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZW8-RY-jyi">
                                                 <rect key="frame" x="22" y="26" width="232" height="18"/>
-                                                <subviews>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_step_4" translatesAutoresizingMaskIntoConstraints="NO" id="8jT-ZK-WiR" customClass="CustomImageView">
-                                                        <rect key="frame" x="52" y="0.0" width="128" height="18"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="width" constant="128" id="ZUV-mu-hyy"/>
-                                                            <constraint firstAttribute="height" constant="18" id="svD-9V-q3C"/>
-                                                        </constraints>
-                                                    </imageView>
-                                                </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
-                                                    <constraint firstItem="8jT-ZK-WiR" firstAttribute="centerX" secondItem="ZW8-RY-jyi" secondAttribute="centerX" id="9US-T9-n8C"/>
                                                     <constraint firstAttribute="height" constant="18" id="VXa-AY-dsO"/>
-                                                    <constraint firstItem="8jT-ZK-WiR" firstAttribute="centerY" secondItem="ZW8-RY-jyi" secondAttribute="centerY" id="kpP-o9-QSO"/>
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1P1-Vg-gg4" userLabel="View - fail">
@@ -3718,7 +3707,6 @@
                     <connections>
                         <outlet property="btnCancel" destination="Cwt-6y-Gex" id="DTx-QR-cih"/>
                         <outlet property="btnRetry" destination="Wtj-92-LLc" id="fvN-fQ-B8G"/>
-                        <outlet property="imgStep" destination="8jT-ZK-WiR" id="JxR-Gj-t6X"/>
                         <outlet property="imgThings" destination="rKb-Jo-wRt" id="haE-au-nrR"/>
                         <outlet property="imgThingsFail" destination="jHS-hH-pc0" id="XGG-h0-dUx"/>
                         <outlet property="lblManufacturer" destination="eps-tq-0Bb" id="SSl-S7-Kzl"/>
@@ -4166,19 +4154,8 @@
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AJS-WX-2ke">
                                                 <rect key="frame" x="0.0" y="26" width="276" height="18"/>
-                                                <subviews>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_step_2" translatesAutoresizingMaskIntoConstraints="NO" id="Eec-sw-bqW" customClass="CustomImageView">
-                                                        <rect key="frame" x="74" y="0.0" width="128" height="18"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="18" id="1FN-qn-6Lu"/>
-                                                            <constraint firstAttribute="width" constant="128" id="rGv-3A-OZm"/>
-                                                        </constraints>
-                                                    </imageView>
-                                                </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
-                                                    <constraint firstItem="Eec-sw-bqW" firstAttribute="centerY" secondItem="AJS-WX-2ke" secondAttribute="centerY" id="SsN-Ws-Has"/>
-                                                    <constraint firstItem="Eec-sw-bqW" firstAttribute="centerX" secondItem="AJS-WX-2ke" secondAttribute="centerX" id="azR-hL-58c"/>
                                                     <constraint firstAttribute="height" constant="18" id="xBv-nN-TAS"/>
                                                 </constraints>
                                             </view>
@@ -4415,7 +4392,6 @@
                     <connections>
                         <outlet property="btnCancel" destination="8X0-hg-Utx" id="Va9-mU-oI2"/>
                         <outlet property="btnRetry" destination="luM-GW-Rbd" id="Zyz-V5-cs5"/>
-                        <outlet property="imgStep" destination="Eec-sw-bqW" id="o6V-XL-lwO"/>
                         <outlet property="imgThings" destination="cvZ-Hj-Txi" id="SX4-tI-7ib"/>
                         <outlet property="imgThingsFail" destination="cl6-p6-y41" id="zBz-Z4-JuM"/>
                         <outlet property="lblManufacturer" destination="Gft-ua-hT1" id="HJ1-p4-2yz"/>
@@ -5425,7 +5401,7 @@
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qPJ-jg-6Wx">
                                                 <rect key="frame" x="0.0" y="160" width="276" height="177"/>
                                                 <subviews>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_01_smartgasvalve" translatesAutoresizingMaskIntoConstraints="NO" id="rkj-Aa-uSu" customClass="CustomImageView">
+                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_things_product_addimg_01_smartgasvalve_wait" translatesAutoresizingMaskIntoConstraints="NO" id="rkj-Aa-uSu" customClass="CustomImageView">
                                                         <rect key="frame" x="50" y="0.0" width="177" height="177"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="177" id="1Vy-Q7-m0H"/>
@@ -5882,18 +5858,60 @@
                                                     <action selector="btnConfirmTouched:" destination="dDR-rR-1qy" eventType="touchUpInside" id="LCx-BW-niU"/>
                                                 </connections>
                                             </button>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GVx-NO-gRZ" userLabel="View - delFailButton">
+                                                <rect key="frame" x="0.0" y="0.0" width="276" height="50"/>
+                                                <subviews>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9B1-S8-rND" customClass="CustomButton">
+                                                        <rect key="frame" x="0.0" y="0.0" width="138" height="50"/>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                        <state key="normal" title="취소">
+                                                            <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                                        </state>
+                                                        <connections>
+                                                            <action selector="btnCancelTouched:" destination="dDR-rR-1qy" eventType="touchUpInside" id="NUG-uj-4kO"/>
+                                                        </connections>
+                                                    </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N45-s8-MYO" customClass="CustomButton">
+                                                        <rect key="frame" x="138" y="0.0" width="138" height="50"/>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                        <state key="normal" title="재시도">
+                                                            <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                                        </state>
+                                                        <connections>
+                                                            <action selector="btnRetryTouched:" destination="dDR-rR-1qy" eventType="touchUpInside" id="o1I-6S-f2u"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstItem="N45-s8-MYO" firstAttribute="top" secondItem="GVx-NO-gRZ" secondAttribute="top" id="Dmx-QZ-o6O"/>
+                                                    <constraint firstItem="N45-s8-MYO" firstAttribute="leading" secondItem="9B1-S8-rND" secondAttribute="trailing" id="KBa-Wa-fbO"/>
+                                                    <constraint firstAttribute="bottom" secondItem="9B1-S8-rND" secondAttribute="bottom" id="Wts-Cf-vqG"/>
+                                                    <constraint firstItem="9B1-S8-rND" firstAttribute="leading" secondItem="GVx-NO-gRZ" secondAttribute="leading" id="esM-40-hPS"/>
+                                                    <constraint firstItem="9B1-S8-rND" firstAttribute="top" secondItem="GVx-NO-gRZ" secondAttribute="top" id="h44-bN-frF"/>
+                                                    <constraint firstAttribute="bottom" secondItem="N45-s8-MYO" secondAttribute="bottom" id="jOz-fl-h8w"/>
+                                                    <constraint firstAttribute="trailing" secondItem="N45-s8-MYO" secondAttribute="trailing" id="pjj-F1-Aac"/>
+                                                    <constraint firstItem="9B1-S8-rND" firstAttribute="width" secondItem="N45-s8-MYO" secondAttribute="width" id="zRg-Kr-8ZK"/>
+                                                </constraints>
+                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="bottom" secondItem="z80-J0-axG" secondAttribute="bottom" id="7I9-Zx-K6g"/>
+                                            <constraint firstAttribute="trailing" secondItem="GVx-NO-gRZ" secondAttribute="trailing" id="EHJ-UF-YHi"/>
                                             <constraint firstAttribute="trailing" secondItem="z80-J0-axG" secondAttribute="trailing" id="GEl-RY-UZH"/>
                                             <constraint firstAttribute="trailing" secondItem="IxG-O5-Gfa" secondAttribute="trailing" id="TQh-cE-B4X"/>
                                             <constraint firstAttribute="bottom" secondItem="IxG-O5-Gfa" secondAttribute="bottom" id="Tme-fo-l0G"/>
                                             <constraint firstItem="IxG-O5-Gfa" firstAttribute="leading" secondItem="wrm-wP-xup" secondAttribute="leading" id="VMz-w2-3Hq"/>
                                             <constraint firstAttribute="height" constant="50" id="Vyy-65-Yi8"/>
+                                            <constraint firstItem="GVx-NO-gRZ" firstAttribute="top" secondItem="wrm-wP-xup" secondAttribute="top" id="Yma-YN-dkj"/>
                                             <constraint firstItem="z80-J0-axG" firstAttribute="top" secondItem="wrm-wP-xup" secondAttribute="top" id="ffm-U8-suw"/>
                                             <constraint firstItem="IxG-O5-Gfa" firstAttribute="top" secondItem="wrm-wP-xup" secondAttribute="top" id="g94-HV-nGo"/>
                                             <constraint firstItem="z80-J0-axG" firstAttribute="leading" secondItem="wrm-wP-xup" secondAttribute="leading" id="q0f-Mj-0rr"/>
+                                            <constraint firstAttribute="bottom" secondItem="GVx-NO-gRZ" secondAttribute="bottom" id="y5v-Hy-pHA"/>
+                                            <constraint firstItem="GVx-NO-gRZ" firstAttribute="leading" secondItem="wrm-wP-xup" secondAttribute="leading" id="y8Z-TV-oEJ"/>
                                         </constraints>
                                     </view>
                                 </subviews>
@@ -5966,7 +5984,9 @@
                         </variation>
                     </view>
                     <connections>
+                        <outlet property="btnCancel" destination="9B1-S8-rND" id="JRn-5R-bqA"/>
                         <outlet property="btnConfirm" destination="z80-J0-axG" id="Idn-iY-9Nm"/>
+                        <outlet property="btnRetry" destination="N45-s8-MYO" id="e8w-kb-51V"/>
                         <outlet property="imgStep" destination="YEV-zg-DAY" id="0xD-8Y-Lfh"/>
                         <outlet property="imgThings" destination="LyN-Qw-m2N" id="jq3-WB-g5W"/>
                         <outlet property="imgThingsFail" destination="pwU-wH-64x" id="vGc-2j-Zz9"/>
@@ -5975,6 +5995,7 @@
                         <outlet property="lblTitle" destination="uDI-d1-GdZ" id="9FL-JK-pvb"/>
                         <outlet property="maskView" destination="0tZ-33-1ez" id="OsC-Lw-5ca"/>
                         <outlet property="popUpView" destination="VBO-fu-8oF" id="b3O-wL-23H"/>
+                        <outlet property="viewRetry" destination="GVx-NO-gRZ" id="Cfl-uv-cTG"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ttq-sY-RIk" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -6020,6 +6041,7 @@
         <image name="img_things_list_btn_onoff_on" width="45" height="45"/>
         <image name="img_things_product_01_smartgasvalve" width="124" height="124"/>
         <image name="img_things_product_addimg_01_smartgasvalve" width="177" height="177"/>
+        <image name="img_things_product_addimg_01_smartgasvalve_wait" width="177" height="177"/>
         <image name="img_things_product_addimg_03_smartplug" width="177" height="177"/>
         <image name="img_things_product_addimg_del_step_1" width="55" height="18"/>
         <image name="img_things_product_addimg_del_step_2" width="55" height="18"/>

+ 0 - 1
OneCable/Classes/ViewControllers/ThingsScreens/ThingsAddFailViewController.h

@@ -17,7 +17,6 @@
 @property (weak, nonatomic) IBOutlet UIView *maskView;
 @property (weak, nonatomic) IBOutlet UIView *popView;
 
-@property (weak, nonatomic) IBOutlet CustomImageView *imgStep; // 스텝 이미지
 @property (weak, nonatomic) IBOutlet CustomLabel *lblTitle; // 장치 타이틀
 @property (weak, nonatomic) IBOutlet CustomImageView *imgThingsFail; // 실패 이미지
 @property (weak, nonatomic) IBOutlet CustomImageView *imgThings; // 장치 이미지

+ 11 - 1
OneCable/Classes/ViewControllers/ThingsScreens/ThingsAddIncludeViewController.m

@@ -24,7 +24,17 @@
     NSInteger _elapsedSeconds;
 }
 @end
+// 가스밸브 타이틀 : 가스 밸브 센서 추가
+// 가스밸브 장치초기화 코멘트 : 밸브를 열림 상태에 두고 "위로" 버튼을 비프음이 날 때까지 5초 이상 누르세요.
+// 가스밸브 이미지 명 : img_things_product_addimg_01_smartgasvalve_wait
 
+// 도어센서 타이틀 : 도어 센서 추가
+// 도어센서 장치초기화 코멘트 : 센서 아래 버튼을 1회 누른 후 LED가 깜빡임을 멈추면 1회 더 누르세요.
+// 도어센서 이미지 명 : img_things_product_addimg_02_mutisensor_door_wait
+
+// 스마트플러그 타이틀 : 스마트 플러그 추가
+// 스마트플러그 장치초기화 코멘트 : 위에 버튼에 빨간 불이 깜빡일 때까지 5초 이상 누르세요.
+// 스마트플러그 이미지 명 : img_things_product_addimg_03_smartplug_wait
 
 #pragma mark - Class Definition
 
@@ -228,4 +238,4 @@
 
 
 
-@end
+@end

+ 0 - 1
OneCable/Classes/ViewControllers/ThingsScreens/ThingsAddInitFailViewController.h

@@ -17,7 +17,6 @@
 @property (weak, nonatomic) IBOutlet UIView *maskView;
 @property (weak, nonatomic) IBOutlet UIView *popUpView;
 
-@property (weak, nonatomic) IBOutlet CustomImageView *imgStep; // 스텝 이미지
 @property (weak, nonatomic) IBOutlet CustomLabel *lblTitle; // 장치 타이틀
 @property (weak, nonatomic) IBOutlet CustomImageView *imgThingsFail; // 실패 이미지
 @property (weak, nonatomic) IBOutlet CustomLabel *lblManufacturer; // 제조사 명

+ 3 - 4
OneCable/Classes/ViewControllers/ThingsScreens/ThingsAddInitViewController.m

@@ -16,16 +16,15 @@
 @end
 // 가스밸브 타이틀 : 가스 밸브 센서 초기화
 // 가스밸브 장치초기화 코멘트 : 밸브를 열림 상태에 두고 "위로" 버튼을 비프음이 날 때까지 5초 이상 누르세요.
-
-// 가스밸브 이미지 명 : img_things_product_addimg_01_smartgasvalve
+// 가스밸브 이미지 명 : img_things_product_addimg_01_smartgasvalve_wait
 
 // 도어센서 타이틀 : 도어 센서 초기화
 // 도어센서 장치초기화 코멘트 : 센서 아래 버튼을 1회 누른 후 LED가 깜빡임을 멈추면 1회 더 누르세요.
-// 도어센서 이미지 명 : img_things_product_addimg_02_mutisensor_door
+// 도어센서 이미지 명 : img_things_product_addimg_02_mutisensor_door_wait
 
 // 스마트플러그 타이틀 : 스마트 플러그 초기화
 // 스마트플러그 장치초기화 코멘트 : 위에 버튼에 빨간 불이 깜빡일 때까지 5초 이상 누르세요.
-// 스마트플러그 이미지 명 : img_things_product_addimg_03_smartplug
+// 스마트플러그 이미지 명 : img_things_product_addimg_03_smartplug_wait
 
 @implementation ThingsAddInitViewController
 

+ 1 - 0
OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelPlugViewController.m

@@ -11,6 +11,7 @@
 #import "CustomButton.h"
 #import "CustomImageView.h"
 
+// 오프라인 장치 강제 삭제
 @interface ThingsDelPlugViewController ()
 
 @end

+ 5 - 1
OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveCompleteViewController.h

@@ -24,7 +24,11 @@
 @property (weak, nonatomic) IBOutlet CustomImageView *imgThingsFail; // 실패 이미지
 @property (weak, nonatomic) IBOutlet CustomImageView *imgThings; // 장치 이미지
 @property (weak, nonatomic) IBOutlet CustomLabel *lblManufacturer; // 제조사 명
-@property (weak, nonatomic) IBOutlet CustomButton *btnConfirm; // 확인
+@property (weak, nonatomic) IBOutlet CustomButton *btnConfirm; // 확인 버튼
+@property (weak, nonatomic) IBOutlet UIView *viewRetry; // 취소,재시도 버튼 뷰
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel; // 취소 버튼
+@property (weak, nonatomic) IBOutlet CustomButton *btnRetry; // 재시도 버튼
+
 
 
 @end

+ 10 - 0
OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveCompleteViewController.m

@@ -26,7 +26,17 @@
     [super didReceiveMemoryWarning];
 
 }
+
+
 - (IBAction)btnConfirmTouched:(id)sender {
     
+}
+
+- (IBAction)btnCancelTouched:(id)sender {
+    
+}
+
+- (IBAction)btnRetryTouched:(id)sender {
+    
 }
 @end

+ 11 - 0
OneCable/Classes/ViewControllers/ThingsScreens/ThingsDelValveStartViewController.m

@@ -14,6 +14,17 @@
 @interface ThingsDelValveStartViewController ()
 
 @end
+// 가스밸브 타이틀 : 가스 밸브 센서 추가
+// 가스밸브 장치초기화 코멘트 : 밸브를 열림 상태에 두고 "위로" 버튼을 비프음이 날 때까지 5초 이상 누르세요.
+// 가스밸브 이미지 명 : img_things_product_addimg_01_smartgasvalve_wait
+
+// 도어센서 타이틀 : 도어 센서 추가
+// 도어센서 장치초기화 코멘트 : 센서 아래 버튼을 1회 누른 후 LED가 깜빡임을 멈추면 1회 더 누르세요.
+// 도어센서 이미지 명 : img_things_product_addimg_02_mutisensor_door_wait
+
+// 스마트플러그 타이틀 : 스마트 플러그 추가
+// 스마트플러그 장치초기화 코멘트 : 위에 버튼에 빨간 불이 깜빡일 때까지 5초 이상 누르세요.
+// 스마트플러그 이미지 명 : img_things_product_addimg_03_smartplug_wait
 
 @implementation ThingsDelValveStartViewController
 

+ 3 - 0
OneCable/Classes/ViewControllers/ThingsScreens/ThingsDetailViewController.m

@@ -52,6 +52,9 @@
  도어센서 on  : img_things_detail_01_02_sensor_door_open
  도어센서 off : img_things_detail_01_02_sensor_door_close
  
+ 장치 열림,켜짐 : img_things_detail_06_99_btn_off ,~off_press
+ 장치 닫힘,꺼짐 : img_things_detail_06_99_btn_on ,~on_press
+ 
  **/
 
 @implementation ThingsDetailTitleTableViewCell