Merge branch 'heyudong_dev' into 'dev'

Heyudong dev

See merge request !110

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -2220,6 +2220,10 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
     }
     
     /*同步联系人数字显示*/
+    if (connect_personnumber >5000)
+    {
+        connect_personnumber =5000;
+    }
     if(g_u8Display_Mode == ModeDAY)
     {
         if((connect_personnumber >= 0)&&(connect_personnumber < 10))
@@ -2234,12 +2238,22 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
             DisplayNumPara.x = 612;
             DisplayNumPara.MinDigits = 2;
         }
-        // else if(Contect_totalnumber == 3)
-        // {
-        //     SetPagePic(GRAPHICS_PAGE_0, );      /*【括号】 三位数 */
-        //     
-        // }
-        
+        else if((connect_personnumber >= 100)&&(connect_personnumber < 1000))
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1150_576_287);      /*【括号】 三位数 */  /* 同步联系人最大位数未确定*/
+            DisplayNumPara.x = 619;
+            DisplayNumPara.MinDigits = 3;
+        }
+        else if((connect_personnumber >= 1000)&&(connect_personnumber < 10000))
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1151_569_287);      /*【括号】 四位数 */  /* 同步联系人最大位数未确定*/
+            DisplayNumPara.x = 626;
+            DisplayNumPara.MinDigits = 4;
+        }
+        else
+        {
+            ;
+        }
         DisplayNumPara.NumList = Bluetooth_num_day;
         DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
         DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
@@ -2261,16 +2275,22 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
             DisplayNumPara.x = 612;
             DisplayNumPara.MinDigits = 2;
         }
+        else if((connect_personnumber >= 100)&&(connect_personnumber < 1000))
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1152_576_287);      /*【括号】 三位数 */  /* 同步联系人最大位数未确定*/
+            DisplayNumPara.x = 619;
+            DisplayNumPara.MinDigits = 3;
+        }
+        else if((connect_personnumber >= 1000)&&(connect_personnumber < 10000))
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_1153_569_287);      /*【括号】 四位数 */  /* 同步联系人最大位数未确定*/
+            DisplayNumPara.x = 626;
+            DisplayNumPara.MinDigits = 4;
+        }
         else
         {
             ;
         }
-        // else if(Contect_totalnumber == 3)
-        // {
-        //     SetPagePic(GRAPHICS_PAGE_0, );      /*【括号】 三位数 */
-        //     
-        // }
-        
         DisplayNumPara.NumList = Bluetooth_num_night;
         DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
         DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
@@ -3060,7 +3080,7 @@ static void AMT630H_GUI_PhoneConnect_Light()
     // {
     //     SetPagePic(GRAPHICS_PAGE_0, Pic_0466_874_488);
     // }
-    if(Get_TelltalesLedSts(em_LED_TCS))
+    if(Get_TelltalesLedSts(em_LED_TCS) == 1)
     {
         SetPagePic(GRAPHICS_PAGE_0, Pic_0473_172_490);
     }

Firmware/Source/Component/Key/Key_user.c

@@ -325,7 +325,8 @@ void Key_Event_Short_Press_Right(void)//确认
 		{
 			PackedTransfer_BlueTooth_DataSet(Phone_Hangup_Out);
 		}
-		else if(Get_ActualVechileSpeed() == 0)
+		else if((Menu_Get_Current_Cursor_Information() == MENU_ITEM_PHONE_CONNECT_APP)||
+	    	   ((Menu_Get_Current_Cursor_Information() == MENU_ITEM_MAIN_ITEM) && (Get_ActualVechileSpeed() == 0)))
 		{
 			Menu_Service(MENU_KEY_CONFIRM_SHORT);
 		}