From: azao <821478748@qq.com> Date: Thu, 3 Jul 2025 09:55:10 +0000 (+0800) Subject: 添加屏幕旋转和充电弹窗 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b71b6f98635bd0a351ac26892565529e86a15092;p=mirrors%2FASR1603_G5.git 添加屏幕旋转和充电弹窗 --- diff --git a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai.py b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai.py index 97fdffdb..599f4fc5 100644 --- a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai.py +++ b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai.py @@ -2564,10 +2564,11 @@ class AIScreen(Screen):#AI_GUI self.refresh_count = 0 self.refresh_texttimer.stop() self.clear_flag() - num = EventMesh.publish("get_volum_size") + # num = EventMesh.publish("get_volum_size") + num = EventMesh.publish("get_storage_config","VC_TTS_volume") if num == None: - num = 11 - self.aud.setVolume(num)#恢复原始音量 + num = 110 + self.aud.setVolume(num // 10)#恢复原始音量 try: self.websocket_deconnect_asr() self.websocket_deconnect_tts() diff --git a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai_VC.py b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai_VC.py index c6510f21..36fbf34e 100644 --- a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai_VC.py +++ b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ai_VC.py @@ -278,8 +278,9 @@ class AI_dev(Abstract): self.Low_power_warning_flag = 0 self.VC_TTS_volume = EventMesh.publish("get_storage_config","VC_TTS_volume")#音量配置 if self.VC_TTS_volume == None: - self.VC_TTS_volume = 100 - self.aud.setVolume(self.VC_TTS_volume //10) + self.VC_TTS_volume = 110 + self.aud.setVolume(self.VC_TTS_volume // 10) + print("音量初始化DEV配置为{}".format(self.VC_TTS_volume // 10)) #self.aud.play(1,0,'U:/static/xianyikaiji.mp3')#开机音频 #EventMesh.publish("audio_montage_play",["xianyikaiji.mp3"]) #EventMesh.publish("publish_AI_btnInfo",{"func":self.ntptime_cb}) @@ -312,7 +313,7 @@ class AI_dev(Abstract): #self.aud.play(1,1,'U:/static/R_CHARGE_IN.mp3') EventMesh.publish("open_led_red")#充电红灯常亮 EventMesh.publish("audio_montage_play",["R_CHARGE_IN.mp3"]) - # EventMesh.publish("load_screen", {"screen": "charge_in"})#充电弹窗 + EventMesh.publish("load_screen", {"screen": "charge_in"})#充电弹窗 self.Low_power_warning_flag = 0 pass elif status == 0:#拨出usbs @@ -339,7 +340,7 @@ class AI_dev(Abstract): except Exception as e: #EventMesh.debug_log("btnInfo_queue:ERROR:{}".format(e)) usys.print_exception(e) - print("ui_queue_thread:ERROR:{} \r\n data:{}".format(e,data["data"])) + # print("ui_queue_thread:ERROR:{} \r\n data:{}".format(e,data["data"])) def publish_AI_btnInfo(self,event,msg): #print("publish_AI_btnInfo 1") self.btnInfo_queue.put(msg) @@ -592,6 +593,7 @@ class AI_dev(Abstract): EventMesh.publish("open_led_green") if self.usb_charge_flag == 0 : EventMesh.publish("audio_montage_play",["R_CHARGE_FULL.mp3"]) + EventMesh.publish("load_screen", {"screen": "charge_full"})#满电弹窗 #self.aud.play(1,0,'U:/static/R_CHARGE_FULL.mp3')#充电已满 # EventMesh.publish("load_screen", {"screen": "charge_full"})#充满电弹窗 self.usb_charge_flag = 1 @@ -1971,7 +1973,8 @@ class AI_VC(Abstract): #self.record.gain_set(4,12) self.aud = audio.Audio(0) self.aud.setCallback(self.audio_cb) - #self.aud.setVolume(self.VC_TTS_volume //10) + self.aud.setVolume(self.VC_TTS_volume //10) + print("音量初始化INIT配置为{}".format(self.VC_TTS_volume // 10)) self.audio_play_state = 1 #音频播放完状态 self.close_timerout = 0 self.LocalRespondingEnded_timerout = 0 @@ -2039,7 +2042,6 @@ class AI_VC(Abstract): except Exception as e: usys.print_exception(e) - #EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) #播报完毕直接关掉AI def post_processor_after_instantiation(self): pass @@ -3513,11 +3515,11 @@ class AI_VC(Abstract): if text.find("音量") != -1 or text.find("声音") != -1: if text.find("加") != -1 or text.find("增") != -1: self.VC_TTS_volume += 10 - if self.VC_TTS_volume > 100: + if self.VC_TTS_volume > 110: #EventMesh.publish("audio_montage_play",["yinliangyizuida.mp3"]) #self.aud.play(1,0,'U:/static/yinliangyizuida.mp3')#音量已最大 self.AI_TTS_str = "音量已最大" - self.VC_TTS_volume = 100 + self.VC_TTS_volume = 110 else: self.aud.setVolume(self.VC_TTS_volume //10) EventMesh.publish("set_storage_config",["VC_TTS_volume",self.VC_TTS_volume]) @@ -3707,7 +3709,8 @@ class AI_VC(Abstract): if self.VC_play_TYPE == VC_play_TYPE_PCM: if self.play_pcm == None: self.play_pcm = audio.Audio.PCM(0,1,self.VC_play_samplerate,1,1,2) - #self.play_pcm.setVolume(11) + # self.play_pcm.setVolume(11) + self.play_pcm.setVolume(self.VC_TTS_volume // 10) ret = self.play_pcm.stream_write_start() print("self.record_pcm.stream_write_start:ret:{}".format(ret)) elif self.VC_play_TYPE == VC_play_TYPE_MP3: @@ -3765,7 +3768,8 @@ class AI_VC(Abstract): self.ud_error(["VC",self.VC_taskid]) else: EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) - + EventMesh.publish("load_screen", {"screen": "main_menu"}) + pass # print("get_audio_state !!!!!{} {} {}\r\n".format(self.play_end,EventMesh.publish("get_audio_state"),self.play_flag)) if self.LocalRespondingEnded_timerout>0 :# self.LocalRespondingEnded_timerout -= 1 @@ -3779,7 +3783,7 @@ class AI_VC(Abstract): if self.Close_flag == 1: self.Close_flag = 0 EventMesh.publish("publish_AI_btnInfo",{"func":self.Close}) - EventMesh.publish("publish_message_event_ui",{"func":self.AI_key_double_press,"data":0}) + EventMesh.publish("load_screen", {"screen": "main_menu"}) else: #utime.sleep_ms(1000) EventMesh.publish("publish_AI_btnInfo",{"func":self.VC_Play_End}) diff --git a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/appWechat.py b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/appWechat.py index b5d87bb8..f10f64fe 100644 --- a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/appWechat.py +++ b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/appWechat.py @@ -580,7 +580,7 @@ class WechatScreen(Screen): self.aud.stop() num = EventMesh.publish("get_volum_size") if num == None: - num = 8 + num = 11 self.aud.setVolume(num)#恢复原始音量 Wechat_log("Close2") diff --git a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/lcd.py b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/lcd.py index bab82773..76065ad5 100644 --- a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/lcd.py +++ b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/lcd.py @@ -174,9 +174,12 @@ disp_drv.draw_buf = disp_buf1 disp_drv.flush_cb = lcd.lcd_write disp_drv.hor_res = LCD_SIZE_W disp_drv.ver_res = LCD_SIZE_H +disp_drv.sw_rotate = True +disp_drv.rotated = 0#旋转角度0-3 disp_drv.register() + # LVGL触摸注册 indev_drv = lv.indev_drv_t() indev_drv.init() diff --git a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui.py index c54481a1..87f71dfd 100644 --- a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui.py @@ -14,7 +14,7 @@ import ql_fs import audio import sms from machine import Pin -from lcd import lcd +from lcd import lcd,disp_drv,PWM_backlight from misc import PWM import uos import gc @@ -22,6 +22,7 @@ import _thread from queue import Queue from machine import RTC import usys +from Gsensor import SC7A20 def audio_cb(event): if event == 0: EventMesh.publish("set_audio_state", 1) @@ -1689,8 +1690,6 @@ class DialNoconnectPopupScreen(Screen):#你所拨打的电话暂时无法接通 def btn8_press(self): EventMesh.publish("return_prev_screen") -charge_full_screen = None -charge_full_screen_title = None class chargefullScreen(Screen):#充电已满弹窗提示 NAME = "charge_full" def __init__(self): @@ -1699,12 +1698,13 @@ class chargefullScreen(Screen):#充电已满弹窗提示 self.meta_type = "popup" self.timer = osTimer() self.count = 0 + self.charge_full_screen = None + self.charge_full_screen_title = None def initialization(self): - global charge_full_screen,charge_full_screen_title - if charge_full_screen == None : - charge_full_screen = lv.obj() + if self.charge_full_screen == None : + self.charge_full_screen = lv.obj() print("charge_full_screen") - charge_full_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + self.charge_full_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) # charge_full_screen_title = lv.label(charge_full_screen) @@ -1714,13 +1714,13 @@ class chargefullScreen(Screen):#充电已满弹窗提示 # charge_full_screen_title.set_long_mode(lv.label.LONG.WRAP) # charge_full_screen_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) # charge_full_screen_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) - energe_img = lv.img(charge_full_screen) - energe_img.set_pos(0, 0) - energe_img.set_size(240, 320) - energe_img.set_src("E:/static/energe_full.png") - energe_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + energe_img = lv.img(self.charge_full_screen) + energe_img.set_pos(0, 0) + energe_img.set_size(240, 320) + energe_img.set_src("E:/static/charge_full.png") + energe_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - self.meta = charge_full_screen + self.meta = self.charge_full_screen self.count = 0 self.timer.start(1*1000,1,self.fun) @@ -1772,9 +1772,9 @@ class UI_ai(Screen): ai_status = EventMesh.publish("screen_get_ai") if ai_status: self.__ai_vc(None, ai_status) - self.timer.start(500,1, lambda t: self.timerout_update()) + self.timer.start(500,1, self.timerout_update) - def timerout_update(self): + def timerout_update(self, *args): EventMesh.publish("publish_message_event_ui",{"func":self.timerout_update_cb,"data":0}) def timerout_update_cb(self,data =None): @@ -6384,9 +6384,9 @@ class PowerOnScreen(Screen): self.aud.set_pa(Pin.GPIO29) self.meta_type = "popup" self.volum_size = 11 - check_volum = EventMesh.publish("get_storage_config","volum") - if check_volum != None: - self.volum_size = check_volum + self.check_volum = EventMesh.publish("get_storage_config","VC_TTS_volume") + if self.check_volum != None: + self.volum_size = self.check_volum self.aud.play(1, 1, 'E:/static/R_POWER_1.mp3') #播放来电铃声 self.aud.setVolume(self.volum_size) @@ -6395,7 +6395,7 @@ class PowerOnScreen(Screen): def initialization(self): EventMesh.publish("set_UI_high_priority",1) self.count = 0 - self.aud.setVolume(11) + # self.aud.setVolume(11)#这里取消注释则表示每次开机默认最大声音 self.timer.start(200,1,self.fun) pass @@ -6430,8 +6430,7 @@ class PowerOnScreen(Screen): pass -charge_in_screen = None -charge_in_screen_label = None + #正在充电 class chargeInScreen(Screen): @@ -6440,17 +6439,18 @@ class chargeInScreen(Screen): super().__init__() self.meta = None self.meta_type = "popup" + self.charge_in_screen = None + self.charge_in_screen_label = None self.count = 0 self.timer = osTimer() def initialization(self): - global charge_in_screen ,charge_in_screen_label - if charge_in_screen == None : - charge_in_screen = lv.obj() + if self.charge_in_screen == None : + self.charge_in_screen = lv.obj() print("charge_in_screen") - charge_in_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + self.charge_in_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) # add style for watchface - charge_in_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) + self.charge_in_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT) #进入图片 # charge_in_screen_label = lv.label(charge_in_screen) # charge_in_screen_label.set_pos(0, 170) @@ -6460,21 +6460,19 @@ class chargeInScreen(Screen): # charge_in_screen_label.set_long_mode(lv.label.LONG.WRAP) # charge_in_screen_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) - charge_out_img = lv.img(charge_out_screen) - charge_out_img.set_size(240, 320) - charge_out_img.set_src("E:/static/charge_in.png") - charge_out_img.add_flag(lv.obj.FLAG.CLICKABLE) - charge_out_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) - charge_out_img.set_pos(0, 0) + charge_out_img = lv.img(self.charge_in_screen) + charge_out_img.set_size(240, 320) + charge_out_img.set_src("E:/static/charge_in.png") + charge_out_img.add_flag(lv.obj.FLAG.CLICKABLE) + charge_out_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + charge_out_img.set_pos(0, 0) - self.meta = charge_in_screen + self.meta = self.charge_in_screen def post_processor_after_initialization(self): - global charge_in_screen_label self.count = 0 self.timer.start(1000,1,self.timer_cb_onescond) - charge_in_screen_label.set_text("正在充电") def Close(self): self.timer.stop() @@ -6815,14 +6813,49 @@ class UI(object): self.level = EventMesh.publish("get_storage_config","brightness_level") + #当前的旋转方向 + self.rotate_flag = 0 #0为原来的,1为垂直翻转后的 if self.level == None: self.level = 6 self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS, self.level, 10) self.PWM_backlight.open() + self.gsensor = SC7A20() + print("gsensor :create") + self.gsensor.activate() + print("gsensor :activate") + self.gsensor.init() + print("gsensor :init") + self.gsensor.set_callback(self.gsensor_cb) self.sleep_lock = 0 - + def set_rotation(self,angle):#软件设置屏幕方向 + global disp_drv + PWM_backlight.close() + disp_drv.rotated = angle + # 重新注册驱动 + disp_drv.register() + # 刷新屏幕 + lv.scr_load(lv.scr_act()) + utime.sleep_ms(200) + PWM_backlight.open() + + def gsensor_cb(self, para): + print("gsensor_cb:{}".format(para)) + if para == 0: #跌倒报警 + pass + elif para == 1: #抬腕 + if self.rotate_flag == 1: + print("抬腕!!!111") + self.set_rotation(0) + self.rotate_flag = 0 + elif para == 2: #放手 + if self.rotate_flag == 0: + print("放手!!!!") + self.set_rotation(2) + self.rotate_flag = 1 + pass + def post_processor_after_instantiation(self): EventMesh.subscribe("load_screen", self.load_screen_cb) EventMesh.subscribe("btn1_press", self.btn_press) @@ -6875,7 +6908,7 @@ class UI(object): def ui_queue_thread(self): while True: data = self.ui_queue.get() - #print("ui_queue_thread:data = {}".format(data)) + # print("ui_queue_thread:data = {}".format(data)) if data != None: try: data["func"](data["data"]) @@ -7129,7 +7162,7 @@ class UI(object): #print("system_sleep_timer_count:{}".format(self.system_sleep_timer_count)) time = EventMesh.publish("get_brightness_time") if time == None: - time = 10 + time = 20 # print("system_sleep_timer_cb:{}".format(self.system_sleep_timer_count)) self.system_sleep_timer_count += 1 if self.system_sleep_timer_count >= time : @@ -7154,11 +7187,11 @@ class UI(object): def get_screen_NAME(self, event, msg): return self.screen.NAME - def load_screen_cb(self, topic, msg): + def load_screen_cb(self, event, msg): EventMesh.publish("publish_message_event_ui",{"func":self.load_screen,"data":msg}) def load_screen(self, msg): - print("msg1={} self.UI_high_priority_flag:{}".format(msg,self.UI_high_priority_flag)) + # print("msg1={} self.UI_high_priority_flag:{}".format(msg,self.UI_high_priority_flag)) if self.UI_high_priority_flag == 1:#电话界面屏蔽其他界面 return state = EventMesh.publish("get_cur_class_time_state") diff --git a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_setting.py index 8f286040..c207a826 100644 --- a/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk/project/K8/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -827,7 +827,7 @@ class PowerOnScreen(Screen): self.aud = audio.Audio(0) self.aud.set_pa(Pin.GPIO29) self.meta_type = "popup" - self.volum_size = 8 + self.volum_size = 11 check_volum = EventMesh.publish("get_storage_config","volum") if check_volum != None: self.volum_size = check_volum