From: dxy15521469561 <1731678236@qq.com> Date: Thu, 4 Jul 2024 02:16:46 +0000 (+0800) Subject: K01: X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=39aad96e2967614e0af4d05798370d506630db8d;p=mirrors%2FASR1603_G5.git K01: aigc表盘界面优化 --- diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ai.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ai.py index e3cce41a..fb401e6a 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ai.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ai.py @@ -13,6 +13,7 @@ import lvgl as lv import urandom import uhashlib import ubinascii +import gc from ui import style_font_youyuan_20,style_screen,Screen,style_img LCD_SIZE_H = 128 LCD_SIZE_W = 128 @@ -22,25 +23,33 @@ style_font_youyuan_ai_20.set_text_color(lv.color_make(253, 82, 19)) style_font_youyuan_ai_20.set_text_font(lv.K01_font_16_ALL) #length长度内,返回string句号或逗号的分割字符串 def split_string(string,start,end): + count = string.find('\n',start,end) + if count != -1: + return string[:count+1] count = string.find(',',start,end) if count != -1: - return string[:count] + return string[:count+1] count = string.find('.',start,end) if count != -1: - return string[:count] + return string[:count+1] count = string.find('!',start,end) if count != -1: - return string[:count] + return string[:count+1] count = string.find('?',start,end) if count != -1: - return string[:count] - + return string[:count+1] + + count = string.find(',',start,end) if count != -1: return string[:count+len(',')] count = string.find('。',start,end) if count != -1: return string[:count+len('。')] + count = string.find('、',start,end) + if count != -1: + return string[:count+len('、')] + count = string.find('!',start,end) if count != -1: return string[:count+len('!')] @@ -127,11 +136,11 @@ AI_talk_end_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) AI_talk_end_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) # -# AI_screen_list_screen_title = lv.obj(AI_talk_end_screen) -# AI_screen_list_screen_title.set_pos(0, 0) -# AI_screen_list_screen_title.set_size(LCD_SIZE_W,40) -# AI_screen_list_screen_title.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -# AI_screen_list_screen_title.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_screen_list_screen_title = lv.obj(AI_talk_end_screen) +AI_screen_list_screen_title.set_pos(0, 0) +AI_screen_list_screen_title.set_size(LCD_SIZE_W,40) +AI_screen_list_screen_title.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_screen_list_screen_title.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) # al_success_title1 = lv.label(AI_screen_list_screen_title) # al_success_title1.set_pos(0, 5) @@ -140,6 +149,12 @@ AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) # # al_success_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) # al_success_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +# AI_press_btn = lv.btn(AI_talk_end_screen) +# AI_press_btn.set_pos(10, (LCD_SIZE_H-60)+4) +# AI_press_btn.set_size(LCD_SIZE_W-20, 56) +# AI_press_btn.add_style(style_AI_btn, lv.PART.MAIN | lv.STATE.DEFAULT) +# AI_press_btn.add_style(style_common_bg_rect_btn_pressed, lv.PART.MAIN | lv.STATE.PRESSED) +# AI_press_btn.set_style_radius(30,0) AI_talk_end_bt_screen = lv.obj(AI_talk_end_screen) AI_talk_end_bt_screen.set_pos(0, 96) @@ -158,7 +173,7 @@ al_talk_end_screen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) al_talk_end_screen_cancel_bt = lv.label(AI_talk_end_bt_screen) al_talk_end_screen_cancel_bt.set_text(" ") -al_talk_end_screen_cancel_bt.set_size(50, LCD_SIZE_H-96) +al_talk_end_screen_cancel_bt.set_size(44, LCD_SIZE_H-96) al_talk_end_screen_cancel_bt.set_pos(0,0) al_talk_end_screen_cancel_bt.add_flag(lv.obj.FLAG.CLICKABLE) @@ -169,7 +184,7 @@ al_talk_end_screen_icon2.add_flag(lv.obj.FLAG.CLICKABLE) al_talk_end_screen_icon2.set_src("U:/static/AI/ai_result_bt.png") al_talk_end_screen_icon2.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -AI_press_label_bt = lv.label(al_talk_end_screen_icon2) +AI_press_label_bt = lv.label(AI_talk_end_bt_screen) AI_press_label_bt.set_text(" ") AI_press_label_bt.set_size(88, LCD_SIZE_H-96) AI_press_label_bt.set_pos(44,0) @@ -177,7 +192,7 @@ AI_press_label_bt.add_flag(lv.obj.FLAG.CLICKABLE) AI_press_label = lv.label(al_talk_end_screen_icon2) AI_press_label.set_text("继续对话") -AI_press_label.set_size(80, 33) +AI_press_label.set_size(80, 20) AI_press_label.set_pos(0,4) AI_press_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) AI_press_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -204,48 +219,7 @@ style_font_28_green_bg_gray.init() # style_font_28_green_bg_gray.set_pad_top(0) # style_font_28_green_bg_gray.set_pad_bottom(0) style_font_28_green_bg_gray.set_text_color(lv.color_make(255, 255, 255)) #字体文本颜色 -# style_font_28_green_bg_gray.set_text_font_v2("font_28.bin",28,0) style_font_28_green_bg_gray.set_text_font(lv.K01_font_16_ALL) - -#列表obj -style_wechat_s_btn = lv.style_t() -style_wechat_s_btn.init() -style_wechat_s_btn.set_radius(5) -style_wechat_s_btn.set_bg_opa(255) -style_wechat_s_btn.set_border_width(0) -style_wechat_s_btn.set_pad_left(0) -style_wechat_s_btn.set_pad_right(0) -style_wechat_s_btn.set_pad_top(0) -style_wechat_s_btn.set_pad_bottom(0) -style_wechat_s_btn.set_bg_color(lv.color_make(79,195,76)) -style_wechat_s_btn.set_shadow_opa(0) - -AI_end_screen_list_screen = lv.obj(AI_talk_end_screen) -AI_end_screen_list_screen.set_pos(5, 5) -AI_end_screen_list_screen.set_size(LCD_SIZE_W-5,96-5) -AI_end_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -AI_end_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) -AI_end_screen_list_screen.set_flex_flow(lv.FLEX_FLOW.COLUMN)#自动排成一列对齐 - -AI_end_screen_list_detail_screen = lv.obj(AI_end_screen_list_screen) -AI_end_screen_list_detail_screen.set_pos(0, 5) -AI_end_screen_list_detail_screen.set_size(LCD_SIZE_W-5,lv.SIZE.CONTENT) -AI_end_screen_list_detail_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - - -AI_end_screen_list_detail_screen1 = lv.obj(AI_end_screen_list_detail_screen) -AI_end_screen_list_detail_screen1.set_pos(20,5) -AI_end_screen_list_detail_screen1.set_size(100,lv.SIZE.CONTENT) -AI_end_screen_list_detail_screen1.add_style(style_wechat_s_btn, lv.PART.MAIN | lv.STATE.DEFAULT) - -AI_listen_text = lv.label(AI_end_screen_list_detail_screen1) -AI_listen_text.set_pos(5, 2) -AI_listen_text.set_size(90, lv.SIZE.CONTENT) -AI_listen_text.set_text(" ") -AI_listen_text.set_long_mode(lv.label.LONG.WRAP) -AI_listen_text.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) -AI_listen_text.add_style(style_font_28_green_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) - style_gray_screen = lv.style_t() style_gray_screen.init() style_gray_screen.set_radius(5) @@ -284,21 +258,77 @@ style_wechat_r_btn.set_pad_bottom(0) style_wechat_r_btn.set_bg_color(lv.color_make(66,66,66)) style_wechat_r_btn.set_border_width(0) style_wechat_r_btn.set_shadow_opa(0) +#列表obj +style_wechat_s_btn = lv.style_t() +style_wechat_s_btn.init() +style_wechat_s_btn.set_radius(5) +style_wechat_s_btn.set_bg_opa(255) +style_wechat_s_btn.set_border_width(0) +style_wechat_s_btn.set_pad_left(0) +style_wechat_s_btn.set_pad_right(0) +style_wechat_s_btn.set_pad_top(0) +style_wechat_s_btn.set_pad_bottom(0) +style_wechat_s_btn.set_bg_color(lv.color_make(79,195,76)) +style_wechat_s_btn.set_shadow_opa(0) +AI_end_screen_list_screen = lv.obj(AI_talk_end_screen) +AI_end_screen_list_screen.set_pos(5, 0) +AI_end_screen_list_screen.set_size(LCD_SIZE_W-10,95) +AI_end_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_end_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_end_screen_list_screen.set_flex_flow(lv.FLEX_FLOW.COLUMN)#自动排成一列对齐 + +AI_end_screen_list_detail_screen = lv.obj(AI_end_screen_list_screen) +AI_end_screen_list_detail_screen.set_pos(0, 5) +AI_end_screen_list_detail_screen.set_size(LCD_SIZE_W-10,lv.SIZE.CONTENT) +AI_end_screen_list_detail_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +#ASR结果1 +AI_end_screen_list_detail_screen1 = lv.obj(AI_end_screen_list_detail_screen) +AI_end_screen_list_detail_screen1.set_pos(20,10) +AI_end_screen_list_detail_screen1.set_size(95,lv.SIZE.CONTENT) +AI_end_screen_list_detail_screen1.add_style(style_wechat_s_btn, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_listen_text = lv.label(AI_end_screen_list_detail_screen1) +AI_listen_text.set_pos(5, 5) +AI_listen_text.set_size(85, lv.SIZE.CONTENT) +AI_listen_text.set_text(" ") +AI_listen_text.set_long_mode(lv.label.LONG.WRAP) +AI_listen_text.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +AI_listen_text.add_style(style_font_28_green_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) + +#chat结果1 msg_detail_cont_obj = lv.obj(AI_end_screen_list_screen) -msg_detail_cont_obj.set_pos(0, 2) -msg_detail_cont_obj.set_size(120,lv.SIZE.CONTENT) +msg_detail_cont_obj.set_pos(0, 0) +msg_detail_cont_obj.set_size(LCD_SIZE_W-10,lv.SIZE.CONTENT) msg_detail_cont_obj.add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT) AI_label = lv.label(msg_detail_cont_obj) AI_label.set_pos(5, 0) -AI_label.set_size(115, lv.SIZE.CONTENT) +AI_label.set_size(LCD_SIZE_W-10-5, lv.SIZE.CONTENT) AI_label.set_long_mode(lv.label.LONG.WRAP) AI_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) AI_label.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) - +#222222222222222222222222222222222222 +AI_end_screen_list_screen2 = lv.obj(AI_talk_end_screen) +AI_end_screen_list_screen2.set_pos(5, 5) +AI_end_screen_list_screen2.set_size(LCD_SIZE_W-5,90) +AI_end_screen_list_screen2.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_end_screen_list_screen2.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_end_screen_list_screen2.set_flex_flow(lv.FLEX_FLOW.COLUMN)#自动排成一列对齐 + +#chat结果2 +msg_detail_cont_obj2 = lv.obj(AI_end_screen_list_screen2) +msg_detail_cont_obj2.set_pos(0, 0) +msg_detail_cont_obj2.set_size(LCD_SIZE_W-10,lv.SIZE.CONTENT) +msg_detail_cont_obj2.add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_label2 = lv.label(msg_detail_cont_obj2) +AI_label2.set_pos(5, 5) +AI_label2.set_size(LCD_SIZE_W-10-5, lv.SIZE.CONTENT) +AI_label2.set_long_mode(lv.label.LONG.WRAP) +AI_label2.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +AI_label2.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_end_screen_list_screen2.add_flag(lv.obj.FLAG.HIDDEN) #隐藏2 #开始对话 AI_talk_screen = lv.obj(AI_screen) @@ -439,10 +469,10 @@ al_listen_screen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) # al_listen_screen_icon.set_src("U:/static/AI/ai_confirm_bt.png") # al_listen_screen_icon.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) -# al_listen_screen_icon_bt = lv.label(AI_listen_screen) -# al_listen_screen_icon_bt.set_text(" ") -# al_listen_screen_icon_bt.set_size(240, 190) -# al_listen_screen_icon_bt.set_pos(0,92) +al_listen_screen_icon_bt = lv.label(AI_listen_screen) +al_listen_screen_icon_bt.set_text(" ") +al_listen_screen_icon_bt.set_size(240, 190) +al_listen_screen_icon_bt.set_pos(0,92) al_listen_screen_title4 = lv.label(AI_listen_screen) al_listen_screen_title4.set_pos(0, 100) @@ -625,6 +655,7 @@ class AIScreen(Screen):#AI_GUI super().__init__() self.meta = AI_screen # self.meta_type = "popup" + self._1S_timer = osTimer() self.Audio_buf_size = 8*1024 self.record_timer = osTimer() self.record = audio.Record() @@ -675,7 +706,14 @@ class AIScreen(Screen):#AI_GUI self.refresh_count = 0 self.AI_send_data_queue = Queue(100) self.AI_audio_queue = Queue(100) - + self.page_num = 0 + self.page_num_tmp = 0 + self.text_max = 400 #一次最大显示字数 + self.scroll_flag_next = 0 + self.scroll_flag_prev = 0 + self.hard_flag_next = 0 + self.hard_flag_prev = 0 + self.scroll_timer_count = 0 AI_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.GESTURE, None) @@ -703,6 +741,9 @@ class AIScreen(Screen):#AI_GUI al_not_listen_icon1_bt.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,8)), lv.EVENT.SHORT_CLICKED, None) al_not_listen_icon1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,8)), lv.EVENT.SHORT_CLICKED, None) + AI_end_screen_list_screen2.add_event_cb(self.scroll_event_cb, lv.EVENT.SCROLL_END, None) + AI_end_screen_list_screen.add_event_cb(self.scroll_event_cb, lv.EVENT.SCROLL_END, None) + def button_cb(self,e,msg): code = e.get_code() indev = lv.indev_get_act() @@ -714,8 +755,7 @@ class AIScreen(Screen):#AI_GUI (AI_talk_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or (AI_no_net_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or \ (AI_connect_timerout_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or (AI_not_listen_text_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or \ (AI_think_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False: - pass - # EventMesh.publish("return_prev_screen") + EventMesh.publish("return_prev_screen") elif code == lv.EVENT.SHORT_CLICKED: if msg == 1: self.talking_cb(e) @@ -810,6 +850,166 @@ class AIScreen(Screen):#AI_GUI AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) # AI_not_listen_text_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + def scroll_event_cb(self,e): + try: + + # 获取事件源对象 + obj = e.get_target() + code = e.get_code() + # 如果事件是滚动条事件 + if code == lv.EVENT.SCROLL_END: + + # 获取滚动条对象 + + # 获取滚动条的位置 + sb_value = obj.get_scroll_y() + + # 获取对象的高度和内容的总高度 + content_height = obj.get_scroll_bottom()#obj.get_child(0).get_height()+obj.get_child(1).get_height() + #obj_height= obj.get_height() + #print("scroll_event_cb:sb_value:{},content_height:{}".format(sb_value,content_height)) + #print("scroll_event_cb:scroll_flag_next:{},scroll_flag_prev:{}".format(self.scroll_flag_next,self.scroll_flag_prev)) + # 检查滚动条是否已经到达最大值,即内容是否已经到达底部 + if self.hard_flag_next == 1 or self.hard_flag_prev == 1: + self.scroll_timer_count = 10 #滑动计时器初始化 + if content_height < 0: + self.scroll_flag_next = 1 + elif self.hard_flag_next == 1 and self.scroll_flag_next == 1 and content_height == 0: + print("下一页") + + self.page_change(2,self.AI_label_str) + self.scroll_flag_next = 0 + self.hard_flag_next = 0 + else: + self.scroll_flag_next = 0 + self.hard_flag_next = 0 + if sb_value < 0: + self.scroll_flag_prev = 1 + elif self.hard_flag_prev == 1 and self.scroll_flag_prev == 1 and sb_value == 0: + print("上一页") + self.page_change(1,self.AI_label_str) + self.scroll_flag_prev = 0 + self.hard_flag_prev = 0 + else: + self.scroll_flag_prev = 0 + self.hard_flag_prev = 0 + except Exception as e: + usys.print_exception(e) + + def page_change(self,dir,text_str):#翻页,dir: = 0跳转第一页,=1上一页,=2下一页,=3最后一页,最后的内容 + text_str_list = [] + text_str_list_len = 0 + while 1:#分割字符串,获取列表 + str_tmp = split_string(text_str[text_str_list_len:],self.text_max,self.text_max+150)#按逗号,句号切割 + if str_tmp =="" :#没找到句号或者逗号,切割字符串 + str_tmp = sub_utf8_String(text_str[text_str_list_len:],self.text_max)#按中文切割字符串 + #print("page_change:str_tmp:{}".format((str_tmp))) + #str_tmp = sub_utf8_String(text_str[text_str_list_len:],self.text_max) + text_str_list_len+=len(str_tmp) + + if len(text_str) <= text_str_list_len: + text_str_list.append(str_tmp) + break + text_str_list.append(str_tmp) + + if self.AI_client_chat_end_flag ==1:#char回答完后,使最后一页字数大于一页 + #if len(text_str_list[-1]) < 50: + if len(self.AI_label_str ) <= len(text_str): + text_str_list[-1]+="\n\n\n\n~~~~~END~~~~~" + if len(text_str_list[-1])<30: + text_str_list[-1]+="\n\n" + else: #chat未完成,创造中 + if dir != 3: + text_str_list[-1]+="\n\n 创作中...\n\n" + + if dir == 0:#第一页 + self.page_num = 0 + if len(text_str_list)>self.page_num: + AI_label.set_text(text_str_list[self.page_num]+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + AI_end_screen_list_screen2.scroll_to_y(0,lv.ANIM.OFF) + AI_end_screen_list_screen2.add_flag(lv.obj.FLAG.HIDDEN) #隐藏2 + AI_end_screen_list_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + elif dir == 1:#上一页 + if self.page_num == 1: #第二页, + + self.page_num-=1 + if len(text_str_list)>self.page_num: + AI_label.set_text(text_str_list[self.page_num]+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + #AI_label.set_text(text_str_list[self.page_num]+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + scroll_bottom = AI_label.get_height() + print("page_change:scroll_bottom:{}".format(scroll_bottom)) + AI_end_screen_list_screen.scroll_to_y(scroll_bottom,lv.ANIM.OFF) + AI_end_screen_list_screen2.add_flag(lv.obj.FLAG.HIDDEN) #隐藏2 + AI_end_screen_list_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + #AI_end_screen_list_screen.scroll_to_view(lv.ANIM.OFF) + elif self.page_num > 1: + self.page_num-=1 + if len(text_str_list)>self.page_num: + AI_label2.set_text(text_str_list[self.page_num]+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + scroll_bottom = AI_label2.get_height() + print("page_change:scroll_bottom:{}".format(scroll_bottom)) + + AI_end_screen_list_screen2.scroll_to_y(scroll_bottom,lv.ANIM.OFF) + #AI_end_screen_list_screen2.scroll_to_view(lv.ANIM.OFF) + elif dir == 2:#下一页 + if len(text_str_list)<=self.page_num+1:#最大页 + return + self.page_num+=1 + if len(text_str_list)>self.page_num: + #AI_label2.set_text(' ...\n\n'+text_str_list[self.page_num]+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + #print("page_change:next:{}".format(text_str_list[self.page_num])) + AI_label2.set_text(text_str_list[self.page_num]+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + AI_end_screen_list_screen2.scroll_to_y(0,lv.ANIM.OFF) + if self.page_num == 1: #显示第二页 + AI_end_screen_list_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏1 + AI_end_screen_list_screen2.clear_flag(lv.obj.FLAG.HIDDEN) # + elif dir == 3:#最后一页,最后的内容 + if len(text_str_list)>1:#大于一页 + + self.page_num = len(text_str_list)-1 + #if len(text_str_list)>self.page_num: + str_tmp = sub_utf8_String(text_str_list[self.page_num-1],self.text_max-80)#在开头加上上一页的最后30字节数据 + #print("str_tmp123:{}".format(str_tmp)) + if len(text_str_list[self.page_num-1])>len(str_tmp): + str_tmp = text_str_list[self.page_num-1][len(str_tmp):] + else: + str_tmp = '' + # + AI_label2.set_text(str_tmp+text_str_list[self.page_num])#+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + scroll_bottom = AI_label2.get_height() + AI_end_screen_list_screen2.scroll_to(0,scroll_bottom,lv.ANIM.ON) + #print("最后内容,大于一页 scroll_bottom:{}".format(scroll_bottom)) + if self.page_num_tmp == self.page_num:#解决切换页面的时候不跳动问题 + # AI_label2.set_text("\n\n"+str_tmp+text_str_list[self.page_num]) + # scroll_bottom = AI_label2.get_height() + AI_end_screen_list_screen2.scroll_to(0,scroll_bottom,lv.ANIM.ON) + else: + # AI_label2.set_text("\n\n\n\n\n\n"+str_tmp+text_str_list[self.page_num]) + # scroll_bottom = AI_label2.get_height() + AI_end_screen_list_screen2.scroll_to(0,scroll_bottom,lv.ANIM.OFF) + self.page_num_tmp = self.page_num + print("text_str_list[self.page_num]:{}".format(str_tmp+text_str_list[self.page_num])) + #AI_end_screen_list_screen2.scroll_to_view(lv.ANIM.OFF) + AI_end_screen_list_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏1 + AI_end_screen_list_screen2.clear_flag(lv.obj.FLAG.HIDDEN) # + if len(self.AI_label_str ) > len(text_str):#处理播放音频的时候,获取下一页数据 + self.page_num-=1 + elif len(text_str_list) == 1:#只有一页 + self.page_num = 0 + if len(text_str_list)>self.page_num: + AI_label.set_text(text_str_list[self.page_num])#+'\n ...{}/{}...'.format(self.page_num+1,len(text_str_list))) + scroll_bottom = AI_label.get_height() + #print("最后内容,只有一页 scroll_bottom:{}".format(scroll_bottom)) + # if(scroll_bottom>200): + # scroll_bottom -= 200 + + AI_end_screen_list_screen.scroll_to(0,scroll_bottom,lv.ANIM.ON) + #AI_end_screen_list_screen.scroll_to_view(lv.ANIM.OFF) + AI_end_screen_list_screen2.add_flag(lv.obj.FLAG.HIDDEN) #隐藏2 + AI_end_screen_list_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + print("page_change1:page_num:{},text_str_list len:{}".format(self.page_num,len(text_str_list))) + #print("page_change2:page_num:{}".format(self.page_num)) + #print("page_change3:str:{}".format(text_str_list[self.page_num])) def listen_end_btcb(self,e):#说话完成确定按钮回调 if self.AI_listen_end == 1:#说话完成 已有录音文字返回 @@ -847,19 +1047,16 @@ class AIScreen(Screen):#AI_GUI self.not_talk_cb() def ai_talk_end(self):#语言识别完 思考结束显示最后的文本和音频数据 - AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏 - AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) - AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 - AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 - AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) # - AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # - AI_talk_end_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + + - # self.AI_label_answer = "" + self.AI_label_answer = "" AI_end_screen_list_screen.scroll_to(0, 0, lv.ANIM.OFF) - AI_label.set_text(self.AI_label_answer) - AI_label.set_text("语音识别中...") - + AI_label.set_pos(5, 10) + #AI_label.set_text(self.AI_label_answer) + AI_label.set_text("思考中...") + AI_label2.set_text(" ") + self.scroll_timer_count = 0 # self.AI_listen_text = "嗯。" str_len = len(self.AI_listen_text)*20 if str_len > 165: @@ -874,16 +1071,21 @@ class AIScreen(Screen):#AI_GUI AI_listen_text.set_text(self.AI_listen_text) EventMesh.publish("system_sleep_rest")#防止黑屏 self.refresh_count = 0 - self.refresh_texttimer.start(500,1,self.ai_talk_end_show_text)#stop() #(500,1,self.ai_talk_end_show_text) - def ai_talk_end_show_text(self,*argc): - EventMesh.publish("publish_message_event_ui",{"func":self.ai_talk_end_lcd_on,"data":0}) - def ai_talk_end_lcd_on(self,data): - EventMesh.publish("system_sleep_rest")#防止黑屏 + AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏 + AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) + AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_talk_end_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + AI_end_screen_list_screen2.add_flag(lv.obj.FLAG.HIDDEN) #隐藏2 + AI_end_screen_list_screen.clear_flag(lv.obj.FLAG.HIDDEN) # def ai_talk_end_show_text_cb(self,data): - AI_label.set_text_static(self.AI_label_answer) - # AI_label.set_text(self.AI_label_answer) - + #AI_label.set_text(self.AI_label_answer) + #print("ai_talk_end_show_text_cb:scroll_timer_count{}".format(self.scroll_timer_count)) + if self.scroll_timer_count <= 0: + self.page_change(3,self.AI_label_answer)#刷新到最后内容 pass def connect_timerout_popup(self,msg):#连接超时弹窗提示 @@ -903,14 +1105,7 @@ class AIScreen(Screen):#AI_GUI def text_show_think(self,*argc): EventMesh.publish("publish_message_event_ui",{"func":self.text_show_think_cb,"data":0}) - def think_end_result(self): - if self.timer_out_count > 1: - if self.img_show_count_flag == 1: - return - self.timer_out_count = 0 - self.img_show_count_flag = 1 - self.refresh_texttimer.stop() - self.ai_talk_end() + def text_show_think_cb(self,data): #文本刷新 if self.img_show_count_flag == 1: self.refresh_texttimer.stop() @@ -953,6 +1148,18 @@ class AIScreen(Screen):#AI_GUI elif self.refresh_count == 3: al_think_screen_title1.set_text("正在思考...") pass + + def think_end_result(self): + EventMesh.publish("publish_message_event_ui",{"func":self.think_end_result_cb,"data":0}) + def think_end_result_cb(self,data): + if self.timer_out_count > 1: + if self.img_show_count_flag == 1: + return + self.timer_out_count = 0 + self.img_show_count_flag = 1 + self.refresh_texttimer.stop() + self.ai_talk_end() + def img_cb(self,e): #无网络 无数据按钮回调 self.refresh_texttimer.stop() AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏 @@ -972,7 +1179,7 @@ class AIScreen(Screen):#AI_GUI AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # AI_talk_screen.clear_flag(lv.obj.FLAG.HIDDEN) #先隐藏 - self.aud.setVolume(11)#设置最大声录音 + # self.aud.setVolume(11)#设置最大声录音 self.AI_label_answer = "" self.AI_client_chat_play_str = '' @@ -1001,7 +1208,7 @@ class AIScreen(Screen):#AI_GUI def AI_init(self): self.AI_audio_queue_thread_id = _thread.start_new_thread(self.AI_audio_queue_thread, ()) self.AI_send_data_queue_thread_id = _thread.start_new_thread(self.AI_send_data_queue_thread, ()) - + self._1S_timer.start(1000,1,self._1S_timer_cb) #按下录音 @@ -1047,23 +1254,33 @@ class AIScreen(Screen):#AI_GUI EventMesh.publish("publish_message_event_ui",{"func":self.talking,"data":e}) - - def text_show_refresh(self,*argc): - EventMesh.publish("publish_message_event_ui",{"func":self.text_show_refresh_cb,"data":0}) def talk_ars_end(self): - if self.AI_listen_text == "": - return + + self.record.stop()#关闭录音 self.record_timer.stop()#关闭定时器 self.timer_out_count = 0 - print("talk_ars_end!!!!!!!!!!!\r\n") - self.AI_client_chat_send(self.AI_listen_text) + self.AI_send_data_queue.clear() + Record_read_buf = bytearray(self.Audio_buf_size) + for i in range(10): + Record_len = self.record.stream_read(Record_read_buf, self.Audio_buf_size) + print("Record_len:!!!!!!{}\r\n".format(Record_len)) + if Record_len <= 0: + break + print("talk_ars_end2!!!!!!!!!!!\r\n") + try: self.websocket_deconnect_asr() except Exception as e: usys.print_exception(e) + if self.AI_listen_text == "": + return + self.AI_client_chat_send(self.AI_listen_text) + def text_show_refresh(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.text_show_refresh_cb,"data":0}) + def text_show_refresh_cb(self,data): if self.AI_listen_end == 1 or self.timer_out_count >= 120:#语音识别结束 self.record.stop()#关闭录音 @@ -1176,6 +1393,10 @@ class AIScreen(Screen):#AI_GUI #EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) else: pass + def _1S_timer_cb(self,*argc): + EventMesh.publish("system_sleep_rest")#防止黑屏 + if self.scroll_timer_count > 0: + self.scroll_timer_count-=1 #定时器 def record_timer_cb(self,*argc): EventMesh.publish("system_sleep_rest")#防止黑屏 @@ -1205,7 +1426,7 @@ class AIScreen(Screen):#AI_GUI #if self.AI_client_chat_isconnect == 0: # 创建客户端, debug=True输出日志, ip和端口需要自己填写, 或者是域名 try: - self.AI_client_chat = uwebsocket.Client.connect('ws://121.40.67.151:9099/chat/ws', debug=False) + self.AI_client_chat = uwebsocket.Client.connect('ws://118.145.158.207:80/chat/ws', debug=False) except Exception as e: #网络连接异常 usys.print_exception(e) print("websocket_connect_chat error!!!\r\n") @@ -1262,11 +1483,14 @@ class AIScreen(Screen):#AI_GUI if jsload_data['type']=='start': self.AI_label_str = "" self.AI_client_chat_end_flag = 0 + self.AI_client_tts_data_len = 0 self.websocket_connect_tts() #连接tts # elif jsload_data['type']=='end': print("chat end!!!!!!!!!!!!!!") self.AI_client_chat_end_flag = 1 + if len(self.AI_client_chat_play_str) > 100: + utime.sleep_ms(100) except Exception as e: usys.print_exception(e) @@ -1282,7 +1506,7 @@ class AIScreen(Screen):#AI_GUI if self.AI_client_tts_isconnect == 0: try: # self.AI_client_tts = uwebsocket.Client.connect('ws://40.67.151:9099/tts/', debug=False) - self.AI_client_tts = uwebsocket.Client.connect('ws://121.40.67.151:9099/tts/long-text-stream', debug=False) + self.AI_client_tts = uwebsocket.Client.connect('ws://118.145.158.207:80/tts/long-text-stream', debug=False) except Exception as e: #网络连接异常 usys.print_exception(e) print("websocket_connect_tts ERROR:{}\r\n".format(e)) @@ -1326,7 +1550,7 @@ class AIScreen(Screen):#AI_GUI play_str = sub_utf8_String(self.AI_client_chat_play_str,20)#按中文切割字符串 self.AI_client_tts_str_total_len += len(play_str) elif self.TTS_PRO_TYPE == 0: - if self.AI_audio_queue.size() >= 5 or self.AI_client_tts_tra_flag == 1 or (self.tts_time_outcount < 3 and len(self.AI_client_chat_play_str) < 100):#存了超过4句,就等小于3次在转化 + if self.AI_audio_queue.size() >= 4 or self.AI_client_tts_tra_flag == 1 or (self.tts_time_outcount < 3 and len(self.AI_client_chat_play_str) < 100):#存了超过4句,就等小于3次在转化 return play_str = split_string(self.AI_client_chat_play_str,50,100)#按逗号,句号切割 if play_str =="" or len(play_str) > 100:#没找到句号或者逗号,切割字符串 @@ -1337,8 +1561,8 @@ class AIScreen(Screen):#AI_GUI return self.AI_client_tts_send(play_str)#TTS语音播放AI结果 self.AI_client_chat_play_str = self.AI_client_chat_play_str[len(play_str):] - print("TTS play:len{},data{}".format(len(play_str),play_str)) - if len(self.AI_client_chat_play_str) <=0 and self.AI_client_chat_end_flag ==1 : + #print("TTS play:len{},data{}".format(len(play_str),play_str)) + if self.TTS_PRO_TYPE == 1 and len(self.AI_client_chat_play_str) <=0 and self.AI_client_chat_end_flag ==1 : self.AI_client_chat_end_flag=0 self.AI_client_tts_end() @@ -1354,11 +1578,11 @@ class AIScreen(Screen):#AI_GUI "trace_id": self.get_trace_id() }, "payload": { - "voice":"xiaoyun", + "voice":"zhixiaomei",#"xiaoyun", "format":"mp3", "sample_rate":8000, "volume":90, - "speech_rate":2, + "speech_rate":30, "text":"%s"%(data_str) } } @@ -1374,12 +1598,13 @@ class AIScreen(Screen):#AI_GUI self.record_timer.stop()#关闭定时器 self.tts_time_count = 0 self.tts_data_tmp = b'' - self.AI_client_tts_data_len = 0 + self.AI_client_tts_data_total_len = 0 self.AI_client_tts_str_total_len= 0 #self.AI_client_tts_str_sen = "" if self.TTS_PRO_TYPE == 1: + self.AI_client_tts_data_len = 0 self.AI_client_tts_tra_flag = 1 self.AI_client_tts.send(json_data) utime.sleep_ms(100) @@ -1406,6 +1631,7 @@ class AIScreen(Screen):#AI_GUI self.tts_data_tmp = b'' if self.TTS_PRO_TYPE == 1: self.AI_client_tts_tra_flag = 0 + gc.collect()#GC主动回收内存 #文字转语音链路读数据 def AI_client_tts_recv(self,cli): recv_data_len_same_count = 0 @@ -1465,7 +1691,8 @@ class AIScreen(Screen):#AI_GUI usys.print_exception(e) # print(recv_data) # print(type(recv_data)) - + mem = gc.mem_free() + print('2剩余内存RAM:{} KB'.format(mem / 1024)) except Exception as e: usys.print_exception(e) break @@ -1482,7 +1709,7 @@ class AIScreen(Screen):#AI_GUI usys.print_exception(e) try: - self.AI_client_asr = uwebsocket.Client.connect('ws://121.40.67.151:9099/asr/ws', debug=False) + self.AI_client_asr = uwebsocket.Client.connect('ws://118.145.158.207:80/asr/ws', debug=False) except Exception as e: #网络连接异常 usys.print_exception(e) print("websocket_connect_asr error!!!\r\n") @@ -1493,7 +1720,7 @@ class AIScreen(Screen):#AI_GUI try: _thread.stop_thread(self.AI_client_asr_recv_id) except Exception as e: - usys.print_exception(e) + usys.print_exception(e) self.AI_client_asr_recv_id = 0 self.AI_client_asr_recv_id = _thread.start_new_thread(self.AI_client_asr_recv, (self.AI_client_asr,)) self.AI_client_asr_isconnect = 1 @@ -1505,8 +1732,7 @@ class AIScreen(Screen):#AI_GUI #self.AI_client_asr.send(data_bytes) self.AI_send_data_queue.put([self.AI_client_asr_num,data_bytes]) def AI_client_asr_start(self): - - self.AI_send_data_queue.put([self.AI_client_asr_num,"{\"header\":{\"event\":\"StartTranscription\",\"trace_id\":\"3fa6b9e6a30b407ea38ad7ae69e6c291\"},\"payload\":{\"format\":\"amr\",\"sample_rate\":8000}}"]) + self.AI_send_data_queue.put([self.AI_client_asr_num,"{\"header\":{\"event\":\"StartTranscription\",\"trace_id\":\"%s\"},\"payload\":{\"format\":\"amr\",\"sample_rate\":8000}}"%(self.get_trace_id())]) #语音转文字链路读数据 def AI_client_asr_recv(self,cli): @@ -1524,7 +1750,12 @@ class AIScreen(Screen):#AI_GUI if isinstance(recv_data, str): jsload_data = ujson.loads(recv_data) print("jsload_data = {}".format(jsload_data)) + if recv_data.find('\"result\"') == -1: + #if jsload_data["result"] == None: + print("continue recv_data:{}".format(recv_data)) + continue if jsload_data["result"] == None: + print("continue recv_data:{}".format(recv_data)) continue if jsload_data["result"]["result"]: self.AI_listen_text = str(jsload_data["result"]["result"]) @@ -1583,6 +1814,8 @@ class AIScreen(Screen):#AI_GUI tmp = self.AI_client_chat.send(data[1]) print("chat send_data:{} tmp:{}".format(len(data[1]),tmp)) if data[0] == self.AI_client_asr_num: + if isinstance(data[1], str): + print("ASR:AI_client_asr_isconnect:{},data:{}",self.AI_client_asr_isconnect,data[1]) if self.AI_client_asr_isconnect == 0: try: self.websocket_connect_asr() @@ -1657,6 +1890,8 @@ class AIScreen(Screen):#AI_GUI if tmp != 0: print("2playStream:error tmp:{} data len:{}!!!!!!!!!!!!".format(tmp,len(data[0]))) self.AI_client_tts_data_len -=len(data[0]) + mem = gc.mem_free() + print('1剩余内存RAM:{} KB'.format(mem / 1024)) except Exception as e: print("AI_audio_queue_thread:ERROR:") usys.print_exception(e) @@ -1698,6 +1933,7 @@ class AIScreen(Screen):#AI_GUI self.AI_client_asr_recv_id = 0 except Exception as e: usys.print_exception(e) + self._1S_timer.stop() self.AI_send_data_queue.clear() print("close:AI_send_data_queue:size:{}".format(self.AI_send_data_queue.size())) self.AI_audio_queue.clear() @@ -1709,22 +1945,37 @@ class AIScreen(Screen):#AI_GUI self.AI_client_chat_play_str = "" self.AI_client_tts_tra_flag = 0 self.record.stop()#关闭录音 - self.AI_label_answer = "" - self.refresh_count = 0 Record_read_buf = bytearray(self.Audio_buf_size) for i in range(10): Record_len = self.record.stream_read(Record_read_buf, self.Audio_buf_size) print("Record_len:!!!!!!{}\r\n".format(Record_len)) if Record_len <= 0: break + self.AI_label_answer = "" + self.refresh_count = 0 self.refresh_texttimer.stop() self.clear_flag() + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num)#恢复原始音量 try: self.websocket_deconnect_asr() self.websocket_deconnect_tts() self.websocket_deconnect_chat() except Exception as e: usys.print_exception(e) + + def done_bottom_to_top(self): + print("done_bottom_to_top:") + self.hard_flag_next = 1 + + def done_top_to_bottom(self): + # self.timer_start_cb() + print("done_top_to_bottom") + self.hard_flag_prev = 1 + pass + def done_return(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py index e4682aeb..7ce11f40 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/main_init.py @@ -173,13 +173,14 @@ def main_init(): ui.add_screen(_ui.videoModeScreen()) ui.add_screen(_ui.voiceOutCallScreen()) - try: - from aigcdial import CreateScreen,aigcStyleLIstScreen,aigcMainLIstScreen - ui.add_screen(CreateScreen()) - ui.add_screen(aigcStyleLIstScreen()) - ui.add_screen(aigcMainLIstScreen()) - except Exception as e: - usys.print_exception(e) + # try: + # from aigcdial import CreateScreen,aigcStyleLIstScreen,aigcMainLIstScreen,aigcShowNewImgScreen + # ui.add_screen(CreateScreen()) + # ui.add_screen(aigcStyleLIstScreen()) + # ui.add_screen(aigcMainLIstScreen()) + # ui.add_screen(aigcShowNewImgScreen()) + # except Exception as e: + # usys.print_exception(e) # from pp_main import allppPopupScreen,delOnePopupScreen,ppListScreen,noppPopupScreen,delppsucessPopupScreen,ppMainScreen,addfaileppPopupScreen,ppMainPopupScreen,addppPopupScreen,addedppPopupScreen,ownaddppPopupScreen # ui.add_screen(ppMainScreen()) @@ -266,6 +267,7 @@ def main_init(): app.append_manager(sosInfoCallManager()) app.append_manager(testSmsSetIPManager()) app.append_manager(setclassTimeManager()) + app.append_manager(mgr.setCallStateManager()) app.append_manager(cameraAlbumManager()) app.append_manager(AddPPManager()) app.append_manager(simFactoryManager()) diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py index a24b67b8..26abde9f 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/mgr.py @@ -374,7 +374,7 @@ class ConfigStoreManager(Abstract): ql_fs.touch(self.file_name, self.map) class sosInfoCallManager(Abstract): - # 通讯录 + # SOS拨号 def __init__(self): pass @@ -384,9 +384,11 @@ class sosInfoCallManager(Abstract): def set_sos_info_call(self, event, msg): hangup_mode = EventMesh.publish("get_hangup_mode") if hangup_mode == 1: + EventMesh.publish("set_sos_flag",0) EventMesh.publish("set_sos_num",0) EventMesh.publish("set_hangup_mode",0) + print('hangup_mode disconnect',hangup_mode) sos_flag = EventMesh.publish("get_sos_flag") print('voicecall sos_flag',sos_flag) @@ -403,11 +405,11 @@ class sosInfoCallManager(Abstract): num_len = 0 if len(number) == 1: - num_len = len(number) - elif len(number) == 2: num_len = len(number)+1 + elif len(number) == 2: + num_len = len(number)+1+2 elif len(number) == 3: - num_len = len(number)+2 + num_len = len(number)+5 # print("number:{} number_len :{} num:{} num_len:{}".format(number,len(number),num,num_len)) if num > num_len : if len(number) == 1: @@ -426,33 +428,45 @@ class sosInfoCallManager(Abstract): sms.sendPduMsg(number2, '我需要你的帮助', 'UCS2') number3 = str(number[2]) sms.sendPduMsg(number3, '我需要你的帮助', 'UCS2') - 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") + if len(number[0]) != 0: + EventMesh.publish("set_callnumer_cb",number[0]) + print("phone 1") elif len(number) == 2: - if num == 1 or num == 3: + if num == 1 or num == 3 or num == 5: print("phone 2") - EventMesh.publish("set_callnumer_cb",number[1]) - elif num == 2: + if len(number[1]) != 0: + EventMesh.publish("set_callnumer_cb",number[1]) + elif num == 2 or num == 4: print("phone 3") - EventMesh.publish("set_callnumer_cb",number[0]) + if len(number[0]) != 0: + EventMesh.publish("set_callnumer_cb",number[0]) elif len(number) == 3: - if num == 1 or num == 4: - EventMesh.publish("set_callnumer_cb",number[1]) + if num == 1 or num == 4 or num == 7: + if len(number[1]) != 0: + EventMesh.publish("set_callnumer_cb",number[1]) print("phone 4") - elif num == 2 or num == 5: + elif num == 2 or num == 5 or num == 8: print("phone 5") - EventMesh.publish("set_callnumer_cb",number[2]) - elif num == 3: - print("phone 6") - EventMesh.publish("set_callnumer_cb",number[0]) - + if len(number[2]) != 0: + EventMesh.publish("set_callnumer_cb",number[2]) + elif num == 3 or num == 6: + if len(number[0]) != 0: + print("phone 6") + EventMesh.publish("set_callnumer_cb",number[0]) + + +WL_timer = osTimer() +def WL_timer_cb(*args): + get_call = EventMesh.publish("get_call_state") + if get_call == 2:#只有拨进来才给接听 + EventMesh.publish("answer_auto_event") + def voice_callback(args): print('voicecall iinfo:{}'.format(args)) if args[0] == 10: @@ -469,6 +483,29 @@ def voice_callback(args): if b == True and size_len > 11: tmp = tmp[size_len-11:] + WLKEY = EventMesh.publish("get_storage_config","WLKEY") + if WLKEY != None: + if WLKEY == "1" or WLKEY == "2":#开启了白名单 + on_list_flag = 0 + phonebook = EventMesh.publish("get_phonebook_list") + phonebook_list = phonebook[1] + print("voice_callback:phonebook_list{}".format(phonebook_list)) + try: + for value in phonebook_list.values(): + if value == args[6]: + on_list_flag = 1 + break + except Exception as e: + usys.print_exception(e) + print("voice_callback:on_list_flag{}".format(on_list_flag)) + if on_list_flag == 1:#在白名单里 + if WLKEY == "2": + WL_timer.start(30000, 0, WL_timer_cb) + else: + print("voice_callback:不在白名单中,挂断") + voiceCall.callEnd() + return + EventMesh.publish("set_call_state",2)#设置 EventMesh.publish("load_screen", {"screen": "incoming_call","meta":str(tmp)}) elif args[0] == 11: @@ -488,6 +525,7 @@ def voice_callback(args): b = tmp[0].isdigit()#判断是否不是数字开头 暂时不用 因为截取了+判断不了 if b == True and size_len > 11: tmp = tmp[size_len-11:] + EventMesh.publish("set_call_state",1)#设置 EventMesh.publish("load_screen", {"screen": "on_call","meta":str(tmp)}) elif args[0] == 12: @@ -498,7 +536,7 @@ def voice_callback(args): EventMesh.publish("set_interrup_incall",0) EventMesh.publish("set_UI_high_priority",0) - + EventMesh.publish("set_call_state",0)#设置通话状态为0 EventMesh.publish("return_prev_screen") # EventMesh.publish("load_screen", {"screen": "main_menu"}) @@ -509,7 +547,7 @@ def voice_callback(args): elif args[0] == 13: print('voicecall is waiting, PhoneNO.: ', args[6]) elif args[0] == 14: - + EventMesh.publish("set_call_state",4)##设置通话状态 print('voicecall dialing, PhoneNO.: ', args[6]) EventMesh.publish("set_UI_high_priority",0) EventMesh.publish("load_screen", {"screen": "dialing"}) @@ -3349,6 +3387,21 @@ class cameraAlbumManager(Abstract):#保存相册数目 def get_camera_num(self, event, msg): return self.album_num +class setCallStateManager(Abstract):#设置电话通话状态 + def __init__(self): + self.call_state = 0 + + def post_processor_after_instantiation(self): + EventMesh.subscribe("set_call_state", self.set_call_state)#设置关机时间 + EventMesh.subscribe("get_call_state", self.get_call_state) + + def set_call_state(self, event, msg): + self.call_state = msg + + + def get_call_state(self, event, msg): + + return self.call_state class setclassTimeManager(Abstract):#设置上课禁用时间 def __init__(self): diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py index 3f9a00fe..05daaab5 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/protocol.py @@ -1454,8 +1454,11 @@ class WLKEY_ProtoCol(ProtoCol): @param event: @param msg: 接收到的下行数据 """ - # b'[SZKW*867387060319166*000A*KEYBRD]' - # print("WLKEY!!!!!!!!!!!!!",msg) + msg = msg[1:-1] + msg_tmp = msg.decode('ascii') + msg_data = msg_tmp.split(',') + print("WLKEY_ProtoCol".format(msg_data[1])) + EventMesh.publish("set_storage_config",["WLKEY",str(msg_data[1])]) EventMesh.publish(constants.PROTOCOL.WLKEY_SEND) # [SG*5678901234*0037* SILENCETIMEFS,21:10-7:30@0111110,21:10-7:30@0111110,21:10-7:30@0111110,21:10-7:30@0111110] diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui.py index e90ae84a..7b48eec0 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui.py @@ -2949,7 +2949,7 @@ class ToolboxScreen(Screen): 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_size(115,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) @@ -2975,7 +2975,7 @@ class ToolboxScreen(Screen): 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_size(115,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) @@ -3001,7 +3001,7 @@ class ToolboxScreen(Screen): 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_size(115,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) @@ -3035,7 +3035,7 @@ class ToolboxScreen(Screen): 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_size(115,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) @@ -3060,7 +3060,7 @@ class ToolboxScreen(Screen): 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_size(115,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) @@ -3092,7 +3092,7 @@ class ToolboxScreen(Screen): tool_set_y+=tool_set_y_offset toolbox_calcut_img_btn_1 = lv.btn(toolbox_cont) toolbox_calcut_img_btn_1.set_pos(int(0),int(tool_set_y-5)) - toolbox_calcut_img_btn_1.set_size(120,35) + toolbox_calcut_img_btn_1.set_size(115,35) toolbox_calcut_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) toolbox_calcut_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) toolbox_calcut_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) @@ -3269,6 +3269,10 @@ class IncomingCallScreen(Screen): def post_processor_after_initialization(self): + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num) global incoming_call_screen,incoming_call_img,incoming_call_name_label,incoming_call_answer ,incoming_call_hangup utime.sleep_ms(200)#不加延时会切屏 data = EventMesh.publish("get_phonebook_list") @@ -3281,7 +3285,7 @@ class IncomingCallScreen(Screen): j = 0 if b == True: for i in range(len(self.phonebook)): #字典 key value - #'001:邓雪英':15521469561 + #'001:': name = self.phonebook[phonebook_keys[j]] name_value = phonebook_keys[j] number_tmp = str(self.meta_info) @@ -3391,6 +3395,10 @@ class IncomingCallScreen(Screen): voiceCall.callAnswer() def Close(self): + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num) self.call_timer.stop() self.aud.stop() @@ -3561,9 +3569,9 @@ class OnCallScreen(Screen): on_call_volum_label = lv.label(on_call_obj) - on_call_volum_label.set_pos(0, 100) + on_call_volum_label.set_pos(0, 95) on_call_volum_label.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_volum_label.set_size(48, 28) + on_call_volum_label.set_size(48, 33) on_call_volum_label.set_text("静音") on_call_volum_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) on_call_volum_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -3580,9 +3588,9 @@ class OnCallScreen(Screen): lv.EVENT.SHORT_CLICKED, None) on_call_tab_label = lv.label(on_call_obj) - on_call_tab_label.set_pos(80, 100) + on_call_tab_label.set_pos(80, 95) on_call_tab_label.add_flag(lv.obj.FLAG.CLICKABLE) - on_call_tab_label.set_size(48, 28) + on_call_tab_label.set_size(48, 33) on_call_tab_label.set_text("键盘") on_call_tab_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0) on_call_tab_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4064,7 +4072,12 @@ class OnCallScreen(Screen): # EventMesh.publish("load_screen", {"screen": "main_menu"}) def Close(self): + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(self.volum_size) self.timer.stop() + voiceCall.mute(2,0,0) def btn1_release(self): pass @@ -8040,7 +8053,7 @@ class cameraalbumScreen(Screen):#相册 read_album = 0 read_album = EventMesh.publish("get_camera_num") print("read_album",read_album) - IFEXIST = ql_fs.path_exists("/ext/static/album/1_camera.jpg") + IFEXIST = ql_fs.path_exists("/usr/static/album/1_camera.jpg") if IFEXIST == True: camera_album_popup_img1.clear_flag(lv.obj.FLAG.HIDDEN) camera_album_popup_img1.set_src("U:/static/album/1_camera.jpg") #'U:/6_camera.jpeg'"U:/static/album/1_camera.jpg" @@ -8242,8 +8255,10 @@ class VdieoVoiceScreen(Screen):#语音接听画面 self.meta = voice_answer_screen EventMesh.publish("set_UI_high_priority", 1) self.timer.start(1*1000,1,self.fun) + def fun(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.fun_cb,"data":0}) - def fun(self,*argc): + def fun_cb(self,data): call_state = jrtc.get_state() if call_state == 5: self.timer.stop() @@ -8305,6 +8320,7 @@ class VoiceShowScreen(Screen):#正在语音通话中 self.meta = None self.preview1 = None self.timer = osTimer() + self.aud = audio.Audio(0) self.statu_open = -1 self.show_label = 0 self.second_count = 0 @@ -8343,9 +8359,9 @@ class VoiceShowScreen(Screen):#正在语音通话中 camera_voice_answer_btn.set_src("U:/static/hang_up.png") camera_voice_answer_btn_label = lv.label(camera_voice_answer_screen) - camera_voice_answer_btn_label.set_pos(18, 50) + camera_voice_answer_btn_label.set_pos(38, 80) camera_voice_answer_btn_label.set_text(" ") - camera_voice_answer_btn_label.set_size(90, 78) + camera_voice_answer_btn_label.set_size(52, 48) camera_voice_answer_btn_label.add_flag(lv.obj.FLAG.CLICKABLE) camera_voice_answer_btn_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.close_cb(e)), lv.EVENT.SHORT_CLICKED, None) @@ -8397,7 +8413,10 @@ class VoiceShowScreen(Screen):#正在语音通话中 def set_dev_end_video(self,event,msg):#手表挂断app self.statu_open = msg - def fun(self,*argc): + def fun(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.fun_cb,"data":0}) + + def fun_cb(self,data): EventMesh.publish("system_sleep_rest")#防止黑屏 call_state = jrtc.get_state() if call_state == 5: @@ -8446,6 +8465,10 @@ class VoiceShowScreen(Screen):#正在语音通话中 camera_voice_answer_second_label.set_text("{}:{}".format("%02d"%(total_min),"%02d"%(total_sec))) def Close(self): + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num)#恢复原始音量 self.timer.stop() def done_return(self): @@ -8563,6 +8586,7 @@ class VedioShowScreen(Screen):#正在视频通话中 super().__init__() self.meta = None self.preview1 = None + self.aud = audio.Audio(0) self.timer = osTimer() self.statu_open = -1 self.show_label = 0 @@ -8660,11 +8684,10 @@ class VedioShowScreen(Screen):#正在视频通话中 camera_video_answer_btn.set_size(32,32) camera_video_answer_btn.set_src("U:/static/hang_up.png") - camera_video_answer_btn_label = lv.label(camera_video_answer_screen) - camera_video_answer_btn_label.set_pos(18, 50) + camera_video_answer_btn_label.set_pos(38, 80) camera_video_answer_btn_label.set_text(" ") - camera_video_answer_btn_label.set_size(90, 78) + camera_video_answer_btn_label.set_size(52, 48) camera_video_answer_btn_label.add_flag(lv.obj.FLAG.CLICKABLE) @@ -8710,9 +8733,12 @@ class VedioShowScreen(Screen):#正在视频通话中 EventMesh.publish("set_UI_high_priority", 0) EventMesh.publish("close_jrtc_event") EventMesh.publish("return_prev_screen") - + + def fun(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.fun_cb,"data":0}) - def fun(self,*argc): + + def fun_cb(self,data): EventMesh.publish("system_sleep_rest")#防止黑屏 call_state = jrtc.get_state() if call_state == 5: @@ -8758,6 +8784,10 @@ class VedioShowScreen(Screen):#正在视频通话中 # camera_video_answer_second_label.set_text("%02d"%(total_min),"%02d"%(total_sec)) def Close(self): + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num)#恢复原始音量 self.timer.stop() def done_return(self): @@ -8865,7 +8895,10 @@ class voiceInCallScreen(Screen):#语音通话打入中 def call_timer_cb(self,e): self.aud.play(1, 1, 'U:/static/R_CALL_mp3.mp3') #播放来电铃声 - def get_video_state(self,e): + def get_video_state(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.get_video_state_cb,"data":0}) + + def get_video_state_cb(self,data): call_state = jrtc.get_state() # print("vedio_incall",call_state) self.timeout+=1 @@ -9019,9 +9052,12 @@ class vedioCallingCallScreen(Screen):#视频通话打入中 def call_timer_cb(self,e): self.aud.play(1, 1, 'U:/static/R_CALL_mp3.mp3') #播放来电铃声 - def get_video_state(self,e): + def get_video_state(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.get_video_state_cb,"data":0}) + + def get_video_state_cb(self,data): call_state = jrtc.get_state() - # print("vedio_incall",call_state) + print("vedio_incall",call_state) self.timeout+=1 if self.timeout >= 1*60: self.timeout = 0 @@ -9052,6 +9088,10 @@ class vedioCallingCallScreen(Screen):#视频通话打入中 def Close(self): self.call_timer.stop() self.call_timer1.stop() + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num)#恢复原始音量 self.aud.stop() def hangup(self,e): @@ -9108,6 +9148,7 @@ class videoOutCallScreen(Screen):#正在拨号中...未打出 self.meta = None self.meta_type = "popup" self.timer1 = osTimer() + self.aud = audio.Audio(0) self.time_count = 0 self.second_count = 0 self.answer = 0 @@ -9151,9 +9192,9 @@ class videoOutCallScreen(Screen):#正在拨号中...未打出 video_outcall_hangup_imgbtn.set_pos(48, 90) video_outcall_hangup_imgbtnlabel = lv.label(video_outcall_screen) - video_outcall_hangup_imgbtnlabel.set_pos(18, 50) + video_outcall_hangup_imgbtnlabel.set_pos(38, 80) video_outcall_hangup_imgbtnlabel.set_text(" ") - video_outcall_hangup_imgbtnlabel.set_size(90, 78) + video_outcall_hangup_imgbtnlabel.set_size(52, 48) video_outcall_hangup_imgbtnlabel.add_flag(lv.obj.FLAG.CLICKABLE) video_outcall_hangup_imgbtnlabel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), @@ -9202,7 +9243,10 @@ class videoOutCallScreen(Screen):#正在拨号中...未打出 EventMesh.publish("load_screen", {"screen": "videolist"}) pass - def fun_cb(self,*argc): + def fun_cb(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.fun,"data":0}) + + def fun(self,data): call_state = jrtc.get_state() print("video_outcall",call_state) EventMesh.publish("system_sleep_rest")#防止黑屏 @@ -9241,6 +9285,10 @@ class videoOutCallScreen(Screen):#正在拨号中...未打出 video_outcall_call.set_text("{}:{}".format("%02d"%(total_min),"%02d"%(total_sec))) def Close(self): + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num)#恢复原始音量 self.timer1.stop() def done_return(self): @@ -9269,6 +9317,7 @@ class voiceOutCallScreen(Screen):#等待对方接接听中 super().__init__() self.meta = None self.meta_type = "popup" + self.aud = audio.Audio(0) self.timer1 = osTimer() self.time_count = 0 self.second_count = 0 @@ -9307,9 +9356,9 @@ class voiceOutCallScreen(Screen):#等待对方接接听中 voice_outcall_hangup_imgbtn.set_pos(48, 90) voice_outcall_hangup_imgbtnlabel = lv.label(voice_outcall_screen) - voice_outcall_hangup_imgbtnlabel.set_pos(18, 50) + voice_outcall_hangup_imgbtnlabel.set_pos(38, 80) voice_outcall_hangup_imgbtnlabel.set_text(" ") - voice_outcall_hangup_imgbtnlabel.set_size(90, 78) + voice_outcall_hangup_imgbtnlabel.set_size(52, 48) voice_outcall_hangup_imgbtnlabel.add_flag(lv.obj.FLAG.CLICKABLE) voice_outcall_hangup_imgbtnlabel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hangup(e)), @@ -9358,7 +9407,10 @@ class voiceOutCallScreen(Screen):#等待对方接接听中 EventMesh.publish("load_screen", {"screen": "videolist"}) pass - def fun_cb(self,*argc): + def fun_cb(self,*argc): + EventMesh.publish("publish_message_event_ui",{"func":self.fun,"data":0}) + + def fun(self,data): call_state = jrtc.get_state() print("voice_outcall",call_state) EventMesh.publish("system_sleep_rest")#防止黑屏 @@ -9396,6 +9448,10 @@ class voiceOutCallScreen(Screen):#等待对方接接听中 voice_outcall_call.set_text("{}:{}".format("%02d"%(total_min),"%02d"%(total_sec))) def Close(self): + num = EventMesh.publish("get_volum_size") + if num == None: + num = 8 + self.aud.setVolume(num)#恢复原始音量 self.timer1.stop() def done_return(self): diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py index a1ecfb2b..bfcac767 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py @@ -386,17 +386,30 @@ class WatchFace(): self.watchface_list = [] self.timer_update = osTimer() EventMesh.subscribe("set_change_face", self.change_face) + EventMesh.subscribe("update_dial_file", self.update_dial_file) self.PWM_backlight = None read_data = EventMesh.publish("get_storage_config","watchface") if read_data != None: self.watchface_style_num = read_data - + def update_dial_file(self,event,msg): + check_txt = ql_fs.path_exists("/usr/static/storage_file/aigc_dial.jpg") + print("update_dial_file!!!!! {}\r\n".format(check_txt)) + if check_txt == True: + if watchface1_bg_img != None: + watchface1_bg_img.set_src("U:/static/storage_file/aigc_dial.jpg") + pass def initialization(self,main_menu): if self.watchface_list == [] : #第一次初始化 self.watchface_list.append( WatchFace1(main_menu)) # self.watchface_list.append( WatchFace2(main_menu)) print("watchface INIT !!!!!!!!:",self.watchface_style_num) + check_txt = ql_fs.path_exists("/usr/static/storage_file/aigc_dial.jpg") + print("update_dial_file!!!!! {}\r\n".format(check_txt)) + if check_txt == True: + if watchface1_bg_img != None: + watchface1_bg_img.set_src("U:/static/storage_file/aigc_dial.jpg") + for wat in self.watchface_list: if wat.NAME == self.watchface_style_num : self.watchface_style = wat @@ -405,6 +418,7 @@ class WatchFace(): self.meta = self.watchface_style.meta self.watchface_style.meta.clear_flag(lv.obj.FLAG.HIDDEN)#显示 self.watchface_style.timerout_update() + self.timer_update.start(10000, 1, self.timerout_update) def timerout_update(self, *args, **kwargs): diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py index 162c6f9a..cb8a7d67 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_setting.py @@ -1107,17 +1107,18 @@ class RestartScreen(Screen): screen_slider_1.set_style_bg_color(lv.color_make(0x00,0x00,0x00), lv.PART.INDICATOR|lv.STATE.DEFAULT) def save_choice(self,e): + EventMesh.publish("system_sleep_rest")#防止黑屏 state_on = 0 state_offset = 0 code = e.get_code() value_slider = screen_slider_1.get_value() total_len = 0+value_slider - if total_len >= 100-7: - total_len = 100-7 + if total_len >= 100-15: + total_len = 100-15 if total_len <= 10: total_len = 10 - if total_len >= 100-7: + if total_len >= 100-15: screen_slider_1.set_value(100, False) if total_len >= 20: @@ -1133,7 +1134,7 @@ class RestartScreen(Screen): if code == lv.EVENT.RELEASED: value_slider = screen_slider_1.get_value() # print("RELEASED save_choice1111111!!!!!!",total_len,value_slider,state_on) - if total_len < 100-7: + if total_len < 100-12: screen_slider_1.set_value(10, False) screen_slider_img.set_pos(10,60) screen_slider_1.set_style_bg_color(lv.color_make(0x00,0x00,0x00), lv.PART.INDICATOR|lv.STATE.DEFAULT) @@ -1342,15 +1343,16 @@ class PoweroffScreen(Screen): poweroff_screen_slider_1.set_style_bg_color(lv.color_make(0x00,0x00,0x00), lv.PART.INDICATOR|lv.STATE.DEFAULT) def save_choice(self,e): + EventMesh.publish("system_sleep_rest")#防止黑屏 code = e.get_code() value_slider = poweroff_screen_slider_1.get_value() total_len = 0+value_slider - if total_len >= 100-7: - total_len = 100-7 + if total_len >= 100-15: + total_len = 100-15 if total_len <= 10: total_len = 10 - if total_len >= 100-7: + if total_len >= 100-15: poweroff_screen_slider_1.set_value(100, False) if total_len >= 20: @@ -1364,7 +1366,7 @@ class PoweroffScreen(Screen): if code == lv.EVENT.RELEASED: value_slider = poweroff_screen_slider_1.get_value() - if total_len < 100-7: + if total_len < 100-15: poweroff_screen_slider_1.set_value(10, False) poweroff_screen_slider_img.set_pos(10,60) poweroff_screen_slider_1.set_style_bg_color(lv.color_make(0x00,0x00,0x00), lv.PART.INDICATOR|lv.STATE.DEFAULT) @@ -1381,6 +1383,7 @@ class PoweroffScreen(Screen): # EventMesh.publish("load_screen", {"screen": "setting"}) def confirm(self, e): + EventMesh.publish("system_sleep_rest")#防止黑屏 EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"}) def concel(self, e): @@ -1704,7 +1707,7 @@ brightness_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAU brightness_bar = lv.bar(brightness_screen) brightness_bar.set_pos(10, 55) -brightness_bar.set_size(108, 12) +brightness_bar.set_size(106, 12) brightness_bar.set_style_anim_time(1000, lv.PART.INDICATOR | lv.STATE.DEFAULT) brightness_bar.set_mode(lv.bar.MODE.NORMAL) brightness_bar.set_value(50, lv.ANIM.OFF) @@ -1977,7 +1980,10 @@ class totalvolumeScreen(Screen): self.show_bar(1) def show_bar(self,msg): - totalvolume_bar.set_value((100 // 11) * self.volum_size, lv.ANIM.OFF) + value = (100 // 11) * self.volum_size + if value >= 99: + value = 100 + totalvolume_bar.set_value(value, lv.ANIM.OFF) if msg == 1: self.aud.setVolume(self.volum_size) EventMesh.publish("set_volum_size",self.volum_size)