From: dxy15521469561 <1731678236@qq.com> Date: Mon, 27 Nov 2023 07:41:16 +0000 (+0800) Subject: C06S: X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6937ab011ae88e70c41b756e90808223958f85f8;p=mirrors%2FASR1603_G5.git C06S: 马达验证 D10开关机 K01: 视频通话 --- diff --git a/2.sdk/Helios_SDK/services/microPython/py/scheduler.c b/2.sdk/Helios_SDK/services/microPython/py/scheduler.c index d387ae90..e18e5092 100644 --- a/2.sdk/Helios_SDK/services/microPython/py/scheduler.c +++ b/2.sdk/Helios_SDK/services/microPython/py/scheduler.c @@ -200,6 +200,7 @@ bool mp_sched_schedule_ex(c_callback_t *callback, mp_obj_t arg) int ret = qpy_send_msg_to_callback_deal_thread(CALLBACK_TYPE_ID_LOAD_BOUNDMETH, loadboundmet_msg); if(ret != 0) { + qpy_callback_para_node_delete(loadboundmet_msg); free(loadboundmet_msg); } return true; diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/Makefile b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/Makefile index b86010e9..0734de61 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/Makefile +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/Makefile @@ -970,6 +970,7 @@ frozen_mpy_list = $(BUILD)/_boot.mpy \ $(BUILD)/ui_WatchFaceScreen.mpy \ $(BUILD)/ui_health.mpy \ $(BUILD)/main_init.mpy \ + $(BUILD)/motor.mpy \ $(BUILD)/versions.mpy \ endif diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_init.py index 3ee086ad..9e5e21f9 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/main_init.py @@ -68,7 +68,7 @@ def main_init(): from appFactoryMode import FactoryModestepScreen,FactoryModeLocationScreen,FactoryModeScreen ,FactoryModeBatTestScreen,FactoryModeHsensorTestScreen,FactoryModeLogScreen from mgr import setCallStateManager,setclassTimeManager,setSmsIndexManager,ConfigStoreManager,testSmsSetIPManager,playPowerAudioManager,sosInfoCallManager,getBootOffManager,getSosFlagManager,CountdownManager, LocationManager, getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, getplayAudiodStateManager,\ AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldTimeManager,getStorageDataManager,getBrightnessManager,getHrTimeManager,getTempTimeManager,getLowBatManager - + from motor import motorEventManager import ui as _ui # import ui as _ui #print("init4:{}".format(utime.localtime())) @@ -78,6 +78,7 @@ def main_init(): app.set_ui(ui) try: app.append_manager(getStorageDataManager()) + app.append_manager(motorEventManager()) except Exception as e: usys.print_exception(e) try: @@ -235,6 +236,7 @@ def main_init(): # .append_manager(mgr.StopwatchManager()) \ # .append_manager(mgr.CountdownManager()) \ app.append_manager(playPowerAudioManager()) + #app.append_manager(Alipay()) app.append_manager(ConfigStoreManager()) app.append_manager(NetManager()) diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/motor.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/motor.py new file mode 100644 index 00000000..cd31639b --- /dev/null +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/motor.py @@ -0,0 +1,112 @@ +from common import Abstract +import osTimer +import EventMesh +from machine import Pin +import utime + +from queue import Queue +import _thread +import usys + + +motor_pin = Pin(Pin.GPIO20, Pin.OUT, Pin.PULL_PD, 0) +def open_motor():#开马达 + motor_pin.write(1) + +def close_motor():#关闭马达 + motor_pin.write(0) + + + +MOTOR_TIME = 100 +class motorEventManager(Abstract):#马达事件 + def __init__(self): + self.motor_timer = osTimer() + self.motorInfo_queue = Queue() + self.motor_enable = 0#马达使能 + self.motor_total_time = 0#总的时间 + self.motor_open_time = 0 #开马达事件 + self.motor_close_time = 0#关马达事件100ms + self.motor_count = 0 + self.motor_mode = 0#模式 + _thread.start_new_thread(self.motorInfo_queue_thread, ()) + EventMesh.subscribe("publish_message_event_motorInfo",self.publish_message_event_motorInfo) + pass + + def motorInfo_queue_thread(self): + while True: + data = self.motorInfo_queue.get() + #print("ledInfo_queue:data = {}".format(data)) + if data != None: + try: + data["func"](data["data"]) + except Exception as e: + print("ledInfo_queue:ERROR:{}".format(e)) + usys.print_exception(e) + def publish_message_event_motorInfo(self,event,msg): + self.motorInfo_queue.put(msg) + + def publish_motor_event_cb(self, *args, **kwargs): + EventMesh.publish("publish_message_event_motorInfo",{"func":self.motor_fun_cb,"data":0}) + + def post_processor_after_instantiation(self): + EventMesh.subscribe("set_motor_time", self.set_motor_time)#设置参数 + EventMesh.subscribe("close_motor_infor", self.close_motor_infor)#关闭马达和定时器 + + # msg 0马达使能 1 马达振动时间100ms单位 2 震动次数 3 间隔时间振动 4 是否需要长振 5 长振时间 6间隔时间长振 7长振次数1一次 要为200ms的倍数 + def set_motor_time(self,event,msg): + open_power = EventMesh.publish("get_power_on_state")#获取开机标识 + if open_power != None: + if open_power == 0: + return + if msg != None: + self.motor_enable = msg[0] + if self.motor_enable == 1: #马达使能 + self.motor_mode = msg [1] + self.motor_total_time = msg[2]#总的时间 + self.motor_open_time = msg[3] #开马达事件 + self.motor_close_time = msg[4]#关马达事件100ms + self.motor_count = 0 + self.motor_timer.stop() + # print("motor msg",msg) + close_motor() + self.motor_timer.start(MOTOR_TIME,1,self.publish_motor_event_cb) + + def motor_fun_cb(self, data): + if self.motor_mode == 0 or self.motor_enable == 0: + close_motor() + EventMesh.publish("close_motor_infor")#关闭马达和定时器 + return + if self.motor_mode == 1:# + if self.motor_total_time > 0: + self.motor_total_time-=1 + if self.motor_total_time > 0: + open_motor() + else: + close_motor() + EventMesh.publish("close_motor_infor")#关闭马达和定时器 + return + elif self.motor_mode == 2:# + # print("self.motor_count",self.motor_count,self.motor_open_time,self.motor_close_time,self.motor_total_time) + if self.motor_count % (self.motor_open_time) < self.motor_close_time: # 4 4 2 1%4 = 1 2%4 = 2 3%4 = 3 + open_motor() + else: + close_motor() + if self.motor_count >= self.motor_total_time-1: + EventMesh.publish("close_motor_infor")#关闭马达和定时器 + return + self.motor_count+=1 + + def close_motor_infor(self,event,msg): + print("close_motor_infor!!!") + close_motor() + self.motor_enable = 0#马达使能 + self.motor_total_time = 0#总的时间 + self.motor_open_time = 0 #开马达事件 + self.motor_close_time = 0#关马达事件100ms + self.motor_count = 0 + self.motor_mode = 0#模式 + self.motor_timer.stop() + + + diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py index 72bd2bb4..59f29b88 100644 --- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -1185,6 +1185,7 @@ class PowerOnScreen(Screen): self.meta = poweron_screen self.meta_type = "popup" self.timer = osTimer() + self.timer1 = osTimer() self.aud = audio.Audio(0) self.aud.set_pa(Pin.GPIO29) self.volum_size = 8 @@ -1199,7 +1200,9 @@ class PowerOnScreen(Screen): def initialization(self): self.count = 0 self.aud.setVolume(11) + # EventMesh.publish("set_motor_time",[1,2,8,8,4])#设置马达参数 self.timer.start(1000,1,self.fun) + self.timer1.start(3000,0,self.fun_motor) pass def fun(self,*argc): @@ -1216,6 +1219,8 @@ class PowerOnScreen(Screen): EventMesh.publish("load_screen", {"screen": "main_menu"}) return self.count+=1 + def fun_motor(self,*argc): + EventMesh.publish("set_motor_time",[1,2,8*1,8,4])#设置马达参数 def Close(self): self.timer.stop() 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 44ce3919..d2123bbb 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 @@ -400,395 +400,7 @@ alarm_list = [{'hour': 16, 'repeart': 10, 'idx': 0, 'enabled': 0, 'days': [], 'm {'hour': 16, 'repeart': 10, 'idx': 1, 'enabled': 0, 'days': [], 'minute': 39}] #用于显示闹钟列表不包含开关机信息 -class ClockManager(Abstract): - def __init__(self): - super().__init__() - self.rtc = RTC() - self.days = 0 - self.idx = 0 - - IFEXIST = ql_fs.path_exists("/usr/static/storage_file/alarm_msg.json") - self.check_alarm_list = [] - if IFEXIST == True: - with open("/usr/static/storage_file/alarm_msg.json","r",encoding='utf-8') as fd: - self.check_alarm_list = ujson.load(fd) - - EventMesh.subscribe("push_clock_info", self.set) - EventMesh.subscribe("read_alarminjson", self.read_alarminjson) - EventMesh.subscribe("add_alarm", self.add_alarm) - EventMesh.subscribe("remove_alarm", self.remove_alarm) - EventMesh.subscribe("set_rtc_alarm", self.set_rtc_alarm) - EventMesh.subscribe("get_alarm_indx", self.get_alarm_indx) - EventMesh.subscribe("get_check_alarm_list", self.get_check_alarm_list) - EventMesh.subscribe("push_update_alarm_show", self.update_show_info) - - def post_processor_after_instantiation(self): - - - EventMesh.publish("read_alarminjson") - EventMesh.publish("set_rtc_alarm") - - def update_show_info(self,event,msg): - EventMesh.publish("read_alarminjson") - EventMesh.publish("set_rtc_alarm") - - def get_check_alarm_list(self, event, msg): - alarm_len = 0 - global alarm_list - EventMesh.publish("read_alarminjson") - alarm_len = len(alarm_list) - return alarm_len - - - def set(self, event, msg): - global alarm_list - print("msg = {}".format(msg)) - idx = msg.get("idx") - print("修改第{}个闹钟信息{}".format(idx,alarm_list[idx])) - alarm_list[idx]["hour"] = msg["hour"] - alarm_list[idx]["minute"] = msg["minute"] - alarm_list[idx]["days"] = msg["days"] - alarm_list[idx]["enabled"] = msg["enabled"] - alarm_list[idx]["repeart"] = msg["repeart"] - with open("/usr/static/storage_file/alarm_msg.json", 'w+',encoding='utf-8') as fd: - ujson.dump(alarm_list,fd) - - def read_alarminjson(self, event, msg): - IFEXIST = ql_fs.path_exists("/usr/static/storage_file/alarm_msg.json") - global alarm_list - print("IFEXIST:{}".format(IFEXIST)) - if IFEXIST == True: - with open("/usr/static/storage_file/alarm_msg.json","r",encoding='utf-8') as fd: - alarm_list = ujson.load(fd) - return alarm_list - - def add_alarm(self, event, msg): - - 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]) - 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)) - - # else: - # msg_tmp = msg[1] - # # print("alarm_list:{} alarm_new_old:{} msg_tmp:{}",alarm_new,alarm_new_old,msg_tmp) - # num = 2 - # count = 1 - # j=0 - # new = 0 - # for j in range(0,3): - # alarm_day = [] - # alarm_week = [] - # alarm_total_data = [] - # alarm_total_data = msg_tmp.split(',')[j] - - # 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) - # if alarm_list and new == 0 : - # for x in range(0,5): - - # print("count :{} self.alarm_new:111111{} len(self.alarm_new):{} ".format(count,alarm_list,len(alarm_list))) - - # tmp = alarm_list[count-1]['idx'] - # if tmp == 2 or tmp == 3 or tmp == 4 :#覆盖旧的 - # alarm_list[count-1] = {"idx": tmp, "hour": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":1} - # count+=1 - # if count > len(alarm_list): - # new = 1 - # print("self.alarm_list:5555 {}".format(alarm_list)) - # break - # else:#添加最新的 - # count+=1 - # if tmp == 0 or tmp == 1:#添加最新的 - # msg_data = EventMesh.publish("get_boot_off_time") - # print("msg_data all_data {}".format(msg_data)) - # if msg_data != None: - # if msg_data[1] > 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": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) - # 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": alarm_time_hour, "minute": alarm_time_min, "days":alarm_day, "enabled": alarm_switch,"repeart":alarm_day_num}) - # new = 1 - # num+=1 - - print("alarm_list----len- :{}".format(len(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") - - - - - - - def remove_alarm(self, event, msg): - global alarm_list - print("ddddddddddddddddddd:",msg) - idx = msg.get("idx") - print("delete_here1-----{},{}:".format(idx,msg)) - - for i, alarm in enumerate(alarm_list): - print("delete_here2-----{},{}:".format(i,alarm)) - - if alarm["idx"] == idx: - del alarm_list[i] - print("delete_here3-----",alarm_list) - - #删除闹钟后,对idx重新排序 - if alarm_list: - for j in range(i,len(alarm_list)): - alarm_list[j]["idx"] -= 1 - print("delete_here4-----",alarm_list) - - with open("/usr/static/storage_file/alarm_msg.json", 'w+',encoding='utf-8') as fd: - ujson.dump(alarm_list,fd) - - - def get_alarm_indx(self,event,msg): - return self.idx - - def _rtc_callback(self,args): - print("---!!!!!!alarm_ring!!!!!!!---,idx:",args) - global alarm_list - EventMesh.publish("read_alarminjson") - idx = self.idx - print("单次闹钟关闭:{} alarm_list:{}".format(idx,alarm_list)) - #判断是否是单次闹钟,如果是,则将开关状态设置为关闭 - # for i in range(len(alarm_list)): - # if alarm_list[i]["idx"] == self.idx: - # idx = i - if not alarm_list[idx]["days"] : - print("关闭1:",alarm_list[idx]["days"]) - print("关闭2:",alarm_list [idx]["days"]) - 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)) - - 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]) - - 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 off_on != None: - if off_on == 1:#开关使能打开 - if end_min == current:#结束的时间分钟等于关机时间分钟数则关机 - # EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) - 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---") - - def set_rtc_alarm(self,event,msg): - global alarm_list - EventMesh.publish("read_alarminjson") - rtc_now_time = self.rtc.datetime() - - # print("00获取所有闹钟信息:{}".format(alarm_list)) - new_alarm_list = [(alarm['hour'], alarm['minute'], alarm['days'],alarm["idx"]) for alarm in alarm_list if alarm['enabled']] - - print("01获取开启的闹钟:{}".format(new_alarm_list)) - start_day = 0 # 周日 - start_minute = 0 # 0点 - end_minute = 60*24*7 - minute_list = [] - - if not new_alarm_list: - print("02当前并没有开启的闹钟,退出闹钟设置程序:{}".format(new_alarm_list)) - self.rtc.enable_alarm(0) - return - - for alarm in new_alarm_list: - hour, minute, days,idx = alarm - #如果没有选择day,则表示是单次闹钟 - if days: - for day in days: - minute_list.append(hour*60 + minute + (day-start_day)*24*60) - - else: - #如果当前时间没超过闹钟设置时间,则设置为今天,否则设置为明天 - if (hour*60 + minute) > (rtc_now_time[4]*60 + rtc_now_time[5]): - minute_list.append(hour*60 + minute + (rtc_now_time[3]-start_day)*24*60) - print("设置单次闹钟:{}".format(new_alarm_list)) - - else: - minute_list.append(hour*60 + minute + (rtc_now_time[3]-start_day+1)*24*60) - - total_minutes = sorted(minute_list) - print("02以周日00:00为起点,计算所有开启闹钟的total_min并排序:{}".format(total_minutes)) - - #获取当前时间 (2020, 9, 11, 5, 15, 43, 23, 0) - # rtc_now_time = (2020, 9, 11, 6, 11, 43, 23, 0) - # rtc_now_time = self.rtc.datetime() - - print("03当前的rtc时间:{}".format(rtc_now_time)) - - current_minute = rtc_now_time[4]*60 + rtc_now_time[5] + (rtc_now_time[3]-start_day)*24*60 - 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) - - for alarm in alarm_list: - if not alarm["days"] and alarm["enabled"]: - print("关闭666:",alarm["idx"]) - if alarm["hour"] == data_l[4] and alarm["minute"]==data_l[5]: - self.idx = alarm["idx"] - #设置rtc闹钟时间 - self.rtc.register_callback(self._rtc_callback) - - FLAG = self.rtc.set_alarm(data_e) - if FLAG == 0: - print("14成功设置rtc的到期时间:", data_e) - else: - print("14设置rtc的到期时间失败:", data_e) - - self.rtc.enable_alarm(1) - + #闹钟弹窗 popup_alarm_screen = lv.obj() print("popup_alarm_screen") 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 66d10861..58fab1ad 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 @@ -124,6 +124,7 @@ def main_init(): app.append_manager(mgr.CallLogManager()) app.append_manager(mgr.getWeatherDataManager()) app.append_manager(PhoneCallingManager()) + app.append_manager(ClockManager()) app.append_manager(gethistoryDataManager()) app.append_manager(getHrTimeManager()) @@ -141,7 +142,6 @@ def main_init(): app.append_manager(sosInfoCallManager()) app.append_manager(testSmsSetIPManager()) app.append_manager(deleteSmsManager()) - app.append_manager(ClockManager()) print("init21:{}".format(utime.localtime())) 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 4854e034..c637e8c5 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 @@ -3317,8 +3317,8 @@ class getBootOffManager(Abstract):#开关机时间 self.off_flag = 0 self.rtc = RTC() self.off_on = 1 - self.off_start = "06:00" - self.off_end = "23:00" + self.off_start = "6:0" + self.off_end = "23:0" read_data = EventMesh.publish("get_storage_config","off_on") if read_data != None: self.off_on = read_data @@ -3335,6 +3335,7 @@ class getBootOffManager(Abstract):#开关机时间 EventMesh.subscribe("get_boot_off_time", self.get_boot_off_time) def set_boot_off_time(self, event, msg): + print("set_boot_off_time",msg) 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]]) @@ -3348,10 +3349,10 @@ class getBootOffManager(Abstract):#开关机时间 if self.off_on == None: self.off_on = 1 if self.off_start == None: - self.off_start = "06:00" + self.off_start = "6:0" - if self.off_on == None: - self.off_on = "23:00" + if self.off_end == None: + self.off_end = "23:0" return [self.off_on,self.off_start,self.off_end] class setSmsIndexManager(Abstract):# def __init__(self): @@ -3464,8 +3465,7 @@ class ClockManager(Abstract): EventMesh.subscribe("push_update_alarm_show", self.update_show_info) def post_processor_after_instantiation(self): - - + EventMesh.publish("read_alarminjson") EventMesh.publish("set_rtc_alarm") @@ -3501,6 +3501,20 @@ class ClockManager(Abstract): if IFEXIST == True: with open("/usr/static/storage_file/alarm_msg.json","r",encoding='utf-8') as fd: alarm_list = ujson.load(fd) + + + # read_data = EventMesh.publish("get_storage_config","off_on") + + hour1 = str(alarm_list[0]["hour"])+':'+str(alarm_list[0]["minute"]) + # min1 = str(alarm_list[0]["minute"]) + + hour2 = str(alarm_list[1]["hour"])+':'+str(alarm_list[1]["minute"]) + # min2 = str(alarm_list[1]["minute"]) + EventMesh.publish("set_boot_off_time",[1,hour1,hour2]) + + print("hour1:{}-{}".format(hour1,hour2)) + + return alarm_list def add_alarm(self, event, msg): @@ -3585,8 +3599,8 @@ class ClockManager(Abstract): 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" + off_start = "6:0" + off_end = "23:0" if msg_data[0] != None: off_on = int(msg_data[0]) if msg_data[1] != None: @@ -3604,7 +3618,6 @@ class ClockManager(Abstract): 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: diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py index 931560b3..604a3c4c 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/constants.py @@ -122,8 +122,21 @@ class PROTOCOL: PPSRVVOICEMSG_SEND = "ppsrvvoicemsg_SEND" PPSRVVOICEMSG_RECV = "ppsrvvoicemsg_RECV" + + + JPREG_SEND = "JPREG_SEND" + JPREG_RECV = "JPREG_RECV" + + MEMBERS_SEND = "MEMBERS_SEND" + MEMBERS_RECV = "MEMBERS_RECV" + + CALLING_SEND = "CALLING_SEND" + CALLING_RECV = "CALLING_RECV" + RCALLING_SEND = "RCALLING_SEND" + RCALLING_RECV = "RCALLING_RECV" + class EVENT: CHANNEL_SOCKET_SEND = "CHANNEL_SOCKET_SEND" START_LOCATION = "START_LOCATION" 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 bfc246ed..6de8b066 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 @@ -92,6 +92,7 @@ def main_init(): ui.add_screen(_ui.Spo2Screen()) ui.add_screen(_ui.TemperatureScreen()) ui.add_screen(_ui.ContactsScreen()) + ui.add_screen(_ui.cameraVdieoAnswerScreen()) from appWechat import WechatScreen,NewWechatPopupScreen ui.add_screen(WechatScreen()) @@ -179,7 +180,7 @@ def main_init(): # ui.add_screen(_ui.Setting3Screen()) print("init6:{}".format(utime.localtime())) - from protocol import ppsrvvoicemsg_ProtoCol,ppdevvoicemsg_ProtoCol,srvtextmsg_ProtoCol,TK_ProtoCol,MESSAGE_ProtoCol,APPVOICEMSG_ProtoCol,restart_ProtoCol,factory_ProtoCol,SILENCETIMEFS_ProtoCol,WLKEY_ProtoCol,SILENCETIME2_ProtoCol,KEYBRD_ProtoCol,LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,\ + from protocol import RCALLING_ProtoCol,AGTALK_ProtoCol,CALLING_ProtoCol,MEMBERS_ProtoCol,JPREG_ProtoCol,ppsrvvoicemsg_ProtoCol,ppdevvoicemsg_ProtoCol,srvtextmsg_ProtoCol,TK_ProtoCol,MESSAGE_ProtoCol,APPVOICEMSG_ProtoCol,restart_ProtoCol,factory_ProtoCol,SILENCETIMEFS_ProtoCol,WLKEY_ProtoCol,SILENCETIME2_ProtoCol,KEYBRD_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,\ pp_ProtoCol,ppfriends_ProtoCol,revpp_ProtoCol,reqpp_ProtoCol,delpp_ProtoCol,ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol,bootoff_ProtoCol,WDSTART_ProtoCol,LOWBAT_ProtoCol,sosHome_dial_ProtoCol,SockManager,NetManager @@ -282,6 +283,12 @@ def main_init(): pcr.add_support(ppfriends_ProtoCol()) pcr.add_support(factory_ProtoCol()) pcr.add_support(restart_ProtoCol()) + + pcr.add_support(JPREG_ProtoCol()) + pcr.add_support(MEMBERS_ProtoCol()) + pcr.add_support(AGTALK_ProtoCol()) + pcr.add_support(CALLING_ProtoCol()) + pcr.add_support(RCALLING_ProtoCol()) EventMesh.publish("load_screen", {"screen": "poweron"}) sm = SockManager() sm.add_support_resolver(pcr) diff --git a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py index c4b20339..d2b5391e 100644 --- a/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py @@ -533,6 +533,7 @@ class LK_ProtoCol(ProtoCol): EventMesh.publish(constants.EVENT.START_LOCATION,constants.PROTOCOL.UD_SEND) #开始UD定位 EventMesh.publish(constants.EVENT.START_LOCATION,constants.PROTOCOL.WT_SEND) #开始WT定位 EventMesh.publish(constants.PROTOCOL.MFCODE_FRIEND_REQ_SEND)#开机获取一次好友列表 + EventMesh.publish(constants.PROTOCOL.MEMBERS_SEND) class PING_ProtoCol(ProtoCol): """获取绑定状态""" @@ -556,6 +557,7 @@ class PING_ProtoCol(ProtoCol): #print("PING_ProtoCol:recv:%s"%(msg)) data_tmp = msg.decode('ascii') data_tmp = data_tmp.split(']')[0] #去掉] + EventMesh.publish(constants.PROTOCOL.JPREG_SEND) EventMesh.publish(constants.EVENT.SET_PING, data_tmp.split(',')[1]) class KA_ProtoCol(ProtoCol): @@ -2280,6 +2282,163 @@ class srvtextmsg_ProtoCol(ProtoCol):#微聊文字 EventMesh.publish(constants.PROTOCOL.SRVTEXTMSG_SEND,[msg_x,msg_id]) +#视频通话 +# [XT*YYYYYYYYYYYYYYY*LEN*JPREG] +# 实例: +# [XT*334588000000156*0004*JPREG] +# 平台回复: +# [XT*设备ID*LEN*JPREG,账号(整型)] +# 实例:[XT*334588000000156*0010*JPREG,1087654321] +class JPREG_ProtoCol(ProtoCol):#登入注册 + """""" + TYPE = "JPREG" + def send(self, event, msg): + + # [XT*334588000000156*0005*WLKEY] + send_data = EventMesh.publish("get_new_pid")+"*%s*0005*JPREG"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s]"%(str(MD5_SIGN),send_data) + # print("WLKEY:data:%s"%(data)) + # print("WLKEY!!!!!!!!!!!!!") + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + print("JPREG!!!!!!!!!!!!!",msg) + # EventMesh.publish(constants.PROTOCOL.JPREG_SEND) + +# (声网,佰锐的账号是整型) +# [XT*YYYYYYYYYYYYYYY*LEN*MEMBERS] +# 实例:[XT*334588000000156*0007*MEMBERS] +# 平台回复:[XT*设备ID*LEN*MEMBERS,账号1,昵称1,电话1,账号2,昵称2,电话2.....] +# 实例: +# [XT*334588000000156*003F*MEMBERS,d3e2f759f9d5af3858f3530,爸爸,13662313580,妈妈,555] +# 以上数据部分使用Unicode编码,最终上面示例传到服务端将是: + +class MEMBERS_ProtoCol(ProtoCol):#获取账号列表 + """""" + TYPE = "MEMBERS" + def send(self, event, msg): + + # [XT*334588000000156*0005*WLKEY] + send_data = EventMesh.publish("get_new_pid")+"*%s*0007*MEMBERS"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s]"%(str(MD5_SIGN),send_data) + # print("WLKEY:data:%s"%(data)) + # print("WLKEY!!!!!!!!!!!!!") + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + print("MEMBERS!!!!!!!!!!!!!",msg) + # EventMesh.publish(constants.PROTOCOL.MEMBERS_SEND) + +# [XT*YYYYYYYYYYYYYYY*LEN*AGTALK,通话类型,对方账号] +# 通话类型:0表示语音通话,1表示视频通话 +# 实例: +# XT*334588000000156*0007*AGTALK,0,d3e2f759f9d5af3858f3530b] +# 或[XT*334588000000156*0007*AGTALK,1,d3e2f759f9d5af3858f3530b] +# 注:如果佰锐视频,则账号为佰锐账号(整型) +# 平台回复:[XT*设备ID*LEN*AGTALK,结果,Token,声网频道名/会议号(如有的话,没有则不带)] +# 结果:0表示可正常通话,-1表示余额不足,不能通话,1表示对方不在线或未登陆成功 +# 实例:[XT*334588000000156*0006*AGTALK,0,efef2323423423,123]或[XT*334588000000156*0006*AGTALK,1] +class AGTALK_ProtoCol(ProtoCol):#设备发起视频通话 + """""" + TYPE = "AGTALK" + def send(self, event, msg): + + # [XT*334588000000156*0005*WLKEY] + send_data = EventMesh.publish("get_new_pid")+"*%s*0006*AGTALK"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s]"%(str(MD5_SIGN),send_data) + # print("WLKEY:data:%s"%(data)) + # print("WLKEY!!!!!!!!!!!!!") + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + print("AGTALK!!!!!!!!!!!!!",msg) + # EventMesh.publish(constants.PROTOCOL.MEMBERS_SEND) + +# [XT*YYYYYYYYYYYYYYY*LEN*AGTALK,通话类型,对方账号] +# 通话类型:0表示语音通话,1表示视频通话 +# 实例: +# XT*334588000000156*0007*AGTALK,0,d3e2f759f9d5af3858f3530b] +# 或[XT*334588000000156*0007*AGTALK,1,d3e2f759f9d5af3858f3530b] +# 注:如果佰锐视频,则账号为佰锐账号(整型) +# 平台回复:[XT*设备ID*LEN*AGTALK,结果,Token,声网频道名/会议号(如有的话,没有则不带)] +# 结果:0表示可正常通话,-1表示余额不足,不能通话,1表示对方不在线或未登陆成功 +# 实例:[XT*334588000000156*0006*AGTALK,0,efef2323423423,123]或[XT*334588000000156*0006*AGTALK,1] +class CALLING_ProtoCol(ProtoCol):#设备发起视频通话 + """""" + TYPE = "CALLING" + def send(self, event, msg): + + # [XT*334588000000156*0005*WLKEY] + send_data = EventMesh.publish("get_new_pid")+"*%s*0007*CALLING"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s,%d]"%(str(MD5_SIGN),send_data,msg) + print("CALLING:send data:%s"%(data)) + # print("WLKEY!!!!!!!!!!!!!") + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + print("AGTALK!!!!!!!!!!!!!",msg) + EventMesh.publish(constants.PROTOCOL.CALLING_SEND,0) + EventMesh.publish("load_screen", {"screen": "camera_answer"}) + +# [XT*YYYYYYYYYYYYYYY*LEN*RCALLING,呼叫者id,会议id/声网频道名(没有则留空,但位置保留),音频还是视频(0为音频,1为视频)] +# 实例: +# [XT*334588000000156*0007*RCALLING,d3e2f759f9d5af3858f3530b,,0] +# 终端回复: +# [XT*设备ID*LEN*RCALLING] +# 实例:[XT*334588000000156*0009*RCALLING] +# +class RCALLING_ProtoCol(ProtoCol):#设备挂断 + """""" + TYPE = "RCALLING" + def send(self, event, msg): + + # [XT*334588000000156*0005*WLKEY] + send_data = EventMesh.publish("get_new_pid")+"*%s*0008*RCALLING"%(self.imei) + MD5_SIGN = self.pack_MD5_head(send_data) + data = "[%s%s,%d]"%(str(MD5_SIGN),send_data,msg) + print("CALLING:send data:%s"%(data)) + # print("WLKEY!!!!!!!!!!!!!") + # 通过socket发送到服务器端 + EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND,data) + + def recv(self, event, msg): + """ + @param event: + @param msg: 接收到的下行数据 + """ + # b'[SZKW*867387060319166*000A*KEYBRD]' + print("AGTALK!!!!!!!!!!!!!",msg) + EventMesh.publish(constants.PROTOCOL.CALLING_SEND,0) + EventMesh.publish("load_screen", {"screen": "camera_answer"}) + class ProtoColResolver(object): def __init__(self): self.protocol_list = [] 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 ae261fbe..6679bdd0 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,7 +22,7 @@ import _thread from queue import Queue import camera from machine import RTC - +import jrtc LCD_X = 128 LCD_Y = 128 def audio_cb(event): @@ -1161,8 +1161,8 @@ class DialingScreen(Screen): screen_NAME = EventMesh.publish("get_screen_NAME") if screen_NAME != None: if screen_NAME != "dialing_noplay_popup": - EventMesh.publish("return_prev_screen") - + # EventMesh.publish("return_prev_screen") + EventMesh.publish("load_screen", {"screen": "main_menu"}) def Close(self): self.timer.stop() @@ -1646,7 +1646,7 @@ class DialingNoPlayPopupScreen(Screen):#正在拨号中...未打出 EventMesh.publish("set_interrup_incall",0) EventMesh.publish("set_UI_high_priority",0) EventMesh.publish("return_prev_screen") - + # EventMesh.publish("load_screen", {"screen": "main_menu"}) def Close(self): self.timer1.stop() @@ -7538,7 +7538,7 @@ class cameraFullScreen(Screen):#相册已满 def btn8_press(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) pass - +import jrtc class cameraScreen(Screen):#相机拍照二级界面 # NAME = "camera" @@ -7572,8 +7572,15 @@ class cameraScreen(Screen):#相机拍照二级界面 if len(album_data) >= 2:#相册已满 EventMesh.publish("load_screen", {"screen": "camera_full"}) pass - + + state = dec.open() + img_test = lv.img(camera_popup_screen) + img_test.set_src("U:/static/hang_up.png") + ret = jrtc.set_img(img_test) + print("set img:", ret) + img_test.set_pos(48, 90) + img_test.set_size(32,32) self.timer.start(1*1000,1,self.fun) print("state",state) @@ -7876,12 +7883,11 @@ class albumPreviewScreen(Screen):#点击预览 def btn8_press(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) pass - - camera_video_screen = None -camera_video_label_screen = None -class cameraVdieoScreen(Screen):#视频通话 - #上课禁用 +camera_video_label = None + +class cameraVdieoScreen(Screen):#相机拍照二级界面 + # NAME = "camera_video" def __init__(self): @@ -7889,50 +7895,120 @@ class cameraVdieoScreen(Screen):#视频通话 self.meta = None self.preview1 = None self.timer = osTimer() - self.open_preview1 = 0 def initialization(self): - global camera_video_screen,camera_video_label_screen + global camera_video_screen ,camera_video_label + if camera_video_screen == None: camera_video_screen = lv.obj() - print("Lowpower_screen") + print("camera_video_screen") camera_video_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - camera_video_label_screen = lv.label(camera_video_screen) - camera_video_label_screen.set_pos(0, 40) - camera_video_label_screen.set_size(128, 40) - camera_video_label_screen.set_text(" ") - camera_video_label_screen.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - camera_video_label_screen.set_long_mode(lv.label.LONG.WRAP) - camera_video_label_screen.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) - + camera_video_label = lv.label(camera_video_screen) + camera_video_label.set_pos(0, 20) + camera_video_label.set_size(128, 40) + camera_video_label.set_text("正在对方接听中") + camera_video_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + camera_video_label.set_long_mode(lv.label.LONG.WRAP) + camera_video_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + + img_btn = lv.img(camera_video_screen) + img_btn.add_flag(lv.obj.FLAG.CLICKABLE) + img_btn.set_pos(0, 90) + img_btn.set_size(32,32) + img_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.close_cb(e)), lv.EVENT.CLICKED, None) self.meta = camera_video_screen - if EventMesh.publish(constants.EVENT.GET_CONNECT) != 0:#未联网提示关机 - self.preview1 = camera.camPreview(0,240,320,128,128,1) - state = self.preview1.open() - self.timer.start(1*1000,1,self.fun) - camera_video_label_screen.set_text(" ") - self.open_preview1 = 1 - else: - self.open_preview1 = 0 - camera_video_label_screen.set_text("无SIM卡或无网络") + def close_cb(self,e): + pass def fun(self,*argc): - EventMesh.publish("system_sleep_rest")#防止黑屏 + pass + # EventMesh.publish("system_sleep_rest")#防止黑屏 def Close(self): + self.timer.stop() if self.open_preview1 == 1: self.timer.stop() self.preview1.close() - def done_click(self): + def done_return(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass + + def btn8_press(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) pass +camera_video_answer_screen = None +camera_video_answer_label = None +camera_video_answer_btn = None +class cameraVdieoAnswerScreen(Screen):#相机拍照二级界面 + # + NAME = "camera_answer" + + def __init__(self): + super().__init__() + self.meta = None + self.preview1 = None + self.timer = osTimer() + self.statu_open = -1 + self.count = 0 + + def initialization(self): + global camera_video_answer_screen ,camera_video_answer_label,camera_video_answer_btn + self.count = 0 + jrtc.init() + jrtc.config_server("119.3.54.56:1050") + jrtc.config("6c06d1b0d9015e47ec144097", "us145b", "1234567890abcdef", "") + self.statu_open = jrtc.open("us144a", "",[15,120,240,320],[15,129,128,128]) + + if camera_video_answer_screen == None: + camera_video_answer_screen = lv.obj() + print("camera_video_answer_screen") + camera_video_answer_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + + + + + img_test = lv.img(camera_video_answer_screen) + # img_test.set_src("U:/hang_up.png") + ret = jrtc.set_img(img_test) + print("set img:", ret) + img_test.align(lv.ALIGN.CENTER, 0, 0) + img_test.set_size(128,128) + + camera_video_answer_btn = lv.img(camera_video_answer_screen) + camera_video_answer_btn.add_flag(lv.obj.FLAG.CLICKABLE) + camera_video_answer_btn.set_pos(48, 90) + camera_video_answer_btn.set_size(32,32) + camera_video_answer_btn.set_src("U:/static/hang_up.png") + camera_video_answer_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.close_cb(e)), lv.EVENT.CLICKED, None) + self.meta = camera_video_answer_screen + + self.timer.start(1*1000,1,self.fun) + + + def close_cb(self,e): + if self.statu_open == 0: + jrtc.close(1) + EventMesh.publish(constants.PROTOCOL.RCALLING_SEND,0) + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + def fun(self,*argc): + EventMesh.publish("system_sleep_rest")#防止黑屏 + + + def Close(self): + self.timer.stop() def done_return(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) @@ -7946,6 +8022,79 @@ class cameraVdieoScreen(Screen):#视频通话 EventMesh.publish("load_screen", {"screen": "main_menu"}) pass + + + + +# class cameraVdieoScreen(Screen):#视频通话 +# # +# NAME = "camera_video" + +# def __init__(self): +# super().__init__() +# self.meta = camera_video_screen +# self.preview1 = None +# self.timer = osTimer() +# self.open_preview1 = 0 + +# def initialization(self): +# global camera_video_screen,camera_video_label_screen +# print("Lowpower_screen") +# if camera_video_screen == None: +# camera_video_screen = lv.obj() +# print("Lowpower_screen") +# camera_video_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + +# camera_video_label_screen = lv.label(camera_video_screen) +# camera_video_label_screen.set_pos(0, 40) +# camera_video_label_screen.set_size(128, 40) +# camera_video_label_screen.set_text(" ") +# camera_video_label_screen.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +# camera_video_label_screen.set_long_mode(lv.label.LONG.WRAP) +# camera_video_label_screen.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + +# # self.meta = camera_video_screen + +# if EventMesh.publish(constants.EVENT.GET_CONNECT) != 0:#未联网提示关机 +# self.preview1 = camera.camPreview(0,240,320,128,128,1) +# state = self.preview1.open() +# self.timer.start(1*1000,1,self.fun) +# camera_video_label_screen.set_text(" ") +# self.open_preview1 = 1 +# print("init preview!!!!!!!!") +# else: +# self.open_preview1 = 0 +# camera_video_label_screen.set_text("无SIM卡或无网络") + +# def fun(self,*argc): +# pass +# # EventMesh.publish("system_sleep_rest")#防止黑屏 + + +# def Close(self): +# self.timer.stop() +# if self.open_preview1 == 1: +# self.timer.stop() +# self.preview1.close() + +# def done_click(self): +# pass + + + + +# def done_return(self): +# EventMesh.publish("load_screen", {"screen": "main_menu"}) + + +# def btn1_release(self): +# EventMesh.publish("load_screen", {"screen": "main_menu"}) +# pass + +# def btn8_press(self): +# EventMesh.publish("load_screen", {"screen": "main_menu"}) +# pass + style_screen_calendar_1_extra_header_main_default = lv.style_t() style_screen_calendar_1_extra_header_main_default.init() style_screen_calendar_1_extra_header_main_default.set_bg_color(lv.color_make(0x21,0x95,0xf6)) 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 1e6c4909..16f2b5c4 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 @@ -165,20 +165,20 @@ 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_VIDEOCALL.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_img_camera_video = lv.img(MainMenu2_heartrate) +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_heartrate) +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 @@ -369,8 +369,8 @@ class MainMenuScreen(Screen): 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, "pp_main")), 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_video.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera_answer")), 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) @@ -381,8 +381,8 @@ class MainMenuScreen(Screen): MainMenu2_img_toolbox.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "toolbox")), lv.EVENT.PRESSING, None) MainMenu2_img_setting.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "setting")), lv.EVENT.PRESSING, None) MainMenu2_img_add_friends.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "pp_main")), lv.EVENT.PRESSING, 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_video.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera_answer")), lv.EVENT.PRESSING, None) + MainMenu2_img_camera.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera")), lv.EVENT.PRESSING, 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.PRESSING, None) MainMenu2_img_wechat.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "wechat")), lv.EVENT.PRESSING, None)