Update README.md

README.md

@@ -26,9 +26,7 @@
     
      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)"
      
@@ -59,28 +57,35 @@ 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
---cn    替换apt镜像源为中国镜像源
---debug 输出详细信息
+--zh                      设置系统语言为zh_CN,UTF-8
+--cn                      替换apt镜像源为中国镜像源
+--gitcn                   克隆中国仓库
+--pisugar-wifi-conf       安装pisugar-wifi-conf
+--pisugar-power-manager   安装pisugar-power-manager
+--debug                   输出详细信息
 ```
+### 
 ```Bash
-#国内源默认设置
+#中国源默认设置
 curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash
 ```
 ```Bash
-#国内源--cn设置
-curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --cn
+#中国源全参数设置(不使用--debug参数)
+curl -sSL https://gitee.com/xingguangk/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --zh --cn --gitcn --pisugar-power-manager --pisugar-wifi-conf
 ```
 ```Bash
 #默认源默认设置
 curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash
 ```
 ```Bash
-#默认源--cn设置
-curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --cn
+#默认源全参数设置(不使用--debug参数)
+curl -sSL https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/bin/install.sh | sudo bash -s -- --zh --cn --gitcn --pisugar-power-manager --pisugar-wifi-conf
 ```
 
 ## 需要安装的软件和依赖:
@@ -89,28 +94,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 netcat*
-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
+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
 ```
-#### 傻瓜式安装命令和执行启动文件：
+#### 安装命令和执行启动文件组合命令：
 ```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://github.com/kxgx/2.13-Ink-screen-clock/raw/main/pic/1736672578025.jpg)
+总体采用局刷方案,程序运行后一直处于程序的获取新数据的过程中,当发现数据变化后即开始自动局刷。
+![image](https://github.com/kxgx/2.13-Ink-screen-clock/raw/main/pic/1736749257603.jpg)

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,15 @@ 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
+    ;;
     --debug)
     DEBUG=true
     ;;
@@ -101,8 +116,8 @@ 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"
-INK_SCREEN_CLOCK_REPO_URL="https://github.com/kxgx/2.13-Ink-screen-clock.git"
+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/"
@@ -112,13 +127,19 @@ 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_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.git"
+# 如果使用中国仓库，则更新链接变量
+if [ "$USE_CN_GIT" = true ]; then
+  INK_SCREEN_CLOCK_REPO_URL="https://gitee.com/xingguangk/2.13-Ink-screen-clock.git"
+fi
+
 # 更新源列表函数
 update_sources_list() {
   local version=$1
@@ -171,15 +192,13 @@ update_sources_list() {
 
 # 安装包函数
 install_packages() {
-  if ! sudo apt-get update; then
+    echo "正在更新源列表"
+  if ! sudo apt-get -q -y update; then
     echo "更新源列表失败" >&2
     exit 1
   fi
-  if ! sudo apt-get upgrade -y; then
-    echo "系统更新失败" >&2
-    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; then
+    echo "正在安装软件包"
+  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; then
     echo "软件包安装失败" >&2
     exit 1
   fi
@@ -187,8 +206,10 @@ install_packages() {
 
 # 安装pip包函数
 install_pip_packages() {
-  if ! sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests --break-system-packages; then
-    echo "pip软件包安装包失败" >&2
+    echo "正在安装pip软件包"
+  if ! sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests; then
+    echo "pip软件包安装失败，如果是最新版系统或是非lite系统" >&2
+    echo "请手动运行sudo pip3 install -i "$PIPY_MIRROR" spidev borax pillow requests --break-system-packages" >&2
     exit 1
   fi
 }
@@ -202,22 +223,24 @@ setup_service() {
 
   # 检查墨水屏时钟仓库是否存在
   if [ ! -d "$HOME/2.13-Ink-screen-clock" ]; then
+      echo "正在克隆仓库"
     cd ~
     if ! git clone $INK_SCREEN_CLOCK_REPO_URL; then
-      echo "克隆墨水屏时钟仓库失败" >&2
+      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"
   else
-    echo "墨水屏时钟仓库文件夹已存在，跳过克隆"
+    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 管理器配置
@@ -239,10 +262,34 @@ setup_service() {
   fi
 }
 
+# 安装pisugar-power-manager函数
+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
-  echo "检测到Debian$DEBIAN_VERSION系统"
+    echo "检测到Debian$DEBIAN_VERSION系统"
 
   # 提取版本号的小数点前的部分
   if ! MAJOR_VERSION=$(echo $DEBIAN_VERSION | cut -d '.' -f 1); then
@@ -262,6 +309,8 @@ if [ -f /etc/debian_version ]; then
         install_packages
         install_pip_packages
         setup_service
+        install_pisugar-wifi-conf
+        install_pisugar-power-manager
         ;;
       12)
         echo "执行Debian 12 (Bookworm) 相关操作"
@@ -269,6 +318,8 @@ if [ -f /etc/debian_version ]; then
         install_packages
         install_pip_packages
         setup_service
+        install_pisugar-wifi-conf
+        install_pisugar-power-manager
         ;;
       *)
         echo "未知的Debian版本: $MAJOR_VERSION" >&2

bin/main.py

@@ -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():
-    try:
-        # 获取电池电量
-        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 "失败"
-
+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():  #在图片中添加底边内容
@@ -252,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")#屏幕开始准备相关展示
@@ -261,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)