Commit 33aadbbb authored by 张金硕's avatar 张金硕

feat:新增只有写入UUID才显示UUID

parent b8131a55
...@@ -352,15 +352,15 @@ void TextService(void) ...@@ -352,15 +352,15 @@ void TextService(void)
TextPara[TEXT_NUM_FAUULT_CODE].Vaild = 0x01; TextPara[TEXT_NUM_FAUULT_CODE].Vaild = 0x01;
} }
if (((memcmp(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay))) != 0)) if (((memcmp(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay))) != 0))
{
for (uint8_t i = 0; i < (sizeof(UUIDConfigBuf)); i++)
{ {
for (uint8_t i = 0; i < (sizeof(UUIDConfigBuf)); i++) UUIDDisplay[i * 2] = UUIDConfigBuf[i];
{ UUIDDisplay[(i * 2) + 1] = 0x00;
UUIDDisplay[i * 2] = UUIDConfigBuf[i];
UUIDDisplay[(i * 2) + 1] = 0x00;
}
memcpy(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay));
TextPara[TEXT_NUM_INFORMATION_UUID].Vaild = 0X01;
} }
memcpy(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay));
TextPara[TEXT_NUM_INFORMATION_UUID].Vaild = 0X01;
}
} }
uint8_t Get_Talking_PhoneBookValid(void) uint8_t Get_Talking_PhoneBookValid(void)
...@@ -373,5 +373,15 @@ uint8_t Get_Talking_PhoneBookValid(void) ...@@ -373,5 +373,15 @@ uint8_t Get_Talking_PhoneBookValid(void)
return 0; return 0;
} }
uint8_t Get_UUID_UDSStatus(void)
{
for(uint8_t i=0;i<21;i++)
{
if(UUIDConfigBuf[i]!=0xFF)
return 1;
}
return 0;
}
...@@ -40,6 +40,7 @@ static const uint8_t SW_Version[3] = {SW_EXTERNAL_VERSION}; ...@@ -40,6 +40,7 @@ static const uint8_t SW_Version[3] = {SW_EXTERNAL_VERSION};
extern void BlueToothService(void); extern void BlueToothService(void);
extern uint8_t Get_Talking_PhoneBookValid(void); extern uint8_t Get_Talking_PhoneBookValid(void);
extern uint8_t Get_UUID_UDSStatus(void);
extern _PICID_Struct PicObj; extern _PICID_Struct PicObj;
extern _QRCODE_RECT QRCode_Rect; extern _QRCODE_RECT QRCode_Rect;
extern uint8_t PhoneNumber[40]; extern uint8_t PhoneNumber[40];
......
...@@ -5167,9 +5167,15 @@ void AMT630H_GUI_Display_Navigation_Area(void) ...@@ -5167,9 +5167,15 @@ void AMT630H_GUI_Display_Navigation_Area(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0495_655_197); SetPagePic(GRAPHICS_PAGE_0, Pic_0495_655_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_0496_410_197); SetPagePic(GRAPHICS_PAGE_0, Pic_0496_410_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_0498_411_252); /*UUID*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0498_411_252); /*UUID*/
if(Get_UUID_UDSStatus() == 1)
PackedTransfer_LabelsList( 0x4014,(uint8_t *)UUIDDisplay, 42); {
SetPageText(GRAPHICS_PAGE_0, 0x4014, 486, 248, 800, ALIGN_LEFT, 200, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); PackedTransfer_LabelsList( 0x4014,(uint8_t *)UUIDDisplay, 42);
SetPageText(GRAPHICS_PAGE_0, 0x4014, 486, 248, 800, ALIGN_LEFT, 200, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
else
{
;
}
} }
if(g_u8Display_Mode == ModeNIGHT) if(g_u8Display_Mode == ModeNIGHT)
{ {
...@@ -5183,8 +5189,15 @@ void AMT630H_GUI_Display_Navigation_Area(void) ...@@ -5183,8 +5189,15 @@ void AMT630H_GUI_Display_Navigation_Area(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_1032_655_197); SetPagePic(GRAPHICS_PAGE_0, Pic_1032_655_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_1033_410_197); SetPagePic(GRAPHICS_PAGE_0, Pic_1033_410_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_1035_411_252); /*UUID*/ SetPagePic(GRAPHICS_PAGE_0, Pic_1035_411_252); /*UUID*/
PackedTransfer_LabelsList( 0x4014,(uint8_t *)UUIDDisplay, 42); if(Get_UUID_UDSStatus() == 1)
SetPageText(GRAPHICS_PAGE_0, 0x4014, 486, 248, 800, ALIGN_LEFT, 200, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); {
PackedTransfer_LabelsList( 0x4014,(uint8_t *)UUIDDisplay, 42);
SetPageText(GRAPHICS_PAGE_0, 0x4014, 486, 248, 800, ALIGN_LEFT, 200, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
else
{
;
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment