瀏覽代碼

1.修改数据监控模块UI

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

+ 25 - 0
baselib/src/main/java/com/yingyangfly/baselib/bean/Record.java

@@ -1,5 +1,7 @@
 package com.yingyangfly.baselib.bean;
 
+import android.text.TextUtils;
+
 import java.io.Serializable;
 
 /**
@@ -31,6 +33,7 @@ public class Record implements Serializable {
     private String duration; //0 持续时长
     private String playClass;//游戏玩耍分类  其他 是可以继续 关卡,A 是只有一关
     private String gameTotalTime;
+    private String totalGameScore;
     /**
      * 游戏插画
      */
@@ -291,4 +294,26 @@ public class Record implements Serializable {
     public void setGameDifficulty(String gameDifficulty) {
         this.gameDifficulty = gameDifficulty;
     }
+
+    public String getTotalGameScore() {
+        return totalGameScore;
+    }
+
+    public void setTotalGameScore(String totalGameScore) {
+        this.totalGameScore = totalGameScore;
+    }
+
+    public String getGameTotalTimeInfo() {
+        if (TextUtils.isEmpty(getGameTotalTime())) {
+            return "";
+        }
+        return getGameTotalTime() + "秒";
+    }
+
+    public String getTotalGameScoreInfo() {
+        if (TextUtils.isEmpty(getTotalGameScore())) {
+            return "";
+        }
+        return getTotalGameScore() + "分";
+    }
 }

+ 4 - 4
workbenches/src/main/java/com/yingyang/workbenches/datamonitor/DataMonitorFragment.kt

@@ -73,14 +73,14 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
             //减小月份
             leftImage.setOnSingleClickListener {
                 dataMonitorAdapter.clearData()
-                binding.tvTrainingTimeToday.text = "0分钟"
+                binding.tvTrainingTimeToday.text = "0"
                 calendar[Calendar.MONTH] = calendar[Calendar.MONTH] - 1
                 loadData()
             }
             //增大月份
             rightImage.setOnSingleClickListener {
                 dataMonitorAdapter.clearData()
-                binding.tvTrainingTimeToday.text = "0分钟"
+                binding.tvTrainingTimeToday.text = "0"
                 calendar[Calendar.MONTH] = calendar[Calendar.MONTH] + 1
                 loadData()
             }
@@ -167,9 +167,9 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
             }
             if (it != null) {
                 binding.tvTrainingTimeToday.text = if (TextUtils.equals("0", it.time)) {
-                    "0分钟"
+                    "0"
                 } else {
-                    it.time
+                    it.time + "秒"
                 }
                 if (it.record.isNullOrEmpty().not()) {
                     dataMonitorList.addAll(it.record)

+ 18 - 2
workbenches/src/main/res/layout/item_data_monitor.xml

@@ -49,19 +49,35 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTime"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/divider_20px"
-            android:layout_marginTop="@dimen/divider_2px"
+            android:layout_marginTop="@dimen/divider_6px"
             android:layout_marginEnd="@dimen/divider_7px"
-            android:text="@{data.gameTotalTime}"
+            android:text='@{"游戏时长:"+data.getGameTotalTimeInfo()}'
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_18px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/imageStatus"
             app:layout_constraintTop_toBottomOf="@+id/tvGameName" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/divider_20px"
+            android:layout_marginTop="@dimen/divider_2px"
+            android:layout_marginEnd="@dimen/divider_7px"
+            android:text='@{"游戏得分:"+data.getTotalGameScoreInfo()}'
+            android:textColor="@color/color_FF333333"
+            android:textSize="@dimen/divider_18px"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageStatus"
+            app:layout_constraintTop_toBottomOf="@+id/tvTime" />
+
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_1px"