From feb9db88c6561005579894861e6ae2afb226ef6e Mon Sep 17 00:00:00 2001
From: xiaojiazhu <258828110@qq.com>
Date: Mon, 23 Oct 2023 20:46:28 +0800
Subject: [PATCH] Fixed bug about comfirm screen.

---
 .../UIFlowPasswordEventCallback.c             | 23 ++++++++++++++++++-
 .../UIFlowPasswordEventCallback.h             |  7 ++++++
 .../UIFlowPhoto/UIFlowPhotoEventCallback.c    |  2 ++
 .../UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c  |  7 ++++--
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.h

diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c
index 323b40a18..83dc79f7b 100755
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c
@@ -1,12 +1,33 @@
 #include "UIFlowLVGL/UIFlowLVGL.h"
 #include <stdio.h>
+
+static lv_group_t* gp = NULL;
+static void set_indev_keypad_group(lv_obj_t* obj)
+{
+	if(gp == NULL){
+		gp = lv_group_create();
+		lv_group_add_obj(gp, obj);
+	}
+
+	lv_indev_t* indev = lv_plugin_find_indev_by_type(LV_INDEV_TYPE_KEYPAD);
+	lv_indev_set_group(indev, gp);
+}
+static void UIFlowPassword_ScrOpen(lv_obj_t* obj)
+{
+	set_indev_keypad_group(obj);
+}
+void OpenPasswordScreen(void)
+{
+	lv_plugin_scr_open(UIFlowPassword, NULL);
+}
 void UIFlowPasswordEventCallback(lv_obj_t* obj, lv_event_t event)
 {
-printf("========================== %d\n", event);
+printf(" UIFlowPasswordEventCallback %d\n", event);
 	switch(event)
 	{
 
 	case LV_PLUGIN_EVENT_SCR_OPEN:
+	    UIFlowPassword_ScrOpen(obj);
 		break;
 
 	case LV_PLUGIN_EVENT_SCR_CLOSE:
diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.h
new file mode 100644
index 000000000..68fb62639
--- /dev/null
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.h
@@ -0,0 +1,7 @@
+#ifndef UIFLOW_PASSWORD_EVENT_CALLBACK_H
+#define UIFLOW_PASSWORD_EVENT_CALLBACK_H
+#include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h"
+#include "UIFlowLVGL/UIFlowLVGL.h"
+#include "Resource/Plugin/lvgl_plugin.h"
+void OpenPasswordScreen(void);
+#endif /*UIFLOW_PASSWORD_EVENT_CALLBACK_H*/
\ No newline at end of file
diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
index ababc9136..d1cf0b207 100755
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
@@ -3,6 +3,7 @@
 #include "UIFlowLVGL/UIFlowLVGL.h"
 #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h"
 #include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h"
+#include "UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.h"
 #include "UIFlowPhotoParams.h"
 #include "UIFlowPhotoFuncs.h"
 #include "ImageApp/ImageApp_Photo.h"
@@ -1528,6 +1529,7 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
 	{
 	case LV_PLUGIN_EVENT_SCR_OPEN:
 		UIFlowPhoto_ScrOpen(obj);
+	    // OpenPasswordScreen();
         #if HUNTING_CAMERA_MCU == ENABLE
         UIMenuStoreInfo *puiPara = sf_ui_para_get();
         if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO))
diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c
index 7d5834ee1..34aad73d1 100755
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c
@@ -30,7 +30,7 @@ static void task_msgbox_timer_cb(lv_task_t* task)
 {
 #define BUF_LENGTH 256
     char buf[BUF_LENGTH] = {0};
-	printf(" task_msgbox_timer_cb\n ");
+	// printf(" task_msgbox_timer_cb\n ");
 	// LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD
 	if(LV_PLUGIN_STRING_ID_STRING_ENTER_WORK == msgID)
 	{
@@ -85,7 +85,10 @@ void UIFlowWrnMsgAPI_Open_StringID(lv_plugin_res_id id, uint16_t auto_close_time
 	 *******************************************************************/
 	 lv_plugin_msgbox_allocate_ext_attr(msgbox);
 
-	 lv_plugin_msgbox_set_text(msgbox, id);
+	if(LV_PLUGIN_STRING_ID_STRING_ENTER_WORK != msgID)
+	{
+	     lv_plugin_msgbox_set_text(msgbox, id);
+	}
 
 	/* add button */
 	// btn_map[0] = lv_plugin_get_string(LV_PLUGIN_STRING_ID_STRID_OK)->ptr;