C06S

diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/lcd.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/lcd.py
index 8de5305..805d5f1 100644 (file)
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/lcd.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/lcd.py
@@ -264,7 +264,7 @@ power_on_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 power_on_label = lv.label(power_on_screen)
 power_on_label.set_pos(0, 150)
-power_on_label.set_size(240, 40)
+power_on_label.set_size(LCD_SIZE_W, 40)
 power_on_label.set_text("系统初始化中")
 power_on_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 power_on_label.add_style(style_font_youyuan_20_op, lv.PART.MAIN | lv.STATE.DEFAULT)

diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_1.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_1.py
index 68ba3ff..1fdd2df 100644 (file)
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_1.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_1.py
@@ -1,2 +1,60 @@
-import main_init 
-main_init.main_init()
\ No newline at end of file
+import sms
+import atcmd
+import net
+import machine
+import usys
+resp=bytearray(50)
+# atcmd.sendSync('AT+log=52,1\r\n',resp,'',200)
+# print("AT+log=52,1:{}".format(resp))
+from common import Abstract
+class App(object):
+    def __init__(self):
+        self.managers = []
+
+    def append_manager(self, manager):
+        try:
+            if isinstance(manager, Abstract):
+                manager.post_processor_after_instantiation()
+                self.managers.append(manager)
+        except Exception as e:
+                    usys.print_exception(e)
+        return self
+
+    def start(self):
+        try:
+            for manager in self.managers:
+                manager.post_processor_before_initialization()
+                manager.initialization()
+                manager.post_processor_after_initialization()
+        except Exception as e:
+                    usys.print_exception(e)
+
+class watchApp(App):
+    def __init__(self):
+        super(watchApp, self).__init__()
+        self.__ui = None
+
+    def set_ui(self, ui):
+        self.__ui = ui
+
+    def start(self):
+        if self.__ui is not None:
+            self.__ui.start()
+        super().start()
+
+
+
+if __name__ == '__main__':
+    
+    from ui_main_menu import MainMenuScreen
+    # from ui_WatchFaceScreen import WatchFaceScreen
+    
+    import ui as _ui
+    # import ui as _ui
+    #print("init4:{}".format(utime.localtime()))
+    ui = _ui.UI()
+    ui.post_processor_after_instantiation()
+    ui.add_screen(MainMenuScreen()) 
+    
+   
+

diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
index 00e9ba1..871f074 100644 (file)
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
@@ -22,6 +22,7 @@ import _thread
 from queue import Queue
 from machine import RTC
 import usys
+from lcd import LCD_SIZE_W,LCD_SIZE_H
 def audio_cb(event):
     if event == 0:
         EventMesh.publish("set_audio_state", 1)
@@ -760,14 +761,14 @@ class CallLogScreen(Screen):
 
             call_log_cont_list_screen = lv.obj(call_log_screen)
             call_log_cont_list_screen.set_pos(0, 50)
-            call_log_cont_list_screen.set_size(240, 270)
+            call_log_cont_list_screen.set_size(LCD_SIZE_W, 270)
             call_log_cont_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             call_log_cont_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
             call_log_title = lv.label(call_log_screen)
             call_log_title.set_pos(0, 10)
-            call_log_title.set_size(240, 40)
+            call_log_title.set_size(LCD_SIZE_W, 40)
             call_log_title.set_long_mode(lv.label.LONG.CLIP)
             call_log_title.set_text("通话记录")
             call_log_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -775,7 +776,7 @@ class CallLogScreen(Screen):
 
             none_call_log_title = lv.label(call_log_cont_list_screen)
             none_call_log_title.set_pos(0, 120)
-            none_call_log_title.set_size(240, 40)
+            none_call_log_title.set_size(LCD_SIZE_W, 40)
             none_call_log_title.set_long_mode(lv.label.LONG.WRAP)
             none_call_log_title.set_text(" ")
             none_call_log_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -783,7 +784,7 @@ class CallLogScreen(Screen):
             #self.call_log_detail_list = lv.obj(call_log_screen)
             self.call_log_detail_list = lv.obj(call_log_cont_list_screen)
             self.call_log_detail_list.set_pos(0, 0)
-            self.call_log_detail_list.set_size(240, 271)
+            self.call_log_detail_list.set_size(LCD_SIZE_W, 271)
             self.call_log_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             self.call_log_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             for i in range(self.CALL_LOG_MAX):
@@ -831,7 +832,7 @@ class CallLogScreen(Screen):
                 # self.call_log_detail_list.delete()#先删除一次控件
                 # self.call_log_detail_list = lv.obj(call_log_cont_list_screen)
                 # self.call_log_detail_list.set_pos(0, 0)
-                # self.call_log_detail_list.set_size(240, 271)
+                # self.call_log_detail_list.set_size(LCD_SIZE_W, 271)
                 # self.call_log_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
                 # self.call_log_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
                 sort_tmp = self.read_call_log.values()
@@ -846,7 +847,7 @@ class CallLogScreen(Screen):
 
                     # print("num_count :{} num_name:{} num_time:{}".format(num_count,num_name,num_time))
                     #_btn = lv.btn(self.call_log_detail_list)
-                    self.call_log_detail_list_dict[h]["_btn"].set_size(240,80)
+                    self.call_log_detail_list_dict[h]["_btn"].set_size(LCD_SIZE_W,80)
                     self.call_log_detail_list_dict[h]["_btn"].set_pos(0,82*h)
                     #self.call_log_detail_list_dict[h]["_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
                     self.call_log_detail_list_dict[h]["_btn"].add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling(e)),
@@ -999,14 +1000,14 @@ class DialingScreen(Screen):
 
             dialing_name = lv.label(dialing_screen)
             dialing_name.set_pos(0, 120)
-            dialing_name.set_size(240, 50)
+            dialing_name.set_size(LCD_SIZE_W, 50)
             dialing_name.set_text(" ")
             dialing_name.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             dialing_name.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             dialing_call_label = lv.label(dialing_screen)
             dialing_call_label.set_pos(0, 174)
-            dialing_call_label.set_size(240, 50)
+            dialing_call_label.set_size(LCD_SIZE_W, 50)
             dialing_call_label.set_text("正在等待对方接\n听电话")
             dialing_call_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             dialing_call_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1081,14 +1082,14 @@ class NoSimScreen(Screen):#
 
             no_sim_popup_screen_title1 = lv.label(no_sim_popup_screen)
             no_sim_popup_screen_title1.set_pos(0, 140)
-            no_sim_popup_screen_title1.set_size(240, 40)
+            no_sim_popup_screen_title1.set_size(LCD_SIZE_W, 40)
             no_sim_popup_screen_title1.set_text("无SIM卡或")
             no_sim_popup_screen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             no_sim_popup_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             no_sim_popup_screen_title2 = lv.label(no_sim_popup_screen)
             no_sim_popup_screen_title2.set_pos(0, 190)
-            no_sim_popup_screen_title2.set_size(240, 40)
+            no_sim_popup_screen_title2.set_size(LCD_SIZE_W, 40)
             no_sim_popup_screen_title2.set_text("无网络")
             no_sim_popup_screen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             no_sim_popup_screen_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1140,7 +1141,7 @@ class NovaliedNumScreen(Screen):#
 
             no_valied_num_screen_title1 = lv.label(no_valied_num_screen)
             no_valied_num_screen_title1.set_pos(0, 140)
-            no_valied_num_screen_title1.set_size(240, 40)
+            no_valied_num_screen_title1.set_size(LCD_SIZE_W, 40)
             no_valied_num_screen_title1.set_text("无效的号码，")
             no_valied_num_screen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             no_valied_num_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1148,7 +1149,7 @@ class NovaliedNumScreen(Screen):#
 
             no_valied_num_screen_title2 = lv.label(no_valied_num_screen)
             no_valied_num_screen_title2.set_pos(0, 190)
-            no_valied_num_screen_title2.set_size(240, 40)
+            no_valied_num_screen_title2.set_size(LCD_SIZE_W, 40)
             no_valied_num_screen_title2.set_text("请重新输入")
             no_valied_num_screen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             no_valied_num_screen_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1214,7 +1215,7 @@ class NoSimPowerScreen(Screen):#
 
             no_sim_power_screen_title = lv.label(no_sim_power_screen)
             no_sim_power_screen_title.set_pos(0, 20)
-            no_sim_power_screen_title.set_size(240, 40)
+            no_sim_power_screen_title.set_size(LCD_SIZE_W, 40)
             no_sim_power_screen_title.set_text("无SIM卡，无法拨打")
             no_sim_power_screen_title.set_long_mode(lv.label.LONG.WRAP)
             no_sim_power_screen_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1229,7 +1230,7 @@ class NoSimPowerScreen(Screen):#
 
             no_sim_power_screen_label = lv.label(no_sim_power_screen)
             no_sim_power_screen_label.set_pos(0, 150)
-            no_sim_power_screen_label.set_size(240, 40)
+            no_sim_power_screen_label.set_size(LCD_SIZE_W, 40)
             no_sim_power_screen_label.set_text("是否关机？")
             no_sim_power_screen_label.set_long_mode(lv.label.LONG.WRAP)
             no_sim_power_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1319,7 +1320,7 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机
 
             no_sim_auto_screen_title = lv.label(no_sim_auto_screen)
             no_sim_auto_screen_title.set_pos(0, 10)
-            no_sim_auto_screen_title.set_size(240, 50)
+            no_sim_auto_screen_title.set_size(LCD_SIZE_W, 50)
             no_sim_auto_screen_title.set_text("无SIM卡,无操作30s\n后自动关机")
             no_sim_auto_screen_title.set_long_mode(lv.label.LONG.WRAP)
             no_sim_auto_screen_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1334,7 +1335,7 @@ class NoSimAutoScreen(Screen):#无sim卡是否关机
 
             no_sim_auto_screen_label = lv.label(no_sim_auto_screen)
             no_sim_auto_screen_label.set_pos(0, 150)
-            no_sim_auto_screen_label.set_size(240, 40)
+            no_sim_auto_screen_label.set_size(LCD_SIZE_W, 40)
             no_sim_auto_screen_label.set_text("是否关机？")
             no_sim_auto_screen_label.set_long_mode(lv.label.LONG.WRAP)
             no_sim_auto_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1440,14 +1441,14 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出
 
             dialing_popup_name = lv.label(dialing_popup_screen)
             dialing_popup_name.set_pos(0, 120)
-            dialing_popup_name.set_size(240, 50)
+            dialing_popup_name.set_size(LCD_SIZE_W, 50)
             dialing_popup_name.set_text(" ")
             dialing_popup_name.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             dialing_popup_name.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             dialing_popup_call = lv.label(dialing_popup_screen)
             dialing_popup_call.set_pos(0, 180)
-            dialing_popup_call.set_size(240, 50)
+            dialing_popup_call.set_size(LCD_SIZE_W, 50)
             dialing_popup_call.set_text("正在拨号中")
             dialing_popup_call.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             dialing_popup_call.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1590,7 +1591,7 @@ class DialNoconnectPopupScreen(Screen):#你所拨打的电话暂时无法接通
 
             dialing_connect_call = lv.label(dial_no_connect_popup)
             dialing_connect_call.set_pos(0, 110)
-            dialing_connect_call.set_size(240, 150)
+            dialing_connect_call.set_size(LCD_SIZE_W, 150)
             dialing_connect_call.set_text("你好，你所拨打的\n电话暂时无法接\n通，请稍后再拨")
             dialing_connect_call.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             dialing_connect_call.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1653,7 +1654,7 @@ class chargefullScreen(Screen):#充电已满弹窗提示
 
             charge_full_screen_title = lv.label(charge_full_screen)
             charge_full_screen_title.set_pos(0, 150)
-            charge_full_screen_title.set_size(240, 40)
+            charge_full_screen_title.set_size(LCD_SIZE_W, 40)
             charge_full_screen_title.set_text("充电已满")
             charge_full_screen_title.set_long_mode(lv.label.LONG.WRAP)
             charge_full_screen_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1709,7 +1710,7 @@ class NewMessageScreen(Screen):
 
             message_popup_title = lv.label(message_popup_screen)
             message_popup_title.set_pos(0, 150)
-            message_popup_title.set_size(240, 40)
+            message_popup_title.set_size(LCD_SIZE_W, 40)
             message_popup_title.set_text("你有新的信息")
             message_popup_title.set_long_mode(lv.label.LONG.WRAP)
             message_popup_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1763,7 +1764,7 @@ class RemoveMessageScreen(Screen):#删除短信弹窗框
 
             message_popup_title = lv.label(remove_message_popup_screen)
             message_popup_title.set_pos(0, 150)
-            message_popup_title.set_size(240, 50)
+            message_popup_title.set_size(LCD_SIZE_W, 50)
             message_popup_title.set_text("正在删除中...\n请稍候")
             message_popup_title.set_long_mode(lv.label.LONG.WRAP)
             message_popup_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1823,7 +1824,7 @@ class MessageFullScreen(Screen):
 
             message_full_label = lv.label(message_full_screen)
             message_full_label.set_pos(0, 100)
-            message_full_label.set_size(240, 50)
+            message_full_label.set_size(LCD_SIZE_W, 50)
             message_full_label.set_text("信息已满,是否清除所有？")
             message_full_label.set_long_mode(lv.label.LONG.WRAP)
             message_full_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1936,7 +1937,8 @@ msg_list_t = None
 msg_list_t_done_img = None
 no_msg_text = None
 msg_cont_list_screen = None
-
+SMS_LIST_ONE_ICON = 65
+SMS_LIST_ONE_LABEL_SIZE = 28
 class PopupScreen(Screen):
     NAME = "popup"
 
@@ -1950,6 +1952,7 @@ class PopupScreen(Screen):
         self.sms_detail_list = None
         self.sms_detail_list_dict = []
         self.sms_data = [] #最新短信内容
+        self.is_sliding = 0 
     def post_processor_before_initialization(self):
         pass
         # self.msg_nums = sms.getMsgNums() #获取短信条数
@@ -1958,6 +1961,7 @@ class PopupScreen(Screen):
         # self.msg_nums_old = self.msg_nums
 
     def initialization(self):
+        self.is_sliding = 0
         global msg_list_screen,msg_top_title,msg_cont_detail,msg_list_t,msg_list_t_done_img,no_msg_text,msg_cont_list_screen
         print("PopupScreen:initialization1")
         if msg_list_screen == None :
@@ -1970,7 +1974,7 @@ class PopupScreen(Screen):
 
             msg_top_title = lv.label(msg_list_screen)
             msg_top_title.set_pos(0, 10)
-            msg_top_title.set_size(240, 40)
+            msg_top_title.set_size(LCD_SIZE_W, 40)
             msg_top_title.set_text("信息")
             msg_top_title.set_long_mode(lv.label.LONG.WRAP)
             msg_top_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -1979,7 +1983,7 @@ class PopupScreen(Screen):
 
             msg_cont_list_screen = lv.obj(msg_list_screen)
             msg_cont_list_screen.set_pos(0, 50)
-            msg_cont_list_screen.set_size(240, 270)
+            msg_cont_list_screen.set_size(LCD_SIZE_W, LCD_SIZE_H-50)
             msg_cont_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             msg_cont_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
@@ -1992,7 +1996,7 @@ class PopupScreen(Screen):
 
             no_msg_text = lv.label(msg_cont_list_screen)
             no_msg_text.set_pos(0, 210)
-            no_msg_text.set_size(240, 40)
+            no_msg_text.set_size(LCD_SIZE_W, 40)
             no_msg_text.set_text("暂无信息")
             no_msg_text.set_long_mode(lv.label.LONG.WRAP)
             no_msg_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -2000,19 +2004,22 @@ class PopupScreen(Screen):
 
             self.sms_detail_list = lv.obj(msg_cont_list_screen)
             self.sms_detail_list.set_pos(0, 0)
-            self.sms_detail_list.set_size(230, 271)
+            self.sms_detail_list.set_size(LCD_SIZE_W-10, LCD_SIZE_H-50+1)
             self.sms_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             self.sms_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             for i in range(MSG_MAX):
                 msg_btn = lv.btn(self.sms_detail_list)
                 msg_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.sms_cb(e)),
                                         lv.EVENT.CLICKED, None)
+                msg_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.sms_cb(e)),
+                                        lv.EVENT.PRESSING, None)
                 msg_btn.add_flag(lv.obj.FLAG.HIDDEN)
                 _btn_label2 = lv.label(msg_btn)
                 _btn_label3 = lv.label(msg_btn)
                 _btn_label4 = lv.label(msg_btn)
                 _btn_label5 = lv.label(msg_btn)
                 msg_btn.add_style(style_sms_bg_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+                msg_btn.add_style(style_sms_bg_btn, lv.PART.MAIN|lv.STATE.PRESSED)
                 _btn_label4.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 _btn_label5.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                     
@@ -2142,6 +2149,7 @@ class PopupScreen(Screen):
         count = 0
         j = 0
         print("self.msg_nums:{}".format(self.msg_nums))
+        self.msg_nums = 10
         if self.msg_nums > 0 :
             
 
@@ -2150,100 +2158,102 @@ class PopupScreen(Screen):
                 msg_list_t_done_img.clear_flag(lv.obj.FLAG.HIDDEN)
                 no_msg_text.clear_flag(lv.obj.FLAG.HIDDEN)
                 no_msg_text.set_text("正在加载···")
-            if self.sms_detail_list != None:
-                self.sms_detail_list.add_flag(lv.obj.FLAG.HIDDEN)
-            SMS_lis={}
-            SMS_lis_count = 0
-            #self.sms_data = [] #短信数组
-            if self.sms_data == [] :
-                for i in range(self.msg_nums):
-                    EventMesh.publish("system_sleep_rest")#防止黑屏
-                    message=self.sms_get_message_info(self.msg_nums-i-1)
-                    if message == -1:
-                        break
-                    #print("self.msg_nums:{} message:{} {} {}".format(self.msg_nums-i-1,message[0],message[1],message[2]))
-                    #message:[253, 3, 1, 100, 140, '751F4EA776EE524D6D4']
-                    if message[1]>1 :#长短信
-                        if message[0] in SMS_lis:#存在列表
-                            SMS_lis[message[0]].append(message)
-
-                        else :#列表是新的
-                            SMS_lis[message[0]] = [message]#新增列表
-                            #print("SMS_lis:{}".format(SMS_lis))
-                            #SMS_lis[message[0]].append(message)#新增列表数据
-                        if len(SMS_lis[message[0]]) == message[1]:#存满一条
-                            SMS_lis_tmp = SMS_lis[message[0]]
-                            data = ""
-                            message_pdu = []
-                            for k in range(len(SMS_lis_tmp)):
-                                for j in range(len(SMS_lis_tmp)): #排序
-                                    if SMS_lis_tmp[j][2] == k+1:
-                                        message_pdu = sms.decodePdu(SMS_lis_tmp[j][5],20)
-                                        if(message_pdu!=-1):
-                                            data += message_pdu[1]
-                                        break
-                            #print("data:{}".format(data))
-                            data_tmp = []
-                            data_tmp.append(message_pdu[0])
-                            data_tmp.append(data)
-                            self.sms_data.append(data_tmp)
-                            SMS_lis_count += 1
-                            if(SMS_lis_count >= MSG_MAX):
-                                break
-                    else :
-                        SMS_lis_count += 1
-                        message_pdu = sms.decodePdu(message[5],20)
-                        data = message_pdu[1]
-                        data_tmp = []
-                        data_tmp.append(message_pdu[0])
-                        data_tmp.append(data)
-                        self.sms_data.append(data_tmp)
-                        print("data:{}".format(data))
-                        if(SMS_lis_count >= MSG_MAX):
-                            break
-            MSG_nums = len (self.sms_data)
+            # if self.sms_detail_list != None:
+            #     self.sms_detail_list.add_flag(lv.obj.FLAG.HIDDEN)
+            # SMS_lis={}
+            # SMS_lis_count = 0
+            # #self.sms_data = [] #短信数组
+            # if self.sms_data == [] :
+            #     for i in range(self.msg_nums):
+            #         EventMesh.publish("system_sleep_rest")#防止黑屏
+            #         message=self.sms_get_message_info(self.msg_nums-i-1)
+            #         if message == -1:
+            #             break
+            #         #print("self.msg_nums:{} message:{} {} {}".format(self.msg_nums-i-1,message[0],message[1],message[2]))
+            #         #message:[253, 3, 1, 100, 140, '751F4EA776EE524D6D4']
+            #         if message[1]>1 :#长短信
+            #             if message[0] in SMS_lis:#存在列表
+            #                 SMS_lis[message[0]].append(message)
+
+            #             else :#列表是新的
+            #                 SMS_lis[message[0]] = [message]#新增列表
+            #                 #print("SMS_lis:{}".format(SMS_lis))
+            #                 #SMS_lis[message[0]].append(message)#新增列表数据
+            #             if len(SMS_lis[message[0]]) == message[1]:#存满一条
+            #                 SMS_lis_tmp = SMS_lis[message[0]]
+            #                 data = ""
+            #                 message_pdu = []
+            #                 for k in range(len(SMS_lis_tmp)):
+            #                     for j in range(len(SMS_lis_tmp)): #排序
+            #                         if SMS_lis_tmp[j][2] == k+1:
+            #                             message_pdu = sms.decodePdu(SMS_lis_tmp[j][5],20)
+            #                             if(message_pdu!=-1):
+            #                                 data += message_pdu[1]
+            #                             break
+            #                 #print("data:{}".format(data))
+            #                 data_tmp = []
+            #                 data_tmp.append(message_pdu[0])
+            #                 data_tmp.append(data)
+            #                 self.sms_data.append(data_tmp)
+            #                 SMS_lis_count += 1
+            #                 if(SMS_lis_count >= MSG_MAX):
+            #                     break
+            #         else :
+            #             SMS_lis_count += 1
+            #             message_pdu = sms.decodePdu(message[5],20)
+            #             data = message_pdu[1]
+            #             data_tmp = []
+            #             data_tmp.append(message_pdu[0])
+            #             data_tmp.append(data)
+            #             self.sms_data.append(data_tmp)
+            #             print("data:{}".format(data))
+            #             if(SMS_lis_count >= MSG_MAX):
+            #                 break
+            
+            
+            # MSG_nums = len (self.sms_data)
             for i in range(MSG_MAX):
-                if i >= MSG_nums :
+                if i >= 10 :
                     self.sms_detail_list_dict[i]["msg_btn"].add_flag(lv.obj.FLAG.HIDDEN)
                     continue
-                tmp = self.sms_data[i]
+                tmp =0
                 if tmp != -1:
                     #msg_btn = lv.btn(self.sms_detail_list)
-                    self.sms_detail_list_dict[i]["msg_btn"].set_size(230,65)
-                    self.sms_detail_list_dict[i]["msg_btn"].set_pos(0,67*count)
+                    self.sms_detail_list_dict[i]["msg_btn"].set_size(LCD_SIZE_W-10,SMS_LIST_ONE_ICON)
+                    self.sms_detail_list_dict[i]["msg_btn"].set_pos(0,(SMS_LIST_ONE_ICON+5)*count)
                     #self.sms_detail_list_dict[i]["msg_btn"].add_style(style_sms_bg_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
                     # self.sms_detail_list_dict[i]["msg_btn"].add_event_cb(lambda e: EventMesh.callback_wrapper(self.sms_cb(e)),
                     #                         lv.EVENT.CLICKED, None)
                 
-                    title = tmp[0] 
+                    title = "tmp[0] "
                     # print("title:{}".format(title))
                     #_btn_label2 = lv.label(msg_btn)
                     self.sms_detail_list_dict[i]["_btn_label2"].set_pos(0, 0)
                     self.sms_detail_list_dict[i]["_btn_label2"].set_size(0, 0)
-                    self.sms_detail_list_dict[i]["_btn_label2"].set_text(title)
+                    self.sms_detail_list_dict[i]["_btn_label2"].set_text("127979+++++++++HIHSI")
                     # _btn_label2.set_long_mode(lv.label.LONG.DOT)
                     # _btn_label2.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                     #
-                    detail = tmp[1]
+                    detail = "tmp[1]"
                     #_btn_label3 = lv.label(msg_btn)
                     self.sms_detail_list_dict[i]["_btn_label3"].set_pos(0, 0)
                     self.sms_detail_list_dict[i]["_btn_label3"].set_size(0, 0)
-                    self.sms_detail_list_dict[i]["_btn_label3"].set_text(detail)
+                    self.sms_detail_list_dict[i]["_btn_label3"].set_text("hi hihi hi是hi hi是奉公守法")
                     # _btn_label3.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-                    detail1 = tmp[1]
+                    detail1 = "tmp[1]"
                     #_btn_label4 = lv.label(msg_btn)
                     self.sms_detail_list_dict[i]["_btn_label4"].set_pos(0, 34)
-                    self.sms_detail_list_dict[i]["_btn_label4"].set_size(230, 28)
-                    self.sms_detail_list_dict[i]["_btn_label4"].set_text(detail1)
+                    self.sms_detail_list_dict[i]["_btn_label4"].set_size(LCD_SIZE_W-10, SMS_LIST_ONE_LABEL_SIZE)
+                    self.sms_detail_list_dict[i]["_btn_label4"].set_text("反对非法33333333fdddv反对")
                     self.sms_detail_list_dict[i]["_btn_label4"].set_long_mode(lv.label.LONG.DOT)
                     #self.sms_detail_list_dict[i]["_btn_label4"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-                    title1 = tmp[0]
+                    title1 = "tmp[0]"
                     #_btn_label5 = lv.label(msg_btn)
                     self.sms_detail_list_dict[i]["_btn_label5"].set_pos(0, 5)
-                    self.sms_detail_list_dict[i]["_btn_label5"].set_size(230, 28)
-                    self.sms_detail_list_dict[i]["_btn_label5"].set_text(title1)
+                    self.sms_detail_list_dict[i]["_btn_label5"].set_size(LCD_SIZE_W-10, SMS_LIST_ONE_LABEL_SIZE)
+                    self.sms_detail_list_dict[i]["_btn_label5"].set_text("hi hihi hi是hi hi是奉公守法")
                     self.sms_detail_list_dict[i]["_btn_label5"].set_long_mode(lv.label.LONG.DOT)
                     #self.sms_detail_list_dict[i]["_btn_label5"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                     
@@ -2267,19 +2277,29 @@ class PopupScreen(Screen):
             if self.sms_detail_list != None:
                 self.sms_detail_list.add_flag(lv.obj.FLAG.HIDDEN)
             
-            
-    def sms_cb(self,e):
+    def sms_cb(self, e):
         code = e.get_code()
-        if code == lv.EVENT.CLICKED:
-            print("tp test!!!!!!!!!!!!!!")
-            #上传标题和内容
-            _name = e.get_target().get_child(0).get_text()
-            EventMesh.publish("save_msg_name", _name)       
-            content = e.get_target().get_child(1).get_text()
-            EventMesh.publish("save_msg_content", content) 
-       
-        #显示详细页面
-        EventMesh.publish("load_screen", {"screen": "msg_detail"})
+        EventMesh.publish("publish_message_event_ui",{"func":self.sms_cb_do,"data":code})  
+    def sms_cb_do(self, data):
+        code = data
+
+        #print("code!!!!!!!!",code,msg)
+        if code == lv.EVENT.PRESSING:
+            #print("PRESSING")
+            self.is_sliding += 1
+
+        elif  code == lv.EVENT.CLICKED:
+            #utime.sleep_ms(10)
+            print("1self.is_sliding",self.is_sliding)
+            if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
+                print("tp test!!!!!!!!!!!!!!")
+                #上传标题和内容
+                _name = code.get_target().get_child(0).get_text()
+                EventMesh.publish("save_msg_name", _name)       
+                content = code.get_target().get_child(1).get_text()
+                EventMesh.publish("save_msg_content", content) 
+                EventMesh.publish("load_screen", {"screen": "msg_detail"})
+            self.is_sliding = 0
     
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
@@ -2314,18 +2334,18 @@ class MsgDetailScreen(Screen):
 
             msg_detail_title = lv.label(msg_detail_screen)
             msg_detail_title.set_pos(0, 10)
-            msg_detail_title.set_size(240, 35)
+            msg_detail_title.set_size(LCD_SIZE_W, 35)
             msg_detail_title.set_long_mode(lv.label.LONG.WRAP)
             msg_detail_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             msg_detail_title.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             msg_detail_cont_obj = lv.obj(msg_detail_screen)
             msg_detail_cont_obj.set_pos(0, 45)
-            msg_detail_cont_obj.set_size(240, 270)
+            msg_detail_cont_obj.set_size(LCD_SIZE_W, 270)
             msg_detail_cont_obj.add_style(style_white_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             msg_detail_cont = lv.label(msg_detail_cont_obj)
             msg_detail_cont.set_pos(0, 5)
-            msg_detail_cont.set_size(240, lv.SIZE.CONTENT)
+            msg_detail_cont.set_size(LCD_SIZE_W, lv.SIZE.CONTENT)
             msg_detail_cont.set_long_mode(lv.label.LONG.WRAP)
             msg_detail_cont.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
             msg_detail_cont.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -2339,7 +2359,7 @@ class MsgDetailScreen(Screen):
         self.content = EventMesh.publish("get_msg_content")
         msg_detail_title.set_text(self.name)
         # tmp_y=(len(self.content)//15+1)*28
-        # msg_detail_cont.set_size(240, tmp_y)
+        # msg_detail_cont.set_size(LCD_SIZE_W, tmp_y)
         msg_detail_cont.set_text(self.content)
 
         
@@ -2403,7 +2423,7 @@ class HeartrateScreen(Screen):
 
             heartrate_label = lv.label(heartrate_screen)
             heartrate_label.set_pos(0, 20)
-            heartrate_label.set_size(240, 40)
+            heartrate_label.set_size(LCD_SIZE_W, 40)
             heartrate_label.set_text("心率")
             heartrate_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
             heartrate_label.set_long_mode(lv.label.LONG.WRAP)
@@ -2426,7 +2446,7 @@ class HeartrateScreen(Screen):
             heartrate_reset_btn_img.add_flag(lv.obj.FLAG.CLICKABLE)
 
             heartrate_start_label = lv.label(heartrate_screen)
-            heartrate_start_label.set_size(240,40)
+            heartrate_start_label.set_size(LCD_SIZE_W,40)
             heartrate_start_label.set_pos(0,200)
             heartrate_start_label.set_text("正在测量中.")
             heartrate_start_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
@@ -2484,7 +2504,7 @@ class HeartrateScreen(Screen):
             heartrate_bpm_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
 
             heartrate_done_label = lv.label(heartrate_screen)
-            heartrate_done_label.set_size(240, 40)
+            heartrate_done_label.set_size(LCD_SIZE_W, 40)
             heartrate_done_label.set_pos(0, 270)
             heartrate_done_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             heartrate_done_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -2711,7 +2731,7 @@ class ToolboxScreen(Screen):
 
             toolbox_cont = lv.obj(toolbox_screen)
             toolbox_cont.set_pos(0, 50)
-            toolbox_cont.set_size(240, 270)
+            toolbox_cont.set_size(LCD_SIZE_W, 270)
             toolbox_cont.add_style(toolbox_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
@@ -2826,7 +2846,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_size(LCD_SIZE_W, 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)
 
@@ -3066,21 +3086,21 @@ class OnCallScreen(Screen):
             on_call_screen = lv.obj()
             on_call_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             on_call_obj = lv.obj(on_call_screen)
-            on_call_obj.set_size(240,320)
+            on_call_obj.set_size(LCD_SIZE_W,LCD_SIZE_H)
             on_call_obj.set_pos(0,0)
             on_call_obj.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             print("on_call_screen")
             
             on_call_label_name = lv.label(on_call_obj)
             on_call_label_name.set_pos(0, 80)
-            on_call_label_name.set_size(240, 50)
+            on_call_label_name.set_size(LCD_SIZE_W, 50)
             on_call_label_name.set_text(" ")
             on_call_label_name.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             on_call_label_name.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             on_call_second_label = lv.label(on_call_obj)
             on_call_second_label.set_pos(0, 140)
-            on_call_second_label.set_size(240, 30)
+            on_call_second_label.set_size(LCD_SIZE_W, 30)
             on_call_second_label.set_text("00:00")
             on_call_second_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             on_call_second_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -3155,7 +3175,7 @@ class OnCallScreen(Screen):
                                     lv.EVENT.CLICKED, None)
 
             on_call_screen_tab = lv.obj(on_call_screen)
-            on_call_screen_tab.set_size(240,320)
+            on_call_screen_tab.set_size(LCD_SIZE_W,320)
             on_call_screen_tab.set_pos(0,0)
             on_call_screen_tab.add_flag(lv.obj.FLAG.HIDDEN)
             on_call_screen_tab.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -3593,7 +3613,7 @@ class StepScreen(Screen):
 
             step_label_01 = lv.label(step_screen)
             step_label_01.set_pos(0, 100)
-            step_label_01.set_size(240, 50)
+            step_label_01.set_size(LCD_SIZE_W, 50)
             step_label_01.set_text("0步")
             step_label_01.set_long_mode(lv.label.LONG.WRAP)
             step_label_01.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -3692,7 +3712,7 @@ class WeatherScreen(Screen):
 
             weather_location_label = lv.label(weather_screen)
             weather_location_label.set_pos(0, 200)
-            weather_location_label.set_size(240, 50)
+            weather_location_label.set_size(LCD_SIZE_W, 50)
             weather_location_label.set_text("--")
             weather_location_label.set_long_mode(lv.label.LONG.WRAP)
             weather_location_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -3700,7 +3720,7 @@ class WeatherScreen(Screen):
 
             no_connect_label = lv.label(weather_screen)
             no_connect_label.set_pos(0, 200)
-            no_connect_label.set_size(240, 40)
+            no_connect_label.set_size(LCD_SIZE_W, 40)
             no_connect_label.set_text("找不到服务器")
             no_connect_label.set_long_mode(lv.label.LONG.WRAP)
             no_connect_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -3708,7 +3728,7 @@ class WeatherScreen(Screen):
 
             no_connect_label1 = lv.label(weather_screen)
             no_connect_label1.set_pos(0, 250)
-            no_connect_label1.set_size(240, 70)
+            no_connect_label1.set_size(LCD_SIZE_W, 70)
             no_connect_label1.set_text("请联网后重试")
             no_connect_label1.set_long_mode(lv.label.LONG.WRAP)
             no_connect_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -3846,13 +3866,13 @@ class ContactsScreen(Screen):
 
             contacts_screen_list_screen = lv.obj(contacts_screen)
             contacts_screen_list_screen.set_pos(0, 50)
-            contacts_screen_list_screen.set_size(240, 270)
+            contacts_screen_list_screen.set_size(LCD_SIZE_W, LCD_SIZE_H-50)
             contacts_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             contacts_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             contacts_top_title = lv.label(contacts_screen)
             contacts_top_title.set_pos(0, 10)
-            contacts_top_title.set_size(240, 40)
+            contacts_top_title.set_size(LCD_SIZE_W, 40)
             contacts_top_title.set_text("联系人")
             contacts_top_title.set_long_mode(lv.label.LONG.WRAP)
             contacts_top_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -3861,7 +3881,7 @@ class ContactsScreen(Screen):
 
             contact_none_label = lv.label(contacts_screen_list_screen)
             contact_none_label.set_pos(0, 80)
-            contact_none_label.set_size(240, 50)
+            contact_none_label.set_size(LCD_SIZE_W, 50)
             contact_none_label.set_text("无联系人，请在手机\nAPP上添加")
             contact_none_label.set_long_mode(lv.label.LONG.WRAP)
             contact_none_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -3869,7 +3889,7 @@ class ContactsScreen(Screen):
 
             self.contact_detail_list = lv.obj(contacts_screen_list_screen)
             self.contact_detail_list.set_pos(0, 0)
-            self.contact_detail_list.set_size(240, 271)
+            self.contact_detail_list.set_size(LCD_SIZE_W, LCD_SIZE_H-50+1)
             self.contact_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             self.contact_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             for i in range(self.MXA_phone_num):
@@ -3917,7 +3937,7 @@ class ContactsScreen(Screen):
             # self.contact_detail_list.delete()#先删除一次控件
             # self.contact_detail_list = lv.obj(contacts_screen_list_screen)
             # self.contact_detail_list.set_pos(0, 0)
-            # self.contact_detail_list.set_size(240, 271)
+            # self.contact_detail_list.set_size(LCD_SIZE_W, 271)
             # self.contact_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             # self.contact_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
             # print("self.phonebook sorted :{}".format(len(self.phonebook)))
@@ -3933,7 +3953,7 @@ class ContactsScreen(Screen):
                 print("name :{} key_tmp:{}".format(name,key_tmp))
                 
                 #contact_btn = lv.btn(self.contact_detail_list)
-                self.contact_detail_listt_dict[i]["contact_btn"].set_size(230,80)
+                self.contact_detail_listt_dict[i]["contact_btn"].set_size(LCD_SIZE_W-10,80)
                 self.contact_detail_listt_dict[i]["contact_btn"].set_pos(0,82*i )
                 #self.contact_detail_listt_dict[i]["contact_btn"].add_style(style_contact_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
                 # contact_btn.add_style(style_contact_btn_pressed, lv.PART.MAIN | lv.STATE.PRESSED)
@@ -3955,7 +3975,7 @@ class ContactsScreen(Screen):
 
                 #contact_btn_label_3 = lv.label(contact_btn)
                 self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(0, 35)
-                self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(220, 35)
+                self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_SIZE_W-20, 35)
                 self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_text(name)
                 #self.contact_detail_listt_dict[i]["contact_btn_label_3"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
                 
@@ -4063,7 +4083,7 @@ class TemperatureScreen(Screen):
 
             temperature_label = lv.label(temperature_screen)
             temperature_label.set_pos(0, 10)
-            temperature_label.set_size(240, 40)
+            temperature_label.set_size(LCD_SIZE_W, 40)
             temperature_label.set_text("体温")
             temperature_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
             temperature_label.set_long_mode(lv.label.LONG.WRAP)
@@ -4086,7 +4106,7 @@ class TemperatureScreen(Screen):
             temp_reset_btn_img.add_flag(lv.obj.FLAG.CLICKABLE)
 
             temperature_start_label = lv.label(temperature_screen)
-            temperature_start_label.set_size(240,40)
+            temperature_start_label.set_size(LCD_SIZE_W,40)
             temperature_start_label.set_pos(0,190)
             temperature_start_label.set_text("正在测量中.")
             temperature_start_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
@@ -4385,7 +4405,7 @@ class TemperatureScreen(Screen):
 
 
 
-line_points = [{"x":0,"y":0},{"x":240,"y":0}]
+line_points = [{"x":0,"y":0},{"x":LCD_SIZE_W,"y":0}]
 spo2_screen = None
 spo2_label_0 = None
 spo2_done_img = None
@@ -4437,7 +4457,7 @@ class Spo2Screen(Screen):
 
             spo2_label = lv.label(spo2_screen)
             spo2_label.set_pos(0, 20)
-            spo2_label.set_size(240, 40)
+            spo2_label.set_size(LCD_SIZE_W, 40)
             spo2_label.set_text("血氧")
             spo2_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
             spo2_label.set_long_mode(lv.label.LONG.WRAP)
@@ -4450,7 +4470,7 @@ class Spo2Screen(Screen):
 
             
             spo2_done_img = lv.img(spo2_screen)
-            spo2_done_img.set_pos(20, 240)
+            spo2_done_img.set_pos(20, LCD_SIZE_W)
             spo2_done_img.set_src("E:/static/spo2_gif04.png")
 
             spo2_reset_btn_img = lv.img(spo2_screen)
@@ -4460,7 +4480,7 @@ class Spo2Screen(Screen):
             spo2_reset_btn_img.add_flag(lv.obj.FLAG.CLICKABLE)
 
             spo2_start_label = lv.label(spo2_screen)
-            spo2_start_label.set_size(240,40)
+            spo2_start_label.set_size(LCD_SIZE_W,40)
             spo2_start_label.set_pos(0,200)
             spo2_start_label.set_text("正在测量中.")
             spo2_start_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
@@ -4765,7 +4785,7 @@ class CountdownScreen(Screen):
 
             countdown_title = lv.label(countdown_screen)
             countdown_title.set_pos(0, 20)
-            countdown_title.set_size(240, 20)
+            countdown_title.set_size(LCD_SIZE_W, 20)
             countdown_title.set_text("倒计时")
             countdown_title.set_long_mode(lv.label.LONG.WRAP)
             countdown_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -5272,7 +5292,7 @@ class CountdownEndScreen(Screen):
 
             countdown_end_label = lv.label(countdown_end_screen)
             countdown_end_label.set_pos(0, 240)
-            countdown_end_label.set_size(240, 40)
+            countdown_end_label.set_size(LCD_SIZE_W, 40)
             countdown_end_label.set_text("时间到")
             countdown_end_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             countdown_end_label.set_long_mode(lv.label.LONG.WRAP)
@@ -5373,7 +5393,7 @@ class StopwatchScreen(Screen):
 
             stopwatch_title = lv.label(stopwatch_screen)
             stopwatch_title.set_pos(0, 20)
-            stopwatch_title.set_size(240, 20)
+            stopwatch_title.set_size(LCD_SIZE_W, 20)
             stopwatch_title.set_text("秒表")
             stopwatch_title.set_long_mode(lv.label.LONG.WRAP)
             stopwatch_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
@@ -5776,7 +5796,7 @@ class LowOnePowerScreen(Screen): #0%的电池电量
 
             LowOnePower_screen_label1 = lv.label(LowOnePower_screen)
             LowOnePower_screen_label1.set_pos(0, 180)
-            LowOnePower_screen_label1.set_size(240, 60)
+            LowOnePower_screen_label1.set_size(LCD_SIZE_W, 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)
@@ -5784,7 +5804,7 @@ class LowOnePowerScreen(Screen): #0%的电池电量
 
             LowOnePower_screen_label2 = lv.label(LowOnePower_screen)
             LowOnePower_screen_label2.set_pos(0, 250)
-            LowOnePower_screen_label2.set_size(240, 60)
+            LowOnePower_screen_label2.set_size(LCD_SIZE_W, 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)
@@ -5850,7 +5870,7 @@ class sosScreen(Screen):
 
             sos_screen_label = lv.label(sos_screen)
             sos_screen_label.set_pos(0, 20)
-            sos_screen_label.set_size(240, 30)
+            sos_screen_label.set_size(LCD_SIZE_W, 30)
             sos_screen_label.set_text("SOS")
             sos_screen_label.add_style(style_font_youyuan_20_red, lv.PART.MAIN | lv.STATE.DEFAULT)
             sos_screen_label.set_long_mode(lv.label.LONG.WRAP)
@@ -5860,14 +5880,14 @@ class sosScreen(Screen):
             sos_screen_label = lv.label(sos_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_size(LCD_SIZE_W, 50)
             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_size(LCD_SIZE_W, 50)
             sos_screen_label.set_pos(0,140)
             sos_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
@@ -5978,7 +5998,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_size(LCD_SIZE_W, 80)
             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)
@@ -6054,7 +6074,7 @@ class SystemInitScreen(Screen):
        
             system_init_label = lv.label(system_init_screen)
             system_init_label.set_pos(0, 150)
-            system_init_label.set_size(240, 40)
+            system_init_label.set_size(LCD_SIZE_W, 40)
             system_init_label.set_text("系统初始化中")
             system_init_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             system_init_label.set_long_mode(lv.label.LONG.WRAP)
@@ -6108,7 +6128,7 @@ class chargeInScreen(Screen):
 
             charge_in_screen_label = lv.label(charge_in_screen)
             charge_in_screen_label.set_pos(0, 170)
-            charge_in_screen_label.set_size(240, 20)
+            charge_in_screen_label.set_size(LCD_SIZE_W, 20)
             charge_in_screen_label.set_text(" ")
             charge_in_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             charge_in_screen_label.set_long_mode(lv.label.LONG.WRAP)
@@ -6191,7 +6211,7 @@ class chargeOutScreen(Screen):
 
             charge_out_screen_label = lv.label(charge_out_screen)
             charge_out_screen_label.set_pos(0, 170)
-            charge_out_screen_label.set_size(240, 20)
+            charge_out_screen_label.set_size(LCD_SIZE_W, 20)
             charge_out_screen_label.set_text(" ")
             charge_out_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             charge_out_screen_label.set_long_mode(lv.label.LONG.WRAP)
@@ -6273,7 +6293,7 @@ class restore_confirmScreen(Screen):
 
             rrestor_confirm_n_screen_label = lv.label(rrestor_confirm_n_screen)
             rrestor_confirm_n_screen_label.set_pos(0, 150)
-            rrestor_confirm_n_screen_label.set_size(240, 60)
+            rrestor_confirm_n_screen_label.set_size(LCD_SIZE_W, 60)
             rrestor_confirm_n_screen_label.set_text("正在恢复出厂中\n请稍等...")
             rrestor_confirm_n_screen_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             rrestor_confirm_n_screen_label.set_long_mode(lv.label.LONG.WRAP)
@@ -6351,14 +6371,14 @@ class classMgrPopupScreen(Screen):#上课禁用时间界面
        
             class_mgr_popup_time1_text = lv.label(class_mgr_popup_screen)
             class_mgr_popup_time1_text.set_pos(0, 10)
-            class_mgr_popup_time1_text.set_size(240, 80)
+            class_mgr_popup_time1_text.set_size(LCD_SIZE_W, 80)
             class_mgr_popup_time1_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
             class_mgr_popup_time1_text.set_text(" ")
             class_mgr_popup_time1_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)
 
             class_mgr_popup_label = lv.label(class_mgr_popup_screen)
             class_mgr_popup_label.set_pos(0, 120)
-            class_mgr_popup_label.set_size(240, 50)
+            class_mgr_popup_label.set_size(LCD_SIZE_W, 50)
             class_mgr_popup_label.set_text("现在是上课时间点,禁用手表功能")
             class_mgr_popup_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
             class_mgr_popup_label.set_long_mode(lv.label.LONG.WRAP)

diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
index c9418ef..5f901fa 100644 (file)
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
@@ -8,7 +8,7 @@ from ui import Screen,style_screen
 import ql_fs
 import ujson
 from machine import RTC
-
+from lcd import LCD_SIZE_W,LCD_SIZE_H
 
 
 # style_font_youyuan_20 = lv.style_t()
@@ -37,7 +37,7 @@ Watchface = lv.obj()
 print("Watchface")
 Watchface1 = lv.obj(Watchface)
 
-Watchface1.set_size(240,320)
+Watchface1.set_size(LCD_SIZE_W,LCD_SIZE_H)
 #Watchface1.set_pos(0,0)
 Watchface1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 Watchface1.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
@@ -55,7 +55,7 @@ style_watchface_img_default.set_img_opa(255)
 #状态栏
 
 watchface1_mpsignal_img = lv.img(Watchface1)
-watchface1_mpsignal_img.set_pos(int(20),int(5))
+watchface1_mpsignal_img.set_pos(int(20),int(15))
 watchface1_mpsignal_img.set_size(30,22)
 watchface1_mpsignal_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface1_mpsignal_img.add_flag(lv.obj.FLAG.CLICKABLE)
@@ -63,7 +63,7 @@ watchface1_mpsignal_img.set_src("E:/static/mpsignal5.png")
 watchface1_mpsignal_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 watchface1_res_stat_battery_img = lv.img(Watchface1)
-watchface1_res_stat_battery_img.set_pos(int(196),int(5))
+watchface1_res_stat_battery_img.set_pos(int(185),int(15))
 watchface1_res_stat_battery_img.set_size(40,22)
 watchface1_res_stat_battery_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface1_res_stat_battery_img.add_flag(lv.obj.FLAG.CLICKABLE)
@@ -75,12 +75,12 @@ watchface1_res_stat_battery_img.add_style(style_watchface_img_default, lv.PART.M
  
 watchface1_res_stat_battery_line = lv.line(Watchface1)
 watchface1_res_stat_battery_line.set_points(power_line_points,2)
-watchface1_res_stat_battery_line.set_pos(int(203),int(3))
+watchface1_res_stat_battery_line.set_pos(int(191),int(13))
 watchface1_res_stat_battery_line.set_size(0,16)#高度12
 watchface1_res_stat_battery_line.add_style(power_line_red,0)
 
 watchface1_res_stat_charge_in_img = lv.img(Watchface1)
-watchface1_res_stat_charge_in_img.set_pos(int(180),int(0))
+watchface1_res_stat_charge_in_img.set_pos(int(180),int(10))
 watchface1_res_stat_charge_in_img.set_size(10,18)
 watchface1_res_stat_charge_in_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface1_res_stat_charge_in_img.add_flag(lv.obj.FLAG.CLICKABLE)
@@ -90,7 +90,7 @@ watchface1_res_stat_charge_in_img.add_style(style_watchface_img_default, lv.PART
 
 #主图片
 watchface1_bg_img = lv.img(Watchface1)
-watchface1_bg_img.set_pos(int(9),int(65))
+watchface1_bg_img.set_pos(int(9),int(60))
 watchface1_bg_img.set_size(222,222)
 watchface1_bg_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface1_bg_img.add_flag(lv.obj.FLAG.CLICKABLE)
@@ -132,7 +132,7 @@ def get_week(msg):
 
 
 watchface1_time1_text = lv.label(Watchface1)
-watchface1_time1_text.set_pos(20, 50)
+watchface1_time1_text.set_pos(20, 55)
 watchface1_time1_text.set_size(190, 71)
 watchface1_time1_text.set_align(lv.TEXT_ALIGN.LEFT)
 watchface1_time1_text.set_text("{}:{}".format("%02d"%(hour),"%02d"%(min)))
@@ -141,14 +141,14 @@ watchface1_time1_text.add_style(style_font_youyuan_70_black, lv.PART.MAIN|lv.STA
 
 #日期
 watchface1_date_span = lv.label(Watchface1)
-watchface1_date_span.set_pos(8, 122)
+watchface1_date_span.set_pos(8, 127)
 watchface1_date_span.set_size(140, 30)
 watchface1_date_span.set_align(lv.TEXT_ALIGN.LEFT)
 watchface1_date_span.set_text("%d月%d日"%(date1,date2))
 watchface1_date_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 #星期
 watchface1_week_span = lv.label(Watchface1)
-watchface1_week_span.set_pos(8, 160)
+watchface1_week_span.set_pos(8, 165)
 watchface1_week_span.set_size(100, 30)
 watchface1_week_span.set_align(lv.TEXT_ALIGN.LEFT)
 watchface1_week_span.set_text("星期%s"%(get_week(week)))
@@ -157,8 +157,8 @@ watchface1_week_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFA
 
 
 watchface1_step_span = lv.label(Watchface1)
-watchface1_step_span.set_pos(142, 159)
-watchface1_step_span.set_size(78, 30)
+watchface1_step_span.set_pos(142, 155)
+watchface1_step_span.set_size(240-142, 30)
 watchface1_step_span.set_align(lv.TEXT_ALIGN.LEFT)
 watchface1_step_span.set_text("0")
 watchface1_step_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
@@ -335,7 +335,7 @@ style_watchface_img_default.set_img_recolor_opa(0)
 style_watchface_img_default.set_img_opa(255)
 
 Watchface2 = lv.obj(Watchface)
-Watchface2.set_size(240,320)
+Watchface2.set_size(LCD_SIZE_W,LCD_SIZE_H)
 #Watchface2.set_pos(0,0)
 Watchface2.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 Watchface2.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
@@ -345,7 +345,7 @@ Watchface2.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
 #状态栏
 
 watchface2_mpsignal_img = lv.img(Watchface2)
-watchface2_mpsignal_img.set_pos(int(20),int(5))
+watchface2_mpsignal_img.set_pos(int(20),int(15))
 watchface2_mpsignal_img.set_size(30,22)
 watchface2_mpsignal_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface2_mpsignal_img.add_flag(lv.obj.FLAG.CLICKABLE)
@@ -353,7 +353,7 @@ watchface2_mpsignal_img.set_src("E:/static/mpsignal5.png")
 watchface2_mpsignal_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 watchface2_res_stat_battery_img = lv.img(Watchface2)
-watchface2_res_stat_battery_img.set_pos(int(196),int(5))
+watchface2_res_stat_battery_img.set_pos(int(185),int(15))
 watchface2_res_stat_battery_img.set_size(40,22)
 watchface2_res_stat_battery_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface2_res_stat_battery_img.add_flag(lv.obj.FLAG.CLICKABLE)
@@ -363,7 +363,7 @@ watchface2_res_stat_battery_img.add_style(style_watchface_img_default, lv.PART.M
  
 watchface2_res_stat_battery_line = lv.line(Watchface2)
 watchface2_res_stat_battery_line.set_points(power_line_points,2)
-watchface2_res_stat_battery_line.set_pos(int(203),int(3))
+watchface2_res_stat_battery_line.set_pos(int(191),int(13))
 watchface2_res_stat_battery_line.set_size(0,16)#高度12
 watchface2_res_stat_battery_line.add_style(power_line_red,0)
 
@@ -436,15 +436,15 @@ watchface2_week.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 watchface2_step_img = lv.img(Watchface2)
-watchface2_step_img.set_pos(int(95),int(260))
+watchface2_step_img.set_pos(int(95),int(250))
 watchface2_step_img.set_size(26,21)
 watchface2_step_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 watchface2_step_img.set_src("U:/static/step.png")
 watchface2_step_img.add_style(style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 watchface2_step_txt = lv.label(Watchface2)
-watchface2_step_txt.set_pos(125, 260)
-watchface2_step_txt.set_size(80, 35)
+watchface2_step_txt.set_pos(125, 250)
+watchface2_step_txt.set_size(80, 30)
 watchface2_step_txt.set_align(lv.TEXT_ALIGN.LEFT)
 watchface2_step_txt.set_text("0")
 watchface2_step_txt.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT)
@@ -533,7 +533,7 @@ class WatchFace2():
         else:
             watchface2_res_stat_battery_img.set_src("E:/static/vbat_0.png")
             level = msg[1]
-            if level >= 100:
+            if level >= 99:
                 level = 100
             line_len = int(level*(30/100))
             # print("__battery_cb:",level,line_len,30/100)

diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
index 2d1ad77..8bb2c7f 100644 (file)
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
@@ -11,6 +11,11 @@ from misc import Power
 import pm
 from ui import Screen
 from ui_WatchFaceScreen import WatchFace
+from lcd import LCD_SIZE_W,LCD_SIZE_H
+MAIN_ICON_SZIE = 120 #菜单界面图片的大小
+MAIN_ICON_X = 60#菜单界面的x坐标
+MAIN_ICON_Y = 30#菜单界面的y坐标
+MAIN_LABEL_Y = 200#菜单界面的文本的y坐标
 style_MainMenu_screen_default = lv.style_t()
 style_MainMenu_screen_default.init()
 style_MainMenu_screen_default.set_radius(0)
@@ -95,6 +100,7 @@ MainMenu2 = lv.obj()
 print("MainMenu2")
 MainMenu2_til = lv.tileview(MainMenu2)
 MainMenu2_til.set_scrollbar_mode(0)
+MainMenu2_til.set_size(240,284)
 MainMenu2_til.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 #MainMenu2_til.add_flag(lv.obj.FLAG.SCROLL_ELASTIC)
 #LV_OBJ_FLAG_SCROLL_MOMENTUM
@@ -102,7 +108,7 @@ MainMenu2_til.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.D
 MainMenu2_Watchface = MainMenu2_til.add_tile(0, 1,  lv.DIR.LEFT | lv.DIR.RIGHT)
 
 label_text = lv.label(MainMenu2_Watchface)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_W)
 label_text.set_size(0, 0)
 label_text.set_text("0")
 MainMenu2_num+=1
@@ -136,19 +142,19 @@ MainMenu2_num+=1
 #拨号盘
 MainMenu2_phone = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 label_text = lv.label(MainMenu2_phone)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_H)
 label_text.set_size(0, 0)
 label_text.set_text("{}".format(MainMenu2_num))
 MainMenu2_img_phone = lv.img(MainMenu2_phone)
-MainMenu2_img_phone.set_size(160,160)
-MainMenu2_img_phone.set_pos(40,20)
+MainMenu2_img_phone.set_size(MAIN_ICON_SZIE,MAIN_ICON_SZIE)
+MainMenu2_img_phone.set_pos(MAIN_ICON_X,MAIN_ICON_Y)
 MainMenu2_img_phone.set_src("U:/static/IMAGE_ONE_PAGE_CALL.png")
 MainMenu2_img_phone.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_phone.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 MainMenu2_img_phone_text = lv.label(MainMenu2_phone)
-MainMenu2_img_phone_text.set_pos(int(0),int(220))
-MainMenu2_img_phone_text.set_size(240,100)
+MainMenu2_img_phone_text.set_pos(int(0),int(MAIN_LABEL_Y))
+MainMenu2_img_phone_text.set_size(LCD_SIZE_W,LCD_SIZE_H-MAIN_LABEL_Y)
 MainMenu2_img_phone_text.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_phone_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 MainMenu2_img_phone_text.set_text("拨号盘")
@@ -157,21 +163,21 @@ MainMenu2_num+=1
 MainMenu2x+=1
 
 #通讯录
-MainMenu2_contacts = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_contacts = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT)
 label_text = lv.label(MainMenu2_contacts)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_H)
 label_text.set_size(0, 0)
 label_text.set_text("{}".format(MainMenu2_num))
 MainMenu2_img_contacts = lv.img(MainMenu2_contacts)
-MainMenu2_img_contacts.set_size(160,160)
-MainMenu2_img_contacts.set_pos(40,20)
+MainMenu2_img_contacts.set_size(MAIN_ICON_SZIE,MAIN_ICON_SZIE)
+MainMenu2_img_contacts.set_pos(MAIN_ICON_X,MAIN_ICON_Y)
 MainMenu2_img_contacts.set_src("U:/static/IMAGE_ONE_PAGE_CONTACTS.png")
 MainMenu2_img_contacts.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_contacts.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 MainMenu2_img_contacts_txt = lv.label(MainMenu2_contacts)
-MainMenu2_img_contacts_txt.set_pos(int(0),int(220))
-MainMenu2_img_contacts_txt.set_size(240,100)
+MainMenu2_img_contacts_txt.set_pos(int(0),int(MAIN_LABEL_Y))
+MainMenu2_img_contacts_txt.set_size(LCD_SIZE_W,LCD_SIZE_H-MAIN_LABEL_Y)
 MainMenu2_img_contacts_txt.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_contacts_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 MainMenu2_img_contacts_txt.set_text("联系人")
@@ -182,19 +188,19 @@ MainMenu2x+=1
 #短信
 MainMenu2_SMS = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 label_text = lv.label(MainMenu2_SMS)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_H)
 label_text.set_size(0, 0)
 label_text.set_text("{}".format(MainMenu2_num))
 MainMenu2_img_sms = lv.img(MainMenu2_SMS)
-MainMenu2_img_sms.set_size(160,160)
-MainMenu2_img_sms.set_pos(40,20)
+MainMenu2_img_sms.set_size(MAIN_ICON_SZIE,MAIN_ICON_SZIE)
+MainMenu2_img_sms.set_pos(MAIN_ICON_X,MAIN_ICON_Y)
 MainMenu2_img_sms.set_src("U:/static/IMAGE_ONE_PAGE_SMS.png")
 MainMenu2_img_sms.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_sms.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 MainMenu2_img_sms_txt = lv.label(MainMenu2_SMS)
-MainMenu2_img_sms_txt.set_pos(int(0),int(220))
-MainMenu2_img_sms_txt.set_size(240,100)
+MainMenu2_img_sms_txt.set_pos(int(0),int(MAIN_LABEL_Y))
+MainMenu2_img_sms_txt.set_size(LCD_SIZE_W,LCD_SIZE_H-MAIN_LABEL_Y)
 MainMenu2_img_sms_txt.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_sms_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 MainMenu2_img_sms_txt.set_text("短信")
@@ -205,19 +211,19 @@ MainMenu2x+=1
 #微聊
 MainMenu2_wechat = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 label_text = lv.label(MainMenu2_wechat)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_H)
 label_text.set_size(0, 0)
 label_text.set_text("{}".format(MainMenu2_num))
 MainMenu2_img_wechat = lv.img(MainMenu2_wechat)
-MainMenu2_img_wechat.set_size(160,160)
-MainMenu2_img_wechat.set_pos(40,20)
+MainMenu2_img_wechat.set_size(MAIN_ICON_SZIE,MAIN_ICON_SZIE)
+MainMenu2_img_wechat.set_pos(MAIN_ICON_X,MAIN_ICON_Y)
 MainMenu2_img_wechat.set_src("U:/static/IMAGE_ONE_PAGE_WECHAT.png")
 MainMenu2_img_wechat.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_wechat.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 MainMenu2_img_wechat_txt = lv.label(MainMenu2_wechat)
-MainMenu2_img_wechat_txt.set_pos(int(0),int(220))
-MainMenu2_img_wechat_txt.set_size(240,100)
+MainMenu2_img_wechat_txt.set_pos(int(0),int(MAIN_LABEL_Y))
+MainMenu2_img_wechat_txt.set_size(LCD_SIZE_W,LCD_SIZE_H-MAIN_LABEL_Y)
 MainMenu2_img_wechat_txt.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_wechat_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 MainMenu2_img_wechat_txt.set_text("微聊")
@@ -228,19 +234,19 @@ MainMenu2x+=1
 #健康测量
 MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 label_text = lv.label(MainMenu2_heartrate)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_H)
 label_text.set_size(0, 0)
 label_text.set_text("{}".format(MainMenu2_num))
 MainMenu2_img_health = lv.img(MainMenu2_heartrate)
-MainMenu2_img_health.set_size(160,160)
-MainMenu2_img_health.set_pos(40,20)
+MainMenu2_img_health.set_size(MAIN_ICON_SZIE,MAIN_ICON_SZIE)
+MainMenu2_img_health.set_pos(MAIN_ICON_X,MAIN_ICON_Y)
 MainMenu2_img_health.set_src("U:/static/IMAGE_ONE_PAGE_HEALTH.png")
 MainMenu2_img_health.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_health.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 MainMenu2_img_health_txt = lv.label(MainMenu2_heartrate)
-MainMenu2_img_health_txt.set_pos(int(0),int(220))
-MainMenu2_img_health_txt.set_size(240,100)
+MainMenu2_img_health_txt.set_pos(int(0),int(MAIN_LABEL_Y))
+MainMenu2_img_health_txt.set_size(LCD_SIZE_W,LCD_SIZE_H-MAIN_LABEL_Y)
 MainMenu2_img_health_txt.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_health_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 MainMenu2_img_health_txt.set_text("健康测量")
@@ -273,19 +279,19 @@ MainMenu2x+=1
 #工具箱
 MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 label_text = lv.label(MainMenu2_toolbox)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_H)
 label_text.set_size(0, 0)
 label_text.set_text("{}".format(MainMenu2_num))
 MainMenu2_img_toolbox = lv.img(MainMenu2_toolbox)
-MainMenu2_img_toolbox.set_size(160,160)
-MainMenu2_img_toolbox.set_pos(40,20)
+MainMenu2_img_toolbox.set_size(MAIN_ICON_SZIE,MAIN_ICON_SZIE)
+MainMenu2_img_toolbox.set_pos(MAIN_ICON_X,MAIN_ICON_Y)
 MainMenu2_img_toolbox.set_src("U:/static/IMAGE_ONE_PAGE_TOOLS.png")
 MainMenu2_img_toolbox.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_toolbox.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 MainMenu2_img_toolbox_txt = lv.label(MainMenu2_toolbox)
-MainMenu2_img_toolbox_txt.set_pos(int(0),int(220))
-MainMenu2_img_toolbox_txt.set_size(240,100)
+MainMenu2_img_toolbox_txt.set_pos(int(0),int(MAIN_LABEL_Y))
+MainMenu2_img_toolbox_txt.set_size(LCD_SIZE_W,LCD_SIZE_H-MAIN_LABEL_Y)
 MainMenu2_img_toolbox_txt.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_toolbox_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 MainMenu2_img_toolbox_txt.set_text("工具箱")
@@ -297,19 +303,19 @@ MainMenu2x+=1
 MainMenu2_setting = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 #MainMenu2_setting.set_tile_act(0,0,lv.ANIM.ON)
 label_text = lv.label(MainMenu2_setting)
-label_text.set_pos(0, 240)
+label_text.set_pos(0, LCD_SIZE_H)
 label_text.set_size(0, 0)
 label_text.set_text("{}".format(MainMenu2_num))
 MainMenu2_img_setting = lv.img(MainMenu2_setting)
-MainMenu2_img_setting.set_size(160,160)
-MainMenu2_img_setting.set_pos(40,20)
+MainMenu2_img_setting.set_size(MAIN_ICON_SZIE,MAIN_ICON_SZIE)
+MainMenu2_img_setting.set_pos(MAIN_ICON_X,MAIN_ICON_Y)
 MainMenu2_img_setting.set_src("U:/static/IMAGE_ONE_PAGE_SETTINGS.png")
 MainMenu2_img_setting.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_setting.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 MainMenu2_img_setting_txt = lv.label(MainMenu2_setting)
-MainMenu2_img_setting_txt.set_pos(int(0),int(220))
-MainMenu2_img_setting_txt.set_size(240,100)
+MainMenu2_img_setting_txt.set_pos(int(0),int(MAIN_LABEL_Y))
+MainMenu2_img_setting_txt.set_size(LCD_SIZE_W,LCD_SIZE_H-MAIN_LABEL_Y)
 MainMenu2_img_setting_txt.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_setting_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 MainMenu2_img_setting_txt.set_text("设置")

diff --git a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CALL.png b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CALL.png
index 3ddd503..e54e54f 100644 (file)
Binary files a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CALL.png and b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CALL.png differ

diff --git a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CONTACTS.png b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CONTACTS.png
index 8af90be..ae4fef8 100644 (file)
Binary files a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CONTACTS.png and b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_CONTACTS.png differ

diff --git a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_HEALTH.png b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_HEALTH.png
index 2312686..f08f17b 100644 (file)
Binary files a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_HEALTH.png and b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_HEALTH.png differ

diff --git a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SETTINGS.png b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SETTINGS.png
index 0d6a188..7554fb6 100644 (file)
Binary files a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SETTINGS.png and b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SETTINGS.png differ

diff --git a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SMS.png b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SMS.png
index 1b0fe10..b0ba18b 100644 (file)
Binary files a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SMS.png and b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_SMS.png differ

diff --git a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_TOOLS.png b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_TOOLS.png
index 457394a..ec8fe18 100644 (file)
Binary files a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_TOOLS.png and b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_TOOLS.png differ

diff --git a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_WECHAT.png b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_WECHAT.png
index 9b9a37f..5a749d6 100644 (file)
Binary files a/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_WECHAT.png and b/2.sdk/project/C06S/usr/static/IMAGE_ONE_PAGE_WECHAT.png differ

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index d7825f8..87c4c2e 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@ -842,15 +842,15 @@ class intervManager(Abstract):
         get_spo2_state = EventMesh.publish("get_spo2_state")
         get_temp_state = EventMesh.publish("get_temp_state")
         if get_hr_state != None or get_spo2_state != None or get_temp_state != None:
-            if get_hr_state != 0:
+            if get_hr_state == 1:
                 EventMesh.publish("set_hr_state",0)#2代表后台进入测试，定时测心率 1ui界面测试洗心率 
                 print("sstop hr")
                 EventMesh.publish(constants.EVENT.STOP_HEART) 
-            elif get_spo2_state != 0:
+            elif get_spo2_state == 1:
                 print("stop spo2")
                 EventMesh.publish("set_spo2_state",0)#2代表后台进入测试
                 EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)
-            if get_temp_state != 0:
+            if get_temp_state == 1:
                 print("stop temp")
                 EventMesh.publish("set_temp_state",0)
                 EventMesh.publish(constants.EVENT.STOP_TEMP)#手动体温测试

diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
index 264d0a8..cec448a 100644 (file)
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -14,7 +14,7 @@ import osTimer
 import constants
 import sms
 from common import Lock, Abstract, LogAdapter
-from location import GPS, GPSMatch,CellLocator
+# from location import GPS, GPSMatch,CellLocator
 from misc import USB, Power, ADC
 from machine import ExtInt, Pin,Timer,RTC,UART
 import EventMesh
@@ -1790,7 +1790,7 @@ class LocationManager(Abstract):
 
     def __init__(self):
         self.gps = None
-        self.match = GPSMatch()
+        # self.match = GPSMatch()
         self.timer_read_GPS_info = osTimer()
         self.wifi_data = []
         self.gps_data  = {}

diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
index 03e7b03..2153338 100644 (file)
--- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
+++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
@@ -91,7 +91,7 @@ MainMenu2_til.set_scrollbar_mode(0)
 MainMenu2_til.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 #工具箱
-MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0,   lv.DIR.ALL)
 label_text = lv.label(MainMenu2_toolbox)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -114,7 +114,7 @@ MainMenu2_num+=1
 MainMenu2x+=1
 
 #加好友，暂时没有
-MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0,   lv.DIR.ALL)
 label_text = lv.label(MainMenu2_toolbox)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -137,7 +137,7 @@ MainMenu2_num+=1
 MainMenu2x+=1
 
 #微聊
-MainMenu2_wechat = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_wechat = MainMenu2_til.add_tile(MainMenu2x, 0,   lv.DIR.ALL)
 label_text = lv.label(MainMenu2_wechat)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -160,7 +160,7 @@ MainMenu2_num+=1
 MainMenu2x+=1
 
 #视频通话
-MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0,   lv.DIR.ALL)
 label_text = lv.label(MainMenu2_heartrate)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -183,7 +183,7 @@ MainMenu2_num+=1
 MainMenu2x+=1
 
 #表盘
-MainMenu2_Watchface = MainMenu2_til.add_tile(MainMenu2_num,0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_Watchface = MainMenu2_til.add_tile(MainMenu2_num,0,   lv.DIR.ALL)
 label_text = lv.label(MainMenu2_Watchface)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -194,7 +194,7 @@ MainMenu2x+=1
 
 
 #通讯录
-MainMenu2_contacts = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_contacts = MainMenu2_til.add_tile(MainMenu2x, 0,   lv.DIR.ALL)
 label_text = lv.label(MainMenu2_contacts)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -218,7 +218,7 @@ MainMenu2x+=1
 
 
 #拨号盘
-MainMenu2_phone = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_phone = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.ALL)
 label_text = lv.label(MainMenu2_phone)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -241,7 +241,7 @@ MainMenu2_num+=1
 MainMenu2x+=1
 
 #相机
-MainMenu2_camera = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_camera = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.ALL)
 label_text = lv.label(MainMenu2_camera)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -265,7 +265,7 @@ MainMenu2x+=1
 
 
 #相册
-MainMenu2_camera_album = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_camera_album = MainMenu2_til.add_tile(MainMenu2x, 0,   lv.DIR.ALL)
 label_text = lv.label(MainMenu2_camera_album)
 label_text.set_pos(0, 0)
 label_text.set_size(0, 0)
@@ -290,7 +290,7 @@ MainMenu2x+=1
 
 
 #设置
-MainMenu2_setting = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+MainMenu2_setting = MainMenu2_til.add_tile(MainMenu2x, 0,  lv.DIR.ALL)
 #MainMenu2_setting.set_tile_act(0,0,lv.ANIM.ON)
 label_text = lv.label(MainMenu2_setting)
 label_text.set_pos(0, 0)