Merge branch 'wangyanan' into 'dev'

Wangyanan

See merge request !73

Firmware/Source/Application/BlueTooth.h

@@ -23,6 +23,9 @@ typedef struct {
     uint16_t Vaild;
 }TEXT_STRUCT;
 
+
+
+
 /*QRCode X Y height Width*/
 #define QRCode_X 178
 #define QRCode_Y 130
@@ -34,5 +37,8 @@ typedef struct {
 extern void BlueToothService(void);
 extern _PICID_Struct PicObj;
 extern _QRCODE_RECT QRCode_Rect;
+extern uint8_t PhoneNumber[40];
+extern uint8_t CurBlueToothPhoneName[100];
+extern TEXT_STRUCT TextPara[];
 
 #endif
\ No newline at end of file

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -3143,33 +3143,57 @@ static void AMT630H_GUI_PhoneConnect_TIME(uint16_t Hour ,uint16_t Minute)
 */
 static void AMT630H_GUI_Telephone()
 {
-    if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
-    {
-        //SetPagePic(GRAPHICS_PAGE_0, );
-    }
-    else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)
-    {
-        //SetPagePic(GRAPHICS_PAGE_0, );
-    }
-    else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming)
-    {
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0548_62_401);
-    }
-    else
-    {
-        ;
-    }
-
-    uint8_t *BLUETOOTH_PHONENAME = (uint8_t *)TEXT_NUM_BLUETOOTH_PHONENAME;
-    uint8_t *PHONE_NUMBER = (uint8_t *)TEXT_NUM_PHONE_NUMBER;
-    /*联系人*/
-    PackedTransfer_LabelsList( 0x4007, BLUETOOTH_PHONENAME , 22);
-    SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
-    /*手机号码*/
-    PackedTransfer_LabelsList(0x4009, PHONE_NUMBER, 22);
-    SetPageText(GRAPHICS_PAGE_0, 0x4009, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
+    //if((TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)||(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01))
+        if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0939_62_401);
+            if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+            {
+                PackedTransfer_LabelsList( 0x4007,(uint8_t *)CurBlueToothPhoneName, 40);
+                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+            }
+            if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+            {
+                PackedTransfer_LabelsList( 0x4007,(uint8_t *)PhoneNumber, 40);
+                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+            }
+        }
+        else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0938_62_399);
+            if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+            {
+                PackedTransfer_LabelsList( 0x4007,(uint8_t *)CurBlueToothPhoneName, 40);
+                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+            }
+            if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+            {
+                PackedTransfer_LabelsList( 0x4007,(uint8_t *)PhoneNumber, 40);
+                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+            }
+        }
+        else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0548_62_401);
+            if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+            {
+                PackedTransfer_LabelsList( 0x4007,(uint8_t *)CurBlueToothPhoneName, 40);
+                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+            }
+            if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+            {
+                PackedTransfer_LabelsList( 0x4007,(uint8_t *)PhoneNumber, 40);
+                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+            }
+        }
+        else
+        {
+            ;
+        }
+    
 }
 
+
 /*
 *NAME : AMT630H_GUI_Fuel
 *FUNCTION : 燃油显示函数
@@ -4179,6 +4203,7 @@ void AMT630H_GUI_BACKGRAND()
     AMT630H_GUI_Light();
     AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
     AMT630H_GUI_Telephone();
+
     /*燃油*/
     if (Get_Fuel_Sensor_State() == FuelSensorNormal)
     {

Firmware/Source/Component/AMT630H/PicBin.c

@@ -118,7 +118,7 @@ static const uint16_t PicIndexData[] = {
     Pic_0910, 13, 639, 293, Pic_0911, 17, 636, 292, Pic_0912, 13, 639, 293, Pic_0913, 17, 636, 292, Pic_0914, 13, 638, 293, Pic_0915, 16, 636, 293, Pic_0916, 11, 640, 293, Pic_0917, 14, 639, 293, Pic_0899, 11, 638, 293, Pic_0918, 3, 643, 293, 
     Pic_0898, 14, 637, 293, Pic_0897, 15, 637, 292, Pic_0919, 11, 640, 293, Pic_0920, 12, 639, 293, Pic_0921, 14, 638, 293, Pic_0922, 14, 638, 292, Pic_0923, 14, 638, 293, Pic_0924, 15, 637, 293, Pic_0925, 221, 501, 160, Pic_0926, 50, 619, 240, 
     Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, Pic_0930, 64, 612, 240, Pic_0930, 64, 612, 175, Pic_0931, 64, 612, 240, Pic_0931, 64, 612, 175, Pic_0932, 777, 124, 85, 
-    Pic_0933, 317, 101, 210, Pic_0934, 209, 102, 260, Pic_0935, 461, 36, 367, Pic_0936, 350, 92, 367, Pic_0937, 323, 564, 521, 
+    Pic_0933, 317, 101, 210, Pic_0934, 209, 102, 260, Pic_0935, 461, 36, 367, Pic_0936, 350, 92, 367, Pic_0937, 323, 564, 521, Pic_0938, 41, 62, 399, Pic_0939, 41, 62, 401, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20240828 2024-08-28 15:55:32 Compression ratio:70.00% */
+/* Flash Bin Version:20240902 2024-09-02 13:18:34 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -939,6 +939,8 @@
 #define Pic_0935 935
 #define Pic_0936 936
 #define Pic_0937 937
+#define Pic_0938 938
+#define Pic_0939 939
 
 enum {
     Pic_0001_0_0 = 0,
@@ -2121,9 +2123,11 @@ enum {
     Pic_0935_36_367,
     Pic_0936_92_367,
     Pic_0937_564_521,
+    Pic_0938_62_399,
+    Pic_0939_62_401,
 };
 
-#define PIC_INDEX_DATA_CRC 0xD0B47BE6
+#define PIC_INDEX_DATA_CRC 0x53F47F46
 
 extern void User_PicIndexDataInit(void);
 #endif

Firmware/Source/System/Sys_Task_List.c

@@ -20,7 +20,7 @@ void Sys_2ms_Tasks(void)
     Sys_Status_Update_Service();
     Analog_Signal_Conv_Service();
     AMT630H_Main();
-    Check_MCU_Info_in_630H(); 
+    // Check_MCU_Info_in_630H(); 
     DoCAN_Timer_Update(2000u);
     //Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 2000u);无外发
     CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp, 2u);