Skip to content

H
HTAnticollision
Commit fdbd57de authored by 马乐's avatar 马乐
Browse files
Options

1.调整无视频主页UI

parent 30cfa78e
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 47 deletions
app/src/main/res/layout/fragment_no_video_home.xml
View file @ fdbd57de
......@@ -10,10 +10,10 @@
android:id="@+id/defaultWorkingAvatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_14"
android:adjustViewBounds="true"
android:padding="3dp"
android:padding="@dimen/dp_3"
android:src="@mipmap/icon_avatar_normal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -23,20 +23,20 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginTop="6dp"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_20"
android:maxEms="6"
android:maxLength="6"
android:text="@string/default_vehicle_number"
app:layout_constraintStart_toEndOf="@id/defaultWorkingAvatar"
app:layout_constraintTop_toTopOf="@id/defaultWorkingAvatar" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/defaultDriverName"
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:layout_marginTop="@dimen/dp_1"
android:maxEms="4"
android:maxLength="4"
android:text="@string/default_driver_name"
......@@ -48,7 +48,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="@dimen/dp_5"
android:background="@drawable/background_status_bar_matter_status"
android:maxEms="2"
android:maxLength="2"
......@@ -72,25 +72,24 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/speedStatusArea"
android:layout_width="294dp"
android:layout_height="85dp"
android:layout_marginStart="3dp"
android:layout_marginTop="8dp"
android:layout_width="@dimen/dp_294"
android:layout_height="@dimen/dp_86"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_19"
android:background="@mipmap/background_speed_state_normal_light"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="@id/defaultWorkingAvatar"
app:layout_constraintTop_toBottomOf="@id/defaultWorkingAvatar">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/defaultMatterType">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/defaultSpeedText"
android:layout_width="66dp"
android:layout_height="66dp"
android:layout_marginStart="32dp"
android:layout_marginTop="18dp"
android:layout_marginBottom="2dp"
android:layout_width="@dimen/dp_66"
android:layout_height="@dimen/dp_66"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginBottom="@dimen/dp_1"
android:text="@string/current_speed2"
android:textColor="@color/white"
android:textSize="42sp"
android:textSize="@dimen/sp_42"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
......@@ -98,7 +97,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginBottom="@dimen/dp_15"
android:text="@string/current_speed_unit"
android:textColor="@color/white"
app:layout_constraintBaseline_toBaselineOf="@id/defaultSpeedText"
......@@ -108,8 +107,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="26dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="@dimen/dp_26"
android:text="@string/current_speed_text"
android:textColor="@color/white"
app:layout_constraintBaseline_toBaselineOf="@id/defaultSpeedText"
......@@ -121,7 +119,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="@dimen/dp_16"
android:background="@mipmap/background_today_carried_light"
android:text="@string/today_carried_text"
app:layout_constraintStart_toStartOf="@id/speedStatusArea"
......@@ -132,7 +130,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginStart="@dimen/dp_24"
android:background="@mipmap/background_warning_illegally"
android:text="@string/today_illegally_text"
android:textColor="@color/color_fffc5454"
......@@ -144,7 +142,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginTop="@dimen/dp_21"
android:text="@string/dispatch_command_text"
app:layout_constraintStart_toStartOf="@id/todayCarried"
app:layout_constraintTop_toBottomOf="@id/todayCarried" />
......@@ -154,7 +152,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="@dimen/dp_5"
android:text="2023/3/10 08:12:34"
android:textSize="24sp"
app:layout_constraintStart_toStartOf="@id/defaultDispatchCommandText"
......@@ -164,7 +162,7 @@
android:id="@+id/defaultDispatchedImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="@dimen/dp_18"
android:adjustViewBounds="true"
android:src="@mipmap/icon_dispatching_light"
app:layout_constraintStart_toStartOf="@id/defaultDispatchedCommTime"
......@@ -175,10 +173,10 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="12dp"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_12"
android:text="@string/default_load_area"
android:textSize="30sp"
android:textSize="@dimen/sp_30"
app:layout_constraintStart_toEndOf="@id/defaultDispatchedImage"
app:layout_constraintTop_toBottomOf="@id/defaultDispatchedCommTime" />
......@@ -189,7 +187,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/default_unload_area"
android:textSize="30sp"
android:textSize="@dimen/sp_30"
app:layout_constraintStart_toStartOf="@id/defaultLoadArea"
app:layout_constraintTop_toBottomOf="@id/defaultLoadArea" />
......@@ -198,7 +196,7 @@
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="@dimen/dp_18"
android:background="@drawable/drawable_bg_reminder_info"
android:text="@string/reminder_info_text"
app:layout_constraintStart_toStartOf="@id/defaultDispatchedCommTime"
......@@ -212,7 +210,6 @@
android:paddingStart="59dp"
android:gravity="center_vertical"
android:drawablePadding="5dp"
android:layout_marginTop="20dp"
android:drawableLeft="@drawable/background_more_default_textview_drawable"
android:background="@drawable/background_more_default_btn"
android:text="@string/toggle_more_text"
......@@ -221,7 +218,8 @@
android:focusable="true"
android:clickable="true"
app:layout_constraintTop_toBottomOf="@id/defaultReminderInfoText"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/defaultCurrentWorkStatusLayout"
......
app/src/main/res/layout/popup_more_features.xml
View file @ fdbd57de
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_426"
android:layout_height="@dimen/dp_332"
android:background="@drawable/background_more_features_popup">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/more_template_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_38"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/toggle_more_text"
android:textColor="@color/home_text_color"
android:textSize="@dimen/sp_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/moreFeatureCollect"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/moreFeatureCollect"
......@@ -32,7 +33,9 @@
android:textColor="@color/home_text_color"
android:textSize="@dimen/sp_20"
app:layout_constraintStart_toStartOf="@id/more_template_title"
app:layout_constraintTop_toBottomOf="@id/more_template_title" />
app:layout_constraintTop_toBottomOf="@id/more_template_title"
app:layout_constraintEnd_toStartOf="@id/moreFeatureHealth"
app:layout_constraintBottom_toTopOf="@id/moreFeatureSettings"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/moreFeatureHealth"
......@@ -50,14 +53,15 @@
android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="@id/moreFeatureCollect"
app:layout_constraintStart_toEndOf="@id/moreFeatureCollect"
app:layout_constraintTop_toTopOf="@id/moreFeatureCollect" />
app:layout_constraintTop_toTopOf="@id/moreFeatureCollect"
app:layout_constraintEnd_toStartOf="@id/moreFeatureData"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/moreFeatureData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_45"
android:layout_marginEnd="@dimen/dp_40"
android:layout_marginEnd="@dimen/dp_38"
android:background="@drawable/background_more_features_item"
android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_data"
......@@ -76,8 +80,8 @@
android:id="@+id/moreFeatureSettings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginBottom="@dimen/dp_28"
android:background="@drawable/background_more_features_item"
android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_settings"
......@@ -89,7 +93,8 @@
android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/moreFeatureCollect"
app:layout_constraintTop_toBottomOf="@id/moreFeatureCollect" />
app:layout_constraintTop_toBottomOf="@id/moreFeatureCollect"
app:layout_constraintEnd_toStartOf="@id/moreFeatureReboot"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/moreFeatureReboot"
......@@ -107,13 +112,15 @@
android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="@id/moreFeatureSettings"
app:layout_constraintStart_toEndOf="@id/moreFeatureSettings"
app:layout_constraintTop_toTopOf="@id/moreFeatureSettings" />
app:layout_constraintTop_toTopOf="@id/moreFeatureSettings"
app:layout_constraintEnd_toStartOf="@id/moreFeaturePowerOff"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/moreFeaturePowerOff"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_45"
android:layout_marginEnd="@dimen/dp_38"
android:background="@drawable/background_more_features_item"
android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_power_off"
......@@ -124,7 +131,7 @@
android:textColor="@color/home_text_color"
android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="@id/moreFeatureReboot"
app:layout_constraintEnd_toEndOf="@id/moreFeatureData"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/moreFeatureReboot"
app:layout_constraintTop_toTopOf="@id/moreFeatureReboot" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ fdbd57de
......@@ -384,6 +384,7 @@
<dimen name="dp_400">400dp</dimen>
<dimen name="dp_410">410dp</dimen>
<dimen name="dp_422">422dp</dimen>
<dimen name="dp_426">426dp</dimen>
<dimen name="dp_448">448dp</dimen>
<dimen name="dp_462">462dp</dimen>
<dimen name="dp_465">465dp</dimen>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment