浏览代码

- 공지사항 , FAQ 수정
- 설정 페이지 , 기본이미지 추가

TaeHyun 8 年之前
父节点
当前提交
ebb12565cf

+ 214 - 112
OneCable/Base.lproj/Main.storyboard

@@ -220,7 +220,7 @@
                                                 <rect key="frame" x="0.0" y="470" width="320" height="50"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wnj-wB-Ik4" customClass="CustomButton">
-                                                        <rect key="frame" x="0.0" y="0.0" width="106.5" height="50"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="107" height="50"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <state key="normal" title="아이디 찾기">
                                                             <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -241,16 +241,16 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W42-pK-39c">
-                                                        <rect key="frame" x="213.5" y="0.0" width="106.5" height="50"/>
+                                                        <rect key="frame" x="214" y="0.0" width="106" height="50"/>
                                                     </button>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="50" placeholderIntrinsicHeight="20" text="회원가입하기" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tfO-02-rlt" customClass="CustomLabel">
-                                                        <rect key="frame" x="213.5" y="0.0" width="106.5" height="50"/>
+                                                        <rect key="frame" x="214" y="0.0" width="106" height="50"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <color key="textColor" red="0.011764705882352941" green="0.60392156862745094" blue="0.87450980392156863" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <color key="highlightedColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </label>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5ZG-Du-5Mr" customClass="CustomButton">
-                                                        <rect key="frame" x="106.5" y="0.0" width="107" height="50"/>
+                                                        <rect key="frame" x="107" y="0.0" width="107" height="50"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <state key="normal" title="비밀번호 찾기">
                                                             <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -1081,7 +1081,7 @@
                                         <rect key="frame" x="0.0" y="266" width="320" height="50"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_homemode_list_count_bg" translatesAutoresizingMaskIntoConstraints="NO" id="1Gi-qG-87G" customClass="CustomImageView">
-                                                <rect key="frame" x="95" y="15" width="20" height="20"/>
+                                                <rect key="frame" x="93" y="15" width="20" height="20"/>
                                                 <userDefinedRuntimeAttributes>
                                                     <userDefinedRuntimeAttribute type="rect" keyPath="rectForCap">
                                                         <rect key="value" x="3" y="5" width="3" height="5"/>
@@ -1089,7 +1089,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="adh-hv-9fD" customClass="CustomLabel">
-                                                <rect key="frame" x="95" y="15" width="20" height="20"/>
+                                                <rect key="frame" x="93" y="15" width="20" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="YG9-tU-h1c"/>
                                                 </constraints>
@@ -1097,12 +1097,22 @@
                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8Dy-i7-CW3" customClass="CustomButton">
-                                                <rect key="frame" x="25" y="14" width="60" height="22"/>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qLh-n2-KTq">
+                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="25" id="eJV-gF-eSX"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YPb-q8-3h8">
+                                                <rect key="frame" x="25" y="0.0" width="58" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="22" id="B7o-y6-sXc"/>
-                                                    <constraint firstAttribute="width" constant="60" id="su1-vd-itY"/>
+                                                    <constraint firstAttribute="width" constant="58" id="r86-9t-i0V"/>
                                                 </constraints>
+                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8Dy-i7-CW3" customClass="CustomButton">
+                                                <rect key="frame" x="25" y="0.0" width="295" height="50"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                 <state key="normal" title="공지사항">
                                                     <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -1114,28 +1124,26 @@
                                                     <action selector="btnNoticeTouched:" destination="trZ-3a-BgT" eventType="touchUpInside" id="wWv-xH-utp"/>
                                                 </connections>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qLh-n2-KTq">
-                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
-                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="25" id="eJV-gF-eSX"/>
-                                                </constraints>
-                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstItem="qLh-n2-KTq" firstAttribute="leading" secondItem="NZq-b9-HUJ" secondAttribute="leading" id="0QV-QE-K1o"/>
-                                            <constraint firstItem="8Dy-i7-CW3" firstAttribute="centerY" secondItem="qLh-n2-KTq" secondAttribute="centerY" id="8be-3A-E7o"/>
                                             <constraint firstItem="qLh-n2-KTq" firstAttribute="top" secondItem="NZq-b9-HUJ" secondAttribute="top" id="9Uk-m4-xkO"/>
-                                            <constraint firstItem="adh-hv-9fD" firstAttribute="leading" secondItem="8Dy-i7-CW3" secondAttribute="trailing" constant="10" id="DHR-xk-A4u"/>
+                                            <constraint firstItem="YPb-q8-3h8" firstAttribute="leading" secondItem="qLh-n2-KTq" secondAttribute="trailing" id="AIW-gg-00v"/>
+                                            <constraint firstItem="8Dy-i7-CW3" firstAttribute="top" secondItem="NZq-b9-HUJ" secondAttribute="top" id="GhC-iS-Mpt"/>
+                                            <constraint firstAttribute="trailing" secondItem="8Dy-i7-CW3" secondAttribute="trailing" id="PRu-Jp-JYh"/>
                                             <constraint firstItem="1Gi-qG-87G" firstAttribute="leading" secondItem="adh-hv-9fD" secondAttribute="leading" id="Peo-jZ-mXN"/>
+                                            <constraint firstAttribute="bottom" secondItem="8Dy-i7-CW3" secondAttribute="bottom" id="Rmg-Yr-3yx"/>
                                             <constraint firstItem="1Gi-qG-87G" firstAttribute="top" secondItem="adh-hv-9fD" secondAttribute="top" id="SRf-NO-Omb"/>
-                                            <constraint firstItem="8Dy-i7-CW3" firstAttribute="leading" secondItem="qLh-n2-KTq" secondAttribute="trailing" id="UGh-Zd-9J3"/>
+                                            <constraint firstItem="adh-hv-9fD" firstAttribute="centerY" secondItem="YPb-q8-3h8" secondAttribute="centerY" id="SVo-lz-gQk"/>
+                                            <constraint firstItem="adh-hv-9fD" firstAttribute="leading" secondItem="YPb-q8-3h8" secondAttribute="trailing" constant="10" id="SZi-nJ-cFA"/>
                                             <constraint firstAttribute="height" constant="50" id="bw1-bz-8pS"/>
                                             <constraint firstItem="1Gi-qG-87G" firstAttribute="bottom" secondItem="adh-hv-9fD" secondAttribute="bottom" id="cfV-g2-Py5"/>
                                             <constraint firstItem="1Gi-qG-87G" firstAttribute="trailing" secondItem="adh-hv-9fD" secondAttribute="trailing" id="jEo-hL-X1l"/>
+                                            <constraint firstItem="YPb-q8-3h8" firstAttribute="top" secondItem="NZq-b9-HUJ" secondAttribute="top" id="jkB-mj-cTl"/>
+                                            <constraint firstItem="8Dy-i7-CW3" firstAttribute="leading" secondItem="qLh-n2-KTq" secondAttribute="trailing" id="mUc-gk-MGj"/>
+                                            <constraint firstAttribute="bottom" secondItem="YPb-q8-3h8" secondAttribute="bottom" id="qPg-lO-TxU"/>
                                             <constraint firstAttribute="bottom" secondItem="qLh-n2-KTq" secondAttribute="bottom" id="tOj-5E-ImY"/>
-                                            <constraint firstItem="adh-hv-9fD" firstAttribute="centerY" secondItem="8Dy-i7-CW3" secondAttribute="centerY" id="tZ9-7v-taa"/>
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uFm-9d-2iH" userLabel="View - line">
@@ -1165,11 +1173,7 @@
                                                 </constraints>
                                             </view>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lst-xe-fhk" customClass="CustomButton">
-                                                <rect key="frame" x="25" y="14" width="120" height="22"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="22" id="qxw-0P-0UL"/>
-                                                    <constraint firstAttribute="width" constant="120" id="wta-bs-LdE"/>
-                                                </constraints>
+                                                <rect key="frame" x="25" y="0.0" width="295" height="50"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                 <state key="normal" title="자주 찾는 질문">
                                                     <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -1184,11 +1188,13 @@
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="Lst-xe-fhk" firstAttribute="leading" secondItem="wlH-rE-efR" secondAttribute="trailing" id="0uc-oB-SK0"/>
                                             <constraint firstItem="wlH-rE-efR" firstAttribute="top" secondItem="k7w-zf-D3E" secondAttribute="top" id="IBQ-GD-mnJ"/>
-                                            <constraint firstItem="Lst-xe-fhk" firstAttribute="centerY" secondItem="wlH-rE-efR" secondAttribute="centerY" id="Yat-uZ-yT7"/>
                                             <constraint firstAttribute="height" constant="50" id="fhT-fz-9JG"/>
                                             <constraint firstItem="wlH-rE-efR" firstAttribute="leading" secondItem="k7w-zf-D3E" secondAttribute="leading" id="giW-6e-qkU"/>
+                                            <constraint firstAttribute="bottom" secondItem="Lst-xe-fhk" secondAttribute="bottom" id="kPt-lU-DUs"/>
+                                            <constraint firstItem="Lst-xe-fhk" firstAttribute="leading" secondItem="wlH-rE-efR" secondAttribute="trailing" id="mT8-Sc-ALA"/>
+                                            <constraint firstAttribute="trailing" secondItem="Lst-xe-fhk" secondAttribute="trailing" id="mhL-aP-n0A"/>
+                                            <constraint firstItem="Lst-xe-fhk" firstAttribute="top" secondItem="k7w-zf-D3E" secondAttribute="top" id="st9-w8-EPo"/>
                                             <constraint firstAttribute="bottom" secondItem="wlH-rE-efR" secondAttribute="bottom" id="vTu-I9-I7j"/>
                                         </constraints>
                                     </view>
@@ -1212,7 +1218,7 @@
                                         <rect key="frame" x="0.0" y="366" width="320" height="50"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_homemode_list_count_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Wtr-OC-NfN" customClass="CustomImageView">
-                                                <rect key="frame" x="80" y="15" width="20" height="20"/>
+                                                <rect key="frame" x="78" y="15" width="20" height="20"/>
                                                 <userDefinedRuntimeAttributes>
                                                     <userDefinedRuntimeAttribute type="rect" keyPath="rectForCap">
                                                         <rect key="value" x="3" y="5" width="3" height="5"/>
@@ -1220,7 +1226,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kzQ-dS-KlL" customClass="CustomLabel">
-                                                <rect key="frame" x="80" y="15" width="20" height="20"/>
+                                                <rect key="frame" x="78" y="15" width="20" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="9f7-5L-8nA"/>
                                                 </constraints>
@@ -1228,12 +1234,22 @@
                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2HT-1u-AvA" customClass="CustomButton">
-                                                <rect key="frame" x="25" y="14" width="45" height="22"/>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gRT-x8-NAi">
+                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="22" id="9EY-WP-GNa"/>
-                                                    <constraint firstAttribute="width" constant="45" id="qD1-bE-xGw"/>
+                                                    <constraint firstAttribute="width" constant="25" id="eHf-DN-GHP"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="scI-Zy-qhr">
+                                                <rect key="frame" x="25" y="0.0" width="43" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="43" id="fVc-ij-2GZ"/>
                                                 </constraints>
+                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2HT-1u-AvA" customClass="CustomButton">
+                                                <rect key="frame" x="25" y="0.0" width="295" height="50"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                 <state key="normal" title="메시지">
                                                     <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -1245,26 +1261,24 @@
                                                     <action selector="btnMessageBoxTouched:" destination="trZ-3a-BgT" eventType="touchUpInside" id="1eD-3B-Itl"/>
                                                 </connections>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gRT-x8-NAi">
-                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
-                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="25" id="eHf-DN-GHP"/>
-                                                </constraints>
-                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="kzQ-dS-KlL" firstAttribute="leading" secondItem="2HT-1u-AvA" secondAttribute="trailing" constant="10" id="5d6-Wc-xuH"/>
+                                            <constraint firstAttribute="trailing" secondItem="2HT-1u-AvA" secondAttribute="trailing" id="1wB-8y-maJ"/>
                                             <constraint firstItem="Wtr-OC-NfN" firstAttribute="leading" secondItem="kzQ-dS-KlL" secondAttribute="leading" id="ECZ-Ht-PSq"/>
-                                            <constraint firstItem="2HT-1u-AvA" firstAttribute="leading" secondItem="gRT-x8-NAi" secondAttribute="trailing" id="Fq0-7j-T0i"/>
-                                            <constraint firstItem="kzQ-dS-KlL" firstAttribute="centerY" secondItem="2HT-1u-AvA" secondAttribute="centerY" id="KlZ-YG-9bD"/>
+                                            <constraint firstItem="scI-Zy-qhr" firstAttribute="leading" secondItem="gRT-x8-NAi" secondAttribute="trailing" id="FTK-jZ-Kpv"/>
                                             <constraint firstItem="Wtr-OC-NfN" firstAttribute="trailing" secondItem="kzQ-dS-KlL" secondAttribute="trailing" id="KqQ-4M-Z5d"/>
                                             <constraint firstItem="Wtr-OC-NfN" firstAttribute="bottom" secondItem="kzQ-dS-KlL" secondAttribute="bottom" id="V7J-E1-FWc"/>
+                                            <constraint firstAttribute="bottom" secondItem="2HT-1u-AvA" secondAttribute="bottom" id="V8c-tq-4ia"/>
                                             <constraint firstAttribute="bottom" secondItem="gRT-x8-NAi" secondAttribute="bottom" id="VIG-7K-UhR"/>
+                                            <constraint firstAttribute="bottom" secondItem="scI-Zy-qhr" secondAttribute="bottom" id="aIr-nM-OS1"/>
                                             <constraint firstItem="gRT-x8-NAi" firstAttribute="leading" secondItem="Ps6-Ol-P1c" secondAttribute="leading" id="eGW-LL-FY3"/>
+                                            <constraint firstItem="kzQ-dS-KlL" firstAttribute="leading" secondItem="scI-Zy-qhr" secondAttribute="trailing" constant="10" id="eWC-A8-hpA"/>
+                                            <constraint firstItem="scI-Zy-qhr" firstAttribute="top" secondItem="Ps6-Ol-P1c" secondAttribute="top" id="f2z-0G-iPF"/>
+                                            <constraint firstItem="kzQ-dS-KlL" firstAttribute="centerY" secondItem="scI-Zy-qhr" secondAttribute="centerY" id="fVW-GR-jXp"/>
                                             <constraint firstItem="gRT-x8-NAi" firstAttribute="top" secondItem="Ps6-Ol-P1c" secondAttribute="top" id="lPD-j1-14A"/>
-                                            <constraint firstItem="2HT-1u-AvA" firstAttribute="centerY" secondItem="gRT-x8-NAi" secondAttribute="centerY" id="mwJ-qs-XCr"/>
+                                            <constraint firstItem="2HT-1u-AvA" firstAttribute="top" secondItem="Ps6-Ol-P1c" secondAttribute="top" id="ogG-mm-hHK"/>
+                                            <constraint firstItem="2HT-1u-AvA" firstAttribute="leading" secondItem="gRT-x8-NAi" secondAttribute="trailing" id="rMA-oE-HTi"/>
                                             <constraint firstAttribute="height" constant="50" id="vca-aW-X9T"/>
                                             <constraint firstItem="Wtr-OC-NfN" firstAttribute="top" secondItem="kzQ-dS-KlL" secondAttribute="top" id="vwp-9L-O9S"/>
                                         </constraints>
@@ -1289,18 +1303,28 @@
                                         <rect key="frame" x="0.0" y="416" width="320" height="50"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bullet_alert_on" translatesAutoresizingMaskIntoConstraints="NO" id="F11-6w-iRe" customClass="CustomImageView">
-                                                <rect key="frame" x="80" y="15" width="21" height="21"/>
+                                                <rect key="frame" x="79" y="15" width="21" height="21"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="21" id="WLe-YK-eh7"/>
                                                     <constraint firstAttribute="width" constant="21" id="mmT-9m-xdx"/>
                                                 </constraints>
                                             </imageView>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1M6-Mf-8P5" customClass="CustomButton">
-                                                <rect key="frame" x="25" y="14" width="45" height="22"/>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bo9-0R-Jxx">
+                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="25" id="pzY-FE-AWK"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xa6-Ts-c0B">
+                                                <rect key="frame" x="25" y="0.0" width="44" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="22" id="4EJ-oZ-Zoh"/>
-                                                    <constraint firstAttribute="width" constant="45" id="Yoc-Cz-1Rh"/>
+                                                    <constraint firstAttribute="width" constant="44" id="iQm-dH-FIH"/>
                                                 </constraints>
+                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1M6-Mf-8P5" customClass="CustomButton">
+                                                <rect key="frame" x="25" y="0.0" width="295" height="50"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                 <state key="normal" title="홈허브">
                                                     <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -1315,23 +1339,21 @@
                                                     <action selector="btnHomeHubTouched:" destination="trZ-3a-BgT" eventType="touchUpInside" id="h05-ep-Pmh"/>
                                                 </connections>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bo9-0R-Jxx">
-                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
-                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="25" id="pzY-FE-AWK"/>
-                                                </constraints>
-                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="F11-6w-iRe" firstAttribute="leading" secondItem="1M6-Mf-8P5" secondAttribute="trailing" constant="10" id="J4l-UO-Key"/>
+                                            <constraint firstItem="Xa6-Ts-c0B" firstAttribute="leading" secondItem="bo9-0R-Jxx" secondAttribute="trailing" id="Bgn-sn-gcL"/>
+                                            <constraint firstAttribute="bottom" secondItem="Xa6-Ts-c0B" secondAttribute="bottom" id="JdM-H3-l4H"/>
+                                            <constraint firstItem="1M6-Mf-8P5" firstAttribute="top" secondItem="9dG-Mn-Gpm" secondAttribute="top" id="NHL-En-Dqb"/>
+                                            <constraint firstAttribute="bottom" secondItem="1M6-Mf-8P5" secondAttribute="bottom" id="OcK-tg-Pus"/>
                                             <constraint firstAttribute="bottom" secondItem="bo9-0R-Jxx" secondAttribute="bottom" id="P1J-Oh-xEl"/>
+                                            <constraint firstAttribute="trailing" secondItem="1M6-Mf-8P5" secondAttribute="trailing" id="PyJ-QK-SL0"/>
+                                            <constraint firstItem="F11-6w-iRe" firstAttribute="leading" secondItem="Xa6-Ts-c0B" secondAttribute="trailing" constant="10" id="T5e-qA-6Bb"/>
                                             <constraint firstItem="bo9-0R-Jxx" firstAttribute="top" secondItem="9dG-Mn-Gpm" secondAttribute="top" id="VxO-Z2-BuO"/>
                                             <constraint firstItem="1M6-Mf-8P5" firstAttribute="leading" secondItem="bo9-0R-Jxx" secondAttribute="trailing" id="j8D-wh-mQe"/>
                                             <constraint firstAttribute="height" constant="50" id="joH-R0-qZS"/>
-                                            <constraint firstItem="F11-6w-iRe" firstAttribute="centerY" secondItem="1M6-Mf-8P5" secondAttribute="centerY" id="pcs-fk-z3k"/>
-                                            <constraint firstItem="1M6-Mf-8P5" firstAttribute="centerY" secondItem="bo9-0R-Jxx" secondAttribute="centerY" id="t8h-kG-1dy"/>
+                                            <constraint firstItem="F11-6w-iRe" firstAttribute="centerY" secondItem="Xa6-Ts-c0B" secondAttribute="centerY" id="otF-Qb-O5y"/>
+                                            <constraint firstItem="Xa6-Ts-c0B" firstAttribute="top" secondItem="9dG-Mn-Gpm" secondAttribute="top" id="tTL-Jc-17w"/>
                                             <constraint firstItem="bo9-0R-Jxx" firstAttribute="leading" secondItem="9dG-Mn-Gpm" secondAttribute="leading" id="wZI-Ao-vQd"/>
                                         </constraints>
                                     </view>
@@ -1361,12 +1383,22 @@
                                                     <constraint firstAttribute="height" constant="21" id="pbb-Lq-wSM"/>
                                                 </constraints>
                                             </imageView>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nJn-Uu-IUe" customClass="CustomButton">
-                                                <rect key="frame" x="25" y="14" width="30" height="22"/>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lms-jp-5d0">
+                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="25" id="qnP-de-9wx"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wvc-cv-eHE">
+                                                <rect key="frame" x="25" y="0.0" width="30" height="50"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="30" id="W5J-le-MRa"/>
-                                                    <constraint firstAttribute="height" constant="22" id="gtN-hk-vrZ"/>
+                                                    <constraint firstAttribute="width" constant="30" id="F5e-s0-D8N"/>
                                                 </constraints>
+                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nJn-Uu-IUe" customClass="CustomButton">
+                                                <rect key="frame" x="25" y="0.0" width="295" height="50"/>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                 <state key="normal" title="설정">
                                                     <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -1378,24 +1410,22 @@
                                                     <action selector="btnSettingsTouched:" destination="trZ-3a-BgT" eventType="touchUpInside" id="bSf-Me-usm"/>
                                                 </connections>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lms-jp-5d0">
-                                                <rect key="frame" x="0.0" y="0.0" width="25" height="50"/>
-                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="25" id="qnP-de-9wx"/>
-                                                </constraints>
-                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="qqE-eE-Ui9" firstAttribute="centerY" secondItem="nJn-Uu-IUe" secondAttribute="centerY" id="93L-a3-xuB"/>
+                                            <constraint firstItem="qqE-eE-Ui9" firstAttribute="leading" secondItem="Wvc-cv-eHE" secondAttribute="trailing" constant="10" id="1y4-yV-3ej"/>
+                                            <constraint firstItem="Wvc-cv-eHE" firstAttribute="leading" secondItem="Lms-jp-5d0" secondAttribute="trailing" id="3TM-AU-n2i"/>
+                                            <constraint firstItem="nJn-Uu-IUe" firstAttribute="top" secondItem="ddn-HT-9cT" secondAttribute="top" id="7UL-l9-yUO"/>
+                                            <constraint firstItem="qqE-eE-Ui9" firstAttribute="centerY" secondItem="Wvc-cv-eHE" secondAttribute="centerY" id="922-Qh-Ezo"/>
                                             <constraint firstAttribute="bottom" secondItem="Lms-jp-5d0" secondAttribute="bottom" id="Doy-jR-G8g"/>
-                                            <constraint firstItem="nJn-Uu-IUe" firstAttribute="centerY" secondItem="Lms-jp-5d0" secondAttribute="centerY" id="dH8-0B-zGM"/>
+                                            <constraint firstAttribute="trailing" secondItem="nJn-Uu-IUe" secondAttribute="trailing" id="Kc4-TA-J60"/>
+                                            <constraint firstItem="Wvc-cv-eHE" firstAttribute="top" secondItem="ddn-HT-9cT" secondAttribute="top" id="WVU-ZN-7Vs"/>
                                             <constraint firstItem="Lms-jp-5d0" firstAttribute="top" secondItem="ddn-HT-9cT" secondAttribute="top" id="fTn-JN-Fmd"/>
                                             <constraint firstAttribute="height" constant="50" id="i7r-3V-8OJ"/>
                                             <constraint firstItem="nJn-Uu-IUe" firstAttribute="leading" secondItem="Lms-jp-5d0" secondAttribute="trailing" id="j4P-fR-V3N"/>
+                                            <constraint firstAttribute="bottom" secondItem="nJn-Uu-IUe" secondAttribute="bottom" id="lXS-Zm-TK0"/>
+                                            <constraint firstAttribute="bottom" secondItem="Wvc-cv-eHE" secondAttribute="bottom" id="pF0-Ef-gHC"/>
                                             <constraint firstItem="Lms-jp-5d0" firstAttribute="leading" secondItem="ddn-HT-9cT" secondAttribute="leading" id="ukJ-OL-3HW"/>
-                                            <constraint firstItem="qqE-eE-Ui9" firstAttribute="leading" secondItem="nJn-Uu-IUe" secondAttribute="trailing" constant="10" id="uss-aB-c7Y"/>
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A8a-eZ-6sZ" userLabel="View - line">
@@ -1475,11 +1505,15 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="btnFaq" destination="Lst-xe-fhk" id="Hvw-ht-l9Q"/>
                         <outlet property="btnHomeHub" destination="1M6-Mf-8P5" id="8eh-Le-C4G"/>
+                        <outlet property="btnMessage" destination="2HT-1u-AvA" id="QVi-tW-bie"/>
                         <outlet property="btnModeAway" destination="8qH-VT-29w" id="kzK-fA-QHn"/>
                         <outlet property="btnModeHome" destination="aSD-6d-jwi" id="axD-lC-dJG"/>
                         <outlet property="btnModeMorning" destination="Pe4-E8-CBK" id="sNr-Bq-Ab9"/>
                         <outlet property="btnModeNight" destination="Dg7-r1-eDA" id="PC5-2R-s4r"/>
+                        <outlet property="btnNotice" destination="8Dy-i7-CW3" id="aHl-X9-PiP"/>
+                        <outlet property="btnSet" destination="nJn-Uu-IUe" id="3qG-a1-cSH"/>
                         <outlet property="imgvComingChecked" destination="Jnx-0z-GIM" id="Tsq-8y-nzN"/>
                         <outlet property="imgvHomehubOff" destination="F11-6w-iRe" id="02G-DO-dV4"/>
                         <outlet property="imgvLogo" destination="Vbv-zv-GUN" id="mL2-8D-Ja2"/>
@@ -1714,7 +1748,7 @@
                                                 <rect key="frame" x="0.0" y="22" width="320" height="86"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dvW-0I-FNk" id="hAw-sm-QO1">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="86"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="85"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="150" placeholderIntrinsicHeight="20" text="초대자" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rjb-JZ-Cf3" customClass="CustomLabel">
@@ -2656,7 +2690,7 @@
                                                 <rect key="frame" x="0.0" y="22" width="320" height="82"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="13O-oy-kzr" id="qha-y8-7bn">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="82"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="81"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2a0-x7-jc2" userLabel="View - Cell">
@@ -2685,14 +2719,14 @@
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FcU-gl-h5i">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="15" height="80.5"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="15" height="81"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="15" id="ut7-rd-6Ux"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fu9-Lb-Ksv">
-                                                                    <rect key="frame" x="305" y="0.0" width="15" height="80.5"/>
+                                                                    <rect key="frame" x="305" y="0.0" width="15" height="81"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="15" id="8Pa-bY-Q5E"/>
@@ -4073,7 +4107,7 @@
                                                 <rect key="frame" x="0.0" y="22" width="320" height="185"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4HR-Ap-zi5" id="FYL-I3-Ct3">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="185"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="184"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DqJ-gM-iax" userLabel="View - Cell" customClass="KNView">
@@ -4391,7 +4425,7 @@
                                                 <rect key="frame" x="0.0" y="207" width="320" height="182"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xsB-wP-ggW" id="qqk-dn-Ftx">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="182"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="181"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i69-BM-Qfs" userLabel="View - Cell" customClass="KNView">
@@ -5544,7 +5578,7 @@
                                                 <rect key="frame" x="0.0" y="22" width="320" height="117"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UAD-3H-XiO" id="AmL-Vh-h4h">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="117"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="116"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Rm-nv-Cry" userLabel="View - Cell">
@@ -5637,7 +5671,7 @@
                                                 <rect key="frame" x="0.0" y="139" width="320" height="81"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OAA-9W-GGd" id="cNB-1f-Prd">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="81"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vqm-T4-8fo" userLabel="View - Cell">
@@ -5659,7 +5693,7 @@
                                                                     </constraints>
                                                                 </imageView>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="247" placeholderIntrinsicWidth="140" placeholderIntrinsicHeight="23" text="1층 전등 플러그" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3AS-GK-m1O" customClass="CustomLabel">
-                                                                    <rect key="frame" x="75" y="30" width="136.5" height="20"/>
+                                                                    <rect key="frame" x="75" y="30" width="137" height="20"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="20" id="ZEb-ty-P8L"/>
                                                                     </constraints>
@@ -5677,7 +5711,7 @@
                                                                     <state key="highlighted" image="common_list_btn_delete_press"/>
                                                                 </button>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="68" placeholderIntrinsicHeight="20" text="켜기" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dHu-GA-nL2" customClass="CustomLabel">
-                                                                    <rect key="frame" x="211.5" y="29" width="45.5" height="22"/>
+                                                                    <rect key="frame" x="212" y="29" width="45" height="22"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="22" id="ILf-Ok-jM6"/>
                                                                     </constraints>
@@ -5769,7 +5803,7 @@
                                                 <rect key="frame" x="0.0" y="220" width="320" height="162"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VWN-Cy-OG8" id="efL-rl-GyQ">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="162"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="161"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kem-2I-4Jj" customClass="CustomButton">
@@ -6104,7 +6138,7 @@
                                         <rect key="frame" x="0.0" y="70" width="320" height="448"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                        <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="FaqCellIdentifier" rowHeight="82" id="rnB-by-AAV" customClass="FaqTableViewCell">
                                                 <rect key="frame" x="0.0" y="22" width="320" height="82"/>
@@ -6116,7 +6150,7 @@
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JXj-Ti-9RH" userLabel="View - Cell">
                                                             <rect key="frame" x="0.0" y="0.0" width="320" height="81"/>
                                                             <subviews>
-                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bg_list_02" translatesAutoresizingMaskIntoConstraints="NO" id="YyK-Wk-uNh" customClass="CustomImageView">
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_bg_list_01" translatesAutoresizingMaskIntoConstraints="NO" id="YyK-Wk-uNh" customClass="CustomImageView">
                                                                     <rect key="frame" x="0.0" y="0.0" width="320" height="81"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                 </imageView>
@@ -6130,14 +6164,14 @@
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4BY-En-byK">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="15" height="80.5"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="15" height="81"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="15" id="MF8-s1-vWC"/>
                                                                     </constraints>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="im5-f8-CHe">
-                                                                    <rect key="frame" x="305" y="0.0" width="15" height="80.5"/>
+                                                                    <rect key="frame" x="305" y="0.0" width="15" height="81"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="15" id="zDX-xR-lZp"/>
@@ -6151,7 +6185,7 @@
                                                                     </constraints>
                                                                 </view>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ydm-om-BIM">
-                                                                    <rect key="frame" x="15" y="0.0" width="25" height="80.5"/>
+                                                                    <rect key="frame" x="15" y="0.0" width="25" height="81"/>
                                                                     <subviews>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mb7-cB-8EP" customClass="CustomLabel">
                                                                             <rect key="frame" x="0.0" y="20" width="25" height="21"/>
@@ -6170,27 +6204,16 @@
                                                                         <constraint firstItem="mb7-cB-8EP" firstAttribute="leading" secondItem="Ydm-om-BIM" secondAttribute="leading" id="Ogy-NY-5k9"/>
                                                                     </constraints>
                                                                 </view>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="752" text="2017-04-04 12:34" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="723-Vj-SoK" userLabel="Label - date" customClass="CustomLabel">
-                                                                    <rect key="frame" x="40" y="41" width="265" height="20"/>
-                                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="height" constant="20" id="SOS-4i-5Ce"/>
-                                                                    </constraints>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                                    <color key="textColor" red="0.53333333329999999" green="0.56078431370000004" blue="0.6588235294" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                                    <nil key="highlightedColor"/>
-                                                                </label>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gmc-KG-O46">
-                                                                    <rect key="frame" x="40" y="61" width="265" height="20"/>
+                                                                    <rect key="frame" x="40" y="41" width="265" height="40"/>
                                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     <constraints>
-                                                                        <constraint firstAttribute="height" constant="20" id="LYq-SY-bVP"/>
+                                                                        <constraint firstAttribute="height" constant="40" id="fWm-J9-STK"/>
                                                                     </constraints>
                                                                 </view>
                                                             </subviews>
                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                             <constraints>
-                                                                <constraint firstItem="723-Vj-SoK" firstAttribute="leading" secondItem="Ydm-om-BIM" secondAttribute="trailing" id="0CM-Or-fcr"/>
                                                                 <constraint firstItem="im5-f8-CHe" firstAttribute="leading" secondItem="Gmc-KG-O46" secondAttribute="trailing" id="2T9-nz-xnc"/>
                                                                 <constraint firstItem="e1u-tR-DFk" firstAttribute="leading" secondItem="Ydm-om-BIM" secondAttribute="trailing" id="30c-PD-juD"/>
                                                                 <constraint firstItem="Ydm-om-BIM" firstAttribute="top" secondItem="JXj-Ti-9RH" secondAttribute="top" id="6o4-ke-yvj"/>
@@ -6201,25 +6224,24 @@
                                                                 <constraint firstItem="Gmc-KG-O46" firstAttribute="leading" secondItem="Ydm-om-BIM" secondAttribute="trailing" id="FYb-9i-NTM"/>
                                                                 <constraint firstItem="Zup-se-tTx" firstAttribute="top" secondItem="e1u-tR-DFk" secondAttribute="bottom" id="FuQ-xl-geK"/>
                                                                 <constraint firstItem="im5-f8-CHe" firstAttribute="leading" secondItem="Zup-se-tTx" secondAttribute="trailing" id="Giy-5a-r5r"/>
-                                                                <constraint firstItem="im5-f8-CHe" firstAttribute="leading" secondItem="723-Vj-SoK" secondAttribute="trailing" id="GlF-5i-MPT"/>
                                                                 <constraint firstItem="4BY-En-byK" firstAttribute="top" secondItem="JXj-Ti-9RH" secondAttribute="top" id="HFq-D5-X0j"/>
                                                                 <constraint firstItem="Ydm-om-BIM" firstAttribute="leading" secondItem="4BY-En-byK" secondAttribute="trailing" id="TZ5-0w-00N"/>
                                                                 <constraint firstItem="e1u-tR-DFk" firstAttribute="top" secondItem="JXj-Ti-9RH" secondAttribute="top" id="Wra-b4-bbf"/>
                                                                 <constraint firstAttribute="trailing" secondItem="YyK-Wk-uNh" secondAttribute="trailing" id="XKb-lx-dCd"/>
-                                                                <constraint firstItem="Gmc-KG-O46" firstAttribute="top" secondItem="723-Vj-SoK" secondAttribute="bottom" id="cci-X5-EYa"/>
                                                                 <constraint firstAttribute="bottom" secondItem="im5-f8-CHe" secondAttribute="bottom" id="dOY-GN-3Sz"/>
+                                                                <constraint firstItem="Gmc-KG-O46" firstAttribute="top" secondItem="Zup-se-tTx" secondAttribute="bottom" id="eH1-Tu-x5P"/>
                                                                 <constraint firstItem="YyK-Wk-uNh" firstAttribute="top" secondItem="JXj-Ti-9RH" secondAttribute="top" id="gn4-8r-02l"/>
                                                                 <constraint firstItem="YyK-Wk-uNh" firstAttribute="leading" secondItem="JXj-Ti-9RH" secondAttribute="leading" id="kQh-P8-ySk"/>
                                                                 <constraint firstItem="im5-f8-CHe" firstAttribute="leading" secondItem="e1u-tR-DFk" secondAttribute="trailing" id="lMM-mk-WLG"/>
-                                                                <constraint firstItem="723-Vj-SoK" firstAttribute="top" secondItem="Zup-se-tTx" secondAttribute="bottom" id="tLl-s4-ogH"/>
                                                                 <constraint firstAttribute="bottom" secondItem="4BY-En-byK" secondAttribute="bottom" id="tlY-g8-gdF"/>
+                                                                <constraint firstAttribute="bottom" secondItem="Gmc-KG-O46" secondAttribute="bottom" id="xGZ-bX-hdE"/>
                                                                 <constraint firstAttribute="bottom" secondItem="YyK-Wk-uNh" secondAttribute="bottom" id="yma-9c-ILS"/>
                                                                 <constraint firstItem="Zup-se-tTx" firstAttribute="leading" secondItem="Ydm-om-BIM" secondAttribute="trailing" id="zSR-EO-6yY"/>
                                                                 <constraint firstAttribute="bottom" secondItem="Ydm-om-BIM" secondAttribute="bottom" id="zu8-37-VIX"/>
                                                             </constraints>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sxo-b0-E7i" userLabel="View - line">
-                                                            <rect key="frame" x="0.0" y="80.5" width="320" height="1"/>
+                                                            <rect key="frame" x="0.0" y="80" width="320" height="1"/>
                                                             <subviews>
                                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="common_bg_line_01" translatesAutoresizingMaskIntoConstraints="NO" id="IVx-9N-QmT">
                                                                     <rect key="frame" x="0.0" y="0.0" width="240" height="1"/>
@@ -6247,7 +6269,6 @@
                                                 <connections>
                                                     <outlet property="lblContent" destination="Zup-se-tTx" id="8lx-YM-q6a"/>
                                                     <outlet property="lblCount" destination="mb7-cB-8EP" id="AS3-8k-ba0"/>
-                                                    <outlet property="lblCreateDatetime" destination="723-Vj-SoK" id="KGx-ne-1Gh"/>
                                                 </connections>
                                             </tableViewCell>
                                         </prototypes>
@@ -6469,8 +6490,8 @@
                                         </variation>
                                     </view>
                                     <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Knb-PM-tlG">
-                                        <rect key="frame" x="0.0" y="70" width="320" height="448"/>
-                                        <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="0.0" y="158" width="320" height="360"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <connections>
                                             <outlet property="delegate" destination="HR6-TX-aFP" id="Jy4-Z4-sBJ"/>
                                         </connections>
@@ -6532,10 +6553,85 @@
                                             </mask>
                                         </variation>
                                     </view>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qe0-LH-yW7">
+                                        <rect key="frame" x="0.0" y="70" width="320" height="88"/>
+                                        <subviews>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gWa-Ou-7v4">
+                                                <rect key="frame" x="0.0" y="0.0" width="15" height="88"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="15" id="Pdr-E3-vwf"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TGu-iS-b9Z">
+                                                <rect key="frame" x="305" y="0.0" width="15" height="88"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="15" id="1Sf-Xp-xLi"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ucl-Zg-31i">
+                                                <rect key="frame" x="15" y="0.0" width="290" height="20"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="20" id="G2U-Jt-fQS"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pam-cV-ZNi">
+                                                <rect key="frame" x="15" y="0.0" width="25" height="88"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8xf-Bq-U2d" customClass="CustomLabel">
+                                                        <rect key="frame" x="0.0" y="20" width="25" height="21"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="21" id="cTx-1d-c1a"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                </subviews>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstItem="8xf-Bq-U2d" firstAttribute="leading" secondItem="Pam-cV-ZNi" secondAttribute="leading" id="AYT-Gy-TGy"/>
+                                                    <constraint firstAttribute="trailing" secondItem="8xf-Bq-U2d" secondAttribute="trailing" id="SXx-Xl-COG"/>
+                                                    <constraint firstAttribute="width" constant="25" id="Sq2-b2-FJh"/>
+                                                </constraints>
+                                            </view>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="자주 찾는 질문입니다." lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FW8-lu-KRZ" userLabel="Label - content" customClass="CustomLabel">
+                                                <rect key="frame" x="40" y="20" width="265" height="21"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="4Vu-H8-lbV"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="88" id="2tv-Fj-VN4"/>
+                                            <constraint firstItem="gWa-Ou-7v4" firstAttribute="leading" secondItem="Qe0-LH-yW7" secondAttribute="leading" id="7O1-S7-GoT"/>
+                                            <constraint firstItem="FW8-lu-KRZ" firstAttribute="leading" secondItem="Pam-cV-ZNi" secondAttribute="trailing" id="Ap0-S1-a5e"/>
+                                            <constraint firstItem="Pam-cV-ZNi" firstAttribute="leading" secondItem="gWa-Ou-7v4" secondAttribute="trailing" id="FRp-px-kQu"/>
+                                            <constraint firstItem="TGu-iS-b9Z" firstAttribute="leading" secondItem="ucl-Zg-31i" secondAttribute="trailing" id="GEN-tP-kUY"/>
+                                            <constraint firstAttribute="trailing" secondItem="TGu-iS-b9Z" secondAttribute="trailing" id="I88-TN-Ph1"/>
+                                            <constraint firstItem="8xf-Bq-U2d" firstAttribute="top" secondItem="FW8-lu-KRZ" secondAttribute="top" id="Tpb-MN-9h1"/>
+                                            <constraint firstAttribute="bottom" secondItem="Pam-cV-ZNi" secondAttribute="bottom" id="VoU-FZ-e5y"/>
+                                            <constraint firstItem="TGu-iS-b9Z" firstAttribute="leading" secondItem="FW8-lu-KRZ" secondAttribute="trailing" id="VrN-NE-Lrb"/>
+                                            <constraint firstItem="ucl-Zg-31i" firstAttribute="top" secondItem="Qe0-LH-yW7" secondAttribute="top" id="cXP-Xm-PSg"/>
+                                            <constraint firstItem="gWa-Ou-7v4" firstAttribute="top" secondItem="Qe0-LH-yW7" secondAttribute="top" id="faC-Oe-lsk"/>
+                                            <constraint firstAttribute="bottom" secondItem="TGu-iS-b9Z" secondAttribute="bottom" id="hlW-JF-2jQ"/>
+                                            <constraint firstItem="Pam-cV-ZNi" firstAttribute="top" secondItem="Qe0-LH-yW7" secondAttribute="top" id="n3r-6V-hE4"/>
+                                            <constraint firstAttribute="bottom" secondItem="gWa-Ou-7v4" secondAttribute="bottom" id="rKd-Rw-fct"/>
+                                            <constraint firstItem="FW8-lu-KRZ" firstAttribute="top" secondItem="ucl-Zg-31i" secondAttribute="bottom" id="rez-aV-uY4"/>
+                                            <constraint firstItem="ucl-Zg-31i" firstAttribute="leading" secondItem="gWa-Ou-7v4" secondAttribute="trailing" id="yfV-Id-sJS"/>
+                                            <constraint firstItem="TGu-iS-b9Z" firstAttribute="top" secondItem="Qe0-LH-yW7" secondAttribute="top" id="zYm-9n-sek"/>
+                                        </constraints>
+                                    </view>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
-                                    <constraint firstItem="Knb-PM-tlG" firstAttribute="top" secondItem="70i-sR-spM" secondAttribute="bottom" id="16r-wT-91R"/>
+                                    <constraint firstItem="Qe0-LH-yW7" firstAttribute="top" secondItem="70i-sR-spM" secondAttribute="bottom" id="BPa-PX-XD1"/>
                                     <constraint firstAttribute="bottom" secondItem="g58-Eo-gJM" secondAttribute="bottom" id="Cyd-77-dLi"/>
                                     <constraint firstAttribute="trailing" secondItem="g58-Eo-gJM" secondAttribute="trailing" id="GHQ-XG-GoA"/>
                                     <constraint firstItem="g58-Eo-gJM" firstAttribute="leading" secondItem="LVw-B8-ZPD" secondAttribute="leading" id="HgQ-UH-79N"/>
@@ -6543,10 +6639,13 @@
                                     <constraint firstItem="70i-sR-spM" firstAttribute="top" secondItem="LVw-B8-ZPD" secondAttribute="top" id="LOB-FT-h9z"/>
                                     <constraint firstItem="g58-Eo-gJM" firstAttribute="top" secondItem="Knb-PM-tlG" secondAttribute="bottom" id="Pi5-ee-zGm"/>
                                     <constraint firstAttribute="trailing" secondItem="70i-sR-spM" secondAttribute="trailing" id="g2U-u0-DdD"/>
+                                    <constraint firstItem="Qe0-LH-yW7" firstAttribute="leading" secondItem="LVw-B8-ZPD" secondAttribute="leading" id="gGC-ko-Rek"/>
+                                    <constraint firstAttribute="trailing" secondItem="Qe0-LH-yW7" secondAttribute="trailing" id="l5x-ZF-GGc"/>
                                     <constraint firstAttribute="trailing" secondItem="Knb-PM-tlG" secondAttribute="trailing" id="lUV-fv-ShD"/>
                                     <constraint firstItem="CUY-dm-RGR" firstAttribute="top" secondItem="70i-sR-spM" secondAttribute="bottom" id="mjm-rJ-wJn"/>
                                     <constraint firstItem="70i-sR-spM" firstAttribute="leading" secondItem="LVw-B8-ZPD" secondAttribute="leading" id="oHB-hz-OfS"/>
                                     <constraint firstAttribute="trailing" secondItem="CUY-dm-RGR" secondAttribute="trailing" id="oKZ-hX-lao"/>
+                                    <constraint firstItem="Knb-PM-tlG" firstAttribute="top" secondItem="Qe0-LH-yW7" secondAttribute="bottom" id="y63-DU-3oN"/>
                                     <constraint firstItem="Knb-PM-tlG" firstAttribute="leading" secondItem="LVw-B8-ZPD" secondAttribute="leading" id="z39-N7-ISe"/>
                                 </constraints>
                             </view>
@@ -6561,17 +6660,20 @@
                     </view>
                     <connections>
                         <outlet property="btnClose" destination="eHK-XM-n1p" id="dPk-Gb-Nbr"/>
+                        <outlet property="lblCount" destination="8xf-Bq-U2d" id="kBn-P8-Ige"/>
+                        <outlet property="lblTitle" destination="FW8-lu-KRZ" id="xTR-sQ-bIj"/>
                         <outlet property="m_webView" destination="Knb-PM-tlG" id="PVy-b4-YTS"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="EO5-46-aj4" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1926" y="1776"/>
+            <point key="canvasLocation" x="1925.625" y="1775.7042253521126"/>
         </scene>
     </scenes>
     <resources>
         <image name="color_body_01" width="2" height="2"/>
         <image name="common_bg_line_01" width="1" height="1"/>
+        <image name="common_bg_list_01" width="2" height="2"/>
         <image name="common_bg_list_02" width="1" height="1"/>
         <image name="common_bg_list_03" width="2" height="2"/>
         <image name="common_bullet_alert_on" width="20" height="20"/>

+ 6 - 2
OneCable/Classes/ViewControllers/MainScreens/FaqDetailViewController.h

@@ -15,8 +15,12 @@
 
 @property (weak, nonatomic) IBOutlet CustomButton *btnClose;
 @property (weak, nonatomic) IBOutlet UIWebView *m_webView;
-@property (weak, nonatomic) NSString *detail_Url;
+@property (weak, nonatomic) IBOutlet CustomLabel *lblCount;
+@property (weak, nonatomic) IBOutlet CustomLabel *lblTitle;
 
-@property (strong, nonatomic) FaqModel *m_faq;
+//@property (weak, nonatomic) NSString *detail_Url;
+@property (weak, nonatomic) NSString *detail_count;
+
+@property (strong, nonatomic) FaqModel *faqModel;
 @end
 

+ 18 - 3
OneCable/Classes/ViewControllers/MainScreens/FaqDetailViewController.m

@@ -15,17 +15,32 @@
 @end
 
 @implementation FaqDetailViewController
+@synthesize faqModel,detail_count;
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    NSLog(@"faq model : %@",_m_faq);
-//    NSURL* url = [NSURL URLWithString:_m_faq.detailUrl];
-    NSURL* url = [NSURL URLWithString:_detail_Url];
+    NSLog(@"faq model : %@",faqModel);
+    NSLog(@"faq title : %@",faqModel.title);
+    NSLog(@"faq count : %@",detail_count);
+
+    [self initUI];
+    [self connectDetailUrl];
+}
+
+- (void)connectDetailUrl {
+    
+    NSURL* url = [NSURL URLWithString:faqModel.detailUrl];
+    //    NSURL* url = [NSURL URLWithString:_detail_Url];
     NSURLRequest* urlRequest = [NSURLRequest requestWithURL:url];
     
     [_m_webView loadRequest:urlRequest];
 }
 
+- (void)initUI {
+    _lblTitle.text = faqModel.title;
+    _lblCount.text = [NSString stringWithFormat:@"%@%@",detail_count,@"."];
+}
+
 - (IBAction)btnCloseTouched:(id)sender {
     [self dismissViewControllerAnimated:YES completion:nil];
 }

+ 0 - 1
OneCable/Classes/ViewControllers/MainScreens/FaqViewController.h

@@ -28,7 +28,6 @@
 @interface FaqTableViewCell : KNTableViewCell
 
 @property (weak, nonatomic) IBOutlet CustomLabel *lblContent;
-@property (weak, nonatomic) IBOutlet CustomLabel *lblCreateDatetime;
 @property (weak, nonatomic) IBOutlet CustomLabel *lblCount;
 
 @end

+ 28 - 77
OneCable/Classes/ViewControllers/MainScreens/FaqViewController.m

@@ -36,32 +36,8 @@
     _faqList = [(NSMutableArray<FaqModel> *)[NSMutableArray alloc] init];
     [self initUI];
     [self prepareViewDidLoad];
-//    [self performSelector:@selector(testFAQDetailViewContrller) withObject:nil afterDelay:3.0f];
-}
-
-//-(void)testFAQDetailViewContrller{
-//    FaqModel *select_faq =[[FaqModel alloc]init];
-//
-//    select_faq.faqId =@"001";
-//    select_faq.title = @"테스트 제목";
-//    select_faq.detailUrl = @"http://m.daum.net/";
-//    
-//    FaqDetailViewController *vc =[CommonUtil instantiateViewControllerWithIdentifier:@"FaqDetailViewController" storyboardName:@"Main"];
-//    
-//    vc.m_faq = select_faq;
-//    
-//    [self presentViewController:vc animated:YES completion:nil];
-//}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
 
 }
-//- (void)viewWillAppear:(BOOL)animated {
-//    [super viewWillAppear:animated];
-//    
-//    [self requestFaqList];
-//}
 
 - (void)initUI {
     [self initTableViewAsDefaultStyle:_tableView];
@@ -74,11 +50,7 @@
 - (void)initRefreshController {
     //set refresh controls
     __weak typeof(self) weakSelf = self;
-    //    self.refreshController = [[JYPullToRefreshController alloc] initWithScrollView:self.tableView];
-    //    self.refreshController.pullToRefreshHandleAction = ^{
-    //        [weakSelf requestNoticeList];
-    //    };
-    
+
     self.refreshController = [[JYPullToRefreshController alloc] initWithScrollView:self.tableView];
     self.refreshController.pullToRefreshHandleAction = ^{
         [weakSelf requestFaqListRecently];
@@ -97,31 +69,36 @@
 }
 
 - (void)requestFaqListRecently {
-    NoticeModel *notice = [_faqList firstObject];
+    FaqModel *faq = [_faqList firstObject];
     _pagingType = ksListPagingTypeUpward;
-    _pagingId = notice.noticeId;
+    _pagingId = faq.faqId;
     
     [self performSelector:@selector(requestFaqList) withObject:nil afterDelay:0.0f];
 }
 
 - (void)requestFaqListOlder {
-    NoticeModel *notice = [_faqList lastObject];
+    FaqModel *faq = [_faqList lastObject];
     _pagingType = ksListPagingTypeDownward;
-    _pagingId = notice.noticeId;
+    _pagingId = faq.faqId;
     
     [self performSelector:@selector(requestFaqList) withObject:nil afterDelay:0.0f];
 }
 
 - (void)requestFaqList{
 
+//    NSDictionary *parameter = @{@"member_id":[JDFacade facade].loginUser.memberId,
+//                                @"faq_id": _pagingId ? _pagingId : ksEmptyString,
+//                                @"paging_type": _pagingType ? _pagingType : ksEmptyString,
+//                                @"read_datetime": [JDFacade facade].loginUser.noticeReadTime ? [JDFacade facade].loginUser.noticeReadTime : ksEmptyString};
+    
     NSDictionary *parameter = @{@"faq_id": _pagingId ? _pagingId : ksEmptyString,
-                                @"paging_type": _pagingType ? _pagingType : ksEmptyString,
-                                @"read_datetime": [JDFacade facade].loginUser.noticeReadTime ? [JDFacade facade].loginUser.noticeReadTime : ksEmptyString};
+                                @"paging_type" : ksEmptyString,
+                                @"read_datetime" :  ksEmptyString};
     
 //    NSString *path = API_GET_FAQ;
     NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_FAQ arguments:nil];
     
-    [[RequestHandler handler] sendAsyncGetRequestAPIPath:path parameters:parameter modelClass:[FaqListModel class] completion:^(id responseObject) {
+    [[RequestHandler handler] sendAsyncPostRequestAPIPath:path parameters:parameter modelClass:[FaqListModel class] completion:^(id responseObject) {
         
         if (!responseObject) {//응답결과가 잘못되었거나 없을 경우,
             return;
@@ -133,12 +110,10 @@
         
         if (fetchedFaqList && fetchedFaqList.faqList && fetchedFaqList.faqList.count) { // API 성공
             
-            
-            NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:0];
+//            NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:0];
 
-            // 수정 팔요
-            if (_faqList && [_pagingType isEqualToString:ksListPagingTypeUpward]) {
-                [_faqList insertObjects:fetchedFaqList.faqList atIndexes:indexSet];
+            if (_pagingType && [_pagingType isEqualToString:ksListPagingTypeUpward]) {
+//                [_faqList insertObjects:fetchedFaqList.faqList atIndexes:indexSet];
             } else {
                 [_faqList addObjectsFromArray:fetchedFaqList.faqList];
             }
@@ -154,7 +129,6 @@
             
         } else {
             if (!_faqList.count) {  //이미 로드된 데이터가 있을 경우는 출력하지 않음.
-                
 //                [_mainView bringSubviewToFront:_noContentView];
                 _noContentView.hidden = NO;
                 _tableView.hidden = YES;
@@ -213,52 +187,29 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     
-    FaqModel *select_faq = _faqList[indexPath.row];
+    FaqModel *faq = _faqList[indexPath.row];
     FaqDetailViewController *vc =[CommonUtil instantiateViewControllerWithIdentifier:@"FaqDetailViewController" storyboardName:@"Main"];
     
-    vc.detail_Url = select_faq.detailUrl;
-//    _detailUrl = select_faq.detailUrl;
+    NSString *detail_count =[NSString stringWithFormat:@"%lu",(_faqList.count - indexPath.row)];
     
-//    NSString * detailUrl = select_faq.detailUrl;
-//    select_faq.detailUrl = detailUrl;
-//    
-//    vc.m_faq = select_faq;
+//    vc.detail_Url = select_faq.detailUrl;
+//    _detailUrl = select_faq.detailUrl;
+
+    vc.faqModel = faq;
+    vc.detail_count = detail_count;
     
     [self presentViewController:vc animated:YES completion:nil];
     
 }
 
-//
-//- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
-//    
-//    NSString* requestUrl = [[request URL] absoluteString];
-//    
-//    NSLog(@"webView: shouldStartLoadWithRequest:%@ navigationType:%ld", requestUrl, (long)navigationType);
-//    
-//    return YES;
-//    
-//}
-//
-//- (void)webViewDidStartLoad:(UIWebView *)webView {
-//    
-//    NSLog(@"webViewDidStartLoad : %@", [[webView.request URL] absoluteString]);
-//    
-//}
-//
-//- (void)webViewDidFinishLoad:(UIWebView *)webView {
-//    
-//    NSLog(@"webViewDidFinishLoad : %@", [[webView.request URL] absoluteString]);
-//    
-//}
-//
-//- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
-// 
-//}
-
-
 #pragma mark - UI Events
 - (IBAction)btnCloseTouched:(id)sender {
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    
+}
+
 @end

+ 7 - 1
OneCable/Classes/ViewControllers/MainScreens/ManagementViewController.h

@@ -20,8 +20,14 @@
 @property (weak, nonatomic) IBOutlet CustomImageView *imgvHomehubOff;
 @property (weak, nonatomic) IBOutlet CustomImageView * imgvSetAlert;
 
-
+@property (weak, nonatomic) IBOutlet CustomButton *btnNotice;
+@property (weak, nonatomic) IBOutlet CustomButton *btnFaq;
+@property (weak, nonatomic) IBOutlet CustomButton *btnMessage;
 @property (weak, nonatomic) IBOutlet CustomButton *btnHomeHub;
+@property (weak, nonatomic) IBOutlet CustomButton *btnSet;
+
+
+
 
 //mode
 @property (weak, nonatomic) IBOutlet CustomLabelButton *btnModeHome;

+ 12 - 13
OneCable/Classes/ViewControllers/MainScreens/MessageBoxViewController.m

@@ -62,11 +62,7 @@
 - (void)initRefreshController {
     //set refresh controls
     __weak typeof(self) weakSelf = self;
-//    self.refreshController = [[JYPullToRefreshController alloc] initWithScrollView:self.tableView];
-//    self.refreshController.pullToRefreshHandleAction = ^{
-//        [weakSelf requestPersonalNotices];
-//    };
-    
+
     self.refreshController = [[JYPullToRefreshController alloc] initWithScrollView:self.tableView];
     self.refreshController.pullToRefreshHandleAction = ^{
         [weakSelf requestPersonalNoticesRecently];
@@ -112,10 +108,15 @@
 
 - (void)requestPersonalNotices {
     //parameters
+//    NSDictionary *parameter = @{@"member_id" : [JDFacade facade].loginUser.emailId,
+//                                @"message_id": _pagingId ? _pagingId : ksEmptyString,
+//                                @"paging_type": _pagingType ? _pagingType : ksEmptyString,
+//                                @"read_datetime": [JDFacade facade].loginUser.personalNoticeReadTime ? [JDFacade facade].loginUser.personalNoticeReadTime : ksEmptyString};
+    
     NSDictionary *parameter = @{@"member_id" : [JDFacade facade].loginUser.emailId,
                                 @"message_id": _pagingId ? _pagingId : ksEmptyString,
-                                @"paging_type": _pagingType ? _pagingType : ksEmptyString,
-                                @"read_datetime": [JDFacade facade].loginUser.personalNoticeReadTime ? [JDFacade facade].loginUser.personalNoticeReadTime : ksEmptyString};
+                                @"paging_type" : ksEmptyString,
+                                @"read_datetime":  ksEmptyString};
     
 //    NSString *path = API_GET_NOTICE_PERSONAL;
     NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_NOTICE_PERSONAL arguments:nil];
@@ -135,8 +136,6 @@
                 [_personalNoticeList insertObjects:fetchedPersonalNoticeList.pushList atIndexes:indexSet];
             } else {
                 [_personalNoticeList addObjectsFromArray:fetchedPersonalNoticeList.pushList];
-//            [_personalNoticeList addObjectsFromArray:fetchedPersonalNoticeList.pushList];
-        
             }
 
             //테이블 컨텐츠가 없을 경우,
@@ -178,7 +177,7 @@
         
         if (self.loadMoreController) {
             [self.loadMoreController stopLoadMoreCompletion:nil];
-            self.loadMoreController.enable = _personalNoticeList.count % kdListPagginSize == 0;            
+            self.loadMoreController.enable = _personalNoticeList.count % kdListPagginSize == 0;
         }
         
         
@@ -266,9 +265,9 @@
     return cell;
 }
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    [super tableView:tableView didSelectRowAtIndexPath:indexPath];
-}
+//- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+//    [super tableView:tableView didSelectRowAtIndexPath:indexPath];
+//}
 
 //- (void)btnSubContentTouched:(id)sender {
 //    [[JDFacade facade] loadInvitationView];

+ 16 - 14
OneCable/Classes/ViewControllers/MainScreens/NoticeViewController.m

@@ -57,10 +57,6 @@
 - (void)initRefreshController {
     //set refresh controls
     __weak typeof(self) weakSelf = self;
-//    self.refreshController = [[JYPullToRefreshController alloc] initWithScrollView:self.tableView];
-//    self.refreshController.pullToRefreshHandleAction = ^{
-//        [weakSelf requestNoticeList];
-//    };
 
     self.refreshController = [[JYPullToRefreshController alloc] initWithScrollView:self.tableView];
     self.refreshController.pullToRefreshHandleAction = ^{
@@ -99,11 +95,16 @@
 
 - (void)requestNoticeList {
     //parameters
-    NSDictionary *parameter = @{@"member_id":[JDFacade facade].loginUser.memberId,
-                                @"notice_id" : _pagingId ? _pagingId : ksEmptyString,
-                                @"paging_type" : _pagingType ? _pagingType : ksEmptyString,
-                                @"read_datetime": [JDFacade facade].loginUser.noticeReadTime ? [JDFacade facade].loginUser.noticeReadTime : ksEmptyString };
+//    NSDictionary *parameter = @{@"member_id":[JDFacade facade].loginUser.memberId,
+//                                @"notice_id" : _pagingId ? _pagingId : ksEmptyString,
+//                                @"paging_type" : _pagingType ? _pagingType : ksEmptyString,
+//                                @"read_datetime": [JDFacade facade].loginUser.noticeReadTime ? [JDFacade facade].loginUser.noticeReadTime : ksEmptyString };
 
+    NSDictionary *parameter = @{@"member_id":[JDFacade facade].loginUser.emailId,
+                                @"notice_id" : _pagingId ? _pagingId : ksEmptyString,
+                                @"paging_type" : ksEmptyString,
+                                @"read_datetime" :  ksEmptyString };
+    
 //    NSString *path = [NSString stringWithFormat:API_GET_NOTICE];
     NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_NOTICE arguments:nil];
     
@@ -118,7 +119,9 @@
         if (fetchedNoticeList && fetchedNoticeList.noticeList &&
             fetchedNoticeList.noticeList.count) { //API 성공 ,
             
-            
+            NSLog(@"_pagingType : %@", _pagingType);
+            NSLog(@"_pagingId : %@",_pagingId);
+            NSLog(@"_paging noticeReadTime : %@ ",[JDFacade facade].loginUser.noticeReadTime);
             NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:0];
 
             if (_pagingType && [_pagingType isEqualToString:ksListPagingTypeUpward]) {
@@ -126,13 +129,11 @@
             } else {
             [_noticeList addObjectsFromArray:fetchedNoticeList.noticeList];
 
-//            [_noticeList addObjectsFromArray:
-//             [[fetchedNoticeList.noticeList reverseObjectEnumerator] allObjects]];
             }
 
             //테이블 컨텐츠가 없을 경우,
             if (_tableView.hidden) {
-                [_mainView bringSubviewToFront:_tableView];
+//                [_mainView bringSubviewToFront:_tableView];
                 _noContentView.hidden = YES;
                 _tableView.hidden = NO;
             }
@@ -143,7 +144,7 @@
         } else {
             if (!_noticeList.count) {//이미 로드된 데이터가 있을 경우는 출력하지 않음.
                 
-                [_mainView bringSubviewToFront:_noContentView];
+//                [_mainView bringSubviewToFront:_noContentView];
                 _noContentView.hidden = NO;
                 _tableView.hidden = YES;
             }
@@ -215,7 +216,8 @@
     cell.imgvStatus.image = isNew ? [UIImage imageNamed:@"common_bg_list_03"] : [UIImage imageNamed:@"common_bg_list_01"];
 
     cell.lblCount.text = [NSString stringWithFormat:@"%lu%@",(_noticeList.count - indexPath.row),@"."];
-    cell.lblContent.text = notice.content;
+    //    cell.lblContent.text = notice.content;
+    cell.lblContent.text = [NSString stringWithFormat:@"%@%@",notice.content,@"공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항공지사항" ];
     cell.lblCreateDatetime.text = [CommonUtil formattedDate4:notice.createDatetime];
     
     return cell;

+ 5 - 0
OneCable/Classes/ViewControllers/SettingsScreens/SettingsViewController.m

@@ -167,6 +167,7 @@
         LoginModel *response = (LoginModel *) responseObject;
         
         if (response) {//API 성공 ,
+            
             [_btnProfile sd_setBackgroundImageWithURL:[NSURL URLWithString:response.profileImage] forState:UIControlStateNormal placeholderImage:nil options:SDWebImageRefreshCached];
             [[JDFacade facade] toast:@"프로필 이미지를 변경했습니다"];
         }
@@ -224,7 +225,11 @@
             _btnProfile = tcell.btnProfile;
         }
         
+        if ([[JDFacade facade].loginUser.profileImage isEqualToString:@""]) {
+            [_btnProfile setBackgroundImage:[UIImage imageNamed:@"img_member_photo_default"] forState:UIControlStateNormal];
+        } else {
         [_btnProfile sd_setBackgroundImageWithURL:[NSURL URLWithString:[JDFacade facade].loginUser.profileImage] forState:UIControlStateNormal placeholderImage:nil options:SDWebImageRefreshCached];
+        }
         
         //set checkbox
         if (!_chkAutoLogin) {