修改冲突合并相关的问题

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py
index 0d1f090..f4106e2 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py
@@ -444,7 +444,7 @@ class POWEROFF_ProtoCol(ProtoCol):
         """
         EventMesh.publish(constants.PROTOCOL.POWEROFF_SEND)
         #print("POWEROFF_ProtoCol:recv:%s"%(msg))
-        Power.powerDown()
+        EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
          
 class PHL_ProtoCol(ProtoCol):
     """电话本同步"""

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
index bbf7bc6..8cdf7b5 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
@@ -929,8 +929,11 @@ class DialingScreen(Screen):
         #EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        pass
-        #EventMesh.publish("load_screen", {"screen": "main_menu"})
+        flag = EventMesh.publish("get_lcd_state")
+        if flag == 1:
+            EventMesh.publish(constants.EVENT.SYSTEM_SLEEP)
+        else:
+            EventMesh.publish(constants.EVENT.SYSTEM_UP)
 
 
 message_popup_screen = None
@@ -1610,6 +1613,7 @@ class IncomingCallScreen(Screen):
 
             incoming_call_name_label = lv.label(incoming_call_screen)
             incoming_call_name_label.set_pos(0, 140)
+            incoming_call_name_label.set_text(" ")
             incoming_call_name_label.set_size(240, 50)
             incoming_call_name_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             incoming_call_name_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1767,8 +1771,11 @@ class IncomingCallScreen(Screen):
         pass
         
     def btn8_press(self):
-        # self.aud.stop()
-        # self.call_timer.stop()
+        flag = EventMesh.publish("get_lcd_state")
+        if flag == 1:
+            EventMesh.publish(constants.EVENT.SYSTEM_SLEEP)
+        else:
+            EventMesh.publish(constants.EVENT.SYSTEM_UP)
         pass
 
     def done_left_to_right(self):
@@ -1859,7 +1866,11 @@ class OnCallScreen(Screen):
         #EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        pass
+        flag = EventMesh.publish("get_lcd_state")
+        if flag == 1:
+            EventMesh.publish(constants.EVENT.SYSTEM_SLEEP)
+        else:
+            EventMesh.publish(constants.EVENT.SYSTEM_UP)
         #EventMesh.publish("load_screen", {"screen": "main_menu"})
 # -------------------------------------------step screen----------------------------------------------------------#
 

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
index e709fdb..40588b8 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
@@ -120,7 +120,8 @@ watchface1_time1_text = lv.label(Watchface1)
 watchface1_time1_text.set_pos(20, 50)
 watchface1_time1_text.set_size(190, 71)
 watchface1_time1_text.set_align(lv.TEXT_ALIGN.LEFT)
-watchface1_time1_text.set_text("%02d:%02d"%(hour,min))
+watchface1_time1_text.set_text("{}:{}".format("%02d"%(hour),"%02d"%(min)))
+# watchface1_time1_text.set_text("%02d:%02d"%(hour,min))
 watchface1_time1_text.add_style(style_font_youyuan_70_black, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 #日期
@@ -338,7 +339,7 @@ watchface2_time1_hour_text = lv.label(Watchface2)
 watchface2_time1_hour_text.set_pos(20, 80)
 watchface2_time1_hour_text.set_size(88, 70)
 watchface2_time1_hour_text.set_align(lv.TEXT_ALIGN.LEFT)
-watchface2_time1_hour_text.set_text("{}".format(hour))
+watchface2_time1_hour_text.set_text("{}".format("%02d"%(hour)))
 watchface2_time1_hour_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 watchface2_time1_mao_text = lv.label(Watchface2)
@@ -352,7 +353,7 @@ watchface2_time1_hour1_text = lv.label(Watchface2)
 watchface2_time1_hour1_text.set_pos(152, 80)
 watchface2_time1_hour1_text.set_size(88, 70)
 watchface2_time1_hour1_text.set_align(lv.TEXT_ALIGN.LEFT)
-watchface2_time1_hour1_text.set_text("{}".format(min))
+watchface2_time1_hour1_text.set_text("{}".format("%02d"%(min)))
 watchface2_time1_hour1_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)