Merge branch 'heyudong_dev' into 'dev'

Heyudong dev

See merge request !100

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -679,6 +679,11 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
     }
     if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
     {
+        if (connect_personnumber >5000)
+        {
+            connect_personnumber =5000;
+        }
+        
         /*同步联系人数字显示*/
         if(g_u8Display_Mode == ModeDAY)
         {
@@ -694,6 +699,18 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
                 DisplayNumPara.x = 612;
                 DisplayNumPara.MinDigits = 2;
             }
+            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
             {
                 ;
@@ -725,15 +742,22 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
                 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;
@@ -743,8 +767,17 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
     }
     else/*蓝牙未连接或蓝牙关闭时  同步联系人显示0*/
     {
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287);
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0225_605_289);
+        if(g_u8Display_Mode == ModeDAY)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0040_605_289);
+        }
+        else if(g_u8Display_Mode == ModeNIGHT)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0225_605_289);
+        }
+        
     }
 }
 

Firmware/Source/Component/AMT630H/PicBin.c

@@ -148,7 +148,8 @@ static const uint16_t PicIndexData[] = {
     Pic_1134, 13, 486, 251, Pic_1135, 13, 486, 251, Pic_1136, 8, 489, 263, Pic_1137, 52, 632, 551, Pic_1138, 133, 786, 561, Pic_1139, 13, 486, 251, Pic_1139, 13, 501, 251, Pic_1139, 13, 516, 251, Pic_1139, 13, 531, 251, Pic_1139, 13, 546, 251, 
     Pic_1139, 13, 561, 251, Pic_1139, 13, 576, 251, Pic_1139, 13, 591, 251, Pic_1139, 13, 606, 251, Pic_1139, 13, 621, 251, Pic_1139, 13, 636, 251, Pic_1139, 13, 651, 251, Pic_1139, 13, 666, 251, Pic_1139, 13, 681, 251, Pic_1139, 13, 696, 251, 
     Pic_1139, 13, 711, 251, Pic_1139, 13, 726, 251, Pic_1139, 13, 741, 251, Pic_1139, 13, 756, 251, Pic_1139, 13, 771, 251, Pic_1139, 13, 786, 251, Pic_1140, 12, 487, 252, Pic_1141, 13, 486, 251, Pic_1142, 14, 485, 251, Pic_1143, 15, 485, 252, 
-    Pic_1144, 14, 485, 252, Pic_1145, 13, 486, 251, Pic_1146, 13, 486, 252, Pic_1147, 13, 486, 251, Pic_1148, 13, 486, 251, Pic_1149, 8, 489, 263, 
+    Pic_1144, 14, 485, 252, Pic_1145, 13, 486, 251, Pic_1146, 13, 486, 252, Pic_1147, 13, 486, 251, Pic_1148, 13, 486, 251, Pic_1149, 8, 489, 263, Pic_1150, 71, 576, 287, Pic_0040, 12, 591, 289, Pic_0040, 12, 619, 289, Pic_1151, 85, 569, 287, 
+    Pic_0040, 12, 584, 289, Pic_0040, 12, 626, 289, Pic_1152, 71, 576, 287, Pic_0225, 12, 591, 289, Pic_0225, 12, 619, 289, Pic_1153, 85, 569, 287, Pic_0225, 12, 584, 289, Pic_0225, 12, 626, 289, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20241026 2024-10-26 11:42:28 Compression ratio:70.00% */
+/* Flash Bin Version:20241029 2024-10-29 15:58:39 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -1151,6 +1151,10 @@
 #define Pic_1147 1147
 #define Pic_1148 1148
 #define Pic_1149 1149
+#define Pic_1150 1150
+#define Pic_1151 1151
+#define Pic_1152 1152
+#define Pic_1153 1153
 
 enum {
     Pic_0001_0_0 = 0,
@@ -2640,9 +2644,21 @@ enum {
     Pic_1147_486_251,
     Pic_1148_486_251,
     Pic_1149_489_263,
+    Pic_1150_576_287,
+    Pic_0040_591_289,
+    Pic_0040_619_289,
+    Pic_1151_569_287,
+    Pic_0040_584_289,
+    Pic_0040_626_289,
+    Pic_1152_576_287,
+    Pic_0225_591_289,
+    Pic_0225_619_289,
+    Pic_1153_569_287,
+    Pic_0225_584_289,
+    Pic_0225_626_289,
 };
 
-#define PIC_INDEX_DATA_CRC 0x6862C54A
+#define PIC_INDEX_DATA_CRC 0x12535796
 
 extern void User_PicIndexDataInit(void);
 #endif