Quellcode durchsuchen

장치 상세를 제외한 업데이트 : 최진오

jinochoi vor 8 Jahren
Ursprung
Commit
1aa26761e3

+ 95 - 0
onecable_admin/src/main/res/layout/aaa.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:background="#000000"
+              android:layout_height="match_parent">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:orientation="vertical"
+                android:layout_height="wrap_content">
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:layout_height="wrap_content">
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:textSize="12dp"
+                    android:text="최진오"
+                    />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

+ 111 - 0
onecable_admin/src/main/res/layout/faq.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2015. Ncomz. All Rights Reserved
+  -->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/llPageRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/color_body_02"
+        android:fitsSystemWindows="true"
+        android:orientation="vertical">
+
+    <include layout="@layout/app_toolbar"/>
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                >
+
+            <android.support.v4.widget.SwipeRefreshLayout
+                    android:id="@+id/swiperefreshlayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:visibility="visible">
+
+                <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rcvList"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:overScrollMode="never"
+                        android:clipToPadding="false"/>
+            </android.support.v4.widget.SwipeRefreshLayout>
+
+            <LinearLayout
+                    android:id="@+id/llNodata1"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:paddingTop="80dp"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
+                    android:visibility="gone">
+
+                <TextView
+                        android:id="@+id/tvNodataTitle1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:includeFontPadding="false"
+                        android:text="@string/layout_notice_02"
+                        android:textColor="@color/color_text_01"
+                        android:textSize="@dimen/size_font_02"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="6dp"
+                android:layout_alignParentTop="true"
+                android:background="@drawable/shadow_top"/>
+
+        <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="7dp"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/shadow_bottom"/>
+    </RelativeLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <View
+                style="@style/width_Divider_02"/>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_gravity="center_horizontal"
+                android:background="@drawable/color_bg_01"
+                android:gravity="center">
+
+            <LinearLayout
+                    android:id="@+id/llBtn1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center">
+
+                <TextView
+                        android:id="@+id/tvBtn1"
+                        android:text="@string/layout_close"
+                        style="@style/bottom_button_text_no"/>
+            </LinearLayout>
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

+ 141 - 0
onecable_admin/src/main/res/layout/faq_detail.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2015. Ncomz. All Rights Reserved
+  -->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/llPageRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/color_body_02"
+        android:fitsSystemWindows="true"
+        android:orientation="vertical">
+
+    <include layout="@layout/app_toolbar"/>
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+        >
+
+            <android.support.v4.widget.SwipeRefreshLayout
+                    android:id="@+id/swiperefreshlayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:visibility="visible">
+
+                <com.ntels.onecable.admin.common.widget.CustomScrollView
+                        android:overScrollMode="never"
+                        android:id="@+id/svBody"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        android:fadingEdge="none">
+
+                    <LinearLayout
+                            android:id="@+id/llSvbody"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
+                        <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingLeft="15dp"
+                                android:paddingRight="15dp"
+                                android:paddingTop="20dp"
+                                android:paddingBottom="20dp">
+                            <TextView
+                                    android:id="@+id/tvFaqTitle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    style="@style/setting_title_text"/>
+                        </LinearLayout>
+                        <View
+                                style="@style/width_Divider_01"/>
+                        <WebView
+                                android:id="@+id/wvFaqDetail"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"/>
+                    </LinearLayout>
+                </com.ntels.onecable.admin.common.widget.CustomScrollView>
+            </android.support.v4.widget.SwipeRefreshLayout>
+
+            <LinearLayout
+                    android:id="@+id/llNodata1"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:paddingTop="80dp"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
+                    android:visibility="gone">
+
+                <TextView
+                        android:id="@+id/tvNodataTitle1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:includeFontPadding="false"
+                        android:text="@string/layout_notice_02"
+                        android:textColor="@color/color_text_01"
+                        android:textSize="@dimen/size_font_02"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="6dp"
+                android:layout_alignParentTop="true"
+                android:background="@drawable/shadow_top"/>
+
+        <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="7dp"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/shadow_bottom"/>
+    </RelativeLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <View
+                style="@style/width_Divider_02"/>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_gravity="center_horizontal"
+                android:background="@drawable/color_bg_01"
+                android:gravity="center">
+
+            <LinearLayout
+                    android:id="@+id/llBtn1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center">
+
+                <TextView
+                        android:id="@+id/tvBtn1"
+                        android:text="@string/layout_close"
+                        style="@style/bottom_button_text_no"/>
+            </LinearLayout>
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

+ 131 - 0
onecable_admin/src/main/res/layout/homehub_ble_step1.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:background="@drawable/color_body_01">
+
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:src="@drawable/img_homehub_setting_step_1"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center"
+                    android:textColor="@color/color_text_01"
+                    android:textSize="@dimen/size_font_02"
+                    android:text="@string/layout_homehub_ble_step1_02"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textColor="@color/color_text_01"
+                    android:textSize="@dimen/size_font_02"
+                    android:text="@string/layout_homehub_ble_step1_03"/>
+
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:src="@drawable/img_homehub_setting_step_1"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center"
+                    android:textColor="@color/color_text_01"
+                    android:textSize="@dimen/size_font_02"
+                    android:text="@string/layout_homehub_ble_step1_04"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center"
+                    android:textColor="@color/color_text_01"
+                    android:textSize="@dimen/size_font_02"
+                    android:text="@string/layout_homehub_ble_step1_05"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_cancel"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+        <View
+                android:id="@+id/vLine"
+                android:visibility="visible"
+                style="@style/height_Divider_03"/>
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_next"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>

+ 152 - 0
onecable_admin/src/main/res/layout/homehub_ble_step2.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/swiperefreshlayou"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:background="@drawable/color_body_01">
+
+                <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:src="@drawable/img_homehub_setting_step_2"/>
+
+                <TextView
+                        android:id="@+id/tvLoadingMsg"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="25dp"
+                        android:gravity="center"
+                        android:textColor="@color/color_text_01"
+                        android:textSize="@dimen/size_font_02"
+                        android:text="@string/layout_homehub_ble_step2_02"/>
+
+                <TextView
+                        android:id="@+id/tvLoadingMsg1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:textColor="@color/color_text_01"
+                        android:textSize="@dimen/size_font_02"
+                        android:text="@string/layout_homehub_ble_step2_03"/>
+
+                <RelativeLayout
+                        android:id="@+id/rlProgressLoading"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                    <ProgressBar
+                            android:id="@+id/progressLoading"
+                            android:theme="@style/CircleProgressBar"
+                            style="@style/Widget.AppCompat.ProgressBar"
+                            android:layout_width="55dp"
+                            android:layout_height="55dp"/>
+
+                    <TextView
+                            android:id="@+id/tvConnectTime"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:includeFontPadding="false"
+                            android:layout_centerInParent="true"
+                            android:text=""
+                            android:textColor="@color/color_text_01"
+                            android:textSize="@dimen/size_font_05"
+                            android:textStyle="bold"/>
+
+                </RelativeLayout>
+
+
+            </LinearLayout>
+
+            <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rvHomhubList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:overScrollMode="never"
+                    android:visibility="gone"/>
+
+        </LinearLayout>
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_cancel"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+        <View
+                android:id="@+id/vLine"
+                android:visibility="visible"
+                style="@style/height_Divider_03"/>
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_next"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>

+ 77 - 0
onecable_admin/src/main/res/layout/homehub_ble_step2_err.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <ImageView
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_marginTop="60dp"
+                android:background="@drawable/common_bullet_alert_on"/>
+        <TextView
+                android:id="@+id/tvErrMsgMsg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center"
+                android:textColor="@color/color_text_01"
+                android:textSize="@dimen/size_font_02"
+                android:text="@string/layout_homehub_ble_step2_err_02"/>
+
+        <Button
+                android:id="@+id/btnRetry"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:paddingLeft="20dp"
+                android:layout_marginTop="25dp"
+                android:paddingRight="20dp"
+                android:text="@string/layout_retry"
+                android:textColor="@color/color_text_01"
+                android:textSize="@dimen/size_font_04"
+                android:background="@drawable/d_img_btn_common"/>
+
+    </LinearLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center_horizontal"
+            android:background="@drawable/color_bg_01"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_close"
+                    android:textColor="@drawable/d_font_color_font_01_color_font_02"
+                    android:textSize="@dimen/size_font_05"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

+ 124 - 0
onecable_admin/src/main/res/layout/homehub_ble_step3.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:background="@drawable/color_body_01">
+
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:src="@drawable/img_homehub_setting_step_3"/>
+
+            <TextView
+                    android:id="@+id/tvMsg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center"
+                    android:textColor="@color/color_text_01"
+                    android:textSize="@dimen/size_font_02"
+                    android:textStyle="bold"
+                    android:text="@string/layout_homehub_ble_step3_02"/>
+
+            <TextView
+                    android:id="@+id/tvSsid"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center"
+                    android:textColor="@color/color_text_03"
+                    android:textSize="@dimen/size_font_03"
+                    android:text=""/>
+
+            <Button
+                    android:id="@+id/btnRetry"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:paddingLeft="20dp"
+                    android:layout_marginTop="80dp"
+                    android:paddingRight="20dp"
+                    android:text="@string/layout_homehub_ble_step3_06"
+                    android:textColor="@color/color_text_01"
+                    android:textSize="@dimen/size_font_04"
+                    android:background="@drawable/d_img_btn_common"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_cancel"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+        <View
+                android:id="@+id/vLine"
+                android:visibility="visible"
+                style="@style/height_Divider_03"/>
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_next"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>

+ 144 - 0
onecable_admin/src/main/res/layout/homehub_ble_step4.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/swiperefreshlayou"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:background="@drawable/color_body_01">
+
+                <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:src="@drawable/img_homehub_setting_step_4"/>
+
+                <TextView
+                        android:id="@+id/tvLoadingMsg"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="25dp"
+                        android:gravity="center"
+                        android:textColor="@color/color_text_01"
+                        android:textSize="@dimen/size_font_02"
+                        android:text="@string/layout_homehub_ble_step4_02"/>
+
+
+                <RelativeLayout
+                        android:id="@+id/rlProgressLoading"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                    <ProgressBar
+                            android:id="@+id/progressLoading"
+                            android:theme="@style/CircleProgressBar"
+                            style="@style/Widget.AppCompat.ProgressBar"
+                            android:layout_width="55dp"
+                            android:layout_height="55dp"/>
+
+                    <TextView
+                            android:id="@+id/tvConnectTime"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:includeFontPadding="false"
+                            android:layout_centerInParent="true"
+                            android:text=""
+                            android:textColor="@color/color_text_01"
+                            android:textSize="@dimen/size_font_05"
+                            android:textStyle="bold"/>
+
+                </RelativeLayout>
+
+
+            </LinearLayout>
+
+            <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rvHomhubList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:overScrollMode="never"
+                    android:visibility="gone"/>
+
+        </LinearLayout>
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_cancel"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+        <View
+                android:id="@+id/vLine"
+                android:visibility="visible"
+                style="@style/height_Divider_03"/>
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_next"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>

+ 77 - 0
onecable_admin/src/main/res/layout/homehub_ble_step4_err.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <ImageView
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_marginTop="60dp"
+                android:background="@drawable/common_bullet_alert_on"/>
+        <TextView
+                android:id="@+id/tvErrMsgMsg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center"
+                android:textColor="@color/color_text_01"
+                android:textSize="@dimen/size_font_02"
+                android:text="@string/layout_homehub_ble_step4_err_02"/>
+
+        <Button
+                android:id="@+id/btnRetry"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:paddingLeft="20dp"
+                android:layout_marginTop="25dp"
+                android:paddingRight="20dp"
+                android:text="@string/layout_homehub_ble_step4_err_03"
+                android:textColor="@color/color_text_01"
+                android:textSize="@dimen/size_font_04"
+                android:background="@drawable/d_img_btn_common"/>
+
+    </LinearLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center_horizontal"
+            android:background="@drawable/color_bg_01"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_close"
+                    android:textColor="@drawable/d_font_color_font_01_color_font_02"
+                    android:textSize="@dimen/size_font_05"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

+ 164 - 0
onecable_admin/src/main/res/layout/homehub_ble_step5.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            >
+
+        <com.ntels.onecable.admin.common.widget.CustomScrollView
+                android:overScrollMode="never"
+                android:id="@+id/svBody"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:fadingEdge="none">
+
+            <LinearLayout
+                    android:id="@+id/llSvbody"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="18dp"
+                    android:orientation="vertical">
+
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="20dp"
+                        android:gravity="center_horizontal"
+                        android:orientation="vertical"
+                        android:background="@drawable/color_body_01">
+
+                    <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="15dp"
+                            android:src="@drawable/img_homehub_setting_step_5"/>
+
+                    <TextView
+                            android:id="@+id/tvMsg"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="25dp"
+                            android:gravity="center"
+                            android:textColor="@color/color_text_01"
+                            android:textSize="@dimen/size_font_02"
+                            android:textStyle="bold"
+                            android:text="@string/layout_homehub_ble_step5_02"/>
+
+                    <TextView
+                            android:id="@+id/tvSsid"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="25dp"
+                            android:gravity="center"
+                            android:textColor="@color/color_text_03"
+                            android:textSize="@dimen/size_font_03"
+                            android:text=""/>
+
+                    <EditText
+                            android:id="@+id/edtPass"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:background="@drawable/d_img_input_round_bg"
+                            android:gravity="left|center_vertical"
+                            android:imeOptions="actionDone"
+                            android:includeFontPadding="false"
+                            android:inputType="textEmailAddress"
+                            android:minHeight="40dp"
+                            android:layout_marginTop="18dp"
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:paddingLeft="10dp"
+                            android:paddingRight="10dp"
+                            android:singleLine="true"
+                            android:textColor="@color/color_text_01"
+                            android:textColorHint="@color/color_text_03"
+                            android:textSize="@dimen/size_font_04">
+                    </EditText>
+
+                    <Button
+                            android:id="@+id/btnRetry"
+                            android:layout_width="wrap_content"
+                            android:layout_height="35dp"
+                            android:paddingLeft="20dp"
+                            android:layout_marginTop="125dp"
+                            android:paddingRight="20dp"
+                            android:text="@string/layout_homehub_ble_step5_03"
+                            android:textColor="@color/color_text_01"
+                            android:textSize="@dimen/size_font_04"
+                            android:background="@drawable/d_img_btn_common"/>
+                </LinearLayout>
+            </LinearLayout>
+        </com.ntels.onecable.admin.common.widget.CustomScrollView>
+    </LinearLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_cancel"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+        <View
+                android:id="@+id/vLine"
+                android:visibility="visible"
+                style="@style/height_Divider_03"/>
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_next"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>

+ 72 - 0
onecable_admin/src/main/res/layout/homehub_ble_step6.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_01">
+
+    <include
+            layout="@layout/app_toolbar"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:background="@drawable/color_body_01">
+
+            <TextView
+                    android:id="@+id/tvMsg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="60dp"
+                    android:gravity="center"
+                    android:textColor="@color/color_text_01"
+                    android:textSize="@dimen/size_font_02"
+                    android:textStyle="bold"
+                    android:text=""/>
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <View
+            style="@style/width_Divider_03"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center">
+
+        <LinearLayout
+                android:id="@+id/llBtn1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/img_popup_btn_dv"
+                android:gravity="center">
+
+            <TextView
+                    android:id="@+id/tvBtn1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:includeFontPadding="false"
+                    android:text="@string/layout_ok"
+                    android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                    android:textSize="@dimen/size_font_09"
+                    android:textStyle="bold"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>

+ 48 - 0
onecable_admin/src/main/res/layout/row_faq_list.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2015. Ncomz. All Rights Reserved
+  -->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/llRowRoot"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+    <LinearLayout
+            android:id="@+id/llRowBody"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingBottom="30dp"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:paddingTop="30dp">
+
+        <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal">
+
+            <!--<TextView
+                    android:id="@+id/tvRowBodyId"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:singleLine="true"
+                    android:textColor="@color/color_text_03"
+                    android:textSize="@dimen/size_font_04"/>-->
+
+            <TextView
+                    android:id="@+id/tvRowBodyTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:maxLines="3"
+                    android:textColor="@color/color_text_03"
+                    android:textSize="@dimen/size_font_04"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

+ 47 - 0
onecable_admin/src/main/res/layout/row_homehub_ble_list.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2015. Ncomz. All Rights Reserved
+  -->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/llRoot"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_02">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="30dp">
+
+        <TextView
+                android:id="@+id/tvModelName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/color_text_01"
+                android:textSize="@dimen/size_font_02"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:gravity="left"
+                android:text=""/>
+
+        <TextView
+                android:id="@+id/tvAddress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:gravity="left"
+                android:singleLine="true"
+                android:text=""
+                android:textColor="@color/color_text_01"
+                android:textSize="@dimen/size_font_04"/>
+    </LinearLayout>
+
+    <View style="@style/width_Divider_01"/>
+</LinearLayout>

+ 55 - 0
onecable_admin/src/main/res/layout/row_homehub_ssid_list.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2015. Ncomz. All Rights Reserved
+  -->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/llRoot"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/color_body_02">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:gravity="center_vertical"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="30dp">
+
+        <ImageView
+                android:id="@+id/ivIcon"
+                android:layout_width="30dp"
+                android:layout_height="25dp"
+                android:duplicateParentState="true"
+                android:background="@drawable/img_list_network_wifi_lock"
+                android:textAllCaps="false"/>
+
+        <TextView
+                android:id="@+id/tvSsidName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginLeft="12dp"
+                android:textColor="@color/color_text_01"
+                android:textSize="@dimen/size_font_02"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:gravity="left"
+                android:text=""/>
+
+        <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:duplicateParentState="true"
+                android:background="@drawable/d_common_radiobox"
+                android:textAllCaps="false"/>
+    </LinearLayout>
+
+    <View style="@style/width_Divider_01"/>
+</LinearLayout>

+ 113 - 114
onecable_admin/src/main/res/layout/row_things_detail_list.xml

@@ -8,7 +8,7 @@
         android:id="@+id/llRowRoot"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/color_bg_03"
+        android:background="@drawable/color_body_02"
         android:orientation="vertical">
 
 
@@ -16,153 +16,151 @@
             android:id="@+id/llRowBody"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/color_body_02"
             android:orientation="vertical">
 
+        <LinearLayout
+                android:id="@+id/llRowBody1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+
             <LinearLayout
-                    android:id="@+id/llRowBody1"
+                    android:id="@+id/llRowBody1_Contents"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
+                    android:gravity="center"
                     android:orientation="vertical">
 
 
                 <LinearLayout
-                        android:id="@+id/llRowBody1_Contents"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:orientation="vertical">
-
+                        android:paddingLeft="15dp"
+                        android:paddingRight="15dp"
+                        android:orientation="horizontal">
 
-                    <LinearLayout
-                            android:layout_width="match_parent"
+                    <TextView
+                            android:id="@+id/tvRowBody1_Title"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="15dp"
-                            android:orientation="horizontal">
+                            android:gravity="left"
+                            android:includeFontPadding="false"
+                            android:layout_marginTop="15dp"
+                            android:layout_marginBottom="15dp"
+                            android:maxLines="1"
+                            android:text="닫힘"
+                            android:textColor="@color/color_text_02"
+                            android:textSize="@dimen/size_font_02"
+                            android:textStyle="bold"/>
+
+                    <RelativeLayout
+                            android:id="@+id/rlRowBody1_Control"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
 
-                        <TextView
-                                android:id="@+id/tvRowBody1_Title"
+                        <LinearLayout
+                                android:id="@+id/llRowBody1_Control"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:gravity="left"
-                                android:includeFontPadding="false"
-                                android:layout_marginTop="15dp"
-                                android:layout_marginBottom="15dp"
-                                android:maxLines="1"
-                                android:text="닫힘"
-                                android:textColor="@color/color_text_02"
-                                android:textSize="@dimen/size_font_02"
-                                android:textStyle="bold"/>
-
-                        <RelativeLayout
-                                android:id="@+id/rlRowBody1_Control"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1">
-
-                            <LinearLayout
-                                    android:id="@+id/llRowBody1_Control"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_alignParentRight="true">
-
-                                <Button
-                                        android:id="@+id/btnRowBody1_Contents_On"
-                                        android:layout_width="45dp"
-                                        android:layout_height="45dp"
-                                        android:background="@drawable/d_img_things_detail_06_99_btn_on"
-                                        android:textColor="@color/color_text_04"
-                                        android:textSize="@dimen/size_font_02"/>
-
-                                <Button
-                                        android:id="@+id/btnRowBody1_Contents_Off"
-                                        android:layout_width="45dp"
-                                        android:layout_height="45dp"
-                                        android:background="@drawable/d_img_things_detail_06_99_btn_off"
-                                        android:textColor="@color/color_text_04"
-                                        android:textSize="@dimen/size_font_02"/>
-                            </LinearLayout>
-
-                            <LinearLayout
-                                    android:id="@+id/llLoading1"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:layout_alignBottom="@+id/llRowBody1_Control"
-                                    android:layout_alignLeft="@+id/llRowBody1_Control"
-                                    android:layout_alignRight="@+id/llRowBody1_Control"
-                                    android:layout_alignTop="@+id/llRowBody1_Control"
-                                    android:background="@drawable/common_bg_alpha_85_w"
-                                    android:gravity="center"
-                                    android:visibility="gone">
-
-                                <ProgressBar
-                                        android:layout_width="45dp"
-                                        android:layout_height="45dp"
-                                        android:indeterminateDrawable="@drawable/d_things_run_loading"
-                                        android:indeterminateDuration="100"/>
-                            </LinearLayout>
-                        </RelativeLayout>
-                    </LinearLayout>
-
-                    <View
-                            style="@style/width_Divider_02"/>
+                                android:layout_alignParentRight="true">
+
+                            <Button
+                                    android:id="@+id/btnRowBody1_Contents_On"
+                                    android:layout_width="45dp"
+                                    android:layout_height="45dp"
+                                    android:background="@drawable/d_img_things_detail_06_99_btn_on"
+                                    android:textColor="@color/color_text_04"
+                                    android:textSize="@dimen/size_font_02"/>
+
+                            <Button
+                                    android:id="@+id/btnRowBody1_Contents_Off"
+                                    android:layout_width="45dp"
+                                    android:layout_height="45dp"
+                                    android:background="@drawable/d_img_things_detail_06_99_btn_off"
+                                    android:textColor="@color/color_text_04"
+                                    android:textSize="@dimen/size_font_02"/>
+                        </LinearLayout>
+
+                        <LinearLayout
+                                android:id="@+id/llLoading1"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_alignBottom="@+id/llRowBody1_Control"
+                                android:layout_alignLeft="@+id/llRowBody1_Control"
+                                android:layout_alignRight="@+id/llRowBody1_Control"
+                                android:layout_alignTop="@+id/llRowBody1_Control"
+                                android:background="@drawable/common_bg_alpha_85_w"
+                                android:gravity="center"
+                                android:visibility="gone">
+
+                            <ProgressBar
+                                    android:layout_width="45dp"
+                                    android:layout_height="45dp"
+                                    android:indeterminateDrawable="@drawable/d_things_run_loading"
+                                    android:indeterminateDuration="100"/>
+                        </LinearLayout>
+                    </RelativeLayout>
                 </LinearLayout>
 
+                <View
+                        style="@style/width_Divider_02"/>
+            </LinearLayout>
+
+            <LinearLayout
+                    android:id="@+id/llRowBody1_LastTime"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
                 <LinearLayout
-                        android:id="@+id/llRowBody1_LastTime"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:orientation="vertical">
+                        android:paddingLeft="15dp"
+                        android:paddingRight="15dp"
+                        android:orientation="horizontal">
 
-                    <LinearLayout
-                            android:layout_width="match_parent"
+                    <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="15dp"
-                            android:orientation="horizontal">
-
-                        <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="left"
-                                android:includeFontPadding="false"
-                                android:maxLines="1"
-                                android:layout_marginTop="15dp"
-                                android:layout_marginBottom="15dp"
-                                android:text="마지막 동작"
-                                android:textColor="@color/color_text_01"
-                                android:textSize="@dimen/size_font_04"/>
-
-                        <TextView
-                                android:id="@+id/tvRowBody1_Lasttime"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="left"
-                                android:includeFontPadding="false"
-                                android:maxLines="1"
-                                android:text="2017.02.08 14:00"
-                                android:textColor="@color/color_text_01"
-                                android:textSize="@dimen/size_font_04"/>
-                    </LinearLayout>
-
-                    <View
-                            style="@style/width_Divider_02"/>
+                            android:layout_weight="1"
+                            android:gravity="left"
+                            android:includeFontPadding="false"
+                            android:maxLines="1"
+                            android:layout_marginTop="15dp"
+                            android:layout_marginBottom="15dp"
+                            android:text="마지막 동작"
+                            android:textColor="@color/color_text_01"
+                            android:textSize="@dimen/size_font_04"/>
+
+                    <TextView
+                            android:id="@+id/tvRowBody1_Lasttime"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="left"
+                            android:includeFontPadding="false"
+                            android:maxLines="1"
+                            android:text="2017.02.08 14:00"
+                            android:textColor="@color/color_text_01"
+                            android:textSize="@dimen/size_font_04"/>
                 </LinearLayout>
 
+                <View
+                        style="@style/width_Divider_02"/>
             </LinearLayout>
 
+        </LinearLayout>
+
 
         <LinearLayout
                 android:id="@+id/llRowBody2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/color_body_02"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -245,6 +243,7 @@
 
             <View
                     style="@style/width_Divider_01"/>
+
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>

+ 14 - 0
onecable_admin/src/main/res/layout/test1111.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_margin="10dp"
+                android:background="@drawable/d_list_bg"
+            android:layout_height="match_parent">
+
+    </LinearLayout>
+</LinearLayout>