Skip to content

H
haoJin750TFT
Commit 5b8297c4 authored by 王雅楠's avatar 王雅楠 🍎
Browse files
Options

🐞 fix:修改字库地址&来电显示时将联系人与电话号码在同一位置显示

parent 410dbc6b
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 224 deletions
Firmware/Source/Application/BlueTooth.c
View file @ 5b8297c4
...@@ -255,8 +255,8 @@ void TextService(void) ...@@ -255,8 +255,8 @@ void TextService(void)
} }
} }
} }
if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_BLUETOOTH_CONNECT) // if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_BLUETOOTH_CONNECT)
{ // {
if (memcmp(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)) != 0) if (memcmp(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)) != 0)
{ {
for (uint8_t i = 0; i < sizeof(BlueToothPhoneData.BlueToothName); i++) for (uint8_t i = 0; i < sizeof(BlueToothPhoneData.BlueToothName); i++)
...@@ -267,7 +267,7 @@ void TextService(void) ...@@ -267,7 +267,7 @@ void TextService(void)
memcpy(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)); memcpy(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName));
TextPara[TEXT_NUM_BLUETOOTH_NAME].Vaild = 0X01; TextPara[TEXT_NUM_BLUETOOTH_NAME].Vaild = 0X01;
} }
} // }
if (LastPhoneBookTotalCount != BlueToothPhoneData.PhoneBookTotalCount) if (LastPhoneBookTotalCount != BlueToothPhoneData.PhoneBookTotalCount)
{ {
uint8_t TempNumberCnts = 0; uint8_t TempNumberCnts = 0;
......
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 5b8297c4
...@@ -118,7 +118,7 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -118,7 +118,7 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0097_334_163);/*current fault*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0097_334_163);/*current fault*/
AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode()); AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode());
} }
/*蓝牙名称改为字库显示*/ /*os MCU版本*/
/* RGB 0 0 0 --- 黑*/ /* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/ /* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20); PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
...@@ -162,7 +162,7 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -162,7 +162,7 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0285_334_163);/*current fault*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0285_334_163);/*current fault*/
AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode()); AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode());
} }
/*蓝牙名称改为字库显示*/ /*os MCU版本*/
/* RGB 0 0 0 --- 黑*/ /* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/ /* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20); PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
...@@ -170,7 +170,6 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -170,7 +170,6 @@ void AMT630H_GUI_Fault_Information(void)
PackedTransfer_LabelsList( 0x9022,(uint8_t *)InformationMCUVersion, 26); PackedTransfer_LabelsList( 0x9022,(uint8_t *)InformationMCUVersion, 26);
SetPageText(GRAPHICS_PAGE_0, 0x9022, 567 , 356 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x9022, 567 , 356 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
...@@ -203,160 +202,29 @@ uint8_t FaultCodevalid_monitor = 2; ...@@ -203,160 +202,29 @@ uint8_t FaultCodevalid_monitor = 2;
/*故障码显示函数*/ /*故障码显示函数*/
static void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost,uint8_t FaultCodevalid,uint8_t FaultCode_hight,uint8_t FaultCode_mid) static void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost,uint8_t FaultCodevalid,uint8_t FaultCode_hight,uint8_t FaultCode_mid)
{ {
/*数字只有两组 历史故障和故障信息纵坐标不同*/
FaultCodevalid_monitor = FaultCodevalid;
if(FaultCodeLost == 1) if(FaultCodeLost == 1)
{ {
if(FaultCodevalid > 0) if(FaultCodevalid == 1)
{ {
DISPLAY_NUM_ST DisplayNumPara;
uint16_t frontnumber;
uint16_t midnumber;
frontnumber = FaultCode_hight;
midnumber = FaultCode_mid;
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P /*当前故障*/
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
/*当前故障码前两位显示*/ SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 229 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.NumList = NumbeList_FaultCode_day; /*历史故障*/
DisplayNumPara.x = 639; PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 164 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*当前故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
/*历史故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*历史故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
{ {
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 164);//当前故障码的P /*当前故障*/
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 229);//历史故障码的P PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
/*当前故障码前两位显示*/ SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 229 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.NumList = NumbeList_FaultCode_night; /*历史故障*/
DisplayNumPara.x = 639; PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 164 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*当前故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
/*历史故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*历史故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
} }
} }
else if(FaultCodevalid == 0)
{
/*显示P0000*/
if(g_u8Display_Mode == ModeDAY)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P
DISPLAY_NUM_ST DisplayNumPara;
/*当前故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
/*当前故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
/*历史故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
/*历史故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
}
else if(g_u8Display_Mode == ModeNIGHT)
{
/*显示P0000(直接贴图方式)*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_625_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_639_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_653_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_667_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_625_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_639_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_653_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_667_229);
}
else
{
;
}
}
else
{
;
}
} }
else if(FaultCodeLost == 0) else if(FaultCodeLost == 0)
{ {
...@@ -766,7 +634,8 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON) ...@@ -766,7 +634,8 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40); PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
{
/*同步联系人数字显示*/ /*同步联系人数字显示*/
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
...@@ -819,16 +688,21 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON) ...@@ -819,16 +688,21 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ // SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ /* 同步联系人最大位数未确定*/
// //
// } // }
DisplayNumPara.NumList = Bluetooth_num_night; DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0; DisplayNumPara.DecimalNum = 0;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, connect_personnumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, connect_personnumber);
} }
}
else/*蓝牙未连接或蓝牙关闭时 同步联系人显示0*/
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287);
SetPagePic(GRAPHICS_PAGE_0, Pic_0225_605_289);
}
} }
static uint16_t Time_num_day[] = { static uint16_t Time_num_day[] = {
...@@ -3157,8 +3031,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3157,8 +3031,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 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)
...@@ -3170,8 +3044,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3170,8 +3044,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
...@@ -3188,8 +3062,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3188,8 +3062,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 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)
...@@ -3201,8 +3075,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3201,8 +3075,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
...@@ -3219,8 +3093,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3219,8 +3093,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 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)
...@@ -3232,8 +3106,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3232,8 +3106,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
} }
...@@ -3260,28 +3134,43 @@ static void AMT630H_GUI_PhoneConnect_Telephone() ...@@ -3260,28 +3134,43 @@ static void AMT630H_GUI_PhoneConnect_Telephone()
{ if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) { if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0451_751_555); SetPagePic(GRAPHICS_PAGE_0, Pic_0451_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking) else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)
{ {
//SetPagePic(GRAPHICS_PAGE_0, Pic_0943_751_555); SetPagePic(GRAPHICS_PAGE_0, Pic_0943_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0450_751_555); SetPagePic(GRAPHICS_PAGE_0, Pic_0450_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 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