Update weather.py

README.md

@@ -8,10 +8,10 @@
 
 ## API说明:
 
-#### 一言API
-此网站可以获取指定长度指定类型的一个句子,可以限定返回长度及返回类型 
+~~#### 一言API~~
+~~此网站可以获取指定长度指定类型的一个句子,可以限定返回长度及返回类型~~
     
-    https://international.v1.hitokoto.cn/?c=a&encode=text&max_length=20
+   ~~https://international.v1.hitokoto.cn/?c=a&encode=text&max_length=20~~
 
 #### 天气API
 获取的天气是通过网页的接口,获取的内容保存在当前目录下的json文件接口的地址是在这里抓取的 
@@ -68,7 +68,7 @@ sudo reboot
 --gitcn                   克隆中国仓库
 --pisugar-wifi-conf       安装pisugar-wifi-conf
 --pisugar-power-manager   安装pisugar-power-manager
---version <tag>           版本号
+--version <tag>           版本号(使用方法 --version + 仓库标签，格式例如 v1.x.x ,可以是主仓库main)
 --debug                   输出详细信息
 ```
 ### 
@@ -78,7 +78,7 @@ curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/instal
 ```
 ```Bash
 #中国源全参数设置(不使用--debug参数)
-curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s --  --version <tag> --zh --cn --gitcn --pisugar-power-manager --pisugar-wifi-conf
+curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --zh --cn --gitcn --pisugar-power-manager --pisugar-wifi-conf --version <tag>
 ```
 ```Bash
 #默认源默认设置
@@ -86,7 +86,7 @@ curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh
 ```
 ```Bash
 #默认源全参数设置(不使用--debug参数)
-curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --version <tag> --zh --cn --gitcn --pisugar-power-manager --pisugar-wifi-conf
+curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --zh --cn --gitcn --pisugar-power-manager --pisugar-wifi-conf --version <tag>
 ```
 
 ## 需要安装的软件和依赖:
@@ -113,7 +113,7 @@ sudo apt-get update && sudo apt-get install -y git pigpio i2c-tools netcat* gawk
 # 如果使用的是非lite系统请在pip3安装部分添加
 --break-system-packages
 ```
-在代码文件第三十三行,此次代码需要更改,否则将展示默认城市天气数据
+在weanther.py文件第64行可以修改默认城市数据
 # 效果展示
 总体采用局刷方案,程序运行后一直处于程序的获取新数据的过程中,当发现数据变化后即开始自动局刷。
 ![image](https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/pic/1736749257603.jpg)

bin/clean.py

@@ -16,39 +16,39 @@ if os.path.exists(libdir):
     from waveshare_epd import epd2in13_V4  #引入墨水屏驱动文件
 
 # 配置日志
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(message)s')
 
 def clear_screen():
     try:
-        logging.info("Starting e-Paper clear screen script")
+        logging.info("启动电子纸清屏脚本")
         
         # 初始化并创建一个 epd2in13_V4 对象
         epd = epd2in13_V4.EPD()
         
         # 初始化屏幕
-        logging.info("Initializing e-Paper display")
+        logging.info("初始化电子纸显示屏")
         epd.init()
         
         # 清除屏幕
-        logging.info("Clearing e-Paper display")
+        logging.info("清除电子纸显示屏内容")
         epd.Clear(0xFF)
         
         # 等待一段时间，确保清除操作完成
         #time.sleep(1)
         
         # 将屏幕置于睡眠模式
-        logging.info("Putting e-Paper display to sleep")
+        logging.info("将电子纸显示屏置入睡眠状态")
         epd.sleep()
         epd2in13_V4.epdconfig.module_exit(cleanup=True)
         exit()
         
-        logging.info("e-Paper display cleared successfully")
+        logging.info("电子纸显示屏清屏成功")
         
     except IOError as e:
         logging.info(e)
         
     except KeyboardInterrupt:
-        logging.info("Ctrl+C pressed, exiting")
+        logging.info("按下了 Ctrl+C，正在退出")
         epd2in13_V4.epdconfig.module_exit(cleanup=True)
         exit()
 

bin/main.py

@@ -8,9 +8,11 @@ import subprocess
 import os
 from threading import Timer
 import requests
+import socket
+
 white = 255 #颜色
 black = 0
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(message)s')
 ################################引入配置文件开始################################################
 picdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'pic')
 libdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'lib')
@@ -40,6 +42,17 @@ def get_time():#返回当前时间,不到秒,大写
     return time.strftime('%H:%M')
 def Get_address():#获取当前的IP地址
      return (subprocess.check_output(u"hostname -I | cut -d\' \' -f1 | head --bytes -1", shell = True ).decode('gbk'))
+def Get_ipv4_address():  # 获取当前的IP地址
+    try:
+        # 执行命令获取IP地址，并处理输出以仅返回IPv4地址
+        ip_output = subprocess.check_output("hostname -I | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}'", shell=True).decode('utf-8').strip()
+        # 检查是否为IPv4地址
+        if ip_output and not ip_output.startswith("127."):
+            return ip_output
+        else:
+            return "IPv4获取失败"
+    except subprocess.CalledProcessError as e:
+        return f"获取失败"
 def CPU_temperature():#CPU温度获取
      temperatura = os.popen('vcgencmd measure_temp').readline()
      temperatura = temperatura.replace('temp=','').strip()
@@ -64,13 +77,13 @@ def Bottom_edge():  #在图片中添加底边内容
      draw.line((157,113,157,115),fill=255, width=1)
      global power_str
      power_str=power_battery()
-     draw.text((128,108),power_str,font = font04,fill =255) #显示当前电量百分比
+     draw.text((129,108),power_str,font = font04,fill =255) #显示当前电量百分比
      '''电池图标画图'''
      draw.ellipse((192, 107, 207, 120), 0, 255)# 时钟图标
      draw.line((199,109,199,114),fill=255, width=1)
      draw.line((200,114,204,114),fill=255, width=1)
      global local_addr  #获取当前IP地址
-     local_addr= Get_address()  #获取当前IP地址
+     local_addr= Get_ipv4_address()  #获取当前IP地址
      draw.text((10,107),"IP:"+local_addr,font = font05,fill =255)#显示当前IP地址
 def Weather(): #在图片中添加天气内容
      Weather_json = open('weather.json','r')
@@ -94,13 +107,15 @@ def Weather(): #在图片中添加天气内容
      draw.text((150,25),"天气:",font = font06,fill =0)#显示当前天气前缀
      draw.text((150,45),"温度:",font = font06,fill =0)#显示当前温度前缀
      draw.text((150,65),"湿度:",font = font06,fill =0)#显示当前湿度前缀
+     draw.text((150,85),"城市:",font = font06,fill =0)#显示当前城市前缀
      draw.text((191,25),weather,font = font06,fill =0)
      draw.text((191,45),temperature,font = font06,fill =0)
      draw.text((191,65),humidity,font = font06,fill =0)
+     draw.text((191,85),Weather_position,font = font06,fill =0)
      draw.text((211,107),weather_update,font = font05,fill =255) #显示天气更新时间
 
 def Basic_refresh(): #全刷函数
-    logging.info("Refresh and prepare the basic content before starting the canvas")#开始画布前刷新准备基础内容
+    logging.info("在启动画布之前，刷新并准备基本内容")#开始画布前刷新准备基础内容
     global get_date_var
     get_date_var=get_date() #记录开始数据
     draw.text((2,2),get_date_var,font = font02,fill =0)#将日期及星期几显示到屏幕
@@ -115,7 +130,7 @@ def Partial_full_brush(): #局部定时全刷函数
      logging.debug("局部定时全局刷新")
      epd.init()
 def Partial_refresh():#局刷函数
-     logging.info("Partial content update, this update is recommended to be synchronized with the minute to save the life of the ink screen")#局部内容更新,此更新建议与分钟同步,以节省墨水屏寿命
+     logging.info("部分内容更新，此更新建议与分钟同步，以节省墨水屏的使用寿命")#局部内容更新,此更新建议与分钟同步,以节省墨水屏寿命
      epd.displayPartBaseImage(epd.getbuffer(info_image.rotate(180)))
      epd.init()
      while (True):
@@ -135,9 +150,9 @@ def Partial_refresh():#局刷函数
              logging.debug("头部日期部位发生刷新变化.")
              Local_strong_brush() #局部强刷
          global local_addr #当前IP地址
-         local_addr1 = Get_address()
+         local_addr1 = Get_ipv4_address()
          if (local_addr1==local_addr) ==False:
-             draw.rectangle((1, 107, 94, 120), fill = 0) #设置头部刷新区域
+             draw.rectangle((1, 107, 123, 120), fill = 0) #设置头部刷新区域
              draw.text((10,107),"IP:"+local_addr1,font = font05,fill =255)#显示当前IP地址
              local_addr=local_addr1
              Local_strong_brush() #局部强刷
@@ -178,6 +193,12 @@ def Partial_refresh():#局刷函数
              humidity = humidity1
              logging.info("湿度局部刷新")
              Local_strong_brush() #局部强刷
+         if (Weather_position1==Weather_position) ==False:
+             draw.rectangle((191, 85, 249, 98), fill = 255) #局刷区域
+             draw.text((191,85),Weather_position1,font = font06,fill =0)
+             Weather_position = Weather_position1
+             logging.info("城市局部刷新")
+             Local_strong_brush() #局部强刷
          if (weather_update1==weather_update) ==False:
              draw.rectangle((211, 107, 248, 118), fill = 0) #设置更新时间刷新区域
              draw.text((211,107),weather_update1,font = font05,fill =255) #显示天气更新时间
@@ -189,7 +210,7 @@ def Partial_refresh():#局刷函数
          power_str1 =power_battery()
          if (power_str1==power_str) ==False:
              draw.rectangle((128, 110, 153, 117), fill = 0) #设置更新时间刷新区域
-             draw.text((127,108),power_battery(),font = font04,fill =255) #显示当前电量百分比
+             draw.text((129,108),power_battery(),font = font04,fill =255) #显示当前电量百分比
              power_str=power_str1
              Local_strong_brush() #局部强刷
              logging.info("电源电量局部刷新")
@@ -200,7 +221,7 @@ try:
     #epd.Clear(0xFF) #清除屏幕内容
 ##################屏幕初始化#########################   
     logging.info("Width = %s, Height = %s", format(epd.width), format(epd.height)) #打印屏幕高度及宽度
-    logging.info("Initialize and clear the display")#屏幕开始准备相关展示
+    logging.info("初始化并清空显示屏")#屏幕开始准备相关展示
     info_image = Image.new('1', (epd.height, epd.width), 255) #画布创建准备
     draw = ImageDraw.Draw(info_image)
     Basic_refresh() #全局刷新
@@ -211,7 +232,7 @@ try:
 except IOError as e:
     logging.info(e)
 except KeyboardInterrupt:
-    logging.info("Keyboard interrupt detected, exiting gracefully.")
+    logging.info("检测到键盘中断，正在优雅地退出")
     epd.init()
     epd.Clear(0xFF)  # 清除屏幕内容
     epd.sleep()       # 使屏幕进入休眠状态
@@ -219,7 +240,7 @@ except KeyboardInterrupt:
     exit()
 
 except Exception as e:
-    logging.error("An unexpected error occurred: %s", e)
+    logging.error("发生了意外的错误: %s", e)
     epd.init()
     epd.Clear(0xFF)  # 清除屏幕内容
     epd.sleep()       # 使屏幕进入休眠状态
@@ -231,4 +252,4 @@ epd.init()
 epd.Clear(0xFF)  # 清除屏幕内容
 epd.sleep()       # 使屏幕进入休眠状态
 epd2in13_V4.epdconfig.module_exit()  # 清理资源
-exit()
+exit()

bin/weather.py

@@ -1,41 +1,99 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
-import os,sys,re,json,time,datetime  #引入系统相关库
-import logging  #日志库
+import os, sys, re, json, time, datetime
+import logging
 import subprocess
 import os
 from threading import Timer
 import requests
-white = 255 #颜色
+
+white = 255  # 颜色
 black = 0
-logging.basicConfig(level=logging.INFO)
-################################引入配置文件开始################################################
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(message)s')  # 设置日志级别
+
 picdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'pic')
 libdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'lib')
-if os.path.exists(libdir): 
-    sys.path.append(libdir)#将引入文件添加到环境变量
-def getWeath(city='101060111'): #天气函数,下载json天气至本地
-     headers = {
-         'User-Agent':'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-         'Referer':'http://www.weather.com.cn/'
-     }
-     response = requests.get('http://d1.weather.com.cn/sk_2d/'+city+'.html',headers=headers)
-     response.encoding = 'utf-8'
-     Weath=response.text[11:]
-     fileHandle=open('weather.json','w')
-     fileHandle.write(str(Weath))
-     fileHandle.close()
-     Timer(180, getWeath).start() #定时器函数,间隔三分钟下载文件至本地
-     print("天气文件更新")
+if os.path.exists(libdir):
+    sys.path.append(libdir)  # 将引入文件添加到环境变量
+
+def get_area_id(city_name):
+    """从city.js中检索AREAID"""
+    url = "https://j.i8tq.com/weather2020/search/city.js"
+    try:
+        response = requests.get(url)
+        response.raise_for_status()  # 检查请求是否成功
+        # 直接打印原始数据
+        logging.debug("Raw data from city.js: %s", response.text)
+        # 预处理返回的数据，去除非JSON部分
+        city_data_text = response.text.strip()
+        city_data_text = city_data_text.split('var city_data = ')[-1].rstrip(';')
+        if city_data_text:
+            city_data = json.loads(city_data_text)
+            # 遍历数据结构，查找城市名称
+            for province, cities in city_data.items():
+                for city, districts in cities.items():
+                    for district, info in districts.items():
+                        if info['NAMECN'] == city_name:
+                            return info['AREAID']
+            logging.error("城市名称 '%s' 在城市数据中未找到，将使用默认城市信息", city_name)
+        else:
+            logging.error("从city.js接收到的数据为空")
+    except requests.RequestException as e:
+        logging.error("检索城市数据时发生网络错误: %s", e)
+    except json.JSONDecodeError as e:
+        logging.error("解析城市数据时发生JSON解码错误: %s", e)
+    return None
+
+def get_current_city():
+    """获取当前城市名称"""
+    url = "http://ip-api.com/json/?lang=zh-CN"
+    try:
+        response = requests.get(url)
+        response.raise_for_status()  # 检查请求是否成功
+        data = response.json()
+        if data['status'] == 'success':
+            return data['city']
+        else:
+            logging.error("获取当前城市失败: %s", data['message'])
+    except requests.RequestException as e:
+        logging.error("检索当前城市时出现网络错误: %s", e)
+    except json.JSONDecodeError as e:
+        logging.error("解析当前城市数据时出现JSON解码错误: %s", e)
+    return None
+
+def getWeath(city='101060101'):
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+        'Referer': 'http://www.weather.com.cn/'
+    }
+    current_city = get_current_city()
+    if current_city:
+        area_id = get_area_id(current_city)
+        if area_id:
+            city = area_id
+    try:
+        response = requests.get('http://d1.weather.com.cn/sk_2d/'+city+'.html',headers=headers)
+        response.raise_for_status()  # 检查请求是否成功
+        response.encoding = 'utf-8'
+        Weath = response.text[11:]
+        fileHandle = open('weather.json', 'w')
+        fileHandle.write(str(Weath))
+        fileHandle.close()
+        Timer(180, getWeath).start()  # 定时器函数,间隔三分钟下载文件至本地
+        print("天气文件更新")
+    except requests.RequestException as e:
+        logging.error("获取天气数据时出现网络错误: %s", e)
+    except Exception as e:
+        logging.error("发生了意外错误: %s", e)
+
 try:
-    getWeath()#天气获取函数开始运行
+    getWeath()  # 天气获取函数开始运行
 except IOError as e:
     logging.info(e)
 except KeyboardInterrupt:
-    logging.info("Keyboard interrupt detected, exiting gracefully.")
-
+    logging.info("检测到键盘中断，正在优雅地退出")
 except Exception as e:
-    logging.error("An unexpected error occurred: %s", e)
+    logging.error("发生了意外错误: %s", e)
     exit()
 
 # 脚本正常结束后的清理操作