1.修改数据监控页面UI

baselib/src/main/java/com/yingyangfly/baselib/utils/StringUtil.kt

@@ -1,6 +1,8 @@
 package com.yingyangfly.baselib.utils
 
 import com.blankj.utilcode.util.RegexUtils
+import java.text.SimpleDateFormat
+import java.util.*
 
 /**
  * @author wangsai
@@ -21,6 +23,7 @@ object StringUtil {
     fun phoneBlur(tel: String): String {
         if (!isMobileExact(tel)) return tel
         val phoneBlurRegex = "(\\d{3})\\d{4}(\\d{4})".toRegex()
+
         /** * 手机号脱敏替换正则 */
         val regex = "$1****$2"
         return tel.replace(phoneBlurRegex, regex)
@@ -35,4 +38,23 @@ object StringUtil {
             input
         )
 
+    // 传入年和月得出当月的天数
+    fun getMonth(m: Int, y: Int): Int {
+        return when (m) {
+            2 -> if (isRunYear(y)) 29 else 28
+            4, 6, 9, 11 -> 30
+            else -> 31
+        }
+    }
+
+    // 判断是否为闰年
+    fun isRunYear(y: Int): Boolean {
+        return y % 4 == 0 && y % 100 != 0 || y % 400 == 0
+    }
+
+    // 格式化时间，设置时间很方便，也比较简单，学的很快
+    fun getFormatTime(p: String, t: Date?): String {
+        return SimpleDateFormat(p, Locale.CHINESE).format(t)
+    }
+
 }

workbenches/src/main/java/com/yingyang/workbenches/adapter/DateAdapter.kt

@@ -4,6 +4,7 @@ import com.yingyang.workbenches.R
 import com.yingyang.workbenches.databinding.ItemDateBinding
 import com.yingyang.workbenches.entity.DayBean
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.ext.setTextColorResource
 
 /**
  * 日历adapter
@@ -12,5 +13,10 @@ class DateAdapter(override val layoutId: Int = R.layout.item_date) :
     BaseDataBindingAdapter<DayBean, ItemDateBinding>() {
     override fun onBindViewHolder(binding: ItemDateBinding, item: DayBean, position: Int) {
         binding.data = item
+        if (item.isCurrentMonth) {
+            binding.tvDate.setTextColorResource(R.color.color_FF333333)
+        } else {
+            binding.tvDate.setTextColorResource(R.color.color_FF9FA5B4)
+        }
     }
 }

workbenches/src/main/java/com/yingyang/workbenches/datamonitor/DataMonitorFragment.kt

@@ -6,10 +6,10 @@ import com.yingyang.workbenches.databinding.FragmentDataMonitorBinding
 import com.yingyang.workbenches.entity.DayBean
 import com.yingyangfly.baselib.base.BaseFragment
 import com.yingyangfly.baselib.utils.RxBusCodes
+import com.yingyangfly.baselib.utils.StringUtil
 import com.yingyangfly.baselib.utils.User
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode
-import java.text.SimpleDateFormat
 import java.util.*
 
 /**
@@ -58,7 +58,7 @@ class DataMonitorFragment : BaseFragment<FragmentDataMonitorBinding>() {
         var weekIndex = calendar!![Calendar.DAY_OF_WEEK] - 1
         // 将日期设为上个月
         calendar!![Calendar.MONTH] = calendar!![Calendar.MONTH] - 1
-        val preMonthDays: Int = getMonth(
+        val preMonthDays: Int = StringUtil.getMonth(
             calendar!![Calendar.MONTH] + 1,
             calendar!![Calendar.YEAR]
         )
@@ -74,7 +74,8 @@ class DataMonitorFragment : BaseFragment<FragmentDataMonitorBinding>() {
         }
         // 将日期设为当月
         calendar!![Calendar.MONTH] = calendar!![Calendar.MONTH] + 1
-        val currentDays = getMonth(calendar!![Calendar.MONTH] + 1, calendar!![Calendar.YEAR])
+        val currentDays =
+            StringUtil.getMonth(calendar!![Calendar.MONTH] + 1, calendar!![Calendar.YEAR])
         // 拿到当月的天数
         for (i in 0 until currentDays) {
             val bean = DayBean()
@@ -83,16 +84,12 @@ class DataMonitorFragment : BaseFragment<FragmentDataMonitorBinding>() {
             bean.day = i + 1
             // 当前日期
             val nowDate: String =
-                getFormatTime("yyyy-M-d", Calendar.getInstance().time)
+                StringUtil.getFormatTime("yyyy-M-d", Calendar.getInstance().time)
             // 选择的日期
             val selectDate: String =
-                getFormatTime("yyyy-M-", calendar!!.time) + (i + 1)
+                StringUtil.getFormatTime("yyyy-M-", calendar!!.time) + (i + 1)
             // 假如相等的话，那么就是今天的日期了
-            if (nowDate.contentEquals(selectDate)) {
-                bean.isCurrentDay = true
-            } else {
-                bean.isCurrentDay = false
-            }
+            bean.isCurrentDay = nowDate.contentEquals(selectDate)
             bean.isCurrentMonth = true
             dataList.add(bean)
         }
@@ -116,23 +113,4 @@ class DataMonitorFragment : BaseFragment<FragmentDataMonitorBinding>() {
         calendar!![Calendar.MONTH] = calendar!![Calendar.MONTH] - 1
     }
 
-    // 传入年和月得出当月的天数
-    fun getMonth(m: Int, y: Int): Int {
-        return when (m) {
-            2 -> if (isRunYear(y)) 29 else 28
-            4, 6, 9, 11 -> 30
-            else -> 31
-        }
-    }
-
-    // 判断是否为闰年
-    fun isRunYear(y: Int): Boolean {
-        return y % 4 == 0 && y % 100 != 0 || y % 400 == 0
-    }
-
-    // 格式化时间，设置时间很方便，也比较简单，学的很快
-    fun getFormatTime(p: String, t: Date?): String {
-        return SimpleDateFormat(p, Locale.CHINESE).format(t)
-    }
-
 }

workbenches/src/main/res/layout/fragment_data_monitor.xml

@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_31px"
                 android:textColor="@color/color_FF333333"
-                android:textSize="@dimen/divider_18px"
+                android:textSize="@dimen/divider_32px"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -70,7 +70,7 @@
                 android:id="@+id/weekLayoutLeft"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/divider_21px"
+                android:layout_marginTop="@dimen/divider_26px"
                 android:orientation="horizontal"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"

workbenches/src/main/res/layout/item_date.xml

@@ -14,9 +14,10 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="@dimen/divider_76px">
+        android:minHeight="@dimen/divider_90px">
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvDate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"

workbenches/src/main/res/values/colors.xml

@@ -50,4 +50,5 @@
     <color name="color_FF979797" tools:ignore="ResourceName">#FF979797</color>
     <color name="color_FF9FA5B4" tools:ignore="ResourceName">#FF9FA5B4</color>
     <color name="color_15BA11" tools:ignore="ResourceName">#15BA11</color>
+    <color name="color_FF333333" tools:ignore="ResourceName">#FF333333</color>
 </resources>