Add files via upload

README.md

@@ -1,6 +1,6 @@
 # 墨水屏展示当前时间及天气数据
-# 此分支专属于本人的个人设备实验分支以及备份
+
-本项目复刻自[Seek-Huang](https://github.com/Seek-Huang)的[代码仓库](https://github.com/Seek-Huang/2.13-Ink-screen-clock)
+本项目复刻自[Seek-Huang](https://github.com/Seek-Huang/2.13-Ink-screen-clock)的代码仓库
 并在此基础上进行改进
 
 ## 本仓库已添加[一键安装部署脚本](https://github.com/kxgx/2.13-Ink-screen-clock#%E4%BD%BF%E7%94%A8%E8%84%9A%E6%9C%AC%E7%9B%B4%E6%8E%A5%E5%AE%89%E8%A3%85%E6%8E%A8%E8%8D%90)

bin/clock.py

@@ -10,32 +10,37 @@ from threading import Timer
 import requests
 white = 255 #颜色
 black = 0
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO)
 ################################引入配置文件开始################################################
 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): 
+if os.path.exists(libdir):
-    sys.path.append(libdir)#将引入文件添加到环境变量
+    sys.path.append(libdir)  # 将引入文件添加到环境变量
-    from waveshare_epd import epd2in13_V4  #引入墨水屏驱动文件
+    from waveshare_epd import epd2in13_V4  # 引入墨水屏驱动文件
+
 logging.debug("Loading Fonts")
-font01 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 20) #字体文件
+font01 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 20)  # 字体文件
-font02 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 15) #字体文件
+font02 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 15)  # 字体文件
-font03 = ImageFont.truetype(os.path.join(picdir, 'DSEG7Modern-Bold.ttf'), 66) #字体文件
+font03 = ImageFont.truetype(os.path.join(picdir, 'DSEG7Modern-Bold.ttf'), 66)  # 字体文件
-font04 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 10) #字体文件
+font04 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 10)  # 字体文件
-font05 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 12) #字体文件
+font05 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 12)  # 字体文件
-font06 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 13) #字体文件
+font06 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 13)  # 字体文件
 ################################引入配置文件结束################################################
-def Local_strong_brush(): #局部强制刷新显示
+
-     i = 0
+
-     while i < 5:
+def Local_strong_brush():  # 局部强制刷新显示
-         epd.displayPartial(epd.getbuffer(info_image.rotate(180)))#局刷开始
+    i = 0
-         i = i + 1
+    while i < 5:
-def get_date():#返回当前年月日及星期几
+        epd.displayPartial(epd.getbuffer(info_image.rotate(180)))  # 局刷开始
+        i += 1
+
+
+def get_date():  # 返回当前年月日及星期几
     date = datetime.datetime.now()
-    today=LunarDate.today()
+    today = LunarDate.today()
-    week_day_dict = {0: '星期一',1: '星期二',2: '星期三',3: '星期四',4: '星期五',5: '星期六',6: '星期日',}
+    week_day_dict = {0: '星期一', 1: '星期二', 2: '星期三', 3: '星期四', 4: '星期五', 5: '星期六', 6: '星期日'}
     day = date.weekday()
-    return time.strftime('%Y年%m月%d日')+''+week_day_dict[day]+''+today.strftime('农历%M月%D')
+    return time.strftime('%Y年%m月%d日') + '' + week_day_dict[day] + '' + today.strftime('农历%M月%D')
 # 定义一个全局标志变量，用于检查是否已经设置了系统时间或尝试过设置
 has_set_system_time = False
 
@@ -74,7 +79,7 @@ def set_system_time_from_hwclock(utc=True):
         
         # 检查时间是否发生了倒退
         if after_time < before_time:
-            logging.warning(f"Time went backwards after hwclock call: before={before_time}, after={after_time}")
+            logging.info(f"Time went backwards after hwclock call: before={before_time}, after={after_time}")
         
         return True
     except subprocess.CalledProcessError as e:
@@ -97,92 +102,106 @@ def get_time():
     current_time = time.strftime('%H:%M').upper()
     logging.debug(f"Returning current time: {current_time}")
     return current_time
-def Get_ipv4_address():  # 获取当前的IP地址
+
-    try:
+def Get_address():  # 获取当前的IP地址
-        ip_output = subprocess.check_output(
+    return subprocess.check_output(u"hostname -I | cut -d' ' -f1 | head --bytes -1", shell=True).decode('gbk').strip()
-            "hostname -I | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}'", shell=True).decode('utf-8').strip()
+
-        ip_list = ip_output.split()
+
-        filtered_ips = [ip for ip in ip_list if not ip.startswith("172.")]
+def CPU_temperature():  # CPU温度获取
-        return filtered_ips[0] if filtered_ips else "地址获取失败"
+    temperatura = os.popen('vcgencmd measure_temp').readline()
-    except subprocess.CalledProcessError:
+    temperatura = temperatura.replace('temp=', '').strip()
-        return "获取失败"
+    return str(temperatura)
-def CPU_temperature():#CPU温度获取
+
-     temperatura = os.popen('vcgencmd measure_temp').readline()
+
-     temperatura = temperatura.replace('temp=','').strip()
+def Memory_footprint():  # 显示内存占用百分比
-     return str(temperatura)
+    return subprocess.check_output(u"free -m | awk -F '[ :]+' 'NR==2{printf \"%d\", ($3)/$2*100}'", shell=True).decode('gbk')
-def Memory_footprint():#显示内存占用百分比
+
-     return(subprocess.check_output(u"free -m | awk -F '[ :]+' 'NR==2{printf \"%d\", ($3)/$2*100}'", shell = True ).decode('gbk'))
+
-def CPU_usage(): #显示CPU占用百分比
+def CPU_usage():  # 显示CPU占用百分比
-     return(str(int(float(os.popen("top -b -n1 | awk '/Cpu\(s\):/ {print $2}'").readline().strip()))))
+    return str(int(float(os.popen("top -b -n1 | awk '/Cpu\(s\):/ {print $2}'").readline().strip())))
-def power_battery():#获取当前电池电量
+
-     return(str(int(subprocess.check_output(u"echo \"get battery\" | nc -q 0 127.0.0.1 8423|awk -F':' '{print int($2)}'", shell = True ).decode('gbk')))+u'%') 
+
+def power_battery():  # 获取当前电池电量
+    return str(int(subprocess.check_output(u"echo \"get battery\" | nc -q 0 127.0.0.1 8423|awk -F':' '{print int($2)}'", shell=True).decode('gbk'))) + u'%'
+
+
 # 打印电量信息
 print(power_battery())
-def Bottom_edge():  #在图片中添加底边内容
+
-     draw.rectangle((0, 105, 250, 122), 'black', 'black')
+
-     '''电池图标画图'''
+def Bottom_edge():  # 在图片中添加底边内容
-     draw.line((126,109,154,109),fill=255, width=1) #电池顶边
+    draw.rectangle((0, 105, 250, 122), 'black', 'black')
-     draw.line((126,110,126,119),fill=255, width=1) #电池左边
+    '''电池图标画图'''
-     draw.line((127,119,154,119),fill=255, width=1) #电池下边
+    draw.line((126, 109, 154, 109), fill=255, width=1)  # 电池顶边
-     draw.line((154,110,154,118),fill=255, width=1)
+    draw.line((126, 110, 126, 119), fill=255, width=1)  # 电池左边
-     draw.line((155,112,157,112),fill=255, width=1)
+    draw.line((127, 119, 154, 119), fill=255, width=1)  # 电池下边
-     draw.line((155,116,157,116),fill=255, width=1)
+    draw.line((154, 110, 154, 118), fill=255, width=1)
-     draw.line((157,113,157,115),fill=255, width=1)
+    draw.line((155, 112, 157, 112), fill=255, width=1)
-     global power_str
+    draw.line((155, 116, 157, 116), fill=255, width=1)
-     power_str=power_battery()
+    draw.line((157, 113, 157, 115), fill=255, width=1)
-     draw.text((128,108),power_str,font = font04,fill =255) #显示当前电量百分比
+    global power_str
-     '''电池图标画图'''
+    power_str = power_battery()
-     draw.ellipse((192, 107, 207, 120), 0, 255)# 时钟图标
+    draw.text((128, 108), power_str, font=font04, fill=255)  # 显示当前电量百分比
-     draw.line((199,109,199,114),fill=255, width=1)
+    '''电池图标画图'''
-     draw.line((200,114,204,114),fill=255, width=1)
+    draw.ellipse((192, 107, 207, 120), 0, 255)  # 时钟图标
-     global local_addr  #获取当前IP地址
+    draw.line((199, 109, 199, 114), fill=255, width=1)
-     local_addr= Get_ipv4_address()  #获取当前IP地址
+    draw.line((200, 114, 204, 114), fill=255, width=1)
-     draw.text((10,107),"IP:"+local_addr,font = font05,fill =255)#显示当前IP地址
+    global local_addr  # 获取当前IP地址
-def Basic_refresh(): #全刷函数
+    local_addr = Get_address()  # 获取当前IP地址
-    logging.info("Refresh and prepare the basic content before starting the canvas")#开始画布前刷新准备基础内容
+    draw.text((10, 107), "IP:" + local_addr, font=font05, fill=255)  # 显示当前IP地址
+
+
+def Basic_refresh():  # 全刷函数
+    logging.info("Refresh and prepare the basic content before starting the canvas")  # 开始画布前刷新准备基础内容
     global get_date_var
-    get_date_var=get_date() #记录开始数据
+    get_date_var = get_date()  # 记录开始数据
-    draw.text((2,2),get_date_var,font = font02,fill =0)#将日期及星期几显示到屏幕
+    draw.text((2, 2), get_date_var, font=font02, fill=0)  # 将日期及星期几显示到屏幕
     global local_time
-    local_time=get_time()
+    local_time = get_time()
-    draw.text((5,40),local_time,font = font03,fill =0)#显示当前时间
+    draw.text((5, 28), local_time, font=font03, fill=0)  # 显示当前时间
-    Bottom_edge() #添加底边内容
+    Bottom_edge()  # 添加底边内容
     epd.display(epd.getbuffer(info_image.rotate(180)))
-def Partial_full_brush(): #局部定时全刷函数
+
-     Basic_refresh() #全局刷新
+
-     logging.debug("局部定时全局刷新")
+def Partial_full_brush():  # 局部定时全刷函数
-     epd.init()
+    Basic_refresh()  # 全局刷新
-def Partial_refresh():#局刷函数
+    logging.debug("局部定时全局刷新")
-     logging.info("Partial content update, this update is recommended to be synchronized with the minute to save the life of the ink screen")#局部内容更新,此更新建议与分钟同步,以节省墨水屏寿命
+    epd.init()
-     epd.displayPartBaseImage(epd.getbuffer(info_image.rotate(180)))
+
-     epd.init()
+
-     while (True):
+def Partial_refresh():  # 局刷函数
-         global local_time
+    logging.info(
-         local_time1=get_time()
+        "Partial content update, this update is recommended to be synchronized with the minute to save the life of the ink screen")  # 局部内容更新,此更新建议与分钟同步,以节省墨水屏寿命
-         if (local_time1==local_time) ==False:
+    epd.displayPartBaseImage(epd.getbuffer(info_image.rotate(180)))
-             draw.rectangle((5, 17, 133, 95), fill = 255) #时间局刷区域
+    epd.init()
-             draw.text((5,17),local_time1,font = font03,fill =0)#刷新当前时间
+    while True:
-             local_time=local_time1
+        global local_time
-             Local_strong_brush() #局部强刷
+        local_time1 = get_time()
-         get_date_var1=get_date()  #局刷判断,如果时间与前一次不一致说明内容变化,需要刷新显示
+        if local_time1 != local_time:
-         global get_date_var #再次声明这个是全局变量
+            draw.rectangle((5, 28, 133, 95), fill=255)  # 时间局刷区域
-         if(get_date_var1==get_date_var) ==False:
+            draw.text((5, 28), local_time1, font=font03, fill=0)  # 刷新当前时间
-             draw.rectangle((2, 2, 250, 16), fill = 255) #设置头部刷新区域
+            local_time = local_time1
-             draw.text((2,2),get_date_var1,font = font02,fill =0)#将日期及星期几刷新显示到屏幕
+            Local_strong_brush()  # 局部强刷
-             get_date_var=get_date_var1 #将更新的值保存到初始变量,直到下一次变化时执行该刷新操作
+        get_date_var1 = get_date()  # 局刷判断,如果时间与前一次不一致说明内容变化,需要刷新显示
-             logging.debug("头部日期部位发生刷新变化.")
+        global get_date_var  # 再次声明这个是全局变量
-             Local_strong_brush() #局部强刷
+        if get_date_var1 != get_date_var:
-         global local_addr #当前IP地址
+            draw.rectangle((2, 2, 250, 16), fill=255)  # 设置头部刷新区域
-         local_addr1 = Get_ipv4_address()
+            draw.text((2, 2), get_date_var1, font=font02, fill=0)  # 将日期及星期几刷新显示到屏幕
-         if (local_addr1==local_addr) ==False:
+            get_date_var = get_date_var1  # 将更新的值保存到初始变量,直到下一次变化时执行该刷新操作
-             draw.rectangle((1, 107, 94, 120), fill = 0) #设置头部刷新区域
+            logging.debug("头部日期部位发生刷新变化.")
-             draw.text((10,107),"IP:"+local_addr1,font = font05,fill =255)#显示当前IP地址
+            Local_strong_brush()  # 局部强刷
-             local_addr=local_addr1
+        global local_addr  # 当前IP地址
-             Local_strong_brush() #局部强刷
+        local_addr1 = Get_address()
-#显示当前电量百分比
+        if local_addr1 != local_addr:
-             power_str=power_str1
+            draw.rectangle((1, 107, 94, 120), fill=0)  # 设置头部刷新区域
-             Local_strong_brush() #局部强刷
+            draw.text((10, 107), "IP:" + local_addr1, font=font05, fill=255)  # 显示当前IP地址
-             logging.debug("电源电量局部刷新")
+            local_addr = local_addr1
+            Local_strong_brush()  # 局部强刷
+        # 显示当前电量百分比
+        global power_str
+        power_str1 = power_battery()
+        power_str = power_str1
+        Local_strong_brush()  # 局部强刷
 
 retry_interval = 180  # 设置重试间隔时间（秒）
 while True:

bin/main.py

@@ -1,37 +1,35 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
-from PIL import Image,ImageDraw,ImageFont  #引入图片处理库
+from PIL import Image, ImageDraw, ImageFont  # 引入图片处理库
-import os,sys,re,json,time,datetime  #引入系统相关库
+import os, sys, json, time, datetime  # 引入系统相关库
-from borax.calendars.lunardate import LunarDate #农历日期以及天干地支纪年法的 Python 库
+from borax.calendars.lunardate import LunarDate  # 农历日期以及天干地支纪年法的 Python 库
-import logging  #日志库
+import logging  # 日志库
 import subprocess
-import os
-from threading import Timer
-import requests
-import socket
 
-white = 255 #颜色
+white = 255  # 颜色
 black = 0
 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): 
+if os.path.exists(libdir):
-    sys.path.append(libdir)#将引入文件添加到环境变量
+    sys.path.append(libdir)  # 将引入文件添加到环境变量
-    from waveshare_epd import epd2in13_V4  #引入墨水屏驱动文件
+    from waveshare_epd import epd2in13_V4  # 引入墨水屏驱动文件
 logging.debug("Loading Fonts")
 font01 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 20) #字体文件
-font02 = ImageFont.truetype(os.path.join(picdir, 'GB2312.ttf'), 15) #字体文件
+font02 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 15) #字体文件
-font03 = ImageFont.truetype(os.path.join(picdir, 'Fonttt.ttf'), 48) #字体文件
+font03 = ImageFont.truetype(os.path.join(picdir, 'DSEG7Modern-Bold.ttf'), 38) #字体文件
 font04 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 10) #字体文件
 font05 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 12) #字体文件
-font06 = ImageFont.truetype(os.path.join(picdir, '原神cn.ttf'), 13) #字体文件
+font06 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 13) #字体文件
 ################################引入配置文件结束################################################
-def Local_strong_brush(): #局部强制刷新显示
+
-     i = 0
+
-     while i < 5:
+def Local_strong_brush():  # 局部强制刷新显示
-         epd.displayPartial(epd.getbuffer(info_image.rotate(180)))#局刷开始
+    for _ in range(5):
-         i = i + 1
+        epd.displayPartial(epd.getbuffer(info_image.rotate(180)))
+
+
 def get_date():  # 返回当前年月日及星期几
     date = datetime.datetime.now()
     today = LunarDate.today()
@@ -139,161 +137,142 @@ def power_battery():  # 获取当前电池电量
         new_power = last_power  # 未到更新时间，使用缓存值
 
     return new_power
-# 打印电量信息
+def Bottom_edge():  # 在图片中添加底边内容
-print(power_battery())
+    draw.rectangle((0, 105, 250, 122), 'black', 'black')
-def Bottom_edge():  #在图片中添加底边内容
+    '''电池图标画图'''
-     draw.rectangle((0, 105, 250, 122), 'black', 'black')
+    draw.line((126, 109, 154, 109), fill=255, width=1)  # 电池顶边
-     '''电池图标画图'''
+    draw.line((126, 110, 126, 119), fill=255, width=1)  # 电池左边
-     draw.line((126,109,154,109),fill=255, width=1) #电池顶边
+    draw.line((127, 119, 154, 119), fill=255, width=1)  # 电池下边
-     draw.line((126,110,126,119),fill=255, width=1) #电池左边
+    draw.line((154, 110, 154, 118), fill=255, width=1)
-     draw.line((127,119,154,119),fill=255, width=1) #电池下边
+    draw.line((155, 112, 157, 112), fill=255, width=1)
-     draw.line((154,110,154,118),fill=255, width=1)
+    draw.line((155, 116, 157, 116), fill=255, width=1)
-     draw.line((155,112,157,112),fill=255, width=1)
+    draw.line((157, 113, 157, 115), fill=255, width=1)
-     draw.line((155,116,157,116),fill=255, width=1)
+    global power_str
-     draw.line((157,113,157,115),fill=255, width=1)
+    power_str = power_battery()
-     global power_str
+    draw.text((129, 108), power_str, font=font04, fill=255)  # 显示当前电量百分比
-     power_str=power_battery()
+    '''电池图标画图'''
-     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.ellipse((192, 107, 207, 120), 0, 255)# 时钟图标
+    draw.line((200, 114, 204, 114), fill=255, width=1)
-     draw.line((199,109,199,114),fill=255, width=1)
+    global local_addr  # 获取当前IP地址
-     draw.line((200,114,204,114),fill=255, width=1)
+    local_addr = Get_ipv4_address()  # 获取当前IP地址
-     global local_addr  #获取当前IP地址
+    draw.text((10, 107), f"IP:{local_addr}", font=font05, fill=255)  # 显示当前IP地址
-     local_addr= Get_ipv4_address()  #获取当前IP地址
+
-     draw.text((10,107),"IP:"+local_addr,font = font05,fill =255)#显示当前IP地址
+
-def Weather():
+def Weather():  # 在图片中添加天气内容
-    try:
+    with open('/root/2.13-Ink-screen-clock/bin/weather.json', 'r') as file:
-        with open('/root/2.13-Ink-screen-clock/bin/weather.json', 'r') as Weather_json:
+        weather_data = json.load(file)
-            Weather_data = Weather_json.read()
+    global Weather_position, temperature, weather, wind_direction, weather_update, weather_date, humidity
-            if not Weather_data.strip():  # 检查文件是否为空
+    Weather_position = weather_data['cityname']  # 定位位置
-                logging.error("天气数据文件为空")
+    temperature = weather_data['temp'] + u'°C'  # 温度
-                return
+    weather = weather_data['weather']  # 天气情况
-                
+    wind_direction = weather_data['WD']  # 风向
-            Weather_text = json.loads(Weather_data)
+    weather_update = weather_data['time']  # 天气更新时间
-            global Weather_position, temperature, weather, wind_direction, weather_update, weather_date, humidity
+    weather_date = weather_data['date']  # 日期
-            
+    humidity = weather_data['SD']  # 湿度
-            Weather_position = Weather_text.get('cityname', '未知')  # 使用get方法提供默认值
+    draw.text((150, 25), "天气:", font=font06, fill=0)  # 显示当前天气前缀
-            temperature = f"{Weather_text.get('temp', '--')}°C"
+    draw.text((150, 45), "温度:", font=font06, fill=0)  # 显示当前温度前缀
-            weather = Weather_text.get('weather', '未知')
+    draw.text((150, 65), "湿度:", font=font06, fill=0)  # 显示当前湿度前缀
-            wind_direction = Weather_text.get('WD', '未知')
+    draw.text((150, 85), "城市:", font=font06, fill=0)  # 显示当前城市前缀
-            weather_update = Weather_text.get('time', '未知')
+    draw.text((191, 25), weather, font=font06, fill=0)
-            weather_date = Weather_text.get('date', '未知')
+    draw.text((191, 45), temperature, font=font06, fill=0)
-            humidity = Weather_text.get('SD', '未知')
+    draw.text((191, 65), humidity, font=font06, fill=0)
-            draw.text((150,25),"天气:",font = font06,fill =0)#显示当前天气前缀
+    draw.text((191, 85), Weather_position, font=font06, fill=0)
-            draw.text((150,45),"温度:",font = font06,fill =0)#显示当前温度前缀
+    draw.text((211, 107), weather_update, font=font05, fill=255)  # 显示天气更新时间
-            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)
+def Basic_refresh():  # 全刷函数
-            draw.text((191,45),temperature,font = font06,fill =0)
+    logging.info("在启动画布之前，刷新并准备基本内容")  # 开始画布前刷新准备基础内容
-            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) #显示天气更新时间
-    except FileNotFoundError:
-        logging.error("天气数据文件未找到")
-    except json.JSONDecodeError as e:
-        logging.error(f"天气数据解析失败: {str(e)}")
-    except Exception as e:
-        logging.error(f"获取天气信息时发生错误: {str(e)}")
-def Basic_refresh(): #全刷函数
-    logging.info("在启动画布之前，刷新并准备基本内容")#开始画布前刷新准备基础内容
     global get_date_var
-    get_date_var=get_date() #记录开始数据
+    get_date_var = get_date()  # 记录开始数据
-    draw.text((2,2),get_date_var,font = font02,fill =0)#将日期及星期几显示到屏幕
+    draw.text((2, 2), get_date_var, font=font02, fill=0)  # 将日期及星期几显示到屏幕
     global local_time
-    local_time=get_time()
+    local_time = get_time()
-    draw.text((5,28),local_time,font = font03,fill =0)#显示当前时间
+    draw.text((5, 40), local_time, font=font03, fill=0)  # 显示当前时间
-    Bottom_edge() #添加底边内容
+    Bottom_edge()  # 添加底边内容
-    Weather() #天气内容
+    Weather()  # 天气内容
     epd.display(epd.getbuffer(info_image.rotate(180)))
-def Partial_full_brush(): #局部定时全刷函数
+
-     Basic_refresh() #全局刷新
+
-     logging.debug("局部定时全局刷新")
+def Partial_full_brush():  # 局部定时全刷函数
-     epd.init()
+    Basic_refresh()  # 全局刷新
-def Partial_refresh():#局刷函数
+    logging.debug("局部定时全局刷新")
-     logging.info("部分内容更新，此更新建议与分钟同步，以节省墨水屏的使用寿命")#局部内容更新,此更新建议与分钟同步,以节省墨水屏寿命
+
-     epd.displayPartBaseImage(epd.getbuffer(info_image.rotate(180)))
+
-     epd.init()
+def Partial_refresh():  # 局刷函数
-     while (True):
+    logging.info("部分内容更新，此更新建议与分钟同步，以节省墨水屏的使用寿命")  # 局部内容更新,此更新建议与分钟同步,以节省墨水屏寿命
-         global local_time
+    epd.displayPartBaseImage(epd.getbuffer(info_image.rotate(180)))
-         local_time1=get_time()
+    epd.init()
-         if (local_time1==local_time) ==False:
+    while True:
-             draw.rectangle((5, 28, 149, 82), fill = 255) #时间局刷区域
+        global local_time
-             draw.text((5,28),local_time1,font = font03,fill =0)#刷新当前时间
+        local_time1 = get_time()
-             local_time=local_time1
+        if local_time1 != local_time:
-             Local_strong_brush() #局部强刷
+            draw.rectangle((5, 40, 133, 82), fill=255)  # 时间局刷区域
-         get_date_var1=get_date()  #局刷判断,如果时间与前一次不一致说明内容变化,需要刷新显示
+            draw.text((5, 40), local_time1, font=font03, fill=0)  # 刷新当前时间
-         global get_date_var #再次声明这个是全局变量
+            local_time = local_time1
-         if(get_date_var1==get_date_var) ==False:
+            Local_strong_brush()  # 局部强刷
-             draw.rectangle((2, 2, 250, 16), fill = 255) #设置头部刷新区域
+        get_date_var1 = get_date()  # 局刷判断,如果时间与前一次不一致说明内容变化,需要刷新显示
-             draw.text((2,2),get_date_var1,font = font02,fill =0)#将日期及星期几刷新显示到屏幕
+        global get_date_var  # 再次声明这个是全局变量
-             get_date_var=get_date_var1 #将更新的值保存到初始变量,直到下一次变化时执行该刷新操作
+        if get_date_var1 != get_date_var:
-             logging.debug("头部日期部位发生刷新变化.")
+            draw.rectangle((2, 2, 250, 16), fill=255)  # 设置头部刷新区域
-             Local_strong_brush() #局部强刷
+            draw.text((2, 2), get_date_var1, font=font02, fill=0)  # 将日期及星期几刷新显示到屏幕
-         global local_addr #当前IP地址
+            get_date_var = get_date_var1  # 将更新的值保存到初始变量,直到下一次变化时执行该刷新操作
-         local_addr1 = Get_ipv4_address()
+            logging.debug("头部日期部位发生刷新变化.")
-         if (local_addr1==local_addr) ==False:
+            Local_strong_brush()  # 局部强刷
-             draw.rectangle((1, 107, 123, 120), fill = 0) #设置头部刷新区域
+        global local_addr  # 当前IP地址
-             draw.text((10,107),"IP:"+local_addr1,font = font05,fill =255)#显示当前IP地址
+        local_addr1 = Get_ipv4_address()
-             local_addr=local_addr1
+        if local_addr1 != local_addr:
-             Local_strong_brush() #局部强刷
+            draw.rectangle((1, 107, 123, 120), fill=0)  # 设置头部刷新区域
-         '''天气局部更新函数'''
+            draw.text((10, 107), f"IP:{local_addr1}", font=font05, fill=255)  # 显示当前IP地址
-         Weather_json = open('/root/2.13-Ink-screen-clock/bin/weather.json','r')
+            local_addr = local_addr1
-         Weather_data = Weather_json.read()
+            Local_strong_brush()  # 局部强刷
-         Weather_json.close()
+        '''天气局部更新函数'''
-         Weather_text=json.loads(Weather_data)
+        with open('/root/2.13-Ink-screen-clock/bin/weather.json', 'r') as file:
-         global Weather_position
+            weather_data = json.load(file)
-         global temperature
+        global Weather_position, temperature, weather, wind_direction, weather_update, weather_date, humidity
-         global weather
+        Weather_position1 = weather_data['cityname']  # 定位位置
-         global wind_direction
+        temperature1 = weather_data['temp'] + u'°C'  # 温度
-         global weather_update
+        weather11 = weather_data['weather']  # 天气情况
-         global weather_date
+        humidity1 = weather_data['SD']  # 湿度
-         global humidity
+        weather_update1 = weather_data['time']  # 天气更新时间
-         Weather_position1 = Weather_text['cityname'] #定位位置
+        if weather11 != weather:
-         temperature1=Weather_text['temp']+u'°C' #温度
+            draw.rectangle((191, 25, 249, 38), fill=255)  # 天气局刷区域
-         weather11 = Weather_text['weather'] #天气情况
+            draw.text((191, 25), weather11, font=font06, fill=0)
-         wind_direction1 = Weather_text['WD'] #风向
+            weather = weather11
-         weather_update1 = Weather_text['time'] #天气更新时间
+            logging.info("天气局部刷新")
-         weather_date1 =  Weather_text['date'] #日期
+            Local_strong_brush()  # 局部强刷
-         humidity1 =  Weather_text['SD'] #湿度
+        if temperature1 != temperature:
-         if (weather11==weather) ==False:
+            draw.rectangle((191, 45, 249, 57), fill=255)  # 局刷区域
-             draw.rectangle((191, 25, 249, 38), fill = 255) #天气局刷区域
+            draw.text((191, 45), temperature1, font=font06, fill=0)
-             draw.text((191,25),weather11,font = font06,fill =0)
+            temperature = temperature1
-             weather=weather11
+            logging.info("温度局部刷新")
-             logging.info("天气局部刷新")
+            Local_strong_brush()  # 局部强刷
-             Local_strong_brush() #局部强刷
+        if humidity1 != humidity:
-         if (temperature1==temperature) ==False:
+            draw.rectangle((191, 65, 249, 77), fill=255)  # 局刷区域
-             draw.rectangle((191, 45, 249, 57), fill = 255) #局刷区域
+            draw.text((191, 65), humidity1, font=font06, fill=0)
-             draw.text((191,45),temperature1,font = font06,fill =0)
+            humidity = humidity1
-             temperature=temperature1
+            logging.info("湿度局部刷新")
-             logging.info("温度局部刷新")
+            Local_strong_brush()  # 局部强刷
-             Local_strong_brush() #局部强刷
+        if Weather_position1 != Weather_position:
-         if (humidity1==humidity) ==False:
+            draw.rectangle((191, 85, 249, 98), fill=255)  # 局刷区域
-             draw.rectangle((191, 65, 249, 77), fill = 255) #局刷区域
+            draw.text((191, 85), Weather_position1, font=font06, fill=0)
-             draw.text((191,65),humidity1,font = font06,fill =0)
+            Weather_position = Weather_position1
-             humidity = humidity1
+            logging.info("城市局部刷新")
-             logging.info("湿度局部刷新")
+            Local_strong_brush()  # 局部强刷
-             Local_strong_brush() #局部强刷
+        if weather_update1 != weather_update:
-         if (Weather_position1==Weather_position) ==False:
+            draw.rectangle((211, 107, 248, 118), fill=0)  # 设置更新时间刷新区域
-             draw.rectangle((191, 85, 249, 98), fill = 255) #局刷区域
+            draw.text((211, 107), weather_update1, font=font05, fill=255)  # 显示天气更新时间
-             draw.text((191,85),Weather_position1,font = font06,fill =0)
+            weather_update = weather_update1
-             Weather_position = Weather_position1
+            logging.info("天气更新时间局部刷新")
-             logging.info("城市局部刷新")
+            Local_strong_brush()  # 局部强刷
-             Local_strong_brush() #局部强刷
+        '''天气局部更新函数'''
-         if (weather_update1==weather_update) ==False:
+        global power_str
-             draw.rectangle((211, 107, 248, 118), fill = 0) #设置更新时间刷新区域
+        power_str1 = power_battery()
-             draw.text((211,107),weather_update1,font = font05,fill =255) #显示天气更新时间
+        if power_str1 != power_str:
-             weather_update=weather_update1
+            draw.rectangle((128, 110, 153, 117), fill=0)  # 设置更新时间刷新区域
-             logging.info("天气更新时间局部刷新")
+            draw.text((129, 108), power_str1, font=font04, fill=255)  # 显示当前电量百分比
-             Local_strong_brush() #局部强刷
+            power_str = power_str1
-         '''天气局部更新函数'''
+            Local_strong_brush()  # 局部强刷
-         global power_str
-         power_str1 =power_battery()
-         if (power_str1==power_str) ==False:
-             draw.rectangle((128, 110, 153, 117), fill = 0) #设置更新时间刷新区域
-             draw.text((129,108),power_battery(),font = font04,fill =255) #显示当前电量百分比
-             power_str=power_str1
-             Local_strong_brush() #局部强刷
-#             logging.info("电池电量局部刷新")
 
 retry_interval = 180  # 设置重试间隔时间（秒）
 while True:
@@ -330,4 +309,4 @@ epd.init()
 epd.Clear(0xFF)  # 清除屏幕内容
 epd.sleep()       # 使屏幕进入休眠状态
 epd2in13_V4.epdconfig.module_exit()  # 清理资源
-exit()
+exit()

bin/main.py1

@@ -1,258 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-from PIL import Image,ImageDraw,ImageFont  #引入图片处理库
-import os,sys,re,json,time,datetime  #引入系统相关库
-from borax.calendars.lunardate import LunarDate #农历日期以及天干地支纪年法的 Python 库
-import logging  #日志库
-import subprocess
-import os
-from threading import Timer
-import requests
-import socket
-
-white = 255 #颜色
-black = 0
-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)#将引入文件添加到环境变量
-    from waveshare_epd import epd2in13_V4  #引入墨水屏驱动文件
-logging.debug("Loading Fonts")
-font01 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 20) #字体文件
-font02 = ImageFont.truetype(os.path.join(picdir, 'GB2312.ttf'), 15) #字体文件
-font03 = ImageFont.truetype(os.path.join(picdir, 'Fonttt.ttf'), 48) #字体文件
-font04 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 10) #字体文件
-font05 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 12) #字体文件
-font06 = ImageFont.truetype(os.path.join(picdir, '原神cn.ttf'), 13) #字体文件
-################################引入配置文件结束################################################
-def Local_strong_brush(): #局部强制刷新显示
-     i = 0
-     while i < 5:
-         epd.displayPartial(epd.getbuffer(info_image.rotate(180)))#局刷开始
-         i = i + 1
-def get_date():#返回当前年月日及星期几
-    date = datetime.datetime.now()
-    today=LunarDate.today()
-    week_day_dict = {0: '星期一',1: '星期二',2: '星期三',3: '星期四',4: '星期五',5: '星期六',6: '星期日',}
-    day = date.weekday()
-    return time.strftime('%Y年%m月%d日')+''+week_day_dict[day]+''+today.strftime('农历%M月%D')
-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()
-        # 分割输出以获取单个IP地址列表
-        ip_list = ip_output.split()
-        # 过滤掉以172开头的IP地址
-        filtered_ips = [ip for ip in ip_list if not ip.startswith("172.")]
-        # 如果有有效的IP地址，返回第一个，否则返回获取失败
-        if filtered_ips:
-            return filtered_ips[0]
-        else:
-            return "地址获取失败"
-    except subprocess.CalledProcessError as e:
-        #logging.error("获取IPv4地址失败: %s", e)
-        return "获取失败"
-def CPU_temperature():#CPU温度获取
-     temperatura = os.popen('vcgencmd measure_temp').readline()
-     temperatura = temperatura.replace('temp=','').strip()
-     return str(temperatura)
-def Memory_footprint():#显示内存占用百分比
-     return(subprocess.check_output(u"free -m | awk -F '[ :]+' 'NR==2{printf \"%d\", ($3)/$2*100}'", shell = True ).decode('gbk'))
-def CPU_usage(): #显示CPU占用百分比
-     return(str(int(float(os.popen("top -b -n1 | awk '/Cpu\(s\):/ {print $2}'").readline().strip()))))
-def power_battery():#获取当前电池电量
-     return(str(int(subprocess.check_output(u"echo \"get battery\" | nc -q 0 127.0.0.1 8423|awk -F':' '{print int($2)}'", shell = True ).decode('gbk')))+u'%') 
-# 打印电量信息
-print(power_battery())
-def Bottom_edge():  #在图片中添加底边内容
-     draw.rectangle((0, 105, 250, 122), 'black', 'black')
-     '''电池图标画图'''
-     draw.line((126,109,154,109),fill=255, width=1) #电池顶边
-     draw.line((126,110,126,119),fill=255, width=1) #电池左边
-     draw.line((127,119,154,119),fill=255, width=1) #电池下边
-     draw.line((154,110,154,118),fill=255, width=1)
-     draw.line((155,112,157,112),fill=255, width=1)
-     draw.line((155,116,157,116),fill=255, width=1)
-     draw.line((157,113,157,115),fill=255, width=1)
-     global power_str
-     power_str=power_battery()
-     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_ipv4_address()  #获取当前IP地址
-     draw.text((10,107),"IP:"+local_addr,font = font05,fill =255)#显示当前IP地址
-def Weather(): #在图片中添加天气内容
-     Weather_json = open('/root/2.13-Ink-screen-clock/bin/weather.json','r')
-     Weather_data = Weather_json.read()
-     Weather_json.close()
-     Weather_text=json.loads(Weather_data)
-     global Weather_position
-     global temperature
-     global weather
-     global wind_direction
-     global weather_update
-     global weather_date
-     global humidity
-     Weather_position = Weather_text['cityname'] #定位位置
-     temperature=Weather_text['temp']+u'°C' #温度
-     weather = Weather_text['weather'] #天气情况
-     wind_direction = Weather_text['WD'] #风向
-     weather_update = Weather_text['time'] #天气更新时间
-     weather_date =  Weather_text['date'] #日期
-     humidity =  Weather_text['SD'] #湿度
-     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("在启动画布之前，刷新并准备基本内容")#开始画布前刷新准备基础内容
-    global get_date_var
-    get_date_var=get_date() #记录开始数据
-    draw.text((2,2),get_date_var,font = font02,fill =0)#将日期及星期几显示到屏幕
-    global local_time
-    local_time=get_time()
-    draw.text((5,28),local_time,font = font03,fill =0)#显示当前时间
-    Bottom_edge() #添加底边内容
-    Weather() #天气内容
-    epd.display(epd.getbuffer(info_image.rotate(180)))
-def Partial_full_brush(): #局部定时全刷函数
-     Basic_refresh() #全局刷新
-     logging.debug("局部定时全局刷新")
-     epd.init()
-def Partial_refresh():#局刷函数
-     logging.info("部分内容更新，此更新建议与分钟同步，以节省墨水屏的使用寿命")#局部内容更新,此更新建议与分钟同步,以节省墨水屏寿命
-     epd.displayPartBaseImage(epd.getbuffer(info_image.rotate(180)))
-     epd.init()
-     while (True):
-         global local_time
-         local_time1=get_time()
-         if (local_time1==local_time) ==False:
-             draw.rectangle((5, 28, 149, 82), fill = 255) #时间局刷区域
-             draw.text((5,28),local_time1,font = font03,fill =0)#刷新当前时间
-             local_time=local_time1
-             Local_strong_brush() #局部强刷
-         get_date_var1=get_date()  #局刷判断,如果时间与前一次不一致说明内容变化,需要刷新显示
-         global get_date_var #再次声明这个是全局变量
-         if(get_date_var1==get_date_var) ==False:
-             draw.rectangle((2, 2, 250, 16), fill = 255) #设置头部刷新区域
-             draw.text((2,2),get_date_var1,font = font02,fill =0)#将日期及星期几刷新显示到屏幕
-             get_date_var=get_date_var1 #将更新的值保存到初始变量,直到下一次变化时执行该刷新操作
-             logging.debug("头部日期部位发生刷新变化.")
-             Local_strong_brush() #局部强刷
-         global local_addr #当前IP地址
-         local_addr1 = Get_ipv4_address()
-         if (local_addr1==local_addr) ==False:
-             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() #局部强刷
-         '''天气局部更新函数'''
-         Weather_json = open('/root/2.13-Ink-screen-clock/bin/weather.json','r')
-         Weather_data = Weather_json.read()
-         Weather_json.close()
-         Weather_text=json.loads(Weather_data)
-         global Weather_position
-         global temperature
-         global weather
-         global wind_direction
-         global weather_update
-         global weather_date
-         global humidity
-         Weather_position1 = Weather_text['cityname'] #定位位置
-         temperature1=Weather_text['temp']+u'°C' #温度
-         weather11 = Weather_text['weather'] #天气情况
-         wind_direction1 = Weather_text['WD'] #风向
-         weather_update1 = Weather_text['time'] #天气更新时间
-         weather_date1 =  Weather_text['date'] #日期
-         humidity1 =  Weather_text['SD'] #湿度
-         if (weather11==weather) ==False:
-             draw.rectangle((191, 25, 249, 38), fill = 255) #天气局刷区域
-             draw.text((191,25),weather11,font = font06,fill =0)
-             weather=weather11
-             logging.info("天气局部刷新")
-             Local_strong_brush() #局部强刷
-         if (temperature1==temperature) ==False:
-             draw.rectangle((191, 45, 249, 57), fill = 255) #局刷区域
-             draw.text((191,45),temperature1,font = font06,fill =0)
-             temperature=temperature1
-             logging.info("温度局部刷新")
-             Local_strong_brush() #局部强刷
-         if (humidity1==humidity) ==False:
-             draw.rectangle((191, 65, 249, 77), fill = 255) #局刷区域
-             draw.text((191,65),humidity1,font = font06,fill =0)
-             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) #显示天气更新时间
-             weather_update=weather_update1
-             logging.info("天气更新时间局部刷新")
-             Local_strong_brush() #局部强刷
-         '''天气局部更新函数'''
-         global power_str
-         power_str1 =power_battery()
-         if (power_str1==power_str) ==False:
-             draw.rectangle((128, 110, 153, 117), fill = 0) #设置更新时间刷新区域
-             draw.text((129,108),power_battery(),font = font04,fill =255) #显示当前电量百分比
-             power_str=power_str1
-             Local_strong_brush() #局部强刷
-#             logging.info("电池电量局部刷新")
-
-retry_interval = 180  # 设置重试间隔时间（秒）
-while True:
-    try:
-        ##################屏幕初始化#########################
-        epd = epd2in13_V4.EPD() #初始化
-        epd.init()#设定屏幕刷新模式
-        #epd.Clear(0xFF) #清除屏幕内容
-        ##################屏幕初始化#########################   
-        logging.info("Width = %s, Height = %s", format(epd.width), format(epd.height)) #打印屏幕高度及宽度
-        logging.info("初始化并清空显示屏")#屏幕开始准备相关展示
-        info_image = Image.new('1', (epd.height, epd.width), 255) #画布创建准备
-        draw = ImageDraw.Draw(info_image)
-        Basic_refresh() #全局刷新
-        Partial_refresh() #局部刷新
-        epd.init()
-        epd.Clear(0xFF)
-        epd.sleep()
-        time.sleep(300)
-        break  # 如果脚本执行成功，则退出循环
-    except (OSError, Exception) as e:  # 捕获你提到的异常
-        logging.error("发生了错误: %s", e)
-        time.sleep(retry_interval)  # 等待一段时间后重试
-    except KeyboardInterrupt:
-        logging.info("检测到键盘中断，正在清理并退出")
-        epd.init()
-        epd.Clear(0xFF)  # 清除屏幕内容
-        epd.sleep()       # 使屏幕进入休眠状态
-        epd2in13_V4.epdconfig.module_exit()  # 清理资源
-        exit()
-
-# 脚本正常结束后的清理操作
-epd.init()
-epd.Clear(0xFF)  # 清除屏幕内容
-epd.sleep()       # 使屏幕进入休眠状态
-epd2in13_V4.epdconfig.module_exit()  # 清理资源
-exit()

bin/weather.py

@@ -5,9 +5,6 @@ import json
 import time
 import logging
 import requests
-import random
-import socket
-from functools import wraps
 from threading import Timer
 
 logging.basicConfig(
@@ -16,162 +13,13 @@ logging.basicConfig(
     datefmt='%Y-%m-%d %H:%M:%S'
 )
 
-def check_network_connection():
-    """检查网络连接状态"""
-    try:
-        # 尝试连接一个可靠的公共DNS服务器
-        socket.create_connection(("223.5.5.5", 53), timeout=5)
-        return True
-    except OSError:
-        return False
-
-def get_ip():
-    """改进的IP获取函数"""
-    if not check_network_connection():
-        logging.warning("网络连接不可用")
-        return None
-        
-    services = [
-        {"url": "https://api.ipify.org?format=json", "field": "ip"},
-        {"url": "https://ipinfo.io/json", "field": "ip"},
-        {"url": "https://ifconfig.me/all.json", "field": "ip_addr"}
-    ]
-    
-    for service in services:
-        try:
-            resp = requests.get(service["url"], timeout=10)
-            data = resp.json()
-            return data.get(service["field"])
-        except Exception:
-            continue
-            
-    logging.error("所有IP服务尝试失败")
-    return None
-def get_ip():
-    """从ip.cn获取当前IP地址"""
-    url = "https://ip.cn/api/index?ip=&type=0"
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
-    }
-    try:
-        resp = requests.get(url, headers=headers, timeout=10)
-        resp.raise_for_status()
-        data = resp.json()
-        if data.get('code') == 'Success':
-            return data.get('ip', '')
-        logging.error("获取IP失败: %s", data.get('msg', '未知错误'))
-    except Exception as e:
-        logging.error("获取IP异常: %s", str(e))
-    return None
-
-def get_current_city():
-    """通过IP地址获取当前定位城市并去除'市'后缀"""
-    ip = get_ip()
-    if not ip:
-        return None
-
-    url = f"http://ip-api.com/json/{ip}?fields=city&lang=zh-CN"
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
-    }
-    while True:
-        try:
-            resp = requests.get(url, headers=headers, timeout=10)
-            data = resp.json()
-            if data.get('status') == 'success':
-                return data.get('city', '').replace('市', '')
-            logging.error("定位失败: %s", data.get('message', '未知错误'))
-        except Exception as e:
-            logging.error("定位异常: %s", str(e))
-        time.sleep(180)
-
-def schedule_getWeath():
-    """改进的定时任务调度"""
-    retry_count = 0
-    max_retries = 3
-    
-    while retry_count < max_retries:
-        try:
-            getWeath()
-            break
-        except Exception as e:
-            retry_count += 1
-            wait_time = min(300, retry_count * 60)  # 指数退避
-            logging.error(f"天气更新失败({retry_count}/{max_retries}): {str(e)}")
-            time.sleep(wait_time)
-    
-    # 无论成功与否，都安排下一次执行
-    Timer(1800, schedule_getWeath).start()  # 30分钟间隔
-
-def getWeath(default_city='101060101'):
-    """改进的天气获取函数"""
-    # 1. 检查网络连接
-    if not check_network_connection():
-        logging.error("网络不可用，跳过天气更新")
-        return
-
-    # 2. 获取城市信息
-    city_name = None
-    try:
-        city_name = get_current_city()
-    except Exception as e:
-        logging.error(f"获取城市失败: {str(e)}")
-    
-    # 3. 确定区域ID
-    area_id = default_city
-    if city_name:
-        try:
-            found_id = get_area_id(city_name)
-            if found_id:
-                area_id = found_id
-                logging.info(f"使用城市区域ID: {area_id} ({city_name})")
-        except Exception as e:
-            logging.error(f"获取区域ID失败: {str(e)}")
-
-    # 4. 获取天气数据
-    weather_apis = [
-        f'https://d1.weather.com.cn/sk_2d/{area_id}.html',
-        f'https://www.weather.com.cn/weather1d/{area_id}.shtml'
-    ]
-    
-    for api_url in weather_apis:
-        try:
-            resp = requests.get(
-                api_url,
-                headers={'User-Agent': 'Mozilla/5.0'},
-                timeout=15
-            )
-            resp.raise_for_status()
-            
-            # 处理不同API的响应格式
-            if 'sk_2d' in api_url:
-                weather_data = resp.content[11:].decode('utf-8')
-            else:
-                weather_data = parse_html_weather(resp.text)
-            
-            # 验证数据有效性
-            if validate_weather_data(weather_data):
-                with open('/root/2.13-Ink-screen-clock/bin/weather.json', 'w') as f:
-                    json.dump(weather_data, f)
-                logging.info("天气数据更新成功")
-                return
-                
-        except Exception as e:
-            logging.warning(f"天气API {api_url} 失败: {str(e)}")
-            continue
-    
-    logging.error("所有天气API尝试失败")
-
 def get_area_id(city_name):
     """从city.js中检索AREAID，无限重试直到成功"""
     url = "https://j.i8tq.com/weather2020/search/city.js"
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
-    }
     while True:
         try:
-            resp = requests.get(url, headers=headers, timeout=10)
+            resp = requests.get(url, timeout=10)
-            resp.encoding = 'utf-8'
+            resp.encoding = 'utf-8'  # 显式设置编码
             city_data = json.loads(resp.text.split('=', 1)[1].rstrip(';'))
             for province in city_data.values():
                 for city in province.values():
@@ -183,10 +31,68 @@ def get_area_id(city_name):
             logging.error("获取城市ID失败: %s", str(e))
         time.sleep(180)
 
+def get_current_city():
+    """获取当前定位城市并去除'市'后缀"""
+    url = "http://ip-api.com/json/?lang=zh-CN"
+    while True:
+        try:
+            resp = requests.get(url, timeout=10)
+            resp.encoding = 'utf-8'  # 显式设置编码
+            data = resp.json()
+            if data['status'] == 'success':
+                return data['city'].rstrip('市')
+            logging.error("定位失败: %s", data.get('message'))
+        except Exception as e:
+            logging.error("定位异常: %s", str(e))
+        time.sleep(180)
+
+def schedule_getWeath():
+    """定时任务调度"""
+    try:
+        getWeath()
+    finally:
+        Timer(180, schedule_getWeath).start()
+
+def getWeath(default_city='101060101'):
+    """获取天气数据核心函数"""
+    city_name = get_current_city()
+    area_id = default_city  # 设置默认值
+    
+    if city_name:
+        try:
+            area_id = get_area_id(city_name) or default_city
+        except Exception as e:
+            logging.error("获取区域ID失败: %s", str(e))
+    
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+        'Referer': 'https://www.weather.com.cn/'
+    }
+
+    try:
+        resp = requests.get(
+            f'https://d1.weather.com.cn/sk_2d/{area_id}.html',
+            headers=headers,
+            timeout=15
+        )
+        resp.encoding = 'utf-8'  # 关键修改：强制设置响应编码
+        resp.raise_for_status()
+        
+        # 直接处理原始字节数据
+        weather_data = resp.content[11:].decode('utf-8')
+        
+        # 使用utf-8编码写入文件
+        with open('/root/2.13-Ink-screen-clock/bin/weather.json', 'w', encoding='utf-8') as f:
+            f.write(weather_data)
+            
+        logging.info("天气数据更新成功")
+    except Exception as e:
+        logging.error("天气更新失败: %s", str(e))
+
 if __name__ == "__main__":
     try:
         schedule_getWeath()
         while True: 
-            time.sleep(1)
+            time.sleep(1)  # 保持主线程存活
     except KeyboardInterrupt:
-        logging.info("程序已终止")
+        logging.info("程序已终止")