From f1a2e59e4bf61df5ee4876d29937a96494f82457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E5=85=89-k?=
 <36470587+kxgx@users.noreply.github.com>
Date: Tue, 21 Jan 2025 13:46:07 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20main.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/main.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/bin/main.py b/bin/main.py
index 4fc1805..2ed029d 100644
--- a/bin/main.py
+++ b/bin/main.py
@@ -38,7 +38,7 @@ def get_date():#返回当前年月日及星期几
     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():
+def get_time_with_hwclock():
     # 执行系统命令
     process = subprocess.Popen(['sudo', 'hwclock', '-r'], stdout=subprocess.PIPE)
     output, error = process.communicate()
@@ -57,6 +57,19 @@ def get_time():
     # 格式化时间
     formatted_time = match.group(1).upper()
     return formatted_time
+
+def get_time_with_strftime():
+    # 返回当前时间,不到秒,大写
+    return time.strftime('%H:%M').upper()
+
+def get_time():
+    try:
+        # 首先尝试使用hwclock获取时间
+        return get_time_with_hwclock()
+    except Exception as e:
+        # 如果hwclock失败，则使用strftime获取时间
+        print(f"hwclock失败: {e}, 正在尝试使用strftime获取时间")
+        return get_time_with_strftime()
 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地址
@@ -73,7 +86,7 @@ def Get_ipv4_address():  # 获取当前的IP地址
         else:
             return "地址获取失败"
     except subprocess.CalledProcessError as e:
-        logging.error("获取IPv4地址失败: %s", e)
+        #logging.error("获取IPv4地址失败: %s", e)
         return "获取失败"
 def CPU_temperature():#CPU温度获取
      temperatura = os.popen('vcgencmd measure_temp').readline()
@@ -274,4 +287,4 @@ epd.init()
 epd.Clear(0xFF)  # 清除屏幕内容
 epd.sleep()       # 使屏幕进入休眠状态
 epd2in13_V4.epdconfig.module_exit()  # 清理资源
-exit()
+exit()
\ No newline at end of file