From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 10 Jul 2023 10:31:11 +0000 (+0800)
Subject: 心率血氧UI调整
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=6c80e8f94bb98d50cc32a8aac82b39ec44868d88;p=mirrors%2FASR1603_G5.git

心率血氧UI调整
---

diff --git a/2.sdk/project/K5/ext/static/IMAGE_HEART_ONLY_TEST_DONE.jpg b/2.sdk/project/K5/ext/static/IMAGE_HEART_ONLY_TEST_DONE.jpg
deleted file mode 100644
index 8f30f367..00000000
Binary files a/2.sdk/project/K5/ext/static/IMAGE_HEART_ONLY_TEST_DONE.jpg and /dev/null differ
diff --git a/2.sdk/project/K5/ext/static/IMAGE_HEART_ONLY_TEST_DONE.png b/2.sdk/project/K5/ext/static/IMAGE_HEART_ONLY_TEST_DONE.png
new file mode 100644
index 00000000..5d641a09
Binary files /dev/null and b/2.sdk/project/K5/ext/static/IMAGE_HEART_ONLY_TEST_DONE.png differ
diff --git a/2.sdk/project/K5/ext/static/IMAGE_SPO2_ONLY_TEST_DONE.jpg b/2.sdk/project/K5/ext/static/IMAGE_SPO2_ONLY_TEST_DONE.jpg
deleted file mode 100644
index cb2ef0d6..00000000
Binary files a/2.sdk/project/K5/ext/static/IMAGE_SPO2_ONLY_TEST_DONE.jpg and /dev/null differ
diff --git a/2.sdk/project/K5/ext/static/IMAGE_SPO2_ONLY_TEST_DONE.png b/2.sdk/project/K5/ext/static/IMAGE_SPO2_ONLY_TEST_DONE.png
new file mode 100644
index 00000000..827b4612
Binary files /dev/null and b/2.sdk/project/K5/ext/static/IMAGE_SPO2_ONLY_TEST_DONE.png differ
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
index 7ffdf1ab..8d260c32 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
@@ -20,7 +20,7 @@ import uos
 import gc
 import _thread
 from queue import Queue
-
+from machine import RTC
 
 def audio_cb(event):
     if event == 0:
@@ -1903,9 +1903,9 @@ class HeartrateScreen(Screen):
             heartrate_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             heartrate_done_img = lv.img(heartrate_screen)
-            heartrate_done_img.set_pos(0, 50)
-            heartrate_done_img.set_size(240, 96)
-            heartrate_done_img.set_src("E:/static/IMAGE_HEART_ONLY_TEST_DONE.jpg")
+            heartrate_done_img.set_pos(69, 50)
+            heartrate_done_img.set_size(101, 96)
+            heartrate_done_img.set_src("E:/static/IMAGE_HEART_ONLY_TEST_DONE.png")
 
             heartrate_start_label = lv.label(heartrate_screen)
             heartrate_start_label.set_size(240,40)
@@ -3536,6 +3536,7 @@ class Spo2Screen(Screen):
         self.point = 0
         self.spo2_value = 0
         self.last_spo2_value = 0
+        self.rtc = RTC()
 
     def initialization(self):
         global spo2_screen ,spo2_label_0 ,spo2_done_img ,spo2_label ,spo2_label_1 ,spo2_line ,spo2_last_time,spo2_last_value 
@@ -3553,9 +3554,9 @@ class Spo2Screen(Screen):
             spo2_label_0.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             spo2_done_img = lv.img(spo2_screen)
-            spo2_done_img.set_pos(0, 50)
-            spo2_done_img.set_size(240, 96)
-            spo2_done_img.set_src("E:/static/IMAGE_SPO2_ONLY_TEST_DONE.jpg")
+            spo2_done_img.set_pos(89, 50)
+            spo2_done_img.set_size(62, 84)
+            spo2_done_img.set_src("E:/static/IMAGE_SPO2_ONLY_TEST_DONE.png")
 
             spo2_label = lv.label(spo2_screen)
             spo2_label.set_size(240,30)
@@ -3640,10 +3641,10 @@ class Spo2Screen(Screen):
                 spo2_last_value.set_text("{}%".format(self.last_spo2_value))
                 spo2_label_1.set_text("测量完成")
                 time = EventMesh.publish("screen_get_time")
-                time_year = time[4]
-                time_month = time[2]
-                time_time ="  {}:{}".format("%02d"%(time[0][0]),"%02d"%(time[0][1]))#通话时间
-                spo2_last_time.set_text(str(time_year)+str(time_month)+str(time_time))
+                #print("time ",time)
+                rtc_time = self.rtc.datetime()
+                time_time ="  {}:{}".format("%02d"%(time[0][0]),"%02d"%(time[0][1]))#测量时间
+                spo2_last_time.set_text(str(rtc_time[0])+'/'+str(rtc_time[1])+'/'+str(rtc_time[2])+str(time_time))
             
             
 
diff --git a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
index 9817b475..2677f364 100644
Binary files a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip and b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip differ