Skip to content

H
haoJin750TFT
Commit 650cf1bc authored by 王雅楠's avatar 王雅楠
Browse files
Options

✨ feat:字库显示蓝牙连接中的蓝牙名称与同步联系人（同步联系人最大位数未确定）

parent ddb97726
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 104 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 650cf1bc
...@@ -651,6 +651,8 @@ static uint16_t Bluetooth_num_night[] = { ...@@ -651,6 +651,8 @@ static uint16_t Bluetooth_num_night[] = {
*/ */
void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON) void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON)
{ {
uint8_t Contect_totalnumber;
Contect_totalnumber = 0;
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
if(g_u8Language == CH) if(g_u8Language == CH)
...@@ -660,7 +662,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -660,7 +662,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_345); SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_345);
SetPagePic(GRAPHICS_PAGE_0, Pic_0139_369_287); SetPagePic(GRAPHICS_PAGE_0, Pic_0139_369_287);
SetPagePic(GRAPHICS_PAGE_0, Pic_0142_367_226); SetPagePic(GRAPHICS_PAGE_0, Pic_0142_367_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0055_570_165); //SetPagePic(GRAPHICS_PAGE_0, Pic_0055_570_165);//HJ3EA0
SetPagePic(GRAPHICS_PAGE_0, Pic_0143_367_163); SetPagePic(GRAPHICS_PAGE_0, Pic_0143_367_163);
if (Connect_ON == 0) if (Connect_ON == 0)
...@@ -671,31 +673,6 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -671,31 +673,6 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0141_584_226); SetPagePic(GRAPHICS_PAGE_0, Pic_0141_584_226);
} }
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
sync_contactsNumber = sync_contacts;
if (sync_contacts < 10)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287);
DisplayNumPara.NumList = Bluetooth_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 604;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 1;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287);
DisplayNumPara.NumList = Bluetooth_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 612;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
} }
else if(g_u8Language == EN) else if(g_u8Language == EN)
{ {
...@@ -704,7 +681,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -704,7 +681,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_348); SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_348);
SetPagePic(GRAPHICS_PAGE_0, Pic_0037_376_289); SetPagePic(GRAPHICS_PAGE_0, Pic_0037_376_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0054_377_227); SetPagePic(GRAPHICS_PAGE_0, Pic_0054_377_227);
SetPagePic(GRAPHICS_PAGE_0, Pic_0055_570_165); //SetPagePic(GRAPHICS_PAGE_0, Pic_0055_570_165);//HJ3EA0
SetPagePic(GRAPHICS_PAGE_0, Pic_0056_377_166); SetPagePic(GRAPHICS_PAGE_0, Pic_0056_377_166);
if (Connect_ON == 0) if (Connect_ON == 0)
{ {
...@@ -714,32 +691,12 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -714,32 +691,12 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0052_574_226); SetPagePic(GRAPHICS_PAGE_0, Pic_0052_574_226);
} }
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
sync_contactsNumber = sync_contacts;
if (sync_contacts < 10)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287);
DisplayNumPara.NumList = Bluetooth_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 604;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 1;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287);
DisplayNumPara.NumList = Bluetooth_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 612;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
} }
/*蓝牙名称改为字库显示*/
/* RGB 0 0 0 --- 白*/
/* RGB 0XFF 0XFF 0XFF --- 黑*/
PackedTransfer_LabelsList( 0x4022,(uint8_t *)BlueToothName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
{ {
...@@ -750,7 +707,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -750,7 +707,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_345); SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_345);
SetPagePic(GRAPHICS_PAGE_0, Pic_0326_369_287); SetPagePic(GRAPHICS_PAGE_0, Pic_0326_369_287);
SetPagePic(GRAPHICS_PAGE_0, Pic_0329_367_226); SetPagePic(GRAPHICS_PAGE_0, Pic_0329_367_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0241_570_165); //SetPagePic(GRAPHICS_PAGE_0, Pic_0241_570_165);//HJ3EA0
SetPagePic(GRAPHICS_PAGE_0, Pic_0330_367_163); SetPagePic(GRAPHICS_PAGE_0, Pic_0330_367_163);
if (Connect_ON == 0) if (Connect_ON == 0)
{ {
...@@ -760,31 +717,6 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -760,31 +717,6 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0328_584_226); SetPagePic(GRAPHICS_PAGE_0, Pic_0328_584_226);
} }
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
sync_contactsNumber = sync_contacts;
if (sync_contacts < 10)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287);
DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 604;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 1;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287);
DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 612;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
} }
else if(g_u8Language == EN) else if(g_u8Language == EN)
{ {
...@@ -793,7 +725,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -793,7 +725,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_348); SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_348);
SetPagePic(GRAPHICS_PAGE_0, Pic_0237_376_289); SetPagePic(GRAPHICS_PAGE_0, Pic_0237_376_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0240_377_227); SetPagePic(GRAPHICS_PAGE_0, Pic_0240_377_227);
SetPagePic(GRAPHICS_PAGE_0, Pic_0241_570_165); //SetPagePic(GRAPHICS_PAGE_0, Pic_0241_570_165);//HJ3EA0
SetPagePic(GRAPHICS_PAGE_0, Pic_0242_377_166); SetPagePic(GRAPHICS_PAGE_0, Pic_0242_377_166);
if (Connect_ON == 0) if (Connect_ON == 0)
...@@ -804,32 +736,67 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -804,32 +736,67 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226); SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226);
} }
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
sync_contactsNumber = sync_contacts;
if (sync_contacts < 10)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287);
DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 604;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 1;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287);
DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 612;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
}
} }
/*蓝牙名称改为字库显示*/
/* RGB 0 0 0 --- 白*/
/* RGB 0XFF 0XFF 0XFF --- 黑*/
PackedTransfer_LabelsList( 0x4022,(uint8_t *)BlueToothName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
/*遍历同步联系人数组*/
for(int i=0 ; i<20 ; i++ )
{
if(PhoneNumberTotal[i] != 0)
{
Contect_totalnumber++;
}
else
{
break;
}
}
/*同步联系人数字显示（字库版）*/
if(g_u8Display_Mode == ModeDAY)
{
if(Contect_totalnumber == 1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
else if(Contect_totalnumber == 2)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 598 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
// else if(Contect_totalnumber == 3)
// {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
// PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40);
// SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
// }
}
else if(g_u8Display_Mode == ModeNIGHT)
{
if(Contect_totalnumber == 1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
else if(Contect_totalnumber == 2)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 598 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
// else if(Contect_totalnumber == 3)
// {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
// PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40);
// SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
// }
} }
} }
......
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