1、添加virfat备份与恢复；

2、修复sensorhub低功耗越界问题；
3、修复rcsp传输相关问题；
4、更新flash_params_v3.bin；
5、修复摄像头、科大讯飞相关问题；

SDK/apps/watch/ui/jlui_app/STYLE_WATCH_PUBLIC_MOLDS/ui_action_camera.c

@@ -44,7 +44,7 @@ REGISTER_UI_STYLE(STYLE_NAME)
 
 
 
-
+#define DEV_LOGO	"sd0"
 #define DEV_ROOT	"storage/sd0/C/"
 #define PHOTO_DIR 	"PHOTO/"
 #define VIDEO_DIR	"VIDEO/"
@@ -110,8 +110,9 @@ static void camera_dec_flush(void)
     struct element *elm;
     elm = ui_core_get_element_by_id(CAM_CAMERA_LAYOUT);
     if (elm != NULL) {
-        /* printf(">>>>>>elm != NULL"); */
+        /* printf("CAM_CAMERA_LAYOUT REDRAW_ENTER"); */
         ui_redraw(CAM_CAMERA_LAYOUT);
+        /* printf("CAM_CAMERA_LAYOUT REDRAW_EXIT"); */
     }
 }
 static void camera_rec_err()
@@ -180,7 +181,7 @@ static int cam_ctrl_view_video(int enable)
 }
 static void cam_camera_photo_savc_cb(char *path)
 {
-    if (jljpeg_stream_src_data_get()) {
+    if (!jljpeg_stream_src_data_get()) {
         return;
     }
     jljpeg_stream_src_data_save_to_file(path);
@@ -264,16 +265,20 @@ static int cam_file_handler_open(int show_temp, char *dir, char *ext_name)
 {
     cam_file_handler_close();
     if (!dev_manager_get_total(1)) {// 获取有效可播放设备数量
+        log_error("%s %d", __func__, __LINE__);
         return -1;
     }
-    struct __dev *dev = dev_manager_find_active(1);//在有效设备中获取活跃设备
+    /* struct __dev *dev = dev_manager_find_active(1);//在有效设备中获取活跃设备 */
+    struct __dev *dev = dev_manager_check_by_logo(DEV_LOGO);
     if (!dev) {
+        log_error("%s %d", __func__, __LINE__);
         return -1;
     }
 
     log_debug("dev_root:%s dir:%s ext:%s \n", dev_manager_get_root_path(dev), dir, ext_name);
     //活跃分区 与目标一致
     if (!strstr(dev_manager_get_root_path(dev), DEV_ROOT)) {
+        log_error("%s dev:%s %d", __func__, dev_manager_get_root_path(dev), __LINE__);
         return -1;
     }
     char path[64] = {0};

SDK/apps/watch/ui/jlui_app/STYLE_WATCH_PUBLIC_MOLDS/ui_action_music.c

@@ -693,6 +693,7 @@ static void music_status_check(void *p)
                 ui_pic_show_image_by_id(SPORTING_MUSIC_PAUSE_START_PIC, 0);
             }
         }
+        return;
     }
 #endif
 #if TCFG_APP_MUSIC_EN

SDK/apps/watch/ui/jlui_app/STYLE_WATCH_PUBLIC_MOLDS/ui_action_netapp_iflytek.c

@@ -133,12 +133,19 @@ static int ui_ifly_vad_event_cb(ifly_vad_event_enum evt, void *param)
             sys_timeout_del(ifly_ui->vad_recv_timer);
             ifly_ui->vad_recv_timer = 0;
         }
-        ui_ifly_vad_button_touch(0);
         break;
     case IFLY_VAD_EVT_NETWORK_RECV_ERROR:
+        if (ifly_ui->vad_recv_timer) {
+            sys_timeout_del(ifly_ui->vad_recv_timer);
+            ifly_ui->vad_recv_timer = 0;
+        }
         UI_MSG_POST("vad_network_recv_error");
         break;
     case IFLY_VAD_EVT_NETWORK_FAIL:
+        if (ifly_ui->vad_recv_timer) {
+            sys_timeout_del(ifly_ui->vad_recv_timer);
+            ifly_ui->vad_recv_timer = 0;
+        }
         UI_MSG_POST("vad_network_fail");
         break;
     case IFLY_VAD_EVT_EXIT:
@@ -427,7 +434,6 @@ static void vad_recv_timer_handler(void *priv)
         sys_timeout_del(ifly_ui->vad_recv_timer);
         ifly_ui->vad_recv_timer = 0;
     }
-    ui_ifly_vad_button_touch(0);
 }
 
 static int ifly_vad_button_ontouch(void *ctr, struct element_touch_event *e)
@@ -538,7 +544,11 @@ static int no_connect_ontouch(void *ctr, struct element_touch_event *e)
     case ELM_EVENT_TOUCH_R_MOVE:
         if (ifly_ui && ifly_ui->cur_layout) {
             ui_hide(IFLY_LAYOUT_NO_CONNECT);
-            ui_show(ifly_ui->cur_layout);
+            if (ifly_ui->cur_layout != IFLY_LAYOUT_TTS) {
+                ui_show(IFLY_LAYOUT_VAD);
+            } else {
+                ui_show(IFLY_LAYOUT_TTS);
+            }
             return true;
         }
         break;
@@ -654,6 +664,7 @@ static int vad_no_content()
     ifly_ui->cur_layout = IFLY_LAYOUT_VAD;
     ifly_ui->show_layout = IFLY_LAYOUT_NO_CONTENT;
     ifly_no_content(IFLY_VAD_NO_DATA_CNT_MAX);
+    ui_ifly_vad_button_touch(0);
 
     return 0;
 }
@@ -663,7 +674,7 @@ static int vad_network_fail()
     ifly_ui->cur_layout = IFLY_LAYOUT_CONNECTTING;
     ifly_ui->show_layout = IFLY_LAYOUT_CONNECT_FAIL;
     ifly_no_content(IFLY_VAD_NO_CONN_CNT_MAX);
-    ui_ifly_vad_button_touch(1);
+    ui_ifly_vad_button_touch(0);
 
     return 0;
 }
@@ -673,7 +684,7 @@ static int vad_network_recv_error()
     ifly_ui->cur_layout = IFLY_LAYOUT_VAD;
     ifly_ui->show_layout = IFLY_LAYOUT_CONNECT_FAIL;
     ifly_no_content(IFLY_VAD_NO_CONN_CNT_MAX);
-    ui_ifly_vad_button_touch(1);
+    ui_ifly_vad_button_touch(0);
 
     return 0;
 }
@@ -691,6 +702,7 @@ static int ai_think()
 {
     ui_hide(IFLY_LAYOUT_VAD);
     ui_show(IFLY_LAYOUT_AI);
+    ui_ifly_vad_button_touch(0);
 
     return 0;
 }

SDK/apps/watch/ui/ui_key_remap.c

@@ -112,6 +112,11 @@ static int ui_key_event_prob_handle(void *arg)
     struct key_event *key = (struct key_event *)arg;
     u16 key_event;
     log_debug("[%s] key->event:%d, key->value:%d", __func__, key->event, key->value);
+    if (app_get_current_mode_name() == APP_MODE_UPDATE ||
+        app_get_current_mode_name() == APP_MODE_RCSP) {
+        log_info("%s return", __func__);
+        return 0; // 传输的时候不处理
+    }
     key_event = jlui_key_event_remap(key, jlui_key_watch_event_table);
 
     if (__this->send_event_cb) {