Update install.sh

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

@@ -5,7 +5,6 @@ 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
@@ -20,7 +19,7 @@ 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) #字体文件
+font01 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 19) #字体文件
 font02 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 15) #字体文件
 font03 = ImageFont.truetype(os.path.join(picdir, 'DSEG7Modern-Bold.ttf'), 38) #字体文件
 font04 = ImageFont.truetype(os.path.join(picdir, 'Font.ttc'), 10) #字体文件
@@ -55,7 +54,7 @@ def Get_ipv4_address():  # 获取当前的IP地址
         return f"获取失败"
 def CPU_temperature():#CPU温度获取
      temperatura = os.popen('vcgencmd measure_temp').readline()
-     temperatura = temperatura.replace('temp=','').strip()
+     temperatura = temperatura.replace('temp=','').replace('\'C', '').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'))
@@ -86,7 +85,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)
@@ -104,14 +103,14 @@ def Weather(): #在图片中添加天气内容
      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((175,25),"天气:",font = font06,fill =0)#显示当前天气前缀
+     draw.text((175,45),"温度:",font = font06,fill =0)#显示当前温度前缀
+     draw.text((175,65),"湿度:",font = font06,fill =0)#显示当前湿度前缀
+     draw.text((175,85),"城市:",font = font06,fill =0)#显示当前城市前缀
+     draw.text((205,25),weather,font = font06,fill =0)
+     draw.text((205,45),temperature,font = font06,fill =0)
+     draw.text((205,65),humidity,font = font06,fill =0)
+     draw.text((205,85),Weather_position,font = font06,fill =0)
      draw.text((211,107),weather_update,font = font05,fill =255) #显示天气更新时间
 
 def Basic_refresh(): #全刷函数
@@ -122,6 +121,18 @@ def Basic_refresh(): #全刷函数
     global local_time
     local_time=get_time()
     draw.text((5,40),local_time,font = font03,fill =0)#显示当前时间
+    global cpu_temp
+    cpu_temp = str(CPU_temperature())       # 调用函数并转换为字符串
+    text_to_display = "CPU温度:" + cpu_temp + "°C"
+    draw.text((4, 19), text_to_display, font=font06, fill=0)  # 绘制文本
+    global mem_use
+    mem_use = str(Memory_footprint())  # 调用函数并转换为字符串
+    text_to_display = "内存占用:" + mem_use + "%"  # 连接字符串
+    draw.text((4, 84), text_to_display, font=font06, fill=0)  # 绘制文本
+    global cpu_use
+    cpu_use = str(CPU_usage())       # 调用函数并转换为字符串
+    text_to_display = "CPU占用:" + cpu_use + "%"
+    draw.text((90, 84), text_to_display, font=font06, fill=0)  # 绘制文本
     Bottom_edge() #添加底边内容
     Weather() #天气内容
     epd.display(epd.getbuffer(info_image.rotate(180)))
@@ -157,7 +168,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)
@@ -176,26 +187,26 @@ def Partial_refresh():#局刷函数
          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)
+             draw.rectangle((205, 25, 250, 38), fill = 255) #天气局刷区域
+             draw.text((205,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)
+             draw.rectangle((205, 45, 250, 57), fill = 255) #局刷区域
+             draw.text((205,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)
+             draw.rectangle((205, 65, 250, 77), fill = 255) #局刷区域
+             draw.text((205,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)
+             draw.rectangle((205, 85, 250, 98), fill = 255) #局刷区域
+             draw.text((205,85),Weather_position1,font = font06,fill =0)
              Weather_position = Weather_position1
              logging.info("城市局部刷新")
              Local_strong_brush() #局部强刷
@@ -213,39 +224,73 @@ def Partial_refresh():#局刷函数
              draw.text((129,108),power_battery(),font = font04,fill =255) #显示当前电量百分比
              power_str=power_str1
              Local_strong_brush() #局部强刷
-             logging.info("电源电量局部刷新")
-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()
-except IOError as e:
-    logging.info(e)
-except KeyboardInterrupt:
-    logging.info("检测到键盘中断，正在优雅地退出")
-    epd.init()
-    epd.Clear(0xFF)  # 清除屏幕内容
-    epd.sleep()       # 使屏幕进入休眠状态
-    epd2in13_V4.epdconfig.module_exit()  # 清理资源
-    exit()
+             #logging.info("电源电量局部刷新")
+         '''CPU温度显示'''
+         global cpu_temp
+         cpu_temp1 =CPU_temperature()
+         if (cpu_temp1==cpu_temp) ==False:
+             draw.rectangle((1, 19, 130, 38), fill = 255)
+             cpu_temp = str(CPU_temperature())       # 调用函数并转换为字符串
+             text_to_display = "CPU温度:" + cpu_temp + "°C"
+             draw.text((4, 19), text_to_display, font=font06, fill=0)  # 绘制文本
+             cpu_temp1=cpu_temp
+             Local_strong_brush() #局部强刷
+             #logging.info("CPU温度局部刷新")
+         '''CPU温度显示'''          
+         '''内存百分比显示'''
+         global mem_use
+         mem_use1 =Memory_footprint()
+         if (mem_use1==mem_use) ==False:
+             draw.rectangle((1, 84, 90, 98), fill = 255)
+             mem_use = str(Memory_footprint())  # 调用函数并转换为字符串
+             text_to_display = "内存占用:" + mem_use + "%"  # 连接字符串
+             draw.text((4, 84), text_to_display, font=font06, fill=0)  # 绘制文本
+             mem_use1=mem_use
+             Local_strong_brush() #局部强刷
+             #logging.info("内存百分比局部刷新")
+         '''内存百分比显示'''
+         '''CPU占用显示'''
+         global cpu_use
+         cpu_use1 =CPU_usage()
+         if (cpu_use1==cpu_use) ==False:
+             draw.rectangle((90, 84, 170, 98), fill = 255)
+             cpu_use = str(CPU_usage())       # 调用函数并转换为字符串
+             text_to_display = "CPU占用:" + cpu_use + "%"
+             draw.text((90, 84), text_to_display, font=font06, fill=0)  # 绘制文本
+             cpu_use1=cpu_use
+             Local_strong_brush() #局部强刷
+             #logging.info("CPU温度局部刷新")
+         '''CPU占用显示'''
 
-except Exception as e:
-    logging.error("发生了意外的错误: %s", e)
-    epd.init()
-    epd.Clear(0xFF)  # 清除屏幕内容
-    epd.sleep()       # 使屏幕进入休眠状态
-    epd2in13_V4.epdconfig.module_exit()  # 清理资源
-    exit()
+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()
+        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()

bin/weather.py

@@ -17,49 +17,48 @@ 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 getWeath(city='101060101'):
     headers = {
@@ -76,7 +75,7 @@ def getWeath(city='101060101'):
         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()  # 定时器函数,间隔三分钟下载文件至本地
@@ -88,10 +87,10 @@ def getWeath(city='101060101'):
 
 try:
     getWeath()  # 天气获取函数开始运行
-except IOError as e:
+except OSError as e:
     logging.info(e)
 except KeyboardInterrupt:
-    logging.info("检测到键盘中断，正在优雅地退出")
+    logging.info("检测到键盘中断，正在退出")
 except Exception as e:
     logging.error("发生了意外错误: %s", e)
     exit()