From: dxy15521469561 <1731678236@qq.com> Date: Mon, 9 Oct 2023 08:24:28 +0000 (+0800) Subject: D10: X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4d20a25dae1843227454d82055c1667a8f1a92fd;p=mirrors%2FASR1603_G5.git D10: 定时开关机 K01: 逻辑界面优化 --- diff --git a/2.sdk/new_version.bat b/2.sdk/new_version.bat index 90d8d813..39f70108 100644 --- a/2.sdk/new_version.bat +++ b/2.sdk/new_version.bat @@ -1,2 +1,2 @@ -echo Version="810M_%1_V1.0" > project\%1%\sdk\services\microPython\ports\quectel\core\versions.py +echo Version="%1_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/D10/sdk/services/microPython/ports/quectel/core/alarm.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/alarm.py index 64c8ffb4..44ce3919 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/alarm.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/alarm.py @@ -394,7 +394,7 @@ label_ok.set_text("完成") label_ok.set_long_mode(lv.label.LONG.DOT) label_ok.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) label_ok.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -fffffffffffffffff + #闹钟信息 alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [], 'minute': 39}, {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}] @@ -647,8 +647,8 @@ class ClockManager(Abstract): msg_data = EventMesh.publish("get_boot_off_time") print("msg_tmp:{}".format(msg_data)) - msg_tmp = msg_data[0] - off_tmp2 = msg_tmp[2] + off_on = msg_data[0] + off_tmp2 = msg_data[2] msg_tmp2 = off_tmp2.split(':') end_min = int(msg_tmp2[0])*60+int(msg_tmp2[1]) @@ -656,9 +656,11 @@ class ClockManager(Abstract): current = rtc_now_time[4]*60+rtc_now_time[5] print("end_min:{} current:{} off_tmp2:{}".format(end_min,current,off_tmp2)) - if end_min == current:#结束的时间分钟等于关机时间分钟数则关机 - # EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) - return + if off_on != None: + if off_on == 1:#开关使能打开 + if end_min == current:#结束的时间分钟等于关机时间分钟数则关机 + # EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + return @@ -666,7 +668,7 @@ class ClockManager(Abstract): # get_spo2_state = EventMesh.publish("get_spo2_state") # if get_hr_state != None or get_spo2_state != None: # if get_hr_state != 1 and get_spo2_state != 1: - EventMesh.publish("OPEN_ALARM_RING")#闹钟到点响铃 + # EventMesh.publish("OPEN_ALARM_RING")#闹钟到点响铃 # EventMesh.publish("load_screen", {"screen": "popup_alarm"}) # def _reset_rtc_alarm_time(self, args): # print("---alarm_ring---") diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py index 7596a8ab..246bcd21 100644 --- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py +++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py @@ -688,8 +688,10 @@ class intervManager(Abstract): EventMesh.publish("set_led_time_arg",str_buf)# if flag == 3 or flag == 1 or flag == 0:#电话通话中 或者呼叫中挂断中断 EventMesh.publish("close_timer_all")# - str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_CHARGE_IN")) - EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data) + self.aud.stop() + self.aud.play(1,1,'U:/static/R_CHARGE_IN.mp3') + # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_CHARGE_IN")) + # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data) print("charge R_CHARGE_IN") @@ -701,8 +703,10 @@ class intervManager(Abstract): print("charge R_CHARGE_OUT") if flag == 3 or flag == 1 or flag == 0:#电话通话中 或者呼叫中挂断中断 EventMesh.publish("close_timer_all")# - str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_CHARGE_OUT")) - EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data) + self.aud.stop() + self.aud.play(1,1,'U:/static/R_CHARGE_OUT.mp3') + # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_CHARGE_OUT")) + # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data) @@ -721,7 +725,7 @@ class intervManager(Abstract): def get_usb(self, event, msg): return self.usbState - def open_power_on(self, event, msg): #msg 1 开机 2 关机 3 重启 4恢复出厂设置 + def open_power_on(self, event, msg): #msg 1 开机 2 关机 3 重启 4恢复出厂设置 5静音关机 EventMesh.publish("close_timer_all")# if msg == 1: @@ -768,6 +772,19 @@ class intervManager(Abstract): EventMesh.publish(constants.PROTOCOL.DLT_SEND) self.aud.stopPlayStream() self.timer.start(6*1000,0,self.fun) + elif msg == 5: + flag = EventMesh.publish("get_call_state") + if flag != 0:#电话呼叫中 + voiceCall.callEnd() + step = EventMesh.publish("get_old_step_value") + self.read_data = EventMesh.publish("get_storage_data") + if step != 0: + EventMesh.publish("set_storage_config",["old_step",step]) + date_tmp = utime.localtime() + time_tmp = utime.mktime(date_tmp) + EventMesh.publish("set_storage_config",["old_time",time_tmp])#关机保存一个是时间 + + self.pwk_timer1.start(3000,0,self.power_off_no_audio_cb)#不需要关机铃声 def fun(self,*argc): self.aud.stopPlayStream() @@ -785,7 +802,7 @@ class intervManager(Abstract): 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) - EventMesh.publish("set_led_time_arg",[1,2,4*8,led_mode.FLASH_LIGHT_GREEN,4,2,led_mode.OTHER_MEASURE_MODE])#測量成功 + EventMesh.publish("set_led_time_arg",[1,2,6*8,led_mode.FLASH_LIGHT_GREEN,6,3,led_mode.OTHER_MEASURE_MODE])#測量成功 # EventMesh.publish("set_led_time_arg",[1000,200,10,led_mode.FLASH_LIGHT_GREEN,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#设置参数 self.pwk_timer1.start(2000,0,self.clear_power_on_cb) self.pwk_timer2.start(6000,0,self.power_on_cb) @@ -798,7 +815,14 @@ class intervManager(Abstract): 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) - EventMesh.publish("set_led_time_arg",[1,2,4*8,led_mode.FLASH_LIGHT_RED,4,2,led_mode.POWER_OFF_MODE])# + EventMesh.publish("set_led_time_arg",[1,2,6*8,led_mode.FLASH_LIGHT_RED,6,3,led_mode.POWER_OFF_MODE])# + + self.pwk_timer1.start(2000,0,self.set_power_off_cb) + self.pwk_timer2.start(7000,0,self.publish_power_down_event_cb) + + def power_off_no_audio_cb(self, msg): + print("power_off_no_audio_cb") + EventMesh.publish("set_led_time_arg",[1,2,6*8,led_mode.FLASH_LIGHT_RED,6,3,led_mode.POWER_OFF_MODE])# self.pwk_timer1.start(2000,0,self.set_power_off_cb) self.pwk_timer2.start(7000,0,self.publish_power_down_event_cb) @@ -911,9 +935,9 @@ class intervManager(Abstract): data = 42 data_tmp = str(data) if data_tmp.find(".") != -1: - temp_shi = data_tmp.split('.')[0]//10 - temp_ge = data_tmp.split('.')[0]%10 - dot_ge = data_tmp.split('.')[1]%10 + temp_shi = int(data_tmp.split('.')[0])//10 + temp_ge = int(data_tmp.split('.')[0])%10 + dot_ge = int(data_tmp.split('.')[1])%10 if temp_ge > 0:#37.0 if dot_ge > 0:#37.5 str_data = 'mp3files={}.mp3+{}.mp3+{}.mp3+{}.mp3+{}.mp3+{}.mp3'.format(audio_buf.index("R_HSENSOR_TEMP_TITLE"),audio_buf.index("R_READ_TIME_{}".format(temp_shi)),\ @@ -936,8 +960,8 @@ class intervManager(Abstract): EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data) else: - temp_shi = data_tmp//10 - temp_ge = data_tmp%10 + temp_shi = int(data_tmp)//10 + temp_ge = int(data_tmp)%10 if temp_ge > 0:#45 str_data = 'mp3files={}.mp3+{}.mp3+{}.mp3+{}.mp3'.format(audio_buf.index("R_HSENSOR_TEMP_TITLE"),audio_buf.index("R_READ_TIME_{}".format(temp_shi)),\ @@ -1845,15 +1869,15 @@ class BtnDevice(Abstract): pass elif self.sosKey_press_count == 6:# self.sosKey_press_count = 0 - EventMesh.publish("stop_led_timer")#设置参数 - EventMesh.publish("set_manual_measure_mode",2)#测量血氧 + # EventMesh.publish("stop_led_timer")#设置参数 + # EventMesh.publish("set_manual_measure_mode",2)#测量血氧 # EventMesh.publish("play_imei_event")#播報imei号 pass - # elif self.sosKey_press_count >= 5:#功能暂时屏蔽 - # self.sosKey_press_count = 0 - # # EventMesh.publish("stop_led_timer")#设置参数 - # # EventMesh.publish("set_manual_measure_mode",3)#测量体温 - # pass + elif self.sosKey_press_count >= 5:#功能暂时屏蔽 + self.sosKey_press_count = 0 + 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 EventMesh.publish("stop_led_timer")#设置参数 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 b68fc6b4..e92b866f 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 @@ -74,7 +74,7 @@ def main_init(): from protocol import MESSAGE_ProtoCol,TK_ProtoCol,LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,\ TEMP_ProtoCol,DLT_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,Time_ProtoCol,\ - ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol,bootoff_ProtoCol,WDSTART_ProtoCol,LOWBAT_ProtoCol,sosHome_dial_ProtoCol,SockManager,NetManager + ProtoColResolver,SILENCETIME2_ProtoCol,PHL_ProtoCol,MONITOR_ProtoCol,bootoff_ProtoCol,WDSTART_ProtoCol,LOWBAT_ProtoCol,sosHome_dial_ProtoCol,SockManager,NetManager import mgr as mgr print("init7:{}".format(utime.localtime())) @@ -174,6 +174,7 @@ def main_init(): pcr.add_support(LOWBAT_ProtoCol()) pcr.add_support(sosHome_dial_ProtoCol()) pcr.add_support(Time_ProtoCol()) + pcr.add_support(SILENCETIME2_ProtoCol()) sm = 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 0e0e7854..0b9a4ae8 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 @@ -1011,6 +1011,8 @@ class DeviceInfoManager(Abstract): get_temp_state = EventMesh.publish("get_temp_state") 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) @@ -1055,20 +1057,25 @@ class DeviceInfoManager(Abstract): if temp < 25 or temp > 42: temp = 0 EventMesh.publish("set_temp_state",0) - if temp > 0: + tmp_f_tmp = 0 + tmp_d_tmp = 0 + if str(temp).find(".") != -1: tmp_f = str(temp).split('.')[0] tmp_f_tmp = int(tmp_f) - - + tmp_d = str(temp).split('.')[1][:1] tmp_d_tmp = int(tmp_d) + else: + tmp_f_tmp = temp + + if temp != None: if temp != 0: 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("play_temp_value",0)#播放体温数值 + else: + EventMesh.publish("set_history_temp_value",0) + EventMesh.publish("play_temp_value",0)#播放体温数值 EventMesh.publish(constants.EVENT.STOP_TEMP) print("AUTO temp:{} tmp_f:{} tmp_f_tmp:{} tmp_d:{} tmp_d_tmp:{}".format(temp,tmp_f,tmp_f_tmp,tmp_d,tmp_d_tmp)) @@ -1088,21 +1095,25 @@ class DeviceInfoManager(Abstract): if temp < 25 or temp > 42: temp = 0 EventMesh.publish("set_temp_state",0) - if temp > 0: + tmp_f_tmp = 0 + tmp_d_tmp = 0 + if str(temp).find(".") != -1: tmp_f = str(temp).split('.')[0] tmp_f_tmp = int(tmp_f) - tmp_d = str(temp).split('.')[1][:1] tmp_d_tmp = int(tmp_d) - if temp != None: - if temp != 0: - 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("play_temp_value",0)#播放体温数值 + tmp_f_tmp = temp + + if temp != None: + if temp != 0: + 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("play_temp_value",0)#播放体温数值 EventMesh.publish(constants.EVENT.STOP_TEMP) print("once temp:{} tmp_f:{} tmp_f_tmp:{} tmp_d:{} tmp_d_tmp:{}".format(temp,tmp_f,tmp_f_tmp,tmp_d,tmp_d_tmp)) @@ -1134,81 +1145,214 @@ class DeviceInfoManager(Abstract): if temp < 25 or temp > 42: temp = 0 EventMesh.publish("set_temp_state",0) - if temp > 0: + tmp_f_tmp = 0 + tmp_d_tmp = 0 + if str(temp).find(".") != -1: tmp_f = str(temp).split('.')[0] tmp_f_tmp = int(tmp_f) - + tmp_d = str(temp).split('.')[1][:1] tmp_d_tmp = int(tmp_d) - if temp != None: - if temp != 0: - 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("play_temp_value",temp)#播放体温数值 else: - EventMesh.publish("set_history_temp_value",0) - EventMesh.publish("play_temp_value",0)#播放体温数值 + tmp_f_tmp = temp + + if temp != None: + if temp != 0: + 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("play_temp_value",0)#播放体温数值 EventMesh.publish(constants.EVENT.STOP_TEMP) print("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)) - - 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])) - 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)) - if self.get_hr_state != 1 and self.get_spo2_state != 1: - if self.get_hr_state == 0 and self.get_spo2_state == 0: - if self.HR_state == 0 or self.HR_state == 3: + if hr_time[0] != None: + 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])) + 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)) + if self.get_hr_state != 1 and self.get_spo2_state != 1: + if self.get_hr_state == 0 and self.get_spo2_state == 0: + if self.HR_state == 0 or self.HR_state == 3: + self.HR_Onestate = 0 + self.HR_OneTime = 0 + + if self.old_time != self.mearsure_timer:#重复修改测量间隔时间 + self.SENSOR_time = time_tmp#防止改变时间的时候正在开启测量突然10s就停止测量 + if self.get_hr_state == 2 and self.HR_state == 1:#自动检测的心率还在测量立马关了测试 + heart_value = EventMesh.publish(constants.EVENT.GET_HEART) + 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("play_hr_value",0)#测量失败 + print("stop debug1") + EventMesh.publish(constants.EVENT.STOP_HEART) + self.HR_state = 0 + elif self.get_spo2_state == 2 and self.HR_state == 2: + self.HR_state = 0 + 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_history_spo2_value",spo2_value) + EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) + else: + EventMesh.publish("play_spo2_value",0) + EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) + self.old_time = self.mearsure_timer + + if self.HR_state == 3 or self.HR_state == 0:# + if (time_tmp - self.SENSOR_time) >= self.mearsure_timer: + if self.get_spo2_state == 3 or self.get_hr_state == 3:#单次测量没有完毕优先测量间隔时间测量的 + if self.get_hr_state == 3: + print("stop debug2") + EventMesh.publish(constants.EVENT.STOP_HEART) + heart_value = EventMesh.publish(constants.EVENT.GET_HEART) + 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("play_hr_value",0) + + elif self.get_spo2_state == 3: + 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_history_spo2_value",spo2_value) + EventMesh.publish("set_old_spo2_data",spo2_value) + EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) + else: + EventMesh.publish("play_hr_value",0) + + self.HR_state = 0 + self.SENSOR_time = time_tmp + self.SENSOR_time = time_tmp + self.HR_state = 0 + + #print("time_tmp :{} self.SENSOR_time :{} time_tmp - self.SENSOR_time:{} self.HR_state:{}".format(time_tmp,self.SENSOR_time,time_tmp - self.SENSOR_time,self.HR_state)) + if (time_tmp - self.SENSOR_time) == 0 and self.HR_state == 0: + print("START_HEART:1") + EventMesh.publish("set_hr_state",2)#2代表后台进入测试 + EventMesh.publish(constants.EVENT.START_HEART) + self.HR_state = 1 self.HR_Onestate = 0 self.HR_OneTime = 0 - - if self.old_time != self.mearsure_timer:#重复修改测量间隔时间 - self.SENSOR_time = time_tmp#防止改变时间的时候正在开启测量突然10s就停止测量 - if self.get_hr_state == 2 and self.HR_state == 1:#自动检测的心率还在测量立马关了测试 + elif (time_tmp - self.SENSOR_time) >= 60 and self.HR_state == 1: + EventMesh.publish("set_hr_state",0)#2代表后台进入测试 + print("stop debug3") + EventMesh.publish(constants.EVENT.STOP_HEART) heart_value = EventMesh.publish(constants.EVENT.GET_HEART) + print("heart_value:{}".format(heart_value)) if heart_value > 50 and heart_value != None: - EventMesh.publish("play_hr_value",heart_value)#测量成功 + 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("play_hr_value",0)#测量失败 - print("stop debug1") - EventMesh.publish(constants.EVENT.STOP_HEART) - self.HR_state = 0 - elif self.get_spo2_state == 2 and self.HR_state == 2: - self.HR_state = 0 - 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_history_spo2_value",spo2_value) - EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) + EventMesh.publish(constants.PROTOCOL.HEART_SEND,heart_value)#上传心率数据 else: - EventMesh.publish("play_spo2_value",0) - EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) - self.old_time = self.mearsure_timer + EventMesh.publish("play_hr_value",0) + #获取心率数据上传数据app + print("STOP_HEART:") + + self.HR_state = 3 + # EventMesh.publish("set_spo2_state",2)#2代表后台进入血氧测试 + # EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 + # print("START_BLOOD_OXYGEN:") + # elif (time_tmp - self.SENSOR_time) >= 120 and self.HR_state == 2:#有需要再打开 + # print("STOP_BLOOD_OXYGEN:") + # EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 + # EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)#停止血氧测试 + # spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) + # print("spo2_value:{}".format(spo2_value)) + # if spo2_value > 85 and spo2_value != None: + # EventMesh.publish("set_old_spo2_data",spo2_value) + # EventMesh.publish("set_history_spo2_value",spo2_value) + # EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) + # self.HR_state = 3 + else: + self.HR_state = 0 + self.old_time = self.mearsure_timer - if self.HR_state == 3 or self.HR_state == 0:# - if (time_tmp - self.SENSOR_time) >= self.mearsure_timer: - if self.get_spo2_state == 3 or self.get_hr_state == 3:#单次测量没有完毕优先测量间隔时间测量的 + if self.HR_state == 3 or self.HR_state == 0:#只有不在测量的时候才测单次的 + if self.get_spo2_state == 3 or self.get_hr_state == 3:#单次测量 + self.HR_state = 0 + self.HR_OneTime+=1 + if self.HR_OneTime == 1 and self.HR_Onestate == 0: + print("hr..........\r\n") if self.get_hr_state == 3: - print("stop debug2") + self.Hr_Need_Open = 1 + EventMesh.publish("set_hr_state",3)#2代表后台进入测试 + EventMesh.publish(constants.EVENT.START_HEART) + else: + self.Hr_Need_Open = 0 + + if self.get_spo2_state == 3 and self.Hr_Need_Open == 0: + self.Spo2_Need_Open = 1 + EventMesh.publish("set_spo2_state",3)#2代表后台进入测试 + EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 + else: + self.Spo2_Need_Open = 0 + self.HR_Onestate = 1 + # print("self.HR_Onestate....3..:{} {} {} {} {}".format(self.HR_Onestate,self.get_hr_state,self.get_spo2_state,self.Hr_Need_Open,self.Spo2_Need_Open)) + elif self.HR_OneTime > 6 and self.HR_Onestate == 1: + # print("self.HR_Onestate...4....:{} {} {} {} {}".format(self.HR_Onestate,self.get_hr_state,self.get_spo2_state,self.Hr_Need_Open,self.Spo2_Need_Open)) + if self.Hr_Need_Open == 1:#需要关闭心率测量 + print("stop debug4") EventMesh.publish(constants.EVENT.STOP_HEART) heart_value = EventMesh.publish(constants.EVENT.GET_HEART) 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) + EventMesh.publish(constants.PROTOCOL.HEART_SEND,heart_value)#上传心率数据 + EventMesh.publish("play_hr_value",heart_value) else: EventMesh.publish("play_hr_value",0) + + if self.Spo2_Need_Open == 0 and self.get_spo2_state == 3: + EventMesh.publish("set_spo2_state",3)#2代表后台进入血氧测试 + EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 + + self.HR_Onestate = 2 + self.set_hsenor_crt = 2#血氧关闭 + else: + self.HR_Onestate = 0 + self.HR_OneTime = 0 + self.set_hsenor_crt = 0# - elif self.get_spo2_state == 3: - EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) + EventMesh.publish("set_hr_state",0)#2代表后台进入血氧测试 + EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 + else: + if self.Spo2_Need_Open == 1:#停止测试血氧 + EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 + EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)#K开血氧 + spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) + + if spo2_value > 85 and spo2_value != None: + EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) + EventMesh.publish("play_spo2_value",spo2_value) + EventMesh.publish("set_history_spo2_value",spo2_value) + else: + EventMesh.publish("play_spo2_value",0) + + if self.Hr_Need_Open == 0 and self.get_hr_state == 3: + EventMesh.publish("set_hr_state",3)#2代表后台进入测试 + EventMesh.publish(constants.EVENT.START_HEART) + self.HR_Onestate = 2 + self.set_hsenor_crt = 1#心率 + else: + self.HR_Onestate = 0 + self.HR_OneTime = 0 + self.set_hsenor_crt = 2#血氧关闭 + + + elif self.HR_OneTime > 6+6 and self.HR_Onestate == 2: + print("HR_OneTime:....05") + if self.set_hsenor_crt == 2: + 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_history_spo2_value",spo2_value) @@ -1217,59 +1361,41 @@ class DeviceInfoManager(Abstract): else: EventMesh.publish("play_hr_value",0) - self.HR_state = 0 - self.SENSOR_time = time_tmp - self.SENSOR_time = time_tmp - self.HR_state = 0 - - #print("time_tmp :{} self.SENSOR_time :{} time_tmp - self.SENSOR_time:{} self.HR_state:{}".format(time_tmp,self.SENSOR_time,time_tmp - self.SENSOR_time,self.HR_state)) - if (time_tmp - self.SENSOR_time) == 0 and self.HR_state == 0: - print("START_HEART:1") - EventMesh.publish("set_hr_state",2)#2代表后台进入测试 - EventMesh.publish(constants.EVENT.START_HEART) - self.HR_state = 1 - self.HR_Onestate = 0 - self.HR_OneTime = 0 - elif (time_tmp - self.SENSOR_time) >= 60 and self.HR_state == 1: - EventMesh.publish("set_hr_state",0)#2代表后台进入测试 - print("stop debug3") - EventMesh.publish(constants.EVENT.STOP_HEART) - heart_value = EventMesh.publish(constants.EVENT.GET_HEART) - print("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)#上传心率数据 + elif self.set_hsenor_crt == 1: + EventMesh.publish("set_hr_state",0)#0代表g关闭测试 + print("stop debug5") + EventMesh.publish(constants.EVENT.STOP_HEART) + heart_value = EventMesh.publish(constants.EVENT.GET_HEART) + if heart_value > 50 and heart_value != None: + EventMesh.publish("set_history_hr_value",heart_value) + EventMesh.publish("play_hr_value",heart_value) + EventMesh.publish(constants.PROTOCOL.HEART_SEND,heart_value)#上传心率数据 + else: + EventMesh.publish("play_hr_value",0) + self.HR_Onestate = 0 else: - EventMesh.publish("play_hr_value",0) - #获取心率数据上传数据app - print("STOP_HEART:") - - self.HR_state = 3 - # EventMesh.publish("set_spo2_state",2)#2代表后台进入血氧测试 - # EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 - # print("START_BLOOD_OXYGEN:") - # elif (time_tmp - self.SENSOR_time) >= 120 and self.HR_state == 2:#有需要再打开 - # print("STOP_BLOOD_OXYGEN:") - # EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 - # EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)#停止血氧测试 - # spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) - # print("spo2_value:{}".format(spo2_value)) - # if spo2_value > 85 and spo2_value != None: - # EventMesh.publish("set_old_spo2_data",spo2_value) - # EventMesh.publish("set_history_spo2_value",spo2_value) - # EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) - # self.HR_state = 3 - else: - self.HR_state = 0 - self.old_time = self.mearsure_timer + if self.get_spo2_state == 2 or self.get_hr_state == 2:#单次测量 + if self.get_hr_state == 2: + EventMesh.publish("set_hr_state",0)#2代表后台进入血氧测试 + EventMesh.publish(constants.EVENT.STOP_HEART) + elif self.get_spo2_state == 2: + EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 + EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) + self.HR_state = 0 + self.HR_Onestate = 0 + self.HR_OneTime = 0 + self.set_hsenor_crt = 0 + else: + #print("hr......01....{} {} self.HR_Onestate {} {}".format(self.get_hr_state,self.get_spo2_state,self.HR_OneTime,self.HR_Onestate)) + self.SENSOR_time = time_tmp#进入最后一次的时间戳 + self.old_time = 0 - if self.HR_state == 3 or self.HR_state == 0:#只有不在测量的时候才测单次的 + self.set_hsenor_crt = 0 + if self.get_hr_state != 1 and self.get_spo2_state != 1:#没有设置间隔时间单次测量 if self.get_spo2_state == 3 or self.get_hr_state == 3:#单次测量 self.HR_state = 0 self.HR_OneTime+=1 if self.HR_OneTime == 1 and self.HR_Onestate == 0: - print("hr..........\r\n") if self.get_hr_state == 3: self.Hr_Need_Open = 1 EventMesh.publish("set_hr_state",3)#2代表后台进入测试 @@ -1284,31 +1410,29 @@ class DeviceInfoManager(Abstract): else: self.Spo2_Need_Open = 0 self.HR_Onestate = 1 - # print("self.HR_Onestate....3..:{} {} {} {} {}".format(self.HR_Onestate,self.get_hr_state,self.get_spo2_state,self.Hr_Need_Open,self.Spo2_Need_Open)) + elif self.HR_OneTime > 6 and self.HR_Onestate == 1: - # print("self.HR_Onestate...4....:{} {} {} {} {}".format(self.HR_Onestate,self.get_hr_state,self.get_spo2_state,self.Hr_Need_Open,self.Spo2_Need_Open)) + print("stop_heart Onec ") if self.Hr_Need_Open == 1:#需要关闭心率测量 - print("stop debug4") + print("stop debug6") EventMesh.publish(constants.EVENT.STOP_HEART) heart_value = EventMesh.publish(constants.EVENT.GET_HEART) + print("stop_heart 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)#上传心率数据 - EventMesh.publish("play_hr_value",heart_value) else: EventMesh.publish("play_hr_value",0) - if self.Spo2_Need_Open == 0 and self.get_spo2_state == 3: EventMesh.publish("set_spo2_state",3)#2代表后台进入血氧测试 EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 - self.HR_Onestate = 2 self.set_hsenor_crt = 2#血氧关闭 else: self.HR_Onestate = 0 self.HR_OneTime = 0 self.set_hsenor_crt = 0# - EventMesh.publish("set_hr_state",0)#2代表后台进入血氧测试 EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 else: @@ -1316,11 +1440,11 @@ class DeviceInfoManager(Abstract): EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)#K开血氧 spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) - + print("spo2_value:{}.......01..".format(spo2_value)) if spo2_value > 85 and spo2_value != None: - EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) EventMesh.publish("play_spo2_value",spo2_value) EventMesh.publish("set_history_spo2_value",spo2_value) + EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) else: EventMesh.publish("play_spo2_value",0) @@ -1333,29 +1457,27 @@ class DeviceInfoManager(Abstract): self.HR_Onestate = 0 self.HR_OneTime = 0 self.set_hsenor_crt = 2#血氧关闭 - + print("STOP_BLOOD_OXYGEN:....06.....") elif self.HR_OneTime > 6+6 and self.HR_Onestate == 2: - print("HR_OneTime:....05") if self.set_hsenor_crt == 2: 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_history_spo2_value",spo2_value) - EventMesh.publish("set_old_spo2_data",spo2_value) EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) else: - EventMesh.publish("play_hr_value",0) - + EventMesh.publish("play_spo2_value",0) elif self.set_hsenor_crt == 1: EventMesh.publish("set_hr_state",0)#0代表g关闭测试 - print("stop debug5") + print("stop debug7") EventMesh.publish(constants.EVENT.STOP_HEART) heart_value = EventMesh.publish(constants.EVENT.GET_HEART) if heart_value > 50 and heart_value != None: - EventMesh.publish("set_history_hr_value",heart_value) 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("play_hr_value",0) @@ -1368,118 +1490,9 @@ class DeviceInfoManager(Abstract): elif self.get_spo2_state == 2: EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) - self.HR_state = 0 self.HR_Onestate = 0 self.HR_OneTime = 0 - self.set_hsenor_crt = 0 - else: - #print("hr......01....{} {} self.HR_Onestate {} {}".format(self.get_hr_state,self.get_spo2_state,self.HR_OneTime,self.HR_Onestate)) - self.SENSOR_time = time_tmp#进入最后一次的时间戳 - self.old_time = 0 - - self.set_hsenor_crt = 0 - if self.get_hr_state != 1 and self.get_spo2_state != 1:#没有设置间隔时间单次测量 - if self.get_spo2_state == 3 or self.get_hr_state == 3:#单次测量 - self.HR_state = 0 - self.HR_OneTime+=1 - if self.HR_OneTime == 1 and self.HR_Onestate == 0: - if self.get_hr_state == 3: - self.Hr_Need_Open = 1 - EventMesh.publish("set_hr_state",3)#2代表后台进入测试 - EventMesh.publish(constants.EVENT.START_HEART) - else: - self.Hr_Need_Open = 0 - - if self.get_spo2_state == 3 and self.Hr_Need_Open == 0: - self.Spo2_Need_Open = 1 - EventMesh.publish("set_spo2_state",3)#2代表后台进入测试 - EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 - else: - self.Spo2_Need_Open = 0 - self.HR_Onestate = 1 - - elif self.HR_OneTime > 6 and self.HR_Onestate == 1: - print("stop_heart Onec ") - if self.Hr_Need_Open == 1:#需要关闭心率测量 - print("stop debug6") - EventMesh.publish(constants.EVENT.STOP_HEART) - heart_value = EventMesh.publish(constants.EVENT.GET_HEART) - print("stop_heart 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("play_hr_value",0) - if self.Spo2_Need_Open == 0 and self.get_spo2_state == 3: - EventMesh.publish("set_spo2_state",3)#2代表后台进入血氧测试 - EventMesh.publish(constants.EVENT.START_BLOOD_OXYGEN)#K开血氧 - self.HR_Onestate = 2 - self.set_hsenor_crt = 2#血氧关闭 - else: - self.HR_Onestate = 0 - self.HR_OneTime = 0 - self.set_hsenor_crt = 0# - EventMesh.publish("set_hr_state",0)#2代表后台进入血氧测试 - EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 - else: - if self.Spo2_Need_Open == 1:#停止测试血氧 - EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 - EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)#K开血氧 - spo2_value = EventMesh.publish(constants.EVENT.GET_BLOOD_OXYGEN) - print("spo2_value:{}.......01..".format(spo2_value)) - if spo2_value > 85 and spo2_value != None: - EventMesh.publish("play_spo2_value",spo2_value) - EventMesh.publish("set_history_spo2_value",spo2_value) - EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) - else: - EventMesh.publish("play_spo2_value",0) - - if self.Hr_Need_Open == 0 and self.get_hr_state == 3: - EventMesh.publish("set_hr_state",3)#2代表后台进入测试 - EventMesh.publish(constants.EVENT.START_HEART) - self.HR_Onestate = 2 - self.set_hsenor_crt = 1#心率 - else: - self.HR_Onestate = 0 - self.HR_OneTime = 0 - self.set_hsenor_crt = 2#血氧关闭 - print("STOP_BLOOD_OXYGEN:....06.....") - - elif self.HR_OneTime > 6+6 and self.HR_Onestate == 2: - if self.set_hsenor_crt == 2: - 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_history_spo2_value",spo2_value) - EventMesh.publish(constants.PROTOCOL.OXYGEN_SEND,spo2_value) - else: - EventMesh.publish("play_spo2_value",0) - elif self.set_hsenor_crt == 1: - EventMesh.publish("set_hr_state",0)#0代表g关闭测试 - print("stop debug7") - EventMesh.publish(constants.EVENT.STOP_HEART) - heart_value = EventMesh.publish(constants.EVENT.GET_HEART) - 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("play_hr_value",0) - self.HR_Onestate = 0 - else: - if self.get_spo2_state == 2 or self.get_hr_state == 2:#单次测量 - if self.get_hr_state == 2: - EventMesh.publish("set_hr_state",0)#2代表后台进入血氧测试 - EventMesh.publish(constants.EVENT.STOP_HEART) - elif self.get_spo2_state == 2: - EventMesh.publish("set_spo2_state",0)#2代表后台进入血氧测试 - EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN) - self.HR_Onestate = 0 - self.HR_OneTime = 0 - self.old_time = 0 + self.old_time = 0 else: self.old_temp_time = 0 self.old_time = 0 @@ -1505,21 +1518,25 @@ class DeviceInfoManager(Abstract): if temp < 25 or temp > 42: temp = 0 EventMesh.publish("set_temp_state",0) - if temp > 0: + tmp_f_tmp = 0 + tmp_d_tmp = 0 + if str(temp).find(".") != -1: tmp_f = str(temp).split('.')[0] tmp_f_tmp = int(tmp_f) tmp_d = str(temp).split('.')[1][:1] tmp_d_tmp = int(tmp_d) - - if temp != None: - if temp != 0: - 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("play_temp_value",0)#播放体温数值 + tmp_f_tmp = temp + + if temp != None: + if temp != 0: + 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("play_temp_value",0)#播放体温数值 EventMesh.publish(constants.EVENT.STOP_TEMP) self.SENSOR_time = time_tmp @@ -1580,25 +1597,28 @@ class DeviceInfoManager(Abstract): temp = 0 print("temp",temp) EventMesh.publish("set_temp_state",0) - if temp > 0: + tmp_f_tmp = 0 + tmp_d_tmp = 0 + if str(temp).find(".") != -1: tmp_f = str(temp).split('.')[0] tmp_f_tmp = int(tmp_f) tmp_d = str(temp).split('.')[1][:1] tmp_d_tmp = int(tmp_d) - - if temp != None: - if temp != 0: - 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("play_temp_value",0)#播放体温数值 + tmp_f_tmp = temp + + if temp != None: + if temp != 0: + 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("play_temp_value",0)#播放体温数值 EventMesh.publish(constants.EVENT.STOP_TEMP) - pass - + EventMesh.publish("play_unread_wechat_infor")#每10s检测是否有未读语音数据 usb_state = EventMesh.publish("get_usb")# @@ -1608,7 +1628,7 @@ class DeviceInfoManager(Abstract): # print("battery[1]",battery[1]) if self.vbat_full_flag <= 120: self.vbat_full_flag+=10 - if self.vbat_full_flag == 80:#开机检测一次如果是充电标识为1就不再提示 + if self.vbat_full_flag == 60:#开机检测一次如果是充电标识为1就不再提示 if usb_state != 1: EventMesh.publish("set_usb",1)# else: @@ -2473,7 +2493,7 @@ class AddrBookManager(Abstract): name = '' key_tmp = '' if self.read_phonebook != {}: - if len(self.read_phonebook) >= 2: + if len(self.read_phonebook) >= 3: phonebook_keys = sorted(self.read_phonebook.keys()) name = self.read_phonebook[phonebook_keys[2]] key_tmp = phonebook_keys[2] @@ -3211,7 +3231,9 @@ class getBootOffManager(Abstract):#开关机时间 self.off_msg = {} self.off_flag = 0 self.rtc = RTC() - + self.off_on = 1 + self.off_start = "06:00" + self.off_end = "23:00" read_data = EventMesh.publish("get_storage_config","off_on") if read_data != None: self.off_on = read_data @@ -3228,26 +3250,24 @@ class getBootOffManager(Abstract):#开关机时间 EventMesh.subscribe("get_boot_off_time", self.get_boot_off_time) def set_boot_off_time(self, event, msg): - EventMesh.publish("get_storage_config",["off_on",msg[0]]) - EventMesh.publish("get_storage_config",["off_start",msg[1]]) - EventMesh.publish("get_storage_config",["off_end",msg[2]]) + EventMesh.publish("set_storage_config",["off_on",msg[0]]) + EventMesh.publish("set_storage_config",["off_start",msg[1]]) + EventMesh.publish("set_storage_config",["off_end",msg[2]]) self.off_msg = msg def get_boot_off_time(self, event, msg): - flag = 0 - msg_tmp = EventMesh.publish("get_check_alarm_list") - # print("len(msg_tmp):{} len(self.off_msg):{}".format(msg_tmp,len(self.off_msg))) - if len(self.off_msg) > 0: - if msg_tmp > len(self.off_msg)-1:#判断闹钟是否有数据 总的数据大于开关机的时间 说明有闹钟列表 - flag = 1 - else: - flag = 0 - else: - if msg_tmp > 0: - flag = 1 - - return [self.off_msg,flag] + self.off_on = EventMesh.publish("get_storage_config","off_on") + self.off_start = EventMesh.publish("get_storage_config","off_start") + self.off_end = EventMesh.publish("get_storage_config","off_end") + if self.off_on == None: + self.off_on = 1 + if self.off_start == None: + self.off_start = "06:00" + + if self.off_on == None: + self.off_on = "23:00" + return [self.off_on,self.off_start,self.off_end] class setSmsIndexManager(Abstract):# def __init__(self): self.index = -1 @@ -3325,8 +3345,11 @@ class deleteSmsManager(Abstract):#删除信息 sms.deleteMsg(1,4) #闹钟信息 -alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [], 'minute': 39}, - {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}] +alarm_list = [{'hour': 23, 'repeart': 10, 'idx': 0, 'enabled': 1, 'days': [0,1,2,3,4,5,6], 'minute': 0}, + {'hour': 6, 'repeart': 10, 'idx': 1, 'enabled': 1, 'days': [0,1,2,3,4,5,6], 'minute': 0}, + {'hour': 16, 'repeart': 10, 'idx': 2, 'enabled': 0, 'days': [], 'minute': 39}, + {'hour': 16, 'repeart': 10, 'idx': 3, 'enabled': 0, 'days': [], 'minute': 39}, + {'hour': 16, 'repeart': 10, 'idx': 4, 'enabled': 0, 'days': [], 'minute': 39}] #用于显示闹钟列表不包含开关机信息 class ClockManager(Abstract): @@ -3395,63 +3418,28 @@ class ClockManager(Abstract): global alarm_list EventMesh.publish("read_alarminjson") - idx = len(alarm_list) - - # msg = ['1','06:90','23:59'] - count = 1 - new = 0 - num = 0 print("msg:{}".format(msg)) - # if msg[0] == 1: - # msg_new = msg[1] for i in range(0,2):#开关机固定是 idx 0 1 off_msg1 = msg[i+1] msg_tmp1 = off_msg1.split(':') start_hour = int(msg_tmp1[0]) start_min = int(msg_tmp1[1]) enable = int(msg[0]) + print("start_hour:{} start_min:{} enable:{}",start_hour,start_min,enable) EventMesh.publish("set_boot_off_time",[msg[0],msg[1],msg[2]]) - if alarm_list and new == 0 : - for x in range(0,5): - # print("count :{} self.alarm_list:111111{} len(self.alarm_list):{}".format(count,alarm_list,len(alarm_list))) - if new == 1 and count > len(alarm_list): - break - tmp = alarm_list[count-1]['idx'] - if tmp == 0 or tmp == 1:#覆盖旧的 - alarm_list[count-1] = {"idx": tmp, "hour": start_hour, "minute": start_min, "days":[0,1,2,3,4,5,6], "enabled": enable,"repeart":10} - count+=1 - if count > len(alarm_list): - new = 1 - # print("self.alarm_list:5555 {}".format(alarm_list)) - break - else:#添加最新的 - count+=1 - if tmp == 2 or tmp == 3 or tmp == 4:#添加最新的 - msg_tmp = EventMesh.publish("get_boot_off_time") - # print("msg_tmp all_data {}".format(msg_tmp)) - if msg_tmp != None: - if len(msg_tmp[0]) > 0:#只有关机时间长度为0时才添加新元素 不是就覆盖原来旧的数据 - # print("self.alarm_list:444444 {}".format(alarm_list)) - if count > len(alarm_list): - new = 1 - continue - else: - alarm_list.append({"idx": num, "hour": start_hour, "minute": start_min, "days":[0,1,2,3,4,5,6], "enabled": enable,"repeart":10}) - # print("self.alarm_list:7777777 {}".format(alarm_list)) - if count > len(alarm_list): - new = 1 - break - count+=1 - # print("self.alarm_list:111111 {}".format(alarm_list)) - - else:#添加最新的 - alarm_list.append({"idx": num, "hour": start_hour, "minute": start_min, "days":[0,1,2,3,4,5,6], "enabled": enable,"repeart":10}) - new = 1 - num+=1 - # print("add_here-----idx:{} msg:{} alarm_list:{}".format(idx,msg,alarm_list)) + + alarm_list[i]["idx"]=i + alarm_list[i]["hour"]=start_hour + alarm_list[i]["minute"]=start_min + alarm_list[i]["days"]=[0,1,2,3,4,5,6] + alarm_list[i]["enabled"]=enable + alarm_list[i]["repeart"]=10 + + + # alarm_list.append({"idx": i, "hour": start_hour, "minute": start_min, "days":[0,1,2,3,4,5,6], "enabled": enable,"repeart":10}) - print("alarm_list----len- :{}".format(len(alarm_list))) + # print("alarm_list----len- :{} alarm_list:{}".format(len(alarm_list),alarm_list)) with open("/usr/static/storage_file/alarm_msg.json", 'w+',encoding='utf-8') as fd: ujson.dump(alarm_list,fd) EventMesh.publish("push_update_alarm_show") @@ -3488,7 +3476,7 @@ class ClockManager(Abstract): return self.idx def _rtc_callback(self,args): - print("---!!!!!!alarm_ring!!!!!!!---,idx:",args) + print("---!!!!!!pfff neew alarm_ring!!!!!!!---,idx:",args) global alarm_list EventMesh.publish("read_alarminjson") idx = self.idx @@ -3503,35 +3491,132 @@ class ClockManager(Abstract): alarm_list[idx]["enabled"] = False with open("/usr/static/storage_file/alarm_msg.json", 'w+',encoding='utf-8') as fd: ujson.dump(alarm_list,fd) - EventMesh.publish("set_rtc_alarm") + #设置下一个闹钟,定时开关机功能 - if 0 : - msg_data = EventMesh.publish("get_boot_off_time") - print("msg_tmp:{}".format(msg_data)) - - msg_tmp = msg_data[0] - off_tmp2 = msg_tmp[2] - msg_tmp2 = off_tmp2.split(':') - end_min = int(msg_tmp2[0])*60+int(msg_tmp2[1]) + msg_data = EventMesh.publish("get_boot_off_time") + print("msg_tmp:{}".format(msg_data)) + off_on = 1 + off_start = "06:00" + off_end = "23:00" + if msg_data[0] != None: + off_on = int(msg_data[0]) + if msg_data[1] != None: + off_start = msg_data[1]#开始时间 + + if msg_data[2] != None: + off_end = msg_data[2]#开始时间 + + off_time1 = int(off_start.split(":")[0]) + off_time2 = int(off_start.split(":")[1]) - rtc_now_time = self.rtc.datetime() - current = rtc_now_time[4]*60+rtc_now_time[5] - - print("end_min:{} current:{} off_tmp2:{}".format(end_min,current,off_tmp2)) - if end_min == current:#结束的时间分钟等于关机时间分钟数则关机 - # EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) - return + start_min = int(off_start.split(":")[0])*60+int(off_start.split(":")[1]) + end_min = int(off_end.split(":")[0])*60+int(off_end.split(":")[1]) + + rtc_now_time = self.rtc.datetime() + current = rtc_now_time[4]*60+rtc_now_time[5] + cur_day = rtc_now_time[3] + print("off_on:{} current:{} start_min:{} end_min:{}".format(off_on,current,start_min,end_min)) + if off_on != None: + if off_on == 1: + if end_min == current:#结束的时间分钟等于关机时间分钟数则关机 + ubs_state = EventMesh.publish("get_usb")#' + start_day = 0 # 周日 + end_minute = 60*24*7 + next_minute = off_time1*60+off_time2 #10:11 + current_minute = rtc_now_time[4]*60 + rtc_now_time[5] + + if next_minute >= current_minute:#开机时间大于当前时间 9:00 > = 8:00 + interval_minute = next_minute - current_minute + + print("关机距离下一次响铃的的分钟数:", interval_minute,next_minute) + else:#8:00 9:00 + #7*60*24 7天一个周期 7*60*24 - + interval_minute = next_minute + 24*60 + print("关机08888距离下一次响铃的的分钟数:", interval_minute,next_minute) + + #反向获取时间戳 + time = utime.localtime() + print("关机09获取utime的时间戳:", time) + rtc_mktime = utime.mktime(time) + print("关机10反向获取utime的mktime:", rtc_mktime) + + #加上下一次响铃需要的时间 + next_alarm_mktime = rtc_mktime + interval_minute*60 #转换成s单位 时间戳 + print("关机11下一次响铃的mktime:", next_alarm_mktime) + + #格式化时间戳,得到下一次闹钟的时间 + next_alarm_time = utime.localtime(next_alarm_mktime) + print("关机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) + print("关机13将该时间转换为RTC元组:", data_e) + + self.rtc.register_callback(self._rtc_callback) + FLAG = self.rtc.set_alarm(data_e) + if FLAG == 0: + print("开机11成功设置rtc的到期时间:", data_e) + else: + print("开机时设置rtc的到期时间失败:", data_e) + self.rtc.enable_alarm(1) + if ubs_state == 2 or ubs_state == 0: + print("结束时设置rtc的到期时间失败:", data_e) + EventMesh.publish("open_power_on", 5)#静音关机 + return + else: + print("结束111开机时设置rtc的到期时间失败:", data_e) + return - # get_hr_state = EventMesh.publish("get_hr_state") - # get_spo2_state = EventMesh.publish("get_spo2_state") - # if get_hr_state != None or get_spo2_state != None: - # if get_hr_state != 1 and get_spo2_state != 1: - EventMesh.publish("OPEN_ALARM_RING")#闹钟到点响铃 - # EventMesh.publish("load_screen", {"screen": "popup_alarm"}) - # def _reset_rtc_alarm_time(self, args): - # print("---alarm_ring---") + EventMesh.publish("set_rtc_alarm") + alarm_flag = 0 + day = [] + enable = 0 + total_min = 0 + if off_on != None: + if off_on == 1: + # print("alarm_list:{}".format(alarm_list)) + for idx in range(0,len(alarm_list)): + hour = int(alarm_list[idx]["hour"]) + min = int(alarm_list[idx]["minute"]) + day = alarm_list[idx]["days"] + enable = int(alarm_list[idx]["enabled"]) + repeart = int(alarm_list[idx]["repeart"]) + total_min = hour*60+min + # print("hour",hour,min,day,enable,repeart,total_min,start_min) + if enable == 1: + if repeart != 10: + if len(day) == 0 and enable == 1:#单次闹钟 + if total_min == start_min and enable == 1:#如果闹钟时间和开机时间一致啧响铃否则不响铃 + EventMesh.publish("OPEN_ALARM_RING")#闹钟到点响铃 + alarm_flag = 1# + break + else: + continue + else: + if (cur_day in day) and enable == 1: + if total_min == start_min and enable == 1:#如果闹钟时间和开机时间一致啧响铃否则不响铃 + # print("alarm_ring22222") + EventMesh.publish("OPEN_ALARM_RING")#闹钟到点响铃 + alarm_flag = 1 + break + else: + continue + else: + continue + else: + alarm_flag = 0 + # print("start_min",start_min,current,alarm_flag) + if (start_min != current and alarm_flag == 0) or off_on == 0: + EventMesh.publish("OPEN_ALARM_RING")#闹钟到点响铃 + def set_rtc_alarm(self,event,msg): global alarm_list @@ -3596,17 +3681,18 @@ class ClockManager(Abstract): next_index = current_index + 1 if next_index >= len(minute_list): next_minute = minute_list[0] - print("07下一个闹钟的分钟数:", next_minute) + print("0744下一个闹钟的分钟数:", next_minute) else: next_minute = minute_list[next_index] - print("07下一个闹钟的分钟数:", next_minute) + print("0744下一个闹钟的分钟数:", next_minute) if next_minute >= current_minute: interval_minute = next_minute - current_minute - print("08距离下一次响铃的的分钟数:", interval_minute) + print("08666距离下一次响铃的的分钟数:", interval_minute) else: + #7*60*24 7天一个周期 7*60*24 - interval_minute = end_minute - current_minute + next_minute - print("08距离下一次响铃的的分钟数:", interval_minute) + print("08888距离下一次响铃的的分钟数:", interval_minute) #反向获取时间戳 time = utime.localtime() 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 0d7aa643..a500f786 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 @@ -25,8 +25,9 @@ import usys def server_init(server_type = None): #服务器选择1,防走丢,2大锤,3三基同创,4童信,5云米,6荣为 if server_type == None: - server_type = 4 + server_type = 1 #print("server_init:server_type:{}".format(server_type)) + d_server_addr = "api.xcloudtech.com" d_server_port = 9000 d_md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP" @@ -61,6 +62,11 @@ def server_init(server_type = None): d_server_port = 9968 d_md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP" d_PID = "SZKW" + elif server_type == 7: + d_server_addr = "8.134.68.15" + d_server_port = 30346 + d_PID="KnHnj1Cd5VxcO3Ft" + d_md5_key = "evxThVhMBmRNiQ1Twigw" return [d_server_addr,d_server_port,d_md5_key,d_PID] from queue import Queue def unicode_to_utf8(src): @@ -780,54 +786,37 @@ class REMIND_ProtoCol(ProtoCol): msg_tmp = msg_tmp[1] alarm_new = EventMesh.publish("read_alarminjson") - # print("alarm_list:{} msg_tmp:{}",alarm_new,msg_tmp) + print("alarm_new start:{}",alarm_new) k=1 count = 0 - - for i in range(len(str(msg_tmp))):#寻找有多少个,号 - if msg_tmp[i] == ',':#, , , - k+=1 - # if len(alarm_new) < 5 : - # alarm_new = [] - # for i in range(5): - # alarm_new.append({'hour': 8, 'repeart': 10, 'idx': i, 'enabled': 0, 'days': [], 'minute': 39}) - # print("len",len(alarm_new),alarm_new) - if len(alarm_new) > 2: - for i in range(0,len(alarm_new)-2): - # print("alarm_new_tmp",alarm_new) - del alarm_new[2] - # print("alarm_new:{}",alarm_new) - for j in range(2,2+k):#0 1是开关机,234是闹钟 - alarm_day = [] - alarm_week = [] - alarm_total_data = [] - # print("j!!!!!!!!!!",j) - if k == 1: - if len(msg_tmp) != 0: - alarm_data = msg_tmp.split('-')#-作为分隔符 - alarm_switch = int(alarm_data[1])#开关 - alarm_day_num = int(alarm_data[2])#天 - alarm_time = alarm_data[0]#时间 - alarm_time_tmp = alarm_time.split(':')#冒号分隔时间 时 分 - alarm_time_hour = int(alarm_time_tmp[0]) - alarm_time_min = int(alarm_time_tmp[1]) - if alarm_day_num == 3: - alarm_week = alarm_data[3]#星期 - - if alarm_day_num == 2:#每一天 - alarm_day = [1,2,3,4,5,6,0] - elif alarm_day_num == 3:#自定义 - for i in range(0,7): - if alarm_week[i] != '0': - alarm_day.append(i) - alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) - else: - if len(msg_tmp) != 0: - alarm_total_data = msg_tmp.split(',')[count] - count+=1 - b = alarm_total_data.find('-') - if b != -1: - alarm_data = alarm_total_data.split('-')#-作为分隔符 + if len(msg_tmp) == 0: + for j in range(2,5):#0 1是开关机,234是闹钟#5-1 0 1 2 3 4 5-1 = 4 3 4 k = 1 1+2+j = + alarm_new[j+2]["idx"] = 2+j + alarm_new[j+2]["hour"] = 16 + alarm_new[j+2]["minute"] = 16 + alarm_new[j+2]["days"] = [] + alarm_new[j+2]["enabled"] = 0 + alarm_new[j+2]["repeart"] = 10 + else: + for i in range(len(str(msg_tmp))):#寻找有多少个,号 + if msg_tmp[i] == ',':#, , , + k+=1 + # if len(alarm_new) > 2: + # for i in range(0,len(alarm_new)-2): + # # print("alarm_new_tmp",alarm_new) + # del alarm_new[2] + # print("alarm_new:{}",alarm_new) + for j in range(2,2+k):#0 1是开关机,234是闹钟 + print("j",j,j+2,2+k,k) + if j > 4: + break + alarm_day = [] + alarm_week = [] + alarm_total_data = [] + # print("j!!!!!!!!!!",j) + if k == 1: + if len(msg_tmp) != 0: + alarm_data = msg_tmp.split('-')#-作为分隔符 alarm_switch = int(alarm_data[1])#开关 alarm_day_num = int(alarm_data[2])#天 alarm_time = alarm_data[0]#时间 @@ -843,10 +832,54 @@ class REMIND_ProtoCol(ProtoCol): for i in range(0,7): if alarm_week[i] != '0': alarm_day.append(i) - alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) - - # print("alarm_new end:{}",alarm_new) - + alarm_new[j]["idx"] = j + alarm_new[j]["hour"] = alarm_time_hour + alarm_new[j]["minute"] = alarm_time_min + alarm_new[j]["days"] = alarm_day + alarm_new[j]["enabled"] = alarm_switch + alarm_new[j]["repeart"] = alarm_day_num + # alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) + else: + if len(msg_tmp) != 0: + alarm_total_data = msg_tmp.split(',')[count] + count+=1 + if len(alarm_total_data) > 0: + b = alarm_total_data.find('-') + if b != -1: + alarm_data = alarm_total_data.split('-')#-作为分隔符 + alarm_switch = int(alarm_data[1])#开关 + alarm_day_num = int(alarm_data[2])#天 + alarm_time = alarm_data[0]#时间 + alarm_time_tmp = alarm_time.split(':')#冒号分隔时间 时 分 + alarm_time_hour = int(alarm_time_tmp[0]) + alarm_time_min = int(alarm_time_tmp[1]) + if alarm_day_num == 3: + alarm_week = alarm_data[3]#星期 + + if alarm_day_num == 2:#每一天 + alarm_day = [1,2,3,4,5,6,0] + elif alarm_day_num == 3:#自定义 + for i in range(0,7): + if alarm_week[i] != '0': + alarm_day.append(i) + print("j+2",j+2) + alarm_new[j]["idx"] = j + alarm_new[j]["hour"] = alarm_time_hour + alarm_new[j]["minute"] = alarm_time_min + alarm_new[j]["days"] = alarm_day + alarm_new[j]["enabled"] = alarm_switch + alarm_new[j]["repeart"] = alarm_day_num + # alarm_new.append({"idx": j, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) + + print("alarm_new end:{}",alarm_new) + for j in range(2,5-k):#0 1是开关机,234是闹钟#5-1 0 1 2 3 4 5-1 = 4 3 4 k = 1 1+2+j = + alarm_new[j+k]["idx"] = k+j + alarm_new[j+k]["hour"] = 16 + alarm_new[j+k]["minute"] = 16 + alarm_new[j+k]["days"] = [] + alarm_new[j+k]["enabled"] = 0 + alarm_new[j+k]["repeart"] = 10 + with open("/usr/static/storage_file/alarm_msg.json", 'w',encoding='utf-8') as fd: ujson.dump(alarm_new,fd) EventMesh.publish("push_update_alarm_show") diff --git a/2.sdk/project/D10/usr/static/R_CHARGE_IN.mp3 b/2.sdk/project/D10/usr/static/R_CHARGE_IN.mp3 new file mode 100644 index 00000000..59620b2d Binary files /dev/null and b/2.sdk/project/D10/usr/static/R_CHARGE_IN.mp3 differ diff --git a/2.sdk/project/D10/usr/static/R_CHARGE_OUT.mp3 b/2.sdk/project/D10/usr/static/R_CHARGE_OUT.mp3 new file mode 100644 index 00000000..5693eff5 Binary files /dev/null and b/2.sdk/project/D10/usr/static/R_CHARGE_OUT.mp3 differ diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py index 1e440b68..b2746a81 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/alarm.py @@ -11,7 +11,7 @@ import ujson import ql_fs from misc import Power import audio -from ui import style_img,style_screen,style_font_youyuan_20 +from ui import style_screen_btn_1_main_main_default,style_font_youyuan_20_gray,style_img,style_screen,style_font_youyuan_20 import ntptime #ntptime.settime(timezone=8) @@ -73,16 +73,16 @@ print("clk_list_screen") clk_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) clk_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -clk_list_title_bg= lv.btn(clk_list_screen) -clk_list_title_bg.set_size(112,25) -clk_list_title_bg.set_pos(8,5) -clk_list_title_bg.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) -clk_list_title_bg.set_ext_click_area(25) +# clk_list_title_bg= lv.btn(clk_list_screen) +# clk_list_title_bg.set_size(112,25) +# clk_list_title_bg.set_pos(8,5) +# clk_list_title_bg.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN | lv.STATE.DEFAULT) +# clk_list_title_bg.set_ext_click_area(25) -clk_list_title = lv.label(clk_list_title_bg) +clk_list_title = lv.label(clk_list_screen) clk_list_title.set_pos(4, 5) clk_list_title.set_size(112, 20) -clk_list_title.set_text("闹钟列表") +clk_list_title.set_text("闹钟") clk_list_title.set_long_mode(lv.label.LONG.WRAP) clk_list_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) clk_list_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -400,8 +400,11 @@ label_ok.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) label_ok.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) #闹钟信息 -alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [], 'minute': 39}, - {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}] +alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [0,1,2,3,4,5,6], 'minute': 39}, + {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [0,1,2,3,4,5,6], 'minute': 39}, + {'hour': 16, 'repeart': 1, 'idx': 1, 'enabled': 0, 'days': [0,1,2,3,4,5,6], 'minute': 39}, + {'hour': 16, 'repeart': 1, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}, + {'hour': 16, 'repeart': 1, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39},] #用于显示闹钟列表不包含开关机信息 class ClockManager(Abstract): @@ -886,6 +889,25 @@ style_common_pressed.set_pad_right(0) style_common_pressed.set_pad_top(0) style_common_pressed.set_pad_bottom(0) +alarm_main_default = lv.style_t() +alarm_main_default.init() +alarm_main_default.set_radius(5) +alarm_main_default.set_bg_color(lv.color_make(0x64,0x64,0x64)) +alarm_main_default.set_bg_grad_color(lv.color_make(0x64,0x64,0x64)) +alarm_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) +alarm_main_default.set_bg_opa(255) +alarm_main_default.set_border_color(lv.color_make(0x64,0x64,0x64)) +alarm_main_default.set_border_width(0) +alarm_main_default.set_border_opa(255) +alarm_main_default.set_pad_left(0) +alarm_main_default.set_pad_right(0) +alarm_main_default.set_pad_top(0) +alarm_main_default.set_pad_bottom(0) + +alarm_style_font_youyuan_20_gray = lv.style_t() +alarm_style_font_youyuan_20_gray.init() +alarm_style_font_youyuan_20_gray.set_text_color(lv.color_make(200, 200, 200)) +alarm_style_font_youyuan_20_gray.set_text_font(lv.K01_font_16_ALL) #闹钟列表 class ClkListScreen(Screen): NAME = "clk_list" @@ -900,26 +922,27 @@ class ClkListScreen(Screen): self.weekdays_list = ["日","一","二","三","四","五","六"] EventMesh.subscribe("push_update_alarm_show", self.update_show_info) self.alarm_show_list = lv.obj(clk_list_screen) - self.alarm_show_list.set_pos(0, 35) - self.alarm_show_list.set_size(128, 128-35) + self.alarm_show_list.set_pos(0, 25) + self.alarm_show_list.set_size(128, 128-25) self.alarm_show_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.alarm_show_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) self.timer=osTimer() for i in range(self.MXA_clk_num): _btn = lv.btn(self.alarm_show_list) + _btn.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + _btn.add_style(alarm_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) _btn.add_flag(lv.obj.FLAG.CLICKABLE) - _btn.add_style(style_cont_alarm, lv.PART.MAIN | lv.STATE.DEFAULT) - _btn.add_flag(lv.obj.FLAG.HIDDEN) _btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.edit_alarm(e)), lv.EVENT.CLICKED, None) + _btn_label1 = lv.label(_btn) _btn_label2 = lv.label(_btn) _btn_label2.set_long_mode(lv.label.LONG.DOT) _btn_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) _btn_label3 = lv.label(_btn) _btn_label3.set_long_mode(lv.label.LONG.DOT) - _btn_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + _btn_label3.add_style(alarm_style_font_youyuan_20_gray, lv.PART.MAIN | lv.STATE.DEFAULT) self.contact_detail_listt_dict.append({"_btn":_btn,"_btn_label1":_btn_label1,"_btn_label2":_btn_label2,"_btn_label3":_btn_label3}) def initialization(self): @@ -940,7 +963,7 @@ class ClkListScreen(Screen): global alarm_list self.clock_list = alarm_list IFEXIST = ql_fs.path_exists("/usr/static/storage_file/alarm_msg.json") - if IFEXIST == True: + if IFEXIST == False: if self.clock_list: no_add_alarm.add_flag(lv.obj.FLAG.HIDDEN) @@ -963,16 +986,16 @@ class ClkListScreen(Screen): continue print("alarm!!!!!!!!!!") #_btn = lv.btn(self.alarm_show_list) - self.contact_detail_listt_dict[count]["_btn"].set_size(112,45) - self.contact_detail_listt_dict[count]["_btn"].set_pos(8,49*count) + self.contact_detail_listt_dict[count]["_btn"].set_size(120,35) + self.contact_detail_listt_dict[count]["_btn"].set_pos(4,39*count) #_btn_label1 = lv.label(_btn) - self.contact_detail_listt_dict[count]["_btn_label1"].set_pos(50, 0) + self.contact_detail_listt_dict[count]["_btn_label1"].set_pos(20, 0) self.contact_detail_listt_dict[count]["_btn_label1"].set_size(0, 0) self.contact_detail_listt_dict[count]["_btn_label1"].set_text(str(num)) #_btn_label2 = lv.label(_btn) - self.contact_detail_listt_dict[count]["_btn_label2"].set_pos(8, 5) + self.contact_detail_listt_dict[count]["_btn_label2"].set_pos(10, 0) self.contact_detail_listt_dict[count]["_btn_label2"].set_size(97, 20) self.contact_detail_listt_dict[count]["_btn_label2"].set_text("%02d" % each["hour"] + ":"+"%02d" % each["minute"]) self.contact_detail_listt_dict[count]["_btn_label2"].set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) @@ -981,7 +1004,7 @@ class ClkListScreen(Screen): repeart = each["repeart"] _output = [self.weekdays_list[x] for x in _new_list] #_btn_label3 = lv.label(_btn) - self.contact_detail_listt_dict[count]["_btn_label3"].set_pos(8, 25) + self.contact_detail_listt_dict[count]["_btn_label3"].set_pos(10, 18) self.contact_detail_listt_dict[count]["_btn_label3"].set_size(128-8, 20) print("_new_list:{} repeart:{}".format(_new_list,repeart)) if repeart == 1: diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py index 0a2f8631..6a8ff123 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py @@ -116,6 +116,7 @@ def main_init(): ui.add_screen(_ui_setting.PhoneringScreen()) ui.add_screen(_ui_setting.totalvolumeScreen()) ui.add_screen(_ui_setting.PoweroffConfirmScreen()) + ui.add_screen(_ui_setting.RestartScreen()) ui.add_screen(_ui.DialingScreen()) ui.add_screen(_ui.CallLogScreen()) ui.add_screen(_ui.UIFINDScreen()) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py index 55b97e97..121127ce 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py @@ -22,6 +22,7 @@ import _thread from queue import Queue import camera from machine import RTC + LCD_X = 128 LCD_Y = 128 def audio_cb(event): @@ -93,6 +94,10 @@ style_font_youyuan_20_red.set_text_color(lv.color_make(0xff, 0x00, 0x00)) style_font_youyuan_20_red.set_text_font(lv.K01_font_16_ALL) #style_font_youyuan_20_red.set_text_font_v2("font_28.bin",28,0) +style_font_youyuan_20_gray = lv.style_t() +style_font_youyuan_20_gray.init() +style_font_youyuan_20_gray.set_text_color(lv.color_make(128, 128, 128)) +style_font_youyuan_20_gray.set_text_font(lv.K01_font_16_ALL) style_img = lv.style_t() style_img.init() style_img.set_img_opa(255) @@ -174,7 +179,16 @@ style_contact_btn_pressed.set_border_opa(255) style_contact_btn_pressed.set_text_color(lv.color_make(0x00,0x00,0x00)) - +style_screen_btn_1_main_main_default = lv.style_t() +style_screen_btn_1_main_main_default.init() +style_screen_btn_1_main_main_default.set_radius(5) +style_screen_btn_1_main_main_default.set_bg_color(lv.color_make(0x64,0x64,0x64)) +style_screen_btn_1_main_main_default.set_bg_grad_color(lv.color_make(0x64,0x64,0x64)) +style_screen_btn_1_main_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) +style_screen_btn_1_main_main_default.set_bg_opa(255) +style_screen_btn_1_main_main_default.set_border_color(lv.color_make(0x64,0x64,0x64)) +style_screen_btn_1_main_main_default.set_border_width(0) +style_screen_btn_1_main_main_default.set_border_opa(255) style_circle = lv.style_t() style_circle.init() @@ -2662,6 +2676,7 @@ class ToolboxScreen(Screen): toolbox_countdown_img,toolbox_stopwatch_img if toolbox_screen == None: tool_set_y = 5 + tool_set_y_offset = 40 toolbox_screen = lv.obj() print("toolbox_screen") toolbox_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2681,15 +2696,22 @@ class ToolboxScreen(Screen): # toolbox_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) toolbox_cont = lv.obj(toolbox_screen) - toolbox_cont.set_pos(0, 0) - toolbox_cont.set_size(128, 128) + toolbox_cont.set_pos(0, 5) + toolbox_cont.set_size(128, 123) toolbox_cont.add_style(toolbox_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) + toolbox_step_img_btn_1 = lv.btn(toolbox_cont) + toolbox_step_img_btn_1.set_pos(int(0),int(tool_set_y-5)) + toolbox_step_img_btn_1.set_size(120,35) + toolbox_step_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + toolbox_step_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_step_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) + toolbox_step_img = lv.img(toolbox_cont) toolbox_step_img.set_pos(5, tool_set_y) toolbox_step_img.set_size(25, 25) - toolbox_step_img.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_step_img.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_step_img.set_src("U:/static/IMAGE_SECMENU_STEP.png") toolbox_step_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2698,16 +2720,23 @@ class ToolboxScreen(Screen): toolbox_step_img_label.set_size(128-35, 35) toolbox_step_img_label.set_text("计步") toolbox_step_img_label.set_long_mode(lv.label.LONG.WRAP) - toolbox_step_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_step_img_label.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_step_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) toolbox_step_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=35 + tool_set_y+=tool_set_y_offset + + toolbox_weather_img_btn_1 = lv.btn(toolbox_cont) + toolbox_weather_img_btn_1.set_pos(int(0),int(tool_set_y-5)) + toolbox_weather_img_btn_1.set_size(120,35) + toolbox_weather_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + toolbox_weather_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_weather_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) toolbox_weather_img = lv.img(toolbox_cont) toolbox_weather_img.set_pos(5, tool_set_y) toolbox_weather_img.set_size(25, 25) - toolbox_weather_img.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_weather_img.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_weather_img.set_src("U:/static/IMAGE_SECMENU_WEATHER.png") toolbox_weather_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2716,16 +2745,24 @@ class ToolboxScreen(Screen): toolbox_weather_img_label.set_size(128-35, 35) toolbox_weather_img_label.set_text("天气") toolbox_weather_img_label.set_long_mode(lv.label.LONG.WRAP) - toolbox_weather_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_weather_img_label.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_weather_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) toolbox_weather_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=35 + tool_set_y+=tool_set_y_offset + + toolbox_alarm_img_btn_1 = lv.btn(toolbox_cont) + toolbox_alarm_img_btn_1.set_pos(int(0),int(tool_set_y-5)) + toolbox_alarm_img_btn_1.set_size(120,35) + toolbox_alarm_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + toolbox_alarm_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_alarm_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) + toolbox_alarm_img = lv.img(toolbox_cont) toolbox_alarm_img.set_pos(5, tool_set_y) toolbox_alarm_img.set_size(25, 25) - toolbox_alarm_img.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_alarm_img.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_alarm_img.set_src("U:/static/IMAGE_SECMENU_ALARM.png") toolbox_alarm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2734,7 +2771,7 @@ class ToolboxScreen(Screen): toolbox_alarm_img_label.set_size(128-35, 35) toolbox_alarm_img_label.set_text("闹钟") toolbox_alarm_img_label.set_long_mode(lv.label.LONG.WRAP) - toolbox_alarm_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_alarm_img_label.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_alarm_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) toolbox_alarm_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2747,11 +2784,19 @@ class ToolboxScreen(Screen): # toolbox_sms_img.set_src("U:/static/tool/sms_setting.png") # toolbox_sms_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=35 + tool_set_y+=tool_set_y_offset + + toolbox_countdown_img_btn_1 = lv.btn(toolbox_cont) + toolbox_countdown_img_btn_1.set_pos(int(0),int(tool_set_y-5)) + toolbox_countdown_img_btn_1.set_size(120,35) + toolbox_countdown_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + toolbox_countdown_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_countdown_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) + toolbox_countdown_img = lv.img(toolbox_cont) toolbox_countdown_img.set_pos(5, tool_set_y) toolbox_countdown_img.set_size(25, 25) - toolbox_countdown_img.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_countdown_img.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_countdown_img.set_src("U:/static/IMAGE_SECMENU_COUNTDOWN.png") toolbox_countdown_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2760,16 +2805,23 @@ class ToolboxScreen(Screen): toolbox_countdown_img_label.set_size(128-35, 35) toolbox_countdown_img_label.set_text("倒计时") toolbox_countdown_img_label.set_long_mode(lv.label.LONG.WRAP) - toolbox_countdown_img_label.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_countdown_img_label.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_countdown_img_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) toolbox_countdown_img_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - tool_set_y+=35 + tool_set_y+=tool_set_y_offset + toolbox_stopwatch_img_btn_1 = lv.btn(toolbox_cont) + toolbox_stopwatch_img_btn_1.set_pos(int(0),int(tool_set_y-5)) + toolbox_stopwatch_img_btn_1.set_size(120,35) + toolbox_stopwatch_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + toolbox_stopwatch_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + toolbox_stopwatch_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) + toolbox_stopwatch_img = lv.img(toolbox_cont) toolbox_stopwatch_img.set_pos(5, tool_set_y) toolbox_stopwatch_img.set_size(25, 25) - toolbox_stopwatch_img.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_stopwatch_img.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_stopwatch_img.set_src("U:/static/IMAGE_SECMENU_STOPWATCH.png") toolbox_stopwatch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -2787,38 +2839,38 @@ class ToolboxScreen(Screen): toolbox_stopwatch_img_label_btn.set_size(128, 45) toolbox_stopwatch_img_label_btn.set_text(" ") toolbox_stopwatch_img_label_btn.set_long_mode(lv.label.LONG.WRAP) - toolbox_stopwatch_img_label_btn.add_flag(lv.obj.FLAG.CLICKABLE) + # toolbox_stopwatch_img_label_btn.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_stopwatch_img_label_btn.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - toolbox_step_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "step")), lv.EVENT.CLICKED, None) - toolbox_weather_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.CLICKED, None) - toolbox_alarm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.CLICKED, None) + toolbox_step_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "step")), lv.EVENT.CLICKED, None) + toolbox_weather_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.CLICKED, None) + toolbox_alarm_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.CLICKED, None) # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) - toolbox_countdown_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e,"countdown")), lv.EVENT.CLICKED, None) - toolbox_stopwatch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.CLICKED, None) + toolbox_countdown_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e,"countdown")), lv.EVENT.CLICKED, None) + toolbox_stopwatch_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.CLICKED, None) - toolbox_step_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "step")), lv.EVENT.CLICKED, None) - toolbox_weather_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.CLICKED, None) - toolbox_alarm_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.CLICKED, None) - # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) - toolbox_countdown_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "countdown")), lv.EVENT.CLICKED, None) - toolbox_stopwatch_img_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.CLICKED, None) + # toolbox_step_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "step")), lv.EVENT.CLICKED, None) + # toolbox_weather_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.CLICKED, None) + # toolbox_alarm_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.CLICKED, None) + # # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) + # toolbox_countdown_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "countdown")), lv.EVENT.CLICKED, None) + # toolbox_stopwatch_img_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.CLICKED, None) - toolbox_step_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "step")), lv.EVENT.PRESSING, None) - toolbox_weather_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.PRESSING, None) - toolbox_alarm_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.PRESSING, None) + toolbox_step_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "step")), lv.EVENT.PRESSING, None) + toolbox_weather_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.PRESSING, None) + toolbox_alarm_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.PRESSING, None) # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) - toolbox_countdown_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "countdown")), lv.EVENT.PRESSING, None) - toolbox_stopwatch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.PRESSING, None) + toolbox_countdown_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "countdown")), lv.EVENT.PRESSING, None) + toolbox_stopwatch_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.PRESSING, None) - toolbox_step_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e,"step")), lv.EVENT.PRESSING, None) - toolbox_weather_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.PRESSING, None) - toolbox_alarm_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.PRESSING, None) - # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) - toolbox_countdown_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "countdown")), lv.EVENT.PRESSING, None) - toolbox_stopwatch_img_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.PRESSING, None) + # toolbox_step_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e,"step")), lv.EVENT.PRESSING, None) + # toolbox_weather_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "weather")), lv.EVENT.PRESSING, None) + # toolbox_alarm_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "clk_list")), lv.EVENT.PRESSING, None) + # # toolbox_sms_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "popup"})), lv.EVENT.CLICKED, None) + # toolbox_countdown_img_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "countdown")), lv.EVENT.PRESSING, None) + # toolbox_stopwatch_img_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_tool_cb(e, "stopwatch")), lv.EVENT.PRESSING, None) self.meta = toolbox_screen @@ -8483,7 +8535,6 @@ class calculatorScreen(Screen): print("input_dot",self.result_buf) if int(self.result_buf.split(".")[1]) == 0:#小数点后面全是0 就取整数 self.result_buf = (self.result_buf.split(".")[0]) - # if len(self.result_buf) > 14:#99978654.087766666 # tmp = str(self.result_buf[:14]) # self.result_buf = tmp diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py index 1f3d46b4..7c02406c 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py @@ -89,39 +89,110 @@ print("MainMenu2") MainMenu2_til = lv.tileview(MainMenu2) MainMenu2_til.set_scrollbar_mode(0) MainMenu2_til.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT) -#表盘 -MainMenu2_Watchface = MainMenu2_til.add_tile(0, 1, lv.DIR.LEFT | lv.DIR.RIGHT) +#工具箱 +MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_toolbox) +label_text.set_pos(0, 0) +label_text.set_size(0, 0) +label_text.set_text("{}".format(MainMenu2_num)) +MainMenu2_img_toolbox = lv.img(MainMenu2_toolbox) +MainMenu2_img_toolbox.set_size(80,80) +MainMenu2_img_toolbox.set_pos(24,10) +MainMenu2_img_toolbox.set_src("U:/static/IMAGE_ONE_PAGE_TOOLS.png") +MainMenu2_img_toolbox.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_toolbox.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) -label_text = lv.label(MainMenu2_Watchface) +MainMenu2_img_toolbox_txt = lv.label(MainMenu2_toolbox) +MainMenu2_img_toolbox_txt.set_pos(int(0),int(100)) +MainMenu2_img_toolbox_txt.set_size(128,20) +MainMenu2_img_toolbox_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_toolbox_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_toolbox_txt.set_text("工具箱") +MainMenu2_img_toolbox_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_num+=1 +MainMenu2x+=1 + +#加好友,暂时没有 +MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_toolbox) label_text.set_pos(0, 0) label_text.set_size(0, 0) label_text.set_text("{}".format(MainMenu2_num)) +MainMenu2_img_add_friends = lv.img(MainMenu2_toolbox) +MainMenu2_img_add_friends.set_size(80,80) +MainMenu2_img_add_friends.set_pos(24,10) +MainMenu2_img_add_friends.set_src("U:/static/IMAGE_ONE_PAGE_TOOLS.png") +MainMenu2_img_add_friends.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_add_friends.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_add_friends_txt = lv.label(MainMenu2_toolbox) +MainMenu2_img_add_friends_txt.set_pos(int(0),int(100)) +MainMenu2_img_add_friends_txt.set_size(128,20) +MainMenu2_img_add_friends_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_add_friends_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_add_friends_txt.set_text("加好友") +MainMenu2_img_add_friends_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) MainMenu2_num+=1 +MainMenu2x+=1 -#拨号盘 -MainMenu2_phone = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -label_text = lv.label(MainMenu2_phone) +#微聊 +MainMenu2_wechat = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_wechat) label_text.set_pos(0, 0) label_text.set_size(0, 0) label_text.set_text("{}".format(MainMenu2_num)) -MainMenu2_img_phone = lv.img(MainMenu2_phone) -MainMenu2_img_phone.set_size(80,80) -MainMenu2_img_phone.set_pos(24,10) -MainMenu2_img_phone.set_src("U:/static/IMAGE_ONE_PAGE_CALL.png") -MainMenu2_img_phone.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_phone.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) +MainMenu2_img_wechat = lv.img(MainMenu2_wechat) +MainMenu2_img_wechat.set_size(80,80) +MainMenu2_img_wechat.set_pos(24,10) +MainMenu2_img_wechat.set_src("U:/static/IMAGE_ONE_PAGE_WECHAT.png") +MainMenu2_img_wechat.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_wechat.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) -MainMenu2_img_phone_text = lv.label(MainMenu2_phone) -MainMenu2_img_phone_text.set_pos(int(0),int(100)) -MainMenu2_img_phone_text.set_size(128,20) -MainMenu2_img_phone_text.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_phone_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -MainMenu2_img_phone_text.set_text("拨号盘") -MainMenu2_img_phone_text.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_img_wechat_txt = lv.label(MainMenu2_wechat) +MainMenu2_img_wechat_txt.set_pos(int(0),int(100)) +MainMenu2_img_wechat_txt.set_size(128,20) +MainMenu2_img_wechat_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_wechat_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_wechat_txt.set_text("微聊") +MainMenu2_img_wechat_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) MainMenu2_num+=1 MainMenu2x+=1 +#视频通话 +MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_heartrate) +label_text.set_pos(0, 0) +label_text.set_size(0, 0) +label_text.set_text("{}".format(MainMenu2_num)) +MainMenu2_img_health = lv.img(MainMenu2_heartrate) +MainMenu2_img_health.set_size(80,80) +MainMenu2_img_health.set_pos(24,10) +MainMenu2_img_health.set_src("U:/static/IMAGE_ONE_PAGE_HEALTH.png") +MainMenu2_img_health.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_health.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_health_txt = lv.label(MainMenu2_heartrate) +MainMenu2_img_health_txt.set_pos(int(0),int(100)) +MainMenu2_img_health_txt.set_size(128,20) +MainMenu2_img_health_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_health_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_health_txt.set_text("视频通话") +MainMenu2_img_health_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_num+=1 +MainMenu2x+=1 + +#表盘 +MainMenu2_Watchface = MainMenu2_til.add_tile(MainMenu2_num,0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_Watchface) +label_text.set_pos(0, 0) +label_text.set_size(0, 0) +label_text.set_text("{}".format(MainMenu2_num)) +MainMenu2_num+=1 +MainMenu2x+=1 + + + #通讯录 MainMenu2_contacts = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) label_text = lv.label(MainMenu2_contacts) @@ -145,168 +216,79 @@ MainMenu2_img_contacts_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv MainMenu2_num+=1 MainMenu2x+=1 -#短信 -MainMenu2_SMS = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -label_text = lv.label(MainMenu2_SMS) + +#拨号盘 +MainMenu2_phone = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_phone) label_text.set_pos(0, 0) label_text.set_size(0, 0) label_text.set_text("{}".format(MainMenu2_num)) -MainMenu2_img_sms = lv.img(MainMenu2_SMS) -MainMenu2_img_sms.set_size(80,80) -MainMenu2_img_sms.set_pos(24,10) -MainMenu2_img_sms.set_src("U:/static/IMAGE_ONE_PAGE_SMS.png") -MainMenu2_img_sms.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_sms.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -MainMenu2_img_sms_txt = lv.label(MainMenu2_SMS) -MainMenu2_img_sms_txt.set_pos(int(0),int(100)) -MainMenu2_img_sms_txt.set_size(128,20) -MainMenu2_img_sms_txt.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_sms_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -MainMenu2_img_sms_txt.set_text("短信") -MainMenu2_img_sms_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_img_phone = lv.img(MainMenu2_phone) +MainMenu2_img_phone.set_size(80,80) +MainMenu2_img_phone.set_pos(24,10) +MainMenu2_img_phone.set_src("U:/static/IMAGE_ONE_PAGE_CALL.png") +MainMenu2_img_phone.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_phone.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_phone_text = lv.label(MainMenu2_phone) +MainMenu2_img_phone_text.set_pos(int(0),int(100)) +MainMenu2_img_phone_text.set_size(128,20) +MainMenu2_img_phone_text.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_phone_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_phone_text.set_text("拨号盘") +MainMenu2_img_phone_text.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) MainMenu2_num+=1 MainMenu2x+=1 -#微聊 -MainMenu2_wechat = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -label_text = lv.label(MainMenu2_wechat) +#相机 +MainMenu2_camera = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_camera) label_text.set_pos(0, 0) label_text.set_size(0, 0) label_text.set_text("{}".format(MainMenu2_num)) -MainMenu2_img_wechat = lv.img(MainMenu2_wechat) -MainMenu2_img_wechat.set_size(80,80) -MainMenu2_img_wechat.set_pos(24,10) -MainMenu2_img_wechat.set_src("U:/static/IMAGE_ONE_PAGE_WECHAT.png") -MainMenu2_img_wechat.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_wechat.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -MainMenu2_img_wechat_txt = lv.label(MainMenu2_wechat) -MainMenu2_img_wechat_txt.set_pos(int(0),int(100)) -MainMenu2_img_wechat_txt.set_size(128,20) -MainMenu2_img_wechat_txt.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_wechat_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -MainMenu2_img_wechat_txt.set_text("微聊") -MainMenu2_img_wechat_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_img_camera = lv.img(MainMenu2_camera) +MainMenu2_img_camera.set_size(80,80) +MainMenu2_img_camera.set_pos(24,10) +MainMenu2_img_camera.set_src("U:/static/IMAGE_ONE_PAGE_CAMERA.png") +MainMenu2_img_camera.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_camera_txt = lv.label(MainMenu2_camera) +MainMenu2_img_camera_txt.set_pos(int(0),int(100)) +MainMenu2_img_camera_txt.set_size(128,20) +MainMenu2_img_camera_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_camera_txt.set_text("相机") +MainMenu2_img_camera_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) MainMenu2_num+=1 MainMenu2x+=1 -#健康测量 -# MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -# label_text = lv.label(MainMenu2_heartrate) -# label_text.set_pos(0, 0) -# label_text.set_size(0, 0) -# label_text.set_text("{}".format(MainMenu2_num)) -# MainMenu2_img_health = lv.img(MainMenu2_heartrate) -# MainMenu2_img_health.set_size(80,80) -# MainMenu2_img_health.set_pos(24,10) -# MainMenu2_img_health.set_src("U:/static/IMAGE_ONE_PAGE_HEALTH.png") -# MainMenu2_img_health.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_health.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -# MainMenu2_img_health_txt = lv.label(MainMenu2_heartrate) -# MainMenu2_img_health_txt.set_pos(int(0),int(100)) -# MainMenu2_img_health_txt.set_size(128,20) -# MainMenu2_img_health_txt.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_health_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -# MainMenu2_img_health_txt.set_text("健康测量") -# MainMenu2_img_health_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) -# MainMenu2_num+=1 -# MainMenu2x+=1 - -#视频通话 -# MainMenu2_camera_video = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -# label_text = lv.label(MainMenu2_camera_video) -# label_text.set_pos(0, 0) -# label_text.set_size(0, 0) -# label_text.set_text("{}".format(MainMenu2_num)) -# MainMenu2_img_camera_video = lv.img(MainMenu2_camera_video) -# MainMenu2_img_camera_video.set_size(80,80) -# MainMenu2_img_camera_video.set_pos(24,10) -# MainMenu2_img_camera_video.set_src("U:/static/IMAGE_ONE_PAGE_VIDEOCALL.png") -# MainMenu2_img_camera_video.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_camera_video.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -# MainMenu2_img_camera_video_txt = lv.label(MainMenu2_camera_video) -# MainMenu2_img_camera_video_txt.set_pos(int(0),int(100)) -# MainMenu2_img_camera_video_txt.set_size(128,20) -# MainMenu2_img_camera_video_txt.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_camera_video_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -# MainMenu2_img_camera_video_txt.set_text("视频通话") -# MainMenu2_img_camera_video_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) -# MainMenu2_num+=1 -# MainMenu2x+=1 - -# #相机 -# MainMenu2_camera = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -# label_text = lv.label(MainMenu2_camera) -# label_text.set_pos(0, 0) -# label_text.set_size(0, 0) -# label_text.set_text("{}".format(MainMenu2_num)) -# MainMenu2_img_camera = lv.img(MainMenu2_camera) -# MainMenu2_img_camera.set_size(80,80) -# MainMenu2_img_camera.set_pos(24,10) -# MainMenu2_img_camera.set_src("U:/static/IMAGE_ONE_PAGE_CAMERA.png") -# MainMenu2_img_camera.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_camera.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -# MainMenu2_img_camera_txt = lv.label(MainMenu2_camera) -# MainMenu2_img_camera_txt.set_pos(int(0),int(100)) -# MainMenu2_img_camera_txt.set_size(128,20) -# MainMenu2_img_camera_txt.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_camera_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -# MainMenu2_img_camera_txt.set_text("相机") -# MainMenu2_img_camera_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) -# MainMenu2_num+=1 -# MainMenu2x+=1 - - -# #相册 -# MainMenu2_camera_album = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -# label_text = lv.label(MainMenu2_camera_album) -# label_text.set_pos(0, 0) -# label_text.set_size(0, 0) -# label_text.set_text("{}".format(MainMenu2_num)) -# MainMenu2_img_camera_album = lv.img(MainMenu2_camera_album) -# MainMenu2_img_camera_album.set_size(80,80) -# MainMenu2_img_camera_album.set_pos(24,10) -# MainMenu2_img_camera_album.set_src("U:/static/IMAGE_ONE_PAGE_ALBUM.png") -# MainMenu2_img_camera_album.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_camera_album.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -# MainMenu2_img_camera_album_txt = lv.label(MainMenu2_camera_album) -# MainMenu2_img_camera_album_txt.set_pos(int(0),int(100)) -# MainMenu2_img_camera_album_txt.set_size(128,20) -# MainMenu2_img_camera_album_txt.add_flag(lv.obj.FLAG.CLICKABLE) -# MainMenu2_img_camera_album_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -# MainMenu2_img_camera_album_txt.set_text("相册") -# MainMenu2_img_camera_album_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) -# MainMenu2_num+=1 -# MainMenu2x+=1 -#工具箱 -MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) -label_text = lv.label(MainMenu2_toolbox) +#相册 +MainMenu2_camera_album = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +label_text = lv.label(MainMenu2_camera_album) label_text.set_pos(0, 0) label_text.set_size(0, 0) label_text.set_text("{}".format(MainMenu2_num)) -MainMenu2_img_toolbox = lv.img(MainMenu2_toolbox) -MainMenu2_img_toolbox.set_size(80,80) -MainMenu2_img_toolbox.set_pos(24,10) -MainMenu2_img_toolbox.set_src("U:/static/IMAGE_ONE_PAGE_TOOLS.png") -MainMenu2_img_toolbox.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_toolbox.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -MainMenu2_img_toolbox_txt = lv.label(MainMenu2_toolbox) -MainMenu2_img_toolbox_txt.set_pos(int(0),int(100)) -MainMenu2_img_toolbox_txt.set_size(128,20) -MainMenu2_img_toolbox_txt.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_toolbox_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -MainMenu2_img_toolbox_txt.set_text("工具箱") -MainMenu2_img_toolbox_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_img_camera_album = lv.img(MainMenu2_camera_album) +MainMenu2_img_camera_album.set_size(80,80) +MainMenu2_img_camera_album.set_pos(24,10) +MainMenu2_img_camera_album.set_src("U:/static/IMAGE_ONE_PAGE_ALBUM.png") +MainMenu2_img_camera_album.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera_album.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_camera_album_txt = lv.label(MainMenu2_camera_album) +MainMenu2_img_camera_album_txt.set_pos(int(0),int(100)) +MainMenu2_img_camera_album_txt.set_size(128,20) +MainMenu2_img_camera_album_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_camera_album_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_camera_album_txt.set_text("相册") +MainMenu2_img_camera_album_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) MainMenu2_num+=1 MainMenu2x+=1 + + #设置 MainMenu2_setting = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) #MainMenu2_setting.set_tile_act(0,0,lv.ANIM.ON) @@ -333,6 +315,42 @@ MainMenu2x+=1 +# #短信 +# MainMenu2_SMS = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.LEFT | lv.DIR.RIGHT) +# label_text = lv.label(MainMenu2_SMS) +# label_text.set_pos(0, 0) +# label_text.set_size(0, 0) +# label_text.set_text("{}".format(MainMenu2_num)) +# MainMenu2_img_sms = lv.img(MainMenu2_SMS) +# MainMenu2_img_sms.set_size(80,80) +# MainMenu2_img_sms.set_pos(24,10) +# MainMenu2_img_sms.set_src("U:/static/IMAGE_ONE_PAGE_SMS.png") +# MainMenu2_img_sms.add_flag(lv.obj.FLAG.CLICKABLE) +# MainMenu2_img_sms.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +# MainMenu2_img_sms_txt = lv.label(MainMenu2_SMS) +# MainMenu2_img_sms_txt.set_pos(int(0),int(100)) +# MainMenu2_img_sms_txt.set_size(128,20) +# MainMenu2_img_sms_txt.add_flag(lv.obj.FLAG.CLICKABLE) +# MainMenu2_img_sms_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# MainMenu2_img_sms_txt.set_text("短信") +# MainMenu2_img_sms_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +# MainMenu2_num+=1 +# MainMenu2x+=1 + + + + + + + + + + + + + + @@ -349,13 +367,14 @@ class MainMenuScreen(Screen): MainMenu2_img_phone.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "Phone")), lv.EVENT.CLICKED, None) MainMenu2_img_toolbox.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "toolbox")), lv.EVENT.CLICKED, None) MainMenu2_img_setting.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "setting")), lv.EVENT.CLICKED, None) + MainMenu2_img_add_friends.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "toolbox")), lv.EVENT.CLICKED, None) # MainMenu2_img_camera_video.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera_video")), lv.EVENT.CLICKED, None) # MainMenu2_img_camera.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera")), lv.EVENT.CLICKED, None) # MainMenu2_img_camera_album.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera_album")), lv.EVENT.CLICKED, None) MainMenu2_img_contacts.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "contacts")), lv.EVENT.CLICKED, None) MainMenu2_img_wechat.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "wechat")), lv.EVENT.CLICKED, None) # MainMenu2_img_spo2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "spo2")), lv.EVENT.CLICKED, None) - MainMenu2_img_sms.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "popup")), lv.EVENT.CLICKED, None) + #MainMenu2_img_sms.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "popup")), lv.EVENT.CLICKED, None) EventMesh.subscribe("watch_top_show", self.watch_top_show) @@ -363,9 +382,9 @@ class MainMenuScreen(Screen): def initialization(self): self.watchface.initialization(MainMenu2_Watchface) - + print("self.menu_id",self.menu_id) if self.menu_id =="0": - MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) # if self.meta_info in globals() : # MainMenu2_til.set_tile_id(self.meta_info[0],self.meta_info[1],lv.ANIM.OFF) pass# @@ -377,7 +396,7 @@ class MainMenuScreen(Screen): if code == lv.EVENT.SCROLL_END: pass def watch_top_show(self, event, msg): # - MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) def img_cb(self, e, msg): state = EventMesh.publish("get_key_board", "key_board") @@ -403,7 +422,7 @@ class MainMenuScreen(Screen): self.watchface.timer_update.stop() def done_return(self): - MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) def btn1_release(self): flag = EventMesh.publish("get_lcd_state") @@ -412,8 +431,9 @@ class MainMenuScreen(Screen): else: if MainMenu2_til.get_tile_act() != None: id = MainMenu2_til.get_tile_act().get_child(0).get_text() - if id != "0": - MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) + #if id != "0": + + MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) def return_setiing(self, event, msg): MainMenu2_til.set_tile_id(7,0,lv.ANIM.OFF) @@ -424,53 +444,56 @@ class MainMenuScreen(Screen): flag = EventMesh.publish("get_lcd_state") if MainMenu2_til.get_tile_act() != None: id = MainMenu2_til.get_tile_act().get_child(0).get_text() - if id == "0": + if id == "4": if flag == 1: EventMesh.publish(constants.EVENT.SYSTEM_SLEEP) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) else: if flag == 1: - MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) else: if flag == 1: - MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) def done_bottom_to_top(self): id = MainMenu2_til.get_tile_act().get_child(0).get_text() - if id == "0": + if id == "4": EventMesh.publish("load_screen", {"screen": "call_log"}) self.menu_id = id def done_top_to_bottom(self): id = MainMenu2_til.get_tile_act().get_child(0).get_text() - if id == "0": + if id == "4": EventMesh.publish("load_screen", {"screen": "popup"}) self.menu_id = id def done_left_to_right(self): - id = MainMenu2_til.get_tile_act().get_child(0).get_text() - print("done_left_to_right:ID{}".format(id)) - if id == "0": - MainMenu2_til.set_tile_id(MainMenu2_num-2,0,lv.ANIM.OFF) - elif self.menu_id != '2' and id == '1': - MainMenu2_til.set_tile_id(MainMenu2_num-2,0,lv.ANIM.OFF) self.menu_id = id + # id = MainMenu2_til.get_tile_act().get_child(0).get_text() + # print("done_left_to_right:ID{}".format(id)) + # if id == "0": + # MainMenu2_til.set_tile_id(MainMenu2_num-2,0,lv.ANIM.OFF) + # elif self.menu_id != '2' and id == '1': + # MainMenu2_til.set_tile_id(MainMenu2_num-2,0,lv.ANIM.OFF) + # self.menu_id = id + pass def done_right_to_left(self): - id = MainMenu2_til.get_tile_act().get_child(0).get_text() - print("done_right_to_left:ID{}".format(id)) - if id == "0": - MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF) - elif (self.menu_id != str(MainMenu2_num-2) ) and id == str(MainMenu2_num-1) : - MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF) - self.menu_id = id - + self.menu_id = id + # id = MainMenu2_til.get_tile_act().get_child(0).get_text() + # print("done_right_to_left:ID{}".format(id)) + # if id == "0": + # MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF) + # elif (self.menu_id != str(MainMenu2_num-2) ) and id == str(MainMenu2_num-1) : + # MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF) + # self.menu_id = id + pass def Close(self): self.watchface.Close() print("main_menu Close !!!!!!!!") - self.menu_id = '1' + # self.menu_id = '0' return diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py index ff087220..9d0570ba 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -3,7 +3,7 @@ import lvgl as lv import ql_fs import EventMesh from misc import Power -from ui import style_screen,style_font_youyuan_20,style_btn,style_img,Screen,style_contact_btn,style_bar,style_bar_indic +from ui import style_screen,style_font_youyuan_20_gray,style_screen_btn_1_main_main_default,style_font_youyuan_20,style_btn,style_img,Screen,style_contact_btn,style_bar,style_bar_indic import constants import osTimer import audio @@ -12,6 +12,7 @@ import ujson # -------------------------------------------setting screen---------------------------------------------------------- + set_icon_x = 25 set_icon_y = 25 @@ -22,8 +23,8 @@ style_volume_btn.set_border_width(0) style_volume_btn.set_bg_color(lv.color_make(0x80, 0x80, 0x80)) - setting_cont_y = 5 +setting_cont_offset = 40 setting_screen = lv.obj() print("setting_screen") setting_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -56,8 +57,8 @@ setting_cont_style.set_pad_bottom(0) setting_cont = lv.obj(setting_screen) -setting_cont.set_pos(0, 0) -setting_cont.set_size(128, 128) +setting_cont.set_pos(0, 5) +setting_cont.set_size(128, 123) setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) # setting_language = lv.btn(setting_cont) @@ -78,12 +79,18 @@ setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) # setting_language_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) #setting_cont_y += 60 +setting_dialswitch_img_btn_1 = lv.btn(setting_cont) +setting_dialswitch_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_dialswitch_img_btn_1.set_size(120,35) +setting_dialswitch_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_dialswitch_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) +setting_dialswitch_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_dialswitch_label = lv.label(setting_cont) setting_dialswitch_label.set_text("表盘切换") setting_dialswitch_label.set_pos(34, setting_cont_y+5) setting_dialswitch_label.set_size(128-34, 35) -setting_dialswitch_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_dialswitch_label.add_flag(lv.obj.FLAG.CLICKABLE) # setting_dialswitch_label.set_text_align(lv.ALIGN.LEFT_MID, 30, setting_cont_y) setting_dialswitch_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_dialswitch_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -91,10 +98,15 @@ setting_dialswitch_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STAT setting_dialswitch_img = lv.img(setting_cont) setting_dialswitch_img.set_pos(4, setting_cont_y) setting_dialswitch_img.set_size(set_icon_x, set_icon_y) -setting_dialswitch_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_dialswitch_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_dialswitch_img.set_src("U:/static/menu_watch_switch.png") setting_dialswitch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 + + + +setting_cont_y+=setting_cont_offset + + # setting_themeswitch = lv.btn(setting_cont) @@ -115,44 +127,66 @@ setting_cont_y+=35 # setting_themeswitch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) #setting_cont_y+=60 +setting_imei_img_btn_1 = lv.btn(setting_cont) +setting_imei_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_imei_img_btn_1.set_size(120,35) +setting_imei_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_imei_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_imei_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) setting_imei_label = lv.label(setting_cont) setting_imei_label.set_text("设备IMEI号") setting_imei_label.set_pos(34, setting_cont_y+5) setting_imei_label.set_size(128-34, 35) -setting_imei_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_imei_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_imei_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_imei_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_imei_img = lv.img(setting_cont) setting_imei_img.set_pos(4, setting_cont_y) setting_imei_img.set_size(set_icon_x, set_icon_y) -setting_imei_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_imei_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_imei_img.set_src("U:/static/menu_imei_qrcode.png") setting_imei_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 +setting_cont_y+=setting_cont_offset + +setting_app_img_btn_1 = lv.btn(setting_cont) +setting_app_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_app_img_btn_1.set_size(120,35) +setting_app_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_app_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_app_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + setting_app_label = lv.label(setting_cont) setting_app_label.set_text("手机APP") setting_app_label.set_pos(34, setting_cont_y+5) setting_app_label.set_size(128-34, 35) -setting_app_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_app_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_app_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) setting_app_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) setting_app_img = lv.img(setting_cont) setting_app_img.set_pos(4, setting_cont_y) setting_app_img.set_size(set_icon_x, set_icon_y) -setting_app_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_app_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_app_img.set_src("U:/static/menu_app_qrcode.png") setting_app_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 +setting_cont_y+=setting_cont_offset + +setting_bright_img_btn_1 = lv.btn(setting_cont) +setting_bright_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_bright_img_btn_1.set_size(120,35) +setting_bright_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_bright_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_bright_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + setting_bright_label = lv.label(setting_cont) setting_bright_label.set_text("屏幕调节") -setting_bright_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_bright_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_bright_label.set_size(128-34, 35) setting_bright_label.set_pos(34, setting_cont_y+5) setting_bright_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -161,15 +195,22 @@ setting_bright_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DE setting_bright_img = lv.img(setting_cont) setting_bright_img.set_pos(4, setting_cont_y) setting_bright_img.set_size(set_icon_x, set_icon_y) -setting_bright_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_bright_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_bright_img.set_src("U:/static/menu_bright.png") setting_bright_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 +setting_cont_y+=setting_cont_offset + +setting_volume_img_btn_1 = lv.btn(setting_cont) +setting_volume_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_volume_img_btn_1.set_size(120,35) +setting_volume_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_volume_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_volume_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) setting_volume_label = lv.label(setting_cont) setting_volume_label.set_text("铃声") -setting_volume_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_volume_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_volume_label.set_size(128-34, 35) setting_volume_label.set_pos(34, setting_cont_y+5) setting_volume_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -178,15 +219,23 @@ setting_volume_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DE setting_volume_img = lv.img(setting_cont) setting_volume_img.set_pos(4, setting_cont_y) setting_volume_img.set_size(set_icon_x, set_icon_y) -setting_volume_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_volume_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_volume_img.set_src("U:/static/menu_volume.png") setting_volume_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 +setting_cont_y+=setting_cont_offset + +setting_restore_img_btn_1 = lv.btn(setting_cont) +setting_restore_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_restore_img_btn_1.set_size(120,35) +setting_restore_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_restore_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_restore_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + setting_restore_label = lv.label(setting_cont) setting_restore_label.set_text("恢复出厂") -setting_restore_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_restore_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_restore_label.set_size(128-34, 35) setting_restore_label.set_pos(34, setting_cont_y+5) setting_restore_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -195,15 +244,24 @@ setting_restore_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.D setting_restore_img = lv.img(setting_cont) setting_restore_img.set_pos(4, setting_cont_y) setting_restore_img.set_size(set_icon_x, set_icon_y) -setting_restore_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_restore_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_restore_img.set_src("U:/static/menu_restore.png") setting_restore_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 + + +setting_cont_y+=setting_cont_offset + +setting_poweroff_img_btn_1 = lv.btn(setting_cont) +setting_poweroff_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_poweroff_img_btn_1.set_size(120,35) +setting_poweroff_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_poweroff_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_poweroff_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) setting_poweroff_label = lv.label(setting_cont) setting_poweroff_label.set_text("关机") -setting_poweroff_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_poweroff_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_poweroff_label.set_size(128-34, 35) setting_poweroff_label.set_pos(34, setting_cont_y+5) setting_poweroff_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -212,15 +270,51 @@ setting_poweroff_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE. setting_poweroff_img = lv.img(setting_cont) setting_poweroff_img.set_pos(4, setting_cont_y) setting_poweroff_img.set_size(set_icon_x, set_icon_y) -setting_poweroff_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_poweroff_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_poweroff_img.set_src("U:/static/menu_poweroff.png") setting_poweroff_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 +setting_cont_y+=setting_cont_offset + + +#重启setting_restart_img_btn_1 +setting_restart_img_btn_1 = lv.btn(setting_cont) +setting_restart_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_restart_img_btn_1.set_size(120,35) +setting_restart_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_restart_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_restart_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + + +setting_restart_label = lv.label(setting_cont) +setting_restart_label.set_text("重启") +# setting_poweroff_label.add_flag(lv.obj.FLAG.CLICKABLE) +setting_restart_label.set_size(128-34, 35) +setting_restart_label.set_pos(34, setting_cont_y+5) +setting_restart_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) +setting_restart_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +setting_restart_img = lv.img(setting_cont) +setting_restart_img.set_pos(4, setting_cont_y) +setting_restart_img.set_size(set_icon_x, set_icon_y) +# setting_poweroff_img.add_flag(lv.obj.FLAG.CLICKABLE) +setting_restart_img.set_src("U:/static/menu_poweroff.png") +setting_restart_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + +setting_cont_y+=setting_cont_offset + +setting_version_img_btn_1 = lv.btn(setting_cont) +setting_version_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_version_img_btn_1.set_size(120,34) +setting_version_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_version_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_version_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + setting_version_label = lv.label(setting_cont) setting_version_label.set_text("关于设备") -setting_version_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_version_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_version_label.set_size(128-34, 35) setting_version_label.set_pos(34, setting_cont_y+5) setting_version_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -229,15 +323,23 @@ setting_version_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.D setting_version_img = lv.img(setting_cont) setting_version_img.set_pos(4, setting_cont_y) setting_version_img.set_size(set_icon_x, set_icon_y) -setting_version_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_version_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_version_img.set_src("U:/static/menu_version.png") setting_version_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -setting_cont_y+=35 +setting_cont_y+=setting_cont_offset + +setting_update_img_btn_1 = lv.btn(setting_cont) +setting_update_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) +setting_update_img_btn_1.set_size(120,35) +setting_update_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +setting_update_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) +setting_update_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) + setting_update_label = lv.label(setting_cont) setting_update_label.set_text("系统升级") -setting_update_label.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_update_label.add_flag(lv.obj.FLAG.CLICKABLE) setting_update_label.set_size(128-34, 35) setting_update_label.set_pos(34, setting_cont_y+5) setting_update_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -245,7 +347,7 @@ setting_update_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DE setting_update_label_btn = lv.label(setting_cont) setting_update_label_btn.set_text(" ") -setting_update_label_btn.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_update_label_btn.add_flag(lv.obj.FLAG.CLICKABLE) setting_update_label_btn.set_size(128, 45) setting_update_label_btn.set_pos(0, setting_cont_y) setting_update_label_btn.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT) @@ -254,10 +356,12 @@ setting_update_label_btn.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STAT setting_update_img = lv.img(setting_cont) setting_update_img.set_pos(4, setting_cont_y) setting_update_img.set_size(set_icon_x, set_icon_y) -setting_update_img.add_flag(lv.obj.FLAG.CLICKABLE) +# setting_update_img.add_flag(lv.obj.FLAG.CLICKABLE) setting_update_img.set_src("U:/static/menu_upgrade.png") setting_update_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + class SettingScreen(Screen): NAME = "setting" @@ -267,53 +371,55 @@ class SettingScreen(Screen): self.is_left_sliding = 0 self.meta = setting_screen # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.CLICKED, None) - setting_dialswitch_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), (lv.EVENT.CLICKED ), None) - # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None) - setting_imei_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), (lv.EVENT.CLICKED ), None) - setting_app_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), (lv.EVENT.CLICKED ), None) - setting_bright_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "brightness")), (lv.EVENT.CLICKED ), None) - setting_volume_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), (lv.EVENT.CLICKED ), None) - setting_restore_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), (lv.EVENT.CLICKED ), None) - setting_poweroff_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), (lv.EVENT.CLICKED ), None) - setting_update_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), (lv.EVENT.CLICKED ), None) - setting_version_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), (lv.EVENT.CLICKED ), None) + # setting_dialswitch_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), (lv.EVENT.CLICKED ), None) + # setting_imei_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), (lv.EVENT.CLICKED ), None) + # setting_app_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), (lv.EVENT.CLICKED ), None) + # setting_bright_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "brightness")), (lv.EVENT.CLICKED ), None) + # setting_volume_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), (lv.EVENT.CLICKED ), None) + # setting_restore_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), (lv.EVENT.CLICKED ), None) + # setting_poweroff_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), (lv.EVENT.CLICKED ), None) + # setting_update_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), (lv.EVENT.CLICKED ), None) + # setting_version_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), (lv.EVENT.CLICKED ), None) # img regist btton # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), (lv.EVENT.CLICKED ), None) - setting_dialswitch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), (lv.EVENT.CLICKED ), None) - # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), (lv.EVENT.CLICKED ), None) - setting_imei_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), (lv.EVENT.CLICKED ), None) - setting_app_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), (lv.EVENT.CLICKED ), None) - setting_bright_img.add_event_cb(lambda e:EventMesh.callback_wrapper( self.ui_setting_cb(e, "brightness")), (lv.EVENT.CLICKED ), None) - setting_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), (lv.EVENT.CLICKED ), None) - setting_restore_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), (lv.EVENT.CLICKED ), None) - setting_poweroff_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), (lv.EVENT.CLICKED ), None) - setting_update_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), (lv.EVENT.CLICKED ), None) - setting_version_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), (lv.EVENT.CLICKED ), None) - - setting_dialswitch_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), lv.EVENT.PRESSING, None) - # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None) - setting_imei_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), lv.EVENT.PRESSING, None) - setting_app_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), lv.EVENT.PRESSING, None) - setting_bright_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "brightness")), lv.EVENT.PRESSING, None) - setting_volume_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None) - setting_restore_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), lv.EVENT.PRESSING, None) - setting_poweroff_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), lv.EVENT.PRESSING, None) - setting_update_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), lv.EVENT.PRESSING, None) - setting_version_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), lv.EVENT.PRESSING, None) + # setting_dialswitch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), (lv.EVENT.CLICKED ), None) + + setting_imei_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), (lv.EVENT.CLICKED ), None) + setting_app_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), (lv.EVENT.CLICKED ), None) + setting_bright_img_btn_1.add_event_cb(lambda e:EventMesh.callback_wrapper( self.ui_setting_cb(e, "brightness")), (lv.EVENT.CLICKED ), None) + setting_volume_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), (lv.EVENT.CLICKED ), None) + setting_restore_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), (lv.EVENT.CLICKED ), None) + setting_poweroff_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), (lv.EVENT.CLICKED ), None) + setting_restart_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restart")), lv.EVENT.CLICKED, None) + setting_update_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), (lv.EVENT.CLICKED ), None) + setting_version_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), (lv.EVENT.CLICKED ), None) + setting_dialswitch_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), lv.EVENT.CLICKED, None) + + # # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None) + # setting_imei_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), lv.EVENT.PRESSING, None) + # setting_app_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), lv.EVENT.PRESSING, None) + # setting_bright_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "brightness")), lv.EVENT.PRESSING, None) + # setting_volume_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None) + # setting_restore_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), lv.EVENT.PRESSING, None) + # setting_poweroff_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), lv.EVENT.PRESSING, None) + # setting_update_label_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), lv.EVENT.PRESSING, None) + # setting_version_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), lv.EVENT.PRESSING, None) # img regist btton # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.CLICKED, None) - setting_dialswitch_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), lv.EVENT.PRESSING, None) + setting_dialswitch_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), lv.EVENT.PRESSING, None) # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.CLICKED, None) - setting_imei_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), lv.EVENT.PRESSING, None) - setting_app_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), lv.EVENT.PRESSING, None) - setting_bright_img.add_event_cb(lambda e:EventMesh.callback_wrapper( self.ui_setting_cb(e, "brightness")), lv.EVENT.PRESSING, None) - setting_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None) - setting_restore_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), lv.EVENT.PRESSING, None) - setting_poweroff_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), lv.EVENT.PRESSING, None) - setting_update_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), lv.EVENT.PRESSING, None) - setting_version_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), lv.EVENT.PRESSING, None) + setting_imei_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), lv.EVENT.PRESSING, None) + setting_app_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), lv.EVENT.PRESSING, None) + setting_bright_img_btn_1.add_event_cb(lambda e:EventMesh.callback_wrapper( self.ui_setting_cb(e, "brightness")), lv.EVENT.PRESSING, None) + setting_volume_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None) + setting_restore_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), lv.EVENT.PRESSING, None) + setting_poweroff_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), lv.EVENT.PRESSING, None) + setting_restart_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restart")), lv.EVENT.PRESSING, None) + setting_update_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), lv.EVENT.PRESSING, None) + setting_version_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), lv.EVENT.PRESSING, None) + def initialization(self): self.is_left_sliding = 0 self.is_sliding = 0 @@ -753,8 +859,8 @@ restore_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) restore_label = lv.label(restore_screen) restore_label.set_pos(0, 20) -restore_label.set_size(128, 20) -restore_label.set_text("恢复出厂设置?") +restore_label.set_size(128, 40) +restore_label.set_text("设备所有的数据将被清除,是否继续?") restore_label.set_long_mode(lv.label.LONG.WRAP) restore_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) restore_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -763,27 +869,27 @@ restore_confirm_label = lv.label(restore_screen) restore_confirm_label.set_text("确认") restore_confirm_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) restore_confirm_label.set_size(64, 20) -restore_confirm_label.set_pos(0,60) +restore_confirm_label.set_pos(0,80) restore_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) restore_confirm = lv.label(restore_screen) restore_confirm.set_text(" ") -restore_confirm.set_size(64, 40) -restore_confirm.set_pos(0,60) +restore_confirm.set_size(64, 48) +restore_confirm.set_pos(0,80) restore_confirm.add_flag(lv.obj.FLAG.CLICKABLE) restore_cancel_label = lv.label(restore_screen) restore_cancel_label.set_text("返回") restore_cancel_label.set_size(64, 20) restore_cancel_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -restore_cancel_label.set_pos(64,60) +restore_cancel_label.set_pos(64,80) restore_cancel_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) restore_cancel = lv.label(restore_screen) restore_cancel.set_text(" ") -restore_cancel.set_size(64, 40) -restore_cancel.set_pos(64,60) +restore_cancel.set_size(64, 48) +restore_cancel.set_pos(64,80) restore_cancel.add_flag(lv.obj.FLAG.CLICKABLE) @@ -807,37 +913,38 @@ IMEI:\n\ import versions version_label1 = lv.label(version_screen) -version_label1.set_pos(0, 5) -version_label1.set_size(128, 40) +version_label1.set_pos(10, 5) +version_label1.set_size(118, 20) version_label1.set_long_mode(lv.label.LONG.WRAP) -version_label1.set_text("Software Version:") -version_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# version_label1.set_text("Software Version:") +version_label1.set_text("产品名称:") +version_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 10) version_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -version_label2 = lv.label(version_screen) -version_label2.set_pos(0, 45) -version_label2.set_size(128, 20) -version_label2.set_long_mode(lv.label.LONG.WRAP) -version_label2.set_text("Python Lvgl") -version_label2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -version_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +# version_label2 = lv.label(version_screen) +# version_label2.set_pos(0, 45) +# version_label2.set_size(128, 20) +# version_label2.set_long_mode(lv.label.LONG.WRAP) +# version_label2.set_text("Python Lvgl") +# version_label2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# version_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -version_label3 = lv.label(version_screen) -version_label3.set_pos(0, 65) -version_label3.set_size(128, 20) -version_label3.set_long_mode(lv.label.LONG.WRAP) -version_label3.set_text("Version:") -version_label3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -version_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +# version_label3 = lv.label(version_screen) +# version_label3.set_pos(0, 65) +# version_label3.set_size(128, 20) +# version_label3.set_long_mode(lv.label.LONG.WRAP) +# version_label3.set_text("Version:") +# version_label3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# version_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label3 = lv.label(version_screen) -version_label3.set_pos(0, 90) -version_label3.set_size(128, 20) +version_label3.set_pos(10, 25) +version_label3.set_size(118, 40) version_label3.set_long_mode(lv.label.LONG.WRAP) version_label3.set_text(versions.Version) -version_label3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -version_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +version_label3.set_style_text_align(lv.TEXT_ALIGN.LEFT, 10) +version_label3.add_style(style_font_youyuan_20_gray, lv.PART.MAIN | lv.STATE.DEFAULT) # version_label4 = lv.label(version_screen) # version_label4.set_pos(0, version_label_y) @@ -848,20 +955,20 @@ version_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) # version_label4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label5 = lv.label(version_screen) -version_label5.set_pos(0, 115) -version_label5.set_size(128, 20) +version_label5.set_pos(10, 55) +version_label5.set_size(118, 20) version_label5.set_long_mode(lv.label.LONG.WRAP) -version_label5.set_text("Build Time:") -version_label5.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +version_label5.set_text("软件版本:") +version_label5.set_style_text_align(lv.TEXT_ALIGN.LEFT, 10) version_label5.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) version_label6 = lv.label(version_screen) -version_label6.set_pos(0, 140) -version_label6.set_size(128, 40) +version_label6.set_pos(10, 75) +version_label6.set_size(118, 40) version_label6.set_long_mode(lv.label.LONG.WRAP) version_label6.set_text(versions.Build_Time) -version_label6.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -version_label6.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +version_label6.set_style_text_align(lv.TEXT_ALIGN.LEFT, 10) +version_label6.add_style(style_font_youyuan_20_gray, lv.PART.MAIN | lv.STATE.DEFAULT) # version_label7 = lv.label(version_screen) # version_label7.set_pos(0, 210) @@ -871,20 +978,20 @@ version_label6.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) # version_label7.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) # version_label7.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -version_label8 = lv.label(version_screen) -version_label8.set_pos(0, 180) -version_label8.set_size(128, 20) -version_label8.set_long_mode(lv.label.LONG.WRAP) -version_label8.set_text("IMEI:") -version_label8.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -version_label8.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +# version_label8 = lv.label(version_screen) +# version_label8.set_pos(0, 180) +# version_label8.set_size(128, 20) +# version_label8.set_long_mode(lv.label.LONG.WRAP) +# version_label8.set_text("IMEI:") +# version_label8.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# version_label8.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) -version_label9 = lv.label(version_screen) -version_label9.set_pos(0, 200) -version_label9.set_size(128, 38) -version_label9.set_text(" ") -version_label9.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -version_label9.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +# version_label9 = lv.label(version_screen) +# version_label9.set_pos(0, 200) +# version_label9.set_size(128, 38) +# version_label9.set_text(" ") +# version_label9.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# version_label9.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -943,6 +1050,64 @@ class RestoreScreen(Screen): EventMesh.publish("load_screen", {"screen": "main_menu"}) +# -------------------------------------------restore screen---------------------------------------------------------- +restart_screen = lv.obj() +print("restart_screen") +restart_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + +restart_confirm_label = lv.label(restart_screen) +restart_confirm_label.set_text("确认") +restart_confirm_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +restart_confirm_label.set_size(64, 20) +restart_confirm_label.set_pos(0,60) +restart_confirm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + +restart_confirm = lv.label(restart_screen) +restart_confirm.set_text(" ") +restart_confirm.set_size(64, 40) +restart_confirm.set_pos(0,60) +restart_confirm.add_flag(lv.obj.FLAG.CLICKABLE) + +restart_cancel_label = lv.label(restart_screen) +restart_cancel_label.set_text("返回") +restart_cancel_label.set_size(64, 20) +restart_cancel_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +restart_cancel_label.set_pos(64,60) +restart_cancel_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +restart_cancel = lv.label(restart_screen) +restart_cancel.set_text(" ") +restart_cancel.set_size(64, 40) +restart_cancel.set_pos(64,60) +restart_cancel.add_flag(lv.obj.FLAG.CLICKABLE) + +class RestartScreen(Screen): + NAME = "restart" + + def __init__(self): + super().__init__() + self.meta = restart_screen + restore_confirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.CLICKED, None) + restart_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.CLICKED, None) + + + def confirm(self, e): + Power.powerRestart() + + def concel(self, e): + EventMesh.publish("load_screen", {"screen": "setting"}) + + def done_return(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "setting"}) + + def btn8_press(self): + EventMesh.publish("watch_top_show") + EventMesh.publish("load_screen", {"screen": "main_menu"}) + class UpdateScreen(Screen): NAME = "update" @@ -974,8 +1139,8 @@ class VersionScreen(Screen): self.btn_count = 0 def initialization(self): imei = EventMesh.publish(constants.EVENT.GET_IMEI) - print("imei",imei) - version_label9.set_text("{}".format(imei)) + # print("imei",imei) + # version_label9.set_text("{}".format(imei)) def Close(self): self.btn_count = 0 diff --git a/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py index 98dbfaa3..52917ef2 100644 --- a/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py +++ b/2.sdk/project/S6/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py @@ -652,7 +652,6 @@ class intervManager(Abstract): if power_off == 1: return flag = EventMesh.publish("get_call_state") - if msg == 1: self.usbState = msg str_buf = [1,1,10,led_mode.LONG_LIGHT_RED,4,2,led_mode.CHARGE_IN_MODE] @@ -1795,12 +1794,12 @@ class BtnDevice(Abstract): print("sosKey_press_count!!!!!!!!!!!!!! ",self.sosKey_press_count) if self.sosKey_press_count == 10:# self.sosKey_press_count = 0 - EventMesh.publish("close_led_and_motor")#设置参数 + EventMesh.publish("close_led_and_motor")#关闭led和马达振动 EventMesh.publish("open_power_on", 4)#恢复出厂 pass elif self.sosKey_press_count == 6:# self.sosKey_press_count = 0 - EventMesh.publish("close_led_and_motor")#设置参数 + EventMesh.publish("close_led_and_motor")#关闭led和马达振动 EventMesh.publish("play_imei_event")#播報imei号 pass elif self.sosKey_press_count == 5: @@ -1818,12 +1817,12 @@ class BtnDevice(Abstract): pass elif self.sosKey_press_count == 2:#播报当前步数 self.sosKey_press_count = 0 - EventMesh.publish("close_led_and_motor")# + EventMesh.publish("close_led_and_motor")#关闭led和马达振动 EventMesh.publish("play_cur_step_event")# pass elif self.sosKey_press_count == 1:#挂断来电 短语音播报 self.sosKey_press_count = 0 - EventMesh.publish("close_led_and_motor")#设置参数 + # EventMesh.publish("close_led_and_motor")#关闭led和马达振动 # EventMesh.publish("call_test_event") EventMesh.publish("sos_short_press")#sos短按事件 pass