From: dxy15521469561 <1731678236@qq.com>
Date: Tue, 18 Jul 2023 03:41:14 +0000 (+0800)
Subject: 1.低电过低关机界面
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1827d5990fe5b398c54dec3868ef8e3cc933333f;p=mirrors%2FASR1603_G5.git

1.低电过低关机界面
2.倒计时显示异常的问题
---

diff --git a/2.sdk/project/K5/ext/static/0_BAT.png b/2.sdk/project/K5/ext/static/0_BAT.png
new file mode 100644
index 00000000..15389b0b
Binary files /dev/null and b/2.sdk/project/K5/ext/static/0_BAT.png differ
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
index fef234ef..8bd7b320 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -797,14 +797,12 @@ class DeviceInfoManager(Abstract):
         
         bat_tmp = EventMesh.publish("screen_get_battery")
         self.vbat_count+=10
-        if self.vbat_count >= 50:
+        if self.vbat_count >= 60:
             self.vbat_count = 0
             if bat_tmp != None:
                 bat_value = bat_tmp[1]
-                bat_value = 0
                 if bat_value <= 0:
-                    bat_value = 10
-                    #EventMesh.publish("load_screen", {"screen": "LOW_ONE_POWER"})
+                    EventMesh.publish("load_screen", {"screen": "LOW_ONE_POWER"})
         
         self.get_hr_state = EventMesh.publish("get_hr_state")
         self.get_spo2_state = EventMesh.publish("get_spo2_state")
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 583448d4..931d315a 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
@@ -4879,6 +4879,17 @@ class CountdownScreen(Screen):
             #                              lv.EVENT.CLICKED, None)  
         date_tmp = utime.localtime()
         self.time_tmp = utime.mktime(date_tmp) 
+  
+        if self.g_state == 1:
+            if self.timer_cb == 1:
+                EventMesh.publish("set_countdown_off_state", [0,self.g_state])
+                self.timer.start(1000,1,self.fun)
+    def post_processor_after_initialization(self):
+        global countdown_screen ,countdown_title,countdown_hour ,countdown_mao ,countdown_mao ,countdown_mao1 ,\
+        countdown_sec ,countdown_hour_up ,countdown_hour_up_btn ,countdown_hour_down ,countdown_hour_down_btn ,\
+        countdown_min_up,countdown_min_up_btn ,countdown_min_down,countdown_min_down_btn,countdown_sec_up ,\
+        countdown_sec_up_btn,countdown_sec_down ,countdown_sec_down_btn ,countdown_reset_img ,countdown_reset_imgbtn ,\
+        countdown_start_img,countdown_start_imgbtn,countdown_stop_img ,countdown_min 
         if self.g_state == 0:
             countdown_start_img.clear_flag(lv.obj.FLAG.HIDDEN)
             countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN)
@@ -4898,11 +4909,8 @@ class CountdownScreen(Screen):
             self.hour = 0
             self.min = 0
             self.sec = 0
+            EventMesh.publish("reset_time_countdown")
             self.show_value()
-        if self.g_state == 1:
-            if self.timer_cb == 1:
-                EventMesh.publish("set_countdown_off_state", [0,self.g_state])
-                self.timer.start(1000,1,self.fun)
 
     def sec_up(self,e):
         EventMesh.publish("add_countdown_sec")
@@ -5703,15 +5711,15 @@ class LowOnePowerScreen(Screen): #0%的电池电量
 
             LowOnePower_screen_label1 = lv.label(LowOnePower_screen)
             LowOnePower_screen_label1.set_pos(0, 180)
-            LowOnePower_screen_label1.set_size(240, 30)
+            LowOnePower_screen_label1.set_size(240, 60)
             LowOnePower_screen_label1.set_text("电池电量过低，请及时充电")
             LowOnePower_screen_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             LowOnePower_screen_label1.set_long_mode(lv.label.LONG.WRAP)
             LowOnePower_screen_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 
             LowOnePower_screen_label2 = lv.label(LowOnePower_screen)
-            LowOnePower_screen_label2.set_pos(0, 240)
-            LowOnePower_screen_label2.set_size(240, 30)
+            LowOnePower_screen_label2.set_pos(0, 250)
+            LowOnePower_screen_label2.set_size(240, 60)
             LowOnePower_screen_label2.set_text("继续使用，5s过后强制关机")
             LowOnePower_screen_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             LowOnePower_screen_label2.set_long_mode(lv.label.LONG.WRAP)
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 d23b695f..dbd37e61 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