From a91831c8a9674cab9a2f41bf470dc2cc91db2b15 Mon Sep 17 00:00:00 2001 From: "@CHENG" <2393524978@qq.com> Date: Tue, 2 Jul 2024 19:29:29 +0800 Subject: [PATCH] gengxin --- .../primary_function/ICON_AIGC_ASSISTANT.png | Bin 4959 -> 2314 bytes .../lv_apps/custom_function/mmi_aigc_data.c | 4 ++ .../lv_apps/custom_function/mmi_aigc_ui.c | 53 +++++++++++++----- .../lv_apps/custom_function/mmi_aigc_ui.h | 1 + 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/2.sdk/project/Z5_WL_K7/gui/lv_watch/resource/png/primary_function/ICON_AIGC_ASSISTANT.png b/2.sdk/project/Z5_WL_K7/gui/lv_watch/resource/png/primary_function/ICON_AIGC_ASSISTANT.png index 9f513b3be81a65a9b58ef83726ac3988273806dc..5abe1831267cbd9bb4d3654b894cd50b8f5aee78 100644 GIT binary patch delta 2294 zcmVCpf`N$9V7d`0 zA*s=X(3ZWsc(yd&Y`M?_TW<)3#CRz^%R;$Hdw>g6PXy{&%6%zINHjD-mSEaQBx2eq zs3hh$ec$xkH*a?5&wI1G?f#Oc+nL!n^M3RD{=DzKnZ8C%M1Q_KP#~f{B05M!J?itW z23J%SKaYuMzMNl}Z&oidB`{we06`#aNd2}6ka$B8TFI(U&I!zy2cW29M07%_EDJ!L z7m4UfIlu7S<@uZum@f~2tO-S4GjWB8Cd>JSs*7u|PGAcWr^5-6)(BLl3gW)B)utm% zDI%?ywiNub~snwX6K;`SMtK6-fft2U7q`ol`fhwQ7 z6(Q+u7eIlBljM(G3CKIP!N?=kms_fDu@Fmv>I9dabfI;C;BqDE)kG$6laR-VOkyMg zH=xgJgvdUzA%QB|-rYpxF+gH}qv%{Wh^Rd8`X(fgRDYkZD-J@@C<;$(fIKe^`V?xemWpgucvrB>4-#)bpQj(5&C#8eJ6T?q3H$V@Y$EV- zR>jcXH-CC*V(+B)I|@MLWc92^YLkE|g3(X{vs52Q`?hzQc5c~OvmGj1{QH5oy?6Tu z0dir|ryq{f@;^)7z9yJ>jS6)iST|(bf=(V3_1)81n*HrsKwaIh=ct$~dS*`QyEhNa z1+E0d!_4vH7~sfPp|3y{dH=|Qz^fn5`pS}u3V#Cv%QyQ=0kxWdc1ll5p1C{3TO5&P zBAtofgOZp$sO^izVkmh~-?{xIqp5>%o)iePl3z+XQ)kf znv_C8hVCOh^WHt;`8Zvrj580%eWjw!uzzbv36C=-(5eE_NhHY9@y{$zhx()3wr>A3 zI*wyu-nvR*-nc37b?|XlKe}cN7HC7JGo}%a1$d2isj7=r9M2U4k#>6N60N>kt$P|M z?dVS<-mwx;5K^Csp0hPK1)o7A@?nZ_U?cL8v>)wcRzRxmLJ{8v;bzVvdr#(!M( zB$`w(L3=m{n6bOOhxcY)^*nfv;Ezf~{@R=Yo?0ivDpoFkbV3hG{BS29@_Xqvr z06t?I)d?sd31e#0&@e3Bv4Eb~OFLYGM<-B}G)Yz&_Axn}(&%XneB}{EJ_DpXN@e1& zjcEiu>5T(D3hTf=97BrKdT9(yUy?Y!XWVvIJy<7DI&8gD7~K2&-YldtEq@Ti!6U3{ zgGkIb1jop9$QG;Nzth|tlnw*~@5b#JMNt&@Lf(PF;-Bj01f7<`M;J}Qn69|&z zU5B%0@Ti0fsBD7rn7BYYxBpzfX}N8+s+I|L)VY^9a1umHB8i3B=ma6%IHDpe`!Z6w zUOltMzPO_bePm-BP6z}+GJhuni8l?E8JOUZh?wZ$O%+-7F)y}ZpTm?S5xUeWBm zaS9Xid<+MbX^%iBk3dOt{iIT;$;mi)fJi;H0Fj*Qk*E(M+9sK@lz){W2Qzh5RAcVh zZk0r$OTtW1TsZaK>6$VW6b2Hp58GvjK^W4Iq+?mMD{thyeFE=ob!Ea(5??%idn*o< znZm3vGLU5`*-;!jvwSIFa!5m>rXpzXlo);B2017yRJvR}tc>Lu3{$n(REA=unr71A zGfnfuI(BT?5jYk%ZhuB3)V2Wbcvf!Sc4ZnQu{pw&^eIU$5MYjX@SQ<#mePxB<{6}fzJua`DH0DD=8|zk9DlEm@fw$liypaHl?s0( zlVBzSozoQuQAbk8tm@_S=AIpZR5+p8fkQ z3;M9k_j~@MX-j-bm@bqiXXGS6B63QQgcSyQMTcvQ87}p$S>oH&Mdmu#KSrGZinDUd z66!B9rzSn-po7Q6VUIm5s5GSsk3BSg%z@TOywEByl7DES2XCgz`Gv+0+EC|FFB3u^ z^)i<9)q$g?eVY`cVXsCBofA=2nyJmsoHE_eF=3-grAb%y!ZtxgaS)2mBmdz@|HwbB znKBwU>}vL|MZqtfXgFUKX|#1)ma~e@2iJt@iIQ_@^G^zr(=V#!A!v9R?Bo4?hO)kt>p| QP5=M^07*qoM6N<$g6#=Lvj6}9 literal 4959 zcmbVQ2{@Gd+aCMAgk(33lO@J1hG7`HkTpx$n-zmu%nXL8v88m7r0iKDjwLyfPzIf} zB1NJ!M3gM0l#}WkZQnWHb^gos&2_!={@(Y!fA@1g&;7j5T-O}+ba#{zR}lvQ08-9Q z_FlZR=jI_Q%=^yX@}`k@5~Df!GXMYy`OSk5P*kD>00`YA`S>yY++0z3D%lWApyG&z zEHaIU1^_IqSTrm?lE?(&h+!lO8noQm4FZw~XwW`mH>exUju=jIN}vhEF_=2=O8^ zs4;Xr(IJ*6Q)@FD8p@7N#4@RLA1XEKhf|(EBm?0HLnu&pABjSs#xeB%vVmxiWfIXK zo@+*6C=v`s_`pn12veSG`cR&I&~H#TDuEOl|4&e3I0}mV8WsdsaC1XBQy5Gv1y6LgM}v4d8v94W&*S*tsAgtx zqA`JB1~$SOBfvN~0uMGt!b8CXVP?fzqPLH?C^ z1~&HJOaJez{HE!jr2nlM|3A{dmjxe=rGycAlM@2kOa`(!V!oLI`M-XBefF1e^aIYD zahuDZ)0KDeb3PL(JZd^``W6+jc|QSC7S8rIKCJO4rSVZgBU`T@dVjb0_0?b1snI4n z+X-4?fugn6{1vjcPNy&W+T@orvfa3H1xVZ*=+p$uOn~HG8I- zoysB*NqV};^e0!C^@o$KYE zlT_Q2s62M42H+?9`1}>J<+Hvv00fY;z(P^*Ty;(<$Kh8<@p&sGzlXq~wT0`aJl+=y zGzgTbWN?Y&4joww%wi97wj#~ES;KGfnFNe z312{DOlW6Vfd!>2!212v>^)RZIKaY@(J)(rZVP(G`STO&#*2D4cWK~bFosfc_-_Aa+T8UAtu%h_kr$jjyav?ALO4? zCbuov^roswoI2T83H6z?=A?|8M!jI?fQB?OjtlV-i&$3mF89_h0BYGHtqHh+XSi&3 zO9W`6S^776g)VFQ%K}5NYg-Zbk5Bv&O+u$&!1JR?U+O5cwGmUr>~8+;c zlMjA!n@a-pitKZRoKGQBvIdPOT`8jjBV#3U92D2&nUC>QZwhqgW4WC!hH{}xVKp}J z3$D^iCP?ZIbW&32n)=v-ooQpQfwgHLM`mp90pC7|uBej%MaPSYUtaP&L&BA|D63TI z2u~*y19IDc(f2)9J^c9$y)0WW$e%CAFy#dI=0l5aO^pq?-F7;e;Tkn~ObvP1dB^Zm z0mxky)^7QEg$!?%Aq^2!%oB52cCgqw+V{`uCaD11+TT;BaG0Y_r*j090DFmUt4BI* zQ|9u|+KBq|bB1^8%?h_rJyH@?vmNfk2EAzIA|`6-B@Lv``ipO8&mLa!SuD!;k53Gf z(S?)pfGlahki1cs@R@y)c#B;DtY2-TAvg zu}8n%%aB>`a}wk)A=g(HcXHa2<+yJeEKyc~^O}drrTmo{0NEDq!bo#vD0g9v*~9o) zzN0Mrka+k}n?1S{fP+%HZN^Fd;R6#EH{}Wk6g`KA1Om<7PqoD|dsF1LNc=ewnZb=S z-!V#@gb>79Z~8QNL;iR?6e4=^QAdQ#Xq~0O z4ht$#>M_E%>)t9y+IkOQCtaj_u64wgA-yKPwS^s|`gvRO{!zPV&yZ}d=33jb?sMuY zC^z4o46;^rvB-=tcWsqB+&tegxOBL6Vta|cU899aXpXJxjSKciZd^=4znD^W>+Kb9 zU*@lE#e^wntSe=|yRnhkZE}BDZRk*4gsr8kVVX2h^p5yK``P*<{F+s}Otn7$p;izq z9DmAS11#F>gU9tLsMf-#leg8pc<$gNx(z+;8vxa^vReKJS0miP87 zLuBi&c3)uuG-^+eBUj5R04Ir|Q<79~@u=HAr9l*}`l-9eXXVf8E=p~8gV6bhFC_2G zELSO!i?=4N*eBrX&Kx8}GfN2yl9FPpUFa}KrccwRQ9=MsmQCDlg|HT?9Haob&r zjPyLZNWji`6@&T{>r)|)@W^P{Nwn~xF)5+g@rCSuya&KI6?--7Ro{wckDr&yd1j)7 zuwePgxHLQ3BhhWI=7cc2rfxo6e(BmD_;6&h@yetfu2Iil{>-*u&F;tp22z;JQ3c^y z^FZgVa__JjeeW<~`x3?i6%{fBtvv+B^H$C;S>8(km-inM@#*bH;it*YX~B^dR-DxeC(cfU%##5(NfLBJB+9G z6o<;#PbnErQOrRW(>#ijclw@k>N>HRP{}^WP7~17xDHI|G$1_G+BJ=dQ=5#GYd(RB zZzvGHpXtzXtCgE4x>2d2a==kGKIp@{y?ztAH}$5RQaYNXwS_7s^1>*`tnnGnGLP|m z2eRVJQ(2s;5K+DPw;1;=iHyT11I6~WPh1ae|0vJGcHemrf9`m{WhN(Bv+t=&y7~0Y z+m}Ok8Wf8LpWQ!JoCUvgmy~iKKW-|}C|P|M!e-wB{kC==dX*R+KQ6z2QsVrptyh)A zMfXVnV$$KrE}-OWhef1|HU5(9b8_j>+%2@4NBFJ$JnrZ^2zU*x>(kt{rR?eU*AHEV zW7&^PhB9AWy25eNZez8O)aH}#i+OZGbpYp=((y^tNBLY%zC5h4qT((srkAbk zBgZcu<%g2GY8BW8du~&gLJnR@NM-GBx==R&VeeJlQevXQCmTE;r!%!|Uj7@v&@kP^ zgEgLYA4A`=aR8F2oSbc`D=DTF0a!F#I`Sq;zd~RCC5F`a!FD*6F6219;)7Ouk=q_V zFe!raUhS>Vm0~Hm=q~Q5HDsR&mOPgERyau}Q{gRZ#a%wia;Ny4sgSxHZ(QoL-9Zhv zGDtg`Y5YMjG3{B=V=-u5Zx93hr}BeKPR6*{npIVf{-a{QOYAl!pP8Og3HzdDp-PPz z-A9e1FMHNZOdku7_sqNOz9T7Iju6pS25fL^~oa{ADHrXTI#LnpZ#L z=fS50_$>OE__ox4cf`!J>|>}pr8c#f&7R+0i1Nr=GUb;GxHm9@?UXqhqj9|c7w4`d zz~|O&(y=zq?j4^^!aTGNyehdf;;)~37ZK{FH}4`^@Oy7_;?AI;{IUzTAIN#9)FE%g z?ML(-7Vvy(;9RX+&?vO4-ph~3@0V>r4J^smHZA)lJ*8ao?rQxnZ6gXtD&^+Sg`2DV z;iS;Ei@0Z;SJPhrT29FRWr?#-edvJ{6>-GgKUc>n zA#as97ORbUqVb_ixnuf7^fUJW`GJ=$N~1L#m-IE)1Aq7t;RTOQd8!ZQooE1y2ZFpH z6DX9U`q-qnNXP8cY<-Pw7h9wzL$bD{@{Iv3^73m~WsTCAPqo(6^+=X<(nb$9N zmHheX>_W@%%P_>QRDMxtW~V5B=urD2D_uy;XTPTgRZKLTJGI zB^>*{rEtLACz2b&kF@5f1oz~aPt1bgou#b;I&tIg(h!d53Oxri+HDK}>51;9Ec0@U z@R#XdmQGhJAF_=$*1p@vC(AXP;g;lIHK{U}J{HN%UiYkupTrdZ>Sb)?bT`p?okPz6 zT`7jV$Yeve4^jbNs$kf5Kmy0(xNpJd#nUeBo`n!~%Dv3jdh)J^FG(4{_7w7YUg*~w z?TMet60~NQat2>BIwSXpTB3y)Trdf_wL1>JMG|`E_KdM)cP9piD?e0vrG{vbxv<}F zyZP4T_r6*e!B-yl>QMItsJfaS)XDAlm`$>a$3*B_{aO+}HP{s6QmuF7XuyQkMES=h zsp?!w;vxrp)l1c-aQ#DAXUv(23@x}+f6?*0!L{hM2}`gdLTX>NYSW_q+L5Ff#ngx8 zbrS=*H%hcFEOKIQBp(hdCi683wPoq5WWgit~uC^-l{On{AhQ4o72AB!Z)6d>K%6PaqM8)>8QiAH%M(H=I^ zQz5BQxmN0HTUO-gO7E2!vT=u8)P=geQVX-HxchAf5T;c*DVk1?%tRikcc`^{9aF$( z^%;7~bk$#eVR(101@2Pm{_ISjs8)u#^x7O$+= ret) { AIGC_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + + mmi_aigc_trans_text_start_msg_send_fail(); } } @@ -311,6 +313,8 @@ static void mmi_aigc_send_trans_audio_data_process(void * data_ptr, uint32_t dat if(0 > ret) { AIGC_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: error=%d,send fail\n", __FUNCTION__, __LINE__, ret); + + mmi_aigc_trans_text_audio_msg_send_fail(); } } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c index ab0954d4..b7b32a15 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.c @@ -295,6 +295,34 @@ void mmi_aigc_trans_text_stop_screen_update(void) lv_task_once(task_p); } +static void mmi_aigc_trans_text_fail_screen_task_cb(void) +{ + AIGC_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + mmi_aigc_default_screen_display(); +} + +void mmi_aigc_trans_text_start_msg_send_fail(void) +{ + mmi_aigc_trans_websocket_close(); + mmi_aigc_listening_stop(true); + + lv_aigc_ext_t * ext = (lv_aigc_ext_t *)mmi_aigc_actId_ext_get(ACT_ID_AIGC_MAIN); + if(NULL == ext) + return ; + + lv_obj_set_hidden(ext->listening_signal_weak_label, false); + + lv_task_t * task_p = lv_task_create(mmi_aigc_trans_text_fail_screen_task_cb, 1500, LV_TASK_PRIO_HIGH, NULL); + lv_task_once(task_p); +} + +void mmi_aigc_trans_text_audio_msg_send_fail(void) +{ + mmi_aigc_trans_websocket_close(); + mmi_aigc_trans_websocket_open(); +} + char * mmi_aigc_chat_result_text_get(uint32_t * data_len) { @@ -1498,7 +1526,6 @@ void mmi_aigc_listening_screen_display(void) // res mmi_aigc_msg_data_clean(); mmi_aigc_tts_audio_ll_clean(); - mmi_aigc_send_trans_start_msg(NULL, 0); if(NULL != ext->record_buffer) { @@ -1515,6 +1542,8 @@ void mmi_aigc_listening_screen_display(void) if(MMI_AIGC_TTS_AUDIO_PRI == Hal_Audio_Manage_Start_Req(MMI_AIGC_TTS_AUDIO_PRI, mmi_aigc_listening_audio_ctrl_callback)) { AIGC_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + mmi_aigc_send_trans_start_msg(NULL, 0); s_aigc_recording_sent_size = 0; Hal_Record_Buffer_With_Format_Req(ext->record_buffer, @@ -1549,22 +1578,18 @@ void mmi_aigc_listening_screen_display(void) lv_obj_set_style_local_bg_color(ext->gif_listening->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); lv_obj_align(ext->gif_listening->container, NULL, LV_ALIGN_CENTER, 0, 0); - //lv_obj_t * imgbtn = lv_imgbtn_create(cont, NULL); - //lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_RELEASED, ICON_AIGC_RECORD_BUTTON_PRESSED); - //lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_PRESSED, ICON_AIGC_RECORD_BUTTON_PRESSED); - //lv_obj_set_event_cb(imgbtn, mmi_aigc_record_button_event_cb); - //lv_obj_add_protect(imgbtn, LV_PROTECT_PRESS_LOST); - //lv_watch_obj_add_element(imgbtn); - //lv_obj_align(imgbtn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -20); - - //lv_obj_t * imgbtn_label = lv_label_create(imgbtn, NULL); - //lv_obj_add_style(imgbtn_label, LV_LABEL_PART_MAIN, &lv_watch_font26); - //lv_label_set_align(imgbtn_label, LV_LABEL_ALIGN_CENTER); - //lv_label_set_text_id(imgbtn_label, WATCH_TEXT_ID_AIGC_TALK_FINISH); - //lv_obj_align(imgbtn_label, NULL, LV_ALIGN_CENTER, 0, 0); + // signal weak + lv_obj_t * label = lv_label_create(cont, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); + lv_label_set_text_id(label, WATCH_TEXT_ID_SIGNAL_WEAK); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10); + lv_obj_set_click(label, false); + ext->listening_signal_weak_label = label; lv_obj_set_hidden(ext->cont_default, true); lv_obj_set_hidden(ext->cont_listening, false); + lv_obj_set_hidden(ext->listening_signal_weak_label, true); lv_obj_set_hidden(ext->cont_listening_middle, true); lv_obj_set_hidden(ext->cont_thinking, true); lv_obj_set_hidden(ext->cont_timeout, true); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h index a2c92b9f..3a8aa709 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/mmi_aigc_ui.h @@ -108,6 +108,7 @@ typedef struct //TIMER_ID delete_timer_id; lv_obj_t * cont_default; lv_obj_t * cont_listening; + lv_obj_t * listening_signal_weak_label; lv_obj_t * cont_listening_middle; lv_obj_t * cont_thinking; lv_obj_t * cont_timeout; -- 2.17.1