From: d15521469561 Date: Fri, 12 May 2023 02:03:58 +0000 (+0800) Subject: 支付宝相关问题 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=473c6cd7f4aa2974e55d658a56784224a2ab35fb;p=mirrors%2FASR1603_G5.git 支付宝相关问题 电话相关问题更改 按键长按8s逻辑更改 家庭号码协议增加 --- diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py index 42310024..3bfeb3db 100644 --- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py +++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py @@ -96,7 +96,7 @@ class Alipay(Abstract): def timeout_Alipay(self, *args, **kwargs): #print("timeout_Alipay1:{}".format(EventMesh.publish(constants.EVENT.GET_CONNECT))) - time = utime.localtime() + #time = utime.localtime() if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and self.alipay != None and (self.is_simcard_identify != 0 ):#or time[3] == 0 or time[3] == 12): #if self.alipay != None and (self.is_simcard_identify != 0 or time[3] == 0 or time[3] == 12): @@ -357,17 +357,22 @@ class AlipayOpenScreen(Screen): super().__init__() self.meta = alipay_open_screen self.timer_AlipayOpen = osTimer() - + self.flag = 0 def initialization(self): print("AlipayOpenScreen:initialization") + self.flag = 0 self.timer_AlipayOpen.start(1000, 1, self.timeout_AlipayOpen) pass def timeout_AlipayOpen(self, *args, **kwargs): + print("timeout_AlipayOpen:") EventMesh.publish("system_sleep_rest")#防止黑屏 if EventMesh.publish("get_alipay_init") == 0: - EventMesh.publish("alipay_1") - self.timer_AlipayOpen.stop() + if self.flag == 0: + self.flag = 1 + EventMesh.publish("alipay_1") + + #self.timer_AlipayOpen.stop() def post_processor_after_initialization(self): pass @@ -375,6 +380,7 @@ class AlipayOpenScreen(Screen): EventMesh.publish("load_screen", {"screen": "main_menu"}) def Close(self): + self.flag = 0 self.timer_AlipayOpen.stop() EventMesh.publish("alipay_exit") @@ -496,18 +502,27 @@ class Alipay_invite(Screen): def __init__(self): super().__init__() self.meta = alipay_invite_screen - + self.alipay_invite = osTimer() + + def initialization(self): + self.alipay_invite.start(1000, 1, self.alipay_invite) + + def alipay_invite(self, *args, **kwargs): + print("alipay_invite:") + EventMesh.publish("system_sleep_rest")#防止黑屏 + - pass - def post_processor_after_initialization(self): # 二维码数据 self.alipay_qr_data = str(self.meta_info) print("alipay_invite:",str(self.meta_info)) alipay_invite_alipay_qr.update(self.alipay_qr_data,len(self.alipay_qr_data)) + def Close(self): + print("alipay_exit:") + self.alipay_invite.stop() EventMesh.publish("alipay_exit") pass @@ -531,7 +546,7 @@ alipay_inviting_label = lv.label(alipay_inviting_screen) alipay_inviting_label.set_pos(0, 158) alipay_inviting_label.set_size(240, 24) alipay_inviting_label.set_long_mode(lv.label.LONG.WRAP) -alipay_inviting_label.set_text("绑定中，不要走开") +alipay_inviting_label.set_text("绑定中,不要走开") alipay_inviting_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) alipay_inviting_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) class Alipay_inviting(Screen): diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/btn_device_ec800m.py index ba4c187c..a4b05a39 100644 --- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/btn_device_ec800m.py +++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/btn_device_ec800m.py @@ -13,7 +13,7 @@ class BtnDevice(Abstract): self.__pwk_timer = osTimer() self.keypad = machine.KeyPad(4, 1) - self.__PowerDownTimeOut = 2000 + self.__PowerDownTimeOut = 8000 self.__tp = tp def post_processor_after_instantiation(self): diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py index 2fce4dad..98bf563e 100644 --- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py @@ -19,6 +19,7 @@ from misc import USB, Power, ADC from machine import ExtInt, Pin,Timer,RTC,UART import EventMesh import audio +from machine import I2C from Gsensor import SC7A20 from Hsensor import GH3018 import quecgnss @@ -435,6 +436,10 @@ class ConfigStoreManager(Abstract): def voice_callback(args): print('voicecall iinfo:{}'.format(args)) if args[0] == 10: + get_UI_high_priority = EventMesh.publish("get_UI_high_priority")#如果在拨出去或者通话中屏蔽来电 + if get_UI_high_priority == 1: + EventMesh.publish("set_interrup_incall",1) + return print('voicecall incoming call, PhoneNO.: ', args[6]) size_len = len(str(args[6])) tmp = [] @@ -447,6 +452,12 @@ def voice_callback(args): EventMesh.publish("load_screen", {"screen": "incoming_call","meta":str(tmp)}) elif args[0] == 11: + EventMesh.publish("set_UI_high_priority",0) + sos_flag = EventMesh.publish("get_sos_flag") + if sos_flag == 1: + sos_flag = 0 + EventMesh.publish("set_sos_flag",0) + print('voicecall connected, PhoneNO.: ', args[6]) size_len = len(str(args[6])) tmp = [] @@ -458,12 +469,67 @@ def voice_callback(args): EventMesh.publish("load_screen", {"screen": "on_call","meta":str(tmp)}) elif args[0] == 12: + set_interrup_call = EventMesh.publish("get_interrup_incall")#打断这次不需要来电的ui事件 以免通话中退出当前界面进不去了 + if set_interrup_call == 1: + EventMesh.publish("set_interrup_incall",0) + return + + EventMesh.publish("set_interrup_incall",0) + EventMesh.publish("set_UI_high_priority",0) print('voicecall disconnect') - EventMesh.publish("load_screen", {"screen": "main_menu"}) + EventMesh.publish("load_screen", {"screen": "main_menu"}) + sos_flag = EventMesh.publish("get_sos_flag") + if sos_flag == 0: + EventMesh.publish("set_sos_num",0) + else: + num = EventMesh.publish("get_sos_num") + number = EventMesh.publish("get_dial_sos_number") + if len(number) > 0: + if num == None: + num = 0 + num+=1 + num_len = 0 + + if len(number) == 1: + num_len = len(number) + elif len(number) == 2: + num_len = len(number)+1 + elif len(number) == 3: + num_len = len(number)+2 + # print("number:{} number_len :{} num:{} num_len:{}".format(number,len(number),num,num_len)) + if num > num_len : + EventMesh.publish("set_sos_flag",0) + EventMesh.publish("set_sos_num",0) + else: + # print("number:{} number_len :{}".format(number,len(number))) + EventMesh.publish("set_sos_num",num) + if len(number) == 1: + EventMesh.publish("set_callnumer_cb",number[0]) + print("phone 1") + elif len(number) == 2: + if num == 1 or num == 3: + print("phone 2") + EventMesh.publish("set_callnumer_cb",number[1]) + elif num == 2: + print("phone 3") + EventMesh.publish("set_callnumer_cb",number[0]) + elif len(number) == 3: + if num == 1 or num == 4: + EventMesh.publish("set_callnumer_cb",number[1]) + print("phone 4") + elif num == 2 or num == 5: + print("phone 5") + EventMesh.publish("set_callnumer_cb",number[2]) + elif num == 3: + print("phone 6") + EventMesh.publish("set_callnumer_cb",number[0]) + print('voicecall disconnect end') + elif args[0] == 13: print('voicecall is waiting, PhoneNO.: ', args[6]) elif args[0] == 14: + print('voicecall dialing, PhoneNO.: ', args[6]) EventMesh.publish("load_screen", {"screen": "dialing"}) @@ -537,6 +603,9 @@ class DeviceInfoManager(Abstract): print('GNSS init ok.') else: print('GNSS init failed.') + + self.i2c0 = I2C(I2C.I2C0, I2C.STANDARD_MODE) + self.stop_temp( None, None) def post_processor_after_instantiation(self): print("post_processor_after_instantiation:1") @@ -575,6 +644,10 @@ class DeviceInfoManager(Abstract): EventMesh.subscribe(constants.EVENT.GET_BLOOD_OXYGEN, self.get_blood_oxygen) EventMesh.subscribe(constants.EVENT.GET_HEART, self.get_heart) + EventMesh.subscribe(constants.EVENT.START_TEMP, self.start_temp) + EventMesh.subscribe(constants.EVENT.STOP_TEMP, self.stop_temp) + EventMesh.subscribe(constants.EVENT.GET_TEMP, self.get_temp) + print("post_processor_after_instantiation:2") self.timer_push_schedule.start(10000, 1, self.publish_event) # self.battery_push_schedule.start(3000, 1, self.__check_battery) @@ -603,11 +676,13 @@ class DeviceInfoManager(Abstract): self.timer_push = 0 date_tmp = utime.localtime() time_tmp = utime.mktime(date_tmp) + print("date_tmp......01....{} time_tmp:{}\r\n".format(date_tmp,time_tmp)) + if math.fabs(time_tmp - self.KA_time) > 7*60: #7分钟一次心跳 self.KA_time = time_tmp EventMesh.publish(constants.PROTOCOL.KA_SEND) self.upload_time = EventMesh.publish("get_upload_data") - + #print("self.upload_time:{} math.fabs(time_tmp - self.UD_time):{}".format(self.upload_time,math.fabs(time_tmp - self.UD_time))) if self.upload_time != None: if math.fabs(time_tmp - self.UD_time) > self.upload_time: #7分钟一次定位 self.UD_time = time_tmp @@ -658,7 +733,7 @@ class DeviceInfoManager(Abstract): if msg_nums >= 50: EventMesh.publish("load_screen", {"screen": "message_full"}) - #print("hr......01....{}\r\n".format(hr_time)) + if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 or battery[1] != 1: if hr_time != None: # print("hr......01....{}\r\n".format(hr_time)) @@ -1159,7 +1234,32 @@ class DeviceInfoManager(Abstract): def get_heart(self, topic, msg): data = self.hsensor.get_all_data() return data[0] + + def start_temp(self, topic, msg): + WHO_AM_I = bytearray([0x01, 0]) + I2C_SLAVE_ADDR = 0x49 + r_data = bytearray(2) + data = bytearray([0x61A0, 0]) # 唤醒 + return self.i2c0.write(I2C_SLAVE_ADDR, WHO_AM_I, 1, data, 2) + def stop_temp(self, topic, msg): + WHO_AM_I = bytearray([0x01, 0]) + I2C_SLAVE_ADDR = 0x49 + r_data = bytearray(2) + data = bytearray([0x60A0, 0]) #休眠 + return self.i2c0.write(I2C_SLAVE_ADDR, WHO_AM_I, 1, data, 2) + + def get_temp(self, topic, msg): + WHO_AM_I = bytearray([0x00, 0]) + I2C_SLAVE_ADDR = 0x49 + r_data = bytearray(2) + self.i2c0.read(I2C_SLAVE_ADDR, WHO_AM_I, 1, r_data, 2, 0) + #print("temp_data:{}".format(r_data)) + temp_s = ((r_data[0]<<8) | (r_data[1]))>>4 + #print("temp_s:{}".format(temp_s)) + temp_data = temp_s * 0.0625 + #print("temp_data:{}".format(temp_data)) + return temp_data @@ -1412,7 +1512,11 @@ class LocationManager(Abstract): data = "" self.location_timer_count = self.location_timer_count +1 self.location_check_data_timer_count = self.location_check_data_timer_count+1 - if self.location_check_data_timer_count > 5 :#5秒查一次 + + match_gga_data = [] + match_gsv_data = [] + + if self.location_check_data_timer_count > 2 :#5秒查一次 self.location_check_data_timer_count = 0 #print(self.location_timer_count) #检查wifi数据 @@ -1424,6 +1528,8 @@ class LocationManager(Abstract): data = quecgnss.read(4096) #print(data[1].decode()) if data[0] > 0 : #有数据 + match_gga_data = self.match.GxGGA(data[1]).split(",") + match_gsv_data = self.match.GxGSV(data[1]).split(",") if self.gps.__check_gps_valid(data[1].decode()): #数据齐全 match_gmc_data = self.match.GxRMC(data[1]).split(",") match_vtg_data = self.match.GxVTG(data[1]).split(",") @@ -1457,14 +1563,17 @@ class LocationManager(Abstract): if self.location_type == 1: #测试模式 EventMesh.publish("PUSH_LOCATION_DATA", [data,self.wifi_data,self.cell_data]) elif self.location_type == 0: #正常模式 - if self.gps_data != [] or self.location_timer_count > 60: #or( self.wifi_data != [] and self.cell_data != []): + if self.gps_data != [] or self.location_timer_count > 40: #or( self.wifi_data != [] and self.cell_data != []): #print("publish:READ_LOCATION") EventMesh.publish(constants.EVENT.READ_LOCATION, [self.gps_data,self.wifi_data,self.cell_data]) EventMesh.publish(constants.EVENT.CLOSE_LOCATION)#关闭定位 - # if self.location_timer_count > 60 : #1分钟定位超时，超时发送数据，停止定时器及关闭定位 - # EventMesh.publish(constants.EVENT.CLOSE_LOCATION)#关闭定位 - # EventMesh.publish(constants.EVENT.READ_LOCATION, [self.gps_data,self.wifi_data,self.cell_data])#发送数据 - + + if len(match_gsv_data) >= 3: + #print("match_gsv_data[3]:{}".format(match_gsv_data[3])) + if (int(match_gsv_data[3]) < 3 and self.wifi_data != [] and self.cell_data != [] and self.location_timer_count > 10): #超过10秒且卫星个数少于3 + #print("publish:READ_LOCATION") + EventMesh.publish(constants.EVENT.READ_LOCATION, [self.gps_data,self.wifi_data,self.cell_data]) + EventMesh.publish(constants.EVENT.CLOSE_LOCATION)#关闭定位 @@ -1909,4 +2018,207 @@ class getVolumSizeManager(Abstract):#设置或获取音量大小数据 def get_volum_size(self, event, msg): return self.volume_size +class getSosFlagManager(Abstract):#设置或获取音量大小数据 + def __init__(self): + self.sos_flag = 0 + self.sos_num = 0 + self.call_timer = osTimer() + self.sos_numer1 = [] + self.callnumer ="" + self.read_data = {} + check = ql_fs.path_exists("/ext/static/storage_file/config.json") + + if check == True: + with open("/ext/static/storage_file/config.json","r") as fd: + self.read_data = ujson.load(fd) + if self.read_data != {}: + b1 = str("SOS_NUMBER1") in self.read_data.keys() + if b1 == True: + self.sos_numer1 = [self.read_data["SOS_NUMBER1"]] + b2 = str("SOS_NUMBER2") in self.read_data.keys() + if b2 == True: + self.sos_numer1 = [self.read_data["SOS_NUMBER1"], self.read_data["SOS_NUMBER2"]] + + b3 = str("SOS_NUMBER3") in self.read_data.keys() + if b3 == True: + self.sos_numer1 = [self.read_data["SOS_NUMBER1"], self.read_data["SOS_NUMBER2"],self.read_data["SOS_NUMBER3"]] + + # print("self.sos_numer1:{} self.read_data:{}".format(self.sos_numer1,self.read_data)) + + def post_processor_after_instantiation(self): + EventMesh.subscribe("set_sos_flag", self.set_sos_flag)#设置sos拨打标识 + EventMesh.subscribe("get_sos_flag", self.get_sos_flag) + + EventMesh.subscribe("set_sos_num", self.set_sos_num)#设置拨打循环次数 + EventMesh.subscribe("get_sos_num", self.get_sos_num) + + EventMesh.subscribe("set_dial_sos_number", self.set_dial_sos_number) + + EventMesh.subscribe("set_callnumer_cb", self.set_callnumer_cb)#延时回调 + + EventMesh.subscribe("get_dial_sos_number", self.get_dial_sos_number)#设置家庭号码三个 + + def set_sos_flag(self, event, msg): + self.sos_flag = msg + if self.sos_flag == 1: + number = EventMesh.publish("get_dial_sos_number") + if len(number) > 0 and number != None: + EventMesh.publish("save_phonename",number[0]) + EventMesh.publish("save_phonenum",number[0]) + voiceCall.callStart(str(number[0])) + + + def set_callnumer_cb(self, event, msg): + self.callnumer = msg + self.call_timer.start(5000, 0, self.call_timer_cb)#延迟1S 继续拨打 + + def call_timer_cb(self, *args, **kwargs): + # print("call_timer_cb:{}".format(self.callnumer)) + EventMesh.publish("save_phonename",str(self.callnumer)) + EventMesh.publish("save_phonenum",str(self.callnumer)) + voiceCall.callStart(str(self.callnumer)) + + def get_sos_flag(self, event, msg): + return self.sos_flag + + def set_sos_num(self, event, msg): + self.sos_num = msg + + def get_sos_num(self, event, msg): + return self.sos_num + + def set_dial_sos_number(self, event, msg): + self.sos_numer1 = msg + # print("self.sos_numer1:{}".format(self.sos_numer1)) + + def get_dial_sos_number(self, event, msg): + return self.sos_numer1 + + +class getBootOffManager(Abstract):#开关机时间 + def __init__(self): + self.read_data = {} + self.off_msg = [] + check = ql_fs.path_exists("/ext/static/storage_file/config.json") + + if check == True: + with open("/ext/static/storage_file/config.json","r") as fd: + self.read_data = ujson.load(fd) + if self.read_data != {}: + b1 = str("off_on") in self.read_data.keys() + if b1 == True: + self.off_on = self.read_data["off_on"] + b2 = str("off_start") in self.read_data.keys() + if b2 == True: + self.off_start= self.read_data["off_start"] + + b3 = str("off_end") in self.read_data.keys() + if b3 == True: + self.off_end = self.read_data["off_end"] + + # print("self.sos_numer1:{} self.read_data:{}".format(self.sos_numer1,self.read_data)) + + def post_processor_after_instantiation(self): + EventMesh.subscribe("set_boot_off_time", self.set_boot_off_time)#设置关机时间 + EventMesh.subscribe("get_boot_off_time", self.get_boot_off_time) + + # def _rtc_callback(self,args): + # print("---!!!!!!alarm_ring!!!!!!!---,idx:",args) + + # def set_boot_off_time(self, event, msg): + + # self.off_msg = msg + # if msg[0] == 0: + # return + + # rtc_now_time = self.rtc.datetime() + + # # data = RTC().datetime() + # # hour = data[4] + # # min = data[5] + + + + # current_minute = rtc_now_time[4]*60 + rtc_now_time[5] #当前的分钟数不包含年月日 + # off_msg1 = msg[1] + # off_msg2 = msg[2] + # msg_tmp1 = off_msg1.split(':') + # msg_tmp2 = off_msg2.split(':') + # start_min = msg_tmp1[0]*60+msg_tmp1[1] + # end_min = msg_tmp2[0]*60+msg_tmp2[1] + # #9:00 6:00 + # if current_minute > start_min:#如果当前的分钟数 大于开始的关机时间分钟数 则认为是第二天6:00需要开机 23:00需要关机 + # next_alarm_time = utime.localtime(next_alarm_mktime) + # pass + + + # print("04当前的rtc_total_minutes：{}".format(current_minute)) + + # if current_minute in minute_list: + # print("当前时间和闹钟列表时间重复，删除重复的时间") + # minute_list.remove(current_minute) + + # minute_list.append(current_minute) + + # # 对分钟数列表进行排序，并获取当前时间分钟数所在的位置 + # minute_list = sorted(minute_list) + # current_index = minute_list.index(current_minute) + + # print("05将当前时间插入min_list后的min_list：{}".format(minute_list)) + # print("06当前时间所在位置：{}".format(current_index)) + + # next_index = current_index + 1 + # if next_index >= len(minute_list): + # next_minute = minute_list[0] + # print("07下一个闹钟的分钟数：", next_minute) + # else: + # next_minute = minute_list[next_index] + # print("07下一个闹钟的分钟数：", next_minute) + + # if next_minute >= current_minute: + # interval_minute = next_minute - current_minute + # print("08距离下一次响铃的的分钟数：", interval_minute) + # else: + # interval_minute = end_minute - current_minute + next_minute + # print("08距离下一次响铃的的分钟数：", interval_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 + # 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) + + # #设置rtc闹钟时间 + # self.rtc.register_callback(self._rtc_callback) + + # FLAG = self.rtc.set_alarm(data_e) + # if FLAG == 0: + # print("成功设置rtc的到期时间：", data_e) + # else: + # print("设置rtc的到期时间失败：", data_e) + + # self.rtc.enable_alarm(1) + + # def get_boot_off_time(self, event, msg): + # return self.off_msg + \ No newline at end of file diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py index 0509a51e..60da1ccb 100644 --- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/protocol.py @@ -889,38 +889,6 @@ class MONITOR_ProtoCol(ProtoCol): EventMesh.publish("save_phonenum", contact) voiceCall.callStart(contact) EventMesh.publish(constants.PROTOCOL.MONITOR_SEND) - -#SOS紧急电话 -class SOS_ProtoCol(ProtoCol): - """紧急呼叫""" - TYPE = "SOS" - def send(self, event, msg): - # [XT*334588000000156*0004*MONITOR] - send_data = "SZKW*%s*0003*SOS"%(self.imei) - MD5_SIGN = self.pack_MD5_head(send_data) - data = "[%s%s]"%(str(MD5_SIGN),send_data) - print("SOS:data:%s"%(data)) - # 通过socket发送到服务器端 - EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) - - def recv(self, event, msg): - """ - @param event: - @param msg: 接收到的下行数据 - """ - # b'[SZKW*867387060319166*000A*SOS_SEND]' - self.read_data = {} - self.read_data = EventMesh.publish("get_storage_data") - if self.read_data != {}: - b = str("center_dial") in self.read_data.keys() - if b == True: - sos_dial = self.read_data["center_dial"] - if len(sos_dial) > 0: - pass - # print("SOS RECV msg:{} {}".format(sos_dial,type(sos_dial))) - # EventMesh.publish("save_phonename", sos_dial) - # voiceCall.callStart(sos_dial) - EventMesh.publish(constants.PROTOCOL.SOS_SEND) #定时开关机 class bootoff_ProtoCol(ProtoCol): @@ -947,19 +915,70 @@ class bootoff_ProtoCol(ProtoCol): msg_tmp = msg.decode('ascii') msg_tmp = msg_tmp.split(',') on_bt = msg_tmp[1] - on_hour = msg_tmp[2] - on_min = msg_tmp[3] - print("BOOTOFF:send data:%d %d %d"%(on_bt,on_hour,on_min)) + on_start = msg_tmp[2] + on_end = msg_tmp[3] + print("BOOTOFF:send data:{} {} {}".format(on_bt,on_start,on_end)) #b'[SZKW*860132060006970*0015*BOOTOFF,1,06:00,23:59]' read_data["off_on"] = on_bt - read_data["off_hour"] = on_hour - read_data["off_min"] = on_min + read_data["off_start"] = on_start + read_data["off_end"] = on_end EventMesh.publish("set_storage_data",read_data) + EventMesh.publish("set_boot_off_time",[on_bt,on_start,on_end]) with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd: ujson.dump(read_data,fd) EventMesh.publish(constants.PROTOCOL.BOOTOFF_SEND) + +#sos家庭号码 +class sosHome_dial_ProtoCol(ProtoCol): + """sos家庭号码""" + TYPE = "SOS" + def send(self, event, msg): + # [XT*334588000000156*0004*MONITOR] + send_data = "SZKW*%s*0003*SOS"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s]"%(str(MD5_SIGN),send_data) + print("sosHome_dial_ProtoCol:data:%s"%(data)) + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*SOS_SEND]' + read_data = {} + read_data = EventMesh.publish("get_storage_data") + msg = msg[1:-1] + msg_tmp = msg.decode('ascii') + msg_tmp = msg_tmp.split(',') + + # print("sosHome_dial_ProtoCol:send data :{} {}".format(len(msg_tmp),msg_tmp)) + #b'[SZKW*860132060006970*0015*sosHome_dial_ProtoCol,15521469561,10086,15521469561]' + i = 0 + for i in range(len(msg_tmp)-1): + # print("sos:send data :{}".format(msg_tmp[i+1])) + if len(msg_tmp[i+1]) != 0: + read_data["SOS_NUMBER{}".format(i+1)] = msg_tmp[i+1] + # print("read_data:{} msg_tmp:{}".format(read_data,msg_tmp[i+1])) + + if (len(msg_tmp)-1) == 3: + EventMesh.publish("set_dial_sos_number",[msg_tmp[1],msg_tmp[2],msg_tmp[3]]) + elif (len(msg_tmp)-1) == 2: + EventMesh.publish("set_dial_sos_number",[msg_tmp[1],msg_tmp[2]]) + elif (len(msg_tmp)-1) == 1: + EventMesh.publish("set_dial_sos_number",[msg_tmp[1]]) + + + if (len(msg_tmp)-1) != 0: + EventMesh.publish("set_storage_data",read_data) + # print("read_data:{}".format(read_data)) + with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd: + ujson.dump(read_data,fd) + + EventMesh.publish(constants.PROTOCOL.SOS_SEND) class ProtoColResolver(object): def __init__(self): diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py index 4c6a2d73..9c80ea5c 100644 --- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py @@ -610,7 +610,7 @@ class CallLogScreen(Screen): def call_log_update_show_list(self, event, msg): read_call_log = EventMesh.publish("get_call_log_list") - print("read_call_log:{}".format(read_call_log)) + # print("read_call_log:{}".format(read_call_log)) self.check_json = read_call_log[0] #文件是否存在 self.read_call_log = read_call_log[1]#通话记录数据 self.timer.start(500,0,self.reciving) @@ -650,7 +650,7 @@ class CallLogScreen(Screen): read_call_log = EventMesh.publish("get_call_log_list") - print("read_call_log:{}".format(read_call_log)) + # print("read_call_log:{}".format(read_call_log)) self.check_json = read_call_log[0] #文件是否存在 self.read_call_log = read_call_log[1]#通话记录数据 if self.check_json == True and self.read_call_log != {}: @@ -728,7 +728,7 @@ class CallLogScreen(Screen): def calling(self,e): global call_log_screen,contacts_cont_list ,call_log_title ,none_call_log_title # print("e.get_text():{} {}".format(e.get_target().get_child(0).get_text(),e.get_target().get_child(3).get_text())) - phonnum = int(e.get_target().get_child(0).get_text()) + phonnum = str(e.get_target().get_child(0).get_text()) phnoname = e.get_target().get_child(3).get_text() # print("phonnum :{} _msg:{}".format(phonnum,phnoname)) EventMesh.publish("save_phonenum",phonnum)#保存电话号码用于界面显示获取 @@ -803,6 +803,7 @@ class DialingScreen(Screen): self.number_tmp = {} def initialization(self): + EventMesh.publish("set_UI_high_priority", 1) global dialing_screen,dialing_img,dialing_name ,hangup_imgbtn if dialing_screen == None: dialing_screen = lv.obj() @@ -890,6 +891,7 @@ class DialingScreen(Screen): EventMesh.publish("call_log_update_show_list") def hangup(self,e): + EventMesh.publish("set_UI_high_priority", 0) voiceCall.callEnd() def done_return(self): @@ -1618,6 +1620,7 @@ class IncomingCallScreen(Screen): incoming_call_hangup.add_event_cb(lambda e: self.hangup(e), lv.EVENT.CLICKED, None) self.meta = incoming_call_screen + EventMesh.publish("set_UI_high_priority", 1) def post_processor_after_initialization(self): global incoming_call_screen,incoming_call_img,incoming_call_name_label,incoming_call_answer ,incoming_call_hangup @@ -1737,6 +1740,7 @@ class IncomingCallScreen(Screen): def answer(self,e): self.call_timer.stop() self.aud.stop() + EventMesh.publish("set_UI_high_priority", 0) voiceCall.callAnswer() def Close(self): @@ -1744,6 +1748,7 @@ class IncomingCallScreen(Screen): self.aud.stop() def hangup(self,e): + EventMesh.publish("set_UI_high_priority", 0) self.aud.stop() self.call_timer.stop() voiceCall.callEnd() @@ -1789,6 +1794,7 @@ class OnCallScreen(Screen): self.count_sec = 0 self.timer = osTimer() def initialization(self): + EventMesh.publish("set_UI_high_priority", 1) global on_call_screen,on_call_label_name,on_call_second_label ,on_call_hangup if on_call_screen ==None : on_call_screen = lv.obj() @@ -1840,6 +1846,7 @@ class OnCallScreen(Screen): self.count_sec+=1 def hangup(self,e): + EventMesh.publish("set_UI_high_priority", 0) voiceCall.callEnd() @@ -3337,6 +3344,8 @@ class UI(object): self.read_data = EventMesh.publish("get_storage_data") self.main_flag = 0 self.main_id = 0 + self.set_interrup_flag = 0 + self.UI_high_priority_flag = 0 #如果=1，则当前ui不被打断 # print("self.read_data:{} self.level:{}".format(self.read_data,self.level)) check = ql_fs.path_exists("/ext/static/storage_file/config.json") if check == True: @@ -3390,8 +3399,25 @@ class UI(object): EventMesh.subscribe(constants.EVENT.SYSTEM_SLEEP, self.system_sleep) EventMesh.subscribe(constants.EVENT.SYSTEM_UP, self.system_up) EventMesh.subscribe("system_sleep_rest", self.system_sleep_rest) + EventMesh.subscribe("set_UI_high_priority", self.set_UI_high_priority) + EventMesh.subscribe("get_UI_high_priority", self.get_UI_high_priority) + + EventMesh.subscribe("set_interrup_incall", self.set_interrup_incall) + EventMesh.subscribe("get_interrup_incall", self.get_interrup_incall) + self.system_sleep_timer.start(1000, 1, self.system_sleep_timer_cb) + def set_interrup_incall(self, event, msg): + self.set_interrup_flag = msg + + def get_interrup_incall(self, event, msg): + return self.set_interrup_flag + + def set_UI_high_priority(self, event, msg): + self.UI_high_priority_flag = msg + + def get_UI_high_priority(self, event, msg): + return self.UI_high_priority_flag def get_lcd_state(self, event, key): return self.sleep_flag @@ -3436,7 +3462,11 @@ class UI(object): if event == "btn8_press": self.screen.btn8_press() if event == "btn8_long_press": - EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机 + EventMesh.publish("set_sos_flag", 1) + else: + EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) + if event == "btn1_press": self.screen.btn1_release() @@ -3535,6 +3565,8 @@ class UI(object): def load_screen(self, topic, msg): print("msg1={}".format(msg)) + if self.UI_high_priority_flag == 1: + return for scr in self.screen_list: if scr.NAME == msg["screen"]: # 每次屏幕切换开始息屏倒计时