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

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

diff --cc 3.code/1.watch/2.code/main_1.py
Simple merge

diff --cc 3.code/1.watch/2.code/mgr.py
index 41fb869,2fdc044..b3c0224
--- 1/3.code/1.watch/2.code/mgr.py
--- 2/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])))

diff --cc 3.code/1.watch/2.code/ui.py
Simple merge