Update README.md

README.md

@@ -1,8 +1,9 @@
 # 墨水屏展示当前时间及天气数据
 
-首先感谢上游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)
 注意:请先配置完需要的硬件以及系统配置操作再运行脚本
 
 ## API说明:
@@ -25,11 +26,9 @@
     
      https://github.com/PiSugar/PiSugar/wiki/PiSugar-3-Series#rtc-on-board
      https://www.pisugar.com/
-
 ps:如果没有使用此模块则需要更改代码内容,以避免运行出错。
-以上可能python脚本已解决
 
-ps:代码里需要nc命令需要安装netcat，安装内容已集成到“需要安装的软件和依赖“https://github.com/kxgx/2.13-Ink-screen-clock#%E9%9C%80%E8%A6%81%E5%AE%89%E8%A3%85%E7%9A%84%E8%BD%AF%E4%BB%B6%E5%92%8C%E4%BE%9D%E8%B5%96
+ps:代码里需要nc命令需要安装netcat，安装内容已集成到“[需要安装的软件和依赖](https://github.com/kxgx/2.13-Ink-screen-clock#%E9%9C%80%E8%A6%81%E5%AE%89%E8%A3%85%E7%9A%84%E8%BD%AF%E4%BB%B6%E5%92%8C%E4%BE%9D%E8%B5%96)"
      
 ### 墨水屏2.13inch e-Paper HAT+硬件连接
 连接树莓派的时候，可以直接将板子插到树莓派的 40PIN 排针上去，注意对好引脚。
@@ -58,28 +57,36 @@ sudo reboot
 
 ![image](https://www.waveshare.net/w/upload/a/a0/RPI_open_spi_2.jpg)
 
+#### wifi连接管理
+可以使用[PiSugar/sugar-wifi-conf:让树莓派提供蓝牙BLE服务，使用小程序可以随时更改树莓派的wifi连接
+](https://github.com/PiSugar/PiSugar/wiki/PiSugar-WiFi-config#sugar-wifi-conf)
 ## 使用脚本直接安装（推荐）
 ### 参数定义
 ```Bash
---zh    设置系统语言为zh_CN,UTF-8
+--zh                      设置系统语言为zh_CN,UTF-8
---cn    替换apt镜像源为中国镜像源
+--cn                      替换apt镜像源为中国镜像源
---debug 输出详细信息
+--gitcn                   克隆中国仓库
+--pisugar-wifi-conf       安装pisugar-wifi-conf
+--pisugar-power-manager   安装pisugar-power-manager
+--version <tag>           版本号
+--debug                   输出详细信息
 ```
+### 
 ```Bash
-#国内源默认设置
+#中国源默认设置
 curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash
 ```
 ```Bash
-#国内源--cn设置
+#中国源全参数设置(不使用--debug参数)
-curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --cn
+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
 ```
 ```Bash
 #默认源默认设置
 curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash
 ```
 ```Bash
-#默认源--cn设置
+#默认源全参数设置(不使用--debug参数)
-curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --cn
+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
 ```
 
 ## 需要安装的软件和依赖:
@@ -88,27 +95,25 @@ curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh
 PiSugar 3官方文档 https://github.com/PiSugar/PiSugar/wiki/PiSugar-3-Series#software-installation
 ```Bash
 sudo apt-get update
-sudo apt install -y git
+sudo apt-get install -y git pigpio i2c-tools netcat* gawk python3-dev python3-pip python3-pil python3-numpy python3-gpiozero python3-pigpio build-essential
-sudo apt-get install -y netcat*
+sudo pip3 install spidev borax pillow requests
-sudo apt-get install -y python3-pip
-sudo apt-get install -y python3-pil
-sudo apt-get install -y python3-numpy
-sudo apt install -y python3-gpiozero
-sudo pip3 install spidev borax pillow requests --break-system-packages
 wget https://cdn.pisugar.com/release/pisugar-power-manager.sh
 bash pisugar-power-manager.sh -c release
 ```
-#### 傻瓜式安装命令和执行启动文件：
+#### 安装命令和执行启动文件组合命令：
 ```Bash
-sudo apt-get update && sudo apt install -y git && sudo apt-get install -y python3-pip && sudo apt-get install -y python3-pil && sudo apt-get install -y python3-numpy && sudo apt install -y python3-gpiozero && sudo apt-get install -y netcat* && sudo pip3 install spidev borax pillow requests --break-system-packages && wget https://cdn.pisugar.com/release/pisugar-power-manager.sh && bash pisugar-power-manager.sh -c release && cd ~/ && git clone https://github.com/kxgx/2.13-Ink-screen-clock.git && cd ~/2.13-Ink-screen-clock/bin/ && sudo chmod +x start.sh && sudo ./start.sh
+sudo apt-get update && sudo apt-get install -y git pigpio i2c-tools netcat* gawk python3-dev python3-pip python3-pil python3-numpy python3-gpiozero python3-pigpio build-essential && sudo pip3 install spidev borax pillow requests && wget https://cdn.pisugar.com/release/pisugar-power-manager.sh && bash pisugar-power-manager.sh -c release && cd ~/ && git clone https://github.com/kxgx/2.13-Ink-screen-clock.git && cd ~/2.13-Ink-screen-clock/bin/ && sudo chmod +x start.sh && sudo ./start.sh
 ```
 ##### 使用国内仓库：
 ```Bash
-sudo apt-get update && sudo apt install -y git && sudo apt-get install -y python3-pip && sudo apt-get install -y python3-pil && sudo apt-get install -y python3-numpy && sudo apt install -y python3-gpiozero && sudo apt-get install -y netcat* && sudo pip3 install spidev borax pillow requests --break-system-packages && wget https://cdn.pisugar.com/release/pisugar-power-manager.sh && bash pisugar-power-manager.sh -c release && cd ~/ && git clone https://gitee.com/xingguangk/2.13-Ink-screen-clock.git && cd ~/2.13-Ink-screen-clock/bin/ && sudo chmod +x start.sh && sudo ./start.sh
+sudo apt-get update && sudo apt-get install -y git pigpio i2c-tools netcat* gawk python3-dev python3-pip python3-pil python3-numpy python3-gpiozero python3-pigpio build-essential && sudo pip3 install spidev borax pillow requests && sudo pip3 install spidev borax pillow requests --break-system-packages && wget https://cdn.pisugar.com/release/pisugar-power-manager.sh && bash pisugar-power-manager.sh -c release && cd ~/ && git clone https://gitee.com/xingguangk/2.13-Ink-screen-clock.git && cd ~/2.13-Ink-screen-clock/bin/ && sudo chmod +x start.sh && sudo ./start.sh
+```
+###### 注意
+```Bash
+# 如果使用的是非lite系统请在pip3安装部分添加
+--break-system-packages
 ```
-
-总体采用局刷方案,程序运行后一直处于程序的获取新数据的过程中,当发现数据变化后即开始自动局刷。
-
-特别注意:
 在代码文件第三十三行,此次代码需要更改,否则将展示默认城市天气数据
-![image](https://raw.githubusercontent.com/huanglinsd/2.13-Ink-screen-clock/main/pic/IMG_1245.JPG)
+# 效果展示
+总体采用局刷方案,程序运行后一直处于程序的获取新数据的过程中,当发现数据变化后即开始自动局刷。
+![image](https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/pic/1736749257603.jpg)

bin/clean.py

@@ -34,7 +34,7 @@ def clear_screen():
         epd.Clear(0xFF)
         
         # 等待一段时间，确保清除操作完成
-        time.sleep(1)
+        #time.sleep(1)
         
         # 将屏幕置于睡眠模式
         logging.info("Putting e-Paper display to sleep")

bin/clean.sh

@@ -5,6 +5,14 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 logdir=${dir%/*}
 screen_name="clean_screen"
 service_name="raspi_e-Paper.service"
+hold_time_seconds=10  # 设置维持时间，例如300秒（5分钟）
+
+# 创建一个新的screen会话并运行Python脚本
+screen -dmS $screen_name /usr/bin/python3 -u $dir/$f_name 2>&1
+
+# 等待维持时间
+echo "正在运行脚本，将在 ${hold_time_seconds} 秒后停止服务..."
+sleep $hold_time_seconds
 
 # 停止raspi_e-Paper服务
 echo "正在停止$service_name服务..."
@@ -16,5 +24,4 @@ for pid in $pids; do
     screen -S $pid -X quit
 done
 
-# 创建一个新的screen会话并运行Python脚本
+echo "脚本运行完成，服务已停止，screen会话已结束"
-screen -dmS $screen_name /usr/bin/python3 -u $dir/$f_name > $logdir/log/clean-info.log 2>&1

bin/e-Paper_clean.service

@@ -8,7 +8,6 @@ Before=reboot.target
 Type=oneshot
 ExecStart=/bin/bash /root/2.13-Ink-screen-clock/bin/clean.sh
 RemainAfterExit=yes
-TimeoutSec=5s
 
 [Install]
 WantedBy=shutdown.target

bin/install.sh

@@ -12,6 +12,12 @@ DEFAULT_LANG="en_US.UTF-8"
 USE_CN_MIRROR=false
 # 控制调试输出
 DEBUG=false
+# 检查是否使用中国git仓库
+USE_CN_GIT=false
+# 检查是否安装pisugar-wifi-conf
+USE_PISUGAR_WIFI_CONF=false
+# 检查是否安装pisugar-power-manager
+USE_PISUGAR_POWER_MANAGER=false
 
 # 解析命令行参数
 while [ "$#" -gt 0 ]; do
@@ -22,6 +28,23 @@ while [ "$#" -gt 0 ]; do
     --cn)
     USE_CN_MIRROR=true
     ;;
+    --gitcn)
+    USE_CN_GIT=true
+    ;;
+    --pisugar-wifi-conf)
+    USE_PISUGAR_WIFI_CONF=true
+    ;;
+    --pisugar-power-manager)
+    USE_PISUGAR_POWER_MANAGER=true
+    ;;
+    --version)
+      if [ -z "$2" ]; then
+        echo "错误: --version 参数后需要跟版本号"
+        exit 1
+      fi
+      VERSION="$2"  # 将版本号赋值给变量 VERSION
+      shift 2  # 移动参数，跳过版本号参数及其值
+      ;;
     --debug)
     DEBUG=true
     ;;
@@ -33,33 +56,58 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
+# 获取当前语言环境变量
+CURRENT_LANG=$(locale | grep LANG | sed 's/.*=//')
+
+# 打印当前语言环境变量
+echo "当前语言环境: $CURRENT_LANG"
+
 # 设置语言环境
-export LANG=$DEFAULT_LANG
+if [ "$CURRENT_LANG" != "$DEFAULT_LANG" ]; then
-export LC_ALL=$DEFAULT_LANG
+  echo "当前语言环境不是 $DEFAULT_LANG，将进行设置"
 
-# 如果 locale.gen 中不存在，则添加到 locale.gen
+  # 设置新的语言环境变量
-if ! grep -q "^$DEFAULT_LANG UTF-8" /etc/locale.gen; then
+  export LANG=$DEFAULT_LANG
-  echo "$DEFAULT_LANG UTF-8" | sudo tee -a /etc/locale.gen
+  export LC_ALL=$DEFAULT_LANG
-fi
 
-# 生成 locale
+  # 检查 locale.gen 中是否已存在 DEFAULT_LANG
-if ! sudo locale-gen; then
+  found=0
-  echo "生成 locale 失败" >&2
+  while read -r line; do
-  exit 1
+    if [[ "$line" == "$DEFAULT_LANG UTF-8" ]]; then
-fi
+      found=1
+      break
+    fi
+  done < /etc/locale.gen
 
-# 重新配置 locales
+  if [ $found -eq 0 ]; then
-if ! sudo dpkg-reconfigure --frontend=noninteractive locales; then
+    # 如果不存在，则添加到 locale.gen
-  echo "重新配置 locales 失败" >&2
+    echo "$DEFAULT_LANG UTF-8" | sudo tee -a /etc/locale.gen
-  exit 1
+    # 确保 locale.gen 被正确更新
-fi
+    if [ $? -ne 0 ]; then
-
+      echo "无法更新 locale.gen 文件" >&2
-# 如果需要调试输出
+      exit 1
-debug() {
+    fi
-  if [ "$DEBUG" = true ]; then
+  else
-    echo "$@"
+    echo "语言环境 $DEFAULT_LANG 已在 locale.gen 中设置，跳过添加"
   fi
-}
+
+  # 生成 locale
+  if ! sudo locale-gen; then
+    # 如果生成失败，打印错误消息并退出
+    echo "生成 locale 失败" >&2
+    exit 1
+  fi
+
+  # 更新 locale 配置
+  if ! sudo update-locale LANG=$DEFAULT_LANG; then
+    echo "更新 locale 配置失败" >&2
+    exit 1
+  fi
+
+  echo "语言环境设置完成"
+else
+  echo "当前语言环境已经是 $DEFAULT_LANG，跳过设置"
+fi
 
 # Debian版本相关命令
 DEBIAN_VERSION=$(cat /etc/debian_version)
@@ -76,41 +124,89 @@ is_raspberry_pi() {
 # 定义链接变量
 DEBIAN_MIRROR="http://deb.debian.org/debian/"
 DEBIAN_SECURITY_MIRROR="http://security.debian.org/"
-PI_SUGAR_POWER_MANAGER_URL="https://cdn.pisugar.com/release/pisugar-power-manager.sh"
+PISUGAR_WIFI_CONF_URL="https://cdn.pisugar.com/PiSugar-wificonfig/script/install.sh"
-INK_SCREEN_CLOCK_REPO_URL="https://github.com/kxgx/2.13-Ink-screen-clock.git"
+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.cernet.edu.cn/debian/"
+  DEBIAN_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/debian/"
-  DEBIAN_SECURITY_MIRROR="https://mirrors.cernet.edu.cn/debian-security"
+  DEBIAN_SECURITY_MIRROR="https://mirrors.tuna.tsinghua.edu.cn/debian-security"
-  INK_SCREEN_CLOCK_REPO_URL="https://gitee.com/xingguangk/2.13-Ink-screen-clock.git"
   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
+
+# 定义仓库链接变量
+INK_SCREEN_CLOCK_REPO_URL="https://github.com/kxgx/2.13-Ink-screen-clock"
+# 如果使用中国仓库，则更新链接变量
+if [ "$USE_CN_GIT" = true ]; then
+  INK_SCREEN_CLOCK_REPO_URL="https://gitee.com/xingguangk/2.13-Ink-screen-clock"
 fi
 
 # 更新源列表函数
 update_sources_list() {
   local version=$1
-  debug "正在更新版本 $version 的源列表"
+  local debian_mirror_in_use=$(grep -oP 'deb\s+\K.+' /etc/apt/sources.list | head -1)
-  sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
+  local raspberry_pi_source_in_use=$(grep -oP 'deb\s+\K.+' /etc/apt/sources.list.d/raspi.list | head -1)
-  {
+
-    echo "deb $DEBIAN_MIRROR $version main contrib non-free"
+  # 检查并替换 Debian 源
-    echo "# deb-src $DEBIAN_MIRROR $version main contrib non-free"
+  if [ "$debian_mirror_in_use" != "$DEBIAN_MIRROR" ]; then
-  } | sudo tee /etc/apt/sources.list > /dev/null
+    sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
+    {
+    if [ "$version" = "bookworm" ]; then
+      echo "deb $DEBIAN_MIRROR $version main contrib non-free non-free-firmware"
+      echo "# deb-src $DEBIAN_MIRROR $version main contrib non-free non-free-firmware"
+      echo "deb $DEBIAN_MIRROR $version-updates main contrib non-free non-free-firmware"
+      echo "# deb-src $DEBIAN_MIRROR $version-updates main contrib non-free non-free-firmware"
+      echo "deb $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free non-free-firmware"
+      echo "# deb-src $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free non-free-firmware"
+    else
+      echo "deb $DEBIAN_MIRROR $version main contrib non-free"
+      echo "# deb-src $DEBIAN_MIRROR $version main contrib non-free"
+      echo "deb $DEBIAN_MIRROR $version-updates main contrib non-free"
+      echo "# deb-src $DEBIAN_MIRROR $version-updates main contrib non-free"
+      echo "deb $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free"
+      echo "# deb-src $DEBIAN_SECURITY_MIRROR $version-security main contrib non-free"
+    fi
+    } | sudo tee /etc/apt/sources.list > /dev/null
+  else
+    echo "Debian 源链接已更新，跳过替换" >&2
+  fi
+
+  # 检查并替换 Raspberry Pi 特定源
+  if [ "$version" == "bullseye" ]; then
+    RASPBERRY_PI_SOURCE=$RASPBERRY_PI_SOURCE_DEBIAN11
+  elif [ "$version" == "bookworm" ]; then
+    RASPBERRY_PI_SOURCE=$RASPBERRY_PI_SOURCE_DEBIAN12
+  else
+    echo "未知的Debian版本: $version" >&2
+    exit 1
+  fi
+
+  if [ "$raspberry_pi_source_in_use" != "$RASPBERRY_PI_SOURCE$version" ]; then
+    if [ -f "/etc/apt/sources.list.d/raspi.list" ]; then
+      sudo cp /etc/apt/sources.list.d/raspi.list /etc/apt/sources.list.d/raspi.list.bak
+    fi
+    echo "deb $RASPBERRY_PI_SOURCE $version main" | sudo tee /etc/apt/sources.list.d/raspi.list > /dev/null
+  else
+    echo "Raspberry Pi 源链接已更新，跳过替换" >&2
+  fi
 }
 
 # 安装包函数
 install_packages() {
-  debug "正在安装软件包..."
+    echo "正在更新源列表"
-  if ! sudo apt-get update; then
+  if ! sudo apt-get -q -y update; then
     echo "更新源列表失败" >&2
     exit 1
   fi
-  if ! sudo apt-get upgrade -y; then
+    echo "正在安装软件包"
-    echo "系统更新失败" >&2
+  if ! sudo apt-get -q -y install git pigpio i2c-tools netcat* gawk python3-dev python3-pip python3-pil python3-numpy python3-gpiozero python3-pigpio build-essential screen; then
-    exit 1
-  fi
-  if ! sudo apt-get install -y git pigpio raspi-config netcat gawk python3-dev python3-pip python3-pil python3-numpy python3-gpiozero python3-pigpio build-essential screen; then
     echo "软件包安装失败" >&2
     exit 1
   fi
@@ -118,54 +214,90 @@ install_packages() {
 
 # 安装pip包函数
 install_pip_packages() {
-  debug "正在安装pip软件包..."
+    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; then
-    echo "pip软件包安装失败" >&2
+    echo "pip软件包安装失败，如果是最新版系统或是非lite系统" >&2
+    echo "请手动运行sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests --break-system-packages" >&2
     exit 1
   fi
 }
 
 # 复制服务文件并设置为开机启动
 setup_service() {
-  debug "正在设置墨水屏时钟服务..."
+  local service_path="raspi_e-Paper.service"
-  if [ ! -d "$HOME/2.13-Ink-screen-clock" ]; then
+  local service1_path="e-Paper_clean.service"
-  cd ~
+  local service_file_path="$HOME/2.13-Ink-screen-clock/bin/$service_path"
-  if ! git clone $INK_SCREEN_CLOCK_REPO_URL; then
+  local service1_file_path="$HOME/2.13-Ink-screen-clock/bin/$service1_path"
-    echo "克隆墨水屏时钟仓库失败" >&2
-    exit 1
-  fi
-  # 设置start.sh和clean.sh脚本的执行权限
-  chmod +x "$HOME/2.13-Ink-screen-clock/bin/start.sh"
-  chmod +x "$HOME/2.13-Ink-screen-clock/bin/clean.sh"
-fi
 
-SERVICE_PATH="raspi_e-Paper.service"
+  # 检查墨水屏时钟仓库是否存在
-SERVICE1_PATH="e-Paper_clean.service"
+  if [ ! -d "$HOME/2.13-Ink-screen-clock" ]; then
-SERVICE_FILE_PATH="$HOME/2.13-Ink-screen-clock/bin/$SERVICE_PATH"
+      echo "正在克隆仓库"
-SERVICE1_FILE_PATH="$HOME/2.13-Ink-screen-clock/bin/$SERVICE1_PATH"
+    cd ~
-if [ -f "$SERVICE_FILE_PATH" ] && [ -f "$SERVICE1_FILE_PATH" ]; then
+    if ! git clone -b $VERSION $INK_SCREEN_CLOCK_REPO_URL; then
-  # 复制服务文件到 systemd 目录
+      echo "克隆仓库失败" >&2
-  if sudo cp "$SERVICE_FILE_PATH" /etc/systemd/system/ && sudo cp "$SERVICE1_FILE_PATH" /etc/systemd/system/; then
+      exit 1
-    # 重载 systemd 管理器配置
+    fi
-    sudo systemctl daemon-reload
+    # 设置start.sh和clean.sh脚本的执行权限
-    # 启动服务
+    chmod +x "$HOME/2.13-Ink-screen-clock/bin/start.sh"
-    sudo systemctl enable $SERVICE_PATH
+    chmod +x "$HOME/2.13-Ink-screen-clock/bin/clean.sh"
-    sudo systemctl enable $SERVICE1_PATH
-    sudo systemctl start $SERVICE_PATH
   else
-    echo "复制服务文件失败" >&2
+    echo "仓库文件夹已存在，跳过克隆"
+  fi
+
+  # 检查服务文件是否存在
+  if [ -f "$service_file_path" ] && [ -f "$service1_file_path" ]; then
+    # 检查服务是否已经启用
+    if ! systemctl is-enabled $service_path &>/dev/null && ! systemctl is-enabled $service1_path &>/dev/null; then
+        echo "正在复制服务文件并启用服务"
+      # 复制服务文件到 systemd 目录
+      if sudo cp "$service_file_path" /etc/systemd/system/ && sudo cp "$service1_file_path" /etc/systemd/system/; then
+        # 重载 systemd 管理器配置
+        sudo systemctl daemon-reload
+        # 启动服务
+        sudo systemctl enable $service_path
+        sudo systemctl enable $service1_path
+        sudo systemctl start $service_path
+      else
+        echo "复制服务文件失败" >&2
+        exit 1
+      fi
+    else
+      echo "服务文件已存在并启用，跳过复制"
+    fi
+  else
+    echo "服务文件不存在于路径: $service_file_path 或 $service1_file_path" >&2
     exit 1
   fi
-else
+}
-  echo "服务文件不存在于路径: $SERVICE_FILE_PATH 或 $SERVICE1_FILE_PATH" >&2
+
-  exit 1
+# 安装pisugar-power-manager函数
-fi
+install_pisugar-power-manager() {
+  if [ "$USE_PISUGAR_POWER_MANAGER" = true ]; then
+    echo "正在安装pisugar-power-manager"
+    if ! curl -sSL "$PISUGAR_POWER_MANAGER_URL" | sudo bash -s - -c release; then
+      echo "pisugar-power-manager安装失败" >&2
+      echo "如需要请手动运行curl -sSL $PISUGAR_POWER_MANAGER_URL | sudo bash -s - -c release" >&2
+      exit 1
+    fi
+  fi
+}
+
+# 安装pisugar-wifi-conf函数
+install_pisugar-wifi-conf() {
+  if [ "$USE_PISUGAR_WIFI_CONF" = true ]; then
+    echo "正在安装pisugar-wifi-conf"
+    if ! curl -sSL "$PISUGAR_WIFI_CONF_URL" | sudo bash; then
+      echo "pisugar-wifi-conf安装失败" >&2
+      echo "如需要请手动运行curl $PISUGAR_WIFI_CONF_URL | sudo bash" >&2
+      exit 1
+    fi
+  fi
 }
 
 # 主逻辑
 # 检测是否是Debian系统
 if [ -f /etc/debian_version ]; then
-  debug "检测到Debian系统"
+    echo "检测到Debian$DEBIAN_VERSION系统"
 
   # 提取版本号的小数点前的部分
   if ! MAJOR_VERSION=$(echo $DEBIAN_VERSION | cut -d '.' -f 1); then
@@ -175,23 +307,27 @@ if [ -f /etc/debian_version ]; then
 
   # 检测是否是Raspberry Pi系统
   if is_raspberry_pi; then
-    debug "检测到Raspberry Pi系统"
+    echo "检测到Raspberry Pi系统"
 
     # 根据版本号的小数点前的部分执行不同的命令
     case "$MAJOR_VERSION" in
       11)
-        debug "执行Debian 11 (Bullseye) 相关操作"
+        echo "执行Debian 11 (Bullseye) 相关操作"
         update_sources_list "bullseye"
         install_packages
         install_pip_packages
         setup_service
+        install_pisugar-wifi-conf
+        install_pisugar-power-manager
         ;;
       12)
-        debug "执行Debian 12 (Bookworm) 相关操作"
+        echo "执行Debian 12 (Bookworm) 相关操作"
         update_sources_list "bookworm"
         install_packages
         install_pip_packages
         setup_service
+        install_pisugar-wifi-conf
+        install_pisugar-power-manager
         ;;
       *)
         echo "未知的Debian版本: $MAJOR_VERSION" >&2

bin/main.py

@@ -32,7 +32,7 @@ def Local_strong_brush(): #局部强制刷新显示
          i = i + 1
 def getWeath(city='101060111'): #天气函数,下载json天气至本地
      headers = {
-         'User-Agent':'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36 Edg/94.0.992.50',
+         '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)
@@ -66,25 +66,8 @@ 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():
+def power_battery():#获取当前电池电量
-    try:
+     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'%') 
-        # 获取电池电量
-        battery_percentage = subprocess.check_output(
-            "echo \"get battery\" | nc -q 0 127.0.0.1 8423 | awk -F':' '{print $2}'",
-            shell=True,
-            text=True
-        ).strip()
-
-        # 检查电量信息
-        if not battery_percentage:
-            return "无效"
-
-        # 返回电量百分比
-        return f"{int(battery_percentage)}%"
-    except Exception as e:
-        # 返回错误信息
-        return "失败"
-
 # 打印电量信息
 print(power_battery())
 def Bottom_edge():  #在图片中添加底边内容
@@ -141,10 +124,6 @@ def Weather(): #在图片中添加天气内容
 
 def Basic_refresh(): #全刷函数
     logging.info("Refresh and prepare the basic content before starting the canvas")#开始画布前刷新准备基础内容
-    epd.init()
-    epd.Clear(0xFF)
-    epd.init()
-    epd.Clear(0xFF)
     global get_date_var
     get_date_var=get_date() #记录开始数据
     draw.text((2,2),get_date_var,font = font02,fill =0)#将日期及星期几显示到屏幕
@@ -256,7 +235,7 @@ try:
     getWeath()#天气获取函数开始运行
     epd = epd2in13_V4.EPD() #初始化
     epd.init()#设定屏幕刷新模式
-    epd.Clear(0xFF) #清除屏幕内容
+    #epd.Clear(0xFF) #清除屏幕内容
 ##################屏幕初始化#########################   
     logging.info("Width = %s, Height = %s", format(epd.width), format(epd.height)) #打印屏幕高度及宽度
     logging.info("Initialize and clear the display")#屏幕开始准备相关展示
@@ -265,7 +244,7 @@ try:
     Basic_refresh() #全局刷新
     Partial_refresh() #局部刷新
     epd.init()
-    #epd.Clear(0xFF)
+    epd.Clear(0xFF)
     epd.sleep()
 except IOError as e:
     logging.info(e)
@@ -283,11 +262,11 @@ except Exception as e:
     epd.Clear(0xFF)  # 清除屏幕内容
     epd.sleep()       # 使屏幕进入休眠状态
     epd2in13_V4.epdconfig.module_exit()  # 清理资源
-    exit()
+    #exit()
 
 # 脚本正常结束后的清理操作
 epd.init()
 epd.Clear(0xFF)  # 清除屏幕内容
 epd.sleep()       # 使屏幕进入休眠状态
 epd2in13_V4.epdconfig.module_exit()  # 清理资源
-exit()
+#exit()

bin/raspi_e-Paper.service

@@ -1,11 +1,11 @@
 [Unit]
 Description=Raspi e-Paper Service
-After=network-online.target
+After=network.target
 
 [Service]
 Type=forking
 # 等待网络完全启动
-#ExecStartPre=systemd-networkd-wait-online --timeout=30
+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

bin/start.sh

@@ -1,15 +1,40 @@
 #!/bin/bash
 
+# 脚本文件名
 f_name=main.py
+# 获取脚本所在目录的路径
 dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+# 日志目录，假设是脚本所在目录的上一级目录
 logdir=${dir%/*}
+# screen会话名称
 screen_name="main_screen"
 
-# 查找并结束所有与指定screen_name相关的screen会话
+# 函数用于启动Python脚本
-pids=$(screen -ls | grep $screen_name | awk -F '.' '{print $1}' | awk '{print $1}')
+start_script() {
-for pid in $pids; do
+    # 创建一个新的screen会话并运行Python脚本
-    screen -S $pid -X quit
+    # 输出重定向到日志文件
-done
+    screen -dmS $screen_name /usr/bin/python3 -u $dir/$f_name 2>&1
+}
 
-# 创建一个新的screen会话并运行Python脚本
+# 无限循环，直到脚本被手动停止
-screen -dmS $screen_name /usr/bin/python3 -u $dir/$f_name > $logdir/log/info.log 2>&1
+while true; do
+    # 检查是否有与指定screen_name相关的screen会话正在运行
+    existing_sessions=$(screen -ls | grep -w $screen_name)
+
+    # 如果找到正在运行的screen会话，则结束它们
+    if [ -n "$existing_sessions" ]; then
+        pids=$(screen -ls | grep $screen_name | awk -F '.' '{print $1}' | awk '{print $1}')
+        for pid in $pids; do
+            screen -S $pid -X quit
+        done
+    fi
+
+    # 启动Python脚本
+    start_script
+
+    # 等待一段时间，检查脚本是否还在运行
+    sleep 180
+    if ! screen -list | grep -q $screen_name; then
+        echo "脚本意外停止。正在重启..."
+    fi
+done