瀏覽代碼

1.修改数据监控页面UI

王鹏鹏 2 年之前
父節點
當前提交
3c657d41f1

+ 3 - 0
.idea/misc.xml

@@ -144,7 +144,10 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_task_btn.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_task_progress.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_incomplete.xml" value="0.1615" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_none.xml" value="0.1615" />
         <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/drawable/bg_train_success.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_times.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_train_title.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_training_content.xml" value="0.219" />

+ 11 - 0
workbenches/src/main/java/com/yingyang/workbenches/adapter/DateAdapter.kt

@@ -18,5 +18,16 @@ class DateAdapter(override val layoutId: Int = R.layout.item_date) :
         } else {
             binding.tvDate.setTextColorResource(R.color.color_FF9FA5B4)
         }
+        when (item.status) {
+            "1" -> {
+                binding.statusView.setBackgroundResource(R.drawable.bg_train_complete)
+            }
+            "2" -> {
+                binding.statusView.setBackgroundResource(R.drawable.bg_train_incomplete)
+            }
+            else -> {
+                binding.statusView.setBackgroundResource(R.drawable.bg_train_none)
+            }
+        }
     }
 }

+ 2 - 1
workbenches/src/main/java/com/yingyang/workbenches/entity/DayBean.java

@@ -13,7 +13,8 @@ public class DayBean {
     private boolean currentMonth;
     // 是否为今天
     private boolean currentDay;
-    private String status;
+
+    private String status;//0今日无训练记录,1今日已完成训练,2今日未完成训练
 
     public String getDay() {
         return day;

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!--指定了形状内部的填充颜色-->
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!--指定了形状内部的填充颜色-->
+    <solid android:color="@color/color_FFFF2B2B" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!--指定了形状内部的填充颜色-->
+    <solid android:color="@android:color/transparent" />
+</shape>

+ 11 - 2
workbenches/src/main/res/layout/item_date.xml

@@ -24,11 +24,20 @@
             android:text="@{data.getNowDay()}"
             android:textColor="@color/color_FF9FA5B4"
             android:textSize="@dimen/divider_24px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <View
+            android:id="@+id/statusView"
+            android:layout_width="@dimen/divider_10px"
+            android:layout_height="@dimen/divider_10px"
+            android:layout_marginTop="@dimen/divider_8px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvDate" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>