From a0b3598842d57f5dfb5736e8a4fff5a9d70191a5 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 06 八月 2020 20:55:52 +0800
Subject: [PATCH] 8.6

---
 app/src/main/java/com/okgoincar/utils/UtilKt.kt |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/utils/UtilKt.kt b/app/src/main/java/com/okgoincar/utils/UtilKt.kt
index 39ebe61..be8d1f9 100644
--- a/app/src/main/java/com/okgoincar/utils/UtilKt.kt
+++ b/app/src/main/java/com/okgoincar/utils/UtilKt.kt
@@ -24,6 +24,7 @@
 import cn.sinata.xldutils.utils.ViewClickDelay.lastClickTime
 import cn.sinata.xldutils.xldUtils
 import com.okgoincar.base.MyApplication
+import com.okgoincar.utils.Cache.CacheKey
 import org.jetbrains.anko.internals.AnkoInternals
 import java.lang.NumberFormatException
 import java.util.*
@@ -293,11 +294,12 @@
     Log.e("OkTrip----trip", "--------" + msg)
 }
 
-fun getFormatOne(value:Double?):String{
-    return  Formatter().format("%.1f",value).toString()
+fun getFormatOne(value: Double?): String {
+    return Formatter().format("%.1f", value).toString()
 }
-fun getFormatTwo(value:Double?):String{
-    return  Formatter().format("%.2f",value).toString()
+
+fun getFormatTwo(value: Double?): String {
+    return Formatter().format("%.2f", value).toString()
 }
 
 //多个参数
@@ -308,15 +310,31 @@
 //})
 
 
+fun getNowTimeBlack(): Boolean {
+    var hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY) //此时的小时
+    var dayNow = Calendar.getInstance().get(Calendar.DAY_OF_MONTH)//此时的天数
+    var date = CacheKey.getKeyStr("date_mode") //记录为点击切换的时间Long
+    var mode = CacheKey.getKeyStr("mode_now_time") ///记录为点击切换的颜色 1 白色 2 黑色
 
-fun getNowTimeBlack():Boolean{
-    var hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY)
-    if (hour < 7 || hour >= 18){
+    if (date.isEmpty()) {
+        if (hour < 7 || hour >= 18) {
             return true
+        }
+        return false
+    } else {
+        var time: Long = date.toLong()
+        var calendar = Calendar.getInstance()
+        calendar.timeInMillis = time
+        var day = calendar.get(Calendar.DAY_OF_MONTH)
+        if (day != dayNow) {
+            CacheKey.putKeyStr("date_mode", "")
+            return getNowTimeBlack()
+        } else {
+            return mode != "1"
+        }
     }
-    return false
 }
 
-fun toast(s:String){
-    Toast.makeText(MyApplication.appContext,s,Toast.LENGTH_SHORT).show()
+fun toast(s: String) {
+    Toast.makeText(MyApplication.appContext, s, Toast.LENGTH_SHORT).show()
 }
\ No newline at end of file

--
Gitblit v1.7.1