From: d15521469561 <d155214695615@qq.com>
Date: Tue, 16 May 2023 06:38:33 +0000 (+0800)
Subject: 更改ui
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5d5d3fc65b429873925073466fe48d75cacfb976;p=mirrors%2FASR1603_G5.git

更改ui
---

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
index bb1195c2..e931de15 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
@@ -613,6 +613,7 @@ class Alipay_success(Screen):
         
 
     def Close(self):
+        self.timer_Alipay_success.stop()
         EventMesh.publish("alipay_exit")
         pass
                 
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 e754410b..91915a34 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
@@ -612,7 +612,7 @@ class DeviceInfoManager(Abstract):
         else:
             print('GNSS init failed.')
 
-        self.i2c0 = I2C(I2C.I2C0, I2C.STANDARD_MODE)
+        self.i2c0 = I2C(I2C.I2C0, I2C.FAST_MODE)
         self.stop_temp( None, None)
         
     def post_processor_after_instantiation(self):
@@ -760,7 +760,7 @@ class DeviceInfoManager(Abstract):
                 EventMesh.publish("load_screen", {"screen": "message_full"})
         
 
-        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 or battery[1] != 1:
+        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and battery[1] != 1:
 
             get_temp_time  = EventMesh.publish("get_temp_time")
             get_temp_state  = EventMesh.publish("get_temp_state")
@@ -1116,6 +1116,18 @@ class DeviceInfoManager(Abstract):
                 elif self.get_spo2_state != 0:
                     EventMesh.publish("set_spo2_state",0)#2代表后台进入测试
                     EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)
+            if get_temp_state != 0:
+                self.temp_one_state = 0
+                self.temp_state = 0
+                temp = EventMesh.publish(constants.EVENT.GET_TEMP)              
+                tmp_f = str(temp).split('.')[0] 
+                tmp_f_tmp = int(tmp_f)
+
+                tmp_d = str(temp).split('.')[1][:1]
+                tmp_d_tmp = int(tmp_d)
+                EventMesh.publish("set_temp_state",0)
+                EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
+                EventMesh.publish(constants.EVENT.STOP_TEMP)
             self.SENSOR_time = time_tmp
             self.HR_Onestate = 0
             self.HR_OneTime = 0
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 7773fe6b..22c305de 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
@@ -166,7 +166,10 @@ class Screen(Abstract):
 
     def Close(self):
         pass
-
+    def lcd_on(self):
+        pass
+    def lcd_off(self):
+        pass
     def done_left_to_right(self):
         pass
 
@@ -224,6 +227,7 @@ class PhoneScreen(Screen):
         self.phone_list = []
         self.button = 0
         self.timer = osTimer()
+        self.timer_cb = 0
         self.count = 0
         
     
@@ -421,13 +425,15 @@ class PhoneScreen(Screen):
         self.count = 0
         phone_label.set_text(" ")
         # print("self.phone_list :{} self.phone_num:{}".format(self.phone_list,self.phone_num))
-        self.timer.start(1000,1,self.refresh_line)   
+        if self.timer_cb == 0:
+            self.timer_cb = 1
+            self.timer.start(1000,1,self.refresh_line) 
+          
 
     def refresh_line(self,e):
-        
         if self.count > 2 :
             self.count = 1
-        if (self.count%2) == 0:
+        if self.count%2 == 0:
             phone_line.clear_flag(lv.obj.FLAG.HIDDEN)
         else:
             phone_line.add_flag(lv.obj.FLAG.HIDDEN)
@@ -507,6 +513,9 @@ class PhoneScreen(Screen):
 
     def pressed_start(self,e):
         self.button = 1
+    def Close(self):
+        self.timer_cb = 0
+        self.timer.stop()
 
     def endpressed_start(self,e):
         if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字
@@ -580,6 +589,16 @@ class PhoneScreen(Screen):
         phone_label.set_size(len_t,48)
         phone_label.set_pos(230-len_t,14)
         phone_label.set_text(self.phone_num)
+    
+    def lcd_on(self):
+        if self.timer_cb != 0:
+            self.timer_cb = 0
+            self.timer.start(1000,1,self.refresh_line) 
+    
+    def lcd_off(self):
+        self.timer_cb = 1
+        self.timer.stop() 
+
 
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
@@ -1846,6 +1865,7 @@ class OnCallScreen(Screen):
         
 
     def refresh(self,e):
+        # print("call_in")
         global on_call_screen,on_call_label_name,on_call_second_label ,on_call_hangup
         min = self.count_sec/60
         sec = self.count_sec%60
@@ -1858,8 +1878,11 @@ class OnCallScreen(Screen):
     
     def hangup(self,e):
         EventMesh.publish("set_UI_high_priority", 0)
+        self.timer.stop()
         voiceCall.callEnd()
         
+    def Close(self):
+        self.timer.stop()
 
     def btn1_release(self):
         pass
@@ -2387,9 +2410,10 @@ class TemperatureScreen(Screen):
             EventMesh.publish(constants.EVENT.STOP_TEMP)
     def Close(self):
         self.count = 0
+        self.temp_timer.stop()
         EventMesh.publish("set_temp_state",0)
         EventMesh.publish(constants.EVENT.STOP_TEMP)
-        self.temp_timer.stop()
+        
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
@@ -2961,7 +2985,8 @@ class CountdownScreen(Screen):
         countdown_sec.set_text(str("%02d"%(self.sec)))
         countdown_min.set_text(str("%02d"%(self.min)))
         countdown_hour.set_text(str("%02d"%(self.hour)))
-       
+    
+    
 
     def done_return(self):
         if self.g_state == 0:
@@ -3599,6 +3624,7 @@ class UI(object):
             self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS, self.level, 10)
             self.PWM_backlight.open()
             self.sleep_lock = 0
+            self.screen.lcd_on()
 
     def publish_call_in(self, event, msg):
         EventMesh.publish("load_screen", {"screen": "dialing", "meta": msg})
@@ -3622,6 +3648,7 @@ class UI(object):
             utime.sleep_ms(100)
             EventMesh.publish("set_lcd_state",self.sleep_flag)
             self.sleep_lock = 0
+            self.screen.lcd_off()
 
     def system_sleep(self, event, msg) :
         self.__lcd_off()
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 0d11ce33..0101a61a 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