修改天气刷新时机，放到页面中进行加载

Author: zhujiang2

app/release/app-release.apk

@@ -12,7 +12,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -21,11 +23,13 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.zj.model.PlayLoading
 import com.zj.model.WeatherModel
 import com.zj.model.air.AirNowBean
 import com.zj.model.room.entity.CityInfo
 import com.zj.model.weather.WeatherDailyBean
 import com.zj.model.weather.WeatherNowBean
+import com.zj.utils.XLog
 import com.zj.utils.lce.LcePage
 import com.zj.utils.view.ImageLoader
 import com.zj.utils.weather.IconUtils
@@ -35,6 +39,7 @@ import com.zj.weather.view.weather.widget.HeaderAction
 import com.zj.weather.view.weather.widget.HeaderWeather
 import com.zj.weather.view.weather.widget.WeatherAnimation
 import com.zj.weather.view.weather.widget.WeatherContent
+import kotlinx.coroutines.delay
 
 @Composable
 fun WeatherPage(
@@ -46,19 +51,15 @@ fun WeatherPage(
     cityListClick: () -> Unit
 ) {
     val context = LocalContext.current
-    val weatherModel by weatherViewModel.weatherModel.collectAsState()
-    val config = LocalConfiguration.current
+    val weatherModel by weatherViewModel.weatherModel(cityInfo).collectAsState(PlayLoading)
+    val isLand = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
 
     LcePage(playState = weatherModel, onErrorClick = onErrorClick) { weather ->
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-        ) {
+        Box(modifier = Modifier.fillMaxSize()) {
             ImageLoader(
                 modifier = Modifier.fillMaxSize(),
                 data = IconUtils.getWeatherBack(context, weather.nowBaseBean?.icon)
             )
-            val isLand = config.orientation == Configuration.ORIENTATION_LANDSCAPE
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -123,7 +124,6 @@ private fun HorizontalWeather(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
         ) {
-
             // 天气头部
             HeaderWeather(
                 cityInfo, weather.nowBaseBean, true, toCityMap = toCityMap

app/src/main/kotlin/com/zj/weather/view/weather/WeatherPage.kt

@@ -1,4 +1,4 @@
-@file:OptIn(ExperimentalFoundationApi::class)
+@file:OptIn(ExperimentalFoundationApi::class, ExperimentalFoundationApi::class)
 
 package com.zj.weather.view.weather
 
@@ -27,7 +27,6 @@ import com.zj.utils.view.HorizontalPagerIndicator
 import com.zj.weather.permission.FeatureThatRequiresLocationPermissions
 import com.zj.weather.view.weather.viewmodel.WeatherViewModel
 import com.zj.weather.view.weather.widget.HeaderAction
-import kotlinx.coroutines.delay
 
 @ExperimentalPermissionsApi
 @Composable
@@ -39,8 +38,8 @@ fun WeatherViewPager(
 ) {
     val cityInfoList by weatherViewModel.cityInfoList.collectAsState(initial = arrayListOf())
     if (cityInfoList.isEmpty()) {
-        FeatureThatRequiresLocationPermissions(weatherViewModel)
         NoCityContent(toWeatherList, toCityList)
+        FeatureThatRequiresLocationPermissions(weatherViewModel)
     } else {
         val pagerState = rememberPagerState(
             initialPage = 0, initialPageOffsetFraction = 0f
@@ -50,7 +49,6 @@ fun WeatherViewPager(
         WeatherViewPager(
             weatherViewModel, cityInfoList, pagerState, toCityList, toCityMap, toWeatherList
         )
-        CurrentPageEffect(pagerState, cityInfoList, weatherViewModel)
         Weather(cityInfoList, pagerState)
     }
 }
@@ -77,22 +75,6 @@ private fun Weather(
     }
 }
 
-@Composable
-fun CurrentPageEffect(
-    pagerState: PagerState, cityInfoList: List<CityInfo>, weatherViewModel: WeatherViewModel
-) {
-    if (pagerState.isScrollInProgress) {
-        return
-    }
-    val index = if (pagerState.currentPage > cityInfoList.size - 1) 0 else pagerState.currentPage
-    LaunchedEffect(pagerState.currentPage) {
-        delay(300L)
-        val cityInfo = cityInfoList[index]
-        weatherViewModel.getWeather(cityInfo)
-        XLog.i("Query initialPage")
-    }
-}
-
 @Composable
 private fun NoCityContent(
     toWeatherList: () -> Unit,
@@ -135,7 +117,7 @@ fun WeatherViewPager(
     Box(
         modifier = Modifier.fillMaxSize()
     ) {
-        HorizontalPager(modifier = Modifier, state = pagerState, key = {
+        HorizontalPager(modifier = Modifier, state = pagerState, beyondBoundsPageCount = 1, key = {
             try {
                 cityInfoList[it].locationId
             } catch (e: Exception) {
@@ -148,12 +130,10 @@ fun WeatherViewPager(
             val pullRefreshState = rememberPullRefreshState(isRefreshing,
                 { weatherViewModel.refresh(cityInfoList[page]) })
 
-            Box(
-                Modifier.pullRefresh(pullRefreshState)
-            ) {
+            Box(Modifier.pullRefresh(pullRefreshState)) {
                 WeatherPage(
                     weatherViewModel, cityInfoList[page], onErrorClick = {
-                        weatherViewModel.getWeather(cityInfoList[page])
+                        weatherViewModel.weatherModel(cityInfoList[page])
                     }, cityList = toCityList, toCityMap = toCityMap, cityListClick = toWeatherList
                 )
 

app/src/main/kotlin/com/zj/weather/view/weather/WeatherViewPager.kt

@@ -15,23 +15,21 @@ import com.zj.model.room.entity.CityInfo
 import com.zj.model.weather.WeatherDailyBean
 import com.zj.model.weather.WeatherNowBean
 import com.zj.utils.XLog
-import com.zj.utils.checkCoroutines
 import com.zj.utils.checkNetConnect
 import com.zj.utils.view.showToast
 import com.zj.utils.weather.getLocationForCityInfo
 import com.zj.weather.R
 import com.zj.weather.widget.today.LOCATION_REFRESH
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.collections.set
 import kotlin.system.measureTimeMillis
@@ -51,29 +49,15 @@ class WeatherViewModel @Inject constructor(
 ) : AndroidViewModel(application) {
 
     companion object {
+        // 缓存过期时间，暂定为15分钟
         private const val FIFTEEN_MINUTES = 60 * 1000 * 15
     }
 
-    private var weatherJob: Job? = null
-    private var updateCityJob: Job? = null
-
     private val weatherMap = hashMapOf<String, Pair<Long, WeatherModel>>()
 
     val cityInfoList: Flow<List<CityInfo>> = weatherRepository.refreshCityList()
 
-    private val _weatherModel = MutableStateFlow<PlayState<WeatherModel>>(PlayLoading)
-    val weatherModel: StateFlow<PlayState<WeatherModel>> = _weatherModel.asStateFlow()
-
-    private fun onWeatherModelChanged(playState: PlayState<WeatherModel>) {
-        if (playState == _weatherModel.value) {
-            XLog.d("onWeatherModelChanged no change")
-            return
-        }
-        viewModelScope.launch {
-            _weatherModel.emit(playState)
-        }
-    }
-
+    // 刷新的flow，用于记录下拉刷新状态
     private val _isRefreshing = MutableStateFlow(false)
 
     val isRefreshing: StateFlow<Boolean>
@@ -85,36 +69,45 @@ class WeatherViewModel @Inject constructor(
             // A fake 2 second 'refresh'
             _isRefreshing.emit(true)
             val time = measureTimeMillis {
-                getWeather(cityInfo)
+                weatherModel(cityInfo, true)
             }
             delay(if (time > 1000L) time else 1000L)
             _isRefreshing.emit(false)
         }
     }
 
-    fun getWeather(cityInfo: CityInfo) {
-        val location = getLocationForCityInfo(cityInfo)
-        if (weatherMap.containsKey(location)) {
-            val weather = weatherMap[location]
-            if (weather != null && weather.first + FIFTEEN_MINUTES > System.currentTimeMillis()) {
-                XLog.d("Direct return")
-                onWeatherModelChanged(PlaySuccess(weather.second))
-                return
+
+    /**
+     * 综合起来直接调用，即数据观察、数据请求、重试等都使用这个函数来进行
+     *
+     * @param cityInfo 城市信息
+     * @param refresh 是否要刷新，默认为否，否的话就是使用缓存数据
+     *
+     * @return flow，可观测数据流
+     */
+    fun weatherModel(cityInfo: CityInfo, refresh: Boolean = false): Flow<PlayState<WeatherModel>> =
+        channelFlow {
+            val location = getLocationForCityInfo(cityInfo)
+            if (weatherMap.containsKey(location) && !refresh) {
+                val weather = weatherMap[location]
+                if (weather != null && weather.first + FIFTEEN_MINUTES > System.currentTimeMillis()) {
+                    XLog.d("Direct return")
+                    send(PlaySuccess(weather.second))
+                }
             }
-        }
-        if (!getApplication<Application>().checkNetConnect()) {
-            showToast(getApplication(), R.string.bad_network_view_tip)
-            onWeatherModelChanged(PlayError(IllegalStateException("当前没有网络")))
-            return
-        }
-        weatherJob.checkCoroutines()
-        weatherJob = viewModelScope.launch(Dispatchers.IO) {
-            val weatherNow = async { weatherRepository.getWeatherNow(location) }.await()
+            if (!getApplication<Application>().checkNetConnect()) {
+                showToast(getApplication(), R.string.bad_network_view_tip)
+                send(PlayError(IllegalStateException("当前没有网络")))
+            }
+            val weatherNow =
+                async(Dispatchers.IO) { weatherRepository.getWeatherNow(location) }.await()
             // 这块由于这两个接口有问题，和风天气的jar包问题，提交反馈人家说没问题。。qtmd。
             // 目前发现在S版本上有问题，R中没有发现
-            val weather24Hour = async { weatherRepository.getWeather24Hour(location) }.await()
-            val weather7Day = async { weatherRepository.getWeather7Day(location) }.await()
-            val airNow = async { weatherRepository.getAirNow(location) }.await()
+            val weather24Hour =
+                async(Dispatchers.IO) { weatherRepository.getWeather24Hour(location) }.await()
+            val weather7Day =
+                async(Dispatchers.IO) { weatherRepository.getWeather7Day(location) }.await()
+            val airNow = async(Dispatchers.IO) { weatherRepository.getAirNow(location) }.await()
             val weatherLifeIndicesList =
                 async { weatherRepository.getWeatherLifeIndicesList(location) }.await()
             buildWeekWeather(weather7Day?.second, weatherNow)
@@ -127,12 +120,8 @@ class WeatherViewModel @Inject constructor(
                 weatherLifeList = weatherLifeIndicesList
             )
             weatherMap[location] = Pair(System.currentTimeMillis(), weatherModel)
-            withContext(Dispatchers.Main) {
-                onWeatherModelChanged(PlaySuccess(weatherModel))
-            }
-            XLog.w("For the weather:$location")
+            send(PlaySuccess(weatherModel))
         }
-    }
 
     /**
      * 为了构建7天天气的柱状图
@@ -178,8 +167,7 @@ class WeatherViewModel @Inject constructor(
      * @param result Address
      */
     fun updateCityInfo(location: Location, result: MutableList<Address>) {
-        updateCityJob.checkCoroutines()
-        updateCityJob = viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch(Dispatchers.IO) {
             weatherRepository.updateCityInfo(location, result)
             getApplication<Application>().sendBroadcast(Intent(LOCATION_REFRESH))
         }

app/src/main/kotlin/com/zj/weather/view/weather/viewmodel/WeatherViewModel.kt

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 ext {
-    extra["versionCode"] = 45
-    extra["versionName"] = "4.5.3"
+    extra["versionCode"] = 46
+    extra["versionName"] = "4.5.4"
 
     extra["sdkVersion"] = 34
     extra["minSdkVersion"] = 24

build.gradle.kts

@@ -4,17 +4,6 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import com.zj.model.Lang
-import kotlinx.coroutines.Job
-
-
-/**
- * 检查协程是否存在并运行
- */
-fun Job?.checkCoroutines() {
-    if (this?.isActive == true) return
-    this?.cancel()
-    XLog.d("Already in the query, first cancel the previous coroutine")
-}
 
 /**
  * 网络状态
@@ -34,13 +23,11 @@ fun Context.checkNetConnect(): Boolean {
 
         networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
             // 当前使用移动网络
-            XLog.d("You are using a mobile network")
             true
         }
 
         networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
             // 当前使用WIFI网络
-            XLog.d("The WIFI network is in use")
             true
         }