06.20 메타 디자인 수정

OneCable/Base.lproj/HomeHub.storyboard

@@ -1523,32 +1523,32 @@
                                         <rect key="frame" x="0.0" y="258" width="320" height="260"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <prototypes>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="HubSearchCellIdentifier" rowHeight="108" id="6cj-yj-2Wn" customClass="HomeHubSearchTableViewCell">
-                                                <rect key="frame" x="0.0" y="28" width="320" height="108"/>
+                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="HubSearchCellIdentifier" rowHeight="107" id="6cj-yj-2Wn" customClass="HomeHubSearchTableViewCell">
+                                                <rect key="frame" x="0.0" y="28" width="320" height="107"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6cj-yj-2Wn" id="0Fx-Wb-Tt1">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="108"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="106"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MX4-Pn-O4A">
-                                                            <rect key="frame" x="0.0" y="0.0" width="320" height="106"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="375" height="105"/>
                                                             <subviews>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hHg-bg-qIh">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="15" height="106"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="15" height="105"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="15" id="QWx-eD-vHD"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZM5-3e-3N1">
-                                                                    <rect key="frame" x="305" y="0.0" width="15" height="106"/>
+                                                                    <rect key="frame" x="360" y="0.0" width="15" height="105"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="15" id="WAs-IS-VGS"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Udv-mz-RQO">
-                                                                    <rect key="frame" x="275" y="38" width="30" height="30"/>
+                                                                    <rect key="frame" x="330" y="38" width="30" height="30"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="30" id="k9W-ai-7Du"/>
                                                                         <constraint firstAttribute="height" constant="30" id="xNa-YW-u6t"/>
@@ -1557,32 +1557,32 @@
                                                                     <state key="selected" image="common_list_checked"/>
                                                                 </button>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bwQ-Rv-qR9">
-                                                                    <rect key="frame" x="15" y="0.0" width="260" height="30"/>
+                                                                    <rect key="frame" x="15" y="0.0" width="315" height="30"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="30" id="JrC-l0-9cY"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wac-oL-FV1">
-                                                                    <rect key="frame" x="15" y="76" width="260" height="30"/>
+                                                                    <rect key="frame" x="15" y="75" width="315" height="30"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="30" id="19c-ag-6qK"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1층 홈허브" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pEZ-CE-1Ce" customClass="CustomLabel">
-                                                                    <rect key="frame" x="15" y="30" width="260" height="22"/>
+                                                                    <rect key="frame" x="15" y="30" width="315" height="44"/>
                                                                     <constraints>
-                                                                        <constraint firstAttribute="height" constant="22" id="H0u-NP-Pvw"/>
+                                                                        <constraint firstAttribute="height" constant="44" id="H0u-NP-Pvw"/>
                                                                     </constraints>
                                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="S/N : 홈허브 시리얼 번호 출력" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UMY-bD-Xqr" customClass="CustomLabel">
-                                                                    <rect key="frame" x="15" y="56" width="260" height="20"/>
+                                                                    <rect key="frame" x="15" y="75" width="315" height="0.0"/>
                                                                     <constraints>
-                                                                        <constraint firstAttribute="height" constant="20" id="lUx-1O-u9p"/>
+                                                                        <constraint firstAttribute="height" id="lUx-1O-u9p"/>
                                                                     </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                                     <color key="textColor" red="0.53333333333333333" green="0.5607843137254902" blue="0.6588235294117647" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1614,10 +1614,10 @@
                                                             </constraints>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pnn-xL-zK2" userLabel="View - line">
-                                                            <rect key="frame" x="0.0" y="106" width="320" height="1"/>
+                                                            <rect key="frame" x="0.0" y="105" width="375" height="1"/>
                                                             <subviews>
                                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bg_line_01" translatesAutoresizingMaskIntoConstraints="NO" id="bcE-y8-IdS">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="1"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
                                                                 </imageView>
                                                             </subviews>
                                                             <color key="backgroundColor" red="0.94509803920000002" green="0.94509803920000002" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1731,13 +1731,34 @@
                                             </mask>
                                         </variation>
                                     </view>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="McC-bW-SOV">
+                                        <rect key="frame" x="133" y="257" width="55" height="55"/>
+                                        <subviews>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loading_count" translatesAutoresizingMaskIntoConstraints="NO" id="aL0-ZK-pP2" customClass="CustomImageView">
+                                                <rect key="frame" x="0.0" y="0.0" width="55" height="55"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="55" id="FRl-11-2fs"/>
+                                                    <constraint firstAttribute="height" constant="55" id="q3d-3j-IaL"/>
+                                                </constraints>
+                                            </imageView>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        <constraints>
+                                            <constraint firstItem="aL0-ZK-pP2" firstAttribute="centerX" secondItem="McC-bW-SOV" secondAttribute="centerX" id="JrN-8o-Rdu"/>
+                                            <constraint firstAttribute="height" constant="55" id="bvC-7i-kcE"/>
+                                            <constraint firstItem="aL0-ZK-pP2" firstAttribute="centerY" secondItem="McC-bW-SOV" secondAttribute="centerY" id="ecP-Dh-u6L"/>
+                                            <constraint firstAttribute="width" constant="55" id="gf1-b0-dMV"/>
+                                        </constraints>
+                                    </view>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
+                                    <constraint firstItem="McC-bW-SOV" firstAttribute="centerX" secondItem="Nza-l2-WLK" secondAttribute="centerX" id="0mV-l9-uQ8"/>
                                     <constraint firstItem="w47-JU-kZw" firstAttribute="top" secondItem="3Oo-VZ-Vls" secondAttribute="bottom" id="2rr-R8-mXq"/>
                                     <constraint firstAttribute="trailing" secondItem="oEp-gC-1r6" secondAttribute="trailing" id="4n4-ST-MXn"/>
                                     <constraint firstAttribute="trailing" secondItem="y3x-H6-D31" secondAttribute="trailing" id="5NF-dt-5UO"/>
                                     <constraint firstItem="Kys-uM-q23" firstAttribute="top" secondItem="ouG-uq-96K" secondAttribute="bottom" id="6gg-KZ-P5m"/>
+                                    <constraint firstItem="McC-bW-SOV" firstAttribute="centerY" secondItem="Nza-l2-WLK" secondAttribute="centerY" id="6vR-NE-HGD"/>
                                     <constraint firstItem="oEp-gC-1r6" firstAttribute="top" secondItem="fo7-Nf-bdH" secondAttribute="bottom" id="93T-xP-bLJ"/>
                                     <constraint firstAttribute="trailing" secondItem="ouG-uq-96K" secondAttribute="trailing" id="CNW-IE-R6q"/>
                                     <constraint firstItem="w47-JU-kZw" firstAttribute="leading" secondItem="Nza-l2-WLK" secondAttribute="leading" id="EYt-yx-d6G"/>
@@ -1780,6 +1801,7 @@
                     <connections>
                         <outlet property="btnCancel" destination="jfh-Py-dRs" id="99f-sC-ddx"/>
                         <outlet property="btnNext" destination="zDd-Em-LRS" id="oqk-Kt-dcy"/>
+                        <outlet property="imgvLoading" destination="aL0-ZK-pP2" id="nhY-tH-71l"/>
                         <outlet property="tableView" destination="w47-JU-kZw" id="Nux-hs-Qh1"/>
                     </connections>
                 </viewController>
@@ -1979,7 +2001,7 @@
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="etA-PJ-tOr" customClass="CustomButton">
-                                        <rect key="frame" x="100" y="250" width="120" height="35"/>
+                                        <rect key="frame" x="101" y="250" width="120" height="35"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="35" id="YTp-2A-xrh"/>
                                             <constraint firstAttribute="width" constant="120" id="fQM-Fs-p2M"/>
@@ -2212,7 +2234,7 @@
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yjV-e8-pJt" customClass="CustomButton">
-                                        <rect key="frame" x="100" y="326" width="120" height="35"/>
+                                        <rect key="frame" x="101" y="326" width="120" height="35"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="120" id="PHq-CV-NDv"/>
                                             <constraint firstAttribute="height" constant="35" id="TyA-vL-Uho"/>
@@ -2773,11 +2795,11 @@
                                                 <rect key="frame" x="0.0" y="28" width="320" height="101"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rNM-7T-Zew" id="J6m-IL-6Yb">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="101"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R3c-rA-Wfq">
-                                                            <rect key="frame" x="0.0" y="0.0" width="320" height="99"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
                                                             <subviews>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1sY-Sw-MKe">
                                                                     <rect key="frame" x="0.0" y="0.0" width="15" height="99"/>
@@ -2787,14 +2809,14 @@
                                                                     </constraints>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qyQ-iw-oZX">
-                                                                    <rect key="frame" x="305" y="0.0" width="15" height="99"/>
+                                                                    <rect key="frame" x="360" y="0.0" width="15" height="99"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="15" id="QRh-BZ-Lk3"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wlr-ph-9TM">
-                                                                    <rect key="frame" x="275" y="35" width="30" height="30"/>
+                                                                    <rect key="frame" x="330" y="35" width="30" height="30"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="30" id="FSc-XV-yAh"/>
                                                                         <constraint firstAttribute="width" constant="30" id="aOk-sI-eNK"/>
@@ -2803,21 +2825,21 @@
                                                                     <state key="selected" image="common_list_checked"/>
                                                                 </button>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xo9-0I-X8F">
-                                                                    <rect key="frame" x="15" y="0.0" width="260" height="30"/>
+                                                                    <rect key="frame" x="15" y="0.0" width="315" height="30"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="30" id="XrA-Fi-fwN"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bjA-Nm-C9i">
-                                                                    <rect key="frame" x="15" y="69" width="260" height="30"/>
+                                                                    <rect key="frame" x="15" y="69" width="315" height="30"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="30" id="lIa-4c-OHY"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1층 홈허브" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jK3-zu-ap5" customClass="CustomLabel">
-                                                                    <rect key="frame" x="57" y="30" width="218" height="39"/>
+                                                                    <rect key="frame" x="57" y="30" width="273" height="39"/>
                                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
@@ -2856,10 +2878,10 @@
                                                             </constraints>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7wQ-gJ-kV2" userLabel="View - line">
-                                                            <rect key="frame" x="0.0" y="99" width="320" height="1"/>
+                                                            <rect key="frame" x="0.0" y="99" width="375" height="1"/>
                                                             <subviews>
                                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bg_line_01" translatesAutoresizingMaskIntoConstraints="NO" id="lVY-KD-N46">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="1"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
                                                                 </imageView>
                                                             </subviews>
                                                             <color key="backgroundColor" red="0.94509803920000002" green="0.94509803920000002" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -2974,19 +2996,19 @@
                                         </variation>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="68k-rs-2OV">
-                                        <rect key="frame" x="132" y="256" width="55" height="55"/>
+                                        <rect key="frame" x="133" y="257" width="55" height="55"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loading_count" translatesAutoresizingMaskIntoConstraints="NO" id="ciB-RZ-STU" customClass="CustomImageView">
                                                 <rect key="frame" x="0.0" y="0.0" width="55" height="55"/>
                                                 <constraints>
+                                                    <constraint firstAttribute="height" constant="55" id="8oF-gO-Xdi"/>
                                                     <constraint firstAttribute="width" constant="55" id="MSt-zv-fov"/>
                                                 </constraints>
                                             </imageView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstAttribute="bottom" secondItem="ciB-RZ-STU" secondAttribute="bottom" id="GqE-vH-8Na"/>
-                                            <constraint firstItem="ciB-RZ-STU" firstAttribute="top" secondItem="68k-rs-2OV" secondAttribute="top" id="Wce-l0-zLT"/>
+                                            <constraint firstItem="ciB-RZ-STU" firstAttribute="centerY" secondItem="68k-rs-2OV" secondAttribute="centerY" id="Nbt-Fw-2xI"/>
                                             <constraint firstAttribute="height" constant="55" id="ptc-9j-oCs"/>
                                             <constraint firstItem="ciB-RZ-STU" firstAttribute="centerX" secondItem="68k-rs-2OV" secondAttribute="centerX" id="uJl-Ch-em6"/>
                                             <constraint firstAttribute="width" constant="55" id="ysg-VS-5Lf"/>
@@ -3228,7 +3250,7 @@
                                         <rect key="frame" x="0.0" y="116" width="320" height="50"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bullet_alert_on" translatesAutoresizingMaskIntoConstraints="NO" id="LRy-JX-yMg">
-                                                <rect key="frame" x="135" y="0.0" width="50" height="50"/>
+                                                <rect key="frame" x="136" y="0.0" width="50" height="50"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="50" id="1y0-Gk-nA1"/>
                                                 </constraints>
@@ -3243,7 +3265,7 @@
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gDd-mF-TxN" customClass="CustomButton">
-                                        <rect key="frame" x="100" y="255" width="120" height="35"/>
+                                        <rect key="frame" x="101" y="255" width="120" height="35"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="35" id="JVb-DP-KLm"/>
                                             <constraint firstAttribute="width" constant="120" id="dxK-Lq-Gcu"/>
@@ -3476,7 +3498,7 @@
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d0C-YF-cCi" customClass="CustomButton">
-                                        <rect key="frame" x="100" y="422" width="120" height="35"/>
+                                        <rect key="frame" x="101" y="422" width="120" height="35"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="120" id="FAH-On-ao6"/>
                                             <constraint firstAttribute="height" constant="35" id="ydj-4W-UJy"/>
@@ -3582,7 +3604,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Am2-Zt-8r5">
-                                        <rect key="frame" x="132.5" y="256" width="55" height="55"/>
+                                        <rect key="frame" x="133" y="257" width="55" height="55"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loading_count" translatesAutoresizingMaskIntoConstraints="NO" id="QZa-Ly-BbS" customClass="CustomImageView">
                                                 <rect key="frame" x="0.0" y="0.0" width="55" height="55"/>
@@ -3757,14 +3779,14 @@
                                         </constraints>
                                     </imageView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qcn-nR-Ipr">
-                                        <rect key="frame" x="0.0" y="76" width="320" height="40"/>
+                                        <rect key="frame" x="0.0" y="76" width="320" height="80"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="40" id="aab-xZ-5s4"/>
+                                            <constraint firstAttribute="height" constant="80" id="aab-xZ-5s4"/>
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3be-M7-bzx">
-                                        <rect key="frame" x="0.0" y="116" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="156" width="320" height="44"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="홈허브 업데이트가
정상적으로 완료되었습니다." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mlA-SG-e2C">
                                                 <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
@@ -4477,7 +4499,7 @@
         <image name="common_list_btn_delete" width="40" height="40"/>
         <image name="common_list_checked" width="30" height="30"/>
         <image name="img_btn_common_active" width="100" height="50"/>
-        <image name="img_btn_common_disable" width="10" height="10"/>
+        <image name="img_btn_common_disable" width="100" height="50"/>
         <image name="img_btn_common_press" width="100" height="50"/>
         <image name="img_homehub_list_notconnect" width="55" height="45"/>
         <image name="img_homehub_setting_step_1" width="157" height="17"/>

OneCable/Base.lproj/Things.storyboard

@@ -264,11 +264,8 @@
                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F2Y-ZG-FFd">
-                                                <rect key="frame" x="280" y="0.0" width="40" height="54"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="40" id="nOi-hC-QPH"/>
-                                                </constraints>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F2Y-ZG-FFd">
+                                                <rect key="frame" x="0.0" y="0.0" width="320" height="54"/>
                                                 <state key="normal" image="common_icon_goto_2"/>
                                                 <connections>
                                                     <action selector="btnOfflineMultiTouched:" destination="G75-Hx-lyG" eventType="touchUpInside" id="rec-oq-aX9"/>
@@ -284,6 +281,7 @@
                                             <constraint firstAttribute="trailing" secondItem="NFK-WH-TSV" secondAttribute="trailing" id="Huc-oc-yLC"/>
                                             <constraint firstAttribute="bottom" secondItem="F2Y-ZG-FFd" secondAttribute="bottom" id="JYx-Py-twM"/>
                                             <constraint firstAttribute="height" constant="54" id="RZm-ak-38C"/>
+                                            <constraint firstItem="F2Y-ZG-FFd" firstAttribute="leading" secondItem="F0z-17-3ou" secondAttribute="leading" id="Uph-oY-Ueh"/>
                                             <constraint firstItem="F2Y-ZG-FFd" firstAttribute="top" secondItem="F0z-17-3ou" secondAttribute="top" id="dmC-EJ-oyG"/>
                                         </constraints>
                                     </view>
@@ -1112,7 +1110,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="320" height="68"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8am-9B-OVU" id="3z1-RY-sUu">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="67"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q6u-Ql-uvI">
@@ -1349,14 +1347,14 @@
                                                 <rect key="frame" x="0.0" y="96" width="320" height="322"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="h1h-oK-SGQ" id="PcJ-j1-AEV">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="322"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="321"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bu5-Tt-H5r">
                                                             <rect key="frame" x="0.0" y="0.0" width="320" height="287"/>
                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         </scrollView>
-                                                        <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="ptn-eX-dHH">
+                                                        <pageControl hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="ptn-eX-dHH">
                                                             <rect key="frame" x="60" y="221" width="200" height="37"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="37" id="5LF-dE-Onv"/>
@@ -1455,7 +1453,7 @@
                                                 <rect key="frame" x="0.0" y="418" 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"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SpF-Bb-9qN" userLabel="View - container">
@@ -1568,7 +1566,7 @@
                                                 <rect key="frame" x="0.0" y="481" width="320" height="89"/>
                                                 <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="89"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k8h-3L-ehd">
@@ -1911,7 +1909,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"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="afL-97-7bS">

OneCable/Classes/CommonUI/CommandClassControlView.m

@@ -234,8 +234,7 @@
 
 - (void) socketDidReceiveMessage:(id)message result:(SocketModel *)result
 {
-    NSLog(@"Message : %@", message);
-    NSLog(@"Message : %@", result);
+
     if (result.isSuccess) {
         ThingsViewController *vc = [JDFacade facade].mainViewController.tvc;
         if (vc && [vc isKindOfClass:[ThingsViewController class]]) {
@@ -281,6 +280,9 @@
 
 - (IBAction)btnSwitchTouched:(id)sender {
 
+    
+    NSLog(@"_device : %@", _device) ;
+    
     if (![[JDFacade facade].loginUser onlineHomeHubFromSelectedHub:_selectHub]) {
         
         [[JDFacade facade] alert:@"허브가 오프라인 상태입니다. 허브 상태 확인 후 다시 시도해주세요." completionHander:nil];
@@ -288,6 +290,8 @@
         return;
     }
     
+    
+    
     NSString *requestValue = _isON ? _requestValueForOff : _requestValueForOn;
     _device.cmdclsValue = requestValue;
     
@@ -509,6 +513,9 @@
     
     NSLog(@"btnOpenTouched");
     
+    NSLog(@"_device : %@", _device) ;
+    NSLog(@"_node : %@", _node) ;
+    
     if (![[JDFacade facade].loginUser onlineHomeHubFromSelectedHub:_selectHub]) {
         
         [[JDFacade facade] alert:@"허브가 오프라인 상태입니다. 허브 상태 확인 후 다시 시도해주세요." completionHander:nil];

OneCable/Classes/CommonUI/DeviceNodePopupTableViewCell.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>
@@ -14,21 +14,21 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="130"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iyt-NC-2Eb" id="aYc-Bf-Bll">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="130"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="129"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bg_list_02" translatesAutoresizingMaskIntoConstraints="NO" id="7GN-eM-ZPr">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="130"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="129"/>
                     </imageView>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zam-26-xpV">
-                        <rect key="frame" x="0.0" y="0.0" width="25" height="129.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="25" height="129"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="25" id="2hc-rq-m6m"/>
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KC0-jd-LnH">
-                        <rect key="frame" x="295" y="0.0" width="25" height="129.5"/>
+                        <rect key="frame" x="295" y="0.0" width="25" height="129"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="25" id="Dzs-9N-vV8"/>
@@ -134,7 +134,7 @@
                 <outlet property="lblNodeName" destination="Ta5-rk-3gu" id="sgc-rR-GMJ"/>
                 <outlet property="rdoSelect" destination="lB6-uO-9At" id="yKt-n4-65b"/>
             </connections>
-            <point key="canvasLocation" x="278" y="352"/>
+            <point key="canvasLocation" x="57" y="-8"/>
         </tableViewCell>
     </objects>
     <resources>

OneCable/Classes/CommonUI/DeviceSelectPopupTableViewCell.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>
@@ -14,11 +14,11 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="95"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iyt-NC-2Eb" id="aYc-Bf-Bll">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="95"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="94"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZUw-oY-IGL" customClass="CustomImageView">
-                        <rect key="frame" x="0.0" y="18" width="60" height="60"/>
+                        <rect key="frame" x="0.0" y="17" width="60" height="60"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="55" id="Bnc-Xn-uKL">
                                 <variation key="heightClass=regular-widthClass=compact" constant="60"/>
@@ -41,7 +41,7 @@
                         </variation>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ta5-rk-3gu" customClass="CustomLabel">
-                        <rect key="frame" x="60" y="37" width="198" height="22"/>
+                        <rect key="frame" x="60" y="36" width="198" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="GyN-Jp-K6Q">
                                 <variation key="heightClass=regular-widthClass=compact" constant="22"/>
@@ -61,7 +61,7 @@
                         </variation>
                     </label>
                     <button opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="25" placeholderIntrinsicHeight="25" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jQQ-As-ktP" userLabel="Button-chk" customClass="CustomCheckBox">
-                        <rect key="frame" x="263" y="31.5" width="32" height="32"/>
+                        <rect key="frame" x="263" y="31" width="32" height="32"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="25" id="7E5-sP-nBT">
                                 <variation key="heightClass=regular-widthClass=compact" constant="32"/>
@@ -88,7 +88,7 @@
                         </variation>
                     </button>
                     <button opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="25" placeholderIntrinsicHeight="25" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Hd-xB-gzI" userLabel="Button-radio" customClass="CustomRadioButton">
-                        <rect key="frame" x="263" y="31.5" width="32" height="32"/>
+                        <rect key="frame" x="263" y="31" width="32" height="32"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="25" id="KYp-Jo-J2N">
                                 <variation key="heightClass=regular-widthClass=compact" constant="32"/>
@@ -163,7 +163,7 @@
                 <outlet property="lblDeviceName" destination="Ta5-rk-3gu" id="2ae-id-MDV"/>
                 <outlet property="rdoSelect" destination="0Hd-xB-gzI" id="aJP-PY-jpq"/>
             </connections>
-            <point key="canvasLocation" x="250" y="359.5"/>
+            <point key="canvasLocation" x="18" y="-35"/>
         </tableViewCell>
     </objects>
     <resources>

OneCable/Classes/ViewControllers/HomeHubScreens/HomeHubSearchSuccessViewController.h

@@ -14,6 +14,9 @@
 
 @interface HomeHubSearchSuccessViewController : JDViewController <BLEServiceHandlerDelegate>
 
+@property (weak, nonatomic) IBOutlet CustomImageView *imgvLoading;  // 로딩 이미지
+@property (weak, nonatomic) IBOutlet CustomLabel *lblTimer;  // 타이머
+
 @property (weak, nonatomic) IBOutlet CustomTableView *tableView;  //테이블뷰
 @property (weak, nonatomic) IBOutlet CustomButton *btnCancel;  // 취소 버튼
 @property (weak, nonatomic) IBOutlet CustomButton *btnNext;  // 다음 버튼

OneCable/Classes/ViewControllers/HomeHubScreens/HomeHubSearchSuccessViewController.m

@@ -17,6 +17,9 @@
     NSMutableArray *devices;
     NSArray *_tableZombieValues;
     BTLEDeivceModel *selectedModel;
+
+    NSTimer *_timer;
+    NSInteger _elapsedSeconds;
 }
 
 @end
@@ -45,6 +48,7 @@
     [super viewWillAppear:animated];
     
     bleService.delegate = self;
+
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -56,6 +60,8 @@
 - (void)initUI {
 
     _btnNext.enabled = NO;
+    _imgvLoading.hidden = YES;
+    
     [self initTableViewAsDefaultStyle:_tableView];
 }
 
@@ -66,10 +72,65 @@
     
     devices = [bleService getDeviceList];
     
+    if (devices != nil && devices.count > 0) {
+        
+        selectedModel = [devices objectAtIndex:0];
+        _btnNext.enabled = YES;
+    }
+    
     [_tableView reloadData];
 }
 
 
+-(void)startLoading:(BOOL)isStart {
+    
+    _lblTimer.hidden = !isStart;
+    _imgvLoading.hidden = !isStart;
+    
+    if (isStart) {
+        
+        _elapsedSeconds = kMaxTimeOut;
+        _lblTimer.text = [NSString stringWithFormat:@"%zd", _elapsedSeconds];
+        if (!_timer) {
+            _timer = [NSTimer scheduledTimerWithTimeInterval:1.0f target:self selector:@selector(updateInclusionStatus) userInfo:nil repeats:YES];
+        }
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            if ([_imgvLoading.layer animationForKey:@"SpinAnimation"] == nil) {
+                CABasicAnimation* animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
+                animation.fromValue = [NSNumber numberWithFloat:0.0f];
+                animation.toValue = [NSNumber numberWithFloat: 2*M_PI];
+                animation.duration = 2.0f;
+                animation.repeatCount = INFINITY;
+                [_imgvLoading.layer addAnimation:animation forKey:@"SpinAnimation"];
+            }
+        });
+    }
+    else {
+        
+        _elapsedSeconds = kMaxTimeOut;
+        
+        if (_timer) {
+            [_timer invalidate];
+            _timer = nil;
+        }
+        
+        if ([_imgvLoading.layer animationForKey:@"SpinAnimation"] != nil) {
+            [_imgvLoading.layer removeAnimationForKey:@"SpinAnimation"];
+        }
+    }
+}
+
+- (void)updateInclusionStatus {
+    
+    dispatch_async(dispatch_get_main_queue(), ^(void) {
+        
+        _elapsedSeconds--;
+        if (_elapsedSeconds == 0) {
+            
+        }
+    });
+}
 
 #pragma mark - UITableView DataSource & Delegate
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -84,7 +145,7 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     
-    return 108.0f;
+    return 107.0f;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -119,10 +180,9 @@
         
         //[bleService setConDevice:selectedModel];
         
-        HomeHubConnectWifiViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"HomeHubConnectWifiViewController" storyboardName:@"HomeHub"];
-        vc.selectedModel = selectedModel;
-
-        [self.navigationController pushViewController:vc animated:YES];
+        [bleService connect:selectedModel];
+         [self startLoading:YES];
+        
     }
 
 }
@@ -132,9 +192,24 @@
 }
 
 
+#pragma mark - ble service delegate
+- (void)BLEConnected:(BTLEDeivceModel *)info {
+    
+    NSLog(@"home hub wifi search view connected!") ;
+    
+    [self startLoading:NO];
+    
+    HomeHubConnectWifiViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"HomeHubConnectWifiViewController" storyboardName:@"HomeHub"];
+    vc.selectedModel = selectedModel;
+    
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 - (void)BLEDisConnected:(BTLEDeivceModel *)info {
     
-    [[JDFacade facade] toast:@"블루투스 연결이 끊어졌습니다."];
+    [self startLoading:NO];
+    
+    [[JDFacade facade] toast:@"홈허브와 연결할 수 없습니다."];
     [self.navigationController popToRootViewControllerAnimated:YES];
 }
 

OneCable/Classes/ViewControllers/HomeHubScreens/HomeHubSearchViewController.m

@@ -119,12 +119,14 @@
     
     [self startLoading:NO];
 
-    
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"HomeHubSearchSuccessViewController" storyboardName:@"HomeHub"];
     
     if (devices.count == 0) {
         
         vc = [CommonUtil instantiateViewControllerWithIdentifier:@"HomeHubSearchFailViaewController" storyboardName:@"HomeHub"];
+        
+        [self.navigationController pushViewController:vc animated:YES];
+        return;
     }
     else if(devices.count > 1) {
         
@@ -137,7 +139,7 @@
         return;
     }
     
-    [self.navigationController pushViewController:vc animated:YES];
+    [self.navigationController pushViewController:vc animated:NO];
 }
 
 

OneCable/Classes/ViewControllers/HomeHubScreens/HomeHubWifiSearchSuccessViewController.m

@@ -275,7 +275,10 @@
         
         //실패
         [self startLoading:NO];
-        [[JDFacade facade] alertTitle:@"인터넷 연결 설정 실패" message:@"인터넷 연결 설정에 실패하였습니다."];
+        [[JDFacade facade] alert:@"네트워크 연결에 실패하였습니다." completionHander:^{
+            
+            [self.navigationController popViewControllerAnimated:NO];
+        }];
     }
 }
 

OneCable/Classes/ViewControllers/HomeHubScreens/HomeHubWifiSearchViewController.m

@@ -42,16 +42,15 @@
     [self initUI];
 
     bleService.delegate = self;
-    [bleService connect:_selectedModel];
     
-//    if ([bleService isConnected] && bleService.conDevice != nil) {
-//        
-//        [self BLEConnected:_selectedModel];
-//    }
-//    else {
-//        
-//        
-//    }
+    if ([bleService isConnected] && bleService.conDevice != nil) {
+        
+        [self BLEConnected:_selectedModel];
+    }
+    else {
+        
+        [bleService connect:_selectedModel];
+    }
     
 }
 
@@ -115,9 +114,7 @@
         if ([_imgvLoading.layer animationForKey:@"SpinAnimation"] != nil) {
             [_imgvLoading.layer removeAnimationForKey:@"SpinAnimation"];
         }
-        
     }
-    
 }
 
 - (void)updateInclusionStatus {
@@ -214,7 +211,7 @@
     HomeHubWifiSearchSuccessViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"HomeHubWifiSearchSuccessViewController" storyboardName:@"HomeHub"];
     vc.wifiList = wifiList;
     
-    [self.navigationController pushViewController:vc animated:YES];
+    [self.navigationController pushViewController:vc animated:NO];
 }
 
 

OneCable/Classes/ViewControllers/HomeHubScreens/MultiHomeHubViewController.m

@@ -62,7 +62,7 @@
 - (void)prepareViewDidLoad {
     
     _imgOnline = [UIImage imageNamed:@"img_homehub_list_connect"];
-    _imgOffLine = [UIImage imageNamed:@"img_homehub_list_connect"];
+    _imgOffLine = [UIImage imageNamed:@"img_homehub_list_notconnect"];
     _imgUptOn = [UIImage imageNamed:@"img_homehub_list_update_on"];
     _imgUptOff = [UIImage imageNamed:@"img_homehub_list_update_off"];
 }
@@ -109,10 +109,10 @@
     }
 
     // Z-Wave 동작상태 확인
-    if ([info isDeviceOnlined]) {
+    if (info.isDeviceOnlined) {
         cell.imgDongle.image = _imgOnline;
     } else {
-        cell.imgDongle.image = _imgOnline;
+        cell.imgDongle.image = _imgOffLine;
     }
     
     if ([info isUpdateNeed]) {

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDetailViewController.m

@@ -178,6 +178,7 @@
 }
 
 - (void)updateTitle {
+    
     [self setMoreBtnArray];
     
     if ([_deviceDetail.prdName isEqualToString:_deviceDetail.prdUserName] || [_deviceDetail.prdUserName isEqualToString:@""]) {
@@ -374,8 +375,21 @@
         ThingsDetailTitleTableViewCell *tcell = (ThingsDetailTitleTableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"TitleCellIdentifier"];
         
 //        [tcell.imgvDevice sd_setImageWithURL:[NSURL URLWithString:_deviceDetail.imageFileName] placeholderImage:nil options:SDWebImageRefreshCached];
+        
         tcell.lblDeviceUpdate.hidden = !_deviceDetail.isProfileUpdate;
+        
+        //배터리 30이하일때 메세지 우선순위
+        NSString *battery = [self getBatteryFromNode];
+        if (battery != nil && [battery integerValue] <= 30) {
+            
+            tcell.lblDeviceUpdate.hidden = NO;
+            tcell.lblDeviceUpdate.text = @"배터리를 즉시 교체하세요.";
+        }
+        
+    
+        
         cell = tcell;
+
     } else if (section == 1) {//device control
         ThingsDetailControlTableViewCell *tcell = (ThingsDetailControlTableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"ControlCellIdentifier"];
         
@@ -439,6 +453,9 @@
         ThingsDetailOptionTableViewCell *tcell = (ThingsDetailOptionTableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"OptionCellIdentifier"];
         
         NodeModel *node = _deviceDetail.cmdclsList[indexPath.row + _mandatoryNodes.count];
+        
+        NSLog(@"NodeModel : %@", node);
+        
         tcell.lblNodeName.text = node.cmdclsName;
         tcell.lblNodeValue.text = node.contentValueMsg;
         
@@ -505,6 +522,21 @@
 }
 
 
+- (NSString*)getBatteryFromNode {
+    
+    for (NodeModel *model in _deviceDetail.cmdclsList) {
+        
+        NSLog(@"model : %@", model);
+        
+        if (EQUALS(model.cmdclsId, @"battery")) {
+            
+            return model.contentValue;
+        }
+    }
+    
+    return nil;
+}
+
 
 -(void)deviceDelete
 {