Skip to content

H
haoJin750TFT
Commit c99dcdd1 authored by 张金硕's avatar 张金硕
Browse files
Options

Merge branch 'wangyanan' into 'dev' 

Wangyanan

See merge request !84
parents 8ba7c58d 7e737154
Show whitespace changes
Inline Side-by-side
Showing with 630 additions and 362 deletions
Firmware/Source/Application/BlueTooth.c
View file @ c99dcdd1
...@@ -86,9 +86,17 @@ void BlueToothService(void) ...@@ -86,9 +86,17 @@ void BlueToothService(void)
} }
if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)) if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking))
{
if(g_u8Cursor_Posittion == MENU_ITEM_PHONE_CONNECT_APP)/*导航界面*/
{
;
}
else/*非导航界面*/
{ {
Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM); Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
} }
}
SetUUIDData((char *)UUIDConfigBuf, 22); SetUUIDData((char *)UUIDConfigBuf, 22);
if (OTA_Update_Flag == 1) if (OTA_Update_Flag == 1)
{ {
...@@ -105,10 +113,10 @@ void BlueToothService(void) ...@@ -105,10 +113,10 @@ void BlueToothService(void)
QRCode_Rect.height = 240; QRCode_Rect.height = 240;
QRCode_Rect.width = 240; QRCode_Rect.width = 240;
SetScreenType(QRCode_TYPE, QRCode_Rect); SetScreenType(QRCode_TYPE, QRCode_Rect);
// if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION) if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
// { {
// OTA_Update_Flag = 0; OTA_Update_Flag = 0;
// } }
if(OTA_Update_Flag == 1) if(OTA_Update_Flag == 1)
{ {
if(OTA_Update_Count_Open < 5) if(OTA_Update_Count_Open < 5)
...@@ -130,15 +138,25 @@ void BlueToothService(void) ...@@ -130,15 +138,25 @@ void BlueToothService(void)
SetTaskbarHeight(150); SetTaskbarHeight(150);
SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName)); SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
TextService(); TextService();
}
else
{
GetBlueToothVaild =0;
OTA_Update_Flag = 0;
SetBluetoothTurnXX(0);
SetUpdateCtrl(0,QRCode_Rect);
}
// BlueConnectStatus = GetBlueToothPowerSTATE();
// juasfha = BlueToothPhoneData.BlueToothPhoneSate;
// juasfha = BlueToothPhoneData.PhoneBookTotalCount;
// for(i=0;i<20;i++)
// {
// sjhja[i] = BlueToothPhoneData.PhoneNumber[i];
// }
// for(i=0;i<100;i++)
// {
// PhoneName[i] = BlueToothPhoneData.BlueToothPhoneName[i];
// }
// _QRCODE_RECT QRCode_Rect;
// QRCode_Rect.x = QRCode_X;
// QRCode_Rect.y = QRCode_Y;
// QRCode_Rect.height = QRCode_HEIGHT;
// QRCode_Rect.width = QRCode_WIDTH;
// SetScreenType(QRCode_TYPE, QRCode_Rect);
} }
TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] = TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] =
......
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ c99dcdd1
...@@ -35,13 +35,13 @@ void AMT630H_GUI_Language_Information(void); ...@@ -35,13 +35,13 @@ void AMT630H_GUI_Language_Information(void);
void AMT630H_GUI_Unit_Information(void); void AMT630H_GUI_Unit_Information(void);
void AMT630H_GUI_Display_Mode_Information(void); void AMT630H_GUI_Display_Mode_Information(void);
void AMT630H_GUI_Backlight_Information(void); void AMT630H_GUI_Backlight_Information(void);
void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON); void AMT630H_GUI_Bluetooth_Information(uint8_t Connect_ON);
void AMT630H_GUI_Clock_Information(uint8_t Clock_Hour, uint8_t Clock_Min); void AMT630H_GUI_Clock_Information(uint8_t Clock_Hour, uint8_t Clock_Min);
// 二级菜单 // 二级菜单
static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uint8_t Clock_BIT); /*时钟设置*/ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uint8_t Clock_BIT); /*时钟设置*/
void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode); /*背光设置*/ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode); /*背光设置*/
void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode); /*显示模式*/ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode); /*显示模式*/
void AMT630H_GUI_Bluetooth_Connect_Setting(uint8_t select, uint8_t sync_contacts, uint8_t Connect_ON); /*蓝牙连接*/ void AMT630H_GUI_Bluetooth_Connect_Setting(uint8_t select, uint8_t Connect_ON); /*蓝牙连接*/
void AMT630H_GUI_Unit_Setting(Menu_Interface_en_t select); /*单位设置*/ void AMT630H_GUI_Unit_Setting(Menu_Interface_en_t select); /*单位设置*/
void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select); /*语言设置*/ void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select); /*语言设置*/
void AMT630H_GUI_Phone_Connect_Win(void); /*手机互联*/ void AMT630H_GUI_Phone_Connect_Win(void); /*手机互联*/
...@@ -50,6 +50,10 @@ void AMT630H_GUI_ReadPosittion_Display(void); ...@@ -50,6 +50,10 @@ void AMT630H_GUI_ReadPosittion_Display(void);
static void AMT630H_GUI_PhoneConnect_Light(); static void AMT630H_GUI_PhoneConnect_Light();
static void AMT630H_GUI_PhoneConnect_TIME(uint16_t Hour ,uint16_t Minute); static void AMT630H_GUI_PhoneConnect_TIME(uint16_t Hour ,uint16_t Minute);
static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VechileSpeed); static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VechileSpeed);
static void AMT630H_GUI_PhoneConnect_ESpeed(uint16_t ESpeed);
static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel);
static void AMT630H_GUI_PhoneConnect_Telephone();
static void AMT630H_GUI_PhoneConnect_Voltage(uint16_t Voltage);
void AMT630H_GUI_Background() void AMT630H_GUI_Background()
...@@ -89,9 +93,9 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -89,9 +93,9 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0155_737_485); SetPagePic(GRAPHICS_PAGE_0, Pic_0155_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0166_445_517); SetPagePic(GRAPHICS_PAGE_0, Pic_0166_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0091_567_356); //SetPagePic(GRAPHICS_PAGE_0, Pic_0091_567_356);20231201.1.G
SetPagePic(GRAPHICS_PAGE_0, Pic_0167_341_354); SetPagePic(GRAPHICS_PAGE_0, Pic_0167_341_354);
SetPagePic(GRAPHICS_PAGE_0, Pic_0093_574_292); //SetPagePic(GRAPHICS_PAGE_0, Pic_0093_574_292);20231201HJ
SetPagePic(GRAPHICS_PAGE_0, Pic_0168_350_290); SetPagePic(GRAPHICS_PAGE_0, Pic_0168_350_290);
SetPagePic(GRAPHICS_PAGE_0, Pic_0169_353_227);/*历史故障*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0169_353_227);/*历史故障*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0170_354_162);/*当前故障*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0170_354_162);/*当前故障*/
...@@ -105,15 +109,22 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -105,15 +109,22 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0086_762_487); SetPagePic(GRAPHICS_PAGE_0, Pic_0086_762_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0090_435_519); SetPagePic(GRAPHICS_PAGE_0, Pic_0090_435_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0091_567_356); //SetPagePic(GRAPHICS_PAGE_0, Pic_0091_567_356);20231201.1.G
SetPagePic(GRAPHICS_PAGE_0, Pic_0092_368_356); SetPagePic(GRAPHICS_PAGE_0, Pic_0092_368_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0093_574_292); //SetPagePic(GRAPHICS_PAGE_0, Pic_0093_574_292);20231201HJ
SetPagePic(GRAPHICS_PAGE_0, Pic_0094_375_292); SetPagePic(GRAPHICS_PAGE_0, Pic_0094_375_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0096_338_228);/*Fault history*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0096_338_228);/*Fault history*/
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());
} }
/*蓝牙名称改为字库显示*/
/* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
SetPageText(GRAPHICS_PAGE_0, 0x8022, 574 , 292 , 400, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
PackedTransfer_LabelsList( 0x9022,(uint8_t *)InformationMCUVersion, 26);
SetPageText(GRAPHICS_PAGE_0, 0x9022, 567 , 356 , 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)
{ {
...@@ -125,9 +136,9 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -125,9 +136,9 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0342_737_485); SetPagePic(GRAPHICS_PAGE_0, Pic_0342_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0353_445_517); SetPagePic(GRAPHICS_PAGE_0, Pic_0353_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0279_567_356); //SetPagePic(GRAPHICS_PAGE_0, Pic_0279_567_356);20231201.1.G
SetPagePic(GRAPHICS_PAGE_0, Pic_0354_341_354); SetPagePic(GRAPHICS_PAGE_0, Pic_0354_341_354);
SetPagePic(GRAPHICS_PAGE_0, Pic_0281_574_292); //SetPagePic(GRAPHICS_PAGE_0, Pic_0281_574_292);20231201HJ
SetPagePic(GRAPHICS_PAGE_0, Pic_0355_350_290); SetPagePic(GRAPHICS_PAGE_0, Pic_0355_350_290);
SetPagePic(GRAPHICS_PAGE_0, Pic_0356_353_227);/*历史故障*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0356_353_227);/*历史故障*/
...@@ -142,16 +153,24 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -142,16 +153,24 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0277_728_486); SetPagePic(GRAPHICS_PAGE_0, Pic_0277_728_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0278_435_519); SetPagePic(GRAPHICS_PAGE_0, Pic_0278_435_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0279_567_356); //SetPagePic(GRAPHICS_PAGE_0, Pic_0279_567_356);20231201.1.G
SetPagePic(GRAPHICS_PAGE_0, Pic_0280_368_356); SetPagePic(GRAPHICS_PAGE_0, Pic_0280_368_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0281_574_292); //SetPagePic(GRAPHICS_PAGE_0, Pic_0281_574_292);20231201HJ
SetPagePic(GRAPHICS_PAGE_0, Pic_0282_375_292); SetPagePic(GRAPHICS_PAGE_0, Pic_0282_375_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0284_338_228); SetPagePic(GRAPHICS_PAGE_0, Pic_0284_338_228);
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());
} }
/*蓝牙名称改为字库显示*/
/* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
SetPageText(GRAPHICS_PAGE_0, 0x8022, 574 , 292 , 400, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
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));
} }
} }
...@@ -232,7 +251,7 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost,uint8_t FaultCodevalid,u ...@@ -232,7 +251,7 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost,uint8_t FaultCodevalid,u
DisplayNumPara.y = 229; DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0; DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
{ {
...@@ -649,8 +668,10 @@ static uint16_t Bluetooth_num_night[] = { ...@@ -649,8 +668,10 @@ static uint16_t Bluetooth_num_night[] = {
* @param[in] sync_contacts 同步联系人 * @param[in] sync_contacts 同步联系人
* @param[in] Connect_ON 0 关 1 开 * @param[in] Connect_ON 0 关 1 开
*/ */
void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON) void AMT630H_GUI_Bluetooth_Information( 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 +681,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -660,7 +681,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 +692,6 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -671,31 +692,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 +700,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -704,7 +700,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 +710,12 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -714,32 +710,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( 0x5022,(uint8_t *)BlueToothName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x5022, 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 +726,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -750,7 +726,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 +736,6 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -760,31 +736,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 +744,7 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -793,7 +744,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,33 +755,75 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON ...@@ -804,33 +755,75 @@ 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; /* RGB 0 0 0 --- 白*/
if (sync_contacts < 10) /* RGB 0XFF 0XFF 0XFF --- 黑*/
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));
}
/*遍历同步联系人数组*/
if(PhoneNumberTotal[0] == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); Contect_totalnumber = 1;
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 else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); for(int i=0 ; i<20 ; i++ )
DisplayNumPara.NumList = Bluetooth_num_night; {
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; if(PhoneNumberTotal[i] != 0)
DisplayNumPara.x = 612; {
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; Contect_totalnumber++;
DisplayNumPara.DecimalNum = 0; }
DisplayNumPara.MinDigits = 2; else
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber); {
break;
} }
} }
} }
/*同步联系人数字显示（字库版）*/
if(g_u8Display_Mode == ModeDAY)
{
if(Contect_totalnumber == 1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 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_0039_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 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(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( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 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_0224_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 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(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
// }
}
} }
static uint16_t Time_num_day[] = { static uint16_t Time_num_day[] = {
...@@ -2118,8 +2111,10 @@ static uint16_t Bluetooth_Connect_num_night[] = { ...@@ -2118,8 +2111,10 @@ static uint16_t Bluetooth_Connect_num_night[] = {
* @param[in] sync_contacts 同步联系人 * @param[in] sync_contacts 同步联系人
* @param[in] Connect_ON 0 关 1 开 * @param[in] Connect_ON 0 关 1 开
*/ */
void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_contacts, uint8_t Connect_ON) void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, 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)
...@@ -2128,7 +2123,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2128,7 +2123,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
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); /*HI3EA0*/ //SetPagePic(GRAPHICS_PAGE_0, Pic_0055_570_165); /*HI3EA0*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0143_367_163); /*蓝牙名称*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0143_367_163); /*蓝牙名称*/
switch (select) switch (select)
...@@ -2154,33 +2149,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2154,33 +2149,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
{ {
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_Connect_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_Connect_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)
{ {
...@@ -2188,7 +2156,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2188,7 +2156,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
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);
SetPagePic(GRAPHICS_PAGE_0, Pic_0056_377_166); SetPagePic(GRAPHICS_PAGE_0, Pic_0056_377_166);
switch (select) switch (select)
{ {
...@@ -2215,34 +2183,12 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2215,34 +2183,12 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
{ {
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_Connect_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_Connect_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( 0x5022,(uint8_t *)BlueToothName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x5022, 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)
{ {
...@@ -2252,7 +2198,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2252,7 +2198,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
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);
SetPagePic(GRAPHICS_PAGE_0, Pic_0330_367_163); SetPagePic(GRAPHICS_PAGE_0, Pic_0330_367_163);
switch (select) switch (select)
{ {
...@@ -2268,7 +2214,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2268,7 +2214,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
default: default:
break; break;
} }
/*蓝牙连接*/ /*蓝牙连接*/
if (Connect_ON == 0) if (Connect_ON == 0)
{ {
...@@ -2278,33 +2223,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2278,33 +2223,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
{ {
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_0223_590_287);
DisplayNumPara.NumList = Bluetooth_Connect_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_0224_583_287);
DisplayNumPara.NumList = Bluetooth_Connect_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)
{ {
...@@ -2312,7 +2230,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2312,7 +2230,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
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);
SetPagePic(GRAPHICS_PAGE_0, Pic_0242_377_166); SetPagePic(GRAPHICS_PAGE_0, Pic_0242_377_166);
switch (select) switch (select)
{ {
...@@ -2329,7 +2247,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2329,7 +2247,6 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
default: default:
break; break;
} }
/*蓝牙连接*/ /*蓝牙连接*/
if (Connect_ON == 0) if (Connect_ON == 0)
{ {
...@@ -2339,37 +2256,74 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c ...@@ -2339,37 +2256,74 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226); SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226);
} }
}
/*蓝牙联系人选择*/ /*蓝牙名称改为字库显示*/
DISPLAY_NUM_ST DisplayNumPara; /* RGB 0 0 0 --- 黑*/
uint8_t sync_contactsNumber; /* RGB 0XFF 0XFF 0XFF --- 白*/
sync_contactsNumber = sync_contacts; PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
if (sync_contacts < 10) SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
/*遍历同步联系人数组*/
if(PhoneNumberTotal[0] == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); Contect_totalnumber = 1;
DisplayNumPara.NumList = Bluetooth_Connect_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 else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); for(int i=0 ; i<20 ; i++ )
DISPLAY_NUM_ST DisplayNumPara; {
uint8_t ArrivalNumber; if(PhoneNumberTotal[i] != 0)
ArrivalNumber = sync_contacts; {
DisplayNumPara.NumList = Bluetooth_Connect_num_night; Contect_totalnumber++;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; }
DisplayNumPara.x = 612; else
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; {
DisplayNumPara.DecimalNum = 0; break;
DisplayNumPara.MinDigits = 2; }
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, sync_contactsNumber);
} }
} }
/*同步联系人数字显示（字库版）*/
if(g_u8Display_Mode == ModeDAY)
{
if(Contect_totalnumber == 1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 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_0039_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 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(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( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 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_0224_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 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(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
// }
} }
} }
...@@ -2763,6 +2717,18 @@ static const uint16_t NumbeList_Voltage_DAY[] = { ...@@ -2763,6 +2717,18 @@ static const uint16_t NumbeList_Voltage_DAY[] = {
Pic_0566_949_465, Pic_0566_949_465,
Pic_0576_945_458, Pic_0576_945_458,
}; };
static const uint16_t NumbeList_PhoneConnect_Voltage[] ={
Pic_0453_688_516,
Pic_0455_692_516,
Pic_0456_689_516,
Pic_0457_689_516,
Pic_0458_688_516,
Pic_0459_689_516,
Pic_0460_689_516,
Pic_0461_688_516,
Pic_0462_688_516,
Pic_0463_689_516,
};
static const uint16_t NumbeList_Voltage_NIGHT[] = { static const uint16_t NumbeList_Voltage_NIGHT[] = {
Pic_0673_943_451, Pic_0673_943_451,
Pic_0675_948_451, Pic_0675_948_451,
...@@ -2873,6 +2839,18 @@ static const uint16_t PICList_ESpeed_NIGHT[] = { ...@@ -2873,6 +2839,18 @@ static const uint16_t PICList_ESpeed_NIGHT[] = {
Pic_0717_731_111, Pic_0717_731_111,
Pic_0716_782_125, Pic_0716_782_125,
}; };
static const uint16_t NumbeList_PhoneConnect_ESpeed[] ={
Pic_0385_63_554,
Pic_0386_73_554,
Pic_0387_64_554,
Pic_0388_65_554,
Pic_0389_62_554,
Pic_0390_64_554,
Pic_0391_64_554,
Pic_0392_63_554,
Pic_0393_63_554,
Pic_0394_64_554,
};
static const uint16_t PICList_Fuel[] = { static const uint16_t PICList_Fuel[] = {
Pic_0562_315_473, Pic_0562_315_473,
Pic_0555_366_473, Pic_0555_366_473,
...@@ -2883,6 +2861,16 @@ static const uint16_t PICList_Fuel[] = { ...@@ -2883,6 +2861,16 @@ static const uint16_t PICList_Fuel[] = {
Pic_0560_586_473, Pic_0560_586_473,
Pic_0561_623_473, Pic_0561_623_473,
}; };
static const uint16_t PICList_PhoneConnect_Fuel[] = {
Pic_0414_76_536,
Pic_0416_105_536,
Pic_0417_134_536,
Pic_0418_163_536,
Pic_0419_192_536,
Pic_0420_221_536,
Pic_0421_250_536,
Pic_0422_279_536,
};
// static const uint16_t PICList_Fuel_RED[] = { // static const uint16_t PICList_Fuel_RED[] = {
// Pic_0562_315_473, // Pic_0562_315_473,
// Pic_0555_366_473, // Pic_0555_366_473,
...@@ -2968,11 +2956,11 @@ static void AMT630H_GUI_Light() ...@@ -2968,11 +2956,11 @@ static void AMT630H_GUI_Light()
; ;
} }
} }
if(Get_TelltalesLedSts(em_LED_WIFI)) if(GetPhoneMirrorst() == 1) /*WIFI指示灯*/
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0737_875_23); SetPagePic(GRAPHICS_PAGE_0, Pic_0737_875_23);
} }
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection) if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection) /*蓝牙指示灯*/
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21); SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);
} }
...@@ -3023,11 +3011,11 @@ static void AMT630H_GUI_PhoneConnect_Light() ...@@ -3023,11 +3011,11 @@ static void AMT630H_GUI_PhoneConnect_Light()
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0473_172_490); SetPagePic(GRAPHICS_PAGE_0, Pic_0473_172_490);
} }
if(Get_TelltalesLedSts(em_LED_WIFI)) if(GetPhoneMirrorst() == 1) /*WIFI指示灯*/
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0465_881_487); SetPagePic(GRAPHICS_PAGE_0, Pic_0465_881_487);
} }
if(Get_TelltalesLedSts(em_LED_Bluetooth)) if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection) /*蓝牙指示灯*/
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0468_819_486); SetPagePic(GRAPHICS_PAGE_0, Pic_0468_819_486);
} }
...@@ -3247,6 +3235,48 @@ static void AMT630H_GUI_Telephone() ...@@ -3247,6 +3235,48 @@ static void AMT630H_GUI_Telephone()
} }
} }
/*
*NAME : AMT630H_GUI_PhoneConnect_Telephone
*FUNCTION : 导航界面来电显示函数
*PARAMETER : NULL
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_Telephone()
{
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
{ if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0451_751_555);
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4009,(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));
}
}
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)
{
//SetPagePic(GRAPHICS_PAGE_0, Pic_0943_751_555);
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4009,(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));
}
}
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0450_751_555);
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4009,(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));
}
}
}
else
{
;
}
}
/* /*
*NAME : AMT630H_GUI_Fuel *NAME : AMT630H_GUI_Fuel
...@@ -3442,6 +3472,92 @@ static void AMT630H_GUI_Fuel_SelfCheck(uint8_t Fuel) ...@@ -3442,6 +3472,92 @@ static void AMT630H_GUI_Fuel_SelfCheck(uint8_t Fuel)
} }
} }
/*
*NAME : AMT630H_GUI_PhoneConnect_Fuel
*FUNCTION : 投屏界面车速显示
*PARAMETER : uint8_t Fuel-燃油等级 0 - 红区一格 1 - 正常一格
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel)
{
static uint8_t s_FuelLowTime = 0U;
uint8_t FuelLevel;
FuelLevel = Fuel;
if(Fuel == 0)
{
FuelLevel = 1;
}
else
{
;
}
SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533); /*E*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0412_314_533); /*F*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0413_74_533); /*燃油格 组*/
/*Fuel=0时 黄色燃油灯1HZ闪烁*/
if (Fuel == 0)
{
if (FLASH_SYNC_1Hz)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0423_26_529); /*黄色燃油灯*/
}
s_FuelLowTime = 0;
}
else if (Fuel == 1)
{
s_FuelLowTime++;
if (s_FuelLowTime <= 15)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0552_503_529); /*黄色燃油灯*/
}
if (s_FuelLowTime > 20)
{
s_FuelLowTime = 0;
}
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0551_503_529); /*黑色燃油灯*/
s_FuelLowTime = 0;
}
/*燃油格数走格*/
if (FuelLevel > 0)
{
if (FuelLevel != g_u16_GUI_PerFuelLevel)
{
for (uint8_t i = 0; i < g_u16_GUI_PerFuelLevel; i++)
{
SetPagePic(GRAPHICS_PAGE_0, PICList_PhoneConnect_Fuel[i]);
}
if (FuelLevel > g_u16_GUI_PerFuelLevel)
{
g_u16_GUI_PerFuelLevel++;
}
else if ((FuelLevel < g_u16_GUI_PerFuelLevel) && (g_u16_GUI_PerFuelLevel != 0))
{
g_u16_GUI_PerFuelLevel--;
}
else
{
;
}
}
if (FuelLevel == g_u16_GUI_PerFuelLevel)
{
g_u16_GUI_PerFuelLevel = FuelLevel;
for (uint8_t i = 0; i < g_u16_GUI_PerFuelLevel; i++)
{
SetPagePic(GRAPHICS_PAGE_0, PICList_PhoneConnect_Fuel[i]);
}
}
}
else
{
//SetPagePic(GRAPHICS_PAGE_0, Pic_0414_76_536); /*燃油红区*/
}
}
/*电压显示函数*/ /*电压显示函数*/
static void AMT630H_GUI_Voltage(uint16_t Voltage) static void AMT630H_GUI_Voltage(uint16_t Voltage)
...@@ -3587,6 +3703,69 @@ static void AMT630H_GUI_Voltage(uint16_t Voltage) ...@@ -3587,6 +3703,69 @@ static void AMT630H_GUI_Voltage(uint16_t Voltage)
} }
} }
/*
*NAME : AMT630H_GUI_PhoneConnect_Voltage
*FUNCTION : 导航界面电压显示函数
*PARAMETER : uint16_t Voltage - 电压值
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_Voltage(uint16_t Voltage)
{
DISPLAY_NUM_ST DisplayNumPara;
uint16_t VoltageNumber;
VoltageNumber = Voltage / 10;
if (Voltage % 10 > 5)
{
VoltageNumber++;
}
uint16_t Voltage_Hundred;
uint16_t Voltage_Ten;
uint16_t Voltage_Unit;
uint16_t Front;
/*数据处理*/
Voltage_Hundred = VoltageNumber / 100;
Voltage_Ten = (VoltageNumber % 100) / 10;
Voltage_Unit = VoltageNumber % 10;
Front = Voltage_Hundred * 10 + Voltage_Ten;
DisplayNumPara.NumList = NumbeList_PhoneConnect_Voltage;
if ((VoltageNumber >= 100) && (VoltageNumber < 1000))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0452_717_516); /* V */
SetPagePic(GRAPHICS_PAGE_0, Pic_0454_704_526); /* . */
DisplayNumPara.x = 707;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 0;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 1;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Voltage_Unit);
DisplayNumPara.x = 693;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 10;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Front);
}
else if (0 <= VoltageNumber < 100)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0452_712_516); /* V */
SetPagePic(GRAPHICS_PAGE_0, Pic_0454_699_526); /* . */
DisplayNumPara.x = 688;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VoltageNumber);
}
}
/*大计里程显示函数*/ /*大计里程显示函数*/
static void AMT630H_GUI_ODO(uint32_t ODO, uint8_t Uint) static void AMT630H_GUI_ODO(uint32_t ODO, uint8_t Uint)
{ {
...@@ -3975,7 +4154,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed) ...@@ -3975,7 +4154,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
{ {
if (VSpeedNumber == 1) if (VSpeedNumber == 1)
{ {
DisplayNumPara.x = 492; // 1的宽度与其他数字不同 坐标没给 DisplayNumPara.x = 492;
} }
else else
{ {
...@@ -4038,7 +4217,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed) ...@@ -4038,7 +4217,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
{ {
if (VSpeedNumber == 1) if (VSpeedNumber == 1)
{ {
DisplayNumPara.x = 492; // 1的宽度与其他数字不同 坐标没给 DisplayNumPara.x = 492;
} }
else else
{ {
...@@ -4072,11 +4251,11 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed) ...@@ -4072,11 +4251,11 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
{ {
if(g_u8UnitSetting == Metric) if(g_u8UnitSetting == Metric)
{ {
//SetPagePic(GRAPHICS_PAGE_0, );/*单位 km/h */ SetPagePic(GRAPHICS_PAGE_0, Pic_0398_632_551); /*单位 km/h */
} }
else if(g_u8UnitSetting == Imperial) else if(g_u8UnitSetting == Imperial)
{ {
//SetPagePic(GRAPHICS_PAGE_0, );/*单位 mph/h */ //SetPagePic(GRAPHICS_PAGE_0, Pic_0942_634_551); /*单位 mph/h */ /*未更改pinbin文件待解*/
} }
else else
{ {
...@@ -4113,7 +4292,7 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed) ...@@ -4113,7 +4292,7 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
{ {
if (VSpeedNumber == 1) if (VSpeedNumber == 1)
{ {
DisplayNumPara.x = 484; // 1的宽度与其他数字不同 坐标没给 DisplayNumPara.x = 502;
} }
else else
{ {
...@@ -4213,7 +4392,35 @@ static void AMT630H_GUI_ESpeed(uint16_t ESpeed) ...@@ -4213,7 +4392,35 @@ static void AMT630H_GUI_ESpeed(uint16_t ESpeed)
; ;
} }
} }
/*
*NAME : AMT630H_GUI_PhoneConnect_ESpeed
*FUNCTION : 投屏界面转速显示
*PARAMETER : uint16_t ESpeed-转速
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_ESpeed(uint16_t ESpeed)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0384_103_570); /* 转速单位x1000r/min */
DISPLAY_NUM_ST DisplayNumPara;
uint16_t ESpeedNumber;
ESpeedNumber = ESpeed / 1000;
DisplayNumPara.NumList = NumbeList_PhoneConnect_ESpeed;
DisplayNumPara.x = 53; /*在UI所给坐标基础上进行调整*/
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 60;
DisplayNumPara.DecimalNum = 0;
if(ESpeedNumber >= 10)
{
DisplayNumPara.MinDigits = 2;
}
else
{
DisplayNumPara.MinDigits = 1;
}
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, ESpeedNumber);
}
/******************************************************************************************/ /******************************************************************************************/
/** /**
* @brief 主界面显示 * @brief 主界面显示
...@@ -4347,6 +4554,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck() ...@@ -4347,6 +4554,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
SetPagePic(GRAPHICS_PAGE_0, Pic_0737_875_23);/*WIFI*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0737_875_23);/*WIFI*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);/*蓝牙*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);/*蓝牙*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);/*E*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);/*E*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0563_923_407); /*红色电压指示灯*/
AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time()); AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
if(KL30_VOLTAGE_time < 10) if(KL30_VOLTAGE_time < 10)
...@@ -4417,27 +4625,27 @@ void AMT630H_GUI_BACKGRAND_SelfCheck() ...@@ -4417,27 +4625,27 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
g_u16espeednumberdown -= 12;/*g_u16espeednumberdown = 0 转速自检结束*/ g_u16espeednumberdown -= 12;/*g_u16espeednumberdown = 0 转速自检结束*/
} }
} }
/* // /*
*电压值自检 // *电压值自检
*电压自检范围：0V~16V // *电压自检范围：0V~16V
*/ // */
if(g_u16voltagenumberup <= 160) // if(g_u16voltagenumberup <= 160)
{ // {
AMT630H_GUI_Voltage(g_u16voltagenumberup*10); // AMT630H_GUI_Voltage(g_u16voltagenumberup*10);
g_u16voltagenumberup += 5; // g_u16voltagenumberup += 5;
} // }
else // else
{ // {
if(g_u16voltagenumberdown > 0) // if(g_u16voltagenumberdown > 0)
{ // {
AMT630H_GUI_Voltage(g_u16voltagenumberdown*10); // AMT630H_GUI_Voltage(g_u16voltagenumberdown*10);
g_u16voltagenumberdown -= 5; // g_u16voltagenumberdown -= 5;
} // }
else // else
{ // {
; // ;
} // }
} // }
/*结束状态*/ /*结束状态*/
if(g_u16fuelnumberdown == 0) if(g_u16fuelnumberdown == 0)
{ {
...@@ -4451,12 +4659,12 @@ void AMT630H_GUI_BACKGRAND_SelfCheck() ...@@ -4451,12 +4659,12 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
{ {
AMT630H_GUI_ESpeed(g_u16espeednumberdown); AMT630H_GUI_ESpeed(g_u16espeednumberdown);
} }
if(g_u16voltagenumberdown == 0) // if(g_u16voltagenumberdown == 0)
{ // {
AMT630H_GUI_Voltage(0); // AMT630H_GUI_Voltage(0);
} // }
/*结束自检*/ /*结束自检*/
if((g_u16fuelnumberdown == 0)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0)&&(g_u16voltagenumberdown == 0)) if((g_u16fuelnumberdown == 0)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0))
{ {
g_u8SelfCheck = 1;/*自检结束标志*/ g_u8SelfCheck = 1;/*自检结束标志*/
Voltage_Selfcheck = 0; Voltage_Selfcheck = 0;
...@@ -4475,8 +4683,8 @@ void AMT630H_GUI_SELFCHECK_STS_INIT(void) ...@@ -4475,8 +4683,8 @@ void AMT630H_GUI_SELFCHECK_STS_INIT(void)
g_u16vspeednumberdown = 200U; g_u16vspeednumberdown = 200U;
g_u16espeednumberup = 0U; g_u16espeednumberup = 0U;
g_u16espeednumberdown = 300U; g_u16espeednumberdown = 300U;
g_u16voltagenumberup = 0U; // g_u16voltagenumberup = 0U;
g_u16voltagenumberdown = 160U; // g_u16voltagenumberdown = 160U;
} }
...@@ -4577,19 +4785,19 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -4577,19 +4785,19 @@ void AMT630H_GUI_ReadPosittion_Display(void)
case MENU_ITEM_BLUETOOTH_CONNECT: /*03 蓝牙连接*/ case MENU_ITEM_BLUETOOTH_CONNECT: /*03 蓝牙连接*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Information(8, Get_Dis_Bluetooth_Open_Close()); AMT630H_GUI_Bluetooth_Information( Get_Dis_Bluetooth_Open_Close());
break; break;
case MENU_ITEM_BLUETOOTH_OPEN_CLOSE: /*12 蓝牙_开*/ case MENU_ITEM_BLUETOOTH_OPEN_CLOSE: /*12 蓝牙_开*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_OPEN_CLOSE, 8, Get_Dis_Bluetooth_Open_Close()); AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_OPEN_CLOSE, Get_Dis_Bluetooth_Open_Close());
break; break;
case MENU_ITEM_BLUETOOTH_SYNC: /*13 蓝牙同步联系人*/ case MENU_ITEM_BLUETOOTH_SYNC: /*13 蓝牙同步联系人*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_SYNC, 8, Get_Dis_Bluetooth_Open_Close()); AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_SYNC, Get_Dis_Bluetooth_Open_Close());
break; break;
case MENU_ITEM_BLUETOOTH_BACK: /*14 蓝牙返回*/ case MENU_ITEM_BLUETOOTH_BACK: /*14 蓝牙返回*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_BACK, 8, Get_Dis_Bluetooth_Open_Close()); AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_BACK, Get_Dis_Bluetooth_Open_Close());
break; break;
case MENU_ITEM_CLOCK_SETTING: /*15 时钟设置*/ case MENU_ITEM_CLOCK_SETTING: /*15 时钟设置*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
...@@ -4700,11 +4908,34 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -4700,11 +4908,34 @@ void AMT630H_GUI_ReadPosittion_Display(void)
PicObj.navigation_task_id = Pic_0411;//红色小e 19B PicObj.navigation_task_id = Pic_0411;//红色小e 19B
if (GetPhoneMirrorst() == 0) if (GetPhoneMirrorst() == 0)
{ SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0); { SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0); SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0); /*上半屏*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0941_0_470); /*下半屏*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0478_188_310); /*版本*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0491_188_343); /*状态*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0494_410_144);
SetPagePic(GRAPHICS_PAGE_0, Pic_0495_655_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_0496_410_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_0498_411_252); /*UUID*/
// /*是否激活接口待补充*/
// /*！！！！！！！！！！！！别删！！！！！！！！！！！！*/
// if(/*已激活*/)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0492_243_344);
// }
// else
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0493_242_344);
// }
// /*！！！！！！！！！！！！别删！！！！！！！！！！！！*/
PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj); PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0941_0_470); /*下半屏*/
PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj); PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
} }
SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313); SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
...@@ -4712,6 +4943,21 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -4712,6 +4943,21 @@ void AMT630H_GUI_ReadPosittion_Display(void)
AMT630H_GUI_PhoneConnect_Light(); AMT630H_GUI_PhoneConnect_Light();
AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time()); AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed); AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed);
AMT630H_GUI_PhoneConnect_ESpeed(Get_DispEngineSpeed());
AMT630H_GUI_PhoneConnect_Fuel(Get_CurFuelSetp());
AMT630H_GUI_PhoneConnect_Telephone();
if(KL30_VOLTAGE_time < 10)
{
KL30_VOLTAGE_time++;
}
else
{
KL30_VOLTAGE_time = 0;
KL30_VOLTAGE_Value = (ADC_Read_Signal(ADC_CH_KL30_VOLTAGE)) / 10;
}
AMT630H_GUI_PhoneConnect_Voltage(KL30_VOLTAGE_Value);
break; break;
default: default:
break; break;
......
Firmware/Source/Component/AMT630H/PicBin.c
View file @ c99dcdd1
...@@ -118,7 +118,7 @@ static const uint16_t PicIndexData[] = { ...@@ -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_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_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_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_0938, 41, 62, 399, Pic_0939, 41, 62, 401, 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, Pic_0940, 155, 53, 498, Pic_0941, 1521, 0, 470,
}; };
#define PicIndexData_LEN 14888 #define PicIndexData_LEN 14888
//uint32_t PicIndexDataLEN = 0; //uint32_t PicIndexDataLEN = 0;
......
Firmware/Source/Component/AMT630H/PicBin.h
View file @ c99dcdd1
#ifndef PICBIN_H #ifndef PICBIN_H
#define PICBIN_H #define PICBIN_H
/* Flash Bin Version:20240902 2024-09-02 13:18:34 Compression ratio:70.00% */ /* Flash Bin Version:20240913 2024-09-13 10:04:21 Compression ratio:70.00% */
#define Pic_0001 1 #define Pic_0001 1
#define Pic_0002 2 #define Pic_0002 2
#define Pic_0003 3 #define Pic_0003 3
...@@ -941,6 +941,8 @@ ...@@ -941,6 +941,8 @@
#define Pic_0937 937 #define Pic_0937 937
#define Pic_0938 938 #define Pic_0938 938
#define Pic_0939 939 #define Pic_0939 939
#define Pic_0940 940
#define Pic_0941 941
enum { enum {
Pic_0001_0_0 = 0, Pic_0001_0_0 = 0,
...@@ -2125,9 +2127,11 @@ enum { ...@@ -2125,9 +2127,11 @@ enum {
Pic_0937_564_521, Pic_0937_564_521,
Pic_0938_62_399, Pic_0938_62_399,
Pic_0939_62_401, Pic_0939_62_401,
Pic_0940_53_498,
Pic_0941_0_470,
}; };
#define PIC_INDEX_DATA_CRC 0x53F47F46 #define PIC_INDEX_DATA_CRC 0xDE18A482
extern void User_PicIndexDataInit(void); extern void User_PicIndexDataInit(void);
#endif #endif
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