From 6f3ac6d0861d5cf1d8ef1e5f76b7851ff78b6599 Mon Sep 17 00:00:00 2001 From: JUNGGWAN KIM Date: Wed, 2 Oct 2024 17:59:56 +0900 Subject: [PATCH] dress by the hour --- .../rasel/lunar/launcher/home/LauncherHome.kt | 23 +++++++++++++------ .../launcher/workers/OpenWeatherGetter.kt | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt b/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt index fcc04202..e8e6a968 100644 --- a/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt +++ b/app/src/main/kotlin/rasel/lunar/launcher/home/LauncherHome.kt @@ -92,6 +92,7 @@ import rasel.lunar.launcher.home.adapters.RssItemAdapter import rasel.lunar.launcher.home.adapters.SmsLogsAdapter import rasel.lunar.launcher.home.adapters.WeatherAdapter import rasel.lunar.launcher.model.CurrentPlayItem +import rasel.lunar.launcher.model.Hour import rasel.lunar.launcher.model.NotificationItem import rasel.lunar.launcher.model.RssData import rasel.lunar.launcher.model.RssDataInterface @@ -304,14 +305,22 @@ internal class LauncherHome : Fragment() { Handler(Looper.getMainLooper()).post { mWeatherAdapter?.let{ it.update( - it.filter( - li.first() - .hourRealm - .also { hli -> - BLog.LOGE("LauncherHome Saved hli >>> ${hli.size}") + mutableListOf().apply { + li.forEach { i -> + if (i == li.first()) { + this.addAll(it + .filter( + i.hourRealm.also { hli -> + BLog.LOGE("LauncherHome Saved hli size >>> ${hli.size}") + } + ).also { fli -> + BLog.LOGE("LauncherHome Saved fli size >>> ${fli.size}") + } + ) + } else { + this.addAll(i.hourRealm) } - ).also { fli -> - BLog.LOGE("LauncherHome Saved fli >>> ${fli.size}") + } } ) it.notifyDataSetChanged() diff --git a/app/src/main/kotlin/rasel/lunar/launcher/workers/OpenWeatherGetter.kt b/app/src/main/kotlin/rasel/lunar/launcher/workers/OpenWeatherGetter.kt index 8d3ca72d..e564d8f6 100644 --- a/app/src/main/kotlin/rasel/lunar/launcher/workers/OpenWeatherGetter.kt +++ b/app/src/main/kotlin/rasel/lunar/launcher/workers/OpenWeatherGetter.kt @@ -28,7 +28,7 @@ class OpenWeatherGetter(context: Context, workerParams: WorkerParameters) : Base val VER_WEATHERAPI = "v1" val URI_WEATHERAPI = "https://api.weatherapi.com" val KEY_WEATHERAPI = "8133d83d23ab4175a4160624241909" - val DAYS = 1 + val DAYS = 2 ////////////////////////////////////////// var lon: Double? = null // 경도 var lat: Double? = null // 위도