Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7bc12a67ea |
@@ -246,14 +246,15 @@ async def fetch_weather_data(city=None):
|
|||||||
if not city:
|
if not city:
|
||||||
city = config.get("cityid") or "北京"
|
city = config.get("cityid") or "北京"
|
||||||
|
|
||||||
print(f"正在获取{city}天气数据...")
|
# 读取API URL,可附加其他参数
|
||||||
# 从配置获取API基础URL,默认使用官方API
|
# http://esp.foresh.com/api/ws2/?appid=xxx&appsecert=yyy
|
||||||
url = config.get("weather_api_url", "http://esp.foresh.com/api/ws2/")
|
url = config.get("weather_api_url", "http://esp.foresh.com/api/ws2/")
|
||||||
params = {"uuid": uuid(), "city": city}
|
full_url = f"{url}{'&' if '?' in url else '?'}uuid={uuid()}&city={city}"
|
||||||
|
print(f"GET> {full_url}")
|
||||||
|
|
||||||
# 发送GET请求
|
# 发送GET请求
|
||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
async with session.get(url, params=params) as response:
|
async with session.get(full_url) as response:
|
||||||
# 检查响应状态
|
# 检查响应状态
|
||||||
if response.status == 200:
|
if response.status == 200:
|
||||||
# 解析JSON数据
|
# 解析JSON数据
|
||||||
@@ -301,7 +302,6 @@ async def sysinfo_update_task():
|
|||||||
last_weather = last_ntptime = start_ticks
|
last_weather = last_ntptime = start_ticks
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
task_id = None # task执行失败后,要快速重试
|
|
||||||
try:
|
try:
|
||||||
current_ticks = time.ticks_ms()
|
current_ticks = time.ticks_ms()
|
||||||
# 计算时间差,处理溢出
|
# 计算时间差,处理溢出
|
||||||
@@ -311,23 +311,17 @@ async def sysinfo_update_task():
|
|||||||
if weather_diff >= weather_ts * 1000:
|
if weather_diff >= weather_ts * 1000:
|
||||||
# 更新天气数据
|
# 更新天气数据
|
||||||
gc.collect()
|
gc.collect()
|
||||||
task_id = "weather"
|
|
||||||
await fetch_weather_data()
|
await fetch_weather_data()
|
||||||
last_weather = current_ticks
|
last_weather = current_ticks
|
||||||
weather_ts = int(config.get("weather_ts", 600)) # 10min
|
weather_ts = int(config.get("weather_ts", 600)) # 10min
|
||||||
elif ntp_diff >= ntptime_ts * 1000:
|
elif ntp_diff >= ntptime_ts * 1000:
|
||||||
# 更新NTP时间
|
# 更新NTP时间
|
||||||
gc.collect()
|
gc.collect()
|
||||||
task_id = "ntp"
|
|
||||||
sync_ntp_time()
|
sync_ntp_time()
|
||||||
last_ntptime = current_ticks
|
last_ntptime = current_ticks
|
||||||
ntptime_ts = int(config.get("ntptime_ts", 3600)) + 13 # 1hour
|
ntptime_ts = int(config.get("ntptime_ts", 3600)) + 13 # 1hour
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"定时任务更新错误: {e}")
|
print(f"定时任务更新错误: {e}")
|
||||||
if task_id == "ntp":
|
|
||||||
ntptime_ts = 10
|
|
||||||
elif task_id == "weather":
|
|
||||||
weather_ts = 60
|
|
||||||
|
|
||||||
# 等待x秒再检查(1~30)
|
# 等待x秒再检查(1~30)
|
||||||
_x = min(30, 1 + min(weather_ts, ntptime_ts) // 10)
|
_x = min(30, 1 + min(weather_ts, ntptime_ts) // 10)
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ class Display:
|
|||||||
self.tft.init()
|
self.tft.init()
|
||||||
self.tft.fill(0)
|
self.tft.fill(0)
|
||||||
self.show_jpg(self.bootimg, 80, 80)
|
self.show_jpg(self.bootimg, 80, 80)
|
||||||
self.message("WS2 v1.3.7 (20260203)")
|
self.message("WS2 v1.3.8 (20260208)")
|
||||||
|
|
||||||
_print_mem()
|
_print_mem()
|
||||||
return True
|
return True
|
||||||
@@ -181,7 +181,7 @@ class Display:
|
|||||||
if t is not None and t != self.ui_data.get('t'):
|
if t is not None and t != self.ui_data.get('t'):
|
||||||
self.ui_data['t'] = t
|
self.ui_data['t'] = t
|
||||||
self.tft.fill_rect(35,179,40,16,0)
|
self.tft.fill_rect(35,179,40,16,0)
|
||||||
self.tft.draw(self.vector_font, f"{str(t)}'C", 35,187,0xFFFF,0.5)
|
self.tft.draw(self.vector_font, f"{str(t)}", 35,187,0xFFFF,0.5)
|
||||||
if rh is not None and rh != self.ui_data.get('rh'):
|
if rh is not None and rh != self.ui_data.get('rh'):
|
||||||
self.ui_data['rh'] = rh
|
self.ui_data['rh'] = rh
|
||||||
self.tft.fill_rect(110,179,40,16,0)
|
self.tft.fill_rect(110,179,40,16,0)
|
||||||
|
|||||||
Reference in New Issue
Block a user