diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index a164706..7d2426d 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/sw_20dp"
android:layout_marginTop="@dimen/sw_20dp"
- android:textColor="@color/text_color_fff"
+ android:textColor="@color/text_color_ff"
android:textSize="@dimen/sw_20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/beidou_application"
- android:textColor="@color/text_color_main"
+ android:textColor="@color/text_color_33"
android:textSize="@dimen/sw_14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -101,7 +101,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/process_approval"
- android:textColor="@color/text_color_main"
+ android:textColor="@color/text_color_33"
android:textSize="@dimen/sw_14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -161,7 +161,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/engineering_control_network"
- android:textColor="@color/text_color_main"
+ android:textColor="@color/text_color_33"
android:textSize="@dimen/sw_14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_instrument.xml b/app/src/main/res/layout/fragment_instrument.xml
index 83b02a1..b5ce24a 100644
--- a/app/src/main/res/layout/fragment_instrument.xml
+++ b/app/src/main/res/layout/fragment_instrument.xml
@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/sw_20dp"
android:layout_marginTop="@dimen/sw_20dp"
- android:textColor="@color/text_color_fff"
+ android:textColor="@color/text_color_ff"
android:textSize="@dimen/sw_20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/instrument_online"
- android:textColor="@color/text_color_main"
+ android:textColor="@color/text_color_33"
android:textSize="@dimen/sw_14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -102,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/job_settings"
- android:textColor="@color/text_color_main"
+ android:textColor="@color/text_color_33"
android:textSize="@dimen/sw_14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/widget_section_item.xml b/app/src/main/res/layout/widget_section_item.xml
index 77a7604..7aa7f9a 100644
--- a/app/src/main/res/layout/widget_section_item.xml
+++ b/app/src/main/res/layout/widget_section_item.xml
@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_badge"
android:gravity="center"
- android:textColor="@color/text_color_fff"
+ android:textColor="@color/text_color_ff"
android:textSize="@dimen/sw_9sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/ivIcon"
@@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/sw_9dp"
- android:textColor="@color/text_color_main"
+ android:textColor="@color/text_color_33"
android:textSize="@dimen/sw_13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index be563f0..b191eed 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -17,10 +17,10 @@
#10000000
#e5e5e5
- #396BD0
+ @color/colorPrimary
#5B5A5E
- #333333
- #FFFFFF
+ #333333
+ #FFFFFF
#202020
#CC5155
#396BD0
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 75595e3..2fce38a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,13 +1,5 @@
-
- 20dp
- 20dp
-
- 14sp
- 13sp
-
-
-1559.52dp
-1558.08dp
-1556.63dp