mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-06-16 16:15:23 -04:00
lingdianshiren
2692777707
Decouple weather data fetching from reverse geocoding so that weather loads as soon as coordinates are available, even when Nominatim is unreachable (e.g. mainland China). - Fetch Open-Meteo weather immediately once lat/lon are known. - Resolve city name in parallel via Nominatim -> Photon -> BigDataCloud. - If all reverse geocoding fails, keep displaying weather with a placeholder city name. - Skip reverse geocoding entirely when the user has configured a city name. - Fall back to ip-api.com when GeoClue2 is unavailable or returns zero coordinates. - Add request-generation tracking to discard stale geocoding responses after location changes. - Hold explicit WeatherService refs in bar widget and dashboard tab. Co-authored-by: lingdiansr <2077258365@qq.com>
82 lines
3.3 KiB
QML
82 lines
3.3 KiB
QML
import QtQuick
|
|
import qs.Common
|
|
import qs.Modules.Plugins
|
|
import qs.Services
|
|
import qs.Widgets
|
|
|
|
BasePill {
|
|
id: root
|
|
|
|
visible: SettingsData.weatherEnabled
|
|
|
|
Component.onCompleted: WeatherService.addRef()
|
|
Component.onDestruction: WeatherService.removeRef()
|
|
|
|
content: Component {
|
|
Item {
|
|
implicitWidth: {
|
|
if (!SettingsData.weatherEnabled)
|
|
return 0;
|
|
if (root.isVerticalOrientation)
|
|
return root.widgetThickness - root.horizontalPadding * 2;
|
|
return Math.min(100 - root.horizontalPadding * 2, weatherRow.implicitWidth);
|
|
}
|
|
implicitHeight: root.isVerticalOrientation ? weatherColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
|
|
|
|
Column {
|
|
id: weatherColumn
|
|
visible: root.isVerticalOrientation
|
|
anchors.centerIn: parent
|
|
spacing: 1
|
|
|
|
DankIcon {
|
|
name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
|
|
size: Theme.barIconSize(root.barThickness, -6, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
|
|
color: Theme.widgetIconColor
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
}
|
|
|
|
StyledText {
|
|
text: {
|
|
if (!WeatherService.weather.available) {
|
|
return "--";
|
|
}
|
|
const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
|
|
return temp;
|
|
}
|
|
font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
|
|
color: Theme.widgetTextColor
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
}
|
|
}
|
|
|
|
Row {
|
|
id: weatherRow
|
|
visible: !root.isVerticalOrientation
|
|
anchors.centerIn: parent
|
|
spacing: Theme.spacingXS
|
|
|
|
DankIcon {
|
|
name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
|
|
size: Theme.barIconSize(root.barThickness, -6, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
|
|
color: Theme.widgetIconColor
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
StyledText {
|
|
text: {
|
|
if (!WeatherService.weather.available) {
|
|
return "--°" + (SettingsData.useFahrenheit ? "F" : "C");
|
|
}
|
|
const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
|
|
return temp + "°" + (SettingsData.useFahrenheit ? "F" : "C");
|
|
}
|
|
font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
|
|
color: Theme.widgetTextColor
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|