Browse Source

1.修改UI

王鹏鹏 2 years ago
parent
commit
06ba245598

+ 5 - 1
.idea/misc.xml

@@ -7,7 +7,11 @@
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_webview.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_item_report.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_right.xml" value="0.2265" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_data.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_radio.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_radio_checked.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_radio_unchecked.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_report_tab_left.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_data.xml" value="0.4700413223140496" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_workbenches.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_report.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_game_list.xml" value="0.22826086956521738" />

+ 6 - 0
workbenches/src/main/res/drawable/bg_train_right.xml

@@ -7,4 +7,10 @@
     <stroke
         android:width="@dimen/divider_1px"
         android:color="@android:color/white" />
+
+    <padding
+        android:bottom="@dimen/divider_14px"
+        android:left="@dimen/divider_25px"
+        android:right="@dimen/divider_25px"
+        android:top="@dimen/divider_14px" />
 </shape>

+ 7 - 0
workbenches/src/main/res/drawable/selector_train_radio.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:drawable="@drawable/selector_train_radio_checked" android:state_checked="true" />
+    <item android:drawable="@drawable/selector_train_radio_unchecked" />
+</selector>
+
+

+ 13 - 0
workbenches/src/main/res/drawable/selector_train_radio_checked.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="#69B8CFFF" />
+    <corners android:radius="@dimen/divider_12px" />
+    <solid android:color="#69B8CFFF" />
+</shape>
+
+

+ 18 - 0
workbenches/src/main/res/drawable/selector_train_radio_unchecked.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@android:color/transparent" />
+    <corners android:radius="@dimen/divider_12px" />
+    <solid android:color="@android:color/transparent" />
+    <padding
+        android:bottom="@dimen/divider_14px"
+        android:left="@dimen/divider_25px"
+        android:right="@dimen/divider_25px"
+        android:top="@dimen/divider_14px" />
+</shape>
+
+

+ 17 - 37
workbenches/src/main/res/layout/activity_train_data.xml

@@ -15,7 +15,7 @@
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            android:layout_width="@dimen/divider_270px"
+            android:layout_width="@dimen/divider_195px"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -41,9 +41,11 @@
 
         <RadioGroup
             android:id="@+id/radioOperate"
-            android:layout_width="@dimen/divider_270px"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/divider_37px"
             android:layout_marginTop="@dimen/divider_110px"
+            android:layout_marginEnd="@dimen/divider_36px"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -51,54 +53,32 @@
 
             <RadioButton
                 android:id="@+id/radioDataMonitor"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/divider_55px"
-                android:layout_gravity="center_horizontal"
-                android:button="@null"
+                style="@style/train_report_radio_button"
+                android:background="@drawable/selector_train_radio"
+                android:checked="true"
                 android:drawableStart="@mipmap/icon_data_monitor"
-                android:drawablePadding="@dimen/divider_8px"
-                android:text="@string/tab1"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px" />
+                android:text="@string/tab1" />
 
             <RadioButton
                 android:id="@+id/radioBrainAbility"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/divider_55px"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="@dimen/divider_30px"
-                android:button="@null"
+                style="@style/train_report_radio_button"
+                android:background="@drawable/selector_train_radio"
                 android:drawableStart="@mipmap/icon_radio_brain"
-                android:drawablePadding="@dimen/divider_8px"
-                android:text="@string/tab2"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px" />
+                android:text="@string/tab2" />
 
             <RadioButton
                 android:id="@+id/radioTrainContent"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/divider_55px"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="@dimen/divider_30px"
-                android:button="@null"
+                style="@style/train_report_radio_button"
+                android:background="@drawable/selector_train_radio"
                 android:drawableStart="@mipmap/icon_train_content"
-                android:drawablePadding="@dimen/divider_8px"
-                android:text="@string/tab3"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px" />
+                android:text="@string/tab3" />
 
             <RadioButton
                 android:id="@+id/radioTrainReport"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/divider_55px"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="@dimen/divider_30px"
-                android:button="@null"
+                style="@style/train_report_radio_button"
+                android:background="@drawable/selector_train_radio"
                 android:drawableStart="@mipmap/icon_train_report"
-                android:drawablePadding="@dimen/divider_8px"
-                android:text="@string/tab4"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px" />
+                android:text="@string/tab4" />
 
         </RadioGroup>
 

+ 1 - 0
workbenches/src/main/res/values/dimens.xml

@@ -16,6 +16,7 @@
     <dimen name="divider_190px" tools:ignore="PxUsage">190px</dimen>
     <dimen name="divider_180px" tools:ignore="PxUsage">180px</dimen>
     <dimen name="divider_140px" tools:ignore="PxUsage">140px</dimen>
+    <dimen name="divider_128px" tools:ignore="PxUsage">128px</dimen>
     <dimen name="divider_120px" tools:ignore="PxUsage">120px</dimen>
     <dimen name="divider_119px" tools:ignore="PxUsage">119px</dimen>
     <dimen name="divider_118px" tools:ignore="PxUsage">118px</dimen>

+ 11 - 0
workbenches/src/main/res/values/themes.xml

@@ -55,4 +55,15 @@
         <item name="android:textColor">@color/txt_radio_color</item>
 
     </style>
+
+    <style name="train_report_radio_button" tools:ignore="ResourceName">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">@dimen/divider_55px</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:button">@null</item>
+        <item name="android:textSize">@dimen/divider_24px</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:drawablePadding">@dimen/divider_8px</item>
+        <item name="android:layout_marginTop">@dimen/divider_30px</item>
+    </style>
 </resources>