更新 weather.py

bin/clean.py

@@ -48,7 +48,7 @@ def clear_screen():
         logging.info(e)
         
     except KeyboardInterrupt:
-        logging.info("按下了 Ctrl+C，正在退出")
+        logging.info("检测到键盘中断，正在退出")
         epd2in13_V4.epdconfig.module_exit(cleanup=True)
         exit()
 

bin/install.sh

@@ -121,25 +121,14 @@ is_raspberry_pi() {
   fi
 }
 
-# 定义链接变量
-DEBIAN_MIRROR="http://deb.debian.org/debian/"
-DEBIAN_SECURITY_MIRROR="http://security.debian.org/"
-PISUGAR_WIFI_CONF_URL="https://cdn.pisugar.com/PiSugar-wificonfig/script/install.sh"
-PISUGAR_POWER_MANAGER_URL="https://cdn.pisugar.com/release/pisugar-power-manager.sh"
-PIPY_MIRROR="https://pypi.org/simple"
-# 修改 Raspberry Pi 特定源链接
-RASPBERRY_PI_SOURCE_DEBIAN11="https://archive.raspberrypi.org/debian/"
-RASPBERRY_PI_SOURCE_DEBIAN12="https://archive.raspberrypi.com/debian/"
-
-# 如果使用中国镜像源，则更新链接变量
-if [ "$USE_CN_MIRROR" = true ]; then
-  DEBIAN_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/debian/"
+# 使用中国镜像源
+  DEBIAN_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/debian"
   DEBIAN_SECURITY_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/debian-security"
   PIPY_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
   # 使用中国镜像源时，Raspberry Pi 特定源链接保持不变
-  RASPBERRY_PI_SOURCE_DEBIAN11="https://mirrors.tuna.tsinghua.edu.cn/raspberrypi/"
-  RASPBERRY_PI_SOURCE_DEBIAN12="https://mirrors.tuna.tsinghua.edu.cn/raspberrypi/"
-fi
+  RASPBERRY_PI_SOURCE_DEBIAN11="https://mirrors.tuna.tsinghua.edu.cn/raspberrypi"
+  RASPBERRY_PI_SOURCE_DEBIAN12="https://mirrors.tuna.tsinghua.edu.cn/raspberrypi"
+
 
 # 定义仓库链接变量
 INK_SCREEN_CLOCK_REPO_URL="https://github.com/kxgx/2.13-Ink-screen-clock"
@@ -155,6 +144,7 @@ update_sources_list() {
   local raspberry_pi_source_in_use=$(grep -oP 'deb\s+\K.+' /etc/apt/sources.list.d/raspi.list | head -1)
 
   # 检查并替换 Debian 源
+  if [ "$USE_CN_MIRROR" = true ]; then
   if [ "$debian_mirror_in_use" != "$DEBIAN_MIRROR" ]; then
     sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
     {
@@ -196,12 +186,13 @@ update_sources_list() {
   else
     echo "Raspberry Pi 源链接已更新，跳过替换" >&2
   fi
+fi
 }
 
 # 安装包函数
 install_packages() {
     echo "正在更新源列表"
-  if ! sudo apt-get -q -y update; then
+  if ! sudo apt-get -q update; then
     echo "更新源列表失败" >&2
     exit 1
   fi
@@ -215,7 +206,7 @@ install_packages() {
 # 安装pip包函数
 install_pip_packages() {
     echo "正在安装pip软件包"
-  if ! sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests; then
+  if ! sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests Flask; then
     echo "pip软件包安装失败，如果是最新版系统或是非lite系统" >&2
     echo "请手动运行sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests --break-system-packages" >&2
     exit 1
@@ -317,6 +308,7 @@ if [ -f /etc/debian_version ]; then
         install_packages
         install_pip_packages
         setup_service
+        #install_webui
         install_pisugar-wifi-conf
         install_pisugar-power-manager
         ;;
@@ -326,6 +318,7 @@ if [ -f /etc/debian_version ]; then
         install_packages
         install_pip_packages
         setup_service
+        #install_webui
         install_pisugar-wifi-conf
         install_pisugar-power-manager
         ;;

bin/main.py

@@ -37,7 +37,7 @@ def get_date():#返回当前年月日及星期几
     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')
+    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地址
@@ -46,13 +46,18 @@ 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
+        # 分割输出以获取单个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 "IPv4获取失败"
+            return "地址获取失败"
     except subprocess.CalledProcessError as e:
-        return f"获取失败"
+        logging.error("获取IPv4地址失败: %s", e)
+        return "获取失败"
 def CPU_temperature():#CPU温度获取
      temperatura = os.popen('vcgencmd measure_temp').readline()
      temperatura = temperatura.replace('temp=','').strip()
@@ -86,7 +91,7 @@ def Bottom_edge():  #在图片中添加底边内容
      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')
+     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)
@@ -157,7 +162,7 @@ def Partial_refresh():#局刷函数
              local_addr=local_addr1
              Local_strong_brush() #局部强刷
          '''天气局部更新函数'''
-         Weather_json = open('weather.json','r')
+         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)
@@ -213,7 +218,7 @@ def Partial_refresh():#局刷函数
              draw.text((129,108),power_battery(),font = font04,fill =255) #显示当前电量百分比
              power_str=power_str1
              Local_strong_brush() #局部强刷
-             logging.info("电源电量局部刷新")
+#             logging.info("电源电量局部刷新")
 try:
 ##################屏幕初始化#########################
     epd = epd2in13_V4.EPD() #初始化
@@ -229,10 +234,10 @@ try:
     epd.init()
     epd.Clear(0xFF)
     epd.sleep()
-except IOError as e:
+except OSError as e:
     logging.info(e)
 except KeyboardInterrupt:
-    logging.info("检测到键盘中断，正在优雅地退出")
+    logging.info("检测到键盘中断，正在清理并退出")
     epd.init()
     epd.Clear(0xFF)  # 清除屏幕内容
     epd.sleep()       # 使屏幕进入休眠状态
@@ -252,4 +257,4 @@ epd.init()
 epd.Clear(0xFF)  # 清除屏幕内容
 epd.sleep()       # 使屏幕进入休眠状态
 epd2in13_V4.epdconfig.module_exit()  # 清理资源
-exit()
+exit()

bin/raspi_e-Paper.service

@@ -4,12 +4,11 @@ After=network.target
 
 [Service]
 Type=forking
-# 等待网络完全启动
-ExecStartPre=/bin/bash -c 'until ping -c1 baidu.com &>/dev/null; do sleep 1; done'
 ExecStart=/root/2.13-Ink-screen-clock/bin/start.sh
-ExecStop=/usr/bin/screen -S main_screen -X quit
-Restart=on-failure
+ExecStop=/bin/bash -c "pkill -f /root/2.13-Ink-screen-clock/bin/main.py; pkill -f /root/2.13-Ink-screen-clock/bin/weather.py"
+WorkingDirectory=/root/2.13-Ink-screen-clock/bin
+Restart=always
 User=root
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

bin/weather.py

@@ -17,54 +17,58 @@ if os.path.exists(libdir):
     sys.path.append(libdir)  # 将引入文件添加到环境变量
 
 def get_area_id(city_name):
-    """从city.js中检索AREAID"""
+    """从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
+    while True:
+        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, json.JSONDecodeError) as e:
+            logging.error("检索或解析城市数据时发生错误: %s", e)
+            time.sleep(180)  # 重试前等待
 
 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
+    while True:
+        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, json.JSONDecodeError) as e:
+            logging.error("检索或解析当前城市时出现错误: %s", e)
+            time.sleep(180)  # 重试前等待
+# 注意：无限重试可能会在特定情况下导致程序无法终止，请确保在实际使用中考虑适当的退出条件或限制重试次数。
+
+def schedule_getWeath():
+    """调度 getWeath 函数每3分钟执行一次"""
+    getWeath()
+    Timer(180, schedule_getWeath).start()  # 重新设置定时器
 
 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/'
+        'Referer': 'https://www.weather.com.cn/'
     }
     current_city = get_current_city()
     if current_city:
@@ -72,14 +76,13 @@ def getWeath(city='101060101'):
         if area_id:
             city = area_id
     try:
-        response = requests.get('http://d1.weather.com.cn/sk_2d/'+city+'.html',headers=headers)
+        response = requests.get('https://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 = open('/root/2.13-Ink-screen-clock/bin/weather.json', 'w')
         fileHandle.write(str(Weath))
         fileHandle.close()
-        Timer(180, getWeath).start()  # 定时器函数,间隔三分钟下载文件至本地
         print("天气文件更新")
     except requests.RequestException as e:
         logging.error("获取天气数据时出现网络错误: %s", e)
@@ -87,11 +90,11 @@ def getWeath(city='101060101'):
         logging.error("发生了意外错误: %s", e)
 
 try:
-    getWeath()  # 天气获取函数开始运行
-except IOError as e:
+    schedule_getWeath()  # 开始调度天气获取函数
+except OSError as e:
     logging.info(e)
 except KeyboardInterrupt:
-    logging.info("检测到键盘中断，正在优雅地退出")
+    logging.info("检测到键盘中断，正在退出")
 except Exception as e:
     logging.error("发生了意外错误: %s", e)
     exit()