From: dxy15521469561 <1731678236@qq.com>
Date: Sat, 8 Jul 2023 09:05:33 +0000 (+0800)
Subject: 优化闹钟列表显示
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=43f568293f90452116f50ca7e0eae06757c461c2;p=mirrors%2FASR1603_G5.git

优化闹钟列表显示
---

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py
index 419b2bff..81a8f158 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/alarm.py
@@ -396,8 +396,8 @@ label_ok.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 label_ok.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 
 #闹钟信息
-alarm_list = [{'hour': 16, 'repeart': 1, 'idx': 0, 'enabled': 0, 'days': [], 'minute': 39},
-               {'hour': 16, 'repeart': 1, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}, 
+alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [], 'minute': 39},
+               {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}, 
                {'hour': 15, 'repeart': 1, 'idx': 2, 'enabled': 0, 'days': [], 'minute': 13}, 
                {'hour': 16, 'repeart': 1, 'idx': 3, 'enabled': 0, 'days': [], 'minute': 39}, 
                {'hour': 15, 'repeart': 1, 'idx': 4, 'enabled': 0, 'days': [], 'minute': 13}]
@@ -788,13 +788,13 @@ popup_alarm_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
 popup_alarm_img = lv.img(popup_alarm_screen)
-popup_alarm_img.set_pos(63, 20)
-popup_alarm_img.set_size(113, 152)
+popup_alarm_img.set_pos(63, 60)
+popup_alarm_img.set_size(110, 140)
 popup_alarm_img.set_src("E:/static/IMAGE_IDLE_SCREEN_ALARM_ICON_NEW.png")
 popup_alarm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 popup_alarm_time = lv.label(popup_alarm_screen)
-popup_alarm_time.set_pos(0, 200)
+popup_alarm_time.set_pos(0, 230)
 popup_alarm_time.set_size(240, 50)
 popup_alarm_time.set_text(" ")
 popup_alarm_time.set_long_mode(lv.label.LONG.WRAP)
@@ -832,23 +832,41 @@ class PopupAlarmScreen(Screen):
             return
         self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
     
-    
+    def close_timer(self):
+        self.alarm_count=0
+        self.timer.stop()
+        self.aud.stop()
 
     def done_left_to_right(self):
+        self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
+
     def done_right_to_left(self):
+        self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
+
     def done_bottom_to_top(self):
+        self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
+
     def done_top_to_bottom(self):
+        self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
+
     def done_return(self):
+        self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
                
+    def done_click(self):
+        self.close_timer()
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
     def btn1_release(self):
+        self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
+        self.close_timer()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 #闹钟列表
@@ -899,9 +917,9 @@ class ClkListScreen(Screen):
                 num = 0
                 count = 0
                 for i ,each in enumerate(self.clock_list):
+                    num = each["idx"]
                     if count >= 3:
                         break
-                    num = each["idx"]
                     repeart = each["repeart"]
                     if repeart == 10:
                         continue
@@ -933,7 +951,7 @@ class ClkListScreen(Screen):
                     repeart = each["repeart"]
                     _output = [self.weekdays_list[x] for x in _new_list]
                     _btn_label3 = lv.label(_btn)
-                    _btn_label3.set_pos(5, 40)
+                    _btn_label3.set_pos(5, 44)
                     _btn_label3.set_size(200, 40)
                     print("_new_list:{} repeart:{}".format(_new_list,repeart))
                     if repeart == 1:
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 9dc57403..df65a2d4 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
@@ -3443,11 +3443,14 @@ class TemperatureScreen(Screen):
         self.countdown = 3*60
         self.temp_timer.start(1*1000, 1, self.temp_timerout)
     def temp_timerout(self,*args):
+        global temperature_value_label,temperature_measure_countdown_label,temperature_measure_end_label
         self.count += 1
         EventMesh.publish("system_sleep_rest")#防止黑屏
         temp = EventMesh.publish(constants.EVENT.GET_TEMP) 
         tmp = str(temp).split('.')[0] + '.' + str(temp).split('.')[1][:1]#获取小数点后一位 舍去小数点最后一位
-        temperature_value_label.set_text("{}".format(tmp))
+        if temperature_measure_end_label != None:
+            temperature_value_label.set_text("{}".format(tmp))
+
         tmp_f = str(temp).split('.')[0] 
         tmp_f_tmp = int(tmp_f)
 
@@ -3458,12 +3461,15 @@ class TemperatureScreen(Screen):
             self.countdown-=1
         min = self.countdown / 60
         sec = self.countdown % 60
-        temperature_measure_countdown_label.set_text("{}:{}".format("%02d"%(min),"%02d"%(sec)))
+        if temperature_measure_countdown_label != None:
+            temperature_measure_countdown_label.set_text("{}:{}".format("%02d"%(min),"%02d"%(sec)))
+
         # print("temp:{} tmp_f:{} tmp_f_tmp:{} tmp_d:{} tmp_d_tmp:{} self.count:{}".format(temp,tmp_f,tmp_f_tmp,tmp_d,tmp_d_tmp,self.count)) 
         if self.count >= 3*60:
             self.count = 0
             EventMesh.publish("set_temp_state",0)
-            temperature_measure_end_label.set_text("测量完成")
+            if temperature_measure_end_label != None:
+                temperature_measure_end_label.set_text("测量完成")
             self.temp_timer.stop()
             EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
             EventMesh.publish(constants.EVENT.STOP_TEMP)
@@ -4177,12 +4183,12 @@ class CountdownEndScreen(Screen):
             countdown_end_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             countdown_end_img = lv.img(countdown_end_screen)
             countdown_end_img.set_size(140, 140)
-            countdown_end_img.set_pos(50, 20)
+            countdown_end_img.set_pos(50, 60)
             countdown_end_img.set_src("E:/static/time_finish.png")
             countdown_end_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             countdown_end_label = lv.label(countdown_end_screen)
-            countdown_end_label.set_pos(0, 200)
+            countdown_end_label.set_pos(0, 240)
             countdown_end_label.set_size(240, 40)
             countdown_end_label.set_text("时间到")
             countdown_end_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -4194,10 +4200,12 @@ class CountdownEndScreen(Screen):
         self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
 
     def FIND_timer_cb(self, *args):
-        
+        EventMesh.publish("system_sleep_rest")#防止黑屏
         self.FIND_timer_count += 1
-        if self.FIND_timer_count >= 2: #120秒
+        if self.FIND_timer_count >= 4: #120秒
             self.stop_FIND()
+            EventMesh.publish("load_screen", {"screen": "countdown"})
+            return
         self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3') 
     
     def stop_FIND(self) :
@@ -4208,26 +4216,35 @@ class CountdownEndScreen(Screen):
        self.stop_FIND()
 
     def done_left_to_right(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "countdown"})
 
     def done_right_to_left(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "countdown"})
 
     def done_bottom_to_top(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "countdown"})
 
     def done_top_to_bottom(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "countdown"})
 
     def done_return(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "countdown"})
+
     def done_click(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "countdown"})
 
     def btn1_release(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "countdown"})
 
     def btn8_press(self):
+        self.stop_FIND()
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 # -------------------------------------------stopwatch screen----------------------------------------------------------
@@ -4572,7 +4589,7 @@ class UIFINDScreen(Screen):
         print("self.FIND_timer_count:{}".format(self.FIND_timer_count))
         self.FIND_timer.start(3000, 1, self.FIND_timer_cb)
         self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
-        pass
+
     def FIND_timer_cb(self, *args):
         EventMesh.publish("system_sleep_rest")
         self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3') 
@@ -4591,24 +4608,29 @@ class UIFINDScreen(Screen):
         self.aud.stop() #播放声音
 
     def done_left_to_right(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.stop_FIND()
 
     def done_right_to_left(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.stop_FIND()
     def done_bottom_to_top(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.stop_FIND()
+
     def done_top_to_bottom(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.stop_FIND()
+
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.stop_FIND()
+
     def done_click(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+       self.stop_FIND()
+
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.stop_FIND()
+
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.stop_FIND()
  
 Lowpower_screen = None
 Lowpower_screen_img = None
@@ -4664,8 +4686,7 @@ class sosScreen(Screen):
     def __init__(self):
         super().__init__()
         self.meta = None
-        self.timer1 = osTimer()
-        self.timer2 = osTimer()
+        self.timer = osTimer()
         self.meta_type = "popup"
         self.count = 0
 
@@ -4680,7 +4701,7 @@ class sosScreen(Screen):
             #进入图片
 
             sos_screen_label = lv.label(sos_screen)
-            sos_screen_label.set_pos(0, 40)
+            sos_screen_label.set_pos(0, 20)
             sos_screen_label.set_size(240, 30)
             sos_screen_label.set_text("SOS")
             sos_screen_label.add_style(style_font_youyuan_20_red, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -4692,12 +4713,20 @@ class sosScreen(Screen):
             sos_screen_label.set_text("是否拨打紧急\n求助电话？")
             sos_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             sos_screen_label.set_size(240, 50)
-            sos_screen_label.set_pos(0,90)
+            sos_screen_label.set_pos(0,65)
             sos_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+            sos_screen_label = lv.label(sos_screen)
+            sos_screen_label.set_text("无操作10s后\n自动拨打")
+            sos_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+            sos_screen_label.set_size(240, 50)
+            sos_screen_label.set_pos(0,140)
+            sos_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
             sos_screen_confirm_img = lv.img(sos_screen)
             sos_screen_confirm_img.set_size(176, 46)
-            sos_screen_confirm_img.set_pos(32, 160)
+            sos_screen_confirm_img.set_pos(32, 210)
             sos_screen_confirm_img.set_src("E:/static/off_icon.png")
             sos_screen_confirm_img.add_flag(lv.obj.FLAG.CLICKABLE)
             sos_screen_confirm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -4709,7 +4738,7 @@ class sosScreen(Screen):
 
             sos_screen_return = lv.img(sos_screen)
             sos_screen_return.set_size(176, 46)
-            sos_screen_return.set_pos(32, 230)
+            sos_screen_return.set_pos(32, 270)
             sos_screen_return.set_src("E:/static/cancel_icon.png")
             sos_screen_return.add_flag(lv.obj.FLAG.CLICKABLE)
             sos_screen_return.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -4734,17 +4763,17 @@ class sosScreen(Screen):
 
     def post_processor_before_initialization(self):
         self.count = 0
-        self.timer1.start(1000,1,self.timer_cb_onescond)
+        self.timer.start(5000,1,self.timer_cb_onescond)
     
     def timer_cb_onescond(self,e):
         EventMesh.publish("system_sleep_rest")#防止黑屏
         self.count+=1
-        if self.count >= 10:
+        if self.count >= 2:
             self.count = 0
             EventMesh.publish("set_sos_flag", 1)
 
     def Close(self):
-        self.timer1.stop()
+        self.timer.stop()
 
     def done_left_to_right(self):
         EventMesh.publish("return_prev_screen")
@@ -4762,7 +4791,7 @@ class sosScreen(Screen):
         EventMesh.publish("return_prev_screen")
         pass
     def done_click(self):
-        EventMesh.publish("return_prev_screen")
+        #EventMesh.publish("return_prev_screen")
         pass
 
     def btn8_press(self):
@@ -4802,7 +4831,7 @@ class noSosDataScreen(Screen):
             no_sos_screen_label = lv.label(no_sos_screen)
             no_sos_screen_label.set_pos(0, 110)
             no_sos_screen_label.set_size(240, 80)
-            no_sos_screen_label.set_text("请在手机app上设置紧急联系人号码")
+            no_sos_screen_label.set_text("请在手机app上设置\n紧急联系人号码")
             no_sos_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             no_sos_screen_label.set_long_mode(lv.label.LONG.WRAP)
             no_sos_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
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 82f59403..b8ee8507 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