From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/res/layout/layout_home_fragment.xml | 144 ++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 77 deletions(-)
diff --git a/app/src/main/res/layout/layout_home_fragment.xml b/app/src/main/res/layout/layout_home_fragment.xml
index b03871d..69133fd 100644
--- a/app/src/main/res/layout/layout_home_fragment.xml
+++ b/app/src/main/res/layout/layout_home_fragment.xml
@@ -3,90 +3,80 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
- <include android:id="@+id/tb" layout="@layout/toolbar"/>
- <LinearLayout
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_below="@+id/tb"
- android:orientation="horizontal"
android:gravity="center"
- android:background="@color/home_bg_color">
- <LinearLayout
- android:layout_width="100dp"
- android:layout_height="100dp"
- android:gravity="center"
+ >
+ <RelativeLayout
+ android:layout_width="558px"
+ android:layout_height="244px"
+ android:background="@mipmap/let_top"
android:id="@+id/network_train"
- android:layout_weight="1"
- android:orientation="vertical">
- <safeluck.drive.evaluation.customview.CircleImageView
- style="@style/home_fragment_icon"
- app:civ_fill_color="@android:color/white"
- app:civ_border_width="15dp"
- app:civ_border_color="@android:color/white"
-
- android:src="@drawable/vehicle_network"
- />
- <TextView
- style="@style/home_fragment_text_sub"
- android:text="@string/vehicle_net"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="100dp"
- android:layout_height="100dp"
- android:gravity="center"
- android:layout_weight="1"
+ >
+ <include
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ layout="@layout/layout_sys_home_part"/>
+ </RelativeLayout>
+ <RelativeLayout
+ android:layout_width="512px"
+ android:layout_height="244px"
+ android:layout_marginLeft="-45px"
+ android:background="@mipmap/right_top"
+ android:layout_toRightOf="@+id/network_train"
android:id="@+id/car_train"
- android:orientation="vertical">
- <safeluck.drive.evaluation.customview.CircleImageView
-
- app:civ_fill_color="@android:color/white"
- app:civ_border_width="15dp"
- app:civ_border_color="@android:color/white"
- android:src="@drawable/wheel"
- style="@style/home_fragment_icon"/>
- <TextView
- style="@style/home_fragment_text_sub"
- android:text="@string/vehicle_train"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="100dp"
- android:layout_height="100dp"
- android:gravity="center"
+ >
+ <include
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ layout="@layout/layout_sys_home_part_train"/>
+ </RelativeLayout>
+ <RelativeLayout
+ android:layout_width="512px"
+ android:layout_height="244px"
+ android:layout_marginTop="13px"
+ android:background="@mipmap/left_bottom"
android:id="@+id/system_setting"
- android:layout_weight="1"
- android:orientation="vertical">
- <safeluck.drive.evaluation.customview.CircleImageView
- app:civ_fill_color="@android:color/white"
- app:civ_border_width="15dp"
- app:civ_border_color="@android:color/white"
- android:src="@drawable/setting"
- style="@style/home_fragment_icon"/>
- <TextView
- style="@style/home_fragment_text_sub"
- android:text="@string/setting"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="100dp"
- android:layout_height="100dp"
- android:gravity="center"
+ android:layout_below="@+id/network_train"
+ >
+ <include
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ layout="@layout/layout_sys_home_part_set"/>
+ </RelativeLayout>
+ <RelativeLayout
+ android:layout_width="550px"
+ android:layout_height="244px"
+ android:background="@mipmap/right_bottom"
android:id="@+id/exit_sys"
- android:layout_weight="1"
- android:orientation="vertical">
- <safeluck.drive.evaluation.customview.CircleImageView
- app:civ_fill_color="@android:color/white"
- app:civ_border_width="15dp"
- app:civ_border_color="@android:color/white"
- android:src="@drawable/exit"
- style="@style/home_fragment_icon"/>
- <TextView
- style="@style/home_fragment_text_sub"
- android:text="@string/exit"
- />
- </LinearLayout>
- </LinearLayout>
+ android:layout_marginLeft="-37px"
+ android:layout_marginTop="13px"
+ android:layout_toRightOf="@+id/system_setting"
+ android:layout_below="@+id/network_train"
+ >
+ <include
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ layout="@layout/layout_sys_home_part_exit"/>
+ </RelativeLayout>
+ <safeluck.drive.evaluation.customview.CircleImageView
+ android:layout_width="208px"
+ android:layout_height="208px"
+ android:layout_marginLeft="411px"
+ android:layout_marginTop="147px"
+ app:civ_fill_color="#2A303F"
+ android:src="@drawable/home_circle"
+ />
+
+ </RelativeLayout>
+
+
+
<TextView
style="@style/home_fragment_text"
android:text="@string/version_name"
--
Gitblit v1.8.0