From: d15521469561 <d155214695615@qq.com>
Date: Thu, 6 Apr 2023 09:16:11 +0000 (+0800)
Subject: Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=bf48efcc244c5cea2b2f901c22355627b5a923f2;p=mirrors%2FASR1603_G5.git

Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
#	3.code/1.watch/2.code/mgr.py
---

bf48efcc244c5cea2b2f901c22355627b5a923f2
diff --cc 3.code/1.watch/2.code/mgr.py
index 41fb8696,2fdc0441..b3c02241
--- a/3.code/1.watch/2.code/mgr.py
+++ b/3.code/1.watch/2.code/mgr.py
@@@ -663,7 -666,7 +666,7 @@@ class DeviceInfoManager(Abstract)
          :return: HH:MM 格式
          """
          rtc_time = self.rtc.datetime()
-         # print("rtc_time:{}".format(rtc_time))
 -        #print("rtc_time:{}".format(rtc_time))
++      
          date = ("%d月%d日" % (rtc_time[1], rtc_time[2]))
          year = ("%04då¹´" % (rtc_time[0]))
          week = ("星期%s"%(self.get_week(rtc_time[3])))