瀏覽代碼

- 장치 UI 수정

TaeHyun 8 年之前
父節點
當前提交
9dbc583179

+ 21 - 10
OneCable/Base.lproj/Things.storyboard

@@ -36,6 +36,13 @@
                                                     <constraint firstAttribute="width" constant="15" id="OTp-Y6-5bn"/>
                                                 </constraints>
                                             </view>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_head_logo" translatesAutoresizingMaskIntoConstraints="NO" id="jj4-yY-OvT" customClass="CustomImageView">
+                                                <rect key="frame" x="190" y="20" width="80" height="50"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="80" id="Kw1-aj-C6P"/>
+                                                    <constraint firstAttribute="height" constant="50" id="yoa-VE-iCD"/>
+                                                </constraints>
+                                            </imageView>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bsD-dR-bxK" customClass="CustomButton">
                                                 <rect key="frame" x="270" y="20" width="50" height="50"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -200,6 +207,7 @@
                                             <constraint firstAttribute="trailing" secondItem="Vs0-VT-7Jr" secondAttribute="trailing" id="6uQ-3X-d73"/>
                                             <constraint firstAttribute="bottom" secondItem="u0O-AJ-zyI" secondAttribute="bottom" id="87O-UK-JpN"/>
                                             <constraint firstAttribute="bottom" secondItem="fW2-6O-SuF" secondAttribute="bottom" id="FqU-hH-eGr"/>
+                                            <constraint firstItem="jj4-yY-OvT" firstAttribute="centerY" secondItem="bsD-dR-bxK" secondAttribute="centerY" id="IHj-f8-8Tu"/>
                                             <constraint firstAttribute="trailing" secondItem="bsD-dR-bxK" secondAttribute="trailing" constant="8" id="Lix-dJ-aRk">
                                                 <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
                                             </constraint>
@@ -211,6 +219,7 @@
                                             <constraint firstItem="fW2-6O-SuF" firstAttribute="leading" secondItem="Vc6-XX-U5k" secondAttribute="trailing" id="WgC-2S-zAC"/>
                                             <constraint firstItem="Vc6-XX-U5k" firstAttribute="leading" secondItem="u0O-AJ-zyI" secondAttribute="trailing" id="bFf-3O-wet"/>
                                             <constraint firstItem="9cx-qS-cUP" firstAttribute="leading" secondItem="u0O-AJ-zyI" secondAttribute="trailing" id="bP4-n1-HMD"/>
+                                            <constraint firstItem="bsD-dR-bxK" firstAttribute="leading" secondItem="jj4-yY-OvT" secondAttribute="trailing" id="fgR-Ta-Nab"/>
                                             <constraint firstItem="Vc6-XX-U5k" firstAttribute="top" secondItem="qAY-8c-k5A" secondAttribute="top" constant="20" id="hMX-Ld-qZY"/>
                                             <constraint firstItem="NYo-u2-QsD" firstAttribute="leading" secondItem="qAY-8c-k5A" secondAttribute="leading" constant="18" id="kE8-F3-cDR"/>
                                             <constraint firstAttribute="bottom" secondItem="bsD-dR-bxK" secondAttribute="bottom" constant="20" id="kiP-a2-DJw">
@@ -926,6 +935,7 @@
                         <outlet property="collectionView" destination="Xfm-Om-Wkr" id="Wk3-RF-8Xd"/>
                         <outlet property="imgvConnectHub" destination="4EA-vh-2Ou" id="5pa-Ra-Hd5"/>
                         <outlet property="imgvHubAlert" destination="NYo-u2-QsD" id="EKy-FQ-nD8"/>
+                        <outlet property="imgvLogo" destination="jj4-yY-OvT" id="pTN-wy-o2T"/>
                         <outlet property="lblConnectHub" destination="auZ-9c-1Rz" id="psm-yc-0k6"/>
                         <outlet property="lblCount" destination="dTZ-mF-DDM" id="SQK-kQ-mXP"/>
                         <outlet property="lblEditMode" destination="9cx-qS-cUP" id="vdh-2B-CMX"/>
@@ -1090,7 +1100,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="320" height="68"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8am-9B-OVU" id="3z1-RY-sUu">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="67"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q6u-Ql-uvI">
@@ -1327,7 +1337,7 @@
                                                 <rect key="frame" x="0.0" y="96" width="320" height="322"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="h1h-oK-SGQ" id="PcJ-j1-AEV">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="322"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="321"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bu5-Tt-H5r">
@@ -1433,7 +1443,7 @@
                                                 <rect key="frame" x="0.0" y="418" width="320" height="63"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4Vp-TW-mCg" id="Gxj-Z0-xe2">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="62"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SpF-Bb-9qN" userLabel="View - container">
@@ -1546,7 +1556,7 @@
                                                 <rect key="frame" x="0.0" y="481" width="320" height="89"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="O2N-bm-Hvc" id="k2Z-gW-HLc">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="88.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k8h-3L-ehd">
@@ -1889,7 +1899,7 @@
                                                 <rect key="frame" x="0.0" y="28" width="320" height="154"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eAC-dN-TM9" id="wmw-7q-Ee8">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="154"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="153"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="afL-97-7bS">
@@ -4791,7 +4801,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="NtT-cS-pzA" firstAttribute="leading" secondItem="HYO-OC-fv1" secondAttribute="trailing" id="Eac-BD-BQY"/>
                             <constraint firstItem="HYO-OC-fv1" firstAttribute="leading" secondItem="Tlc-hO-Eua" secondAttribute="trailing" id="FeA-ma-qF1"/>
@@ -5080,7 +5090,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="3zH-ge-VQ0" firstAttribute="top" secondItem="PPM-LH-37d" secondAttribute="top" id="2dq-dg-UyG"/>
                             <constraint firstItem="UPb-lc-mVm" firstAttribute="top" secondItem="PPM-LH-37d" secondAttribute="top" id="7if-BR-ULj"/>
@@ -5391,7 +5401,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="B0H-eI-bBf" firstAttribute="leading" secondItem="T3f-8r-jZL" secondAttribute="leading" id="CSA-Ct-sRp"/>
                             <constraint firstItem="q3C-PR-Gjp" firstAttribute="leading" secondItem="T3f-8r-jZL" secondAttribute="leading" id="DaS-LR-wSi"/>
@@ -5700,7 +5710,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="slU-uF-Ke4" firstAttribute="top" secondItem="q06-WB-gnb" secondAttribute="bottom" id="4Qw-Uv-QuJ"/>
                             <constraint firstAttribute="trailing" secondItem="q06-WB-gnb" secondAttribute="trailing" id="8AX-8N-Q3H"/>
@@ -6080,7 +6090,7 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="vYF-Ok-RLN" firstAttribute="top" secondItem="0tZ-33-1ez" secondAttribute="bottom" id="1su-qd-POe"/>
                             <constraint firstItem="0tZ-33-1ez" firstAttribute="leading" secondItem="Fab-Qe-FSS" secondAttribute="leading" id="AUe-dU-eDx"/>
@@ -6150,6 +6160,7 @@
         <image name="common_head_btn_save_press" width="50" height="50"/>
         <image name="common_head_btn_update" width="50" height="50"/>
         <image name="common_head_btn_update_press" width="50" height="50"/>
+        <image name="common_head_logo" width="80" height="50"/>
         <image name="common_icon_arrow" width="9" height="9"/>
         <image name="common_icon_arrow_press" width="9" height="9"/>
         <image name="common_list_btn_big_add" width="44" height="44"/>

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

@@ -27,6 +27,7 @@
 @property (weak, nonatomic) IBOutlet UIImageView *imgvHubAlert;
 @property (weak, nonatomic) IBOutlet CustomButton *btnOption;
 @property (weak, nonatomic) IBOutlet CustomButton *btnClose;
+@property (weak, nonatomic) IBOutlet CustomImageView *imgvLogo; // 로고
 
 @property (weak, nonatomic) IBOutlet UIView *viewEditMode;
 @property (weak, nonatomic) IBOutlet CustomButton *btnEditClose;