Skip to content

H
haoJin750TFT
Commit 1371086f authored by 王雅楠's avatar 王雅楠
Browse files
Options

Merge branch 'wangyanan' into 'dev' 

✨ feat:修改语言设置、手机互联、退出的一级菜单和二级菜单+修改ODO数字为显示前导0+增加开机动画（fullbin未更新已隐藏）

See merge request !18
parents 09ca5326 78849a44
Hide whitespace changes
Inline Side-by-side
Showing with 510 additions and 391 deletions
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h
View file @ 1371086f
......@@ -20,7 +20,7 @@ User definitions
typedef unsigned short MD_STATUS;
#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
#define APP_BASE (0x0000C400ul)
/* Status list definition */
......
Firmware/Source/Component/AMT630H/AMT630H.c
View file @ 1371086f
......@@ -46,6 +46,23 @@ static uint16_t AMT630H_Animation_RefreshTime = 0;
static uint16_t AMT630H_Animation_RefreshTime_default = 0;
static const uint16_t BootAnimationList[AMT630H_ANIMATION_PIC_NUM] = {
0,
// Pic_0001_0_0,Pic_0758_0_0,Pic_0759_0_0,Pic_0760_0_0,Pic_0761_0_0,Pic_0762_0_0,Pic_0763_0_0,
// Pic_0764_0_0,Pic_0765_0_0,Pic_0766_0_0,Pic_0767_0_0,Pic_0768_0_0,Pic_0769_0_0,Pic_0770_0_0,
// Pic_0771_0_0,Pic_0772_0_0,Pic_0773_0_0,Pic_0774_0_0,Pic_0775_0_0,Pic_0776_0_0, Pic_0777_0_0,
//Pic_0778_0_0,Pic_0779_0_0,Pic_0780_0_0,Pic_0781_0_0,Pic_0782_0_0,Pic_0783_0_0,Pic_0784_0_0,
// Pic_0785_0_0,Pic_0786_0_0,Pic_0787_0_0,Pic_0788_0_0,Pic_0789_0_0,Pic_0790_0_0,Pic_0791_0_0,
//Pic_0792_0_0,Pic_0793_0_0,Pic_0794_0_0,Pic_0795_0_0,Pic_0796_0_0,Pic_0797_0_0,Pic_0798_0_0,
// Pic_0799_0_0,Pic_0800_0_0,Pic_0801_0_0,Pic_0802_0_0,Pic_0803_0_0, Pic_0804_0_0,Pic_0805_0_0,
// Pic_0806_0_0,Pic_0807_0_0,Pic_0808_0_0,Pic_0809_0_0,Pic_0810_0_0,Pic_0811_0_0,Pic_0812_0_0,
// Pic_0813_0_0,Pic_0814_0_0,Pic_0815_0_0,Pic_0816_0_0,Pic_0817_0_0,Pic_0818_0_0, Pic_0819_0_0,
// Pic_0820_0_0,Pic_0821_0_0,Pic_0822_0_0,Pic_0823_0_0,Pic_0824_0_0,Pic_0825_0_0,Pic_0826_0_0,
// Pic_0827_0_0,Pic_0828_0_0, Pic_0829_0_0,Pic_0830_0_0,Pic_0831_0_0, Pic_0832_0_0,Pic_0833_0_0,
// Pic_0834_0_0,Pic_0835_0_0,Pic_0836_0_0, Pic_0837_0_0,Pic_0838_0_0,Pic_0839_0_0,Pic_0840_0_0,
// Pic_0841_0_0,Pic_0842_0_0,Pic_0843_0_0,Pic_0844_0_0,Pic_0845_0_0,Pic_0846_0_0,Pic_0847_0_0,
// Pic_0848_0_0,Pic_0849_0_0,Pic_0850_0_0,Pic_0851_0_0,Pic_0852_0_0,Pic_0853_0_0,Pic_0854_0_0,
// Pic_0855_0_0,Pic_0856_0_0,Pic_0857_0_0,Pic_0858_0_0, Pic_0859_0_0,Pic_0859_0_0,Pic_0859_0_0,
// Pic_0859_0_0,Pic_0860_0_0, Pic_0860_0_0,Pic_0860_0_0,Pic_0860_0_0,
//psd已更新开机动画，fullbin等待odo trip补齐再开放
};
void AMT630H_Animation_PlayProc(uint16_t PicIndex)
{
......
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 1371086f
......@@ -48,40 +48,78 @@ void AMT630H_GUI_Background()
*/
void AMT630H_GUI_Fault_Information(void)
{
/*日间中文*/
if (Pic_mode == PIC_DAYTIME_CH)
if(g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0163_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0164_913_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0165_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0155_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0166_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0091_567_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0167_341_354);
SetPagePic(GRAPHICS_PAGE_0, Pic_0093_574_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0168_350_290);
SetPagePic(GRAPHICS_PAGE_0, Pic_0095_633_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0169_353_227);
SetPagePic(GRAPHICS_PAGE_0, Pic_0095_633_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0170_354_162);
}
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0163_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0164_913_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0165_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0155_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0166_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0091_567_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0167_341_354);
SetPagePic(GRAPHICS_PAGE_0, Pic_0093_574_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0168_350_290);
SetPagePic(GRAPHICS_PAGE_0, Pic_0095_633_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0169_353_227);
SetPagePic(GRAPHICS_PAGE_0, Pic_0095_633_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0170_354_162);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0088_47_398);
SetPagePic(GRAPHICS_PAGE_0, Pic_0084_869_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0089_193_488);
SetPagePic(GRAPHICS_PAGE_0, Pic_0086_762_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0090_435_519);
/*夜间中文*/
else if (Pic_mode == PIC_NIGHTTIME_CH)
SetPagePic(GRAPHICS_PAGE_0, Pic_0091_567_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0092_368_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0093_574_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0094_375_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0095_633_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0096_338_228);
SetPagePic(GRAPHICS_PAGE_0, Pic_0095_633_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0097_334_163);
}
}
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0350_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0351_913_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0352_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0342_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0353_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0279_567_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0354_341_354);
SetPagePic(GRAPHICS_PAGE_0, Pic_0281_574_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0355_350_290);
SetPagePic(GRAPHICS_PAGE_0, Pic_0283_633_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0356_353_227);
SetPagePic(GRAPHICS_PAGE_0, Pic_0283_633_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0357_354_162);
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0350_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0351_913_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0352_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0342_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0353_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0279_567_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0354_341_354);
SetPagePic(GRAPHICS_PAGE_0, Pic_0281_574_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0355_350_290);
SetPagePic(GRAPHICS_PAGE_0, Pic_0283_633_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0356_353_227);
SetPagePic(GRAPHICS_PAGE_0, Pic_0283_633_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0357_354_162);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0274_47_398);
SetPagePic(GRAPHICS_PAGE_0, Pic_0275_916_398);
SetPagePic(GRAPHICS_PAGE_0, Pic_0276_193_488);
SetPagePic(GRAPHICS_PAGE_0, Pic_0277_728_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0278_435_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0279_567_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0280_368_356);
SetPagePic(GRAPHICS_PAGE_0, Pic_0281_574_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0282_375_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0283_633_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0284_338_228);
SetPagePic(GRAPHICS_PAGE_0, Pic_0283_633_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0285_334_163);
}
}
}
/**
......@@ -550,141 +588,141 @@ static uint16_t Time_num_night[] = {
*/
void AMT630H_GUI_Clock_Information(uint8_t Clock_Hour, uint8_t Clock_Min)
{
/*日间中文*/
if (Pic_mode == PIC_DAYTIME_CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0179_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0180_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0181_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0173_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0182_446_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_338);
SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
DISPLAY_NUM_ST DisplayNumPara;
uint8_t Clock_HourNumber;
uint8_t Clock_MinNumber;
Clock_HourNumber = Clock_Hour;
Clock_MinNumber = Clock_Min;
DisplayNumPara.NumList = Time_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 457;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = Time_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 574;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
}
/*夜间中文*/
else if (Pic_mode == PIC_NIGHTTIME_CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0366_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0367_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0368_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0360_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0369_446_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);
SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
DISPLAY_NUM_ST DisplayNumPara;
uint8_t Clock_HourNumber;
uint8_t Clock_MinNumber;
Clock_HourNumber = Clock_Hour;
Clock_MinNumber = Clock_Min;
DisplayNumPara.NumList = Time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 457;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = Time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 574;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
}
/*日间英文*/
else if (Pic_mode == PIC_DAYTIME_EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0108_19_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0109_899_399);
SetPagePic(GRAPHICS_PAGE_0, Pic_0110_192_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0111_758_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0112_429_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);
SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
DISPLAY_NUM_ST DisplayNumPara;
uint8_t Clock_HourNumber;
uint8_t Clock_MinNumber;
Clock_HourNumber = Clock_Hour;
Clock_MinNumber = Clock_Min;
DisplayNumPara.NumList = Time_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 457;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = Time_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 574;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
}
/*夜间英文*/
else if (Pic_mode == PIC_NIGHTTIME_EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0296_19_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0297_899_399);
SetPagePic(GRAPHICS_PAGE_0, Pic_0298_192_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0299_758_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0300_429_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);
SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
DISPLAY_NUM_ST DisplayNumPara;
uint8_t Clock_HourNumber;
uint8_t Clock_MinNumber;
Clock_HourNumber = Clock_Hour;
Clock_MinNumber = Clock_Min;
DisplayNumPara.NumList = Time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 457;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = Time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 574;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
}
// /*日间中文*/
// if (Pic_mode == PIC_DAYTIME_CH)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0179_27_396);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0180_903_396);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0181_197_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0173_737_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0182_446_517);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_338);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
// /*夜间中文*/
// else if (Pic_mode == PIC_NIGHTTIME_CH)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0366_27_396);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0367_903_396);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0368_197_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0360_737_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0369_446_517);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = Time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = Time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
// /*日间英文*/
// else if (Pic_mode == PIC_DAYTIME_EN)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0108_19_397);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0109_899_399);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0110_192_486);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0111_758_487);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0112_429_519);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
// /*夜间英文*/
// else if (Pic_mode == PIC_NIGHTTIME_EN)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0296_19_397);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0297_899_399);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0298_192_486);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0299_758_487);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0300_429_519);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = Time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = Time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
}
/**
......@@ -802,48 +840,47 @@ void AMT630H_GUI_Language_Information(void)
*/
void AMT630H_GUI_Phone_Connect(void)
{
/*日间中文*/
if (Pic_mode == PIC_DAYTIME_CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0158_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0159_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0160_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0161_747_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0162_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0128_429_152);
}
/*夜间中文*/
else if (Pic_mode == PIC_NIGHTTIME_CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0345_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0346_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0347_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0348_747_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0349_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0316_429_152);
}
/*日间英文*/
else if (Pic_mode == PIC_DAYTIME_EN)
if(g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0083_23_399);
SetPagePic(GRAPHICS_PAGE_0, Pic_0084_869_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0085_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0086_762_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0087_435_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0005_304_155);
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0158_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0159_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0160_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0161_747_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0162_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0128_429_152);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0083_23_399);
SetPagePic(GRAPHICS_PAGE_0, Pic_0084_869_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0085_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0086_762_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0087_435_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0005_304_155);
}
}
/*夜间中文*/
else if (Pic_mode == PIC_NIGHTTIME_EN)
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0269_23_399);
SetPagePic(GRAPHICS_PAGE_0, Pic_0270_869_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0271_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0272_762_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0273_435_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0195_304_155);
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0345_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0346_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0347_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0348_747_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0349_445_517);
SetPagePic(GRAPHICS_PAGE_0, Pic_0316_429_152);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0269_23_399);
SetPagePic(GRAPHICS_PAGE_0, Pic_0270_869_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0271_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0272_762_487);
SetPagePic(GRAPHICS_PAGE_0, Pic_0273_435_519);
SetPagePic(GRAPHICS_PAGE_0, Pic_0195_304_155);
}
}
}
......@@ -853,44 +890,43 @@ void AMT630H_GUI_Phone_Connect(void)
*/
void AMT630H_GUI_Quit(void)
{
/*日间中文*/
if (Pic_mode == PIC_DAYTIME_CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0153_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0154_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0155_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0156_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0157_461_517);
}
/*夜间中文*/
else if (Pic_mode == PIC_NIGHTTIME_CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0340_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0341_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0342_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0343_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0344_461_517);
}
/*日间英文*/
else if (Pic_mode == PIC_DAYTIME_EN)
if(g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0078_18_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0079_895_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0080_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0081_714_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0082_481_519);
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0153_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0154_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0155_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0156_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0157_461_517);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0078_18_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0079_895_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0080_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0081_714_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0082_481_519);
}
}
/*夜间英文*/
else if (Pic_mode == PIC_NIGHTTIME_EN)
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0264_18_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0265_895_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0266_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0267_714_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0268_481_519);
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0340_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0341_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0342_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0343_737_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0344_461_517);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0264_18_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0265_895_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0266_188_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0267_714_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0268_481_519);
}
}
}
......@@ -905,7 +941,8 @@ static uint16_t time_num_day[] = {
Pic_0028_551_211,
Pic_0029_549_211,
Pic_0030_550_211,
Pic_0031_551_211};
Pic_0031_551_211
};
static uint16_t time_num_night[] = {
Pic_0210_550_211,
Pic_0211_564_211,
......@@ -916,7 +953,8 @@ static uint16_t time_num_night[] = {
Pic_0216_551_211,
Pic_0217_549_211,
Pic_0218_550_211,
Pic_0219_551_211};
Pic_0219_551_211
};
/**
* @brief 时间设
置 二级菜单
......@@ -1661,13 +1699,13 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
switch (select)
{
case 0:
case MENU_ITEM_BLUETOOTH_OPEN_CLOSE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_205);/*蓝牙连接 光标*/
break;
case 1:
case MENU_ITEM_BLUETOOTH_SYNC:
SetPagePic(GRAPHICS_PAGE_0, Pic_0036_336_266);/*同步联系人 光标*/
break;
case 2:
case MENU_ITEM_BLUETOOTH_BACK:
SetPagePic(GRAPHICS_PAGE_0, Pic_0035_336_324);/*返回 光标*/
break;
default:
......@@ -1915,25 +1953,25 @@ void AMT630H_GUI_Unit_Setting(Menu_Interface_en_t select) /*图 单位设置*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0130_27_396);/*组*/
switch (select)
{
case MENU_ITEM_UNIT_KM:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_141);
SetPagePic(GRAPHICS_PAGE_0, Pic_0133_473_288);
SetPagePic(GRAPHICS_PAGE_0, Pic_0134_436_152);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_KM) == 1)
{
g_u8UnitSetting = Metric;
}
break;
case MENU_ITEM_UNIT_MILE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_261);
SetPagePic(GRAPHICS_PAGE_0, Pic_0131_435_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0132_474_168);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_MILE) == 1)
{
g_u8UnitSetting = Imperial;
}
default:
break;
case MENU_ITEM_UNIT_KM:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_141);
SetPagePic(GRAPHICS_PAGE_0, Pic_0133_473_288);
SetPagePic(GRAPHICS_PAGE_0, Pic_0134_436_152);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_KM) == 1)
{
g_u8UnitSetting = Metric;
}
break;
case MENU_ITEM_UNIT_MILE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_261);
SetPagePic(GRAPHICS_PAGE_0, Pic_0131_435_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0132_474_168);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_MILE) == 1)
{
g_u8UnitSetting = Imperial;
}
default:
break;
}
}
else if(g_u8Language == EN)
......@@ -2033,15 +2071,31 @@ void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select) /*图 语言设置
SetPagePic(GRAPHICS_PAGE_0, Pic_0129_28_396);/*下方菜单*/
switch (select)
{
case MENU_ITEM_LANGUAGE_CHINESE:/*在日间模式中文下 选择中文*/
case MENU_ITEM_LANGUAGE_CHINESE:/*在日间模式中文下 光标选择中文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0007_475_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0008_474_152);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_CHINESE) == 1)
{
g_u8Language == CH;
}
else
{
;
}
break;
case MENU_ITEM_LANGUAGE_ENGLISH:/*在日间模式中文下 选择英文*/
case MENU_ITEM_LANGUAGE_ENGLISH:/*在日间模式中文下 光标选择英文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0010_448_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0011_490_168);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_ENGLISH) == 1)
{
g_u8Language == EN;
}
else
{
;
}
break;
default:
break;
......@@ -2056,124 +2110,109 @@ void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select) /*图 语言设置
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0007_475_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0008_474_152);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_CHINESE) == 1)
{
g_u8Language == CH;
}
else
{
;
}
break;
case MENU_ITEM_LANGUAGE_ENGLISH:/*在日间英文模式下 选择英文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0010_448_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0011_490_168);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_ENGLISH) == 1)
{
g_u8Language == EN;
}
else
{
;
}
break;
default:
break;
}
}
else if(g_u8Display_Mode == ModeNIGHT)
}
else if(g_u8Display_Mode == ModeNIGHT)
{
if(g_u8Language == CH)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0317_28_396);/*下方菜单*/
switch (select)
{
case MENU_ITEM_LANGUAGE_CHINESE:/*在夜间中文模式下 选择中文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
break;
case MENU_ITEM_LANGUAGE_ENGLISH:/*在夜间英文模式下 选择英文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
break;
default:
break;
}
}
else if(g_u8Language == EN)
SetPagePic(GRAPHICS_PAGE_0, Pic_0317_28_396);/*下方菜单*/
switch (select)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0196_14_397);/*下方菜单*/
switch (select)
{
case MENU_ITEM_LANGUAGE_CHINESE:/*在夜间中文模式下 选择中文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
break;
case MENU_ITEM_LANGUAGE_ENGLISH:/*在夜间英文模式下 选择英文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
break;
default:
break;
}
case MENU_ITEM_LANGUAGE_CHINESE:/*在夜间中文模式下 光标选择中文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0199_475_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0200_474_152);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_CHINESE) == 1)
{
g_u8Language == CH;
}
else
{
;
}
break;
case MENU_ITEM_LANGUAGE_ENGLISH:/*在夜间英文模式下 光标选择英文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0197_448_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0198_490_168);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_ENGLISH) == 1)
{
g_u8Language == EN;
}
else
{
;
}
break;
default:
break;
}
}
// switch (select)
// {
// case MENU_ITEM_LANGUAGE_CHINESE:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0129_28_396);/*组*/
// SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
// SetPagePic(GRAPHICS_PAGE_0, Pic_0007_475_289);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0008_474_152);
// if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_CHINESE))
// {
// g_u8Language = CH;
// }
// else
// {
// ;
// }
// break;
// case MENU_ITEM_LANGUAGE_ENGLISH:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0006_14_397);/*组*/
// SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
// SetPagePic(GRAPHICS_PAGE_0, Pic_0010_448_274);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0011_490_168);
// if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_ENGLISH))
// {
// g_u8Language = EN;
// }
// else
// {
// ;
// }
// break;
// default:
// break;
// }
}
else if(g_u8Display_Mode == ModeNIGHT)
{
switch (select)
else if(g_u8Language == EN)
{
case MENU_ITEM_LANGUAGE_CHINESE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0317_28_396);/*组*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0199_475_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0200_474_152);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_CHINESE))
{
g_u8Language = CH;
}
else
{
;
}
break;
case MENU_ITEM_LANGUAGE_ENGLISH:
SetPagePic(GRAPHICS_PAGE_0, Pic_0196_14_397);/*组*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0197_448_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0198_490_168);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_ENGLISH))
{
g_u8Language = EN;
}
else
{
;
}
break;
default:
break;
SetPagePic(GRAPHICS_PAGE_0, Pic_0196_14_397);/*下方菜单*/
switch (select)
{
case MENU_ITEM_LANGUAGE_CHINESE:/*在夜间中文模式下 选择中文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0199_475_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0200_474_152);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_CHINESE) == 1)
{
g_u8Language == CH;
}
else
{
;
}
break;
case MENU_ITEM_LANGUAGE_ENGLISH:/*在夜间英文模式下 选择英文*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0009_321_261);/*光标*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0197_448_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0198_490_168);
if(Menu_Item_Select_Get(MENU_ITEM_LANGUAGE_ENGLISH) == 1)
{
g_u8Language == EN;
}
else
{
;
}
break;
default:
break;
}
}
}
}
}
/**
* @brief 手机互联成功 二级菜单
......@@ -2742,44 +2781,107 @@ static void AMT630H_GUI_ODO(uint32_t ODO, uint8_t mode)
{
if (g_u8Display_Mode == ModeDAY)
{
/*ODO位数不同 KM位置不同*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0577_48_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0578_55_296);
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_211_324);
SetPagePic(GRAPHICS_PAGE_0, Pic_0578_55_296);/*ODO图标不动*/
DISPLAY_NUM_ST DisplayNumPara;
uint16_t ODONumber;
ODONumber = ODO;
DisplayNumPara.NumList = NumbeList_ODO_DAY;
DisplayNumPara.x = 173;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 24;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 6;
if((ODONumber<1000000)&&(ODONumber>=100000))
{
DisplayNumPara.x = 173;
DisplayNumPara.MinDigits = 6;
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_211_324);/*KM*/
}
else if((ODONumber<100000)&&(ODONumber>=10000))
{
DisplayNumPara.x = 149;
DisplayNumPara.MinDigits = 5;
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_187_324);/*KM*/
}
else if((ODONumber<10000)&&(ODONumber>=1000))
{
DisplayNumPara.x = 125;
DisplayNumPara.MinDigits = 4;
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/
}
else if((ODONumber<1000)&&(ODONumber>=100))
{
DisplayNumPara.x = 101;
DisplayNumPara.MinDigits = 3;
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
}
else if((ODONumber<100)&&(ODONumber>=10))
{
DisplayNumPara.x = 77;
DisplayNumPara.MinDigits = 2;
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_115_324);/*KM*/
}
else if((ODONumber<10)&&(ODONumber>=0))
{
DisplayNumPara.x = 53;
DisplayNumPara.MinDigits = 1;
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_91_324);/*KM*/
}
else
{
;
}
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, ODONumber);
}
else if (g_u8Display_Mode == ModeNIGHT)
{
/*ODO位数不同 KM位置不同*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0685_48_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0686_55_296);
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_211_324);
SetPagePic(GRAPHICS_PAGE_0, Pic_0686_55_296);/*ODO图标不动*/
DISPLAY_NUM_ST DisplayNumPara;
uint16_t ODONumber;
ODONumber = ODO;
DisplayNumPara.NumList = NumbeList_ODO_NIGHT;
DisplayNumPara.x = 173;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 24;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 6;
if((ODONumber<1000000)&&(ODONumber>=100000))
{
DisplayNumPara.MinDigits = 6;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_211_324);/*KM*/
}
else if((ODONumber<100000)&&(ODONumber>=10000))
{
DisplayNumPara.MinDigits = 5;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_187_324);/*KM*/
}
else if((ODONumber<10000)&&(ODONumber>=1000))
{
DisplayNumPara.MinDigits = 4;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_163_324);/*KM*/
}
else if((ODONumber<1000)&&(ODONumber>=100))
{
DisplayNumPara.MinDigits = 3;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_139_324);/*KM*/
}
else if((ODONumber<100)&&(ODONumber>=10))
{
DisplayNumPara.MinDigits = 2;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_115_324);/*KM*/
}
else if((ODONumber<10)&&(ODONumber>=0))
{
DisplayNumPara.MinDigits = 1;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_91_324);/*KM*/
}
else
{
;
}
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, ODONumber);
}
else
{
;
......@@ -3019,7 +3121,7 @@ void AMT630H_GUI_BACKGRAND()
}
/*主界面函数*/
AMT630H_GUI_Light();
AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
/* AMT630H_GUI_Telephone(Telephone); */
if (Get_Fuel_Sensor_State() == FuelSensorNormal)
......@@ -3101,7 +3203,7 @@ void AMT630H_GUI_ReadPosittion_Display(void)
{
case MENU_ITEM_MAIN_ITEM: /*主界面*/
AMT630H_GUI_BACKGRAND();
AMT630H_GUI_Light(); /*主界面*/
break;
case MENU_ITEM_DISPLAY_MODE: /*01 显示模式*/
AMT630H_GUI_SETTING();
......@@ -3154,15 +3256,15 @@ void AMT630H_GUI_ReadPosittion_Display(void)
break;
case MENU_ITEM_BLUETOOTH_OPEN_CLOSE: /*12 蓝牙_开*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(0, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_OPEN_CLOSE, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
break;
case MENU_ITEM_BLUETOOTH_SYNC: /*13 蓝牙同步联系人*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(1, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_SYNC, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
break;
case MENU_ITEM_BLUETOOTH_BACK: /*14 蓝牙返回*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(2, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_BACK, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
break;
case MENU_ITEM_CLOCK_SETTING: /*15 时钟设置*/
AMT630H_GUI_SETTING();
......@@ -3170,23 +3272,23 @@ void AMT630H_GUI_ReadPosittion_Display(void)
break;
case MENU_ITEM_CLOCK_HOUR_TENB: /*20 时钟小时十位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 1);
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_HOUR_TENB);
break;
case MENU_ITEM_CLOCK_HOUR_BIT: /*19 时钟小时个位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 2);
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_HOUR_BIT);
break;
case MENU_ITEM_CLOCK_MIN_TENB: /*18 时钟分钟十位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 3);
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_MIN_TENB);
break;
case MENU_ITEM_CLOCK_MIN_BIT: /*17 时钟分钟个位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 4);
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_MIN_BIT);
break;
case MENU_ITEM_CLOCK_BACK: /*16 时钟返回*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 5);
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_BACK);
break;
case MENU_ITEM_UNIT_SETTING: /*21 单位设置*/
AMT630H_GUI_SETTING();
......
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