翻动数字箭头修改, 红色电量, btn_map

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr

@@ -852,8 +852,8 @@
                     "drag": false,
                     "event callback": "",
                     "geometry": {
-                        "height": 40,
+                        "height": 11,
-                        "width": 48,
+                        "width": 18,
                         "x": 216,
                         "y": 0
                     },

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr

@@ -177,8 +177,8 @@
                     "drag": false,
                     "event callback": "",
                     "geometry": {
-                        "height": 40,
+                        "height": 11,
-                        "width": 48,
+                        "width": 18,
                         "x": 216,
                         "y": 0
                     },

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c

@@ -370,17 +370,17 @@ void  UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID)
 	} else {
 		DBG_FUNC("IDM_OKNO>>\r\n");
 
-		// btn_map[0] = lv_plugin_get_string(LV_PLUGIN_STRING_ID_STRID_OK)->ptr;
+		 btn_map[0] = lv_plugin_get_string(LV_PLUGIN_STRING_ID_STRID_OK)->ptr;
-		// btn_map[1] = lv_plugin_get_string(LV_PLUGIN_STRING_ID_STRID_NO)->ptr;
+		 btn_map[1] = lv_plugin_get_string(LV_PLUGIN_STRING_ID_STRID_NO)->ptr;
 
 		DBG_FUNC("IDM_OKNO<<\r\n");
 	}
 
-	// lv_msgbox_add_btns(msgbox, btn_map);
+	 lv_msgbox_add_btns(msgbox, btn_map);
 	lv_obj_t * btnmatrix = lv_msgbox_get_btnmatrix(msgbox);
 
 	if(btnmatrix){
-		lv_btnmatrix_set_focused_btn(btnmatrix, 0);
+		lv_btnmatrix_set_focused_btn(btnmatrix, 1);
 
 		/* update font of button part */
 		// lv_plugin_msgbox_update_font(msgbox, LV_MSGBOX_PART_BTN);
@@ -399,7 +399,7 @@ void UIFlowMenuCommonConfirm_OnOpen(lv_obj_t* obj)
 
 
 	set_indev_keypad_group(msgbox);
-	lv_group_send_data(gp, LV_KEY_RIGHT);
+	//lv_group_send_data(gp, LV_KEY_RIGHT);
 
 }
 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c

@@ -582,7 +582,7 @@ void show_Delay_page(lv_obj_t* obj)
   lv_obj_set_hidden(DelayImage, false);
   lv_obj_set_click(DelayImage, false);
   lv_obj_set_drag(DelayImage, false);
-  lv_obj_set_pos(DelayImage, 96, 78);
+  lv_obj_set_pos(DelayImage, 96, 96);
   lv_obj_set_size(DelayImage, 32, 88);
   lv_img_set_src(DelayImage, &sf_pwd_down_up);
 
@@ -803,8 +803,12 @@ static void update_Operating_Time_msg(lv_obj_t* obj)
   lv_btnmatrix_set_map(OperatingTimeMatrixObj, OperatingTimeMap);
 
   lv_btnmatrix_set_focused_btn(OperatingTimeMatrixObj, OperatingTimeIndex);
-
+  int offset = 0;
-  lv_obj_set_x(OperatingTimeImage, (71 + ((32 + 16) / 2) * OperatingTimeIndex));
+  if(OperatingTimeIndex == 0)
+  {
+    offset = 1;
+  }
+  lv_obj_set_x(OperatingTimeImage, (71 + ((32 + 16) / 2) * OperatingTimeIndex + offset));
 }
 
 void show_Operating_Time_page(lv_obj_t* obj)
@@ -847,7 +851,7 @@ void show_Operating_Time_page(lv_obj_t* obj)
   lv_obj_set_hidden(OperatingTimeImage, false);
   lv_obj_set_click(OperatingTimeImage, false);
   lv_obj_set_drag(OperatingTimeImage, false);
-  lv_obj_set_pos(OperatingTimeImage, 72, 78);
+  lv_obj_set_pos(OperatingTimeImage, 72, 96);
   lv_obj_set_size(OperatingTimeImage, 32, 88);
   lv_img_set_src(OperatingTimeImage, &sf_pwd_down_up);
 
@@ -1211,7 +1215,7 @@ void show_DateTime_page(lv_obj_t* obj, int defaultTime)
   lv_obj_set_hidden(DateTimeImage, false);
   lv_obj_set_click(DateTimeImage, false);
   lv_obj_set_drag(DateTimeImage, false);
-  lv_obj_set_pos(DateTimeImage, 20, 78);
+  lv_obj_set_pos(DateTimeImage, 20, 96);
   lv_obj_set_size(DateTimeImage, 32, 88);
   lv_img_set_src(DateTimeImage, &sf_pwd_down_up);
 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c

@@ -960,8 +960,12 @@ static void update_Password_msg(lv_obj_t* obj)
   lv_btnmatrix_set_map(PasswordMatrixObj, PasswordMap);
 
   lv_btnmatrix_set_focused_btn(PasswordMatrixObj, PasswordIndex);
-
+  int offset = 0;
-  lv_obj_set_x(PasswordImage, (63 + 32 * PasswordIndex));
+  if (PasswordIndex == 0)
+  {
+    offset = 1;
+  }
+  lv_obj_set_x(PasswordImage, (63 + 32 * PasswordIndex + offset));
 }
 
 void show_Password_page(lv_obj_t* obj)
@@ -1003,7 +1007,7 @@ void show_Password_page(lv_obj_t* obj)
   lv_obj_set_hidden(PasswordImage, false);
   lv_obj_set_click(PasswordImage, false);
   lv_obj_set_drag(PasswordImage, false);
-  lv_obj_set_pos(PasswordImage, 64, 78);
+  lv_obj_set_pos(PasswordImage, 64, 96);
   lv_obj_set_size(PasswordImage, 32, 88);
   lv_img_set_src(PasswordImage, &sf_pwd_down_up);
 }
@@ -1406,8 +1410,12 @@ static void update_Camera_Name_msg(lv_obj_t* obj)
   lv_btnmatrix_set_map(CameraNameMatrixObj, CameraNameMap);
 
   lv_btnmatrix_set_focused_btn(CameraNameMatrixObj, CameraNameIndex);
-
+  int offset = 0;
-  lv_obj_set_x(CameraNameImage, (96 + 32 * CameraNameIndex));
+  if (CameraNameIndex == 0)
+  {
+    offset = 1;
+  }
+  lv_obj_set_x(CameraNameImage, (96 + 32 * CameraNameIndex + offset));
 }
 
 void show_Camera_Name_page(lv_obj_t* obj)
@@ -1457,7 +1465,7 @@ void show_Camera_Name_page(lv_obj_t* obj)
   lv_obj_set_hidden(CameraNameImage, false);
   lv_obj_set_click(CameraNameImage, false);
   lv_obj_set_drag(CameraNameImage, false);
-  lv_obj_set_pos(CameraNameImage, 96, 78);
+  lv_obj_set_pos(CameraNameImage, 97, 96);
   lv_obj_set_size(CameraNameImage, 32, 88);
   lv_img_set_src(CameraNameImage, &sf_pwd_down_up);
 }

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c

@@ -351,7 +351,7 @@ void show_MaxNum_page(lv_obj_t* obj)
   lv_obj_set_drag(SelectedImage, false);
   lv_obj_set_size(SelectedImage, 32, 88);
   lv_img_set_src(SelectedImage, &sf_pwd_down_up);
-  lv_obj_set_pos(SelectedImage, 144, 62);
+  lv_obj_set_pos(SelectedImage, 144, 80);
 }
 
 void hidde_MaxNum_page(void)
@@ -487,13 +487,22 @@ static void update_send_time_msg(lv_obj_t* obj)
      lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_0, gMatrixIndex);
      lv_btnmatrix_set_map(SendTimeMatrixObj_0, SendTimeMap_0);
      offset = gMatrixIndex > 3 ? 32 : 0;
+     if (gMatrixIndex == 0)
+     {
+      offset = 1;
+     }
      lv_obj_set_x(SelectedImage, (31 + 32 * gMatrixIndex + offset));
   }
   if(NULL != SendTimeMatrixObj_1)
   {
      lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_1, gMatrixIndex);
      lv_btnmatrix_set_map(SendTimeMatrixObj_1, SendTimeMap_1);
-     lv_obj_set_x(SelectedImage, (111 + 32 * gMatrixIndex));
+     offset = 0;
+     if (gMatrixIndex == 0)
+     {
+      offset = 1;
+     }
+     lv_obj_set_x(SelectedImage, (111 + 32 * gMatrixIndex + offset));
   }
   if(NULL != btnm)
   {
@@ -596,11 +605,11 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
   lv_img_set_src(SelectedImage, &sf_pwd_down_up);
   if(ONCE_DAY != gSendType)
   {
-    lv_obj_set_pos(SelectedImage, 32, 78);
+    lv_obj_set_pos(SelectedImage, 32, 96);
   }
   else
   {
-    lv_obj_set_pos(SelectedImage, 112, 78);
+    lv_obj_set_pos(SelectedImage, 112, 96);
   }
 
   if(FOUR_TIME_DAY == gSendType)

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c

@@ -909,7 +909,7 @@ lv_obj_t* UIFlowMovie_create(){
 	lv_obj_set_click(image_4g, false);
 	lv_obj_set_drag(image_4g, false);
 	lv_obj_set_pos(image_4g, 216, 0);
-	lv_obj_set_size(image_4g, 48, 40);
+	lv_obj_set_size(image_4g, 18, 11);
 	lv_img_set_src(image_4g, &sf_net4g);
 	lv_obj_add_style(image_4g, 0, &image_4g_s0);
 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPasswordEventCallback.c

@@ -181,7 +181,7 @@ static void UIFlowPassword_ScrOpen(lv_obj_t* obj)
 	lv_obj_set_drag(SelectedImage, false);
 	lv_obj_set_size(SelectedImage, 32, 88);
 	lv_img_set_src(SelectedImage, &sf_pwd_down_up);
-	lv_obj_set_pos(SelectedImage, 69, 99);
+	lv_obj_set_pos(SelectedImage, 69, 118);
 
 	sf_set_keep_alive_time(PASSWORD_SCREEN_GO_TO_WORK_MODE_TIME_S);
 	set_indev_keypad_group(obj);
@@ -216,6 +216,10 @@ static void update_Password_msg(lv_obj_t* obj)
   lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_0, PasswordIndex);
   lv_btnmatrix_set_map(SendTimeMatrixObj_0, PasswordMap);
   int offset = 0;
+  if (PasswordIndex == 0)
+     {
+      offset = 1;
+     }
   lv_obj_set_x(SelectedImage, (68 + 32 * PasswordIndex + offset));
 }
 static void UIFlowPassword_Key(lv_obj_t* obj, uint32_t key)

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c

@@ -295,7 +295,7 @@ lv_obj_t* UIFlowPhoto_create(){
 	lv_obj_set_click(image_4g, false);
 	lv_obj_set_drag(image_4g, false);
 	lv_obj_set_pos(image_4g, 216, 0);
-	lv_obj_set_size(image_4g, 48, 40);
+	lv_obj_set_size(image_4g, 18, 11);
 	lv_img_set_src(image_4g, &sf_net4g);
 	lv_obj_add_style(image_4g, 0, &image_4g_s0);