修复展示的问题，优化性能

目前已知问题，设置线性颜色无效

Author: zhujiang2

app/proguard-rules.pro

@@ -57,4 +57,59 @@
 
 # 导航
 -keep class com.amap.api.navi.**{*;}
--keep class com.autonavi.**{*;}
+-keep class com.autonavi.**{*;}
+
+-dontwarn com.amap.api.location.AMapLocation
+-dontwarn com.amap.api.location.AMapLocationClient
+-dontwarn com.amap.api.location.AMapLocationClientOption$AMapLocationMode
+-dontwarn com.amap.api.location.AMapLocationClientOption
+-dontwarn com.amap.api.location.AMapLocationListener
+
+# Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and
+# EnclosingMethod is required to use InnerClasses.
+-keepattributes Signature, InnerClasses, EnclosingMethod
+
+# Retrofit does reflection on method and parameter annotations.
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+
+# Keep annotation default values (e.g., retrofit2.http.Field.encoded).
+-keepattributes AnnotationDefault
+
+# Retain service method parameters when optimizing.
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+
+# Ignore annotation used for build tooling.
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+
+# Ignore JSR 305 annotations for embedding nullability information.
+-dontwarn javax.annotation.**
+
+# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
+-dontwarn kotlin.Unit
+
+# Top-level functions that can only be used by Kotlin.
+-dontwarn retrofit2.KotlinExtensions
+-dontwarn retrofit2.KotlinExtensions$*
+
+# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
+# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+# Keep inherited services.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface * extends <1>
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+# R8 full mode strips generic signatures from return types if not kept.
+-if interface * { @retrofit2.http.* public *** *(...); }
+-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
+
+# With R8 full mode generic signatures are stripped for classes that are not kept.
+-keep,allowobfuscation,allowshrinking class retrofit2.Response

app/release/app-release.apk

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 42,
-      "versionName": "4.5.0",
+      "versionCode": 43,
+      "versionName": "4.5.1",
       "outputFile": "app-release.apk"
     }
   ],

app/release/output-metadata.json

@@ -15,6 +15,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.zj.model.PlayError
@@ -39,6 +40,7 @@ fun WeatherListPage(
     onBack: () -> Unit,
 ) {
     val context = LocalContext.current
+    val focusManager = LocalFocusManager.current
     val locationBeanState by weatherListViewModel.locationBeanList.collectAsState()
     WeatherListPage(
         locationBeanState = locationBeanState,
@@ -52,6 +54,7 @@ fun WeatherListPage(
         toWeatherDetails = { cityInfo ->
             weatherListViewModel.insertCityInfo(cityInfo)
             (context as Activity).hideIme()
+            focusManager.clearFocus()
             onBack()
         })
 }

app/src/main/kotlin/com/zj/weather/view/list/WeatherListPage.kt

@@ -1,7 +1,9 @@
 package com.zj.weather.view.map
 
-import android.app.Application
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
@@ -17,7 +19,6 @@ import com.amap.api.maps2d.model.CameraPosition
 import com.amap.api.maps2d.model.LatLng
 import com.amap.api.maps2d.model.Marker
 import com.amap.api.maps2d.model.MarkerOptions
-import com.zj.model.PlayError
 import com.zj.utils.XLog
 import com.zj.utils.checkNetConnect
 import com.zj.utils.lce.ErrorContent

app/src/main/kotlin/com/zj/weather/view/map/MapCompose.kt

@@ -69,11 +69,11 @@ private fun Weather(
             return@forEachIndexed
         }
     }
-    if (indexOf >= 0 && indexOf != pagerState.currentPage) {
-        LaunchedEffect(Unit) {
-            pagerState.scrollToPage(indexOf)
-            defaultCityState.value = null
-        }
+    if (indexOf < 0 || indexOf == pagerState.currentPage) return
+    LaunchedEffect(Unit) {
+        pagerState.scrollToPage(indexOf)
+        XLog.d("scrollToPage:$indexOf")
+        defaultCityState.value = null
     }
 }
 
@@ -133,10 +133,7 @@ fun WeatherViewPager(
     toWeatherList: () -> Unit,
 ) {
     Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .navigationBarsPadding()
-            .statusBarsPadding()
+        modifier = Modifier.fillMaxSize()
     ) {
         HorizontalPager(modifier = Modifier, state = pagerState, key = {
             try {
@@ -170,14 +167,7 @@ fun WeatherViewPager(
             pageCount = cityInfoList.size,
             modifier = Modifier
                 .align(Alignment.BottomCenter)
-                .padding(16.dp),
+                .padding(bottom = 25.dp),
         )
     }
-}
-
-fun getLocation(cityInfo: CityInfo?): String {
-    if (cityInfo == null) return "CN101010100"
-    return cityInfo.locationId.ifEmpty {
-        cityInfo.location
-    }
-}
+}

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

@@ -18,8 +18,8 @@ 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.view.weather.getLocation
 import com.zj.weather.widget.today.LOCATION_REFRESH
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -93,7 +93,7 @@ class WeatherViewModel @Inject constructor(
     }
 
     fun getWeather(cityInfo: CityInfo) {
-        val location = getLocation(cityInfo)
+        val location = getLocationForCityInfo(cityInfo)
         if (weatherMap.containsKey(location)) {
             val weather = weatherMap[location]
             if (weather != null && weather.first + FIFTEEN_MINUTES > System.currentTimeMillis()) {

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

@@ -4,12 +4,11 @@ import android.appwidget.AppWidgetManager
 import android.content.Context
 import com.zj.model.*
 import com.zj.model.room.entity.CityInfo
-import com.zj.model.weather.WeatherNowBean
 import com.zj.network.PlayWeatherNetwork
 import com.zj.utils.XLog
 import com.zj.utils.weather.getDateWeekName
+import com.zj.utils.weather.getLocationForCityInfo
 import com.zj.weather.R
-import com.zj.weather.view.weather.getLocation
 import com.zj.weather.widget.today.TodayWeatherRemoteViewsFactory
 import com.zj.weather.widget.week.WeatherRemoteViewsFactory
 import com.zj.weather.widget.week.WeekWeather
@@ -90,7 +89,7 @@ object WeatherWidgetUtils : CoroutineScope by MainScope() {
         appWidgetId: Int
     ) {
         XLog.w("notifyWeatherWidget: Refresh the weather")
-        getWeather7Day(context = context, location = getLocation(cityInfo = cityInfo)) { items ->
+        getWeather7Day(context = context, location = getLocationForCityInfo(cityInfo = cityInfo)) { items ->
             WeatherRemoteViewsFactory.setWidgetItemList(items)
             val mgr = AppWidgetManager.getInstance(context)
             mgr.notifyAppWidgetViewDataChanged(

app/src/main/kotlin/com/zj/weather/widget/WeatherWidgetUtils.kt

@@ -6,7 +6,6 @@ import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.util.SizeF
 import android.widget.RemoteViews
 import com.zj.weather.MainActivity
@@ -15,10 +14,10 @@ import com.zj.weather.widget.WeatherWidgetUtils
 import com.zj.weather.widget.utils.deleteCityInfoPref
 import com.zj.weather.widget.utils.loadCityInfoPref
 import com.zj.model.room.entity.CityInfo
-import com.zj.weather.view.weather.getLocation
 import com.zj.utils.XLog
 import com.zj.utils.isSOrLater
 import com.zj.utils.weather.IconUtils
+import com.zj.utils.weather.getLocationForCityInfo
 
 const val CLICK_TODAY_ACTION = "com.zj.weather.widget.today.CLICK_TODAY_ACTION"
 const val LOCATION_REFRESH = "com.zj.weather.LOCATION_REFRESH"
@@ -110,7 +109,7 @@ private fun buildRemoteViews(
 ) {
     WeatherWidgetUtils.getWeather7Day(
         context = context,
-        location = getLocation(cityInfo = cityInfo)
+        location = getLocationForCityInfo(cityInfo = cityInfo)
     ) { items ->
         val nowBaseBean = items[0]
         views.setTextViewText(R.id.today_tv_location, "${cityInfo?.city} ${cityInfo?.name}")
@@ -136,7 +135,7 @@ private fun buildRemoteViews(
         val intent = Intent(context, TodayWeatherWidgetService::class.java).apply {
             // Add the app widget ID to the intent extras.
             putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
-            putExtra(LOCATION_INFO, getLocation(cityInfo = cityInfo))
+            putExtra(LOCATION_INFO, getLocationForCityInfo(cityInfo = cityInfo))
             data = Uri.parse(toUri(Intent.URI_INTENT_SCHEME))
         }
         // 设置 RemoteViews 对象以使用 RemoteViews 适配器

app/src/main/kotlin/com/zj/weather/widget/today/TodayWeatherWidget.kt

@@ -1,11 +1,25 @@
 package com.zj.utils.weather
 
 import android.content.Context
+import com.zj.model.room.entity.CityInfo
 import com.zj.model.weather.WeatherDailyBean
 import com.zj.utils.R
 import com.zj.utils.XLog
 import java.util.Calendar
 
+
+/**
+ * 获取需要查询的location sting
+ *
+ * @param cityInfo 城市信息
+ */
+fun getLocationForCityInfo(cityInfo: CityInfo?): String {
+    if (cityInfo == null) return "CN101010100"
+    return cityInfo.locationId.ifEmpty {
+        cityInfo.location
+    }
+}
+
 /**
  * 从7天中获取今天的天气，因为里面有紫外线和日出日落信息
  *