D10:
authordxy15521469561 <1731678236@qq.com>
Fri, 24 Nov 2023 03:29:48 +0000 (11:29 +0800)
committerdxy15521469561 <1731678236@qq.com>
Fri, 24 Nov 2023 03:29:48 +0000 (11:29 +0800)
优化音频文件
K01 C06S K5工厂模式加计步测试

32 files changed:
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/callbackdeal.c
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/alarm.py
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/appFactoryMode.py
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py
2.sdk/project/D10/audio.bin
2.sdk/project/D10/audio/R_READ_TIME_0.mp3
2.sdk/project/D10/audio/R_READ_TIME_1.mp3
2.sdk/project/D10/audio/R_READ_TIME_2.mp3
2.sdk/project/D10/audio/R_READ_TIME_3.mp3
2.sdk/project/D10/audio/R_READ_TIME_4.mp3
2.sdk/project/D10/audio/R_READ_TIME_5.mp3
2.sdk/project/D10/audio/R_READ_TIME_6.mp3
2.sdk/project/D10/audio/R_READ_TIME_7.mp3
2.sdk/project/D10/audio/R_READ_TIME_8.mp3
2.sdk/project/D10/audio/R_READ_TIME_9.mp3
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/D10/usr/static/audio.bin
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/appFactoryMode.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appFactoryMode.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py

index f6888ca..0f96a8b 100644 (file)
 #include "callbackdeal.h"
 #if MICROPY_ENABLE_CALLBACK_DEAL
 
+#define QPY_CALLBACKDEAL_LOG_ENABLE
+
+#ifdef QPY_CALLBACKDEAL_LOG_ENABLE
+#if defined(PLAT_ASR) || defined(PLAT_ASR_1606) || defined(PLAT_ASR_1609) || defined(PLAT_ASR_1803s) || defined(PLAT_ASR_1602)
+extern void ql_log_mask_set(unsigned long long module_mask, unsigned int port_mask);
+extern void _ql_app_log(const char* fmt, ...);
+static char usb_trace_init_flag = 0;
+#define qpy_callbackdeal_trace(fmt, ...) do{                                                                            \
+                                                if(!usb_trace_init_flag)                                                \
+                                                {                                                                       \
+                                                    ql_log_mask_set(0x20, 0x02);                                        \
+                                                    usb_trace_init_flag = 1;                                            \
+                                                }                                                                       \
+                                                _ql_app_log("[%s][%s, L%d]"fmt"", "cbdl", __FUNCTION__, __LINE__, ##__VA_ARGS__);   \
+                                           }while(0)
+
+#elif defined(PLAT_Unisoc) || defined(PLAT_Unisoc_8850)
+#include "helios_debug.h"
+#define qpy_callbackdeal_trace(fmt, ...) Helios_Debug_Output("[%s][%s, L%d]"fmt"", "cbdl", __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#else
+#error "The platform not support usb trace!!!"
+#endif
+#else
+#define qpy_callbackdeal_trace(fmt, ...)
+#endif
+
+
+
 #define QPY_CALLBACK_DEAL_MSG_MAX_NUM (2 * MICROPY_SCHEDULER_DEPTH)
 #if defined(PLAT_ECR6600)
 #define QPY_CALLBACK_DEAL_THREAD_STACK_SIZE (4 *1024)
@@ -113,6 +141,7 @@ int qpy_send_msg_to_callback_deal_thread(uint8_t id, void *msg)
         st_CallBack_Deal cb_msg = {0};
         cb_msg.callback_type_id = id;
         cb_msg.msg = msg;
+        qpy_callbackdeal_trace("callback_type_id:%d", id);
         ret = Helios_MsgQ_Put(qpy_callback_deal_queue, (void*)(&cb_msg), sizeof(st_CallBack_Deal), HELIOS_NO_WAIT);
     }
        return ret;
@@ -133,6 +162,7 @@ st_CallBack_LoadBoundMeth * qpy_callback_para_node_add(c_callback_t *callback, m
     loadboundmet_msg->callback = callback;
     loadboundmet_msg->arg = arg;
     MP_STATE_PORT(loadmeth_para) = (void *)loadboundmet_msg;
+    qpy_callbackdeal_trace("loadmeth_para:0x%x", MP_STATE_PORT(loadmeth_para));
 #if defined(PLAT_ASR) || defined(PLAT_ASR_1606) || defined(PLAT_ASR_1803s)
     Helios_Critical_Exit(rc);
 #endif
@@ -146,15 +176,18 @@ void qpy_callback_para_node_delete(st_CallBack_LoadBoundMeth *cb_msg)
 #if defined(PLAT_ASR) || defined(PLAT_ASR_1606) || defined(PLAT_ASR_1803s)
     int rc = Helios_Critical_Enter();
 #endif
+    qpy_callbackdeal_trace("loadmeth_para:0x%x", MP_STATE_PORT(loadmeth_para));
     st_CallBack_LoadBoundMeth *loadmeth_para_head = (st_CallBack_LoadBoundMeth *)MP_STATE_PORT(loadmeth_para);
     st_CallBack_LoadBoundMeth *loadmeth_para_tmp = loadmeth_para_head;
     for(;loadmeth_para_head != NULL; loadmeth_para_head = loadmeth_para_head->next)
     {
         if(loadmeth_para_head == cb_msg)
         {
+            qpy_callbackdeal_trace("cb_msg:0x%x", cb_msg);
             if(loadmeth_para_head == (st_CallBack_LoadBoundMeth *)MP_STATE_PORT(loadmeth_para))
             {
                 MP_STATE_PORT(loadmeth_para) = loadmeth_para_head->next;
+                qpy_callbackdeal_trace("loadmeth_para:0x%x", MP_STATE_PORT(loadmeth_para));
             }
             else
             {
@@ -254,7 +287,9 @@ void qpy_callback_deal_thread(void * args_in)
         {
             MP_THREAD_GIL_EXIT();
             //Wait for an underlying callback to process the message
+            qpy_callbackdeal_trace("wait msg");
                int ret = Helios_MsgQ_Get(qpy_callback_deal_queue, (void*)&msg, sizeof(msg), HELIOS_WAIT_FOREVER);
+               qpy_callbackdeal_trace("get msg");
                MP_THREAD_GIL_ENTER();
             if(ret != 0)
                {
@@ -262,6 +297,7 @@ void qpy_callback_deal_thread(void * args_in)
                        continue;
                }
                //Each is processed according to the callback ID
+               qpy_callbackdeal_trace("callback_type_id:%d", msg.callback_type_id);
             switch(msg.callback_type_id)
             {
                 case CALLBACK_TYPE_ID_EXTINT:
@@ -463,10 +499,11 @@ void qpy_callback_deal_thread(void * args_in)
                            case CALLBACK_TYPE_ID_LOAD_BOUNDMETH:
                            {
                                st_CallBack_LoadBoundMeth *cb_msg = (st_CallBack_LoadBoundMeth *)msg.msg;
-
+                    qpy_callbackdeal_trace("cb_msg:0x%x", cb_msg);
                     qpy_callback_para_node_delete(cb_msg);
                                
                                mp_obj_t cb = mp_load_attr(cb_msg->callback->method_self, cb_msg->callback->method_name);
+                               qpy_callbackdeal_trace("cb:0x%x", cb);
                     mp_call_function_1_protected(cb, cb_msg->arg);
                                break;
                            }
index 1c56b92..4ab88a5 100644 (file)
@@ -809,7 +809,8 @@ class PopupAlarmScreen(Screen):
         self.timer = osTimer()
         self.aud = audio.Audio(0)
         self.alarm_count = 0
-
+        self.meta_type = "popup"
+        
     def initialization(self):
         self.alarm_count = 0
         self.timer.start(1000,1,self.exit_alarm_page)
index 26bb4f7..43d9405 100644 (file)
@@ -96,6 +96,18 @@ factorymode_hsensor_test_label.set_style_text_color(lv.color_make(0xff, 0xff, 0x
 factorymode_hsensor_test_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 factorymode_hsensor_test.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+factorymode_cont_y+=60
+factorymode_step = lv.btn(factorymode_cont)
+factorymode_step.set_pos(0, factorymode_cont_y)
+factorymode_step.set_size(240, 60)
+factorymode_step_label = lv.label(factorymode_step)
+factorymode_step_label.set_text("计步测试")
+factorymode_step.set_style_pad_all(0, lv.STATE.DEFAULT)
+factorymode_step_label.align(lv.ALIGN.LEFT_MID, 70, 0)
+factorymode_step_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
+factorymode_step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+factorymode_step.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 factorymode_cont_y+=60
 factorymode_log = lv.btn(factorymode_cont)
 factorymode_log.set_pos(0, factorymode_cont_y)
@@ -132,12 +144,15 @@ class FactoryModeScreen(Screen):
         factorymode_bat_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeBatTest")), lv.EVENT.SHORT_CLICKED, None)
         factorymode_hsensor_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeHsensorTest")), lv.EVENT.SHORT_CLICKED, None)
         factorymode_log.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e,  "FactoryModeLog")), lv.EVENT.SHORT_CLICKED, None)
+        factorymode_step.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e,  "FactoryModestep")), lv.EVENT.SHORT_CLICKED, None)
 
         factorymode_location.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeLocation")), lv.EVENT.PRESSING, None)
         #factorymode_alipay_init.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeAlipayInit"})), lv.EVENT.CLICKED, None)
         factorymode_bat_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeBatTest")), lv.EVENT.PRESSING, None)
         factorymode_hsensor_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeHsensorTest")), lv.EVENT.PRESSING, None)
         factorymode_log.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModeLog")), lv.EVENT.PRESSING, None)
+
+        factorymode_step.add_event_cb(lambda e: EventMesh.callback_wrapper(self.location_mode(e, "FactoryModestep")), lv.EVENT.PRESSING, None)
     
     def initialization(self):
         self.is_sliding = 0
@@ -284,6 +299,72 @@ class FactoryModeLogScreen(Screen):
 
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
+#显示x y z 三轴数据
+FactoryModestep_screen = lv.obj()
+FactoryModestep_screen.center()
+FactoryModestep_screen.set_size(240, 284)
+FactoryModestep_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
+FactoryMode_step_label = lv.label(FactoryModestep_screen)
+FactoryMode_step_label.set_text(" ")
+FactoryMode_step_label.set_pos(0, 40)
+FactoryMode_step_label.set_size(240, 40)
+FactoryMode_step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+FactoryMode_step_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+
+
+FactoryMode_xyz_label = lv.label(FactoryModestep_screen)
+FactoryMode_xyz_label.set_text(" ")
+FactoryMode_xyz_label.set_pos(0, 100)
+FactoryMode_xyz_label.set_size(240, 100)
+FactoryMode_xyz_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+FactoryMode_xyz_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#FactoryModeLogNext_label.set_style_bg_color(lv.color_make(0x00, 0xff, 0x2a), lv.PART.MAIN | lv.STATE.DEFAULT)
+
+class FactoryModestepScreen(Screen):
+    NAME = "FactoryModestep"
+    def __init__(self):
+        super().__init__()
+        self.meta = FactoryModestep_screen
+        self.Log_timer_count = 0
+        self.Log_timer = osTimer()
+        
+    def initialization(self):
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        FactoryMode_step_label.set_text("步数{}".format(step[0]))
+        FactoryMode_xyz_label.set_text("X:{}\nY:{}\nZ:{}".format(step[1],step[2],step[3]))
+        self.Log_timer.start(1*1000,1,self.step_cb)
+        
+    def post_processor_after_initialization(self):
+
+        pass
+
+    def step_cb(self,*argc):
+        EventMesh.publish("system_sleep_rest")#防止黑屏
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        print("FactoryModestepScreen",step)
+        FactoryMode_step_label.set_text("步数{}".format(step[0]))
+        FactoryMode_xyz_label.set_text("X:{}\nY:{}\nZ:{}".format(step[1],step[2],step[3]))
+        pass
+
+    
+
+    def Close(self):
+        self.Log_timer.stop()
+        self.log_data = ""
+        pass
+
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "factorymode"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "factorymode"})
+        
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+
 
 #hsensor测试
 FactoryModeHsensorTest_screen = lv.obj()
index c893c3c..3ee086a 100644 (file)
@@ -65,7 +65,7 @@ def main_init():
     from ui_main_menu import MainMenuScreen
     # from ui_WatchFaceScreen import WatchFaceScreen
     
-    from appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen,FactoryModeHsensorTestScreen,FactoryModeLogScreen
+    from appFactoryMode import  FactoryModestepScreen,FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen,FactoryModeHsensorTestScreen,FactoryModeLogScreen
     from mgr import setCallStateManager,setclassTimeManager,setSmsIndexManager,ConfigStoreManager,testSmsSetIPManager,playPowerAudioManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\
     AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager
 
@@ -139,6 +139,7 @@ def main_init():
         ui.add_screen(_ui_setting.PowerOnScreen())
         ui.add_screen(_ui.DialingScreen()) 
         ui.add_screen(_ui.CallLogScreen()) 
+
     except Exception as e:
         usys.print_exception(e)
     # try:
@@ -169,6 +170,7 @@ def main_init():
     try:
         ui.add_screen(FactoryModeLocationScreen())
         ui.add_screen(FactoryModeScreen())
+        ui.add_screen(FactoryModestepScreen())
         
         ui.add_screen(FactoryModeBatTestScreen())
         ui.add_screen(FactoryModeHsensorTestScreen())
index 9dcc9e8..e6bd4bb 100644 (file)
@@ -266,16 +266,16 @@ class CountdownManager(Abstract):
 BATTERY_OCV_TABLE = {
     "nix_coy_mnzo2": {
         55: {
-            4270: 100, 4237: 95, 4179: 90, 4123: 85, 4070: 80, 4020: 75, 3963: 70, 3919: 65, 3882: 60, 3847: 55,
-            3818: 50, 3794: 45, 3772: 40, 3752: 35, 3733: 30, 3716: 25, 3699: 20, 3677: 15, 3652: 10, 3629: 5, 3355: 0,
+            4136: 100, 4058: 95, 4011: 90, 3971: 85, 3916: 80, 3874: 75, 3842: 70, 3811: 65, 3782: 60, 3756: 55,
+            3735: 50, 3715: 45, 3697: 40, 3682: 35, 3669: 30, 3654: 25, 3637: 20, 3616: 15, 3592: 10, 3551: 5, 3395: 0,
         },
         20: {
-            4270: 100, 4237: 95, 4179: 90, 4123: 85, 4070: 80, 4020: 75, 3963: 70, 3919: 65, 3882: 60, 3847: 55,
-            3818: 50, 3794: 45, 3772: 40, 3752: 35, 3733: 30, 3716: 25, 3699: 20, 3677: 15, 3652: 10, 3629: 5, 3355: 0,
+            4136: 100, 4058: 95, 4011: 90, 3971: 85, 3916: 80, 3874: 75, 3842: 70, 3811: 65, 3782: 60, 3756: 55,
+            3735: 50, 3715: 45, 3697: 40, 3682: 35, 3669: 30, 3654: 25, 3637: 20, 3616: 15, 3592: 10, 3551: 5, 3395: 0,
         },
         0: {
-            4270: 100, 4237: 95, 4179: 90, 4123: 85, 4070: 80, 4020: 75, 3963: 70, 3919: 65, 3882: 60, 3847: 55,
-            3818: 50, 3794: 45, 3772: 40, 3752: 35, 3733: 30, 3716: 25, 3699: 20, 3677: 15, 3652: 10, 3629: 5, 3355: 0,
+            4136: 100, 4058: 95, 4011: 90, 3971: 85, 3916: 80, 3874: 75, 3842: 70, 3811: 65, 3782: 60, 3756: 55,
+            3735: 50, 3715: 45, 3697: 40, 3682: 35, 3669: 30, 3654: 25, 3637: 20, 3616: 15, 3592: 10, 3551: 5, 3395: 0,
         },
     },
 }
@@ -2759,7 +2759,7 @@ class getTempTimeManager(Abstract):
 
     def set_temp_time(self, event, msg): 
         self.set_time = msg
-        EventMesh.publish("set_storage_config",["set_temp_time",self.set_time])
+        EventMesh.publish("set_storage_config",["temp_time",self.set_time])
 
     def get_temp_time(self, event, msg): 
         if self.set_time:
@@ -2866,6 +2866,8 @@ class getStorageDataManager(Abstract):#获取内存数据
             self.config_data[msg[0]]=msg[1]
             # print("set_storage_key_data2:{}".format(self.config_data[msg[0]]))
             EventMesh.publish("publish_message_event_ui",{"func":self.set_storage_save,"data":0})
+        
+
     def set_storage_save(self, data): 
             with open("/ext/static/storage_file/config.json",'w+',encoding="utf-8") as fd:
                 ujson.dump(self.config_data,fd)
index b02aa48..ec3a2bc 100644 (file)
@@ -936,7 +936,6 @@ class CallLogScreen(Screen):
         h = 0
         if call_log_screen != None:
             if self.check_json == True and len(self.read_call_log) != 0:
-                
                 none_call_log_title.set_text(" ")
                 sort_tmp = self.read_call_log.values()
                 sort_new = sorted(sort_tmp, key = lambda i: i['timesec'],reverse = True)#按照时间戳进行排序 去掉最旧的一次数据如果满了五十条
@@ -944,11 +943,13 @@ class CallLogScreen(Screen):
                 self.call_log_detail_list.clear_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本
                 
                 for sort_new_tmp in sort_new: #字典 key value
+               
                     num_count = sort_new_tmp["count"]#获取通话次数
                     num_name = sort_new_tmp["name"]#获取名称
                     num_phonnum = sort_new_tmp["number"]#获取电话号码
                     num_time = sort_new_tmp["time"]#获取电话号码
 
+
                     # 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(LCD_SIZE_W-10,CALL_LOG_LIST_SIZE)
@@ -1015,61 +1016,57 @@ class CallLogScreen(Screen):
 
         elif  code == lv.EVENT.SHORT_CLICKED:
             global call_log_screen,contacts_cont_list ,call_log_title ,none_call_log_title 
-            if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件
-                self.is_sliding = 0
                 # print("e.get_text():{} {}".format(e.get_target().get_child(0).get_text(),e.get_target().get_child(3).get_text()))
-                phonnum = str(e.get_target().get_child(0).get_text())
-                phnoname = e.get_target().get_child(3).get_text()
-                # print("phonnum :{} _msg:{}".format(phonnum,phnoname))
-                
+            phonnum = str(e.get_target().get_child(0).get_text())
+            phnoname = e.get_target().get_child(3).get_text()
+            # print("phonnum :{} _msg:{}".format(phonnum,phnoname))
             
-                self.name = None
-                self.phonebook = {}
-
-                self.call_log = {}
-                self.call_log_value = {}
-                self.read_call_log = {}
-                self.number_tmp = {}
-
-                data = EventMesh.publish("get_phonebook_list")
-                if data != None:
-                    check = data[0]
-                    self.phonebook = data[1]
-                    # print("check :{}".format(check))
-                    if check == 1:#检查通讯录
-                        phonebook_keys = sorted(self.phonebook.keys())
-                        b = str(phonnum) in self.phonebook.values()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面
-                        j = 0
-                        if b == True:
-                            for i in range(len(self.phonebook)): #字典 key value
-                                #'001:':15521469561
-                                name = self.phonebook[phonebook_keys[j]]
-                                name_value = phonebook_keys[j]
-                                number_tmp = str(phonnum)
-                                # print("name :{} number_tmp:{}".format(name,number_tmp))
-                                if name.find(number_tmp) != -1:#查找电话号码是否在通讯录里面
-                                    number_f= name_value
-                                    name_s = number_f.split(':')
-                                    name_s = name_s[1]
-                                    self.name = name_s
-                                    break
-                                j+=1
-                        else:
-                            self.name = phnoname
+        
+            self.name = None
+            self.phonebook = {}
+
+            self.call_log = {}
+            self.call_log_value = {}
+            self.read_call_log = {}
+            self.number_tmp = {}
+
+            data = EventMesh.publish("get_phonebook_list")
+            if data != None:
+                check = data[0]
+                self.phonebook = data[1]
+                # print("check :{}".format(check))
+                if check == 1:#检查通讯录
+                    phonebook_keys = sorted(self.phonebook.keys())
+                    b = str(phonnum) in self.phonebook.values()#查找key中是否包含content电话号码 True 包含在里面 False不包含在里面
+                    j = 0
+                    if b == True:
+                        for i in range(len(self.phonebook)): #字典 key value
+                            #'001:':15521469561
+                            name = self.phonebook[phonebook_keys[j]]
+                            name_value = phonebook_keys[j]
+                            number_tmp = str(phonnum)
+                            # print("name :{} number_tmp:{}".format(name,number_tmp))
+                            if name.find(number_tmp) != -1:#查找电话号码是否在通讯录里面
+                                number_f= name_value
+                                name_s = number_f.split(':')
+                                name_s = name_s[1]
+                                self.name = name_s
+                                break
+                            j+=1
                     else:
                         self.name = phnoname
-
-                if self.name == None:
-                    self.name = phnoname
-                if len(phonnum) > 0:
-                    EventMesh.publish("save_phonename",self.name)#
-                    EventMesh.publish("save_phonenum",phonnum)#保存电话号码用于界面显示获取
-                    #voiceCall.callStart(str(phonnum))
-                    EventMesh.publish("load_screen", {"screen": "dialing_noplay_popup"})
                 else:
-                    EventMesh.publish("load_screen", {"screen": "no_valied_num_screen"})#无效的号码 请重新输入
+                    self.name = phnoname
 
-            self.is_sliding = 0
+            if self.name == None:
+                self.name = phnoname
+            if len(phonnum) > 0:
+                EventMesh.publish("save_phonename",self.name)#
+                EventMesh.publish("save_phonenum",phonnum)#保存电话号码用于界面显示获取
+                #voiceCall.callStart(str(phonnum))
+                EventMesh.publish("load_screen", {"screen": "dialing_noplay_popup"})
+            else:
+                EventMesh.publish("load_screen", {"screen": "no_valied_num_screen"})#无效的号码 请重新输入
 
     def done_DOWN(self):#下滑
         if self.call_log_detail_list != None:
@@ -1095,8 +1092,8 @@ class CallLogScreen(Screen):
     def btn1_release(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
-    def done_left_to_right(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    # def done_left_to_right(self):
+    #     EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
@@ -1122,6 +1119,8 @@ class DialingScreen(Screen):
         self.number_tmp = {}
         self.is_sliding =0
         self.CALL_LOG_MAX = CALL_LOG_MAX
+        self.meta_type = "popup"
+
     def initialization(self):
         self.is_sliding =0
         EventMesh.publish("set_UI_high_priority", 1)
@@ -2546,6 +2545,7 @@ class PopupScreen(Screen):
         dir = lv.indev_t.get_gesture_dir(indev)
         if code == lv.EVENT.GESTURE:
             if dir == lv.DIR.RIGHT:
+                EventMesh.publish("watch_top_show")
                 EventMesh.publish("load_screen", {"screen": "main_menu"})
 
         elif  code == lv.EVENT.SHORT_CLICKED:
@@ -2579,6 +2579,7 @@ class PopupScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     # def done_left_to_right(self):
+        # EventMesh.subscribe("watch_top_show", self.watch_top_show)
     #     EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
@@ -3237,6 +3238,7 @@ class IncomingCallScreen(Screen):
         self.call_log_value = {}
         self.read_call_log = {}
         self.number_tmp = {}
+        self.meta_type = "popup"
         
     def initialization(self):
         self.is_sliding =0
@@ -3523,6 +3525,8 @@ class OnCallScreen(Screen):
         self.button = 0
         self.mute_btn = 0
         self.is_sliding = 0
+        self.meta_type = "popup"
+
 
     def initialization(self):
         self.is_sliding = 0
@@ -4590,8 +4594,8 @@ class ContactsScreen(Screen):
     def btn1_release(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
-    def done_left_to_right(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    # def done_left_to_right(self):
+    #     EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
         EventMesh.publish("watch_top_show")
@@ -5980,6 +5984,7 @@ class CountdownEndScreen(Screen):
     def __init__(self):
         super().__init__()
         self.meta = None
+        self.meta_type = "popup"
         self.FIND_timer=osTimer()
         self.aud = audio.Audio(0)
         self.FIND_timer_count = 0
@@ -6366,6 +6371,7 @@ class UIFINDScreen(Screen):
         self.FIND_timer_count = 0
 
         self.meta = None
+        self.meta_type = "popup"
 
     def initialization(self):
         global FIND_screen ,watchface_mpsignal_img 
@@ -6444,6 +6450,7 @@ class LowPowerScreen(Screen):
     def __init__(self):
         super().__init__()
         self.meta = None
+        self.meta_type = "popup"
 
     def initialization(self):
         global Lowpower_screen ,Lowpower_screen_img  
@@ -6494,6 +6501,7 @@ class LowOnePowerScreen(Screen): #0%的电池电量
         super().__init__()
         self.meta = None
         self.timer = osTimer()
+        self.meta_type = "popup"
 
     def initialization(self):
         global LowOnePower_screen ,LowOnePower_screen_img ,LowOnePower_screen_label2,LowOnePower_screen_label1
@@ -6578,6 +6586,7 @@ class sosScreen(Screen):
         self.meta_type = "popup"
         self.count = 0
         self.is_sliding =0
+        self.meta_type = "popup"
 
     def initialization(self):
         global sos_screen ,sos_screen_label  
@@ -7314,7 +7323,9 @@ class UI(object):
         if screen_NAME == "system_init":
             return
         self.system_sleep_timeout_rest()
-        #print("ui press {}".format(event))
+        # print("ui press {} self.screen_old:{}".format(self.screen_prev,self.screen_old))
+        # print("ui_press_do")
+
         if self.system_ui_state == 0:
             if event == "done_left_to_right":
                 self.screen.done_left_to_right()
@@ -7478,6 +7489,7 @@ class UI(object):
             self.__lcd_off()
     
     def system_ui_flag(self, *args):
+        # print("system_ui_flag")
         self.system_ui_state = 0
             
 
@@ -7552,7 +7564,7 @@ class UI(object):
                     self.lv.img.cache_set_size(16) #开img cache
                     if self.screen_old.meta_type != "popup": #不是弹窗,保存上一个界面,用来返回
                         self.screen_prev = self.screen_old #
-                self.screen_old = self.screen
+                
                 if msg.get("meta"):
                     self.screen.meta_info = msg.get("meta")
                 print("load_screen:post_processor_before_initialization")
@@ -7568,8 +7580,10 @@ class UI(object):
                 self.__lcd_on()
                 mem = gc.mem_free()
                 print('2剩余内存RAM:{} KB'.format(mem / 1024))
+                self.screen_old = self.screen
                 self.system_ui_state = 1
-                self.system_ui_timer.start(100, 0, self.system_ui_flag)
+                self.system_ui_timer.stop()
+                self.system_ui_timer.start(200, 0, self.system_ui_flag)
                 
 
 
index 6dbc5fb..797df5f 100644 (file)
@@ -621,7 +621,7 @@ class WatchFace():
         self.watchface_style.meta.clear_flag(lv.obj.FLAG.HIDDEN)#显示
 
     def initialization(self):
-        
+        self.watchface_style.timerout_update()
         print("watchface INIT !!!!!!!!:",self.watchface_style_num)
         
         self.timer_update.start(10000, 1, self.timerout_update)
index c2623c2..72bd2bb 100644 (file)
@@ -1010,6 +1010,7 @@ class RestoreScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
+
 class UpdateScreen(Screen):
     NAME = "update"
 
@@ -1182,6 +1183,7 @@ class PowerOnScreen(Screen):
     def __init__(self):
         super().__init__()
         self.meta = poweron_screen
+        self.meta_type = "popup"
         self.timer = osTimer()
         self.aud = audio.Audio(0)
         self.aud.set_pa(Pin.GPIO29)
@@ -1489,7 +1491,8 @@ class ThemeswitchScreen(Screen):
                 menustyle_select.set_pos(int(190),int(80))
                 # menustyle_img1.set_src("E:/static/theme_four2.png")
                 # menustyle_img2.set_src("E:/static/theme_single1.png")
-                EventMesh.publish("set_mainmenu",[1])    
+                EventMesh.publish("set_mainmenu",msg = ["1",0])   
+                # self.set_mainmenu(msg = [read_data,0]) 
                 EventMesh.publish("load_screen", {"screen": "main_menu"})
                 
             self.is_sliding1 =0
@@ -1509,7 +1512,7 @@ class ThemeswitchScreen(Screen):
                 menustyle_select.set_pos(int(190),int(165))
                 # menustyle_img1.set_src("E:/static/theme_four1.png")
                 # menustyle_img2.set_src("E:/static/theme_single2.png")
-                EventMesh.publish("set_mainmenu",[2])   
+                EventMesh.publish("set_mainmenu",msg = ["2",0])   
                 EventMesh.publish("load_screen", {"screen": "main_menu"})
                 
             self.is_sliding2 = 0
index 5682f9b..5448f4c 100644 (file)
Binary files a/2.sdk/project/D10/audio.bin and b/2.sdk/project/D10/audio.bin differ
index dd4d91d..02f4ee2 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_0.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_0.mp3 differ
index 79bc5a2..1e7edb7 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_1.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_1.mp3 differ
index 7e61092..619e46e 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_2.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_2.mp3 differ
index e91e1f3..abb9b00 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_3.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_3.mp3 differ
index 699e9cf..3efe878 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_4.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_4.mp3 differ
index 23e7e1b..2534f87 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_5.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_5.mp3 differ
index 5b6a54b..25ccdd1 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_6.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_6.mp3 differ
index 895d4e3..62c5f13 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_7.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_7.mp3 differ
index 33a6c81..b5cea9a 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_8.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_8.mp3 differ
index 7eaaa07..bcdbd25 100644 (file)
Binary files a/2.sdk/project/D10/audio/R_READ_TIME_9.mp3 and b/2.sdk/project/D10/audio/R_READ_TIME_9.mp3 differ
index 39f9e0e..4eba2ae 100644 (file)
@@ -108,6 +108,7 @@ class intervManager(Abstract):
         self.sos_phone_num = ''
         self.msg_tmp = ""
         self.time_count = 0
+        self.audio_int = 0
         check_txt = ql_fs.path_exists("/usr/static/storage_file/wechat_record.json")
         if check_txt == True :
             with open("/usr/static/storage_file/wechat_record.json","r") as fd:#音频文件编号
@@ -227,17 +228,16 @@ class intervManager(Abstract):
     def play_audio_file_do(self,data):#msg 拼接的路径文件
         open_power = EventMesh.publish("get_power_on_state")#获取开机标识
         power_off = EventMesh.publish("get_power_off_state")#获取开机标识
-        print("play_audio_file",data[0],data[1],open_power,power_off)#路径 str_data[1] 是否需要被打断
+        # print("play_audio_file",data[0],data[1],open_power,power_off)#路径 str_data[1] 是否需要被打断
         if open_power != None:
             if open_power == 0:
                 return
         if power_off != None:
             if power_off == 1:
                 return
-        print("play_audio_file end",data[0],data[1])#路径 str_data[1] 是否需要被打断
         self.aud.montage_play('U:/static/audio.bin',1,data[1],data[0])
-
-    
+        # print("play_audio_file end",data[0],data[1])#路径 str_data[1] 是否需要被打断
+        
 
 
     def interInfo_queue_thread(self):
@@ -295,7 +295,7 @@ class intervManager(Abstract):
 
 
     def close_timer_all(self, event, msg): 
-        print("close_timer_all!!!!!!!!!!!!!!!!!!!")
+        # print("close_timer_all!!!!!!!!!!!!!!!!!!!")
         open_power = EventMesh.publish("get_power_on_state")#获取开机标识
         power_off = EventMesh.publish("get_power_off_state")#获取开机标识
         if open_power != None:
@@ -331,7 +331,7 @@ class intervManager(Abstract):
         EventMesh.publish("close_wechat_btn_timer")#
         self.timer.start(6000, 1, self.publish_call_event_cb)
         str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_CALL_mp3"))
-        EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
+        EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件
         # EventMesh.publish("play_audio_file",str_data)#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
     
     def call_timer_cb(self,data):
@@ -373,10 +373,9 @@ class intervManager(Abstract):
             else:
                 self.time_count = 0
                 self.phone_num = str(msg)
-                
                 self.timer1.start(2000, 0, self.time_out_phone)
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_SOS_ALERT"))
-                EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
+                EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件
     
     def time_out_phone(self, msg):#电话拨出去
         voiceCall.callStart(self.phone_num)
@@ -391,7 +390,7 @@ class intervManager(Abstract):
             if power_off == 1:
                 return
         self.sos_phone_num = ''
-        print("sos_out_call_center_cb",msg)
+        # print("sos_out_call_center_cb",msg)
         if self.call_state == 0:
             EventMesh.publish("close_timer_all")#
             if msg == None:
@@ -403,7 +402,7 @@ class intervManager(Abstract):
                 self.sos_timer1.start(2000, 0, self.sos_call_out_phone)
                 self.timer1_sos.start(30000, 0, self.sos_time_out_phone)
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_SOS_ALERT"))
-                EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
+                EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件
                 
     def sos_time_out_phone(self, msg):#30s超时未打通或者信号不好则重新拨打
         sos_flag = EventMesh.publish("get_sos_flag")
@@ -800,7 +799,7 @@ class intervManager(Abstract):
     
     def power_on_audio_cb(self, msg):
         self.power_on_flag = 1
-        print("power_on_audio_cb")
+        # print("power_on_audio_cb")
         self.aud.play(1,0,'U:/static/R_POWER_OFF_1.mp3')
         # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_POWER_OFF_1"))
         # EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
@@ -813,7 +812,7 @@ class intervManager(Abstract):
         return self.power_on_flag
     
     def power_off_audio_cb(self, msg):
-        print("power_off_audio_cb")
+        # print("power_off_audio_cb")
         self.aud.play(1,0,'U:/static/R_POWER_OFF_1.mp3')
         # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_POWER_OFF_1"))
         # EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
@@ -917,9 +916,9 @@ class intervManager(Abstract):
          
     def play_temp_value(self, event, msg): #播放体温数值
         flag = EventMesh.publish("get_call_state") 
-        if flag != 2:#电话通话中 或者呼叫中挂断中断
-            if msg != None:
-                EventMesh.publish("close_timer_all")#
+        if msg != None:
+            EventMesh.publish("close_timer_all")#
+            if flag == 0:
                 if msg > 0:
                     # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
                     # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
@@ -977,9 +976,9 @@ class intervManager(Abstract):
 
     def play_hr_value(self, event, msg): #播放心率数值
         flag = EventMesh.publish("get_call_state") 
-        if flag != 2:#电话通话中 或者呼叫中挂断中断
-            if msg != None:
-                EventMesh.publish("close_timer_all")#
+        if msg != None:
+            EventMesh.publish("close_timer_all")#
+            if flag == 0:
                 if msg >= 50:
                     # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
                     # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
@@ -989,15 +988,16 @@ class intervManager(Abstract):
                     self.play_hr_fun(0)
                     
                 else:
-                    str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_FAILE"))
+
+                    str_data ='mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_FAILE"))
                     EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
                     EventMesh.publish("set_hr_blood_led",3)#测量异常
 
     def play_spo2_value(self, event, msg): #播放血样数值
         flag = EventMesh.publish("get_call_state") 
-        if flag != 2:#电话通话中 或者呼叫中挂断中断
-            if msg != None:
-                EventMesh.publish("close_timer_all")#
+        if msg != None:
+            EventMesh.publish("close_timer_all")#
+            if flag == 0:
                 if msg >= 85:
                     # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
                     # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
@@ -1012,8 +1012,8 @@ class intervManager(Abstract):
 
     def play_spo2_fun(self,argc):#播放血氧测试值
         flag = EventMesh.publish("get_call_state") 
-        if flag != 2:#电话通话中 或者呼叫中挂断中断
-            EventMesh.publish("close_timer_all")#
+        EventMesh.publish("close_timer_all")#
+        if flag == 0:#电话通话中 或者呼叫中挂断中断
             data = self.spo2_value
             if data > 100:
                 data = 100
@@ -1028,10 +1028,9 @@ class intervManager(Abstract):
 
 
     def play_hr_fun(self,argc):#播放心率测试值
-        
         flag = EventMesh.publish("get_call_state") 
-        if flag != 2:#电话通话中 或者呼叫中挂断中断
-            EventMesh.publish("close_timer_all")#
+        EventMesh.publish("close_timer_all")#
+        if flag == 0:#电话通话中 或者呼叫中挂断中断
             data = self.hr_value
             if data > 220:
                 data = 220
@@ -1170,7 +1169,7 @@ class intervManager(Abstract):
 
     def FIND_timer_cb(self, data):
         if self.find_state == 1:
-            print("self.FIND_timer_count:{}".format(self.FIND_timer_count))
+            # print("self.FIND_timer_count:{}".format(self.FIND_timer_count))
             str_data = 'mp3files={}.mp3'.format(audio_buf.index("audio_find_haixiu"))
             EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
             self.FIND_timer_count += 1
@@ -1211,7 +1210,7 @@ class intervManager(Abstract):
 
     def Alarm_timer_cb(self, data):
         if self.alarm_state == 1:
-            print("self.alarm_timer_count:{}".format(self.alarm_timer_count))
+            # print("self.alarm_timer_count:{}".format(self.alarm_timer_count))
             str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_ALARM_NEW"))
             EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
             self.alarm_timer_count += 1
@@ -1407,9 +1406,9 @@ class intervManager(Abstract):
                 if len(center_dial) > 0:
                     voiceCall.callStart(str(center_dial))
                     str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_SOS_ALERT"))
-                    EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
+                    EventMesh.publish("play_audio_file",[str_data,0])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
             else:#未设置号码
-                print("play_center_phone")
+                # print("play_center_phone")
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_NO_SET_SOS_DIAL"))
                 EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
                 pass
@@ -1441,14 +1440,14 @@ class intervManager(Abstract):
         return [self.MXA_MSG ,self.wechat_recode_list]
     
     def set_wechat_data(self, event, msg): 
-        print("set_wechat_data1 ",msg,self.wechat_num)
+        # print("set_wechat_data1 ",msg,self.wechat_num)
         self.MXA_MSG = msg[0]
         self.wechat_recode_list = msg[1]
         self.wechat_num = self.wechat_recode_list["num"]
         with open("/usr/static/storage_file/wechat_record.json","w",encoding="utf-8") as fd:
             ujson.dump(self.wechat_recode_list,fd)
             #写编号
-        print("set_wechat_data2:{} ".format(self.wechat_num))
+        # print("set_wechat_data2:{} ".format(self.wechat_num))
        
 
     def get_wechat_time(self, event, msg):
@@ -1509,7 +1508,7 @@ class intervManager(Abstract):
 
                 with open("/usr/static/storage_file/wechat_record.json","w+",encoding="utf-8") as fd:
                     ujson.dump(self.wechat_recode_list,fd)
-                print("send wechat data!!!!!!!!!!!!!!!!!!!!!")
+                # print("send wechat data!!!!!!!!!!!!!!!!!!!!!")
 
                 check_txt = ql_fs.path_exists("/usr/static/storage_file/{}.amr".format(self.wechat_show))
                 if check_txt == True :
@@ -1638,16 +1637,6 @@ class intervManager(Abstract):
 
 
 
-
-
-
-
-
-class wechatInforManager(Abstract):#微聊相关信息 
-    pass
-
-        
-
 class BtnDevice(Abstract):
 
     def __init__(self, tp=None):
@@ -1744,7 +1733,7 @@ class BtnDevice(Abstract):
 
     def pwk_extint_cb(self,args):#侧边按键
         self.GPIO26_status = self.extint.read_level()
-        print('### key20_extint_cb  {} self.GPIO26_status :{}'.format(args,self.GPIO26_status)) # args[0]:gpio号 args[1]:上升沿或下降沿
+        # print('### key20_extint_cb  {} self.GPIO26_status :{}'.format(args,self.GPIO26_status)) # args[0]:gpio号 args[1]:上升沿或下降沿
         power_off = EventMesh.publish("get_power_off_state")#获取关机标识
         if power_off != None:
             if power_off == 1:
@@ -1939,8 +1928,15 @@ class BtnDevice(Abstract):
             pass
         elif self.sosKey_press_count == 5:#功能暂时屏蔽
             self.sosKey_press_count = 0
-            EventMesh.publish("stop_led_timer")#设置参数
-            EventMesh.publish("set_manual_measure_mode",3)#测量体温
+            call_state = EventMesh.publish("get_call_state")
+            battery = EventMesh.publish("screen_get_battery")
+            if call_state == None:
+                call_state = 0
+            if call_state == 0: 
+                if battery != None:
+                    if battery[0] != "1":#在充电得时候
+                        EventMesh.publish("stop_led_timer")#设置参数
+                        EventMesh.publish("set_manual_measure_mode",3)#测量体温
             pass
         elif self.sosKey_press_count == 4:#拨打app快捷号码
             self.sosKey_press_count = 0
@@ -1950,8 +1946,16 @@ class BtnDevice(Abstract):
             pass
         elif self.sosKey_press_count == 3:#测试心率
             self.sosKey_press_count = 0
-            EventMesh.publish("stop_led_timer")#设置参数
-            EventMesh.publish("set_manual_measure_mode",1)#
+            
+            call_state = EventMesh.publish("get_call_state")
+            battery = EventMesh.publish("screen_get_battery")
+            if call_state == None:
+                call_state = 0
+            if call_state == 0: 
+                if battery != None:
+                    if battery[0] != "1":#在充电得时候
+                        EventMesh.publish("stop_led_timer")#设置参数
+                        EventMesh.publish("set_manual_measure_mode",1)#
             pass
         elif self.sosKey_press_count == 2:#播报当前步数
             self.sosKey_press_count = 0
index 1c9f4b7..dca8c00 100644 (file)
@@ -207,7 +207,7 @@ class ledEventManager(Abstract):#灯事件
         if msg != None:
             if len(msg) != 0:
                 self.led_total_time = msg[2]#
-                print("open_timer:{}".format(msg))
+                # print("open_timer:{}".format(msg))
                 if self.led_total_time != None:
 
                     if self.led_total_time > 0:
@@ -233,7 +233,7 @@ class ledEventManager(Abstract):#灯事件
         
         open_power = EventMesh.publish("get_power_on_state")#获取开机标识
         power_off = EventMesh.publish("get_power_off_state")#获取开机标识
-        print("set_led_time_arg",msg,open_power,power_off)
+        # print("set_led_time_arg",msg,open_power,power_off)
         if open_power != None:
             if open_power == 0:
                 return
@@ -288,7 +288,7 @@ class ledEventManager(Abstract):#灯事件
                                 self.wechat_btn = 0
                                 if get_hr_state != 0 or get_spo2_state != 0 or temp_state != 0 :#心率血氧优先级高
                                     if self.working_led_mode != led_mode.HEALTH_LED_MODE:#如果不在亮微聊模式需要亮微聊模式
-                                        print("set_hr_blood_led!!!!!!!!!!")
+                                        # print("set_hr_blood_led!!!!!!!!!!")
                                         str_buf = [1,2,10*70*2,led_mode.FLASH_LIGHT_RED_GREEN,10,5,led_mode.HEALTH_LED_MODE]#測量成功
                                         self.timer_state = 0
                                         self.timer.stop()
@@ -296,7 +296,7 @@ class ledEventManager(Abstract):#灯事件
                                         self.working_led_mode = led_mode.HEALTH_LED_MODE
                                         return
                                     else:
-                                        print("set_hr_blood_led stop!!!!!!!!!!")
+                                        # print("set_hr_blood_led stop!!!!!!!!!!")
                                         return
                                 if  get_hr_state == 0 and get_spo2_state == 0 and temp_state == 0:
                                     self.working_led_mode = led_mode.OTHER_MEASURE_MODE
@@ -309,6 +309,21 @@ class ledEventManager(Abstract):#灯事件
     def led_fun_cb(self, data):#
         if self.led_enable == 0 or self.led_total_time == 0:
             return
+        call_state = EventMesh.publish("get_call_state")
+        if call_state == None:
+            call_state = 0
+        if call_state != 0:
+            battery = EventMesh.publish("screen_get_battery")
+            if battery != None:
+                if battery[0] != "1":#在充电得时候
+                    get_hr_state = EventMesh.publish("get_hr_state")
+                    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 == 1 or get_spo2_state == 1 or get_temp_state == 1:
+                            EventMesh.publish("close_hr_sop2")
+                            EventMesh.publish("close_led_pin")
+                            return
         # print("self.long_count",self.long_count)
         if self.led_total_time != 0:
             #红灯闪烁
@@ -495,9 +510,17 @@ class ledEventManager(Abstract):#灯事件
     
     def close_led_pin(self, event, msg):
         print("close_led_pin!!!")
-        if self.timer_state == 1:
-            self.timer_state = 0
-            self.timer.stop()
+
+        self.timer.stop()
+        self.timer_state = 0
+        self.led_total_time = 0
+        self.led_enable = 0
+        self.led_mode = 0
+        self.long_light_mode = 0
+        self.led_open_time = 0
+        self.led_close_time = 0
+        self.working_led_mode = 0
+        self.long_count = 0
         close_led_red()
         close_led_green()
         close_led_white()
index 4961728..66d1086 100644 (file)
@@ -55,7 +55,7 @@ def main_init():
     
     print("init2:{}".format(utime.localtime()))
     print("init3:{}".format(utime.localtime()))
-    from btn_device_ec800m import BtnDevice,intervManager,wechatInforManager
+    from btn_device_ec800m import BtnDevice,intervManager
 
     btn_device = BtnDevice()
     btn_device.start()
@@ -103,7 +103,6 @@ def main_init():
         .append_manager(mgr.BatteryManager()) \
         .append_manager(intervManager())\
         .append_manager(ledEventManager())\
-        .append_manager(wechatInforManager())\
         # .append_manager(playImeiManager())\
         # .append_manager(playCurStepManager())\
         # .append_manager(usbStateManager())\
index 182cac9..4854e03 100644 (file)
@@ -1048,19 +1048,24 @@ class DeviceInfoManager(Abstract):
         hr_time = {}
         hr_time = EventMesh.publish("get_time_hr_spo2")#获取时间是否大于0
        
-        
-        if get_temp_state != None : #突然脱腕
-            if get_temp_state > 1 and WEAR != 1:
-                EventMesh.publish(constants.EVENT.STOP_TEMP)
-                EventMesh.publish("set_temp_state",0)       
-            if (self.get_hr_state > 1 or self.get_spo2_state > 1) and WEAR != 1:
-                if self.get_hr_state > 1 :
-                    EventMesh.publish("set_hr_state",0)#2代表后台进入测试,定时测心率 1ui界面测试洗心率 
-                    EventMesh.publish(constants.EVENT.STOP_HEART) 
-                elif self.get_spo2_state > 1:
-                    EventMesh.publish("set_spo2_state",0)#2代表后台进入测试
-                    EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)
-        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and battery[0] != "1" and WEAR == 1:
+        call_state = EventMesh.publish("get_call_state")
+        if call_state == None:
+            call_state = 0
+        # if battery[0] != "1":
+        #     if get_temp_state != None and call_state != None: #突然脱腕
+        #         if get_temp_state > 1  and WEAR != 1 or (call_state != 0):
+        #             EventMesh.publish(constants.EVENT.STOP_TEMP)
+        #             EventMesh.publish("set_temp_state",0)       
+        #         if (self.get_hr_state > 1 or self.get_spo2_state > 1) and WEAR != 1 or (call_state != 0):
+        #             if self.get_hr_state > 1 :
+        #                 EventMesh.publish("set_hr_state",0)#2代表后台进入测试,定时测心率 1ui界面测试洗心率 
+        #                 EventMesh.publish(constants.EVENT.STOP_HEART) 
+        #             elif self.get_spo2_state > 1:
+        #                 EventMesh.publish("set_spo2_state",0)#2代表后台进入测试
+        #                 EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)
+
+        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:
+        # if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and battery[0] != "1" and WEAR == 1 and call_state == 0:
 
             # print("get_temp_time:{} self.temp_one_state:{}".format(get_temp_time,self.temp_one_state))
             if get_temp_time != None:#定时测量体温
@@ -1203,7 +1208,7 @@ class DeviceInfoManager(Abstract):
                 self.mearsure_btn = int(hr_time[0])
                 self.mearsure_timer = int(hr_time[1])
                 if self.mearsure_btn != None and self.mearsure_timer != None:
-                    print("hr......01....{} {}\r\n".format(hr_time[0],hr_time[1]))
+                    # print("hr......01....{} {}\r\n".format(hr_time[0],hr_time[1]))
                     if self.mearsure_btn > 0:
                         if self.mearsure_timer > 0:
                             #print("get_hr_state:{} get_spo2_state:{} self.old_time:{} mearsure_timer:{}".format(self.get_hr_state,self.get_spo2_state,self.old_time,mearsure_timer))
@@ -2352,7 +2357,7 @@ class LocationManager(Abstract):
                             
                             if i % 2 == 0:
                                 if i+1 >= len(gsv_data) :
-                                    print("gsv_data num error!!")
+                                    # print("gsv_data num error!!")
                                     break
                                 GSV_dict[gsv_data[i]] = gsv_data[i+1]
                                 #print("type:gsv_data{}".format(type(gsv_data[i+1])))
@@ -3011,7 +3016,7 @@ class getTempTimeManager(Abstract):
 
     def set_temp_time(self, event, msg): 
         self.set_time = msg
-        EventMesh.publish("set_storage_config",["set_temp_time",self.set_time])
+        EventMesh.publish("set_storage_config",["temp_time",self.set_time])
 
     def get_temp_time(self, event, msg): 
         return self.set_time
index 5682f9b..5448f4c 100644 (file)
Binary files a/2.sdk/project/D10/usr/static/audio.bin and b/2.sdk/project/D10/usr/static/audio.bin differ
index 3d5f245..dd97ddb 100644 (file)
@@ -68,6 +68,17 @@ factorymode_bat_test_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff),
 factorymode_bat_test_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 factorymode_bat_test.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+factorymode_cont_y+=60
+factorymode_step = lv.btn(factorymode_cont)
+factorymode_step.set_pos(0, factorymode_cont_y)
+factorymode_step.set_size(240, 60)
+factorymode_step_label = lv.label(factorymode_step)
+factorymode_step_label.set_text("计步测试")
+factorymode_step.set_style_pad_all(0, lv.STATE.DEFAULT)
+factorymode_step_label.align(lv.ALIGN.LEFT_MID, 70, 0)
+factorymode_step_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
+factorymode_step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+factorymode_step.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 class FactoryModeScreen(Screen):
     NAME = "factorymode"
@@ -76,6 +87,7 @@ class FactoryModeScreen(Screen):
         self.meta = factorymode_screen
         factorymode_location.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeLocation"})), lv.EVENT.CLICKED, None)
         factorymode_bat_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeBatTest"})), lv.EVENT.CLICKED, None)
+        factorymode_step.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModestep"})), lv.EVENT.CLICKED, None)
 
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
@@ -100,6 +112,7 @@ FactoryModeBatTest_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), l
 FactoryModeBatTest_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
+
 class FactoryModeBatTestScreen(Screen):
     NAME = "FactoryModeBatTest"
     def __init__(self):
@@ -133,6 +146,71 @@ class FactoryModeBatTestScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
+#显示x y z 三轴数据
+FactoryModestep_screen = lv.obj()
+FactoryModestep_screen.center()
+FactoryModestep_screen.set_size(128, 128)
+FactoryModestep_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
+FactoryMode_step_label = lv.label(FactoryModestep_screen)
+FactoryMode_step_label.set_text(" ")
+FactoryMode_step_label.set_pos(0, 20)
+FactoryMode_step_label.set_size(128, 40)
+FactoryMode_step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+FactoryMode_step_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+
+
+FactoryMode_xyz_label = lv.label(FactoryModestep_screen)
+FactoryMode_xyz_label.set_text(" ")
+FactoryMode_xyz_label.set_pos(0, 60)
+FactoryMode_xyz_label.set_size(128, 68)
+FactoryMode_xyz_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+FactoryMode_xyz_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#FactoryModeLogNext_label.set_style_bg_color(lv.color_make(0x00, 0xff, 0x2a), lv.PART.MAIN | lv.STATE.DEFAULT)
+
+class FactoryModestepScreen(Screen):
+    NAME = "FactoryModestep"
+    def __init__(self):
+        super().__init__()
+        self.meta = FactoryModestep_screen
+        self.Log_timer_count = 0
+        self.Log_timer = osTimer()
+        
+    def initialization(self):
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        FactoryMode_step_label.set_text("步数{}".format(step[0]))
+        FactoryMode_xyz_label.set_text("X:{}\nY:{}\nZ:{}".format(step[1],step[2],step[3]))
+        self.Log_timer.start(1*1000,1,self.step_cb)
+        
+    def post_processor_after_initialization(self):
+
+        pass
+
+    def step_cb(self,*argc):
+        EventMesh.publish("system_sleep_rest")#防止黑屏
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        print("FactoryModestepScreen",step)
+        FactoryMode_step_label.set_text("步数{}".format(step[0]))
+        FactoryMode_xyz_label.set_text("X:{}\nY:{}\nZ:{}".format(step[1],step[2],step[3]))
+        pass
+
+    
+
+    def Close(self):
+        self.Log_timer.stop()
+        self.log_data = ""
+        pass
+
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "factorymode"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "factorymode"})
+        
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
 
 
 FactoryModeLocation_screen = lv.obj()
index 541b77d..bfc246e 100644 (file)
@@ -55,7 +55,7 @@ def main_init():
     from ui_main_menu import MainMenuScreen
     # from ui_WatchFaceScreen import WatchFaceScreen
     
-    from appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen
+    from appFactoryMode import  FactoryModestepScreen,FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen
     import ui as _ui
 
     from mgr import simFactoryManager,AddPPManager,cameraAlbumManager,setclassTimeManager,setkeyboardManager,testSmsSetIPManager,ConfigStoreManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\
@@ -130,6 +130,7 @@ def main_init():
     ui.add_screen(_ui.MessageFullScreen())
     # ui.add_screen(_ui.PowerOnScreen())
     ui.add_screen(FactoryModeLocationScreen())
+    ui.add_screen(FactoryModestepScreen())
     ui.add_screen(FactoryModeScreen())
     ui.add_screen(FactoryModeBatTestScreen())
     ui.add_screen(PopupAlarmScreen())
index 0012428..e721cbf 100644 (file)
@@ -2635,7 +2635,7 @@ class getTempTimeManager(Abstract):
 
     def set_temp_time(self, event, msg): 
         self.set_time = msg
-        EventMesh.publish("set_storage_config",["set_temp_time",self.set_time])
+        EventMesh.publish("set_storage_config",["temp_time",self.set_time])
 
     def get_temp_time(self, event, msg): 
         return self.set_time
index 10fb4fd..56e123d 100644 (file)
@@ -405,6 +405,7 @@ class WatchFace():
         self.watchface_style.initialization(main_menu)
         self.meta = self.watchface_style.meta
         self.watchface_style.meta.clear_flag(lv.obj.FLAG.HIDDEN)#显示
+        self.watchface_style.timerout_update()
         self.timer_update.start(10000, 1, self.timerout_update)
 
     def timerout_update(self, *args, **kwargs):
index 4b4f098..070c07c 100644 (file)
@@ -96,6 +96,20 @@ factorymode_hsensor_test_label.set_style_text_color(lv.color_make(0xff, 0xff, 0x
 factorymode_hsensor_test_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 factorymode_hsensor_test.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+
+
+factorymode_cont_y+=60
+factorymode_step = lv.btn(factorymode_cont)
+factorymode_step.set_pos(0, factorymode_cont_y)
+factorymode_step.set_size(240, 60)
+factorymode_step_label = lv.label(factorymode_step)
+factorymode_step_label.set_text("计步测试")
+factorymode_step.set_style_pad_all(0, lv.STATE.DEFAULT)
+factorymode_step_label.align(lv.ALIGN.LEFT_MID, 70, 0)
+factorymode_step_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
+factorymode_step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+factorymode_step.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 factorymode_cont_y+=60
 factorymode_log = lv.btn(factorymode_cont)
 factorymode_log.set_pos(0, factorymode_cont_y)
@@ -131,6 +145,8 @@ class FactoryModeScreen(Screen):
         factorymode_bat_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeBatTest"})), lv.EVENT.CLICKED, None)
         factorymode_hsensor_test.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeHsensorTest"})), lv.EVENT.CLICKED, None)
         factorymode_log.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModeLog"})), lv.EVENT.CLICKED, None)
+
+        factorymode_step.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "FactoryModestep"})), lv.EVENT.CLICKED, None)
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
@@ -244,6 +260,75 @@ class FactoryModeLogScreen(Screen):
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
+
+#显示x y z 三轴数据
+FactoryModestep_screen = lv.obj()
+FactoryModestep_screen.center()
+FactoryModestep_screen.set_size(240, 320)
+FactoryModestep_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
+FactoryMode_step_label = lv.label(FactoryModestep_screen)
+FactoryMode_step_label.set_text(" ")
+FactoryMode_step_label.set_pos(0, 40)
+FactoryMode_step_label.set_size(240, 40)
+FactoryMode_step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+FactoryMode_step_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+
+
+FactoryMode_xyz_label = lv.label(FactoryModestep_screen)
+FactoryMode_xyz_label.set_text(" ")
+FactoryMode_xyz_label.set_pos(0, 100)
+FactoryMode_xyz_label.set_size(240, 100)
+FactoryMode_xyz_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+FactoryMode_xyz_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#FactoryModeLogNext_label.set_style_bg_color(lv.color_make(0x00, 0xff, 0x2a), lv.PART.MAIN | lv.STATE.DEFAULT)
+
+class FactoryModestepScreen(Screen):
+    NAME = "FactoryModestep"
+    def __init__(self):
+        super().__init__()
+        self.meta = FactoryModestep_screen
+        self.Log_timer_count = 0
+        self.Log_timer = osTimer()
+        
+    def initialization(self):
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        FactoryMode_step_label.set_text("步数{}".format(step[0]))
+        FactoryMode_xyz_label.set_text("X:{}\nY:{}\nZ:{}".format(step[1],step[2],step[3]))
+        self.Log_timer.start(1*1000,1,self.step_cb)
+        
+    def post_processor_after_initialization(self):
+
+        pass
+
+    def step_cb(self,*argc):
+        EventMesh.publish("system_sleep_rest")#防止黑屏
+        step = EventMesh.publish(constants.EVENT.GET_STEP)
+        print("FactoryModestepScreen",step)
+        FactoryMode_step_label.set_text("{}".format(step[0]))
+        FactoryMode_xyz_label.set_text("X:{}\nY:{}\nZ:{}".format(step[1],step[2],step[3]))
+        pass
+
+    
+
+    def Close(self):
+        self.Log_timer.stop()
+        self.log_data = ""
+        pass
+
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "factorymode"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "factorymode"})
+        
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+
+
+
 #hsensor测试
 FactoryModeHsensorTest_screen = lv.obj()
 FactoryModeHsensorTest_screen.center()
index 6f5952c..9e878bc 100644 (file)
@@ -65,7 +65,7 @@ def main_init():
     from ui_main_menu import MainMenuScreen
     # from ui_WatchFaceScreen import WatchFaceScreen
     
-    from appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen,FactoryModeHsensorTestScreen,FactoryModeLogScreen
+    from appFactoryMode import FactoryModestepScreen, FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen,FactoryModeHsensorTestScreen,FactoryModeLogScreen
     from mgr import setCallStateManager,setclassTimeManager,setSmsIndexManager,ConfigStoreManager,testSmsSetIPManager,playPowerAudioManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\
     AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager
 
@@ -175,6 +175,7 @@ def main_init():
         ui.add_screen(FactoryModeBatTestScreen())
         ui.add_screen(FactoryModeHsensorTestScreen())
         ui.add_screen(FactoryModeLogScreen())
+        ui.add_screen(FactoryModestepScreen())
         ui.add_screen(PopupAlarmScreen())
     except Exception as e:
         usys.print_exception(e)
index ab1d90e..d54b18a 100644 (file)
@@ -2755,7 +2755,7 @@ class getTempTimeManager(Abstract):
 
     def set_temp_time(self, event, msg): 
         self.set_time = msg
-        EventMesh.publish("set_storage_config",["set_temp_time",self.set_time])
+        EventMesh.publish("set_storage_config",["temp_time",self.set_time])
 
     def get_temp_time(self, event, msg): 
         if self.set_time:
index 7d7d0dd..07fc26e 100644 (file)
@@ -622,6 +622,7 @@ class WatchFace():
         self.watchface_style.initialization(main_menu)
         self.meta = self.watchface_style.meta
         self.watchface_style.meta.clear_flag(lv.obj.FLAG.HIDDEN)#显示
+        self.watchface_style.timerout_update()
         self.timer_update.start(10000, 1, self.timerout_update)
 
     def timerout_update(self, *args, **kwargs):