From 42fd163bc655dd01fb2c51a56b7eb0d50f2bbcfb Mon Sep 17 00:00:00 2001 From: dxy15521469561 <1731678236@qq.com> Date: Wed, 20 Dec 2023 11:18:26 +0800 Subject: [PATCH] =?utf8?q?D10:=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- 2.sdk/new_version.bat | 2 +- .../ports/quectel/core/EventMesh.py | 6 + .../ports/quectel/core/ui_setting.py | 4 +- 2.sdk/project/D10/audio.bin | Bin 372519 -> 378652 bytes 2.sdk/project/D10/audio/R_BLOOD_SUGAR.mp3 | Bin 0 -> 5997 bytes 2.sdk/project/D10/list.json | 2 +- .../ports/quectel/core/EventMesh.py | 7 + .../ports/quectel/core/btn_device_ec800m.py | 243 ++++- .../ports/quectel/core/constants.py | 3 + .../microPython/ports/quectel/core/led.py | 21 +- .../ports/quectel/core/main_init.py | 51 +- .../microPython/ports/quectel/core/mgr.py | 842 ++++++++++++------ .../ports/quectel/core/protocol.py | 147 ++- .../microPython/ports/quectel/core/ui.py | 11 +- 2.sdk/project/D10/usr/static/audio.bin | Bin 372519 -> 378652 bytes .../ports/quectel/core/EventMesh.py | 11 + .../ports/quectel/core/ui_setting.py | 4 +- .../ports/quectel/core/EventMesh.py | 7 + .../ports/quectel/core/ui_setting.py | 4 +- .../ports/quectel/core/EventMesh.py | 6 + 20 files changed, 943 insertions(+), 428 deletions(-) create mode 100644 2.sdk/project/D10/audio/R_BLOOD_SUGAR.mp3 diff --git a/2.sdk/new_version.bat b/2.sdk/new_version.bat index 39f70108..c4947b90 100644 --- a/2.sdk/new_version.bat +++ b/2.sdk/new_version.bat @@ -1,2 +1,2 @@ -echo Version="%1_V1.0" > project\%1%\sdk\services\microPython\ports\quectel\core\versions.py +echo Version="V1.0" > project\%1%\sdk\services\microPython\ports\quectel\core\versions.py echo Build_Time="%date:~0,4%-%date:~5,2%-%date:~8,2% %time:~0,8%" >> project\%1%\sdk\services\microPython\ports\quectel\core\versions.py \ No newline at end of file diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/EventMesh.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/EventMesh.py index b1df6058..2b472e34 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/EventMesh.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/EventMesh.py @@ -1,6 +1,12 @@ import _thread import usys +import versions +MODEL = "CO6S_" #项目型号 + + +version = "{}{}".format(MODEL,versions.Version) +builTime = "{}".format(versions.Build_Time) class EventStore(object): def __init__(self): diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py index 939e1665..3e7fe7d2 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -865,7 +865,7 @@ version_label3 = lv.label(version_screen) version_label3.set_pos(10, 70) version_label3.set_size(230, 30) version_label3.set_long_mode(lv.label.LONG.WRAP) -version_label3.set_text(versions.Version) +version_label3.set_text(EventMesh.version) version_label3.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) version_label3.add_style(style_font_youyuan_20_gray, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -889,7 +889,7 @@ version_label6 = lv.label(version_screen) version_label6.set_pos(10, 160) version_label6.set_size(230, 60) version_label6.set_long_mode(lv.label.LONG.WRAP) -version_label6.set_text(versions.Build_Time) +version_label6.set_text(EventMesh.builTime) version_label6.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) version_label6.add_style(style_font_youyuan_20_gray, lv.PART.MAIN | lv.STATE.DEFAULT) diff --git a/2.sdk/project/D10/audio.bin b/2.sdk/project/D10/audio.bin index c28c3d9d046ffe70207bcdc74ff31999782879f1..e3aa0cfeb1b06937df5a4ae19c7f99af9e4c4f03 100644 GIT binary patch delta 5601 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 Y|%D!k)Xjlh!_nTG zSa`k1!}<>3fH1Wlnj=6%`13r|USP!GCVZav(CW{Rhd1KeD<0A^P^%S{-ZPgFrS$OA z|5Qr7zu9IBQz>7D~~~IbxTa z1jiFk<2yBuVwm6T69$TD@zKZYD}<-+hB-L@cDjr!98MCrY#Na+_Z+kk6e}gEjY? zd`_n$A9!T&${NKUmsZ1;jX}Wy!>KN;xASnZ#J}(mB*RC>R{#ZI0}&P2v);+ zR|$#(S`Fvb0FgIfCDR^bF=u5Z^YLtebSF{6nOF$W>LY46f0l{c-9vCvE6-UwMUqry yFf8_|ODb%HNOm)o)X)j0d=~XW%I~}K{Bvgj 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 1: # EventMesh.debug_log("pwKey_timeout_cb:self.pwKey_press_count >= 1") + EventMesh.publish("stop_led_timer")#设置参数 EventMesh.publish("dialing_out_event")#电话呼叫中voiceCall.callEnd() @@ -2235,7 +2372,6 @@ class BtnDevice(Abstract): EventMesh.publish("set_sos_flag",0) EventMesh.publish("set_sos_num",0) EventMesh.publish("set_hangup_mode",0) - EventMesh.publish("close_hr_sop2")# flag = EventMesh.publish("get_call_state") if flag != 1: @@ -2248,6 +2384,10 @@ class BtnDevice(Abstract): if power_off != None: if power_off == 1: return + open_power = EventMesh.publish("get_power_on_state")#获取开机标识 + if open_power != None: + if open_power == 0: + return self.sosKey_status = self.sosKey.read_level() # EventMesh.debug_log('### key22_extint_cb {} self.GPIO22_status:{}'.format(args,self.sosKey_status)) # args[0]:gpio号 args[1]:上升沿或下降沿 if self.WeChatKey_status != 0 and self.GPIO26_status != 0: @@ -2355,8 +2495,13 @@ class BtnDevice(Abstract): def wechatKey_extint_cb(self,args): power_off = EventMesh.publish("get_power_off_state")#获取关机标识 if power_off != None: - if power_off == 1: + if power_off != 0: return + open_power = EventMesh.publish("get_power_on_state")#获取开机标识 + if open_power != None: + if open_power == 0: + return + self.WeChatKey_status = self.wechatKey.read_level() # EventMesh.debug_log('### wechatKey_extint_cb {} self.WeChatKey_status:{}'.format(args,self.WeChatKey_status)) # args[0]:gpio号 args[1]:上升沿或下降沿 if self.sosKey_status != 0 and self.GPIO26_status != 0: diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/constants.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/constants.py index 5d7ea8d8..ea2e1ae4 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/constants.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/constants.py @@ -137,6 +137,9 @@ class PROTOCOL: SLEEPTIME_SEND = "SLEEPTIME_SEND" SLEEPTIME_RECV = "SLEEPTIME_RECV" + + FACTORY_SEND = "FACTORY_SEND" + FACTORY_RECV = "FACTORY_RECV" class EVENT: diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py index f861048f..9dc73784 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py @@ -288,8 +288,8 @@ class ledEventManager(Abstract):#灯事件 else: self.wechat_btn = 0 # if get_hr_state != 0 or get_spo2_state != 0 or temp_state != 0 or bp_state != 0 or bg_state != 0 :#心率血氧优先级高 - if get_hr_state == 1 or get_hr_state == 3 or get_spo2_state == 1 or get_spo2_state == 3 or temp_state == 1 or temp_state == 3 \ - or bp_state == 1 or bp_state == 3 or bg_state == 1 or bg_state == 3: + if get_hr_state == 1 or get_spo2_state == 1 or temp_state == 1 \ + or bp_state == 1 or bg_state == 1: if self.working_led_mode != led_mode.HEALTH_LED_MODE:#如果不在亮微聊模式需要亮微聊模式 # EventMesh.debug_log("set_hr_blood_led!!!!!!!!!!") str_buf = [1,2,10*70*2,led_mode.FLASH_LIGHT_RED_GREEN,10,5,led_mode.HEALTH_LED_MODE]#測量成功 @@ -301,10 +301,8 @@ class ledEventManager(Abstract):#灯事件 else: # EventMesh.debug_log("set_hr_blood_led stop!!!!!!!!!!") return - if get_hr_state == 0 and get_spo2_state == 0 and temp_state == 0 and bp_state == 0 and bg_state == 0\ - and get_hr_state == 2 and get_spo2_state == 2 and temp_state == 2 and bp_state == 2 and bg_state == 2: + else:# 0 2都认为其他模式灯亮 不是测试健康灯 self.working_led_mode = led_mode.OTHER_MEASURE_MODE - self.open_timer(msg) @@ -323,9 +321,10 @@ class ledEventManager(Abstract):#灯事件 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:#手动触发 - if get_hr_state == 3 or get_spo2_state == 3 or get_temp_state == 3: + get_bp_state = EventMesh.publish("get_bp_state") + get_bg_state = EventMesh.publish("get_bg_state") + if get_hr_state != None and get_spo2_state != None and get_temp_state != None and get_bp_state != None and get_bg_state != None: + if get_hr_state == 1 or get_spo2_state == 1 or get_temp_state == 1 or get_bp_state == 1 or get_bg_state == 1: EventMesh.publish("close_hr_sop2") EventMesh.publish("close_led_pin") return @@ -535,8 +534,6 @@ class ledEventManager(Abstract):#灯事件 def close_all_led(self, event, msg): self.close_all_led_do(0) - # EventMesh.debug_log("close_all_led!!2222222!!") - # EventMesh.publish("publish_message_event_ledInfo",{"func":self.close_all_led_do,"data":0}) def close_all_led_do(self,data): open_power = EventMesh.publish("get_power_on_state")#获取开机标识 if open_power != None: @@ -562,8 +559,8 @@ class ledEventManager(Abstract):#灯事件 bg_state = EventMesh.publish("get_bg_state") # EventMesh.debug_log("get_hr_state",get_hr_state,get_spo2_state,wechat_state,self.working_led_mode) if wechat_state != None: #获取微聊状态 - if wechat_state == 1 or get_spo2_state == 1 or get_spo2_state == 3 or get_hr_state == 1 or get_hr_state == 3 or temp_state == 1 or bp_state == 1 \ - or bg_state == 1 or bg_state == 3 or temp_state == 3 or bp_state == 3: + if wechat_state == 1 or get_spo2_state == 1 or get_hr_state == 1 or temp_state == 1 or bp_state == 1 \ + or bg_state == 1 : return if self.timer_state == 1: self.timer.stop() diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py index f326bb5f..dd3e5524 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py @@ -77,11 +77,10 @@ def main_init(): # TEMP_ProtoCol,DLT_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,Time_ProtoCol,TKS_ProtoCol,FALLDOWN_ProtoCol,\ # ProtoColResolver,SILENCETIME2_ProtoCol,PHL_ProtoCol,MONITOR_ProtoCol,bootoff_ProtoCol,WDSTART_ProtoCol,LOWBAT_ProtoCol,sosHome_dial_ProtoCol,SockManager,NetManager import protocol - import mgr as mgr + import mgr EventMesh.debug_log("init7:{}".format(utime.localtime())) - from mgr import ClockManager,deleteSmsManager,testSmsSetIPManager,ConfigStoreManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\ - AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager + EventMesh.debug_log("init8:{}".format(utime.localtime())) # from appWechat import TK_ProtoCol,MESSAGE_ProtoCol @@ -96,7 +95,7 @@ def main_init(): app = watchApp() app.set_ui(ui) - app.append_manager(getStorageDataManager()) + app.append_manager(mgr.getStorageDataManager()) app.append_manager(mgr.AlarmVolumeLevelManager()) \ .append_manager(mgr.MsgVolumeLevelManager()) \ .append_manager(mgr.PhoneVolumeLevelManager()) \ @@ -116,33 +115,34 @@ def main_init(): # .append_manager(mgr.CountdownManager()) \ - app.append_manager(ConfigStoreManager()) + app.append_manager(mgr.ConfigStoreManager()) app.append_manager(protocol.NetManager()) - app.append_manager(LocationManager()) - app.append_manager(AddrBookManager()) + app.append_manager(mgr.LocationManager()) + app.append_manager(mgr.AddrBookManager()) app.append_manager(mgr.MsgManager()) - app.append_manager(MsgdetailManager()) + app.append_manager(mgr.MsgdetailManager()) app.append_manager(mgr.CallLogManager()) app.append_manager(mgr.getWeatherDataManager()) - app.append_manager(PhoneCallingManager()) - app.append_manager(ClockManager()) + app.append_manager(mgr.PhoneCallingManager()) + app.append_manager(mgr.ClockManager()) + app.append_manager(mgr.sendDevinfoManager()) - app.append_manager(gethistoryDataManager()) - app.append_manager(getHrTimeManager()) - app.append_manager(getBrightnessManager()) + app.append_manager(mgr.gethistoryDataManager()) + app.append_manager(mgr.getHrTimeManager()) + app.append_manager(mgr.getBrightnessManager()) - app.append_manager(getUpLoadDataManager()) - app.append_manager(getVolumSizeManager()) - app.append_manager(getTempTimeManager()) - app.append_manager(getplayAudiodStateManager()) - app.append_manager(getLowBatManager()) - app.append_manager(getBootOffManager()) - app.append_manager(getOldTimeManager()) - app.append_manager(getSosFlagManager()) - app.append_manager(CountdownManager()) - app.append_manager(sosInfoCallManager()) - app.append_manager(testSmsSetIPManager()) - app.append_manager(deleteSmsManager()) + app.append_manager(mgr.getUpLoadDataManager()) + app.append_manager(mgr.getVolumSizeManager()) + app.append_manager(mgr.getTempTimeManager()) + app.append_manager(mgr.getplayAudiodStateManager()) + app.append_manager(mgr.getLowBatManager()) + app.append_manager(mgr.getBootOffManager()) + app.append_manager(mgr.getOldTimeManager()) + app.append_manager(mgr.getSosFlagManager()) + app.append_manager(mgr.CountdownManager()) + app.append_manager(mgr.sosInfoCallManager()) + app.append_manager(mgr.testSmsSetIPManager()) + app.append_manager(mgr.deleteSmsManager()) EventMesh.debug_log("init21:{}".format(utime.localtime())) @@ -195,6 +195,7 @@ def main_init(): pcr.add_support(protocol.REMIND_CH_REST_ProtoCol()) pcr.add_support(protocol.SLEEP_DATA_ProtoCol()) pcr.add_support(protocol.SLEEPTIME_ProtoCol()) + pcr.add_support(protocol.FACTORY_ProtoCol()) sm = protocol.SockManager() sm.add_support_resolver(pcr) diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py index 2145807d..a65f0ae8 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py @@ -42,6 +42,9 @@ import voiceCall from misc import PWM from led import led_mode,open_led_green,close_led_green,open_led_red,close_led_red,close_led_white from queue import Queue + +heartbeat_time = 7*60 #心跳时间 + def get_autoblood_value():#血压值 data = RTC().datetime() hour = int(data[4]) @@ -787,6 +790,12 @@ class DeviceInfoManager(Abstract): self.bg_times = 0 + self.bp_timeSecond = 0 + self.bpauto_state = 0 + + self.spo2_timeSecond = 0 + self.spo2auto_state = 0 + self.vbat_count = 0 self.vbat_buf=[] @@ -1041,6 +1050,8 @@ class DeviceInfoManager(Abstract): self.old_hr_time = 0 self.old_spo2_time = 0 self.BG_state = 0 + self.bpauto_state = 0 + self.spo2auto_state = 0 pass def clear_temp_state(self,event,msg): @@ -1074,7 +1085,7 @@ class DeviceInfoManager(Abstract): # EventMesh.publish(constants.EVENT.START_LOCATION,constants.PROTOCOL.UD_SEND) #开始UD定位 """7分钟一次心跳""" - if math.fabs(time_tmp - self.KA_time) > 7*60: #7分钟一次心跳 + if math.fabs(time_tmp - self.KA_time) > heartbeat_time: #7分钟一次心跳 self.KA_time = time_tmp EventMesh.publish(constants.PROTOCOL.KA_SEND) @@ -1095,6 +1106,7 @@ class DeviceInfoManager(Abstract): #EventMesh.txt_log("NO status") EventMesh.debug_log("NO status") EventMesh.publish(constants.EVENT.CLOSE_LOCATION)#关闭定位 + EventMesh.publish(constants.EVENT.PUSH_STEP, self.get_step_count()) """电池平均值""" @@ -1128,28 +1140,27 @@ class DeviceInfoManager(Abstract): data = RTC().datetime() - hour = data[4] - min = data[5] + hour = int(data[4]) + min = int(data[5]) + + cur_month = int(data[1]) cur_day = int(data[2]) cur_year = int(data[0]) old_Timesec = EventMesh.publish("get_old_time_data") - next_alarm_time = utime.localtime(int(old_Timesec)) - old_step_state = EventMesh.publish("get_old_step_data") # EventMesh.debug_log("hour:{} {} cur_month:{} {} next_alarm_time:{} old_Timesec:{}".format(hour,min,cur_month,cur_day,next_alarm_time,old_Timesec)) - if old_step_state == None: - old_step_state = 0 # EventMesh.debug_log("old_Timesec",old_Timesec) - if old_Timesec != None and old_step_state != None: - month = next_alarm_time[1] #00:00 - day = next_alarm_time[2] - year = next_alarm_time[0] + if old_Timesec != None: + next_alarm_time = utime.localtime(int(old_Timesec)) + month = int(next_alarm_time[1]) #00:00 18 + day = int(next_alarm_time[2]) + year = int(next_alarm_time[0]) if month != cur_month or day != cur_day or year != cur_year:#年 月 日只要其中一个都不一样就清零 - step = EventMesh.publish("get_old_step_value") EventMesh.publish("set_old_time_data",time_tmp) self.gsensor.reset_step() + EventMesh.publish("set_old_step_value",0) hr = EventMesh.publish("get_old_hr_data") @@ -1159,35 +1170,29 @@ class DeviceInfoManager(Abstract): spo2 = EventMesh.publish("get_old_spo2_data") if spo2 != 0: EventMesh.publish("set_old_spo2_data", 0) - EventMesh.publish("set_old_step_data",[1,time_tmp]) EventMesh.debug_log("clear step1111") else: - EventMesh.publish("set_old_step_data",[4,time_tmp]) + pass if hour == 23:#清步数23:59 - if min <= 59 and min >= 58:#58 59 - clear_step_state = EventMesh.publish("get_old_step_data") - if clear_step_state == None: - clear_step_state = 0 - if self.clear_step == 0: - self.clear_step = 1 - step = EventMesh.publish("get_old_step_value") - EventMesh.publish("set_old_time_data",time_tmp) - self.gsensor.reset_step() - EventMesh.publish("set_old_step_value",0) - - hr = EventMesh.publish("get_old_hr_data") - if hr != 0: - EventMesh.publish("set_old_hr_data", 0) - - spo2 = EventMesh.publish("get_old_spo2_data") - if spo2 != 0: - EventMesh.publish("set_old_spo2_data", 0) - EventMesh.publish("set_old_step_data",[2,time_tmp]) - EventMesh.debug_log("clear step2222") + if min == 59:#58 59 + # if self.clear_step == 0: + # self.clear_step = 1 + EventMesh.publish("set_old_time_data",time_tmp) + self.gsensor.reset_step() + EventMesh.publish("set_old_step_value",0) + + hr = EventMesh.publish("get_old_hr_data") + if hr != 0: + EventMesh.publish("set_old_hr_data", 0) + + spo2 = EventMesh.publish("get_old_spo2_data") + if spo2 != 0: + EventMesh.publish("set_old_spo2_data", 0) + EventMesh.debug_log("clear step2222") + else: - EventMesh.publish("set_old_step_data",[3,time_tmp]) self.clear_step = 0 else: self.clear_step = 0 @@ -1215,14 +1220,9 @@ class DeviceInfoManager(Abstract): if battery[0] != '1': self.no_smi_count+=10 # EventMesh.debug_log("self.no_smi_count",self.no_smi_count) - if self.no_smi_count >= (15*60): + if self.no_smi_count >= (15*60):#(15*60) self.no_smi_count = 0 - EventMesh.publish("open_power_on", 2)# #未检测到sim卡15分钟后关机 - - if self.no_smi_state < 6: - self.no_smi_state+=1 - if self.no_smi_state >= 6:#开机一分钟后提示未检测到sim卡 - EventMesh.publish("sim_no_cb")#未插卡 + EventMesh.publish("open_power_on",2)# #未检测到sim卡15分钟后关机 else: self.no_smi_count = 0 @@ -1233,7 +1233,7 @@ class DeviceInfoManager(Abstract): sms_data = sms.getSaveLoc() sms_max = sms_data[0][2] if msg_nums >= sms_max-1: - EventMesh.publish("remove_all_sms_cb")# + EventMesh.publish("delete_sms_event")# #佩戴检测 WEAR = EventMesh.publish(constants.EVENT.GET_WEAR)#佩戴数据 @@ -1278,12 +1278,6 @@ class DeviceInfoManager(Abstract): self.get_hr_state = 0 if self.get_spo2_state == None: self.get_spo2_state = 0 - - hr_time = {} - hr_time = EventMesh.publish("get_time_hr_spo2")#获取时间是否大于0 - - bg_time = {} - bg_time = EventMesh.publish("get_bgauto_time") call_state = EventMesh.publish("get_call_state") if call_state == None: @@ -1357,19 +1351,76 @@ class DeviceInfoManager(Abstract): # print("bp get_bp_state ",get_bp_state,self.old_bp_time) + + if get_hr_state != None: + if get_hr_state == 3: + self.old_hr_time+=1 + if self.old_hr_time == 1: + EventMesh.publish("set_hr_state",3)#2代表后台进入测试 + # EventMesh.publish("set_hr_blood_led",1) + EventMesh.publish(constants.EVENT.START_HEART) + print("hr start 3") + elif self.old_hr_time > 6: + self.old_hr_time = 0 + EventMesh.publish("set_hr_state",0)#2代表后台进入测试 + EventMesh.debug_log("stop hr 3 debug3") + EventMesh.publish(constants.EVENT.STOP_HEART) + heart_value = EventMesh.publish(constants.EVENT.GET_HEART) + EventMesh.debug_log("heart_value:{}".format(heart_value)) + if heart_value > 50 and heart_value != None: + # EventMesh.publish("play_hr_value",heart_value) + EventMesh.publish(constants.PROTOCOL.HEART_SEND,heart_value)#上传心率数据 + else: + # EventMesh.publish("play_hr_value",0) + pass + # EventMesh.publish("play_hr_value",0) + #获取心率数据上传数据app + EventMesh.debug_log("STOP_HEART:3") + else: + self.old_hr_time = 0 + else: + self.old_hr_time = 0 + + + if get_spo2_state != None: + if get_spo2_state == 3: + self.old_spo2_time+=1 + if self.old_spo2_time == 1: + EventMesh.publish("set_spo2_state",3)#2代表后台进入测试 + # EventMesh.publish("set_hr_blood_led",1) + EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 + print("spo2 start 3") + elif self.old_spo2_time > 6: + self.old_spo2_time = 0 + EventMesh.publish("set_spo2_state",0)#2代表后台进入测试 + EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) + spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) + if spo2_value > 85 and spo2_value != None: + # EventMesh.publish("play_spo2_value",spo2_value) + # EventMesh.publish("set_old_spo2_data",spo2_value) + EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) + else: + # EventMesh.publish("play_spo2_value",0) + print("spo2 stop 3") + else: + self.old_spo2_time = 0 + else: + self.old_spo2_time = 0 + + if get_bp_state != None: if get_bp_state == 3: self.old_bp_time+=1 if self.old_bp_time == 1: EventMesh.publish("set_bp_state",3)#2代表后台进入测试 - EventMesh.publish("set_hr_blood_led",1) + # EventMesh.publish("set_hr_blood_led",1) EventMesh.publish(constants.EVENT.START_HEART) print("bp start ") elif self.old_bp_time > 6: self.old_bp_time = 0 EventMesh.publish("set_bp_state",0)#2代表后台进入测试 - EventMesh.publish("stop_led_timer")#设置参数 + # EventMesh.publish("stop_led_timer")#设置参数 blood_data = get_autoblood_value() if blood_data == None: blood_data[0] = 0 @@ -1393,19 +1444,25 @@ class DeviceInfoManager(Abstract): self.old_bg_time+=1 if self.old_bg_time == 1: EventMesh.publish("set_bg_state",3)#2代表后台进入测试 - EventMesh.publish("set_hr_blood_led",1) + # EventMesh.publish("set_hr_blood_led",1) EventMesh.publish(constants.EVENT.START_HEART) print("bg start ") elif self.old_bg_time > 6: self.old_bg_time = 0 EventMesh.publish("set_bg_state",0)#2代表后台进入测试 - EventMesh.publish("stop_led_timer")#设置参数 + EventMesh.publish(constants.EVENT.STOP_HEART) + # EventMesh.publish("stop_led_timer")#设置参数 bg_data = get_blood_sugar_value() if bg_data == None: bg_data = 0 if bg_data != 0: + # EventMesh.publish("play_sugar_value", bg_data)#播放血糖数值 EventMesh.publish(constants.PROTOCOL.BLOODGLUSOCE_SEND,bg_data) - EventMesh.publish(constants.EVENT.STOP_HEART) + else: + # EventMesh.publish("play_sugar_value", 0)#播放血糖数值 + pass + + print("bg stop ") else: self.old_bg_time = 0 @@ -1413,72 +1470,13 @@ class DeviceInfoManager(Abstract): self.old_bg_time = 0 - if get_hr_state != None: - if get_hr_state == 3: - self.old_hr_time+=1 - if self.old_hr_time == 1: - EventMesh.publish("set_hr_state",3)#2代表后台进入测试 - EventMesh.publish("set_hr_blood_led",1) - EventMesh.publish(constants.EVENT.START_HEART) - print("hr start 3") - elif self.old_hr_time > 6: - self.old_hr_time = 0 - EventMesh.publish("set_hr_state",0)#2代表后台进入测试 - EventMesh.debug_log("stop hr 3 debug3") - EventMesh.publish(constants.EVENT.STOP_HEART) - heart_value = EventMesh.publish(constants.EVENT.GET_HEART) - EventMesh.debug_log("heart_value:{}".format(heart_value)) - if heart_value > 50 and heart_value != None: - # EventMesh.publish("play_hr_value",heart_value) - EventMesh.publish("set_history_hr_value",heart_value) - EventMesh.publish(constants.PROTOCOL.HEART_SEND,heart_value)#上传心率数据 - else: - EventMesh.publish("stop_led_timer")#设置参数 - pass - # EventMesh.publish("play_hr_value",0) - #获取心率数据上传数据app - EventMesh.debug_log("STOP_HEART:3") - else: - self.old_hr_time = 0 - else: - self.old_hr_time = 0 - - - if get_spo2_state != None: - if get_spo2_state == 3: - self.old_spo2_time+=1 - if self.old_spo2_time == 1: - EventMesh.publish("set_spo2_state",3)#2代表后台进入测试 - EventMesh.publish("set_hr_blood_led",1) - EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 - print("spo2 start 3") - elif self.old_spo2_time > 6: - self.old_spo2_time = 0 - EventMesh.publish("set_spo2_state",0)#2代表后台进入测试 - EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) - spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) - if spo2_value > 85 and spo2_value != None: - # EventMesh.publish("play_spo2_value",0) - EventMesh.publish("set_history_spo2_value",spo2_value) - EventMesh.publish("set_old_spo2_data",spo2_value) - EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) - else: - EventMesh.publish("stop_led_timer")#设置参数 - pass - print("spo2 stop 3") - # EventMesh.publish("play_spo2_value",0) - else: - self.old_spo2_time = 0 - else: - self.old_spo2_time = 0 - if get_temp_state != None: if get_temp_state == 3:#单次测量 self.temp_one_state+=1 if self.temp_one_state == 1: EventMesh.debug_log("AUTO one temp:2") EventMesh.publish("set_temp_state",3) - EventMesh.publish("set_hr_blood_led",1) + # EventMesh.publish("set_hr_blood_led",1) EventMesh.publish(constants.EVENT.START_TEMP) elif self.temp_one_state > 3: self.temp_one_state = 0 @@ -1499,18 +1497,20 @@ class DeviceInfoManager(Abstract): if temp != None: if temp != 0: - EventMesh.publish("set_history_temp_value",temp) + # EventMesh.publish("set_history_temp_value",temp) # EventMesh.publish("play_temp_value",temp)#播放体温数值 EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp]) else: - EventMesh.publish("set_history_temp_value",0) + # EventMesh.publish("set_history_temp_value",0) + pass # EventMesh.publish("play_temp_value",0)#播放体温数值 - EventMesh.publish("stop_led_timer")#设置参数 + # EventMesh.publish("stop_led_timer")#设置参数 EventMesh.publish(constants.EVENT.STOP_TEMP) EventMesh.debug_log("AUTO once temp:{} tmp_f:{} tmp_f_tmp:{} tmp_d:{} tmp_d_tmp:{}".format(temp,tmp_f,tmp_f_tmp,tmp_d,tmp_d_tmp)) + # EventMesh.debug_log("get_temp_time:{} self.temp_one_state:{}".format(get_temp_time,self.temp_one_state)) if get_temp_time != None:#定时测量体温 @@ -1564,7 +1564,22 @@ class DeviceInfoManager(Abstract): else: self.temp_state = 0 self.old_temp_time = 0 - + else: + temp_state = EventMesh.publish("get_temp_state") + if temp_state == 2: + EventMesh.publish("set_temp_state",0)#2代表后台进入测试 + # EventMesh.publish("stop_led_timer")#设置参数 + EventMesh.debug_log("temp stop debug3") + EventMesh.publish(constants.EVENT.STOP_TEMP) + self.temp_state = 0 + self.temp_time = 0 + self.old_temp_time = 0 + + + + hr_time = {} + hr_time = EventMesh.publish("get_time_hr_spo2")#获取时间是否大于0 + if hr_time[0] != None: self.mearsure_btn = int(hr_time[0]) self.mearsure_timer = int(hr_time[1]) @@ -1617,13 +1632,110 @@ class DeviceInfoManager(Abstract): EventMesh.debug_log("33stop debug3") # EventMesh.publish("stop_led_timer")#设置参数 EventMesh.publish(constants.EVENT.STOP_HEART) - + get_spo2time = EventMesh.publish("get_spo2_time")#血压自动测试 + # print("get_spo2time",get_spo2time) + if get_spo2time != None:#血压时间不为0 + spo2_on = int(get_spo2time[0]) + spo2_time = int(get_spo2time[1]) + if spo2_on != 0 and spo2_time != 0: + get_hr_state = EventMesh.publish("get_hr_state") + get_spo2_state = EventMesh.publish("get_spo2_state") + get_bp_state = EventMesh.publish("get_bp_state") + get_bg_state = EventMesh.publish("get_bg_state") + # print("state bg2",get_hr_state,get_spo2_state,get_bp_state,get_bg_state) + if (get_hr_state == 0 and get_bp_state == 0 and get_bg_state == 0) and (get_spo2_state == 2 or get_spo2_state == 0):#心率血压血氧不在测试就测试血糖自动测量 + if (time_tmp-self.spo2_timeSecond) >= spo2_time:#大于一个周期的时间,保存的时间戳时间 1678 0 1678 30 1678 + self.spo2_timeSecond = time_tmp + self.spo2auto_state = 0 + # print("time_tmp spo2",time_tmp,self.spo2_timeSecond,time_tmp-self.spo2_timeSecond,self.bg_timer,self.bpauto_state) + if (time_tmp - self.spo2_timeSecond) == 0 and self.spo2auto_state == 0: + EventMesh.debug_log("START_spo2:auto") + EventMesh.publish("set_spo2_state",2)#2代表后台进入测试 + EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 + self.spo2auto_state = 1 + elif (time_tmp - self.spo2_timeSecond) >= 60 and self.spo2auto_state == 1: + EventMesh.publish("set_spo2_state",0)#2代表后台进入测试 + EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) + spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) + if spo2_value > 85 and spo2_value != None: + EventMesh.publish("set_old_spo2_data",spo2_value) + EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) + print("spo2 auto stop ") + self.spo2auto_state = 0 + else: + self.spo2auto_state = 0 + else: + self.spo2_timeSecond = 0 + self.spo2auto_state = 0 + spo2_state = EventMesh.publish("get_spo2_state")#心率 + if spo2_state == 2: + EventMesh.publish("set_spo2_state",0)#2代表后台进入测试 + EventMesh.debug_log("spo2 stop debug3") + # EventMesh.publish("stop_led_timer")#设置参数 + EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) + + + get_bptime = EventMesh.publish("get_bp_time")#血压自动测试 + # print("get_bptime",get_bptime) + if get_bptime != None:#血压时间不为0 + bp_on = int(get_bptime[0]) + bp_time = int(get_bptime[1]) + if bp_on != 0 and bp_time != 0: + get_hr_state = EventMesh.publish("get_hr_state") + get_spo2_state = EventMesh.publish("get_spo2_state") + get_bp_state = EventMesh.publish("get_bp_state") + get_bg_state = EventMesh.publish("get_bg_state") + # print("state bg2",get_hr_state,get_spo2_state,get_bp_state,get_bg_state) + + if (get_hr_state == 0 and get_spo2_state == 0 and get_bg_state == 0) and (get_bp_state == 2 or get_bp_state == 0):#心率血压血氧不在测试就测试血糖自动测量 + if (time_tmp-self.bp_timeSecond) >= bp_time:#大于一个周期的时间,保存的时间戳时间 1678 0 1678 30 1678 + self.bp_timeSecond = time_tmp + self.bpauto_state = 0 + # print("time_tmp bp",time_tmp,self.bp_timeSecond,time_tmp-self.bp_timeSecond,self.bg_timer,self.bpauto_state) + if (time_tmp - self.bp_timeSecond) == 0 and self.bpauto_state == 0: + EventMesh.debug_log("START_bp:auto") + EventMesh.publish("set_bp_state",2)#2代表后台进入测试 + # EventMesh.publish("set_hr_blood_led",1) + EventMesh.publish(constants.EVENT.START_HEART) + self.bpauto_state = 1 + elif (time_tmp - self.bp_timeSecond) >= 60 and self.bpauto_state == 1: + EventMesh.publish("set_bp_state",0)#2代表后台进入测试 + blood_data = get_autoblood_value() + if blood_data == None: + blood_data[0] = 0 + blood_data[1] = 0 + + max_value = blood_data[0] + min_value = blood_data[1] + if max_value != 0 and min_value != 0: + EventMesh.publish("set_old_blood_data",[max_value,min_value]) + + EventMesh.publish(constants.PROTOCOL.BLOOD_SEND,[max_value,min_value]) + EventMesh.publish(constants.EVENT.STOP_HEART) + print("bp auto stop ") + self.bpauto_state = 0 + else: + self.bpauto_state = 0 + else: + self.bp_timeSecond = 0 + self.bpauto_state = 0 + bp_state = EventMesh.publish("get_bp_state")#心率 + if bp_state == 2: + EventMesh.publish("set_bp_state",0)#2代表后台进入测试 + EventMesh.debug_log("bp stop debug3") + # EventMesh.publish("stop_led_timer")#设置参数 + EventMesh.publish(constants.EVENT.STOP_HEART) + + + + bg_time = {} + bg_time = EventMesh.publish("get_bgauto_time") if bg_time[0] != None: - self.bg_btn = int(bg_time[0]) - self.bg_timer = int(bg_time[1]) + bg_btn = int(bg_time[0]) + bg_timer = int(bg_time[1]) # print("state bg2",self.bg_btn,self.bg_timer) - if self.bg_btn >= 1 and self.bg_timer > 0:#开关打开并且时间大于0就可以测试血糖 + if bg_btn >= 1 and bg_timer > 0:#开关打开并且时间大于0就可以测试血糖 get_hr_state = EventMesh.publish("get_hr_state") get_spo2_state = EventMesh.publish("get_spo2_state") get_bp_state = EventMesh.publish("get_bp_state") @@ -1631,10 +1743,10 @@ class DeviceInfoManager(Abstract): # print("state bg2",get_hr_state,get_spo2_state,get_bp_state,get_bg_state) if (get_hr_state == 0 and get_spo2_state == 0 and get_bp_state == 0) and (get_bg_state == 2 or get_bg_state == 0):#心率血压血氧不在测试就测试血糖自动测量 - if (time_tmp-self.bg_times) >= self.bg_timer:#大于一个周期的时间,保存的时间戳时间 1678 0 1678 30 1678 + if (time_tmp-self.bg_times) >= bg_timer:#大于一个周期的时间,保存的时间戳时间 1678 0 1678 30 1678 self.bg_times = time_tmp self.BG_state = 0 - # print("time_tmp bg",time_tmp,self.bg_times,time_tmp-self.bg_times,self.bg_timer,self.BG_state) + # print("time_tmp bg",time_tmp,self.bg_times,time_tmp-self.bg_times,bg_timer,self.BG_state) if (time_tmp - self.bg_times) == 0 and self.BG_state == 0: EventMesh.debug_log("START_bg:1") EventMesh.publish("set_bg_state",2)#2代表后台进入测试 @@ -1683,6 +1795,12 @@ class DeviceInfoManager(Abstract): self.BG_state = 0 self.temp_time = time_tmp + self.bp_timeSecond = time_tmp + self.bpauto_state = 0 + + self.spo2_timeSecond = time_tmp + self.spo2auto_state = 0 + self.temp_state = 0 self.temp_one_state = 0 self.old_temp_time = 0 @@ -1721,27 +1839,27 @@ class DeviceInfoManager(Abstract): if get_hr_state == 2 or get_hr_state == 3: EventMesh.publish("set_hr_state",0)#2代表后台进入测试,定时测心率 1ui界面测试洗心率 - if get_hr_state == 3: - EventMesh.publish("stop_led_timer")#设置参数 + # if get_hr_state == 3: + # EventMesh.publish("stop_led_timer")#设置参数 EventMesh.debug_log("stop debug8") EventMesh.publish(constants.EVENT.STOP_HEART) elif get_spo2_state == 2 or get_spo2_state == 3: EventMesh.publish("set_spo2_state",0)#2代表后台进入测试 - if get_spo2_state == 3: - EventMesh.publish("stop_led_timer")#设置参数 + # if get_spo2_state == 3: + # EventMesh.publish("stop_led_timer")#设置参数 EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) EventMesh.debug_log("stop debug13") elif get_bp_state == 2 or get_bp_state == 3: EventMesh.publish("set_bp_state",0)#2代表后台进入测试 - if get_bp_state == 3: - EventMesh.publish("stop_led_timer")#设置参数 + # if get_bp_state == 3: + # EventMesh.publish("stop_led_timer")#设置参数 EventMesh.publish(constants.EVENT.STOP_HEART) EventMesh.debug_log("stop debug14") elif get_bg_state == 2 or get_bg_state == 3: EventMesh.publish("set_bg_state",0)#2代表后台进入测试 - if get_bg_state == 3: - EventMesh.publish("stop_led_timer")#设置参数 + # if get_bg_state == 3: + # EventMesh.publish("stop_led_timer")#设置参数 EventMesh.publish(constants.EVENT.STOP_HEART) EventMesh.debug_log("stop debug15") @@ -1772,8 +1890,8 @@ class DeviceInfoManager(Abstract): else: EventMesh.publish("set_history_temp_value",0) # EventMesh.publish("play_temp_value",0)#播放体温数值 - if get_temp_state == 3: - EventMesh.publish("stop_led_timer")#设置参数 + # if get_temp_state == 3: + # EventMesh.publish("stop_led_timer")#设置参数 EventMesh.publish(constants.EVENT.STOP_TEMP) @@ -1917,7 +2035,6 @@ class DeviceInfoManager(Abstract): # EventMesh.publish("set_led_time_arg",[1000,400,52,led_mode.FLASH_LIGHT_RED,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#開始測量 - self.normal_alarm() #喝水提醒 self.drink_alarm() @@ -1940,8 +2057,6 @@ class DeviceInfoManager(Abstract): #普通闹钟 def normal_alarm(self): - date_tmp = utime.localtime() - time_tmp = utime.mktime(date_tmp) data = RTC().datetime() hour = data[4] min = data[5] @@ -2032,8 +2147,6 @@ class DeviceInfoManager(Abstract): #吃药提醒 def medicine_alarm(self): - date_tmp = utime.localtime() - time_tmp = utime.mktime(date_tmp) data = RTC().datetime() hour = data[4] min = data[5] @@ -2086,8 +2199,6 @@ class DeviceInfoManager(Abstract): break #该起床了 def wakeup_alarm(self): - date_tmp = utime.localtime() - time_tmp = utime.mktime(date_tmp) data = RTC().datetime() hour = data[4] min = data[5] @@ -2154,8 +2265,6 @@ class DeviceInfoManager(Abstract): #该睡觉了 def sleep_alarm(self): - date_tmp = utime.localtime() - time_tmp = utime.mktime(date_tmp) data = RTC().datetime() hour = data[4] min = data[5] @@ -2223,14 +2332,8 @@ class DeviceInfoManager(Abstract): j+=1 - - - - #该回家了 def home_alarm(self): - date_tmp = utime.localtime() - time_tmp = utime.mktime(date_tmp) data = RTC().datetime() hour = data[4] min = data[5] @@ -2272,8 +2375,6 @@ class DeviceInfoManager(Abstract): #该休息了 def reset_alarm(self): - date_tmp = utime.localtime() - time_tmp = utime.mktime(date_tmp) data = RTC().datetime() hour = data[4] min = data[5] @@ -2440,17 +2541,18 @@ class DeviceInfoManager(Abstract): """ 获取步数 """ + # print("11111:{}".format(EventMesh.publish("get_storage_config","clear_state3"))) XYZ = self.gsensor.get_x_y_z() tmp = 0 - + step =[0,0,0,0] tmp = self.gsensor.get_step() # EventMesh.debug_log("x:%d,y:%d,z:%d tmp %d",XYZ[0],XYZ[1],XYZ[2],tmp) - self.step[0]= tmp - self.step[1] = XYZ[0] - self.step[2] = XYZ[1] - self.step[3] = XYZ[2] - - return self.step + step[0]= tmp + step[1] = XYZ[0] + step[2] = XYZ[1] + step[3] = XYZ[2] + # print("1222:{}".format(EventMesh.publish("get_storage_config","clear_state3"))) + return step def get_ic_cid(self, event, msg): """ @@ -3502,6 +3604,7 @@ class gethistoryDataManager(Abstract): ujson.dump(self.read_histroy_hr_data,fd) pass else: + EventMesh.publish("set_storage_config",["old_hr",msg]) pass @@ -3543,6 +3646,7 @@ class gethistoryDataManager(Abstract): def set_old_step_value(self, event, msg): self.oldstep = msg + EventMesh.publish("set_storage_config",["old_step",msg]) def get_old_step_value(self, event, msg): @@ -3573,6 +3677,56 @@ class getOldTimeManager(Abstract): EventMesh.subscribe("get_old_step_data", self.get_old_step_data) EventMesh.subscribe("set_old_step_data", self.set_old_step_data) + EventMesh.subscribe("set_test_data1", self.set_test_data1) + + EventMesh.subscribe("set_test_data2", self.set_test_data2) + + EventMesh.subscribe("set_test_data3", self.set_test_data3) + + EventMesh.subscribe("set_test_data4", self.set_test_data4) + + EventMesh.subscribe("set_test_data5", self.set_test_data5) + + EventMesh.subscribe("set_test_data6", self.set_test_data6) + + EventMesh.subscribe("set_test_data7", self.set_test_data7) + + EventMesh.subscribe("set_test_data8", self.set_test_data8) + + + def set_test_data1(self, event, msg): + EventMesh.publish("set_storage_config",["clear_state1",msg]) + + + def set_test_data2(self, event, msg): + + EventMesh.publish("set_storage_config",["clear_state2",msg]) + + + def set_test_data3(self, event, msg): + EventMesh.publish("set_storage_config",["clear_state3",msg]) + + def set_test_data4(self, event, msg): + EventMesh.publish("set_storage_config",["clear_state4",msg]) + + def set_test_data5(self, event, msg): + EventMesh.publish("set_storage_config",["clear_state5",msg]) + + def set_test_data6(self, event, msg): + EventMesh.publish("set_storage_config",["clear_state6",msg]) + + def set_test_data7(self, event, msg): + EventMesh.publish("set_storage_config",["clear_state7",msg]) + + def set_test_data8(self, event, msg): + EventMesh.publish("set_storage_config",["clear_state8",msg]) + + # f = open("/usr/static/storage_file/config.json",'r',encoding="utf-8") + # print(f.read()) + + def get_old_step_data(self, event, msg): + return [self.time_step,self.step_second] + def get_old_time_data(self, event, msg): return self.time_sec @@ -3718,19 +3872,28 @@ class getTempTimeManager(Abstract): if read_data != None: self.set_time = read_data - self.set_bptime = 0 + self.get_bgstate = 0 self.get_bpstate = 0 - read_data = EventMesh.publish("get_storage_config","bp_time") + self.bptime_on = 0 + self.bptime_time = 0 + read_data=EventMesh.publish("get_storage_config","bpauto_btn") if read_data != None: - self.set_bptime = read_data + self.bptime_on = read_data - self.set_bgtime = 0 - self.get_bgstate = 0 - read_data = EventMesh.publish("get_storage_config","bg_time") + EventMesh.publish("get_storage_config","bpauto_time") + if read_data != None: + self.bptime_time = read_data + + self.spo2time_on = 0 + self.spo2time_time = 0 + read_data = EventMesh.publish("get_storage_config","spo2auto_btn") + if read_data != None: + self.spo2time_on = read_data + read_data = EventMesh.publish("get_storage_config","spo2auto_time") if read_data != None: - self.set_bgtime = read_data + self.spo2time_time = read_data def post_processor_after_instantiation(self): EventMesh.subscribe("set_temp_time", self.set_temp_time) @@ -3745,21 +3908,13 @@ class getTempTimeManager(Abstract): EventMesh.subscribe("set_bp_state", self.set_bp_state) EventMesh.subscribe("get_bp_state", self.get_bp_state) - EventMesh.subscribe("set_bg_time", self.set_bg_time) - EventMesh.subscribe("get_bg_time", self.get_bg_time) EventMesh.subscribe("set_bg_state", self.set_bg_state) EventMesh.subscribe("get_bg_state", self.get_bg_state) - def set_bg_time(self, event, msg): - self.set_bgtime = msg - EventMesh.publish("set_storage_config",["bg_time",self.set_time]) + EventMesh.subscribe("set_spo2_time", self.set_spo2_time) + EventMesh.subscribe("get_spo2_time", self.get_spo2_time) - def get_bg_time(self, event, msg): - if self.set_bgtime: - return self.set_bgtime - else : - return 0 def set_bg_state(self, event, msg): self.get_bgstate = msg @@ -3774,18 +3929,31 @@ class getTempTimeManager(Abstract): else : return 0 + def set_spo2_time(self, event, msg): + self.spo2time_on = msg[0] + self.spo2time_time = msg[1] + EventMesh.publish("set_storage_config",["spo2auto_btn",self.spo2time_on]) + EventMesh.publish("set_storage_config",["spo2auto_time",self.spo2time_time]) + def get_spo2_time(self, event, msg): + + return [self.spo2time_on,self.spo2time_time] + def set_bp_time(self, event, msg): - self.set_bptime = msg - EventMesh.publish("set_storage_config",["bp_time",self.set_time]) + self.bptime_on = msg[0] + self.bptime_time = msg[1] + EventMesh.publish("set_storage_config",["bpauto_btn",self.bptime_on]) + EventMesh.publish("set_storage_config",["bpauto_time",self.bptime_time]) def get_bp_time(self, event, msg): - if self.set_bptime: - return self.set_bptime - else : - return 0 + if self.bptime_on == None: + self.bptime_on = 0 + if self.bptime_time == None: + self.bptime_time = 0 + return [self.bptime_on,self.bptime_time] + def set_bp_state(self, event, msg): self.get_bpstate = msg @@ -3909,8 +4077,8 @@ class getStorageDataManager(Abstract):#获取内存数据 # EventMesh.debug_log("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("/usr/static/storage_file/config.json",'w+',encoding="utf-8") as fd: - ujson.dump(self.config_data,fd) + with open("/usr/static/storage_file/config.json",'w+',encoding="utf-8") as fd: + ujson.dump(self.config_data,fd) def get_storage_data(self, event, msg): # EventMesh.debug_log("get_storage_data:{}".format(self.config_data)) return self.config_data @@ -3930,11 +4098,10 @@ class getStorageDataManager(Abstract):#获取内存数据 #定位频率 class getUpLoadDataManager(Abstract):# def __init__(self): - self.upload_time = 1800 + self.upload_time = 2*60*60 read_data = EventMesh.publish("get_storage_config","upload_time") if read_data != None: self.upload_time = read_data - def post_processor_after_instantiation(self): EventMesh.subscribe("set_upload_data", self.set_upload_data) @@ -3944,6 +4111,8 @@ class getUpLoadDataManager(Abstract):# self.upload_time = msg def get_upload_data(self, event, msg): + if self.upload_time == None: + self.upload_time = 2*60*60 return self.upload_time class getplayAudiodStateManager(Abstract):#获取设置播放音频状态 @@ -4107,7 +4276,7 @@ class getBootOffManager(Abstract):#开关机时间 if read_data != None: self.poweroff_time = read_data else: - self.poweroff_time = [{"poweroff_on":1,"start_hour":6,"start_min":0,"end_hour":0,"end_min":0}] + self.poweroff_time = [{"poweroff_on":0,"start_hour":6,"start_min":0,"end_hour":0,"end_min":0}] @@ -4117,6 +4286,7 @@ class getBootOffManager(Abstract):#开关机时间 def set_boot_off_time(self, event, msg): EventMesh.debug_log("set_boot_off_time",msg) + EventMesh.publish("set_storage_config",["poweroff_alarm",msg]) self.poweroff_time = msg EventMesh.publish("set_rtc_alarm") @@ -4186,6 +4356,81 @@ class testSmsSetIPManager(Abstract):# return [self.newip,self.newcom] +# MMI Version:UIX8910_C55_DS_D12G_PRO18_FZD_V1.0_Release +# Build:07-07-2022 16:12:58 +# IMEI:861218001025267 +# IP:api.xcloudtech.com +# PORT:9000 +# UPLOAD:300 +# Battery:3948, 64 +# Udebug: 0 +# ConnectTime: 7 +import protocol + +class sendDevinfoManager(Abstract):#发送设备信息 + def __init__(self): + self.timer = osTimer() + pass + + def post_processor_after_instantiation(self): + EventMesh.subscribe("send_devinfo_event", self.send_devinfo_event)#删除短信 + + def send_devinfo_event(self, event, msg): + number = str(msg) + versions = EventMesh.softversion + Build = EventMesh.builTime + IMEI = EventMesh.publish(constants.EVENT.GET_IMEI) + IP = "" + new_ip = EventMesh.publish("get_storage_config","set_new_ip_addr") + new_com = EventMesh.publish("get_storage_config","set_new_com") + server_data = protocol.server_init() + + if new_ip != None: + if len(new_ip) != 0: + IP = new_ip + else: + IP = server_data[0] + else: + IP = server_data[0] + + PORT = '' + if new_com != None: + if len(new_com) != 0: + PORT = new_com + else: + PORT = server_data[1] + else: + PORT = server_data[1] + + UPLOAD = EventMesh.publish("get_upload_data") + + level = EventMesh.publish("get_curr_battery_level") + if level == None: + level = 4200 + bat = EventMesh.publish("screen_get_battery")[1] + if bat == None: + bat = 100 + Battery = str(level) +',' + str(bat) + + ConnectTime = heartbeat_time//60 + data1 = "Version:{}\nBuild:{}".format(versions,Build) + + data2 = "IMEI:{}\nIP:{}\nPORT:{}".format(IMEI,IP,PORT) + + data3 = "UPLOAD:{}\nBattery:{}\nConnectTime:{}".format(UPLOAD,Battery,ConnectTime) + + send_state1 = -1 + send_state2 = -1 + # print("data",data1,data2,data3) + send_state1 = sms.sendPduMsg(number, data1, 'UCS2') + + if send_state1 == 0: + send_state2 = sms.sendPduMsg(number, data2, 'UCS2') + + if send_state2 == 0: + sms.sendPduMsg(number, data3, 'UCS2') + + class deleteSmsManager(Abstract):#删除信息 def __init__(self): self.timer = osTimer() @@ -4366,55 +4611,55 @@ class ClockManager(Abstract): if end_min_total == current_minute:#结束的时间分钟等于关机时间分钟数则关机 ubs_state = EventMesh.publish("get_usb")#' - + if ubs_state == 2 or ubs_state == 0: - if next_minute >= current_minute:#开机时间大于当前时间 9:00 > = 8:00 - interval_minute = next_minute - current_minute + if next_minute > current_minute:#开机时间大于当前时间 9:00 > = 8:00 + interval_minute = next_minute - current_minute + + EventMesh.debug_log("开机距离下一次响铃的的分钟数:", interval_minute,next_minute) + else:#8:00 9:00 + #7*60*24 7天一个周期 7*60*24 - + interval_minute = next_minute + (24*60-current_minute) + EventMesh.debug_log("开机08888距离下一次响铃的的分钟数:", interval_minute,next_minute) + + #反向获取时间戳 + time = utime.localtime() + EventMesh.debug_log("开机9获取utime的时间戳:", time) + rtc_mktime = utime.mktime(time)-time[5] + EventMesh.debug_log("开机10反向获取utime的mktime:", rtc_mktime) + + #加上下一次响铃需要的时间 + next_alarm_mktime = rtc_mktime + interval_minute*60 #转换成s单位 时间戳 + EventMesh.debug_log("开机11下一次响铃的mktime:", next_alarm_mktime) + + #格式化时间戳,得到下一次闹钟的时间 + next_alarm_time = utime.localtime(next_alarm_mktime) + EventMesh.debug_log("开机12下一次响铃的准确时间:", next_alarm_time) + #将时间转换为rtc的格式 + data_l = [2021, 7, 9, 5, 12, 30, 0, 0] + #给rtc时间赋值 + data_l[0] = next_alarm_time[0] #year + data_l[1] = next_alarm_time[1] #month + data_l[2] = next_alarm_time[2] #day + data_l[4] = next_alarm_time[3] #hour + data_l[5] = next_alarm_time[4] #minute + data_e=tuple(data_l) + EventMesh.debug_log("开机13将该时间转换为RTC元组:", data_e) - EventMesh.debug_log("开机距离下一次响铃的的分钟数:", interval_minute,next_minute) - else:#8:00 9:00 - #7*60*24 7天一个周期 7*60*24 - - interval_minute = next_minute + (24*60-current_minute) - EventMesh.debug_log("开机08888距离下一次响铃的的分钟数:", interval_minute,next_minute) - - #反向获取时间戳 - time = utime.localtime() - EventMesh.debug_log("开机9获取utime的时间戳:", time) - rtc_mktime = utime.mktime(time)-time[5] - EventMesh.debug_log("开机10反向获取utime的mktime:", rtc_mktime) - - #加上下一次响铃需要的时间 - next_alarm_mktime = rtc_mktime + interval_minute*60 #转换成s单位 时间戳 - EventMesh.debug_log("开机11下一次响铃的mktime:", next_alarm_mktime) - - #格式化时间戳,得到下一次闹钟的时间 - next_alarm_time = utime.localtime(next_alarm_mktime) - EventMesh.debug_log("开机12下一次响铃的准确时间:", next_alarm_time) - #将时间转换为rtc的格式 - data_l = [2021, 7, 9, 5, 12, 30, 0, 0] - #给rtc时间赋值 - data_l[0] = next_alarm_time[0] #year - data_l[1] = next_alarm_time[1] #month - data_l[2] = next_alarm_time[2] #day - data_l[4] = next_alarm_time[3] #hour - data_l[5] = next_alarm_time[4] #minute - data_e=tuple(data_l) - EventMesh.debug_log("开机13将该时间转换为RTC元组:", data_e) - - self.rtc.register_callback(self._rtc_callback) + self.rtc.register_callback(self._rtc_callback) - FLAG = self.rtc.set_alarm(data_e) - if FLAG == 0: - EventMesh.debug_log("开机11成功设置rtc的到期时间:", data_e) - else: - EventMesh.debug_log("开机时设置rtc的到期时间失败:", data_e) - self.rtc.enable_alarm(1) - if ubs_state == 2 or ubs_state == 0: + FLAG = self.rtc.set_alarm(data_e) + if FLAG == 0: + EventMesh.debug_log("开机11成功设置rtc的到期时间:", data_e) + else: + EventMesh.debug_log("开机时设置rtc的到期时间失败:", data_e) + self.rtc.enable_alarm(1) + EventMesh.debug_log("结束时设置rtc的到期时间失败:", data_e) EventMesh.publish("open_power_on", 5)#静音关机 return else: - EventMesh.debug_log("充电关机失败:", data_e) + EventMesh.publish("set_rtc_alarm") #self.rtc.datetime([2023, 12, 1, 5, 5, 59, 30, 0]) return @@ -4425,75 +4670,82 @@ class ClockManager(Abstract): msg_data = EventMesh.publish("get_boot_off_time") if msg_data != None: power_offdata = msg_data[0] - start_hour = power_offdata["start_hour"] - start_min = power_offdata["start_min"] - end_hour = power_offdata["end_hour"] - end_min = power_offdata["end_min"] - - next_minute = start_hour*60+start_min #10:11 - - start_total = start_hour*60+start_min #10:11 - end_total = end_hour*60+end_min #10:11 - rtc_now_time = self.rtc.datetime() - current_minute = rtc_now_time[4]*60 + rtc_now_time[5]#当前时间 - - minute_list = [] - minute_list.append(start_total)#23*60= - minute_list.append(end_total) - minute_list.append(current_minute)#[460,480,340] - minute_list = sorted(minute_list) - current_index = minute_list.index(current_minute) - # print("minute_list",minute_list,start_total,end_total,current_index,power_offdata) - - - next_index = current_index + 1 - if next_index >= len(minute_list): - next_minute = minute_list[0] - print("07下一个闹钟的分钟数:", next_minute) - else: - next_minute = minute_list[next_index] - print("07下一个闹钟的分钟数:", next_minute) + start_hour = int(power_offdata["start_hour"]) + start_min = int(power_offdata["start_min"]) + end_hour = int(power_offdata["end_hour"]) + end_min = int(power_offdata["end_min"]) + off_on = int(power_offdata["poweroff_on"]) + if off_on == 1: + next_minute = start_hour*60+start_min #10:11 + + start_total = start_hour*60+start_min #10:11 + end_total = end_hour*60+end_min #10:11 + rtc_now_time = self.rtc.datetime() + current_minute = rtc_now_time[4]*60 + rtc_now_time[5]#当前时间 + + + minute_list = [] + if start_total != current_minute: + minute_list.append(start_total)#23*60= + if end_total != current_minute: + minute_list.append(end_total) + minute_list.append(current_minute)#[927,927,930] + minute_list = sorted(minute_list) + current_index = minute_list.index(current_minute) + print("minute_list",minute_list,start_total,end_total,current_index,power_offdata) + + + next_index = current_index + 1 + if next_index >= len(minute_list): + next_minute = minute_list[0] + print("07下一个闹钟的分钟数:", next_minute) + else: + next_minute = minute_list[next_index] + print("08下一个闹钟的分钟数:", next_minute) - if next_minute >= current_minute: - interval_minute = next_minute - current_minute - print("08距离下一次响铃的的分钟数:", interval_minute) - else: - interval_minute = (24*60 - current_minute) + next_minute - print("08距离下一次响铃的的分钟数:", interval_minute) - - - #反向获取时间戳 - time = utime.localtime() - EventMesh.debug_log("关机09获取utime的时间戳:", time) - time - rtc_mktime = utime.mktime(time)-time[5] - EventMesh.debug_log("关机10反向获取utime的mktime:", rtc_mktime) - - #加上下一次响铃需要的时间 - next_alarm_mktime = rtc_mktime + interval_minute*60 #转换成s单位 时间戳 - EventMesh.debug_log("关机11下一次响铃的mktime:", next_alarm_mktime) - - #格式化时间戳,得到下一次闹钟的时间 - next_alarm_time = utime.localtime(next_alarm_mktime) - EventMesh.debug_log("关机12下一次响铃的准确时间:", next_alarm_time) - #将时间转换为rtc的格式 - data_l = [2021, 7, 9, 5, 12, 30, 0, 0] - #给rtc时间赋值 - data_l[0] = next_alarm_time[0] #year - data_l[1] = next_alarm_time[1] #month - data_l[2] = next_alarm_time[2] #day - data_l[4] = next_alarm_time[3] #hour - data_l[5] = next_alarm_time[4] #minute - data_e=tuple(data_l) - EventMesh.debug_log("关机13将该时间转换为RTC元组:", data_e) - - self.rtc.register_callback(self._rtc_callback) + print("minute_list1",minute_list,current_index,next_minute) + if next_minute > current_minute: + interval_minute = next_minute - current_minute + print("09距离下一次响铃的的分钟数:", interval_minute)#14 31 14 29 14 31 24*60- + else: + interval_minute = (24*60 - current_minute) + next_minute + print("10距离下一次响铃的的分钟数:", interval_minute) + + + #反向获取时间戳 + time = utime.localtime() + EventMesh.debug_log("关机09获取utime的时间戳:", time) + time + rtc_mktime = utime.mktime(time)-time[5] + EventMesh.debug_log("关机10反向获取utime的mktime:", rtc_mktime) + + #加上下一次响铃需要的时间 + next_alarm_mktime = rtc_mktime + interval_minute*60 #转换成s单位 时间戳 + EventMesh.debug_log("关机11下一次响铃的mktime:", next_alarm_mktime) + + #格式化时间戳,得到下一次闹钟的时间 + next_alarm_time = utime.localtime(next_alarm_mktime) + EventMesh.debug_log("关机12下一次响铃的准确时间:", next_alarm_time) + #将时间转换为rtc的格式 + data_l = [2021, 7, 9, 5, 12, 30, 0, 0] + #给rtc时间赋值 + data_l[0] = next_alarm_time[0] #year + data_l[1] = next_alarm_time[1] #month + data_l[2] = next_alarm_time[2] #day + data_l[4] = next_alarm_time[3] #hour + data_l[5] = next_alarm_time[4] #minute + data_e=tuple(data_l) + EventMesh.debug_log("关机13将该时间转换为RTC元组:", data_e) + + self.rtc.register_callback(self._rtc_callback) - FLAG = self.rtc.set_alarm(data_e) - if FLAG == 0: - EventMesh.debug_log("关机11成功设置rtc的到期时间:", data_e) + FLAG = self.rtc.set_alarm(data_e) + if FLAG == 0: + EventMesh.debug_log("关机11成功设置rtc的到期时间:", data_e) + else: + EventMesh.debug_log("关机时设置rtc的到期时间失败:", data_e) + self.rtc.enable_alarm(1) else: - EventMesh.debug_log("关机时设置rtc的到期时间失败:", data_e) - self.rtc.enable_alarm(1) + self.rtc.enable_alarm(0) diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py index bdb0178b..4c07fa3a 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py @@ -23,7 +23,7 @@ import usys def server_init(server_type = None): - #服务器选择1,防走丢,2大锤,3三基同创,4童信,5云米,6荣为 8:ds未知 dey.hinwatch. com:9968 9:183.62.239.121:31869 + #服务器选择1,防走丢,2大锤,3三基同创,4童信,5云米,6荣为 8:ds未知 dey.hinwatch. com:9968 9:183.62.239.121:31869 10:183.62.239.121:33461 if server_type == None: server_type = 1 #EventMesh.debug_log("server_init:server_type:{}".format(server_type)) @@ -73,6 +73,9 @@ def server_init(server_type = None): elif server_type == 9: d_server_addr = "183.62.239.121" d_server_port = 31869 + elif server_type == 10: + d_server_addr = "183.62.239.121" + d_server_port = 33461 return [d_server_addr,d_server_port,d_md5_key,d_PID] from queue import Queue @@ -262,7 +265,7 @@ class SockManager(Abstract): utime.sleep(1) def send(self, topic, msg): - EventMesh.debug_log("TCP:send data:{}".format(msg)) + # EventMesh.debug_log("TCP:send data:{}".format(msg)) if EventMesh.publish("get_sim_Status") != 1: #没sim,则不发送 EventMesh.publish(constants.EVENT.SET_CONNECT, 0)#标记断网 EventMesh.debug_log("dataCall not connect") @@ -552,7 +555,7 @@ class KA_ProtoCol(ProtoCol): self.roll_count = 0 - # EventMesh.debug_log("ka roll_count:",roll_count) + # EventMesh.debug_log("ka roll_count:",self.roll_count) battery_caption = bat_tmp[1] @@ -1094,28 +1097,29 @@ class HRSTART_ProtoCol(ProtoCol): msg_tmp = msg_tmp[1] EventMesh.debug_log("HRSTART_ProtoCol RECV msg:{} msg_:{}".format(msg,msg_tmp)) hrTotal = int(msg_tmp) - if hrTotal == 0:#关闭自动测量 - EventMesh.debug_log("HRSTART_ 1") - EventMesh.publish("set_time_hr_spo2",[0,0]) + if hrTotal == 1:#单次测量 + EventMesh.debug_log("HRSTART_ 2".format(hrTotal)) + get_hr_state = EventMesh.publish("get_hr_state") + get_spo2_state = EventMesh.publish("get_spo2_state") + get_bp_state = EventMesh.publish("get_bp_state") + get_bg_state = EventMesh.publish("get_bg_state") + # if (get_hr_state == 3 ) or (get_spo2_state == 0 and get_hr_state == 0):#只要两个不在测量 单次优先级最低 + if (get_spo2_state == 0 and get_hr_state == 0 and get_bg_state == 0 and get_bp_state == 0): + battery = EventMesh.publish("screen_get_battery") + if battery != None: + if battery[0] != "1": + EventMesh.publish("set_hr_state",3)#3代表单次测量 + pass else: - if hrTotal == 1:#单次测量 - EventMesh.debug_log("HRSTART_ 2".format(hrTotal)) - get_hr_state = EventMesh.publish("get_hr_state") - get_spo2_state = EventMesh.publish("get_spo2_state") - # if (get_hr_state == 3 ) or (get_spo2_state == 0 and get_hr_state == 0):#只要两个不在测量 单次优先级最低 - if (get_spo2_state == 0 and get_hr_state == 0): - battery = EventMesh.publish("screen_get_battery") - if battery != None: - if battery[0] != "1": - EventMesh.publish("set_hr_state",3)#3代表单次测量 - pass - else: - if hrTotal > 0 and hrTotal <= 300: - hrTotal = 300 - elif hrTotal >= 65536: - hrTotal = 65536 - EventMesh.debug_log("HRSTART_ 3".format(hrTotal)) - EventMesh.publish("set_time_hr_spo2",[1,hrTotal]) + if hrTotal > 0 and hrTotal <= 300: + hrTotal = 300 + elif hrTotal >= 65536: + hrTotal = 65536 + EventMesh.debug_log("HRSTART_ 3".format(hrTotal)) + on = 0 + if hrTotal != 0: + on = 1 + EventMesh.publish("set_time_hr_spo2",[on,hrTotal]) EventMesh.publish(constants.PROTOCOL.HRTSTART_SEND) @@ -1196,16 +1200,36 @@ class OXYGEN_One_ProtoCol(ProtoCol):#单次测量 msg_tmp = msg.decode('ascii') msg_tmp = msg_tmp.split(',') msg_tmp = msg_tmp[1] - state = int(msg_tmp) - get_hr_state = EventMesh.publish("get_hr_state") - get_spo2_state = EventMesh.publish("get_spo2_state") - if state == 1: - # if (get_hr_state == 3 ) or (get_spo2_state == 0 and get_hr_state == 0):#只要两个不在测量 单次优先级最低 - if (get_spo2_state == 0 and get_hr_state == 0): + + oxstartTotal = int(msg_tmp) + # oxstartTotal = 300 + print("oxstartTotal:{}".format(oxstartTotal)) + if oxstartTotal == 1:#单次测量 + get_bp_state = EventMesh.publish("get_bp_state") + get_hr_state = EventMesh.publish("get_hr_state") + get_spo2_state = EventMesh.publish("get_spo2_state") + get_bg_state = EventMesh.publish("get_bp_state") + print("get_bp_state:{}".format(get_bp_state)) + if get_bp_state == 0 and get_hr_state == 0 and get_spo2_state == 0 and get_bg_state == 0:#只要两个不在测量 单次优先级最低 battery = EventMesh.publish("screen_get_battery") if battery != None: if battery[0] != "1": EventMesh.publish("set_spo2_state",3)#3代表单次测量 + else: + if oxstartTotal > 0 and oxstartTotal <= 300: + oxstartTotal = 300 + elif oxstartTotal >= 65536: + oxstartTotal = 65536 + + # if oxstartTotal == 0:#关闭自动测量 + # EventMesh.debug_log("bpSTART_ 1") + # EventMesh.publish("set_spo2_time",[0,0]) + # else: + on = 0 + if oxstartTotal != 0: + on = 1 + EventMesh.publish("set_spo2_time",[on,oxstartTotal]) + EventMesh.publish(constants.PROTOCOL.OXSTART_SEND) class TEMP_ProtoCol(ProtoCol): @@ -1315,13 +1339,15 @@ class bldstart_ProtoCol(ProtoCol): msg_tmp = msg_tmp[1] bldstartTotal = int(msg_tmp) + # bldstartTotal = 300 print("bldstartTotal:{}".format(bldstartTotal)) if bldstartTotal == 1:#单次测量 get_bp_state = EventMesh.publish("get_bp_state") get_hr_state = EventMesh.publish("get_hr_state") get_spo2_state = EventMesh.publish("get_spo2_state") + get_bg_state = EventMesh.publish("get_bg_state") print("get_bp_state:{}".format(get_bp_state)) - if get_bp_state == 0 and get_hr_state == 0 and get_spo2_state == 0:#只要两个不在测量 单次优先级最低 + if get_bp_state == 0 and get_hr_state == 0 and get_spo2_state == 0 and get_bg_state == 0:#只要两个不在测量 单次优先级最低 battery = EventMesh.publish("screen_get_battery") if battery != None: if battery[0] != "1": @@ -1331,7 +1357,12 @@ class bldstart_ProtoCol(ProtoCol): bldstartTotal = 300 elif bldstartTotal >= 65536: bldstartTotal = 65536 - EventMesh.publish("set_bp_time", bldstartTotal) + + on = 0 + if bldstartTotal != 0:#关闭自动测量 + on = 1 + print("on:{} bldstartTotal:{} ".format(on,bldstartTotal)) + EventMesh.publish("set_bp_time",[on,bldstartTotal]) EventMesh.publish(constants.PROTOCOL.BLDSTART_SEND) @@ -1421,11 +1452,14 @@ class bgstart_ProtoCol(ProtoCol): elif bgstartTotal >= 65536: bgstartTotal = 65536 - if bgstartTotal == 0:#关闭自动测量 - EventMesh.debug_log("bgSTART_ 1") - EventMesh.publish("set_bgauto_time",[0,0]) - else: - EventMesh.publish("set_bgauto_time",[1,bgstartTotal]) + # if bgstartTotal == 0:#关闭自动测量 + # EventMesh.debug_log("bgSTART_ 1") + # EventMesh.publish("set_bgauto_time",[0,0]) + # else: + on = 0 + if bgstartTotal != 0: + on = 1 + EventMesh.publish("set_bgauto_time",[on,bgstartTotal]) EventMesh.publish(constants.PROTOCOL.BGSTART_SEND) @@ -1648,12 +1682,12 @@ class sosHome_dial_ProtoCol(ProtoCol): # EventMesh.debug_log("sosHome_dial_ProtoCol:send data :{} {}".format(len(msg_tmp),msg_tmp)) #b'[SZKW*860132060006970*0015*sosHome_dial_ProtoCol,15521469561,10086,15521469561]' + # print("sosnumber msg_tmp",msg_tmp) i = 0 for i in range(len(msg_tmp)-1): # EventMesh.debug_log("sos:send data :{}".format(msg_tmp[i+1])) if len(msg_tmp[i+1]) != 0: EventMesh.publish("set_storage_config",["SOS_NUMBER{}".format(i+1),msg_tmp[i+1]]) - # EventMesh.debug_log("read_data:{} msg_tmp:{}".format(read_data,msg_tmp[i+1])) if (len(msg_tmp)-1) == 3: EventMesh.publish("set_dial_sos_number",[msg_tmp[1],msg_tmp[2],msg_tmp[3]]) @@ -1720,6 +1754,7 @@ class Time_ProtoCol(ProtoCol): timeSecond = int(msg_data[1]) #EventMesh.debug_log("type {} timeSecond {}".format((msg_data[1]),timeSecond)) + # timeSecond = 1703001360 next_alarm_time = utime.localtime(timeSecond) #EventMesh.debug_log("next_alarm_time",next_alarm_time) #EventMesh.debug_log("local time",msg) @@ -2716,6 +2751,42 @@ class SLEEPTIME_ProtoCol(ProtoCol):#睡眠时间 EventMesh.publish(constants.PROTOCOL.SLEEPTIME_SEND) +# 平台发送: +# [XT*YYYYYYYYYYYYYYY*LEN*FACTORY] +# 实例:[XT*334588000000156*0007*FACTORY] +# 终端回复: +# [XT*YYYYYYYYYYYYYYY*LEN*FACTORY] +# 实例:[XT*334588000000156*0007*FACTORY] +# 说明:终端恢复出厂设置,里面设置的号码都将清空 +class FACTORY_ProtoCol(ProtoCol):#睡眠时间 + """ + 实例:[XT*334588000000156*0008*FACTORY] + 终端回复 + [XT*YYYYYYYYYYYYYYY*LEN*WLKEY] + 实例:[XT*334588000000156*0006*FACTORY] + """ + TYPE = "FACTORY" + + def send(self, event, msg): + send_data = self.PID+"*%s*0007*FACTORY"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s,%s]"%(str(MD5_SIGN),send_data,msg) + EventMesh.debug_log("FACTORY:send:%s"%(data)) + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data) + + def recv(self, event, msg): + + EventMesh.debug_log("FACTORY!!!!!!!!!") + # msg = msg[1:-1] + # msg_tmp = msg.decode('ascii') + # msg_data = msg_tmp.split(',') + # EventMesh.debug_log("WLKEY_ProtoCol".format(msg_data[1])) + # EventMesh.publish("set_storage_config",["WLKEY",msg_data[1]]) + + EventMesh.publish(constants.PROTOCOL.FACTORY_SEND) + EventMesh.publish("app_factory",None)#app恢复出厂 + class ProtoColResolver(object): def __init__(self): self.protocol_list = [] diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py index 8c31f04b..349edc4e 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/ui.py @@ -41,6 +41,7 @@ def msg_cb(args): tmp = sms.searchTextMsg(index) detail = tmp[1]#内容 # EventMesh.debug_log("msg_cb:detail {}".format,detail) + if detail.find("SETIP:") != -1:#寻找是否有这个字符串 tmp_test = detail.split("SETIP:")[1] if tmp_test.find(":") != -1: @@ -49,8 +50,16 @@ def msg_cb(args): new_com = tmp_test.split(':')[1] # new_md5 = detail.split(':')[3] if len(new_ip) > 0 and len(new_com) > 0: - EventMesh.publish("set_new_ip", [new_ip,new_com,tmp[0]])#设置关机时间 + EventMesh.publish("set_new_ip", [new_ip,new_com,tmp[0]])# # EventMesh.publish("set_new_ip", [new_ip,new_com,new_md5])#设置关机时间 + if detail.find("ts#") != -1: + EventMesh.publish("send_devinfo_event", tmp[0])#删除短信 + pass + if detail.find("fact#") != -1:#恢复出厂设置 + EventMesh.publish("app_factory",tmp[0])#app恢复出厂 + + if detail.find("rest#") != -1:#重启 + EventMesh.publish("app_restart",tmp[0])# if index >= sms_max-1:#删除短信 EventMesh.publish("delete_sms_event")#删除短信 diff --git a/2.sdk/project/D10/usr/static/audio.bin b/2.sdk/project/D10/usr/static/audio.bin index c28c3d9d046ffe70207bcdc74ff31999782879f1..e3aa0cfeb1b06937df5a4ae19c7f99af9e4c4f03 100644 GIT binary patch delta 5601 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 Y|%D!k)Xjlh!_nTG zSa`k1!}<>3fH1Wlnj=6%`13r|USP!GCVZav(CW{Rhd1KeD<0A^P^%S{-ZPgFrS$OA z|5Qr7zu9IBQz>7D~~~IbxTa z1jiFk<2yBuVwm6T69$TD@zKZYD}<-+hB-L@cDjr!98MCrY#Na+_Z+kk6e}gEjY? zd`_n$A9!T&${NKUmsZ1;jX}Wy!>KN;xASnZ#J}(mB*RC>R{#ZI0}&P2v);+ zR|$#(S`Fvb0FgIfCDR^bF=u5Z^YLtebSF{6nOF$W>LY46f0l{c-9vCvE6-UwMUqry yFf8_|ODb%HNOm)o)X)j0d=~XW%I~}K