From: dxy15521469561 <1731678236@qq.com> Date: Mon, 24 Jun 2024 08:51:07 +0000 (+0800) Subject: M36_K01: X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1621d981976cdf52c2d0400e51557f85850423b1;p=mirrors%2FASR1603_G5.git M36_K01: 界面优化 bug修复 --- diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/Makefile b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/Makefile index 1a0abb30..0db46bb4 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/Makefile +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/Makefile @@ -1056,7 +1056,6 @@ frozen_mpy_list = $(BUILD)/_boot.mpy \ $(BUILD)/main_init.mpy \ $(BUILD)/calculator.mpy \ $(BUILD)/versions.mpy \ - $(BUILD)/pp_main.mpy \ $(BUILD)/copy.mpy \ $(BUILD)/types.mpy \ $(BUILD)/ai.mpy 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 3a0694a9..df10e0f3 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 @@ -4,7 +4,6 @@ from machine import Pin import osTimer import _thread from queue import Queue -from ui import style_font_youyuan_20,style_screen,Screen,style_font_youyuan_20_black,style_img import uwebsocket import usys import EventMesh @@ -14,8 +13,13 @@ import lvgl as lv import urandom import uhashlib import ubinascii +from ui import style_font_youyuan_20,style_screen,Screen,style_img LCD_SIZE_H = 128 -LCD_SIZE_W = 128 +LCD_SIZE_W = 128 +style_font_youyuan_ai_20 = lv.style_t() +style_font_youyuan_ai_20.init() +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(',',start,end) @@ -88,18 +92,6 @@ style_common_bg_rect_btn_pressed.set_bg_opa(100) style_common_bg_rect_btn_pressed.set_border_width(0) style_common_bg_rect_btn_pressed.set_shadow_opa(0) -# style_font_20_ai_green = lv.style_t() -# style_font_20_ai_green.init() -# style_font_20_ai_green.set_text_color(lv.color_make(0x00, 0xf0, 0x00)) -# style_font_20_ai_green.set_bg_color(lv.color_make(0x00, 0xff, 0x2a)) -# style_font_20_ai_green.set_text_font(lv.K01_font_16_ALL) - -# style_font_20_ai_white = lv.style_t() -# style_font_20_ai_white.init() -# style_font_20_ai_white.set_text_color(lv.color_make(0x00, 0xf0, 0x00)) -# style_font_20_ai_white.set_bg_color(lv.color_make(0xff, 0xff, 0xff)) -# style_font_20_ai_white.set_text_font(lv.K01_font_16_ALL) - style_font_20_ai_white = lv.style_t() style_font_20_ai_white.init() style_font_20_ai_white.set_radius(0) @@ -108,16 +100,18 @@ style_font_20_ai_white.set_bg_color(lv.color_make(0xff, 0xff, 0xff)) style_font_20_ai_white.set_bg_grad_dir(lv.GRAD_DIR.NONE) style_font_20_ai_white.set_bg_opa(255) style_font_20_ai_white.set_text_color(lv.color_make(0x00, 0x00, 0x00)) +# style_font_20_ai_white.set_text_font_v2("font_28.bin",28,0) style_font_20_ai_white.set_text_font(lv.K01_font_16_ALL) style_font_20_ai_green = lv.style_t() style_font_20_ai_green.init() -style_font_20_ai_green.set_radius(0) +style_font_20_ai_green.set_radius(5) style_font_20_ai_green.set_bg_color(lv.color_make(0x00, 0xff, 0x2a)) #style_font_20_ai_green.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6)) style_font_20_ai_green.set_bg_grad_dir(lv.GRAD_DIR.NONE) style_font_20_ai_green.set_bg_opa(255) -style_font_20_ai_green.set_text_color(lv.color_make(0x00, 0x00, 0x00)) +style_font_20_ai_green.set_text_color(lv.color_make(0xff, 0xff, 0xff)) +# style_font_20_ai_green.set_text_font_v2("font_28.bin",28,0) style_font_20_ai_green.set_text_font(lv.K01_font_16_ALL) AI_screen = lv.obj() @@ -125,46 +119,504 @@ print("AI_screen") AI_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) AI_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) -AI_screen_list_screen = lv.obj(AI_screen) -AI_screen_list_screen.set_pos(0, 0) -AI_screen_list_screen.set_size(LCD_SIZE_W, LCD_SIZE_H-60) -AI_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -AI_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_talk_end_screen = lv.obj(AI_screen) +AI_talk_end_screen.set_pos(0, 0) +AI_talk_end_screen.set_size(LCD_SIZE_W,LCD_SIZE_H) +print("AI_talk_end_screen") +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) + +# al_success_title1 = lv.label(AI_screen_list_screen_title) +# al_success_title1.set_pos(0, 5) +# al_success_title1.set_size(LCD_SIZE_W, 25) +# al_success_title1.set_text("AI智能助手") +# 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_talk_end_bt_screen = lv.obj(AI_talk_end_screen) +AI_talk_end_bt_screen.set_pos(0, 96) +AI_talk_end_bt_screen.set_size(LCD_SIZE_W,LCD_SIZE_H-96) +print("AI_talk_end_bt_screen") +AI_talk_end_bt_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_talk_end_bt_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_talk_end_screen_icon1 = lv.img(AI_talk_end_bt_screen) +al_talk_end_screen_icon1.set_size(26,26) +al_talk_end_screen_icon1.set_pos(10,5) +al_talk_end_screen_icon1.add_flag(lv.obj.FLAG.CLICKABLE) +al_talk_end_screen_icon1.set_src("U:/static/AI/ai_result_can_bt.png") +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_pos(0,0) +al_talk_end_screen_cancel_bt.add_flag(lv.obj.FLAG.CLICKABLE) -AI_press_btn = lv.btn(AI_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) +al_talk_end_screen_icon2 = lv.img(AI_talk_end_bt_screen) +al_talk_end_screen_icon2.set_size(80,26) +al_talk_end_screen_icon2.set_pos(44,5) +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 = lv.label(AI_screen) -AI_press_label.set_text("单击说话") -AI_press_label.set_size(LCD_SIZE_W, 38) -AI_press_label.set_pos(0,(LCD_SIZE_H-60)+22) +AI_press_label_bt = lv.label(al_talk_end_screen_icon2) +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) +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_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) +style_green_screen = lv.style_t() +style_green_screen.init() +style_green_screen.set_radius(5) +style_green_screen.set_bg_color(lv.color_make(79,195,76)) +style_green_screen.set_bg_opa(255) +style_green_screen.set_border_width(0) +style_green_screen.set_pad_left(0) +style_green_screen.set_pad_right(0) +style_green_screen.set_pad_top(0) +style_green_screen.set_pad_bottom(0) + +style_font_28_green_bg_gray = lv.style_t() +style_font_28_green_bg_gray.init() +# style_font_28_green_bg_gray.set_bg_color(lv.color_make(79,195,76)) +# style_font_28_green_bg_gray.set_bg_opa(255) +# style_font_28_green_bg_gray.set_radius(5) +# style_font_28_green_bg_gray.set_border_width(0) +# style_font_28_green_bg_gray.set_pad_left(0) +# style_font_28_green_bg_gray.set_pad_right(0) +# 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_press_label_countdown = lv.label(AI_screen_list_screen) -AI_press_label_countdown.set_pos(30, 20) -AI_press_label_countdown.set_size(LCD_SIZE_W-30, 40) -AI_press_label_countdown.set_text(" ") -AI_press_label_countdown.set_long_mode(lv.label.LONG.WRAP) -AI_press_label_countdown.set_style_text_align(lv.TEXT_ALIGN.RIGHT, 0) -AI_press_label_countdown.add_style(style_font_20_ai_green, 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_label = lv.label(AI_screen_list_screen) -AI_label.set_pos(0, 90) -AI_label.set_size(LCD_SIZE_W-30, 120) -AI_label.set_text(" ") +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) +style_gray_screen.set_bg_color(lv.color_make(66,66,66)) #灰色背景 +style_gray_screen.set_bg_opa(255) +style_gray_screen.set_border_width(0) +style_gray_screen.set_pad_left(0) +style_gray_screen.set_pad_right(0) +style_gray_screen.set_pad_top(0) +style_gray_screen.set_pad_bottom(0) + +#灰色背景黑色字 +style_font_28_black_bg_gray = lv.style_t() +style_font_28_black_bg_gray.init() +# style_font_28_black_bg_gray.set_radius(5) +# style_font_28_black_bg_gray.set_bg_opa(255) +# style_font_28_black_bg_gray.set_border_width(0) +# style_font_28_black_bg_gray.set_pad_left(0) +# style_font_28_black_bg_gray.set_pad_right(0) +# style_font_28_black_bg_gray.set_pad_top(0) +# style_font_28_black_bg_gray.set_pad_bottom(0) +# style_font_28_black_bg_gray.set_bg_color(lv.color_make(66,66,66)) #字体文本颜色 +style_font_28_black_bg_gray.set_text_color(lv.color_make(153, 153, 153)) #字体文本颜色 +# style_font_28_black_bg_gray.set_text_font_v2("font_28.bin",28,0) +style_font_28_black_bg_gray.set_text_font(lv.K01_font_16_ALL) + +style_wechat_r_btn = lv.style_t() +style_wechat_r_btn.init() +style_wechat_r_btn.set_radius(5) +style_wechat_r_btn.set_bg_opa(255) +style_wechat_r_btn.set_border_width(0) +style_wechat_r_btn.set_pad_left(0) +style_wechat_r_btn.set_pad_right(0) +style_wechat_r_btn.set_pad_top(0) +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) + + +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.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_long_mode(lv.label.LONG.WRAP) AI_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) -AI_label.add_style(style_font_20_ai_white, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_label.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) + + + +#开始对话 +AI_talk_screen = lv.obj(AI_screen) +print("AI_talk_screen") +AI_talk_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_talk_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_talk_screen.set_pos(0, 0) +AI_talk_screen.set_size(LCD_SIZE_W, LCD_SIZE_H) + + +al_talk_screen_title1 = lv.label(AI_talk_screen) +al_talk_screen_title1.set_pos(0, 10) +al_talk_screen_title1.set_size(LCD_SIZE_W, 20) +al_talk_screen_title1.set_text("AI智能助手") +al_talk_screen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_talk_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_talk_screen_icon1 = lv.img(AI_talk_screen) +al_talk_screen_icon1.set_size(75,24) +al_talk_screen_icon1.set_pos((LCD_SIZE_W-75)//2,45) +al_talk_screen_icon1.set_src("U:/static/AI/AI_LISTEN_GIF001.png") +al_talk_screen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_talk_screen_icon = lv.img(AI_talk_screen) +al_talk_screen_icon.set_size(120,25) +al_talk_screen_icon.set_pos((LCD_SIZE_W-120)//2,95) +al_talk_screen_icon.set_src("U:/static/AI/ai_talk_bt.png") +al_talk_screen_icon.add_flag(lv.obj.FLAG.CLICKABLE) +al_talk_screen_icon.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_talk_screen_icon_btn = lv.label(AI_talk_screen) +al_talk_screen_icon_btn.set_text(" ") +al_talk_screen_icon_btn.set_size(LCD_SIZE_W, 38) +al_talk_screen_icon_btn.set_pos(0,90) +al_talk_screen_icon_btn.add_flag(lv.obj.FLAG.CLICKABLE) + +al_talk_screen_title4 = lv.label(al_talk_screen_icon) +al_talk_screen_title4.set_pos(0, 3) +al_talk_screen_title4.set_size(120, 33) +al_talk_screen_title4.set_text("开始对话") +al_talk_screen_title4.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_talk_screen_title4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +#没有网络数据 +AI_no_net_screen = lv.obj(AI_screen) +print("AI_no_net_screen") +AI_no_net_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_no_net_screen.set_pos(0, 0) +AI_no_net_screen.set_size(LCD_SIZE_W, LCD_SIZE_H) +AI_no_net_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + +al_no_sim_popup_screen_title1 = lv.label(AI_no_net_screen) +al_no_sim_popup_screen_title1.set_pos(0, 5) +al_no_sim_popup_screen_title1.set_size(LCD_SIZE_W, 20) +al_no_sim_popup_screen_title1.set_text("AI智能助手") +al_no_sim_popup_screen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_no_sim_popup_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_no_sim_popup_screen_icon = lv.img(AI_no_net_screen) +al_no_sim_popup_screen_icon.set_size(22,22) +al_no_sim_popup_screen_icon.set_pos((LCD_SIZE_W-22)//2,30) +al_no_sim_popup_screen_icon.set_src("U:/static/AI/ai_warning.png") +al_no_sim_popup_screen_icon.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_no_sim_popup_screen_title2 = lv.label(AI_no_net_screen) +al_no_sim_popup_screen_title2.set_pos(0, 56) +al_no_sim_popup_screen_title2.set_size(LCD_SIZE_W, 20) +al_no_sim_popup_screen_title2.set_text("启动失败") +al_no_sim_popup_screen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_no_sim_popup_screen_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_no_sim_popup_screen_title3 = lv.label(AI_no_net_screen) +al_no_sim_popup_screen_title3.set_pos(0, 76) +al_no_sim_popup_screen_title3.set_size(LCD_SIZE_W, 20) +al_no_sim_popup_screen_title3.set_text("请先开启移动数据") +al_no_sim_popup_screen_title3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_no_sim_popup_screen_title3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_no_sim_popup_screen_icon1 = lv.img(AI_no_net_screen) +al_no_sim_popup_screen_icon1.set_size(120,25) +al_no_sim_popup_screen_icon1.set_pos((LCD_SIZE_W-120)//2,96) +al_no_sim_popup_screen_icon1.set_src("U:/static/AI/ai_confirm_bt.png") +al_no_sim_popup_screen_icon1.add_flag(lv.obj.FLAG.CLICKABLE) +al_no_sim_popup_screen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_no_sim_popup_screen_title4 = lv.label(al_no_sim_popup_screen_icon1) +al_no_sim_popup_screen_title4.set_pos(0, 4) +al_no_sim_popup_screen_title4.set_size(120, 33) +al_no_sim_popup_screen_title4.set_text("确定") +al_no_sim_popup_screen_title4.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_no_sim_popup_screen_title4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +#正在聆听 +AI_listen_screen = lv.obj(AI_screen) +print("AI_listen_screen") +AI_listen_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_listen_screen.set_pos(0, 0) +AI_listen_screen.set_size(LCD_SIZE_W, LCD_SIZE_H) +AI_listen_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + +ai_talk_requestion_obj = lv.obj(AI_listen_screen) +ai_talk_requestion_obj.set_pos(15, 5) +ai_talk_requestion_obj.set_size(LCD_SIZE_W-25, 40) +ai_talk_requestion_obj.add_style(style_green_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_listen_screen_title1 = lv.label(ai_talk_requestion_obj) +al_listen_screen_title1.set_pos(0, 5) +al_listen_screen_title1.set_size(LCD_SIZE_W-25, 35) +al_listen_screen_title1.set_text("识别中...") +al_listen_screen_title1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +al_listen_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + +# al_listen_screen_icon1 = lv.gif(AI_listen_screen) +# al_listen_screen_icon1.set_size(140,45) +# al_listen_screen_icon1.set_pos((240-140)//2,110) +# # al_listen_screen_icon1.set_src("E:/static/AI/AI_LISTEN_GIF001.png") +# al_listen_screen_icon1.set_src("E:/static/AI/listen_gif.gif") + +# al_listen_screen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_listen_screen_icon1 = lv.img(AI_listen_screen) +al_listen_screen_icon1.set_size(75,24) +al_listen_screen_icon1.set_pos((LCD_SIZE_W-75)//2,60) +al_listen_screen_icon1.set_src("U:/static/AI/AI_LISTEN_GIF001.png") +# al_listen_screen_icon1.set_src("E:/static/AI/listen_gif.gif") +al_listen_screen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +# al_listen_screen_icon = lv.img(AI_listen_screen) +# al_listen_screen_icon.set_size(230,58) +# al_listen_screen_icon.set_pos((240-230)//2,210) +# 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_title4 = lv.label(AI_listen_screen) +al_listen_screen_title4.set_pos(0, 100) +al_listen_screen_title4.set_size(LCD_SIZE_W, 28) +al_listen_screen_title4.set_text("正在聆听...") +al_listen_screen_title4.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_listen_screen_title4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +#正在思考 +AI_think_screen = lv.obj(AI_screen) +print("AI_think_screen") +AI_think_screen.set_pos(0, 0) +AI_think_screen.set_size(LCD_SIZE_W, LCD_SIZE_H) +AI_think_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_think_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 +al_think_screen_title1 = lv.label(AI_think_screen) +al_think_screen_title1.set_pos(0, 5) +al_think_screen_title1.set_size(LCD_SIZE_W, 20) +al_think_screen_title1.set_text("正在思考...") +al_think_screen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_think_screen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +# al_think_screen_icon = lv.gif(AI_think_screen) +# al_think_screen_icon.set_size(130,130) +# al_think_screen_icon.set_pos((240-130)//2,65) +# # al_think_screen_icon.set_src("E:/static/AI/AI_THINK001.png") +# al_think_screen_icon.set_src("E:/static/AI/think_gif.gif") +# al_think_screen_icon.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_think_screen_icon = lv.img(AI_think_screen) +al_think_screen_icon.set_size(66,66) +al_think_screen_icon.set_pos((LCD_SIZE_W-66)//2,25) +al_think_screen_icon.set_src("U:/static/AI/AI_THINK001.png") +# al_think_screen_icon.set_src("E:/static/AI/think_gif.gif") + +al_think_screen_icon.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_think_screen_icon1 = lv.img(AI_think_screen) +al_think_screen_icon1.set_size(120,25) +al_think_screen_icon1.set_pos((LCD_SIZE_W-120)//2,95) +al_think_screen_icon1.set_src("U:/static/AI/ai_confirm_bt.png") +al_think_screen_icon1.add_flag(lv.obj.FLAG.CLICKABLE) +al_think_screen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_think_screen_icon1_bt = lv.label(AI_think_screen) +al_think_screen_icon1_bt.set_text(" ") +al_think_screen_icon1_bt.set_size(120, 38) +al_think_screen_icon1_bt.set_pos(0,90) +al_think_screen_icon1_bt.add_flag(lv.obj.FLAG.CLICKABLE) + + +al_think_screen_title4 = lv.label(al_think_screen_icon1) +al_think_screen_title4.set_pos(0, 3) +al_think_screen_title4.set_size(120, 33) +al_think_screen_title4.set_text("取消") +al_think_screen_title4.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_think_screen_title4.add_style(style_font_youyuan_ai_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +# #连接超时 +AI_connect_timerout_screen = lv.obj(AI_screen) +AI_connect_timerout_screen.set_pos(0, 0) +AI_connect_timerout_screen.set_size(LCD_SIZE_W, LCD_SIZE_H) +print("AI_connect_timerout_screen") +AI_connect_timerout_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_connect_timerout_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + +al_connect_timerout_title1 = lv.label(AI_connect_timerout_screen) +al_connect_timerout_title1.set_pos(0, 5) +al_connect_timerout_title1.set_size(LCD_SIZE_W, 20) +al_connect_timerout_title1.set_text("AI智能助手") +al_connect_timerout_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_connect_timerout_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_connect_timerout_icon = lv.img(AI_connect_timerout_screen) +al_connect_timerout_icon.set_size(22,22) +al_connect_timerout_icon.set_pos((LCD_SIZE_W-22)//2,30) +al_connect_timerout_icon.set_src("U:/static/AI/ai_warning.png") +al_connect_timerout_icon.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_connect_timerout_title2 = lv.label(AI_connect_timerout_screen) +al_connect_timerout_title2.set_pos(0, 56) +al_connect_timerout_title2.set_size(LCD_SIZE_W, 20) +al_connect_timerout_title2.set_text("连接超时") +al_connect_timerout_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_connect_timerout_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_connect_timerout_title3 = lv.label(AI_connect_timerout_screen) +al_connect_timerout_title3.set_pos(0, 76) +al_connect_timerout_title3.set_size(LCD_SIZE_W, 20) +al_connect_timerout_title3.set_text("请重新对话") +al_connect_timerout_title3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_connect_timerout_title3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_connect_timerout_icon1 = lv.img(AI_connect_timerout_screen) +al_connect_timerout_icon1.set_size(120,25) +al_connect_timerout_icon1.set_pos((LCD_SIZE_W-120)//2,96) +al_connect_timerout_icon1.set_src("U:/static/AI/ai_confirm_bt.png") +al_connect_timerout_icon1.add_flag(lv.obj.FLAG.CLICKABLE) +al_connect_timerout_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_connect_timerout_icon1_bt = lv.label(AI_connect_timerout_screen) +al_connect_timerout_icon1_bt.set_text(" ") +al_connect_timerout_icon1_bt.set_size(120, 38) +al_connect_timerout_icon1_bt.set_pos(0,90) +al_connect_timerout_icon1_bt.add_flag(lv.obj.FLAG.CLICKABLE) + +al_connect_timerout_title4 = lv.label(al_connect_timerout_icon1) +al_connect_timerout_title4.set_pos(0, 4) +al_connect_timerout_title4.set_size(120, 33) +al_connect_timerout_title4.set_text("确定") +al_connect_timerout_title4.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_connect_timerout_title4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) +#未检测到录音 +AI_not_listen_text_screen = lv.obj(AI_screen) +AI_not_listen_text_screen.set_pos(0, 0) +AI_not_listen_text_screen.set_size(LCD_SIZE_W, LCD_SIZE_H) +print("AI_not_listen_text_screen") +AI_not_listen_text_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +AI_not_listen_text_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) +AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + +al_not_listen_title1 = lv.label(AI_not_listen_text_screen) +al_not_listen_title1.set_pos(0, 5) +al_not_listen_title1.set_size(LCD_SIZE_W, 20) +al_not_listen_title1.set_text("AI智能助手") +al_not_listen_title1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_not_listen_title1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_not_listen_icon = lv.img(AI_not_listen_text_screen) +al_not_listen_icon.set_size(22,22) +al_not_listen_icon.set_pos((LCD_SIZE_W-22)//2,30) +al_not_listen_icon.set_src("U:/static/AI/ai_warning.png") +al_not_listen_icon.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_not_listen_title2 = lv.label(AI_not_listen_text_screen) +al_not_listen_title2.set_pos(0, 56) +al_not_listen_title2.set_size(LCD_SIZE_W, 20) +al_not_listen_title2.set_text("未检测到录音数据") +al_not_listen_title2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_not_listen_title2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_not_listen_title3 = lv.label(AI_not_listen_text_screen) +al_not_listen_title3.set_pos(0, 76) +al_not_listen_title3.set_size(LCD_SIZE_W, 20) +al_not_listen_title3.set_text("请重新对话") +al_not_listen_title3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_not_listen_title3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + + +al_not_listen_icon1 = lv.img(AI_not_listen_text_screen) +al_not_listen_icon1.set_size(120,25) +al_not_listen_icon1.set_pos((LCD_SIZE_W-120)//2,96) +al_not_listen_icon1.set_src("U:/static/AI/ai_confirm_bt.png") +al_not_listen_icon1.add_flag(lv.obj.FLAG.CLICKABLE) +al_not_listen_icon1.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +al_not_listen_icon1_bt = lv.label(AI_not_listen_text_screen) +al_not_listen_icon1_bt.set_text(" ") +al_not_listen_icon1_bt.set_size(120, 38) +al_not_listen_icon1_bt.set_pos(0,90) +al_not_listen_icon1_bt.add_flag(lv.obj.FLAG.CLICKABLE) + +al_not_listen_title4 = lv.label(al_not_listen_icon1) +al_not_listen_title4.set_pos(0, 4) +al_not_listen_title4.set_size(120, 33) +al_not_listen_title4.set_text("确定") +al_not_listen_title4.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +al_not_listen_title4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) class AIScreen(Screen):#AI_GUI # NAME = "AI_success" @@ -172,15 +624,14 @@ class AIScreen(Screen):#AI_GUI def __init__(self): super().__init__() self.meta = AI_screen - self.meta_type = "popup" + # self.meta_type = "popup" self.Audio_buf_size = 8*1024 self.record_timer = osTimer() self.record = audio.Record() #self.record.end_callback(self.record_callback) self.record.gain_set(4,10) self.aud = audio.Audio(0) - self.audio_play_start = 0 - self.audio_play_state = 0 #音频播放完状态 + self.audio_play_state = 1 #音频播放完状态 self.aud.setCallback(self.audio_cb) self.TTS_PRO_TYPE = 0 #TTS协议类型,=0:用长文本合成接口,=1用音频流合成接口 @@ -208,25 +659,324 @@ class AIScreen(Screen):#AI_GUI self.AI_client_tts_tra_flag = 0 self.AI_client_tts_full_sentence_flag = 0 #完整的句子标识 self.tts_time_count = 0 + self.tts_time_outcount = 0 + self.timer_out_count = 0 + self.img_show_count = 0 + self.img_show_count_tmp = 0 + self.img_show_count_flag = 0 self.tts_data_tmp = bytes() self.press_state = 0 + self.AI_label_answer = "" self.AI_label_str = "" self.AI_client_tts_play_data_len = 0 + self.refresh_texttimer = osTimer() + self.AI_listen_text = "" + self.AI_listen_end = 0 #语音识别完成 + self.refresh_count = 0 self.AI_send_data_queue = Queue(100) self.AI_audio_queue = Queue(100) - # AI_press_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.talking_cb(e)), - # lv.EVENT.LONG_PRESSED, None) - # AI_press_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.sending_cb(e)), - # lv.EVENT.RELEASED, None) - AI_press_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.talking_cb(e)), - lv.EVENT.RELEASED, None) + + AI_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), + lv.EVENT.GESTURE, None) + + al_talk_screen_icon.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), + lv.EVENT.SHORT_CLICKED, None) + al_talk_screen_icon_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), + lv.EVENT.SHORT_CLICKED, None) + + al_no_sim_popup_screen_icon1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)), lv.EVENT.SHORT_CLICKED, None) #无网络按钮 + + # al_listen_screen_icon_bt.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,3)), lv.EVENT.SHORT_CLICKED, None) #说话完成按钮 + # al_listen_screen_icon.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,3)), lv.EVENT.SHORT_CLICKED, None) #说话完成按钮 + + al_think_screen_icon1_bt.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,4)), lv.EVENT.SHORT_CLICKED, None) #思考界面取消按钮 + al_think_screen_icon1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,4)), lv.EVENT.SHORT_CLICKED, None) #思考界面取消按钮 + + al_connect_timerout_icon1_bt.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,5)), lv.EVENT.SHORT_CLICKED, None) #连接超时 请重新对话按钮 + al_connect_timerout_icon1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,5)), lv.EVENT.SHORT_CLICKED, None) #连接超时 请重新对话按钮 + + al_talk_end_screen_cancel_bt.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,6)), lv.EVENT.SHORT_CLICKED, None) #对话结束 取消对话按钮 + al_talk_end_screen_icon1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,6)), lv.EVENT.SHORT_CLICKED, None) #对话结束 取消对话按钮 + + AI_press_label_bt.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,7)), lv.EVENT.SHORT_CLICKED, None) #对话结束 继续对话按钮 + al_talk_end_screen_icon2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,7)), lv.EVENT.SHORT_CLICKED, None) #对话结束 继续对话按钮 + + 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) + def button_cb(self,e,msg): + code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + if (AI_talk_end_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or (AI_listen_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or\ + (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") + elif code == lv.EVENT.SHORT_CLICKED: + if msg == 1: + self.talking_cb(e) + pass + elif msg == 2: + self.img_cb(e) + pass + elif msg == 3: + self.listen_end_btcb(e) + pass + elif msg == 4: + self.think_bt_cb(e) + pass + elif msg == 5: + self.talk_end_continue_cb(e) + pass + elif msg == 6: + self.talk_end_cancel_cb(e) + pass + elif msg == 7: + self.talk_end_continue_cb(e) + pass + elif msg == 8: + self.talk_end_continue_cb(e) + pass + + def clear_flag(self): #清标识 + self.timer_out_count = 0 + self.img_show_count = 0 + self.img_show_count_tmp = 0 + self.img_show_count_flag = 0 + self.AI_listen_end = 0 #语音识别完成 + self.refresh_count = 0 + self.AI_listen_text = "" + self.AI_label_str = "" + self.AI_label_answer = "" + self.tts_time_count = 0 + self.tts_time_outcount = 0 + + def talk_end_cancel_cb(self,e):#对话结束已经播放音频取消继续对话按钮 + self.Close() + self.AI_label_answer = "" + 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_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) # + + + def talk_end_continue_cb(self,e):#连接超时确定按钮回调或者继续对话按钮 + self.Close() + self.AI_label_answer = "" + AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏 + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_listen_screen.clear_flag(lv.obj.FLAG.HIDDEN) + al_listen_screen_title1.set_text("识别中...") + al_listen_screen_icon1.set_src("U:/static/AI/AI_LISTEN_GIF001.png") + self.AI_client_tts_timer.start(1000,1,self.AI_client_tts_timer_cb) + EventMesh.publish("publish_message_event_ui",{"func":self.talking,"data":e}) + + pass + + def talk_connectout_cb(self,e):#连接超时确定按钮回调 + + pass + + def think_bt_cb(self,e):#正在思考确定按钮回调 取消播放 + self.Close() + 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_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) # + + pass + + def not_talk_cb(self):#没有说话或者没有检测到录音数据 + self.Close() + AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏 + AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_not_listen_text_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + + + def listen_end_btcb(self,e):#说话完成确定按钮回调 + if self.AI_listen_end == 1:#说话完成 已有录音文字返回 + self.AI_listen_end = 0 + self.refresh_count = 0 + self.refresh_texttimer.stop() + self.record.stop()#关闭录音 + self.record_timer.stop()#关闭定时器 + if self.AI_listen_text != "": + self.AI_client_chat_send(self.AI_listen_text) + print("self.AI_listen_text:{}".format(self.AI_listen_text)) + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_think_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + al_think_screen_icon.set_src("U:/static/AI/AI_THINK009.png") + self.refresh_count = 0 + self.timer_out_count = 0 + self.img_show_count = 0 + self.img_show_count_tmp = 0 + self.img_show_count_flag = 0 + self.refresh_texttimer.start(500,1,self.text_show_think) + else: + self.not_talk_cb() + return + try: + self.websocket_deconnect_asr() + except Exception as e: + usys.print_exception(e) + return + else:#没有识别到录音文字 + 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 = "" + AI_end_screen_list_screen.scroll_to(0, 0, lv.ANIM.OFF) + AI_label.set_text(self.AI_label_answer) + AI_label.set_text("语音识别中...") + + # self.AI_listen_text = "嗯。" + str_len = len(self.AI_listen_text)*20 + if str_len > 165: + str_len = 165 + print("len:{} str_len:{} self.AI_listen_text:{}\r\n".format(len(self.AI_listen_text),str_len,self.AI_listen_text)) + # AI_end_screen_list_detail_screen1.set_pos(170-str_len,10) + + # AI_listen_text.set_size(str_len,lv.SIZE.CONTENT) + + # AI_listen_text.set_pos(0, 10) + # AI_listen_text.set_size(str_len,lv.SIZE.CONTENT) + 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")#防止黑屏 + + 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) + + pass + + def connect_timerout_popup(self,msg):#连接超时弹窗提示 + self.Close() + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏 + AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_connect_timerout_screen.clear_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + if msg == 1: #连接超时 + al_connect_timerout_title2.set_text("连接超时") + else: + al_connect_timerout_title2.set_text("网络连接异常") + + + 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() + return + if self.AI_label_str != "": + self.timer_out_count = 1 + self.img_show_count_flag = 1 + self.refresh_texttimer.stop() + self.ai_talk_end() + return + EventMesh.publish("system_sleep_rest")#防止黑屏 + self.timer_out_count += 1 + if self.timer_out_count > 2*30: #说话了服务器没有返回结果数据 + self.timer_out_count = 0 + #连接超时 + self.img_show_count = 0 + self.img_show_count_tmp = 0 + self.connect_timerout_popup(1) + return + + if self.img_show_count > 10: + self.img_show_count_tmp+=1 + self.img_show_count_tmp = self.img_show_count-self.img_show_count_tmp + if self.img_show_count_tmp >= 10: + self.img_show_count = 1 + al_think_screen_icon.set_src("U:/static/AI/AI_THINK{}.png".format("%03d"%(self.img_show_count_tmp))) + else: + self.img_show_count+=1 + self.img_show_count_tmp = 0 + al_think_screen_icon.set_src("U:/static/AI/AI_THINK{}.png".format("%03d"%(self.img_show_count))) + + + self.refresh_count+=1 + if self.refresh_count > 3: + self.refresh_count = 0 + if self.refresh_count == 1: + al_think_screen_title1.set_text("正在思考.") + elif self.refresh_count == 2: + al_think_screen_title1.set_text("正在思考..") + elif self.refresh_count == 3: + al_think_screen_title1.set_text("正在思考...") + pass + def img_cb(self,e): #无网络 无数据按钮回调 + self.refresh_texttimer.stop() + 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_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + pass def initialization(self): self.TTS_PRO_TYPE = 0 + 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_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #开启显示 + 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.AI_label_answer = "" self.AI_client_chat_play_str = '' - #测试代码 - # self.AI_client_chat_play_str =ai_tts_str_tmp - # self.AI_init() + self.AI_init() self.AI_client_tts_data_len = 0 self.AI_client_tts_data_total_len = 0 self.AI_client_tts_str_total_len = 0 @@ -242,40 +992,141 @@ class AIScreen(Screen):#AI_GUI def audio_cb(self,event): if event == 0: self.audio_play_state =1 - #print('audio-play start.') + EventMesh.publish("set_audio_state", 1) + print('audio-play start.') elif event == 7: self.audio_play_state = 0 - # if self.AI_audio_queue.size() > 0: - # data = self.AI_audio_queue.get() - # print("audio_queue:data:{}".format(len(data))) - # if len(data) > 1: - # try: - # # while self.audio_play_state : - # # utime.sleep_ms(1) - # EventMesh.publish("system_sleep_rest")#防止黑屏 - # tmp=self.aud.playStream(3, data)#播放音频流文件 - # self.audio_play_state =1 - # print("playStream:{}".format(tmp)) - # except Exception as e: - # usys.print_exception(e) - #print('audio-play finish.') - def AI_init(self,): + EventMesh.publish("set_audio_state", 0) + print('audio-play finish.') + 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.AI_client_tts_timer.start(1000,1,self.AI_client_tts_timer_cb) + #按下录音 def talking_cb(self,e): - #print("talking_cb") - EventMesh.publish("publish_message_event_ui",{"func":self.talking,"data":e}) + self.press_state = 0 + self.refresh_count = 0 + self.refresh_texttimer.stop() + signal = EventMesh.publish("screen_get_sig") + if signal == -1 or EventMesh.publish("get_sim_Status") != 1:#网络不正常 + AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) + AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_no_net_screen.clear_flag(lv.obj.FLAG.HIDDEN) #开启显示 + al_no_sim_popup_screen_title3.set_text("无SIM卡") + + elif signal == None or signal == 0 or signal == 99: + AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) + AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_no_net_screen.clear_flag(lv.obj.FLAG.HIDDEN) #开启显示 + al_no_sim_popup_screen_title3.set_text("请先开启移动数据") + + else: + AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) #隐藏 + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_think_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_listen_screen.clear_flag(lv.obj.FLAG.HIDDEN) + al_listen_screen_title1.set_text("识别中...") + al_listen_screen_icon1.set_src("U:/static/AI/AI_LISTEN_GIF001.png") + self.timer_out_count = 0 + self.refresh_count = 0 + self.img_show_count = 0 + self.img_show_count_tmp = 0 + + 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) + try: + self.websocket_deconnect_asr() + except Exception as e: + usys.print_exception(e) + + + def text_show_refresh_cb(self,data): + if self.AI_listen_end == 1 or self.timer_out_count >= 120:#语音识别结束 + self.record.stop()#关闭录音 + self.record_timer.stop()#关闭定时器 + if self.AI_listen_text != "": + self.img_show_count_tmp+=1 + if self.img_show_count_tmp > 2: + self.AI_listen_end = 0 + self.refresh_count = 0 + self.refresh_texttimer.stop() + self.timer_out_count = 0 + print("self.AI_listen_text:{}".format(self.AI_listen_text)) + #正在思考 + AI_talk_end_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_listen_screen.add_flag(lv.obj.FLAG.HIDDEN) + AI_talk_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_no_net_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_connect_timerout_screen.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + AI_not_listen_text_screen.add_flag(lv.obj.FLAG.HIDDEN) # + AI_think_screen.clear_flag(lv.obj.FLAG.HIDDEN) # + al_think_screen_icon.set_src("U:/static/AI/AI_THINK009.png") + self.refresh_count = 0 + self.timer_out_count = 0 + self.img_show_count = 0 + self.img_show_count_tmp = 0 + self.img_show_count_flag = 0 + self.refresh_texttimer.start(500,1,self.text_show_think) + else: + + self.not_talk_cb() + return + try: + self.websocket_deconnect_asr() + except Exception as e: + usys.print_exception(e) + return + + EventMesh.publish("system_sleep_rest")#防止黑屏 + self.timer_out_count += 1 + + self.img_show_count+=1 + if self.img_show_count > 11: + self.img_show_count = 1 + # print("self.img_show_count:{}\r\n".format(self.img_show_count)) + al_listen_screen_icon1.set_src("U:/static/AI/AI_LISTEN_GIF{}.png".format("%03d"%(self.img_show_count))) + + self.refresh_count+=1 + if self.refresh_count > 3: + self.refresh_count =0 + if self.refresh_count == 1: + al_listen_screen_title4.set_text("正在聆听.") + elif self.refresh_count == 2: + al_listen_screen_title4.set_text("正在聆听..") + elif self.refresh_count == 3: + al_listen_screen_title4.set_text("正在聆听...") + pass #按下录音 def talking(self,e): #self.AI_client_tts_send("创建客户端, debug=True输出日志")#TTS语音播放AI结果 #return if 1:#EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机 - if 1:#self.audio_play_start == 0: - self.audio_play_start = 1 + if 1:#self.audio_play_state == 0: + self.audio_play_state = 1 print("talking1") #self.AI_list.add_flag(lv.obj.FLAG.HIDDEN)#隐藏列表选项方框 try: @@ -283,19 +1134,21 @@ class AIScreen(Screen):#AI_GUI self.Close() print("talking3") self.AI_init() + self.AI_client_tts_timer.start(1000,1,self.AI_client_tts_timer_cb) except Exception as e: - usys.print_exception(e) + usys.print_exception(e) + al_listen_screen_title1.set_text("识别中...") self.record.stream_start(audio.Record.AMRNB, 8000, 60) self.record_timer.start(1*1000,1,self.record_timer_cb) + self.refresh_texttimer.start(500,1,self.text_show_refresh) #self.AI_list.add_flag(lv.obj.FLAG.HIDDEN)#隐藏列表选项方框 - AI_label.clear_flag(lv.obj.FLAG.HIDDEN) - - AI_press_label_countdown.clear_flag(lv.obj.FLAG.HIDDEN) - #AI_press_label_countdown.set_text("{}S".format(str(self.countdown))) + + # AI_label.clear_flag(lv.obj.FLAG.HIDDEN) + # AI_label.set_text("语音识别中...") + # AI_listen_text.clear_flag(lv.obj.FLAG.HIDDEN) + #AI_listen_text.set_text("{}S".format(str(self.countdown))) self.press_state = 1 self.AI_client_asr_start() - AI_label.set_text("语音识别中...") - print("talking7") else: EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) @@ -309,15 +1162,15 @@ class AIScreen(Screen):#AI_GUI self.record_timer.stop()#关闭定时器 # self.record.stream_start(audio.Record.AMRNB, 8000, 2) # self.record_timer.start(2*1000,0,self.record_timer_cb) - AI_label.clear_flag(lv.obj.FLAG.HIDDEN) + # AI_label.clear_flag(lv.obj.FLAG.HIDDEN) #AI_label.set_text(" ") - AI_press_label_countdown.clear_flag(lv.obj.FLAG.HIDDEN) - #AI_press_label_countdown.set_text(" ") + # AI_listen_text.clear_flag(lv.obj.FLAG.HIDDEN) + #AI_listen_text.set_text(" ") #Wechat_log("sending_cb1") #EventMesh.publish("publish_message_event_ui",{"func":self.sending,"data":e}) #self.sending(e) #Wechat_log("sending_cb2") - self.audio_play_start = 0 + self.audio_play_state = 0 else: self.press_state = 0 #EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) @@ -351,7 +1204,13 @@ class AIScreen(Screen):#AI_GUI print("websocket_connect_chat:{}!!!!!!!!!!!!!!!!!!!!!".format(self.AI_client_chat_isconnect)) #if self.AI_client_chat_isconnect == 0: # 创建客户端, debug=True输出日志, ip和端口需要自己填写, 或者是域名 - self.AI_client_chat = uwebsocket.Client.connect('ws://121.40.67.151:9099/chat/ws', debug=False) + try: + self.AI_client_chat = uwebsocket.Client.connect('ws://121.40.67.151:9099/chat/ws', debug=False) + except Exception as e: #网络连接异常 + usys.print_exception(e) + print("websocket_connect_chat error!!!\r\n") + self.connect_timerout_popup(2) + return # 线程接收数据 if self.AI_client_chat_recv_id != 0: try: @@ -392,13 +1251,14 @@ class AIScreen(Screen):#AI_GUI print("AI_client_chat_recv chat_data = {}".format(chat_data)) self.AI_label_str+=str(chat_data) self.AI_client_chat_play_str+=str(chat_data) + self.think_end_result() if self.TTS_PRO_TYPE == 1: AI_label.set_text(self.AI_label_str) - EventMesh.publish("system_sleep_rest")#防止黑屏 + # EventMesh.publish("system_sleep_rest")#防止黑屏 else: # if self.AI_label_str: # self.AI_client_tts_send(self.AI_label_str)#TTS语音播放AI结果 - + print("AI_client_chat_recv chat_data start\r\n") if jsload_data['type']=='start': self.AI_label_str = "" self.AI_client_chat_end_flag = 0 @@ -418,9 +1278,17 @@ class AIScreen(Screen):#AI_GUI ############################################################################## #文字转语音链路 def websocket_connect_tts(self): - #print("websocket_connect_tts:{}!!!!!!!!!!!!!!!!!!!!!!".format(self.AI_client_tts_isconnect)) + print("websocket_connect_tts:{}!!!!!!!!!!!!!!!!!!!!!!".format(self.AI_client_tts_isconnect)) if self.AI_client_tts_isconnect == 0: - self.AI_client_tts = uwebsocket.Client.connect('ws://121.40.67.151:9099/tts/long-text-stream', debug=False) + 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) + except Exception as e: #网络连接异常 + usys.print_exception(e) + print("websocket_connect_tts ERROR:{}\r\n".format(e)) + self.connect_timerout_popup(2) + return + print("websocket_connect_tts:self.AI_client_tts {}\r\n".format(self.AI_client_tts)) # 线程接收数据 if self.AI_client_tts_recv_id != 0: try: @@ -441,32 +1309,35 @@ class AIScreen(Screen):#AI_GUI except Exception as e: usys.print_exception(e) def AI_client_tts_timer_cb(self,*argc): - EventMesh.publish("system_sleep_rest")#防止黑屏 + # EventMesh.publish("system_sleep_rest")#防止黑屏 self.tts_time_count+=1 + if self.TTS_PRO_TYPE == 1: #tts数据入队 self.AI_client_tts_put_data() - #print("AI_audio_queue.size:{},AI_send_data_queue.size:{},AI_client_chat_play_str_len:{}".format(self.AI_audio_queue.size(),self.AI_send_data_queue.size(),len(self.AI_client_chat_play_str)) ) - + print("AI_audio_queue.size:{},AI_send_data_queue.size:{} self.AI_client_chat_play_str:{} self.AI_client_tts_tra_flag:{}\r\n".format(self.AI_audio_queue.size(),self.AI_send_data_queue.size(),self.AI_client_chat_play_str,self.AI_client_tts_tra_flag) ) #字符串分段发送,等待播放缓存变小 - if len(self.AI_client_chat_play_str) >0 and self.AI_client_tts_data_len < 200*1024 :#and (self.AI_client_tts_str_total_len <100 or self.AI_client_tts_str_total_len - self.AI_client_tts_data_total_len//672 < 60)缓存200k以下,且tts发送文字字节数比返回音频数据少60字节 + if len(self.AI_client_chat_play_str) > 0 and self.AI_client_tts_data_len < 150*1024 :#and (self.AI_client_tts_str_total_len <100 or self.AI_client_tts_str_total_len - self.AI_client_tts_data_total_len//672 < 60)缓存200k以下,且tts发送文字字节数比返回音频数据少60字节 + + self.tts_time_outcount+=1 # play_str = split_string(self.AI_client_chat_play_str,40)# # if play_str =="":#没找到句号或者逗号,切割字符串 if self.TTS_PRO_TYPE == 1: 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:#存了超过4句,就等小于3次在转化 + 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次在转化 return - play_str = split_string(self.AI_client_chat_play_str,70,150)#按逗号,句号切割 - if play_str =="" or len(play_str)>150:#没找到句号或者逗号,切割字符串 + play_str = split_string(self.AI_client_chat_play_str,50,100)#按逗号,句号切割 + if play_str =="" or len(play_str) > 100:#没找到句号或者逗号,切割字符串 play_str = sub_utf8_String(self.AI_client_chat_play_str,100)#按中文切割字符串 self.AI_client_tts_tra_flag = 1 self.AI_client_tts_str_sen = play_str - + if len(play_str) == 0: + 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)) + 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 : self.AI_client_chat_end_flag=0 self.AI_client_tts_end() @@ -509,12 +1380,9 @@ class AIScreen(Screen):#AI_GUI #self.AI_client_tts_str_sen = "" if self.TTS_PRO_TYPE == 1: - #self.AI_audio_queue.clear() self.AI_client_tts_tra_flag = 1 self.AI_client_tts.send(json_data) utime.sleep_ms(100) - # if self.TTS_PRO_TYPE == 0: - # self.AI_client_tts_tra_flag = 0 #self.AI_send_data_queue.put([self.AI_client_tts_num,json_data]) def AI_client_tts_end(self): if self.TTS_PRO_TYPE == 1: @@ -529,21 +1397,15 @@ class AIScreen(Screen):#AI_GUI or (self.AI_client_tts_full_sentence_flag == 1 and self.AI_client_tts_tra_flag == 1 and len(self.tts_data_tmp) >5*1024): self.AI_client_tts_full_sentence_flag == 0 #self.AI_client_tts_data_len +=len(self.tts_data_tmp) - #print("AI_client_tts_put_data1") if self.AI_client_tts_tra_flag == 1:#第一个数据去掉头 self.tts_data_tmp = self.tts_data_tmp[9:] - #print("AI_client_tts_put_data2") if len(self.tts_data_tmp)>0: - #print("AI_client_tts_put_data3") - tmp = self.AI_audio_queue.put([self.tts_data_tmp,self.AI_client_tts_str_sen]) - #print("AI_client_tts_put_data4") - print("入:tmp:{},{},{},{}".format(tmp,len(self.tts_data_tmp),self.AI_client_tts_data_len,len(self.AI_client_tts_str_sen))) - print("AI_audio_queue.size:{},AI_send_data_queue.size:{},AI_client_chat_play_str_len:{}".format(self.AI_audio_queue.size(),self.AI_send_data_queue.size(),len(self.AI_client_chat_play_str)) ) + self.AI_audio_queue.put([self.tts_data_tmp,self.AI_client_tts_str_sen]) + print("入:{},{}".format(len(self.tts_data_tmp),self.AI_client_tts_data_len)) self.tts_time_count = 0 self.tts_data_tmp = b'' if self.TTS_PRO_TYPE == 1: self.AI_client_tts_tra_flag = 0 - #print("AI_client_tts_put_data5") #文字转语音链路读数据 def AI_client_tts_recv(self,cli): recv_data_len_same_count = 0 @@ -555,24 +1417,30 @@ class AIScreen(Screen):#AI_GUI recv_data = cli.recv() if not recv_data: # 服务器关闭连接或客户端关闭连接 - #print("AI_client_tts_recv close!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\r\n") - #print("AI_client_tts_recv close!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\r\n") + print("AI_client_tts_recv close!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\r\n") + print("AI_client_tts_recv close!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\r\n") break try: - #print("AI_client_tts_recv :{}".format(len(recv_data))) + print("AI_client_tts_recv :{}".format(len(recv_data))) #结束标志{"header":{"event":"EndSynthesis","msg":"success","status":20000000,"task_id":"ffd727e620000803280c5a6498d0e321"}} - if isinstance(recv_data, str): print("AI_client_tts_recv:str recv_data:{}".format(recv_data)) if recv_data.find('\"event\":\"EndSynthesis\"') != -1: print("EndSynthesis!!!!!!!!!!!!!!!!!\r\n") - # + print("EndSynthesis!!!!!!!!!!!!!!!!!!\r\n") #self.tts_data_tmp=self.tts_data_tmp[9:-100] - self.websocket_deconnect_tts()#断开 + try: + self.websocket_deconnect_tts()#断开 + except Exception as e: #网络连接异常 + usys.print_exception(e) + + self.tts_time_count = 60#立即发送剩余数据 self.AI_client_tts_put_data() + self.AI_client_tts_full_sentence_flag = 1 - #print("EndSynthesis!!!!!!!!!!!!!!!!!!\r\n") + break + if recv_data.find('\"msg\":\"success\"') == -1: break else: #判断是否是一个完整的句子 @@ -612,7 +1480,14 @@ class AIScreen(Screen):#AI_GUI self.websocket_deconnect_asr()#先断一次,预防出错 except Exception as e: usys.print_exception(e) - self.AI_client_asr = uwebsocket.Client.connect('ws://121.40.67.151:9099/asr/ws', debug=False) + + try: + self.AI_client_asr = uwebsocket.Client.connect('ws://121.40.67.151:9099/asr/ws', debug=False) + except Exception as e: #网络连接异常 + usys.print_exception(e) + print("websocket_connect_asr error!!!\r\n") + self.connect_timerout_popup(2) + return # 线程接收数据 if self.AI_client_asr_recv_id != 0: try: @@ -630,6 +1505,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}}"]) #语音转文字链路读数据 def AI_client_asr_recv(self,cli): @@ -651,21 +1527,29 @@ class AIScreen(Screen):#AI_GUI if jsload_data["result"] == None: continue if jsload_data["result"]["result"]: - AI_press_label_countdown.set_text(str(jsload_data["result"]["result"])) + self.AI_listen_text = str(jsload_data["result"]["result"]) + al_listen_screen_title1.set_text(str(jsload_data["result"]["result"])) + # AI_listen_text.set_text(str(jsload_data["result"]["result"])) if jsload_data["result"]["is_end"] == True: #{"type":"chat","content":"你好"} + self.AI_listen_end = 1 + self.audio_play_state = 0 + self.talk_ars_end() + break #chat_data = bytearray(chat_data_str) - AI_label.set_text("思考中...") - self.AI_client_chat_send(str(jsload_data["result"]["result"])) - print("chat_data:{}".format(str(jsload_data["result"]["result"]))) - self.record.stop()#关闭录音 - self.record_timer.stop()#关闭定时器 - try: - self.websocket_deconnect_asr() - break - except Exception as e: - usys.print_exception(e) + # AI_label.set_text("思考中...") + # self.AI_client_chat_send(str(jsload_data["result"]["result"])) + # print("chat_data:{}".format(str(jsload_data["result"]["result"]))) + # self.record.stop()#关闭录音 + # self.record_timer.stop()#关闭定时器 + + # try: + # self.websocket_deconnect_asr() + # break + # except Exception as e: + # usys.print_exception(e) elif jsload_data["result"]["is_end"] == False: - AI_label.set_text("语音识别中...") + self.AI_listen_end = 0 + # AI_label.set_text("语音识别中...") except Exception as e: print("error recv_data:{}".format(recv_data)) usys.print_exception(e) @@ -692,28 +1576,43 @@ class AIScreen(Screen):#AI_GUI #data[0].send(data[1]) if data[0] == self.AI_client_chat_num: if self.AI_client_chat_isconnect == 0: - self.websocket_connect_chat() + try: + self.websocket_connect_chat() + except Exception as e: #网络连接异常 + usys.print_exception(e) 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 self.AI_client_asr_isconnect == 0: - self.websocket_connect_asr() + try: + self.websocket_connect_asr() + except Exception as e: #网络连接异常 + usys.print_exception(e) print("asr send_data:{}".format(len(data[1]))) self.AI_client_asr.send(data[1]) if data[0] == self.AI_client_tts_num: if self.AI_client_tts_isconnect == 0: - self.websocket_connect_tts() - #print("tts send_data:{}".format((data[1]))) + try: + self.websocket_connect_tts() + except Exception as e: #网络连接异常 + usys.print_exception(e) + print("tts send_data:{}".format((data[1]))) self.AI_client_tts.send(data[1]) except Exception as e: print("DeviceInfo_queue_thread:ERROR:{}".format(e)) usys.print_exception(e) if data[0] == self.AI_client_chat_num: self.AI_client_chat_isconnect = 0 - self.websocket_connect_chat() + try: + self.websocket_connect_chat() + except Exception as e: #网络连接异常 + usys.print_exception(e) if data[0] == self.AI_client_asr_num: self.AI_client_asr_isconnect = 0 - self.websocket_connect_asr() + try: + self.websocket_connect_asr() + except Exception as e: #网络连接异常 + usys.print_exception(e) if data[0] == self.AI_client_tts_num: count =10 while 1: @@ -721,7 +1620,10 @@ class AIScreen(Screen):#AI_GUI if count<=0: break self.AI_client_tts_isconnect = 0 - self.websocket_connect_tts() + try: + self.websocket_connect_tts() + except Exception as e: #网络连接异常 + usys.print_exception(e) #self.AI_client_tts_start() if self.AI_client_tts_isconnect == 1: try: @@ -736,7 +1638,7 @@ class AIScreen(Screen):#AI_GUI while True: try: - if 1:#self.audio_play_state == 0: + if 1: #self.audio_play_state == 0: #print("AI_audio_queue_thread") data = self.AI_audio_queue.get() @@ -744,30 +1646,24 @@ class AIScreen(Screen):#AI_GUI print("audio_queue:len:{},data{}".format(len(data[0]),data[1])) if len(data[0]) > 1: if self.TTS_PRO_TYPE == 0: - AI_label.set_text(data[1]) - # - # f = open("/usr/test.mp3", "w+") - # f.write(data) + + self.AI_label_answer+=data[1] + EventMesh.publish("publish_message_event_ui",{"func":self.ai_talk_end_show_text_cb,"data":0}) + # AI_label.set_text(self.AI_label_answer) try: - # while self.audio_play_state: - # pass - #print("开始播放!!!!!!!!!!!!!!!!!!!!!") - #print("开始播放!!!!!!!!!!!!!!!!!!!!!") - #print("开始播放!!!!!!!!!!!!!!!!!!!!!") - #print("开始播放!!!!!!!!!!!!!!!!!!!!!") - tmp=self.aud.playStream(3, data[0])#播放音频流 + tmp= self.aud.playStream(3, data[0])#播放音频流 print("出:{},{}!!!".format(len(data[0]),self.AI_client_tts_data_len)) - + if tmp != 0: + print("2playStream:error tmp:{} data len:{}!!!!!!!!!!!!".format(tmp,len(data[0]))) self.AI_client_tts_data_len -=len(data[0]) except Exception as e: print("AI_audio_queue_thread:ERROR:") usys.print_exception(e) except Exception as e: - print("AI_audio_queue_thread:ERROR:") - usys.print_exception(e) + print("AI_audio_queue_thread:ERROR:") + usys.print_exception(e) def Close(self): - print("Close1") try: #销毁线程 if self.AI_audio_queue_thread_id != 0: @@ -802,37 +1698,44 @@ class AIScreen(Screen):#AI_GUI self.AI_client_asr_recv_id = 0 except Exception as e: usys.print_exception(e) - print("Close2") 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() - print("Close3") self.AI_client_tts_str_sen = '' self.record_timer.stop() - self. AI_client_tts_timer.stop() - print("Close4") + self.AI_client_tts_timer.stop() self.aud.stopPlayStream() self.aud.stopAll() - print("Close5") self.AI_client_chat_play_str = "" self.AI_client_tts_tra_flag = 0 self.record.stop()#关闭录音 - print("Close6") + self.AI_label_answer = "" + self.refresh_count = 0 + self.refresh_texttimer.stop() + self.clear_flag() try: self.websocket_deconnect_asr() self.websocket_deconnect_tts() self.websocket_deconnect_chat() except Exception as e: usys.print_exception(e) - print("Close7") - def done_return(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) + + # def done_left_to_right(self): + # # print("ai done_right_to_left\r\n") + # if (AI_talk_end_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or (AI_listen_screen.has_flag(lv.obj.FLAG.HIDDEN)) == False or\ + # (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: + # EventMesh.publish("return_prev_screen") - def btn1_release(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) pass def btn8_press(self): + EventMesh.publish("watch_top_show") EventMesh.publish("load_screen", {"screen": "main_menu"}) - pass \ No newline at end of file + pass + diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py index 5cc30794..77a42626 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/appWechat.py @@ -154,7 +154,7 @@ class WechatScreen(Screen): def __init__(self): super().__init__() - self.MXA_MSG = 5 + self.MXA_MSG = 2 self.wechat_recode_list = {} self.wechat_num = 0 self.volum_size = 8 @@ -195,6 +195,7 @@ class WechatScreen(Screen): self.timer = osTimer() self.second_timer = osTimer() self.play_timer = osTimer() + self.update_lcdTimer = osTimer() @@ -202,8 +203,8 @@ class WechatScreen(Screen): self.startWidth = 0 self.check_json = 0 self.wechat_list = lv.obj(wechat_screen_list_screen) - self.wechat_list.set_pos(0, 2) - self.wechat_list.set_size(128, 94) + self.wechat_list.set_pos(0, 20) + self.wechat_list.set_size(128, 91-15) self.wechat_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.wechat_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) self.wechat_list.set_flex_flow(lv.FLEX_FLOW.COLUMN)#自动排成一列对齐 @@ -445,6 +446,7 @@ class WechatScreen(Screen): print("talking1.0") self.record_test.start("/usr/static/storage_file/{}.amr".format(self.wechat_num),16) self.second_timer.start(1000, 1, self.reduce_second) + self.update_lcdTimer.start(500, 1, self.update_lcd) self.press_state = 1 self.ble_send = 1 #松开发送 @@ -493,6 +495,7 @@ class WechatScreen(Screen): #写序号 self.record_test.stop() #停止錄音 self.second_timer.stop() #停止计时器 + self.update_lcdTimer.stop() self.countdown_old = self.countdown # Wechat_log("self.countdown :{} self.wechat_num:{} self.wechat_recode_list:{} self.wechat_show:{}".format(self.countdown,self.wechat_num,self.wechat_recode_list,self.wechat_show)) self.wechat_recode_list["%02d"%(self.wechat_show)] = "S:{}".format(str(self.countdown)) @@ -525,7 +528,7 @@ class WechatScreen(Screen): Wechat_log("play_img_cb2") def play_img(self,*args): Wechat_log("play_img1") - if self.paay_btn_count < 0 or self.paay_btn_count>= self.MXA_MSG: + if self.paay_btn_count < 0 or self.paay_btn_count >= self.MXA_MSG: self.play_timer.stop() return EventMesh.publish("system_sleep_rest")#防止黑屏 @@ -543,7 +546,7 @@ class WechatScreen(Screen): self.sec_num+=1 if self.sec_num % 2 == 0: - # Wechat_log("self.play_sec:{}".format(self.play_sec)) + Wechat_log("self.play_sec:{}".format(self.play_sec)) if self.play_sec > 0: self.play_sec -= 1 if self.play_sec == 0: @@ -560,7 +563,7 @@ class WechatScreen(Screen): self.wechat_list_dict[self.paay_btn_count]["_btn_img"].set_src("U:/static/R_3.png") elif self.play_text == "S:": self.wechat_list_dict[self.paay_btn_count]["_btn_img"].set_src("U:/static/S_3.png") - Wechat_log("play_img2") + Wechat_log("play_img2 {}\r\n".format(get_play)) def play_label_cb(self,e): #lvgl按钮回调 Wechat_log("play_label_cb1") #Wechat_log("play_label_cb.0:e:{}".format(e.get_code())) @@ -577,6 +580,7 @@ class WechatScreen(Screen): def play_label(self,play_btn):#另外一个线程实际执行的地方 Wechat_log("play_label1") self.sec_num = 0 + self.count_img = 0 #喇叭动画显示的数量 # Wechat_log("play_label self.play_text:{}".format(self.play_text)) if self.paay_btn_old_count <= self.MXA_MSG: #停止东画还原到3图标 text = self.wechat_list_dict[self.paay_btn_old_count]["_btn_label2"].get_text() @@ -586,7 +590,7 @@ class WechatScreen(Screen): elif self.play_text == "S:": self.wechat_list_dict[self.paay_btn_old_count]["_btn_img"].set_src("U:/static/S_3.png") - self.count_img = 0 #喇叭动画显示的数量 + text = self.wechat_list_dict[self.paay_btn_count]["_btn_label2"].get_text() @@ -615,6 +619,8 @@ class WechatScreen(Screen): self.aud.stop()# self.aud.play(1, 1, '/usr/static/storage_file/{}.amr'.format(i)) #文件名前面要加上路径 self.paay_btn_old_count = self.paay_btn_count + + Wechat_log("play_label2") #获取是否在录音 @@ -625,11 +631,20 @@ class WechatScreen(Screen): return self.ble_send + def lcd_off(self): + self.play_timer.stop() + self.record_test.stop() #停止錄音 + self.second_timer.stop() #停止计时器 + self.update_lcdTimer.stop() + self.aud.stop() + def Close(self): Wechat_log("Close1") self.play_timer.stop() self.record_test.stop() #停止錄音 self.second_timer.stop() #停止计时器 + self.update_lcdTimer.stop() + self.aud.stop() num = EventMesh.publish("get_volum_size") if num == None: @@ -637,7 +652,18 @@ class WechatScreen(Screen): self.aud.setVolume(num)#恢复原始音量 Wechat_log("Close2") + def update_lcd(self,*args): + EventMesh.publish("publish_message_event_ui",{"func":self.update_lcd_cb,"data":0}) + + def update_lcd_cb(self,data): + Wechat_log("update_lcd_cb") + EventMesh.publish("system_sleep_rest")#防止黑屏 + def reduce_second(self,*args): + EventMesh.publish("publish_message_event_ui",{"func":self.reduce_second_cb,"data":0}) + + def reduce_second_cb(self,data): + if self.countdown < 15: self.countdown += 1 else: @@ -651,6 +677,9 @@ class WechatScreen(Screen): def done_return(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) + def done_left_to_right(self): + pass + def btn1_release(self): EventMesh.publish("load_screen", {"screen": "main_menu"}) diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/calculator.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/calculator.py index 47ca5992..7f075107 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/calculator.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/calculator.py @@ -175,7 +175,7 @@ class calculatorScreen(Screen): self.count = 0 self.str = "" self.equal = '' - calculator_num.add_event_cb(lambda e: self.calculator_event_cb(e,calculator_num), lv.EVENT.VALUE_CHANGED, None) + calculator_num.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calculator_event_cb(e,calculator_num)), lv.EVENT.VALUE_CHANGED, None) self.calculator_flag = '' self.result = '' self.num_count = 0 #限制输入位数 20位 @@ -190,7 +190,6 @@ class calculatorScreen(Screen): calculator_label.clear_flag(lv.obj.FLAG.HIDDEN) calculator_label.set_text(" ") self.meta = calculator_screen - def calculator_eval(self,str): print("calculator_eval:str{}".format) @@ -232,8 +231,13 @@ class calculatorScreen(Screen): def calculator_event_cb(self,e,calculator_num): src = e.get_target() code = e.get_code() - #print("calculator_clicked:{} {}".format(src,code)) - if code == lv.EVENT.VALUE_CHANGED: + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + elif code == lv.EVENT.VALUE_CHANGED: txt = src.get_btn_text(src.get_selected_btn()) # 获取被点击的按钮的内容 try : if txt == "<-": # 如果是退格键,那么就删除1个字符 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 355c83ac..d7b3884a 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 @@ -74,14 +74,7 @@ def main_init(): - #AI - try: - from ai import AIScreen - ui.add_screen(AIScreen()) - - except Exception as e: - usys.print_exception(e) ui.add_screen(_ui.SystemInitScreen()) EventMesh.publish("load_screen", {"screen": "system_init"}) print("init5:{}".format(utime.localtime())) @@ -123,20 +116,21 @@ def main_init(): ui.add_screen(_ui_setting.ImeiScreen()) ui.add_screen(_ui_setting.AppScreen()) ui.add_screen(_ui_setting.BrightnessScreen()) - ui.add_screen(_ui_setting.VolumeScreen()) ui.add_screen(_ui_setting.RestoreScreen()) ui.add_screen(_ui_setting.PoweroffScreen()) ui.add_screen(_ui_setting.VersionScreen()) ui.add_screen(_ui_setting.UpdateScreen()) - ui.add_screen(_ui_setting.AlarmvolumeScreen()) - ui.add_screen(_ui_setting.MsgvolumeScreen()) - ui.add_screen(_ui_setting.PhoneringScreen()) ui.add_screen(_ui_setting.totalvolumeScreen()) ui.add_screen(_ui_setting.PoweroffConfirmScreen()) ui.add_screen(_ui_setting.RestartScreen()) ui.add_screen(_ui.DialingScreen()) ui.add_screen(_ui.CallLogScreen()) ui.add_screen(_ui.UIFINDScreen()) + # from usr.sleep_test import MsgDetailScreen + # try: + # ui.add_screen(MsgDetailScreen()) + # except Exception as e: + # usys.print_exception(e) ui.add_screen(_ui.MsgDetailScreen()) ui.add_screen(_ui.IncomingCallScreen()) ui.add_screen(_ui.OnCallScreen()) @@ -179,18 +173,18 @@ def main_init(): ui.add_screen(_ui.videoModeScreen()) ui.add_screen(_ui.voiceOutCallScreen()) - from pp_main import allppPopupScreen,delOnePopupScreen,ppListScreen,noppPopupScreen,delppsucessPopupScreen,ppMainScreen,addfaileppPopupScreen,ppMainPopupScreen,addppPopupScreen,addedppPopupScreen,ownaddppPopupScreen - ui.add_screen(ppMainScreen()) - ui.add_screen(ppMainPopupScreen()) - ui.add_screen(addppPopupScreen()) - ui.add_screen(addedppPopupScreen()) - ui.add_screen(ownaddppPopupScreen()) - ui.add_screen(addfaileppPopupScreen()) - ui.add_screen(delppsucessPopupScreen()) - ui.add_screen(noppPopupScreen()) - ui.add_screen(ppListScreen()) - ui.add_screen(delOnePopupScreen()) - ui.add_screen(allppPopupScreen()) + # from pp_main import allppPopupScreen,delOnePopupScreen,ppListScreen,noppPopupScreen,delppsucessPopupScreen,ppMainScreen,addfaileppPopupScreen,ppMainPopupScreen,addppPopupScreen,addedppPopupScreen,ownaddppPopupScreen + # ui.add_screen(ppMainScreen()) + # ui.add_screen(ppMainPopupScreen()) + # ui.add_screen(addppPopupScreen()) + # ui.add_screen(addedppPopupScreen()) + # ui.add_screen(ownaddppPopupScreen()) + # ui.add_screen(addfaileppPopupScreen()) + # ui.add_screen(delppsucessPopupScreen()) + # ui.add_screen(noppPopupScreen()) + # ui.add_screen(ppListScreen()) + # ui.add_screen(delOnePopupScreen()) + # ui.add_screen(allppPopupScreen()) ui.add_screen(NewWechatPopupScreen()) # ui.add_screen(HealthScreen()) @@ -209,6 +203,16 @@ def main_init(): print("init8:{}".format(utime.localtime())) + try: + + import ai + ui.add_screen(ai.AIScreen()) + + except Exception as e: + usys.print_exception(e) + + # import ai + # ui.add_screen(ai.AIScreen()) #from ui_WatchFaceScreen import WatchFaceScreen 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 bd794338..2d36ef34 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 @@ -903,12 +903,13 @@ class DeviceInfoManager(Abstract): msg_nums = sms.getMsgNums() #获取短信条数 if(msg_nums != -1): sms_data = sms.getSaveLoc() - sms_max = sms_data[0][2] - if msg_nums >= sms_max-1: - self.sms_full_flag+=10 - if self.sms_full_flag >= 120: - self.sms_full_flag=0 - EventMesh.publish("load_screen", {"screen": "message_full"}) + if sms_data != -1: + sms_max = sms_data[0][2] + if msg_nums >= sms_max-1: + self.sms_full_flag+=10 + if self.sms_full_flag >= 120: + self.sms_full_flag=0 + EventMesh.publish("load_screen", {"screen": "message_full"}) else: self.sms_full_flag = 0 @@ -2880,6 +2881,7 @@ class getplayAudiodStateManager(Abstract):#获取设置播放音频状态 EventMesh.subscribe("get_audio_state", self.get_audio_state) def set_audio_state(self, event, msg): + # print("getplayAudiodStateManager:{}".format(msg)) self.play = msg def get_audio_state(self, event, msg): diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/pp_main.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/pp_main.py index a4544cff..0df103e0 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/pp_main.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/pp_main.py @@ -89,7 +89,7 @@ class ppMainScreen(Screen): delppmain_call_label = lv.label(ppmain_screen) delppmain_call_label.set_pos(35, 64) delppmain_call_label.set_size(LCD_X-35, 40) - delppmain_call_label.set_text("设备号交友") + delppmain_call_label.set_text("碰碰交友列表") delppmain_call_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) delppmain_call_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -149,6 +149,7 @@ class ppMainScreen(Screen): EventMesh.publish("load_screen", {"screen": "pp_list"}) def done_return(self): + # EventMesh.publish("return_prev_screen") EventMesh.publish("load_screen", {"screen": "main_menu"}) def btn1_release(self): @@ -418,7 +419,8 @@ class ppListScreen(Screen): def done_return(self): - EventMesh.publish("load_screen", {"screen": "pp_main"}) + EventMesh.publish("return_prev_screen") + # EventMesh.publish("load_screen", {"screen": "pp_main"}) def btn1_release(self): EventMesh.publish("load_screen", {"screen": "pp_main"}) 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 6019a95c..4c500879 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 @@ -2445,7 +2445,8 @@ class MEMBERS_ProtoCol(ProtoCol):#获取账号列表 j+=1 print("videobook!!!:{}".format(str(videobook))) # print("phonebook!!!:{}".format(str(phonebook))) - with open("/usr/static/storage_file/videobook.json","w",encoding="utf-8") as fd: + + with open("/usr/static/storage_file/videobook.json","w+",encoding="utf-8") as fd: ujson.dump(videobook,fd) print("创建视频通话账号") diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py index 1af3af79..6de88aeb 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/sleep_test.py @@ -1,54 +1,806 @@ -import uos -import ql_fs -if ql_fs.path_exists("/ext") == False: - ldev = uos.VfsLfs1(32, 32, 32, "ext_fs",0,3) - uos.mount(ldev,'/ext') -res = uos.statvfs("/ext") -res = list(res) -print('总ext空间:{} MB,剩余空间:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024))) -from lcd import tp_cst816 -from btn_device_ec800m import BtnDevice - import lvgl as lv +# from machine import LCD, Pin +# from tp import cst816 +# import _thread +# import utime +# import EventMesh +# import osTimer +# from misc import PWM + +# init_data = ( +# 0, 0, 0xfe, +# 0, 0, 0xfe, +# 0, 0, 0xEF, + +# 0, 0, 0x20, + +# 0, 1, 0x36, +# 1, 1, 0x00, + +# 0, 1, 0x3A, +# 1, 1, 0x05, + +# 0, 1, 0x35, +# 1, 1, 0x00, + +# 0, 1, 0xA8, +# 1, 1, 0x22, + +# 0, 1, 0xB4, +# 1, 1, 0x00, + +# 0, 1, 0xc6, +# 1, 1, 0x3f, + +# 0, 1, 0xB0, +# 1, 1, 0xC0, + +# 0, 1, 0xB2, +# 1, 1, 0x2F, + +# 0, 1, 0xB3, +# 1, 1, 0x13, + +# 0, 1, 0xB6, +# 1, 1, 0x19, + +# 0, 1, 0xB7, +# 1, 1, 0x01, + +# 0, 1, 0xAC, +# 1, 1, 0xC8, + +# 0, 1, 0xAB, +# 1, 1, 0x0f, + +# 0, 1, 0xb8, +# 1, 1, 0x08, + +# 0, 1, 0xE8, +# 1, 1, 0x27, + +# 2, 0, 12, + +# 0, 1, 0xE9, +# 1, 1, 0x47, + +# 0, 1, 0xea, +# 1, 1, 0x44, + +# 0, 1, 0xeb, +# 1, 1, 0xb0, + +# # 0, 1, 0xed, +# # 1, 1, 0x03, + +# 0, 1, 0x44, +# 1, 1, 0x00, + + + +# 0, 1, 0xc7, +# 1, 1, 0x1D, + +# 0, 14, 0xF0, +# 1, 1, 0x0F, +# 1, 1, 0x24, +# 1, 1, 0x2c, +# 1, 1, 0x38, +# 1, 1, 0x67, +# 1, 1, 0x39, +# 1, 1, 0x20, +# 1, 1, 0x60, +# 1, 1, 0x04, +# 1, 1, 0x14, +# 1, 1, 0x10, +# 1, 1, 0x10, +# 1, 1, 0x0c, +# 1, 1, 0x1f, + +# 0, 14, 0xF1, +# 1, 1, 0x1f, +# 1, 1, 0x38, +# 1, 1, 0x3f, +# 1, 1, 0x4f, +# 1, 1, 0xd7, +# 1, 1, 0x24, +# 1, 1, 0x3f, +# 1, 1, 0x60, +# 1, 1, 0x00, +# 1, 1, 0x03, +# 1, 1, 0x09, +# 1, 1, 0x14, +# 1, 1, 0x10, +# 1, 1, 0x1F, + +# 0, 3, 0xf4, +# 1, 1, 0x00, +# 1, 1, 0x00, +# 1, 1, 0xff, + +# 0, 0, 0x11, +# 2, 0, 120, +# 0, 0, 0x29, +# 0, 0, 0x2c, + +# ) + +# XSTART_H = 0xf0 +# XSTART_L = 0xf1 +# YSTART_H = 0xf2 +# YSTART_L = 0xf3 +# XEND_H = 0xE0 +# XEND_L = 0xE1 +# YEND_H = 0xE2 +# YEND_L = 0xE3 + + +# XSTART = 0xD0 +# XEND = 0xD1 +# YSTART = 0xD2 +# YEND = 0xD3 + +# lcd = LCD() + +# init_buf = bytearray(init_data) + +# init_data2 = ( +# 0, 4, 0x2a, +# 1, 1, XSTART_H, +# 1, 1, XSTART_L, +# 1, 1, XEND_H, +# 1, 1, XEND_L, +# 0, 4, 0x2b, +# 1, 1, YSTART_H, +# 1, 1, YSTART_L, +# 1, 1, YEND_H, +# 1, 1, YEND_L, +# 0, 0, 0x2c, + +# ) +# invalid = bytearray(init_data2) + +# init_data3 = ( +# 0, 0, 0x28, +# 2, 0, 120, +# 0, 0, 0x10, + +# ) +# displayoff = bytearray(init_data3) + +# init_data4 = ( +# 0, 0, 0x11, +# 2, 0, 120, +# 0, 0, 0x29, + +# ) +# displayon = bytearray(init_data4) +# # CST816初始化 +# import initTP +# initTP.HYN_Initial() +# tp_cst816 = cst816(i2c_no = 2,irq=33, reset=32) +# tp_cst816.activate() +# tp_cst816.init() + +# print("cst816 init...") +# from btn_device_ec800m import BtnDevice +# btn_device = BtnDevice(tp_cst816) +# btn_device.start() + +# print("lcd_init2 ...") +# lcd_ctrl = Pin(Pin.GPIO18, Pin.OUT, Pin.PULL_DISABLE, 1) + +# #lcd.lcd_init(init_buf, 128, 128, 26000, 1, 4, 0, invalid, displayon, displayoff, None,spi_mode=0,TESel = True,TEPin = 17) +# #lcd.lcd_init(init_buf, 240,320,4,1,4,0,invalid,displayon,displayoff,None,1, 0, 0, 2, 3, 31) +# #lcd.lcd_init(init_buf, 128, 128,4,1,4,0,invalid,displayon,displayoff,None,1, 0, 0, 2, 4, 31,) +# #2是spi_cs引脚的GPIO号,4是DC引脚的GPIO号,5是RST引脚的GPIO号 +# lcd.lcd_init(init_buf, 128,128,5,1,4,0,invalid,displayon,displayoff,None,1, 0, 0, 2, 4, 5,) +# lcd.lcd_set_offset(0,32) +# # gpio_backlight = Pin(Pin.GPIO37, Pin.OUT, Pin.PULL_DISABLE, 0) +# # gpio_backlight.write(1) +# PWM_backlight = PWM(PWM.PWM0, PWM.ABOVE_10US, 0, 1000) +# PWM_backlight.open() + +# LCD_SIZE_W = 128 +# LCD_SIZE_H = 128 +# # pwm.close() +# # 初始化lvgl +# lv.init() + +# # Register SDL display driver. +# disp_buf1 = lv.disp_draw_buf_t() +# buf1_1 = bytearray(LCD_SIZE_W * LCD_SIZE_H * 2) +# #buf1_2= bytearray(LCD_SIZE_W * LCD_SIZE_H * 2) + +# disp_buf1.init(buf1_1, None, len(buf1_1)) +# disp_drv = lv.disp_drv_t() +# disp_drv.init() +# 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.register() + + +# # LVGL触摸注册 +# indev_drv = lv.indev_drv_t() +# indev_drv.init() +# indev_drv.type = lv.INDEV_TYPE.POINTER +# indev_drv.read_cb = tp_cst816.read +# indev_drv.long_press_time = 400 +# indev_drv.register() +# gpio4 = Pin(Pin.GPIO33, Pin.OUT, Pin.PULL_PU, 0) + +# # def indev_task(): +# # while 1: +# # pos_s = tp_cst816.read_xy() +# # # import _thread +# # # x = _thread.get_heap_size() +# # # print('heap:',x) +# # if pos_s: +# # if 100 == pos_s[0] and 400 == pos_s[1]: +# # EventMesh.publish("done_return") +# # print("return") +# # utime.sleep_ms(200) +# # else: +# # utime.sleep_ms(200) + +# # _thread.start_new_thread(indev_task,()) + +# # 启动lvgv线程 +# lv.tick_inc(5) +# lv.task_handler() +# style_screen = lv.style_t() +# style_screen.init() +# style_screen.set_radius(0) +# style_screen.set_bg_color(lv.color_make(0x00, 0x00, 0x00)) +# style_screen.set_bg_opa(255) +# style_screen.set_border_width(0) +# style_screen.set_pad_left(0) +# style_screen.set_pad_right(0) +# style_screen.set_pad_top(0) +# style_screen.set_pad_bottom(0) +# #开机画面 +# style_font_youyuan_40 = lv.style_t() +# style_font_youyuan_40.init() +# style_font_youyuan_40.set_text_color(lv.color_make(0xff, 0xff, 0xff)) +# style_font_youyuan_40.set_text_font(lv.K01_font_16_ALL) +# #style_font_youyuan_40.set_text_font_v2("font_40.bin",40,0) + +# lcd.lcd_display_on() +# utime.sleep_ms(2) +# lv.autoSleep(0) + +# power_on_screen = lv.obj() +# print("power_on_screen") +# power_on_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + +# #class camera.camPreview(model,cam_w,cam_h,lcd_w,lcd_h,perview_level) +# style_wechat_r_btn = lv.style_t() +# style_wechat_r_btn.init() +# style_wechat_r_btn.set_radius(5) +# style_wechat_r_btn.set_bg_opa(255) +# style_wechat_r_btn.set_border_width(0) +# style_wechat_r_btn.set_pad_left(0) +# style_wechat_r_btn.set_pad_right(0) +# style_wechat_r_btn.set_pad_top(0) +# 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) + +# #灰色背景黑色字 +# style_font_28_black_bg_gray = lv.style_t() +# style_font_28_black_bg_gray.init() +# # style_font_28_black_bg_gray.set_radius(5) +# # style_font_28_black_bg_gray.set_bg_opa(255) +# # style_font_28_black_bg_gray.set_border_width(0) +# # style_font_28_black_bg_gray.set_pad_left(0) +# # style_font_28_black_bg_gray.set_pad_right(0) +# # style_font_28_black_bg_gray.set_pad_top(0) +# # style_font_28_black_bg_gray.set_pad_bottom(0) +# # style_font_28_black_bg_gray.set_bg_color(lv.color_make(66,66,66)) #字体文本颜色 +# style_font_28_black_bg_gray.set_text_color(lv.color_make(153, 153, 153)) #字体文本颜色 +# # style_font_28_black_bg_gray.set_text_font_v2("font_28.bin",28,0) +# style_font_28_black_bg_gray.set_text_font(lv.K01_font_16_ALL) + +# style_common_bg_rect_btn_pressed = lv.style_t() +# style_common_bg_rect_btn_pressed.init() +# style_common_bg_rect_btn_pressed.set_bg_color(lv.color_make(66,66,66)) +# style_common_bg_rect_btn_pressed.set_bg_opa(100) +# style_common_bg_rect_btn_pressed.set_border_width(0) +# style_common_bg_rect_btn_pressed.set_shadow_opa(0) + +# style_AI_btn = lv.style_t() +# style_AI_btn.init() +# style_AI_btn.set_bg_color(lv.color_make(66,66,66)) +# style_AI_btn.set_border_width(0) +# style_AI_btn.set_shadow_opa(0) + +# post_top = -56 #(17*7 - (17//2))//2+1 +# setPageShowY = 0 +# text = ["苗晶坐在梧桐树下的石头上,默默凝望远处的城市。城市笼罩在灿烂的朝霞中。淡淡的霞光,映着蝉翼样的烟霭,烟霭在小山脚下轻飘飘的滚动,穿梭在城市的大街小巷。一夜的秋雨洗刷多", +# "1 **信息检索**:我可以回答各种问题,涵盖广泛的主题,等2 **学习和教育**:我可以帮助解答学术问题,1 **信息检索**:我可以回答各种问题,涵盖广泛的主题,等2 **学习和教育**:我可以帮助解答学术问题,","辅导作业,或者提供学习资源."] +# refresh_texttimer = osTimer() + +# AI_end_screen_list_screen = lv.btn(power_on_screen) +# AI_end_screen_list_screen.set_pos(4, 5) +# AI_end_screen_list_screen.set_size(120, lv.SIZE.CONTENT) +# AI_end_screen_list_screen.add_style(style_AI_btn, lv.PART.MAIN | lv.STATE.DEFAULT) +# AI_end_screen_list_screen.add_style(style_common_bg_rect_btn_pressed, lv.PART.MAIN | lv.STATE.PRESSED) +# AI_end_screen_list_screen.set_style_radius(10,0) + +# # AI_end_screen_list_screen = lv.obj(power_on_screen) +# # AI_end_screen_list_screen.set_pos(0, 0) +# # AI_end_screen_list_screen.set_size(128,lv.SIZE.CONTENT) +# # AI_end_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +# # AI_end_screen_list_screen.add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT) +# # AI_end_screen_list_screen.set_flex_flow(lv.FLEX_FLOW.COLUMN)#自动排成一列对齐 + +# # msg_detail_cont_obj = lv.obj(AI_end_screen_list_screen) + +# AI_label1 = lv.label(AI_end_screen_list_screen) + +# def timer_start_cb(): + +# refresh_texttimer.start(2000,0,ai_talk_end_show_text)#stop() #(500,1,self.ai_talk_end_show_text) +# count = 0 +# def ai_talk_end_show_text(*args): +# global count +# count+=1 +# if count > 2: +# count = 0 +# print("显示新的文字内容!!!") +# # AI_end_screen_list_screen.scroll_to(0, 0, lv.ANIM.OFF) +# AI_end_screen_list_screen.scroll_to_view(lv.ANIM.OFF) +# AI_label1.scroll_to_view_recursive(lv.ANIM.ON) +# AI_label1.set_pos(0, 10) +# AI_label1.set_text(text[count]) + +# print("text[200:400]:{}\r\n".format(text[count])) + + + + +# def event_cb(e): +# code = e.get_code() +# # text = e.get_target().get_child(0).get_text() +# # text = e.get_target().get_text() +# get_height = e.get_target().get_height() +# # get_height = e.get_target().get_height() #获取显示区域的高度实时文字显示 +# child_a = lv.area_t() +# e.get_target().get_coords(child_a) + +# parent_h = e.get_target().get_height() +# # get_scroll_y = e.get_target().get_child(0).get_scroll_y() +# # text_y = e.get_target().get_child(0).get_y() #获取文本的y +# # text_h = e.get_target().get_child(0).get_height() + + + +# # print("child_a.y1,(parent_h//2 {} {}\r\n".format(child_a.y1,(parent_h//2))) +# if code == lv.EVENT.DRAW_POST_END:#滚动完成 +# tmp_pos = (parent_h//4)-8 +# print("滑动最底部了 加载新的文字!!!!!!!!!!!!!{} {} {} {}".format(child_a.y1,post_top,parent_h,tmp_pos)) + +# if child_a.y1 <= tmp_pos and child_a.y1 < 0: +# print("滑动最底部了 加载新的文字!!!!!!!!!!!!!{} {}".format(child_a.y1,(parent_h//2))) +# # AI_label1.set_text(text+"...") +# if count != 2: +# timer_start_cb() +# # e.get_target().get_child(0).set_text(text[200:400]) +# if child_a.y1 >= 0: +# print("滑动最顶部了 加载新的文字!!!!!!!!!!!!!") +# # print("get_height:READY READY {}!!!!!".format(get_height//17)) +# if get_height // 17 >= 8: +# pass +# # msg_detail_cont_obj.set_pos(0, 0) +# # AI_label1.set_text("还是北师大接孩子海底海底花呗看啥都斗佛ish 测试1111好嗲话ID号i啊的hi啊好滴hi啊 施慧达hi大海hi大海hihi都还好的") +# # print("MainMenu2:SCROLL_END code {}!!!!!".format(code)) +# elif code == lv.EVENT.SCROLL_BEGIN: +# pass +# # print("MainMenu2:SCROLL_BEGIN code {}!!!!!".format(code)) +# elif code == lv.EVENT.SCROLL: +# pass +# # print("MainMenu2:LV_EVENT_SCROLL code {}!!!!!".format(code)) +# elif code == lv.EVENT.READY: +# print("MainMenu2:READY READY {}!!!!!".format(code)) + +# # power_on_screen.add_event_cb(event_cb, lv.EVENT.ALL, None) + + +# # msg_detail_cont_obj.set_pos(0, 0) +# # msg_detail_cont_obj.set_size(128,lv.SIZE.CONTENT) +# # msg_detail_cont_obj.add_flag(lv.obj.FLAG.CLICKABLE) +# # # msg_detail_cont_obj.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +# # msg_detail_cont_obj.add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT) +# # msg_detail_cont_obj.add_event_cb(event_cb, lv.EVENT.ALL, None) + + +# AI_label1.set_pos(0, 0) +# AI_label1.set_size(128, lv.SIZE.CONTENT) +# AI_label1.set_long_mode(lv.label.LONG.WRAP) +# AI_label1.add_flag(lv.obj.FLAG.CLICKABLE) +# AI_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) +# # AI_label1.set_text_sel_start(13) +# # AI_label1.set_text_sel_end(300) +# AI_label1.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) +# AI_end_screen_list_screen.add_event_cb(event_cb,lv.EVENT.ALL, None) +# # AI_label1.add_event_cb(event_cb,lv.EVENT.ALL, None) + +# AI_label1.set_text(text[0]) + + +# lv.scr_load(power_on_screen) +# utime.sleep_ms(200) +# print("power_on_screen end...") +# PWM_backlight = PWM(PWM.PWM0, PWM.ABOVE_10US, 200, 1000) +# PWM_backlight.open() + import utime -import osTimer -import pm -import ql_fs +import audio from machine import Pin -from lcd import lcd,lcd_ctrl,tp_cst816,lcd_ctrl -from misc import PWM -import uos -from machine import I2C -from Hsensor import GH3018 -from Gsensor import SC7A20 -btn_device = BtnDevice(tp_cst816) -btn_device.start() -i2c0 = I2C(I2C.I2C0, I2C.FAST_MODE) -WHO_AM_I = bytearray([0x01, 0]) -I2C_SLAVE_ADDR = 0x49 -r_data = bytearray(2) -data = bytearray([0x60A0, 0]) #休眠 -i2c0.write(I2C_SLAVE_ADDR, WHO_AM_I, 1, data, 2) -def gsensor_cb(self, para): - print("gsensor_cb:{}".format(para)) -gsensor = SC7A20() -print("DeviceInfoManager:1.0") -gsensor.activate() -print("DeviceInfoManager:1.1") -gsensor.init() -print("DeviceInfoManager:2") -gsensor.set_callback(gsensor_cb) -hsensor = GH3018() -hsensor.activate() -hsensor.init() -hsensor.open_blood_oxygen() -utime.sleep(5) -PWM_backlight = PWM(PWM.PWM0, PWM.ABOVE_10US, 0, 1000) -PWM_backlight.open() -hsensor.close() -tp_cst816.suspend() -lcd.lcd_display_off() -#lcd_ctrl.write(0) -lv.autoSleep(1) -pm.autosleep(1) -print("test end2") \ No newline at end of file +import osTimer +import _thread +from queue import Queue +import uwebsocket +import usys +import EventMesh +import constants +import ujson +import lvgl as lv +import urandom +import uhashlib +import ubinascii +from ui import style_font_youyuan_20,style_screen,Screen,style_img + +style_white_screen = lv.style_t() +style_white_screen.init() +style_white_screen.set_radius(0) +style_white_screen.set_bg_color(lv.color_make(0xff, 0xff, 0xff)) +style_white_screen.set_bg_opa(255) +style_white_screen.set_border_width(0) +style_white_screen.set_pad_left(0) +style_white_screen.set_pad_right(0) +style_white_screen.set_pad_top(0) +style_white_screen.set_pad_bottom(0) + +#灰色背景黑色字 + +style_font_20_black_bg_gray = lv.style_t() +style_font_20_black_bg_gray.init() +style_font_20_black_bg_gray.set_text_color(lv.color_make(0x00, 0x00, 0x00)) +#style_font_youyuan_20.set_text_font_v2("font_28.bin",28,0) +style_font_20_black_bg_gray.set_bg_color(lv.color_make(0xe1,0xdb,0xdb)) +style_font_20_black_bg_gray.set_text_font(lv.K01_font_16_ALL) + + +msg_detail_screen = None +msg_detail_title = None +msg_detail_cont = None +AI_label1 = None +msg_detail_cont_obj = None + +style_font_28_black_bg_gray = lv.style_t() +style_font_28_black_bg_gray.init() +style_font_28_black_bg_gray.set_radius(5) +style_font_28_black_bg_gray.set_bg_opa(255) +style_font_28_black_bg_gray.set_border_width(0) +style_font_28_black_bg_gray.set_pad_left(0) +style_font_28_black_bg_gray.set_pad_right(0) +style_font_28_black_bg_gray.set_pad_top(0) +style_font_28_black_bg_gray.set_pad_bottom(0) +style_font_28_black_bg_gray.set_bg_color(lv.color_make(66,66,66)) #字体文本颜色 +style_font_28_black_bg_gray.set_text_color(lv.color_make(153, 153, 153)) #字体文本颜色 +# style_font_28_black_bg_gray.set_text_font_v2("font_28.bin",28,0) +style_font_28_black_bg_gray.set_text_font(lv.K01_font_16_ALL) + +style_green_screen = lv.style_t() +style_green_screen.init() +style_green_screen.set_radius(5) +style_green_screen.set_bg_color(lv.color_make(79,195,76)) +style_green_screen.set_bg_opa(255) +style_green_screen.set_border_width(0) +style_green_screen.set_pad_left(0) +style_green_screen.set_pad_right(0) +style_green_screen.set_pad_top(0) +style_green_screen.set_pad_bottom(0) + +style_font_28_green_bg_gray = lv.style_t() +style_font_28_green_bg_gray.init() +# style_font_28_green_bg_gray.set_bg_color(lv.color_make(79,195,76)) +# style_font_28_green_bg_gray.set_bg_opa(255) +# style_font_28_green_bg_gray.set_radius(5) +# style_font_28_green_bg_gray.set_border_width(0) +# style_font_28_green_bg_gray.set_pad_left(0) +# style_font_28_green_bg_gray.set_pad_right(0) +# 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) + +style_gray_screen = lv.style_t() +style_gray_screen.init() +style_gray_screen.set_radius(5) +style_gray_screen.set_bg_color(lv.color_make(66,66,66)) #灰色背景 +style_gray_screen.set_bg_opa(255) +style_gray_screen.set_border_width(0) +style_gray_screen.set_pad_left(0) +style_gray_screen.set_pad_right(0) +style_gray_screen.set_pad_top(0) +style_gray_screen.set_pad_bottom(0) + +#灰色背景黑色字 +style_font_28_black_bg_gray = lv.style_t() +style_font_28_black_bg_gray.init() +# style_font_28_black_bg_gray.set_radius(5) +# style_font_28_black_bg_gray.set_bg_opa(255) +# style_font_28_black_bg_gray.set_border_width(0) +# style_font_28_black_bg_gray.set_pad_left(0) +# style_font_28_black_bg_gray.set_pad_right(0) +# style_font_28_black_bg_gray.set_pad_top(0) +# style_font_28_black_bg_gray.set_pad_bottom(0) +# style_font_28_black_bg_gray.set_bg_color(lv.color_make(66,66,66)) #字体文本颜色 +style_font_28_black_bg_gray.set_text_color(lv.color_make(153, 153, 153)) #字体文本颜色 +# style_font_28_black_bg_gray.set_text_font_v2("font_28.bin",28,0) +style_font_28_black_bg_gray.set_text_font(lv.K01_font_16_ALL) + +style_wechat_r_btn = lv.style_t() +style_wechat_r_btn.init() +style_wechat_r_btn.set_radius(5) +style_wechat_r_btn.set_bg_opa(255) +style_wechat_r_btn.set_border_width(0) +style_wechat_r_btn.set_pad_left(0) +style_wechat_r_btn.set_pad_right(0) +style_wechat_r_btn.set_pad_top(0) +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) + +AI_end_screen_list_detail_screen = None +AI_update_text = None +AI_listen_text = None +text = ["1 **信息检索**:我可以回答各种问题,涵盖广泛的主题,等.2 **学习和教育**:我可以 作为一个AI助手,我能执行多种任务,包括但不限于行一些计算、转换或提供单位换算等实用功能.**实用工具**:我可以帮助您执行一些计算、转换或:",\ + "**实用工具**:我可以帮助您执行一些计算、转换或提供单位换算等实用功能.**实用工具**:我可以帮助您执行一些计算、转换或提供单位换算等实用功能行一些计算、转换或提供单位换算等实用功能.**实用工具**:我可以帮助您执行一些计算、转换或.","8 **情感支持**:无论是聆听您的想法还是提供鼓励,我都在这里."] +class MsgDetailScreen(Screen): + NAME = "msg_detail" + + def __init__(self): + super().__init__() + self.refresh_texttimer = osTimer() + self.lcd_onupdate = osTimer() + self.meta = None + self.count=0 + self.name = "" + self.contetn = "" + self.post_y1 = 0 #移动更新的y值 + self.text_h = 0 #总的文本宽度 + self.text_pos = 0 # + self.contetn = "" + self.get_height = 0 + + + def initialization(self): + global msg_detail_screen,msg_detail_title,msg_detail_cont,AI_update_text,msg_detail_cont_obj,AI_label1,AI_end_screen_list_detail_screen,AI_listen_text + if msg_detail_screen == None: + msg_detail_screen = lv.obj() + print("msg_detail_screen") + msg_detail_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + msg_detail_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + + + + AI_end_screen_list_screen = lv.obj(msg_detail_screen) + AI_end_screen_list_screen.set_pos(5, 25) + AI_end_screen_list_screen.set_size(128-5,96-25) + 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(128-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_event_cb(self.event_cb,lv.EVENT.ALL, None) + # 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_screen) + 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) + + + + + msg_detail_cont_obj = lv.obj(AI_end_screen_list_screen) + msg_detail_cont_obj.set_pos(0, 5) + msg_detail_cont_obj.set_size(120,lv.SIZE.CONTENT) + + msg_detail_cont_obj.add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT) + + AI_label1 = lv.label(msg_detail_cont_obj) + AI_label1.set_pos(5, 0) + AI_label1.set_size(115, lv.SIZE.CONTENT) + AI_label1.set_long_mode(lv.label.LONG.WRAP) + AI_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + AI_label1.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) + AI_label1.set_text(text[0]) + + + AI_update_text = lv.label(AI_end_screen_list_screen) + AI_update_text.set_pos(5, 2) + AI_update_text.set_size(128, 20) + AI_update_text.set_text("...") + # AI_update_text.set_long_mode(lv.label.LONG.WRAP) + AI_update_text.set_long_mode(lv.label.LONG.SCROLL_CIRCULAR) + AI_update_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) + AI_update_text.set_style_anim_speed(1000,0) + + AI_update_text.add_style(style_font_28_green_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) + AI_update_text.add_flag(lv.obj.FLAG.HIDDEN) #先隐藏 + # msg_detail_screen.set_size(128,100) + # msg_detail_cont_obj = lv.obj(msg_detail_screen) + # msg_detail_cont_obj.set_pos(0, 0) + # msg_detail_cont_obj.set_size(128,lv.SIZE.CONTENT) + # msg_detail_cont_obj.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) + # msg_detail_cont_obj.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + # msg_detail_cont_obj.add_event_cb(self.event_cb,lv.EVENT.ALL, None) + # msg_detail_cont_obj.set_flex_flow(lv.FLEX_FLOW.COLUMN)#自动排成一列对齐 + + # # msg_detail_cont_obj = lv.obj(AI_end_screen_list_screen) + + # AI_label1 = lv.label(msg_detail_cont_obj) + + # AI_label1.set_pos(0, 0) + # AI_label1.set_size(128, lv.SIZE.CONTENT) + # AI_label1.set_long_mode(lv.label.LONG.WRAP) + # AI_label1.add_flag(lv.obj.FLAG.CLICKABLE) + # AI_label1.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0) + # # AI_label1.set_text_sel_start(13) + # # AI_label1.set_text_sel_end(300) + # AI_label1.add_style(style_font_28_black_bg_gray, lv.PART.MAIN | lv.STATE.DEFAULT) + + + # AI_label1.set_text(text[0]) + self.meta = msg_detail_screen + #获取字符串 + msg_detail_cont_obj.scroll_to(0, 0, lv.ANIM.OFF) + msg_detail_cont_obj.add_event_cb(self.event_cb,lv.EVENT.ALL, None) + AI_end_screen_list_detail_screen.add_event_cb(self.event_cb1,lv.EVENT.ALL, None) + # AI_listen_text_H = AI_end_screen_list_detail_screen.get_height() + # print("AI_listen_text_H:{}\r\n".format(AI_listen_text_H)) + + self.name = EventMesh.publish("get_msg_name") + self.content = EventMesh.publish("get_msg_content") + # msg_detail_title.set_text(self.name) + # tmp_y=(len(self.content)//15+1)*28 + # msg_detail_cont.set_size(240, tmp_y) + # msg_detail_cont.set_text(self.content) + self.count=0 + self.lcd_onupdate.start(1000,1,self.lcd_update)#stop() #(500,1,self.ai_talk_end_show_text) + def event_cb1(self,e): + self.get_height = e.get_target().get_child(0).get_height() + + # print("get_height:{}\r\n".format(get_height)) + pass + def event_cb(self,e): + code = e.get_code() + # text = e.get_target().get_child(0).get_text() + # text = e.get_target().get_text() + get_height = e.get_target().get_child(0).get_height() + # get_height = e.get_target().get_height() #获取显示区域的高度实时文字显示 + child_a = lv.area_t() + e.get_target().get_coords(child_a) + + parent_h = e.get_target().get_height() + get_scroll_y = e.get_target().get_child(0).get_scroll_y() + text_y = e.get_target().get_child(0).get_y() #获取文本的y + text_h = e.get_target().get_child(0).get_height() + + p= lv.point_t() + e.get_target().get_scroll_end(p) + + # print("child_a.y1,(parent_h//2 {} {}\r\n".format(child_a.y1,(parent_h//2))) + if code == lv.EVENT.DRAW_POST_END:#滚动完成 + tmp_pos = (parent_h//2)-8 + + self.post_y1 = child_a.y1 + self.text_h = parent_h + self.text_pos = tmp_pos + # print("滑动最底部了 加载新的文字!!!!!!!!!!!!!{} {} {} {}".format(child_a.y1,child_a.y2,parent_h,tmp_pos)) + # if child_a.y1 <= -tmp_pos and child_a.y1 < 0: + # pass + # print("滑动最底部了 加载新的文字!!!!!!!!!!!!!{} {}".format(child_a.y1,(parent_h//2))) + # AI_label1.set_text(text+"...") + # self.post_y1 + + # e.get_target().get_child(0).set_text(text[200:400]) + if child_a.y1 >= 0: + pass + # print("滑动最顶部了 加载新的文字!!!!!!!!!!!!!") + + def lcd_update(self,*argc): + EventMesh.publish("system_sleep_rest")#防止黑屏 + + def timer_start_cb(self,*argc): + self.refresh_texttimer.start(1000,0,self.ai_talk_end_show_text)#stop() #(500,1,self.ai_talk_end_show_text) + + + def ai_talk_end_show_text(self,*args): + self.count+=1 + if self.count > 2: + self.count=0 + + if self.count <= 0: + self.count = 0 + print("滑动最底部了 显示新的文字内容!!!{}".format(self.count)) + + + AI_label1.scroll_to_view_recursive(lv.ANIM.ON) + msg_detail_cont_obj.scroll_to_view(lv.ANIM.OFF) + + AI_label1.scroll_to_view_recursive(lv.ANIM.ON) + AI_label1.set_pos(0, 10) + AI_label1.set_text(text[self.count]) + + print("text[200:400]:{}\r\n".format(text[self.count])) + + def done_return(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + def done_bottom_to_top(self): + global msg_detail_cont_obj + child_a = lv.area_t() + # msg_detail_cont_obj.get_coords(child_a) + # parent_h = msg_detail_cont_obj.get_height() + # self.text_pos = (parent_h//2)-8 + # self.post_y1 = child_a.y1 + print("self.post_y1 {} {} {}\r\n".format(self.post_y1,self.text_h,self.text_pos)) + if self.post_y1 <= -(self.text_pos+self.get_height+(self.get_height//17)*3) and self.post_y1 < 0: + self.post_y1 = 0 + + print("done_bottom_to_top 滑到底部了!\r\n") + AI_update_text.clear_flag(lv.obj.FLAG.HIDDEN) #清楚隐藏 + # self.timer_start_cb() + print("done_bottom_to_top\r\n") + + def done_top_to_bottom(self): + # self.timer_start_cb() + print("done_top_to_bottom\r\n") + + def lcd_off(self): + self.refresh_texttimer.stop() + + def btn1_release(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + def btn8_press(self): + EventMesh.publish("load_screen", {"screen": "main_menu"}) + + + + + +#class camera.camPreview(model,cam_w,cam_h,lcd_w,lcd_h,perview_level) \ No newline at end of file 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 fb334fab..373c6f92 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 @@ -32,7 +32,7 @@ def audio_cb(event): elif event == 7: EventMesh.publish("set_audio_state", 0) print('audio-play finish.') -CALL_LOG_MAX = 50 +CALL_LOG_MAX = 10 aud = audio.Audio(0) aud.setCallback(audio_cb) # -----------------------------------------style create-------------------------------------- @@ -221,6 +221,18 @@ style_screen_btn_1_main_main_default.set_border_color(lv.color_make(0x64,0x64,0x style_screen_btn_1_main_main_default.set_border_width(0) style_screen_btn_1_main_main_default.set_border_opa(255) + +style_screen_btn_1_main_main_black = lv.style_t() +style_screen_btn_1_main_main_black.init() +style_screen_btn_1_main_main_black.set_radius(0) +style_screen_btn_1_main_main_black.set_bg_color(lv.color_make(0,0,0)) +style_screen_btn_1_main_main_black.set_bg_grad_color(lv.color_make(0,0,0)) +style_screen_btn_1_main_main_black.set_bg_grad_dir(lv.GRAD_DIR.NONE) +style_screen_btn_1_main_main_black.set_bg_opa(255) +style_screen_btn_1_main_main_black.set_border_color(lv.color_make(0,0,0)) +style_screen_btn_1_main_main_black.set_border_width(0) +style_screen_btn_1_main_main_black.set_border_opa(255) + style_circle = lv.style_t() style_circle.init() style_circle.set_bg_color(lv.color_make(0xff, 0xff, 0xff)) @@ -529,56 +541,57 @@ class PhoneScreen(Screen): self.meta = phone_screen + phone_screen.add_event_cb(lambda e:EventMesh.callback_wrapper(self.button_cb(e,0)), lv.EVENT.GESTURE, None) - phone_one.add_event_cb(lambda e: EventMesh.callback_wrapper(self.one(e)), + phone_one.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.SHORT_CLICKED, None) - phone_two.add_event_cb(lambda e: EventMesh.callback_wrapper(self.two(e)), + phone_two.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)), lv.EVENT.SHORT_CLICKED, None) - phone_three.add_event_cb(lambda e: EventMesh.callback_wrapper(self.three(e)), + phone_three.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,3)), lv.EVENT.SHORT_CLICKED, None) - phone_four.add_event_cb(lambda e: EventMesh.callback_wrapper(self.four(e)), + phone_four.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,4)), lv.EVENT.SHORT_CLICKED, None) - phone_five.add_event_cb(lambda e: EventMesh.callback_wrapper(self.five(e)), + phone_five.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,5)), lv.EVENT.SHORT_CLICKED, None) - phone_six.add_event_cb(lambda e: EventMesh.callback_wrapper(self.six(e)), + phone_six.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,6)), lv.EVENT.SHORT_CLICKED, None) - phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,7)), lv.EVENT.SHORT_CLICKED, None) - phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.LONG_PRESSED, None)#长按显示+ - phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.endpressed_start(e)), + phone_seven.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.RELEASED, None)#释放按键 - phone_eight.add_event_cb(lambda e: EventMesh.callback_wrapper(self.eight(e)), + phone_eight.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,8)), lv.EVENT.SHORT_CLICKED, None) - phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,9)), lv.EVENT.SHORT_CLICKED, None) - phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)), lv.EVENT.LONG_PRESSED, None)#长按显示+ - phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.nine_endpressed_start(e)), + phone_nine.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)), lv.EVENT.RELEASED, None)#释放按键 # phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero(e)), # lv.EVENT.SHORT_CLICKED, None) - phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,10)), lv.EVENT.SHORT_CLICKED, None)#短按显示* - phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.pressed_start(e)), + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,3)), lv.EVENT.LONG_PRESSED, None)#长按显示+ - phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.zero_endpressed_start(e)), + phone_zero.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,3)), lv.EVENT.RELEASED, None)#释放按键 - phone_call.add_event_cb(lambda e: EventMesh.callback_wrapper(self.call(e)), + phone_call.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,11)), lv.EVENT.SHORT_CLICKED, None) # phone_contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.contact(e)), # lv.EVENT.SHORT_CLICKED, None) - phone_delete.add_event_cb(lambda e: EventMesh.callback_wrapper(self.delete(e)), + phone_delete.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,12)), lv.EVENT.SHORT_CLICKED, None) # phone_start.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), @@ -607,7 +620,123 @@ class PhoneScreen(Screen): if self.timer_cb == 0: self.timer_cb = 1 # self.timer.start(1000,1,self.refresh_line) - + def button_cb(self,e,msg): + code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: #手势向左还是向右 还是向下向上 + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.SHORT_CLICKED: + if msg == 1: + self.one(e) + elif msg == 2: + self.two(e) + elif msg == 3: + self.three(e) + elif msg == 4: + self.four(e) + elif msg == 5: + self.five(e) + elif msg == 6: + self.six(e) + elif msg == 7: + self.button = 0 + elif msg == 8: + if len(self.phone_list) >= PHONE_CALL_MAX_DATA: + self.show_maxnum_warin() + return + self.phone_list.append("8") + self.phone_num = ''.join(self.phone_list) + self.show_num() + elif msg == 9: + self.button = 0 + elif msg == 10: + self.button = 0 + elif msg == 11: + self.call(e) + elif msg == 12: + self.delete(e) + elif code == lv.EVENT.LONG_PRESSED: + if msg == 1: + + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.button = 0 + return + self.button = 1 + if self.button == 1:#长按 + self.phone_list.append("*") + else:#短按 + self.phone_list.append("7") + self.phone_num = ''.join(self.phone_list) + self.show_num() + self.button = 0 + elif msg == 2: + + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.button = 0 + return + self.button = 1 + if self.button == 1:#长按 + self.phone_list.append("#") + else:#短按 + self.phone_list.append("9") + self.button = 0 + self.phone_num = ''.join(self.phone_list) + self.show_num() + + elif msg == 3: + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.button = 0 + return + self.button = 1 + if self.button == 1:#长按 + self.phone_list.append("+") + else:#短按 + self.phone_list.append("0") + self.button = 0 + self.phone_num = ''.join(self.phone_list) + self.show_num() + + + elif code == lv.EVENT.RELEASED: + if msg == 1: + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.button = 0 + return + if self.button == 1:#长按 + self.phone_list.append("*") + else:#短按 + self.phone_list.append("7") + self.phone_num = ''.join(self.phone_list) + self.show_num() + self.button = 0 + elif msg == 2: + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.button = 0 + return + if self.button == 1:#长按 + self.phone_list.append("#") + else:#短按 + self.phone_list.append("9") + self.phone_num = ''.join(self.phone_list) + self.show_num() + self.button = 0 + elif msg == 3: + if len(self.phone_list) >= PHONE_CALL_MAX_DATA:#限制拨号数量20个数字 + self.button = 0 + return + if self.button == 1:#长按 + self.phone_list.append("+") + else:#短按 + self.phone_list.append("0") + + self.phone_num = ''.join(self.phone_list) + self.show_num() + self.button = 0 + def refresh_line(self,e): return @@ -1940,25 +2069,28 @@ def msg_cb(args): storage = args[2] print("index:{}".format(index)) sms_data = sms.getSaveLoc() - sms_max = sms_data[0][2] - if index != -1: - tmp = sms.searchTextMsg(index) - detail = tmp[1]#内容 - if detail.find("SETIP:") != -1:#寻找是否有这个字符串 - tmp_test = detail.split("SETIP:")[1] - if tmp_test.find(":") != -1: - new_ip = tmp_test.split(':')[0] - print("tmp_test:{} new_ip:{}".format(tmp_test,new_ip)) - new_com = tmp_test.split(':')[1] - # new_md5 = detail.split(':')[3] - if len(new_ip) > 0 and len(new_com) > 0: - EventMesh.publish("set_new_ip_com", [new_ip,new_com,tmp[0]])#设置关机时间 - # EventMesh.publish("set_new_ip_com", [new_ip,new_com,new_md5])#设置关机时间 + if sms_data != -1: + sms_max = sms_data[0][2] + if index != -1: + tmp = sms.searchTextMsg(index) + detail = tmp[1]#内容 + if detail.find("SETIP:") != -1:#寻找是否有这个字符串 + tmp_test = detail.split("SETIP:")[1] + if tmp_test.find(":") != -1: + new_ip = tmp_test.split(':')[0] + print("tmp_test:{} new_ip:{}".format(tmp_test,new_ip)) + new_com = tmp_test.split(':')[1] + # new_md5 = detail.split(':')[3] + if len(new_ip) > 0 and len(new_com) > 0: + EventMesh.publish("set_new_ip_com", [new_ip,new_com,tmp[0]])#设置关机时间 + # EventMesh.publish("set_new_ip_com", [new_ip,new_com,new_md5])#设置关机时间 if index >= sms_max-1: - EventMesh.publish("load_screen", {"screen": "message_full"}) + EventMesh.publish_async("remove_all_sms_cb","",1*1024) + # EventMesh.publish("load_screen", {"screen": "message_full"}) else: - EventMesh.publish("load_screen", {"screen": "message_popup"}) + pass + # EventMesh.publish("load_screen", {"screen": "message_popup"}) sms.setCallback(msg_cb) style_sms_bg_btn = lv.style_t() @@ -4225,12 +4357,14 @@ class ContactsScreen(Screen): print("contacts_screen") contacts_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) contacts_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + contacts_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,0)), lv.EVENT.GESTURE, None) contacts_screen_list_screen = lv.obj(contacts_screen) contacts_screen_list_screen.set_pos(0, 30) contacts_screen_list_screen.set_size(LCD_X, LCD_Y-30) contacts_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) contacts_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + contacts_screen_list_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,0)), lv.EVENT.GESTURE, None) contacts_top_title = lv.label(contacts_screen) contacts_top_title.set_pos(0, 5) @@ -4254,12 +4388,13 @@ class ContactsScreen(Screen): self.contact_detail_list.set_size(LCD_X, LCD_Y-30+1) self.contact_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.contact_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + self.contact_detail_list.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,0)), lv.EVENT.GESTURE, None) for i in range(self.MXA_phone_num): contact_btn = lv.btn(self.contact_detail_list) contact_btn.add_flag(lv.obj.FLAG.CLICKABLE) - contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)), + contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,1)), lv.EVENT.SHORT_CLICKED, None) - contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)), lv.EVENT.PRESSING, None) + # contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)), lv.EVENT.PRESSING, None) contact_btn.add_flag(lv.obj.FLAG.HIDDEN) # contact_btn.add_style(style_press_btn, lv.PART.MAIN | lv.STATE.PRESSED) @@ -4322,7 +4457,7 @@ class ContactsScreen(Screen): self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_pos(0, 0) self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_size(LCD_X-15, 16) self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_text(key_tmp[4:]) - self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.CLIP) + self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.DOT) # self.contact_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.DOT) # self.contact_detail_listt_dict[i]["contact_btn_label_1"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4336,7 +4471,7 @@ class ContactsScreen(Screen): self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_pos(0, 20) self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_X-15, 16) self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_text(name) - self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_long_mode(lv.label.LONG.CLIP) + self.contact_detail_listt_dict[i]["contact_btn_label_3"].set_long_mode(lv.label.LONG.DOT) # self.contact_detail_listt_dict[i]["contact_btn_label_3"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -4352,26 +4487,41 @@ class ContactsScreen(Screen): contact_none_label.clear_flag(lv.obj.FLAG.HIDDEN) #显示空文本 if self.contact_detail_list != None: self.contact_detail_list.add_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本 - - - def calling_cb(self,e): + def calling_cb(self,e,msg): code = e.get_code() - if code == lv.EVENT.PRESSING: - #print("PRESSING") - self.is_sliding += 1 - + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) elif code == lv.EVENT.SHORT_CLICKED: - #utime.sleep_ms(10) - print("1self.is_sliding",self.is_sliding) - if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 - self.is_sliding = 0 + if msg == 1: if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机 msg_text = e.get_target().get_child(1).get_text() EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) else: EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) + + # def calling_cb(self,e): + # code = e.get_code() + # if code == lv.EVENT.PRESSING: + # #print("PRESSING") + # self.is_sliding += 1 + + # elif code == lv.EVENT.SHORT_CLICKED: + # #utime.sleep_ms(10) + # print("1self.is_sliding",self.is_sliding) + # if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + # self.is_sliding = 0 + # if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机 + # msg_text = e.get_target().get_child(1).get_text() + # EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) + # else: + # EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) - self.is_sliding =0 + # self.is_sliding =0 def calling(self,msg_text): @@ -5413,22 +5563,23 @@ class CountdownScreen(Screen): countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) self.meta = countdown_screen + countdown_screen.add_event_cb(lambda e:EventMesh.callback_wrapper(self.button_cb(e,0)), lv.EVENT.GESTURE, None) - countdown_sec_up_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.sec_up(e)), + countdown_sec_up_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.SHORT_CLICKED, None) - countdown_sec_down_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.sec_down(e)), + countdown_sec_down_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)), lv.EVENT.SHORT_CLICKED, None) - countdown_min_up_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.min_up(e)), + countdown_min_up_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,3)), lv.EVENT.SHORT_CLICKED, None) - countdown_min_down_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.min_down(e)), + countdown_min_down_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,4)), lv.EVENT.SHORT_CLICKED, None) - countdown_hour_up_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hour_up(e)), + countdown_hour_up_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,5)), lv.EVENT.SHORT_CLICKED, None) - countdown_hour_down_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.hour_down(e)), + countdown_hour_down_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,6)), lv.EVENT.SHORT_CLICKED, None) - countdown_start_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + countdown_start_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,7)), lv.EVENT.SHORT_CLICKED, None) - countdown_reset_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reset(e)), + countdown_reset_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,8)), lv.EVENT.SHORT_CLICKED, None) # countdown_stop_imgbtn.add_event_cb(lambda e: self.stop(e), # lv.EVENT.SHORT_CLICKED, None) @@ -5439,6 +5590,52 @@ class CountdownScreen(Screen): if self.timer_cb == 1: EventMesh.publish("set_countdown_off_state", [0,self.g_state]) self.timer.start(1000,1,self.fun) + def button_cb(self,e,msg): + code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.SHORT_CLICKED: + if msg == 1: + EventMesh.publish("add_countdown_sec") + self.sec = EventMesh.publish("get_countdown_sec") + print("sec_up:",self.sec) + self.show_value() + elif msg == 2: + EventMesh.publish("reduce_countdown_sec") + self.sec = EventMesh.publish("get_countdown_sec") + print("sec_down:",self.sec) + self.show_value() + elif msg == 3: + EventMesh.publish("add_countdown_min") + self.min = EventMesh.publish("get_countdown_min") + print("min_up:",self.min) + self.show_value() + elif msg == 4: + EventMesh.publish("reduce_countdown_min") + self.min = EventMesh.publish("get_countdown_min") + print("min_down:",self.min) + self.show_value() + elif msg == 5: + EventMesh.publish("add_countdown_hour") + self.hour = EventMesh.publish("get_countdown_hour") + + print("hour_up:",self.hour) + self.show_value() + elif msg == 6: + EventMesh.publish("reduce_countdown_hour") + self.hour = EventMesh.publish("get_countdown_hour") + print("hour_down:",self.hour) + self.show_value() + elif msg == 7: + self.start(e) + elif msg == 8: + self.reset(e) + def post_processor_after_initialization(self): global countdown_screen ,countdown_title,countdown_hour ,countdown_mao ,countdown_mao ,countdown_mao1 ,\ countdown_sec ,countdown_hour_up ,countdown_hour_up_btn ,countdown_hour_down ,countdown_hour_down_btn ,\ @@ -5584,20 +5781,21 @@ class CountdownScreen(Screen): # print("self.total:{} self.time_tmp:{} self.timeSecond:{} test_hour:{} test_min:{} test_sec:{}".format(self.total,self.time_tmp,self.timeSecond,test_hour,test_min,test_sec)) - self.show_value() + # print("Close self.timeSecond:22") EventMesh.publish("set_countdown_all_time", [self.total,self.timeSecond]) if self.total <= 0: + EventMesh.publish("set_countdown_off_state", [0,self.g_state]) + self.timer.stop() + EventMesh.publish("load_screen", {"screen": "countdown_end"}) self.g_state = 0 self.g_end = 1 self.hour = 0 self.min = 0 self.sec = 0 - EventMesh.publish("set_countdown_off_state", [0,self.g_state]) - self.timer.stop() - self.show_value() - EventMesh.publish("load_screen", {"screen": "countdown_end"}) - + + else: + self.show_value() # self.total = self.total - 1 # self.sec = self.sec - 1 @@ -5657,7 +5855,63 @@ class CountdownScreen(Screen): countdown_min_up,countdown_min_up_btn ,countdown_min_down,countdown_min_down_btn,countdown_sec_up ,\ countdown_sec_up_btn,countdown_sec_down ,countdown_sec_down_btn ,countdown_reset_img ,countdown_reset_imgbtn ,\ countdown_start_img,countdown_start_imgbtn,countdown_stop_img ,countdown_min - + if self.g_state == 0:#没点开始 + countdown_start_img.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN) + countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_up_btn.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down_btn.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up_btn.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down_btn.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up_btn.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_up.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_sec.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_min.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_hour.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_title.clear_flag(lv.obj.FLAG.HIDDEN) + + elif self.g_state == 1:#计时 + countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_up_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_start_img.add_flag(lv.obj.FLAG.HIDDEN) + countdown_stop_img.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) + elif self.g_state == 2:#暂停 + countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_up_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_hour_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_up_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_min_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_up_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_sec_down_btn.add_flag(lv.obj.FLAG.HIDDEN) + countdown_start_img.clear_flag(lv.obj.FLAG.HIDDEN) + countdown_stop_img.add_flag(lv.obj.FLAG.HIDDEN) + countdown_reset_img.clear_flag(lv.obj.FLAG.HIDDEN) countdown_sec.set_text(str("%02d"%(self.sec))) countdown_min.set_text(str("%02d"%(self.min))) countdown_hour.set_text(str("%02d"%(self.hour))) @@ -5858,7 +6112,9 @@ class StopwatchScreen(Screen): stopwatch_screen = lv.obj() print("stopwatch_screen") stopwatch_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) - + stopwatch_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,0)), + lv.EVENT.GESTURE, None) + stopwatch_title = lv.label(stopwatch_screen) stopwatch_title.set_pos(0, 5) stopwatch_title.set_size(128, 20) @@ -5943,10 +6199,10 @@ class StopwatchScreen(Screen): stopwatch_stop_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) stopwatch_stop_img.set_pos(66, 90) stopwatch_stop_img.add_flag(lv.obj.FLAG.HIDDEN) - stopwatch_start_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.start(e)), + stopwatch_start_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.SHORT_CLICKED, None) - stopwatch_reset_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reset(e)), + stopwatch_reset_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)), lv.EVENT.SHORT_CLICKED, None) self.meta = stopwatch_screen @@ -5966,7 +6222,22 @@ class StopwatchScreen(Screen): else: self.timer.start(100,1,self._fun) - + def button_cb(self,e,msg): + code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: #手势向左还是向右 还是向下向上 + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("return_prev_screen") + elif code == lv.EVENT.SHORT_CLICKED: + if msg == 1: + self.start(e) + pass + elif msg == 2: + self.reset(e) + pass def start(self, e): global stopwatch_screen,stopwatch_title,stopwatch_label_min,stopwatch_mao,stopwatch_label_sec ,\ stopwatch_mao1 ,stopwatch_label_ms,stopwatch_reset_img ,stopwatch_start_img ,\ @@ -7057,28 +7328,52 @@ class classMgrPopupScreen(Screen):#上课禁用时间界面 # -------------------------------------------down screen---------------------------------------------------------- down_show_screen = lv.obj() -print("restart_screen") +print("down_show_screen") down_show_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + +down_show_bright_imgbtn_1 = lv.btn(down_show_screen) +down_show_bright_imgbtn_1.set_pos(int(0),80) +down_show_bright_imgbtn_1.set_size(44,48) +down_show_bright_imgbtn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +down_show_bright_imgbtn_1.add_style(style_screen_btn_1_main_main_black, lv.PART.MAIN|lv.STATE.DEFAULT) +down_show_bright_imgbtn_1.add_flag(lv.obj.FLAG.CLICKABLE) + + down_show_bright_img = lv.img(down_show_screen)#亮度 down_show_bright_img.set_size(25, 25) down_show_bright_img.set_pos(13, 90) down_show_bright_img.set_src("U:/static/menu_bright.png") -down_show_bright_img.add_flag(lv.obj.FLAG.CLICKABLE) +# down_show_bright_img.add_flag(lv.obj.FLAG.CLICKABLE) down_show_bright_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) + +down_show_volume_imgbtn_1 = lv.btn(down_show_screen) +down_show_volume_imgbtn_1.set_pos(int(44),80) +down_show_volume_imgbtn_1.set_size(37,48) +down_show_volume_imgbtn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +down_show_volume_imgbtn_1.add_style(style_screen_btn_1_main_main_black, lv.PART.MAIN|lv.STATE.DEFAULT) +down_show_volume_imgbtn_1.add_flag(lv.obj.FLAG.CLICKABLE) + down_show_volume_img = lv.img(down_show_screen)#音量 down_show_volume_img.set_size(25, 25) down_show_volume_img.set_pos(13+25+13, 90) down_show_volume_img.set_src("U:/static/menu_volume.png") -down_show_volume_img.add_flag(lv.obj.FLAG.CLICKABLE) +# down_show_volume_img.add_flag(lv.obj.FLAG.CLICKABLE) down_show_volume_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) +down_show_setting_imgbtn_1 = lv.btn(down_show_screen) +down_show_setting_imgbtn_1.set_pos(int(81),80) +down_show_setting_imgbtn_1.set_size(47,48) +down_show_setting_imgbtn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) +down_show_setting_imgbtn_1.add_style(style_screen_btn_1_main_main_black, lv.PART.MAIN|lv.STATE.DEFAULT) +down_show_setting_imgbtn_1.add_flag(lv.obj.FLAG.CLICKABLE) + down_show_setting_img = lv.img(down_show_screen)#设置 down_show_setting_img.set_size(25, 25) down_show_setting_img.set_pos(13+25+13+25+13, 90) down_show_setting_img.set_src("U:/static/ui_setting.png") -down_show_setting_img.add_flag(lv.obj.FLAG.CLICKABLE) +# down_show_setting_img.add_flag(lv.obj.FLAG.CLICKABLE) down_show_setting_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -7148,131 +7443,6 @@ down_show_date_span.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) down_show_date_span.set_text("%02d/%02d 星期%s"%(date1,date2,get_week(week))) down_show_date_span.add_style(style_font_youyuan_28, lv.PART.MAIN|lv.STATE.DEFAULT) -# volum_bar_1 = lv.bar(down_show_screen) -# volum_bar_1.set_pos(int(10),int(65)) -# volum_bar_1.set_size(108,15) -# volum_bar_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -# volum_bar_1.set_style_anim_time(1000, 0) -# volum_bar_1.set_mode(lv.bar.MODE.NORMAL) -# volum_bar_1.set_value(100, lv.ANIM.OFF) -# volum_bar_1.add_flag(lv.obj.FLAG.HIDDEN) -# # create style style_screen_bar_1_main_main_default -# style_screen_bar_1_main_main_default = lv.style_t() -# style_screen_bar_1_main_main_default.init() -# style_screen_bar_1_main_main_default.set_radius(10) -# style_screen_bar_1_main_main_default.set_bg_color(lv.color_make(0x00,0x00,0x00)) -# style_screen_bar_1_main_main_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6)) -# style_screen_bar_1_main_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_bar_1_main_main_default.set_bg_opa(60) - -# # add style for screen_bar_1 -# volum_bar_1.add_style(style_screen_bar_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) - -# # create style style_screen_bar_1_main_indicator_default -# style_screen_bar_1_main_indicator_default = lv.style_t() -# style_screen_bar_1_main_indicator_default.init() -# style_screen_bar_1_main_indicator_default.set_radius(10) -# style_screen_bar_1_main_indicator_default.set_bg_color(lv.color_make(0x80,0x80,0x80)) -# style_screen_bar_1_main_indicator_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6)) -# style_screen_bar_1_main_indicator_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_bar_1_main_indicator_default.set_bg_opa(255) - -# # add style for screen_bar_1 -# volum_bar_1.add_style(style_screen_bar_1_main_indicator_default, lv.PART.INDICATOR|lv.STATE.DEFAULT) - -# volum_slider_1 = lv.slider(down_show_screen) -# volum_slider_1.set_pos(int(19),int(70)) -# volum_slider_1.set_size(90,5) -# volum_slider_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -# volum_slider_1.set_range(0, 100) -# volum_slider_1.set_value(0, False) -# volum_slider_1.add_flag(lv.obj.FLAG.HIDDEN) -# create style style_screen_slider_1_main_main_default -# style_screen_slider_1_main_main_default = lv.style_t() -# style_screen_slider_1_main_main_default.init() -# style_screen_slider_1_main_main_default.set_radius(30) -# style_screen_slider_1_main_main_default.set_bg_color(lv.color_make(237,30,121)) -# style_screen_slider_1_main_main_default.set_bg_grad_color(lv.color_make(237,30,121)) -# style_screen_slider_1_main_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_slider_1_main_main_default.set_bg_opa(0) -# style_screen_slider_1_main_main_default.set_outline_color(lv.color_make(237,30,121)) -# style_screen_slider_1_main_main_default.set_outline_width(0) -# style_screen_slider_1_main_main_default.set_outline_opa(0) - -# # add style for screen_slider_1 -# volum_slider_1.add_style(style_screen_slider_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) - -# create style style_screen_slider_1_main_indicator_default -# style_screen_volum_slider_1_main_indicator_default = lv.style_t() -# style_screen_volum_slider_1_main_indicator_default.init() -# style_screen_volum_slider_1_main_indicator_default.set_radius(30) -# style_screen_volum_slider_1_main_indicator_default.set_bg_color(lv.color_make(237,30,121)) -# style_screen_volum_slider_1_main_indicator_default.set_bg_grad_color(lv.color_make(237,30,121)) -# style_screen_volum_slider_1_main_indicator_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_volum_slider_1_main_indicator_default.set_bg_opa(255) - -# # add style for screen_slider_1 -# volum_slider_1.add_style(style_screen_volum_slider_1_main_indicator_default, lv.PART.INDICATOR|lv.STATE.DEFAULT) - -# # create style style_screen_slider_1_main_knob_default -# style_screen_volum_slider_1_main_knob_default = lv.style_t() -# style_screen_volum_slider_1_main_knob_default.init() -# style_screen_volum_slider_1_main_knob_default.set_radius(30) -# style_screen_volum_slider_1_main_knob_default.set_bg_color(lv.color_make(237,30,121)) -# style_screen_volum_slider_1_main_knob_default.set_bg_grad_color(lv.color_make(237,30,121)) -# style_screen_volum_slider_1_main_knob_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_volum_slider_1_main_knob_default.set_bg_opa(255) - -# # add style for screen_slider_1 -# volum_slider_1.add_style(style_screen_volum_slider_1_main_knob_default, lv.PART.KNOB|lv.STATE.DEFAULT) - - - -# brightress_slider_1 = lv.slider(down_show_screen) -# brightress_slider_1.set_pos(int(19),int(70)) -# brightress_slider_1.set_size(90,5) -# brightress_slider_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) -# brightress_slider_1.set_range(0, 100) -# brightress_slider_1.set_value(0, False) -# brightress_slider_1.add_flag(lv.obj.FLAG.HIDDEN) -# create style style_screen_slider_1_main_main_default -# style_screen_slider_1_main_main_default = lv.style_t() -# style_screen_slider_1_main_main_default.init() -# style_screen_slider_1_main_main_default.set_radius(30) -# style_screen_slider_1_main_main_default.set_bg_color(lv.color_make(247,147,30)) -# style_screen_slider_1_main_main_default.set_bg_grad_color(lv.color_make(247,147,30)) -# style_screen_slider_1_main_main_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_slider_1_main_main_default.set_bg_opa(0) -# style_screen_slider_1_main_main_default.set_outline_color(lv.color_make(247,147,30)) -# style_screen_slider_1_main_main_default.set_outline_width(0) -# style_screen_slider_1_main_main_default.set_outline_opa(0) - -# # add style for screen_slider_1 -# brightress_slider_1.add_style(style_screen_slider_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) - -# # create style style_screen_slider_1_main_indicator_default -# style_screen_slider_1_main_indicator_default = lv.style_t() -# style_screen_slider_1_main_indicator_default.init() -# style_screen_slider_1_main_indicator_default.set_radius(30) -# style_screen_slider_1_main_indicator_default.set_bg_color(lv.color_make(247,147,30)) -# style_screen_slider_1_main_indicator_default.set_bg_grad_color(lv.color_make(247,147,30)) -# style_screen_slider_1_main_indicator_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_slider_1_main_indicator_default.set_bg_opa(255) - -# # add style for screen_slider_1 -# brightress_slider_1.add_style(style_screen_slider_1_main_indicator_default, lv.PART.INDICATOR|lv.STATE.DEFAULT) - -# # create style style_screen_slider_1_main_knob_default -# style_screen_slider_1_main_knob_default = lv.style_t() -# style_screen_slider_1_main_knob_default.init() -# style_screen_slider_1_main_knob_default.set_radius(30) -# style_screen_slider_1_main_knob_default.set_bg_color(lv.color_make(247,147,30)) -# style_screen_slider_1_main_knob_default.set_bg_grad_color(lv.color_make(247,147,30)) -# style_screen_slider_1_main_knob_default.set_bg_grad_dir(lv.GRAD_DIR.NONE) -# style_screen_slider_1_main_knob_default.set_bg_opa(255) - -# # add style for screen_slider_1 -# brightress_slider_1.add_style(style_screen_slider_1_main_knob_default, lv.PART.KNOB|lv.STATE.DEFAULT) class down_Screen(Screen):#下滑界面 NAME = "down_screen" @@ -7287,38 +7457,54 @@ class down_Screen(Screen):#下滑界面 # brightress_slider_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.change_bright(e)), lv.EVENT.RELEASED, None) # volum_slider_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.save_choice(e)), lv.EVENT.VALUE_CHANGED, None) # volum_slider_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.save_choice(e)), lv.EVENT.RELEASED, None) + down_show_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"void")), lv.EVENT.GESTURE, None) + down_show_bright_imgbtn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"brightness")), lv.EVENT.SHORT_CLICKED, None) + down_show_volume_imgbtn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"totalvolume")), lv.EVENT.SHORT_CLICKED, None) + down_show_setting_imgbtn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"setting")), lv.EVENT.SHORT_CLICKED, None) - down_show_bright_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"brightness")), lv.EVENT.SHORT_CLICKED, None) - down_show_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"totalvolume")), lv.EVENT.SHORT_CLICKED, None) - down_show_setting_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"setting")), lv.EVENT.SHORT_CLICKED, None) - - down_show_bright_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"brightness")), lv.EVENT.PRESSING, None) - down_show_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"totalvolume")), lv.EVENT.PRESSING, None) - down_show_setting_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"setting")), lv.EVENT.PRESSING, None) + # down_show_bright_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"brightness")), lv.EVENT.PRESSING, None) + # down_show_volume_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"totalvolume")), lv.EVENT.PRESSING, None) + # down_show_setting_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e,"setting")), lv.EVENT.PRESSING, None) def img_cb(self,e,msg): code = e.get_code() indev = lv.indev_get_act() lv.indev_t.wait_release(indev) dir = lv.indev_t.get_gesture_dir(indev) - # LV_DIR_TOP if code == lv.EVENT.GESTURE: if dir == lv.DIR.BOTTOM: - EventMesh.publish("load_screen", {"screen": "main_menu"}) - + pass + # EventMesh.publish("watch_top_show") + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) elif code == lv.EVENT.SHORT_CLICKED: - if msg == "brightness": - # volum_slider_1.add_flag(lv.obj.FLAG.HIDDEN) - # brightress_slider_1.clear_flag(lv.obj.FLAG.HIDDEN) - EventMesh.publish("load_screen", {"screen": "brightness"}) - elif msg == "totalvolume": - # brightress_slider_1.add_flag(lv.obj.FLAG.HIDDEN) - # volum_slider_1.clear_flag(lv.obj.FLAG.HIDDEN) - EventMesh.publish("load_screen", {"screen": "totalvolume"}) - else: - if msg == 'setting': + if msg != "void": + if msg == "brightness": + EventMesh.publish("load_screen", {"screen": "brightness"}) + elif msg == "totalvolume": + EventMesh.publish("load_screen", {"screen": "totalvolume"}) + elif msg == 'setting': EventMesh.publish("load_screen", {"screen": "setting"}) - pass + # def img_cb(self,e,msg): + # code = e.get_code() + # indev = lv.indev_get_act() + # lv.indev_t.wait_release(indev) + # dir = lv.indev_t.get_gesture_dir(indev) + # # LV_DIR_TOP + # if code == lv.EVENT.GESTURE: + # if dir == lv.DIR.BOTTOM: + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + # elif dir == lv.DIR.RIGHT: + # pass + # elif code == lv.EVENT.SHORT_CLICKED: + # if msg == "brightness": + # EventMesh.publish("load_screen", {"screen": "brightness"}) + # elif msg == "totalvolume": + # EventMesh.publish("load_screen", {"screen": "totalvolume"}) + # elif msg == 'setting': + # EventMesh.publish("load_screen", {"screen": "setting"}) @@ -8423,7 +8609,7 @@ class VedioShowScreen(Screen):#正在视频通话中 jrtc.open(uid,ticket,[],[]) else: jrtc.open(uid,ticket,[15,129,128,128],[15,120,240,320]) - jrtc.set_cam_angle(jrtc.CAM_ROTATE_180) + jrtc.set_cam_angle(jrtc.CAM_ROTATE_270) def close_jrtc_event(self,event,msg): @@ -9266,12 +9452,14 @@ class videolistScreen(Screen): print("videolist_screen") videolist_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) videolist_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + videolist_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,0)), lv.EVENT.GESTURE, None) videolist_screen_list_screen = lv.obj(videolist_screen) videolist_screen_list_screen.set_pos(0, 30) videolist_screen_list_screen.set_size(LCD_X, LCD_Y-30) videolist_screen_list_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) videolist_screen_list_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + videolist_screen_list_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,0)), lv.EVENT.GESTURE, None) videolist_top_title = lv.label(videolist_screen) @@ -9290,18 +9478,21 @@ class videolistScreen(Screen): videolist_none_label.set_long_mode(lv.label.LONG.WRAP) videolist_none_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) videolist_none_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT) + self.videolist_detail_list = lv.obj(videolist_screen_list_screen) self.videolist_detail_list.set_pos(0, 0) self.videolist_detail_list.set_size(LCD_X, LCD_Y-30+1) self.videolist_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) self.videolist_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + self.videolist_detail_list.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,0)), lv.EVENT.GESTURE, None) + for i in range(self.MXA_phone_num): contact_btn = lv.btn(self.videolist_detail_list) contact_btn.add_flag(lv.obj.FLAG.CLICKABLE) - contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)), + contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e,1)), lv.EVENT.SHORT_CLICKED, None) - contact_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_cb(e)), lv.EVENT.PRESSING, None) + contact_btn.add_flag(lv.obj.FLAG.HIDDEN) # contact_btn.add_style(style_press_btn, lv.PART.MAIN | lv.STATE.PRESSED) @@ -9366,9 +9557,9 @@ class videolistScreen(Screen): #contact_btn_label_1 = lv.label(contact_btn) self.videolist_detail_listt_dict[i]["contact_btn_label_1"].set_pos(0, 0) - self.videolist_detail_listt_dict[i]["contact_btn_label_1"].set_size(LCD_X-15, 16) + self.videolist_detail_listt_dict[i]["contact_btn_label_1"].set_size(LCD_X-5, 16) self.videolist_detail_listt_dict[i]["contact_btn_label_1"].set_text(key_tmp[4:]) - self.videolist_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.CLIP) + self.videolist_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.DOT) # self.videolist_detail_listt_dict[i]["contact_btn_label_1"].set_long_mode(lv.label.LONG.DOT) # self.videolist_detail_listt_dict[i]["contact_btn_label_1"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -9380,9 +9571,9 @@ class videolistScreen(Screen): #contact_btn_label_3 = lv.label(contact_btn) self.videolist_detail_listt_dict[i]["contact_btn_label_3"].set_pos(0, 20) - self.videolist_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_X-15, 16) + self.videolist_detail_listt_dict[i]["contact_btn_label_3"].set_size(LCD_X-5, 16) self.videolist_detail_listt_dict[i]["contact_btn_label_3"].set_text(name) - self.videolist_detail_listt_dict[i]["contact_btn_label_3"].set_long_mode(lv.label.LONG.CLIP) + self.videolist_detail_listt_dict[i]["contact_btn_label_3"].set_long_mode(lv.label.LONG.DOT) # self.videolist_detail_listt_dict[i]["contact_btn_label_3"].add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT) @@ -9398,28 +9589,24 @@ class videolistScreen(Screen): videolist_none_label.clear_flag(lv.obj.FLAG.HIDDEN) #显示空文本 if self.videolist_detail_list != None: self.videolist_detail_list.add_flag(lv.obj.FLAG.HIDDEN)#隐藏空文本 - - - def calling_cb(self,e): + def calling_cb(self,e,msg): code = e.get_code() - if code == lv.EVENT.PRESSING: - #print("PRESSING") - self.is_sliding += 1 + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: #手势向左还是向右 还是向下向上 + if dir == lv.DIR.RIGHT: + pass elif code == lv.EVENT.SHORT_CLICKED: - #utime.sleep_ms(10) - print("1self.is_sliding",self.is_sliding) - if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 - self.is_sliding = 0 + if msg == 1: if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1:#有卡时触发sos报警 无卡时自动关机 msg_text = e.get_target().get_child(1).get_text() # EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) EventMesh.publish("load_screen", {"screen": "vedio_mode","meta":msg_text}) else: EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) - - self.is_sliding =0 - + def calling(self,msg_text): pass @@ -9472,6 +9659,7 @@ class videoModeScreen(Screen):#通话模式选择 video_select_mode_screen = lv.obj() print("video_select_mode_screen") video_select_mode_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT) + video_select_mode_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,0)), lv.EVENT.GESTURE, None) video_select_mode_name = lv.label(video_select_mode_screen) video_select_mode_name.set_pos(0, 20) @@ -9527,13 +9715,13 @@ class videoModeScreen(Screen):#通话模式选择 self.meta = video_select_mode_screen - video_select_mode_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,0)), + video_select_mode_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,1)), lv.EVENT.SHORT_CLICKED, None) - video_select_mode_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,0)), lv.EVENT.PRESSING, None) + # video_select_mode_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,0)), lv.EVENT.PRESSING, None) - video_select_mode_btn1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,1)), + video_select_mode_btn1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,2)), lv.EVENT.SHORT_CLICKED, None) - video_select_mode_btn1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,1)), lv.EVENT.PRESSING, None) + # video_select_mode_btn1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.calling_vedio_cb(e,1)), lv.EVENT.PRESSING, None) if self.meta_info != None: if len(str(self.meta_info)) != 0: @@ -9556,23 +9744,21 @@ class videoModeScreen(Screen):#通话模式选择 pass def calling_vedio_cb(self,e,data):#视频通话 code = e.get_code() - if code == lv.EVENT.PRESSING: - #print("PRESSING") - self.is_sliding += 1 + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass elif code == lv.EVENT.SHORT_CLICKED: - #utime.sleep_ms(10) - print("1self.is_sliding",self.is_sliding) - if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 - self.is_sliding = 0 - if data == 1: - msg_text = [self.meta_info,1] - EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) - else: - msg_text = [self.meta_info,0] - EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) - self.is_sliding = 0 - pass + if data == 1: #语音通话 + msg_text = [self.meta_info,0] + EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) + + elif data == 2:# 视频通话 + msg_text = [self.meta_info,1] + EventMesh.publish("publish_message_event_ui",{"func":self.calling,"data":msg_text}) def calling(self,msg_text): _msg = msg_text[0] @@ -9591,7 +9777,6 @@ class videoModeScreen(Screen):#通话模式选择 self.timer.stop() def done_return(self): - pass EventMesh.publish("return_prev_screen") diff --git a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py index 4e1c9dcf..bd2eb986 100644 --- a/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py +++ b/2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ui_main_menu.py @@ -113,28 +113,28 @@ MainMenu2_img_toolbox_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv. MainMenu2_num+=1 MainMenu2x+=1 -#加好友,暂时没有 -MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.ALL) -label_text = lv.label(MainMenu2_toolbox) -label_text.set_pos(0, 0) -label_text.set_size(0, 0) -label_text.set_text("{}".format(MainMenu2_num)) -MainMenu2_img_add_friends = lv.img(MainMenu2_toolbox) -MainMenu2_img_add_friends.set_size(80,80) -MainMenu2_img_add_friends.set_pos(24,10) -MainMenu2_img_add_friends.set_src("U:/static/IMAGE_ONE_PAGE_FRIEND.png") -MainMenu2_img_add_friends.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_add_friends.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) - -MainMenu2_img_add_friends_txt = lv.label(MainMenu2_toolbox) -MainMenu2_img_add_friends_txt.set_pos(int(0),int(100)) -MainMenu2_img_add_friends_txt.set_size(128,20) -MainMenu2_img_add_friends_txt.add_flag(lv.obj.FLAG.CLICKABLE) -MainMenu2_img_add_friends_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) -MainMenu2_img_add_friends_txt.set_text("交友") -MainMenu2_img_add_friends_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) -MainMenu2_num+=1 -MainMenu2x+=1 +# #加好友,暂时没有 +# MainMenu2_toolbox = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.ALL) +# label_text = lv.label(MainMenu2_toolbox) +# label_text.set_pos(0, 0) +# label_text.set_size(0, 0) +# label_text.set_text("{}".format(MainMenu2_num)) +# MainMenu2_img_add_friends = lv.img(MainMenu2_toolbox) +# MainMenu2_img_add_friends.set_size(80,80) +# MainMenu2_img_add_friends.set_pos(24,10) +# MainMenu2_img_add_friends.set_src("U:/static/IMAGE_ONE_PAGE_FRIEND.png") +# MainMenu2_img_add_friends.add_flag(lv.obj.FLAG.CLICKABLE) +# MainMenu2_img_add_friends.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +# MainMenu2_img_add_friends_txt = lv.label(MainMenu2_toolbox) +# MainMenu2_img_add_friends_txt.set_pos(int(0),int(100)) +# MainMenu2_img_add_friends_txt.set_size(128,20) +# MainMenu2_img_add_friends_txt.add_flag(lv.obj.FLAG.CLICKABLE) +# MainMenu2_img_add_friends_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +# MainMenu2_img_add_friends_txt.set_text("交友") +# MainMenu2_img_add_friends_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +# MainMenu2_num+=1 +# MainMenu2x+=1 #微聊 MainMenu2_wechat = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.ALL) @@ -159,6 +159,31 @@ MainMenu2_img_wechat_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.S MainMenu2_num+=1 MainMenu2x+=1 + +#AI语音 + +MainMenu2_ai = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.ALL) +label_text = lv.label(MainMenu2_ai) +label_text.set_pos(0, 0) +label_text.set_size(0, 0) +label_text.set_text("{}".format(MainMenu2_num)) +MainMenu2_img_ai_main = lv.img(MainMenu2_ai) +MainMenu2_img_ai_main.set_size(80,80) +MainMenu2_img_ai_main.set_pos(24,10) +MainMenu2_img_ai_main.set_src("U:/static/AI_MAIN_ICON.png") +MainMenu2_img_ai_main.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_ai_main.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT) + +MainMenu2_img_ai_main_txt = lv.label(MainMenu2_ai) +MainMenu2_img_ai_main_txt.set_pos(int(0),int(100)) +MainMenu2_img_ai_main_txt.set_size(128,20) +MainMenu2_img_ai_main_txt.add_flag(lv.obj.FLAG.CLICKABLE) +MainMenu2_img_ai_main_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0) +MainMenu2_img_ai_main_txt.set_text("AI助手") +MainMenu2_img_ai_main_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT) +MainMenu2_num+=1 +MainMenu2x+=1 + #视频通话 MainMenu2_heartrate = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.ALL) label_text = lv.label(MainMenu2_heartrate) @@ -183,6 +208,7 @@ MainMenu2_num+=1 MainMenu2x+=1 #表盘 +watchface_id = MainMenu2_num MainMenu2_Watchface = MainMenu2_til.add_tile(MainMenu2_num,0, lv.DIR.ALL) label_text = lv.label(MainMenu2_Watchface) label_text.set_pos(0, 0) @@ -290,6 +316,7 @@ MainMenu2x+=1 #设置 +setting_id = MainMenu2_num MainMenu2_setting = MainMenu2_til.add_tile(MainMenu2x, 0, lv.DIR.ALL) #MainMenu2_setting.set_tile_act(0,0,lv.ANIM.ON) label_text = lv.label(MainMenu2_setting) @@ -363,29 +390,31 @@ class MainMenuScreen(Screen): self.watchface = WatchFace() self.menu_id = "0" print("MainMenu1:__init__") + MainMenu2.add_event_cb(lambda e:EventMesh.callback_wrapper(self.img_cb(e,"void")), lv.EVENT.GESTURE, None) # MainMenu2_til.add_event_cb(lambda e: EventMesh.callback_wrapper(self.scroll_begin_event(e)),lv.EVENT.ALL,None) #lv_obj_add_event_cb(lv_tabview_get_content(tabview), scroll_begin_event, LV_EVENT_SCROLL_END, NULL); MainMenu2_img_phone.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "Phone")), lv.EVENT.SHORT_CLICKED, None) MainMenu2_img_toolbox.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "toolbox")), lv.EVENT.SHORT_CLICKED, None) MainMenu2_img_setting.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "setting")), lv.EVENT.SHORT_CLICKED, None) - MainMenu2_img_add_friends.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "pp_main")), lv.EVENT.SHORT_CLICKED, None) + # MainMenu2_img_add_friends.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "pp_main")), lv.EVENT.SHORT_CLICKED, None) MainMenu2_img_camera_video.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "videolist")), lv.EVENT.SHORT_CLICKED, None) MainMenu2_img_camera.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera")), lv.EVENT.SHORT_CLICKED, None) MainMenu2_img_camera_album.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "camera_album")), lv.EVENT.SHORT_CLICKED, None) MainMenu2_img_contacts.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "contacts")), lv.EVENT.SHORT_CLICKED, None) + MainMenu2_img_ai_main.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "AI_success")), lv.EVENT.SHORT_CLICKED, None) MainMenu2_img_wechat.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "wechat")), lv.EVENT.SHORT_CLICKED, None) # MainMenu2_img_spo2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "spo2")), lv.EVENT.SHORT_CLICKED, None) #MainMenu2_img_sms.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "popup")), lv.EVENT.SHORT_CLICKED, None) - MainMenu2_img_phone.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "Phone")), lv.EVENT.PRESSING, None) - 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, "videolist")), 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.PRESSING, 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) + # MainMenu2_img_phone.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "Phone")), lv.EVENT.PRESSING, None) + # 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, "videolist")), 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.PRESSING, 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) # MainMenu2_img_spo2.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "spo2")), lv.EVENT.SHORT_CLICKED, None) #MainMenu2_img_sms.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "popup")), lv.EVENT.SHORT_CLICKED, None) @@ -398,7 +427,7 @@ class MainMenuScreen(Screen): self.watchface.initialization(MainMenu2_Watchface) print("self.menu_id",self.menu_id) if self.menu_id =="0": - MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(watchface_id,0,lv.ANIM.OFF) # if self.meta_info in globals() : # MainMenu2_til.set_tile_id(self.meta_info[0],self.meta_info[1],lv.ANIM.OFF) pass# @@ -407,10 +436,47 @@ class MainMenuScreen(Screen): def watch_top_show(self, event, msg): # - MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(watchface_id,0,lv.ANIM.OFF) def img_cb(self, e, msg): code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.SHORT_CLICKED: + state = EventMesh.publish("get_key_board", "key_board") + # print("msg",type(msg),msg,state) + if state == 1: + # print("state11",state) + if msg == 'Phone': + # print("Phone",state) + EventMesh.publish("load_screen", {"screen": "keyboard_popup"}) + pass + else: + if msg == "pp_main": + if EventMesh.publish(constants.EVENT.GET_CONNECT) == 0:#未联网提示关机 + EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) + return + else: + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + else: + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + + else: + if msg == "pp_main": + if EventMesh.publish(constants.EVENT.GET_CONNECT) == 0:#未联网提示关机 + EventMesh.publish("load_screen", {"screen": "no_sim_popup_screen"}) + return + else: + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + else: + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + def img_cb_1(self, e, msg): + code = e.get_code() #print("code!!!!!!!!",code,msg) if code == lv.EVENT.PRESSING: @@ -464,7 +530,7 @@ class MainMenuScreen(Screen): self.watchface.timer_update.stop() def done_return(self): - MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(watchface_id,0,lv.ANIM.OFF) #返回表盘界面 def btn1_release(self): flag = EventMesh.publish("get_lcd_state") @@ -475,10 +541,10 @@ class MainMenuScreen(Screen): id = MainMenu2_til.get_tile_act().get_child(0).get_text() #if id != "0": - MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(watchface_id,0,lv.ANIM.OFF) - def return_setiing(self, event, msg): - MainMenu2_til.set_tile_id(7,0,lv.ANIM.OFF) + def return_setiing(self, event, msg): #返回设置界面 + MainMenu2_til.set_tile_id(setting_id,0,lv.ANIM.OFF) @@ -486,31 +552,32 @@ class MainMenuScreen(Screen): flag = EventMesh.publish("get_lcd_state") if MainMenu2_til.get_tile_act() != None: id = MainMenu2_til.get_tile_act().get_child(0).get_text() - if id == "4": + if id == str(watchface_id): if flag == 1: EventMesh.publish(constants.EVENT.SYSTEM_SLEEP) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) else: if flag == 1: - MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(watchface_id,0,lv.ANIM.OFF) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) else: if flag == 1: - MainMenu2_til.set_tile_id(4,0,lv.ANIM.OFF) + MainMenu2_til.set_tile_id(watchface_id,0,lv.ANIM.OFF) else: EventMesh.publish(constants.EVENT.SYSTEM_UP) def done_bottom_to_top(self): id = MainMenu2_til.get_tile_act().get_child(0).get_text() - if id == "4": + if id == str(watchface_id): + # EventMesh.publish("load_screen", {"screen": "msg_detail"}) EventMesh.publish("load_screen", {"screen": "up_screen"}) self.menu_id = id def done_top_to_bottom(self): id = MainMenu2_til.get_tile_act().get_child(0).get_text() - if id == "4": + if id == str(watchface_id): EventMesh.publish("load_screen", {"screen": "down_screen"}) self.menu_id = id def done_left_to_right(self): 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 c8b6dc2f..162c6f9a 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 @@ -92,7 +92,7 @@ setting_cont.add_style(setting_cont_style,lv.PART.MAIN | lv.STATE.DEFAULT) setting_imei_img_btn_1 = lv.btn(setting_cont) setting_imei_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_imei_img_btn_1.set_size(120,35) +setting_imei_img_btn_1.set_size(115,35) setting_imei_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_imei_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_imei_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -117,7 +117,7 @@ setting_cont_y+=setting_cont_offset setting_app_img_btn_1 = lv.btn(setting_cont) setting_app_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_app_img_btn_1.set_size(120,35) +setting_app_img_btn_1.set_size(115,35) setting_app_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_app_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_app_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -142,7 +142,7 @@ setting_cont_y+=setting_cont_offset setting_bright_img_btn_1 = lv.btn(setting_cont) setting_bright_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_bright_img_btn_1.set_size(120,35) +setting_bright_img_btn_1.set_size(115,35) setting_bright_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_bright_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_bright_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -166,7 +166,7 @@ setting_cont_y+=setting_cont_offset setting_volume_img_btn_1 = lv.btn(setting_cont) setting_volume_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_volume_img_btn_1.set_size(120,35) +setting_volume_img_btn_1.set_size(115,35) setting_volume_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_volume_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_volume_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -191,7 +191,7 @@ setting_cont_y+=setting_cont_offset setting_restore_img_btn_1 = lv.btn(setting_cont) setting_restore_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_restore_img_btn_1.set_size(120,35) +setting_restore_img_btn_1.set_size(115,35) setting_restore_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_restore_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_restore_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -216,7 +216,7 @@ setting_cont_y+=setting_cont_offset setting_poweroff_img_btn_1 = lv.btn(setting_cont) setting_poweroff_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_poweroff_img_btn_1.set_size(120,35) +setting_poweroff_img_btn_1.set_size(115,35) setting_poweroff_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_poweroff_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_poweroff_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -244,7 +244,7 @@ setting_cont_y+=setting_cont_offset #重启setting_restart_img_btn_1 setting_restart_img_btn_1 = lv.btn(setting_cont) setting_restart_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_restart_img_btn_1.set_size(120,35) +setting_restart_img_btn_1.set_size(115,35) setting_restart_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_restart_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_restart_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -270,7 +270,7 @@ setting_cont_y+=setting_cont_offset setting_version_img_btn_1 = lv.btn(setting_cont) setting_version_img_btn_1.set_pos(int(0),int(setting_cont_y-5)) -setting_version_img_btn_1.set_size(120,34) +setting_version_img_btn_1.set_size(115,34) setting_version_img_btn_1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF) setting_version_img_btn_1.add_style(style_screen_btn_1_main_main_default, lv.PART.MAIN|lv.STATE.DEFAULT) setting_version_img_btn_1.add_flag(lv.obj.FLAG.CLICKABLE) @@ -333,6 +333,7 @@ class SettingScreen(Screen): self.is_sliding = 0 self.is_left_sliding = 0 self.meta = setting_screen + setting_screen.add_event_cb(lambda e:EventMesh.callback_wrapper(self.ui_setting_cb(e,"void")), lv.EVENT.GESTURE, None) # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.SHORT_CLICKED, None) # setting_dialswitch_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), (lv.EVENT.SHORT_CLICKED ), None) # setting_imei_label.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), (lv.EVENT.SHORT_CLICKED ), None) @@ -373,44 +374,57 @@ class SettingScreen(Screen): # setting_language.add_event_cb(lambda e: self.load_screen(e, {"screen": "language"}), lv.EVENT.SHORT_CLICKED, None) # setting_dialswitch_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "dialswitch")), lv.EVENT.PRESSING, None) # setting_themeswitch.add_event_cb(lambda e: self.load_screen(e, {"screen": "themeswitch"}), lv.EVENT.SHORT_CLICKED, None) - setting_imei_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), lv.EVENT.PRESSING, None) - setting_app_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), lv.EVENT.PRESSING, None) - setting_bright_img_btn_1.add_event_cb(lambda e:EventMesh.callback_wrapper( self.ui_setting_cb(e, "brightness")), lv.EVENT.PRESSING, None) - setting_volume_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None) - setting_restore_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), lv.EVENT.PRESSING, None) - setting_poweroff_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), lv.EVENT.PRESSING, None) - setting_restart_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restart")), lv.EVENT.PRESSING, None) - # setting_update_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), lv.EVENT.PRESSING, None) - setting_version_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), lv.EVENT.PRESSING, None) + # setting_imei_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "imei")), lv.EVENT.PRESSING, None) + # setting_app_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "app")), lv.EVENT.PRESSING, None) + # setting_bright_img_btn_1.add_event_cb(lambda e:EventMesh.callback_wrapper( self.ui_setting_cb(e, "brightness")), lv.EVENT.PRESSING, None) + # setting_volume_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "totalvolume")), lv.EVENT.PRESSING, None) + # setting_restore_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restore")), lv.EVENT.PRESSING, None) + # setting_poweroff_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "poweroff")), lv.EVENT.PRESSING, None) + # setting_restart_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "restart")), lv.EVENT.PRESSING, None) + # # setting_update_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "update")), lv.EVENT.PRESSING, None) + # setting_version_img_btn_1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.ui_setting_cb(e, "version")), lv.EVENT.PRESSING, None) def initialization(self): self.is_left_sliding = 0 self.is_sliding = 0 pass - def ui_setting_cb(self, e, msg): + def ui_setting_cb(self,e,msg): code = e.get_code() - EventMesh.publish("publish_message_event_ui",{"func":self.ui_setting_cb_do,"data":[code,msg]}) - def ui_setting_cb_do(self, data): - #code = e.get_code() - - code = data[0] - msg = data[1] - - #print("code!!!!!!!!",code,msg) - if code == lv.EVENT.PRESSING: - #print("PRESSING") - self.is_sliding += 1 - + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) elif code == lv.EVENT.SHORT_CLICKED: - #utime.sleep_ms(10) - print("1self.is_sliding",self.is_sliding) - if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 - self.is_sliding =0 - EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) - print("2self.is_sliding",self.is_sliding) + if msg != "void": + EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + + # def ui_setting_cb(self, e, msg): + # code = e.get_code() + # EventMesh.publish("publish_message_event_ui",{"func":self.ui_setting_cb_do,"data":[code,msg]}) + # def ui_setting_cb_do(self, data): + # #code = e.get_code() + + # code = data[0] + # msg = data[1] + + # #print("code!!!!!!!!",code,msg) + # if code == lv.EVENT.PRESSING: + # #print("PRESSING") + # self.is_sliding += 1 + + # elif code == lv.EVENT.SHORT_CLICKED: + # #utime.sleep_ms(10) + # print("1self.is_sliding",self.is_sliding) + # if self.is_sliding <= 5 and self.is_sliding != 0:#如果是在滑动中则不需要点击事件 + # self.is_sliding =0 + # EventMesh.publish("load_screen", {"screen": "{}".format(msg)}) + # print("2self.is_sliding",self.is_sliding) - self.is_sliding =0 + # self.is_sliding =0 def done_return(self): EventMesh.publish("return_prev_screen") @@ -910,9 +924,24 @@ class RestoreScreen(Screen): def __init__(self): super().__init__() self.meta = restore_screen - restore_confirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.confirm(e)),lv.EVENT.SHORT_CLICKED, None) - restore_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.concel(e)),lv.EVENT.SHORT_CLICKED, None) - + restore_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,0)),lv.EVENT.GESTURE, None) + restore_confirm.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)),lv.EVENT.SHORT_CLICKED, None) + restore_cancel.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)),lv.EVENT.SHORT_CLICKED, None) + + def button_cb(self,e,msg): + code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.SHORT_CLICKED: + if msg == 1: + EventMesh.publish("load_screen", {"screen": "restore_confirm"}) + elif msg == 2: + EventMesh.publish("return_prev_screen") def confirm(self, e): EventMesh.publish("load_screen", {"screen": "restore_confirm"}) @@ -1477,70 +1506,6 @@ class PowerOnScreen(Screen): pass from common import Abstract -class TimePoweroffScreen(Abstract): - - - def __init__(self): - super().__init__() - self.power_off_flag = 0 - self.read_data = {} - EventMesh.subscribe("get_time_power_off", self.get_time_power_off) - EventMesh.subscribe("power_off_callback", self.power_off_callback) - EventMesh.subscribe("set_time_power_off", self.set_time_power_off) - - - def power_off_callback(self,event,msg): - if self.power_off_flag == 0: - self.power_off_flag = 1 - EventMesh.publish("set_time_power_off") - Power.powerDown() - - elif self.power_off_flag == 1: - self.power_off_flag = 0 - EventMesh.publish("set_time_power_off") - Power.powerRestart() - - - def get_time_power_off(self,event,msg): - if self.power_off_flag == 0: - self.power_off_flag = 1 - elif self.power_off_flag == 1: - self.power_off_flag = 0 - - def set_time_power_off(self,event,msg): - self.read_data = EventMesh.publish("get_storage_data") - if self.read_data != {}: - b = str("off_on") in self.read_data().keys() - if b == True: - pass - - - - - def done_return(self): - pass - - def btn1_release(self): - pass - - def btn8_press(self): - pass - -class LanguageScreen(Screen): - NAME = "language" - - def __init__(self): - super().__init__() - self.meta = language_screen - - def done_return(self): - EventMesh.publish("load_screen", {"screen": "setting"}) - - def btn1_release(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) - - def btn8_press(self): - EventMesh.publish("load_screen", {"screen": "setting"}) class DialswitchScreen(Screen): @@ -1811,16 +1776,45 @@ class BrightnessScreen(Screen): self.time = 10 self.read_data = {} self.meta = brightness_screen - brightness_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_level(e)), - lv.EVENT.SHORT_CLICKED, None) - brightness_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)), - lv.EVENT.SHORT_CLICKED, None) - - brightness_time_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_time_level(e)), - lv.EVENT.SHORT_CLICKED, None) - brightness_time_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_time_level(e)), - lv.EVENT.SHORT_CLICKED, None) + brightness_screen.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,0)),lv.EVENT.GESTURE, None) + brightness_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)),lv.EVENT.SHORT_CLICKED, None) + brightness_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)),lv.EVENT.SHORT_CLICKED, None) + brightness_time_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,3)),lv.EVENT.SHORT_CLICKED, None) + brightness_time_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,4)),lv.EVENT.SHORT_CLICKED, None) + + def button_cb(self,e,msg): + code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.SHORT_CLICKED: + if msg == 1: + EventMesh.publish("push_add_brightness_level") + self.level = EventMesh.publish("get_brightness_level") + # print("self.level:{}".format(self.level)) + self.show_bar() + elif msg == 2: + EventMesh.publish("push_reduce_brightness_level") + self.level = EventMesh.publish("get_brightness_level") + self.show_bar() + elif msg == 3: + self.time+=5 + if self.time >= 30: + self.time = 30 + EventMesh.publish("set_brightness_time",self.time) + brightness_label_time_text.set_text("{}秒".format(self.time)) + elif msg == 4: + if self.time > 5: + self.time-=5 + EventMesh.publish("set_brightness_time",self.time) + brightness_label_time_text.set_text("{}秒".format(self.time)) + pass + def initialization(self): self.level = EventMesh.publish("get_brightness_level") self.time = EventMesh.publish("get_brightness_time") @@ -1875,155 +1869,6 @@ class BrightnessScreen(Screen): EventMesh.publish("watch_top_show") EventMesh.publish("load_screen", {"screen": "main_menu"}) - -class VolumeScreen(Screen): - NAME = "volume" - - def __init__(self): - super().__init__() - self.meta = volume_screen - volume_phone_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "phonering"})), lv.EVENT.SHORT_CLICKED, None) - volume_message_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "msgvolume"})), lv.EVENT.SHORT_CLICKED, None) - volume_alarm_btn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.load_screen(e, {"screen": "alarmvolume"})), lv.EVENT.SHORT_CLICKED, None) - - def done_return(self): - EventMesh.publish("load_screen", {"screen": "setting"}) - - def btn1_release(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) - - def btn8_press(self): - EventMesh.publish("load_screen", {"screen": "setting"}) - - - -class PhoneringScreen(Screen): - NAME = "phonering" - - def __init__(self): - super().__init__() - self.level = 2 - self.meta = phonering_screen - phonering_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_level(e)), - lv.EVENT.SHORT_CLICKED, None) - phonering_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)), - lv.EVENT.SHORT_CLICKED, None) - phonering_add_imgbtn.set_ext_click_area(20) - phonering_reduce_imgbtn.set_ext_click_area(20) - - def add_level(self, e): - EventMesh.publish("push_add_phonering_level") - self.level = EventMesh.publish("get_phonering_level") - self.show_bar() - - def reduce_level(self, e): - EventMesh.publish("push_reduce_phonering_level") - self.level = EventMesh.publish("get_phonering_level") - self.show_bar() - - def show_bar(self): - phonering_bar.set_value((100 // 7) * self.level, lv.ANIM.OFF) - - def initialization(self): - self.level = EventMesh.publish("get_phonering_level") - self.show_bar() - - def done_return(self): - EventMesh.publish("load_screen", {"screen": "volume"}) - - def done_left_to_right(self): - pass - - def done_right_to_left(self): - pass - def btn1_release(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) - - def btn8_press(self): - EventMesh.publish("load_screen", {"screen": "volume"}) - - - -class AlarmvolumeScreen(Screen): - NAME = "alarmvolume" - - def __init__(self): - super().__init__() - self.level = 2 - self.meta = alarmvolume_screen - alarmvolume_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_level(e)), - lv.EVENT.SHORT_CLICKED, None) - alarmvolume_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)), - lv.EVENT.SHORT_CLICKED, None) - - def add_level(self, e): - EventMesh.publish("push_add_alarmvolume_level") - self.level = EventMesh.publish("get_alarmvolume_level") - self.show_bar() - - def reduce_level(self, e): - EventMesh.publish("push_reduce_alarmvolume_level") - self.level = EventMesh.publish("get_alarmvolume_level") - self.show_bar() - - def show_bar(self): - alarmvolume_bar.set_value((100 // 7) * self.level, lv.ANIM.OFF) - - def initialization(self): - self.level = EventMesh.publish("get_alarmvolume_level") - self.show_bar() - - def done_return(self): - EventMesh.publish("load_screen", {"screen": "volume"}) - - def btn1_release(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) - - def btn8_press(self): - EventMesh.publish("load_screen", {"screen": "volume"}) - - - -class MsgvolumeScreen(Screen): - NAME = "msgvolume" - - def __init__(self): - super().__init__() - self.level = 2 - self.meta = msgvolume_screen - msgvolume_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_level(e)), - lv.EVENT.SHORT_CLICKED, None) - msgvolume_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_level(e)), - lv.EVENT.SHORT_CLICKED, None) - - def add_level(self, e): - EventMesh.publish("push_add_msgvolume_level") - self.level = EventMesh.publish("get_msgvolume_level") - self.show_bar() - - def reduce_level(self, e): - EventMesh.publish("push_reduce_msgvolume_level") - self.level = EventMesh.publish("get_msgvolume_level") - self.show_bar() - - def show_bar(self): - msgvolume_bar.set_value((100 // 7) * self.level, lv.ANIM.OFF) - - def initialization(self): - self.level = EventMesh.publish("get_msgvolume_level") - self.show_bar() - - def done_return(self): - EventMesh.publish("load_screen", {"screen": "volume"}) - - def btn1_release(self): - EventMesh.publish("load_screen", {"screen": "main_menu"}) - - def btn8_press(self): - EventMesh.publish("load_screen", {"screen": "volume"}) - - - #-----------------------------------------Total--volum------------------------------- volume_adjust_screen = lv.obj() @@ -2076,15 +1921,37 @@ class totalvolumeScreen(Screen): def __init__(self): super().__init__() self.meta = volume_adjust_screen - totalvolume_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.add_volum_size(e)), + volume_adjust_screen.add_event_cb(lambda e:EventMesh.callback_wrapper(self.button_cb(e,0)), lv.EVENT.GESTURE, None) + totalvolume_add_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.SHORT_CLICKED, None) - totalvolume_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.reduce_volum_size(e)), + totalvolume_reduce_imgbtn.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)), lv.EVENT.SHORT_CLICKED, None) self.read_data = {} self.volum_size = 8 self.aud = audio.Audio(0) # self.aud.set_pa(Pin.GPIO43) + def button_cb(self,e,msg): + code = e.get_code() + indev = lv.indev_get_act() + lv.indev_t.wait_release(indev) + dir = lv.indev_t.get_gesture_dir(indev) + if code == lv.EVENT.GESTURE: + if dir == lv.DIR.RIGHT: + pass + # EventMesh.publish("load_screen", {"screen": "main_menu"}) + elif code == lv.EVENT.SHORT_CLICKED: + if msg == 1: + self.volum_size+=2 + if self.volum_size >= 11: + self.volum_size = 11 + self.show_bar(1) + elif msg == 2: + self.volum_size -= 2 + if self.volum_size < 0: + self.volum_size = 0 + self.show_bar(1) + def initialization(self): self.read_data = EventMesh.publish("get_storage_data") # print("self.read_data:{}".format(self.read_data)) diff --git a/2.sdk-ZY/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk-ZY/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip index 231eb6c0..06c5a5b6 100644 Binary files a/2.sdk-ZY/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk-ZY/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF001.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF001.png new file mode 100644 index 00000000..4e77e794 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF001.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF002.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF002.png new file mode 100644 index 00000000..cfae4691 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF002.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF003.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF003.png new file mode 100644 index 00000000..8be82509 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF003.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF004.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF004.png new file mode 100644 index 00000000..4797aef6 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF004.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF005.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF005.png new file mode 100644 index 00000000..3f90da78 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF005.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF006.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF006.png new file mode 100644 index 00000000..94d495b3 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF006.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF007.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF007.png new file mode 100644 index 00000000..d7daaaaf Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF007.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF008.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF008.png new file mode 100644 index 00000000..ee6fbe46 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF008.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF009.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF009.png new file mode 100644 index 00000000..db705442 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF009.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF010.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF010.png new file mode 100644 index 00000000..08854f56 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF010.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF011.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF011.png new file mode 100644 index 00000000..5ff2715f Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_LISTEN_GIF011.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK001.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK001.png new file mode 100644 index 00000000..32531064 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK001.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK002.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK002.png new file mode 100644 index 00000000..b2f715d7 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK002.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK003.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK003.png new file mode 100644 index 00000000..a486aea0 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK003.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK004.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK004.png new file mode 100644 index 00000000..2fdf9638 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK004.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK005.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK005.png new file mode 100644 index 00000000..ad54e2ec Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK005.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK006.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK006.png new file mode 100644 index 00000000..276f240c Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK006.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK007.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK007.png new file mode 100644 index 00000000..1f0ff291 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK007.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK008.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK008.png new file mode 100644 index 00000000..07866765 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK008.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK009.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK009.png new file mode 100644 index 00000000..11fe9500 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK009.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK009_01.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK009_01.png new file mode 100644 index 00000000..6509eb82 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK009_01.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK010.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK010.png new file mode 100644 index 00000000..663ca5f8 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK010.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK011.png b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK011.png new file mode 100644 index 00000000..15fdd7dd Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/AI_THINK011.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/ai_confirm_bt.png b/2.sdk-ZY/project/K01/usr/static/AI/ai_confirm_bt.png new file mode 100644 index 00000000..4eeecc37 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/ai_confirm_bt.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/ai_result_bt.png b/2.sdk-ZY/project/K01/usr/static/AI/ai_result_bt.png new file mode 100644 index 00000000..2d022d7d Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/ai_result_bt.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/ai_result_can_bt.png b/2.sdk-ZY/project/K01/usr/static/AI/ai_result_can_bt.png new file mode 100644 index 00000000..8dbd751a Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/ai_result_can_bt.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/ai_talk_bt.png b/2.sdk-ZY/project/K01/usr/static/AI/ai_talk_bt.png new file mode 100644 index 00000000..3dd7a17f Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/ai_talk_bt.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/AI/ai_warning.png b/2.sdk-ZY/project/K01/usr/static/AI/ai_warning.png new file mode 100644 index 00000000..c53f86d0 Binary files /dev/null and b/2.sdk-ZY/project/K01/usr/static/AI/ai_warning.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/IMAGE_APP_QR_CODE.png b/2.sdk-ZY/project/K01/usr/static/IMAGE_APP_QR_CODE.png index b9829179..d7f464aa 100644 Binary files a/2.sdk-ZY/project/K01/usr/static/IMAGE_APP_QR_CODE.png and b/2.sdk-ZY/project/K01/usr/static/IMAGE_APP_QR_CODE.png differ diff --git a/2.sdk-ZY/project/K01/usr/static/play.png b/2.sdk-ZY/project/K01/usr/static/play.png deleted file mode 100644 index 0c68dc9a..00000000 Binary files a/2.sdk-ZY/project/K01/usr/static/play.png and /dev/null differ