Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
haoJin750TFT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
haoJin750TFT
Commits
5b8297c4
Commit
5b8297c4
authored
Sep 25, 2024
by
王雅楠
🍎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修改字库地址&来电显示时将联系人与电话号码在同一位置显示
parent
410dbc6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
113 additions
and
224 deletions
+113
-224
BlueTooth.c
Firmware/Source/Application/BlueTooth.c
+3
-3
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+110
-221
No files found.
Firmware/Source/Application/BlueTooth.c
View file @
5b8297c4
...
...
@@ -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
)
{
for
(
uint8_t
i
=
0
;
i
<
sizeof
(
BlueToothPhoneData
.
BlueToothName
);
i
++
)
...
...
@@ -267,7 +267,7 @@ void TextService(void)
memcpy
(
LastBlueToothName
,
BlueToothPhoneData
.
BlueToothName
,
sizeof
(
LastBlueToothName
));
TextPara
[
TEXT_NUM_BLUETOOTH_NAME
].
Vaild
=
0X01
;
}
}
//
}
if
(
LastPhoneBookTotalCount
!=
BlueToothPhoneData
.
PhoneBookTotalCount
)
{
uint8_t
TempNumberCnts
=
0
;
...
...
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
5b8297c4
...
...
@@ -118,7 +118,7 @@ void AMT630H_GUI_Fault_Information(void)
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
());
}
/*
蓝牙名称改为字库显示
*/
/*
os MCU版本
*/
/* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList
(
0x8022
,(
uint8_t
*
)
InformationOSVersion
,
20
);
...
...
@@ -162,7 +162,7 @@ void AMT630H_GUI_Fault_Information(void)
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
());
}
/*
蓝牙名称改为字库显示
*/
/*
os MCU版本
*/
/* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList
(
0x8022
,(
uint8_t
*
)
InformationOSVersion
,
20
);
...
...
@@ -170,7 +170,6 @@ void AMT630H_GUI_Fault_Information(void)
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
));
}
}
...
...
@@ -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
)
{
/*数字只有两组 历史故障和故障信息纵坐标不同*/
FaultCodevalid_monitor
=
FaultCodevalid
;
if
(
FaultCodeLost
==
1
)
{
if
(
FaultCodevalid
>
0
)
{
DISPLAY_NUM_ST
DisplayNumPara
;
uint16_t
frontnumber
;
uint16_t
midnumber
;
frontnumber
=
FaultCode_hight
;
midnumber
=
FaultCode_mid
;
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
/*当前故障码前两位显示*/
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
,
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
)
{
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0912_639_293
,
610
,
164
);
//当前故障码的P
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0912_639_293
,
610
,
229
);
//历史故障码的P
/*当前故障码前两位显示*/
DisplayNumPara
.
NumList
=
NumbeList_FaultCode_night
;
DisplayNumPara
.
x
=
639
;
DisplayNumPara
.
NumInterval
=
GROUP_PIC_DIR_LEFT
|
14
;
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
)
if
(
FaultCodevalid
==
1
)
{
/*显示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
);
/*当前故障*/
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
));
/*历史故障*/
PackedTransfer_LabelsList
(
0x6009
,(
uint8_t
*
)
TextFaultCodeNum
,
10
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x6009
,
610
,
164
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
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
{
;
/*当前故障*/
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
));
/*历史故障*/
PackedTransfer_LabelsList
(
0x6009
,(
uint8_t
*
)
TextFaultCodeNum
,
10
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x6009
,
610
,
164
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0XFF
,
0XFF
,
0XFF
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
}
else
{
;
}
}
else
if
(
FaultCodeLost
==
0
)
{
...
...
@@ -766,68 +634,74 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
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
(
g_u8Display_Mode
==
ModeDAY
)
if
(
BlueToothPhoneData
.
BlueToothSignalSate
==
BlueTooth_Connection
)
{
if
((
connect_personnumber
>=
0
)
&&
(
connect_personnumber
<
10
))
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0038_590_287
);
/*【括号】 一位数 */
DisplayNumPara
.
x
=
605
;
DisplayNumPara
.
MinDigits
=
1
;
}
else
if
((
connect_personnumber
>=
10
)
&&
(
connect_personnumber
<
100
))
/*同步联系人数字显示*/
if
(
g_u8Display_Mode
==
ModeDAY
)
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0039_583_287
);
/*【括号】 两位数 */
DisplayNumPara
.
x
=
612
;
DisplayNumPara
.
MinDigits
=
2
;
if
((
connect_personnumber
>=
0
)
&&
(
connect_personnumber
<
10
))
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0038_590_287
);
/*【括号】 一位数 */
DisplayNumPara
.
x
=
605
;
DisplayNumPara
.
MinDigits
=
1
;
}
else
if
((
connect_personnumber
>=
10
)
&&
(
connect_personnumber
<
100
))
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0039_583_287
);
/*【括号】 两位数 */
DisplayNumPara
.
x
=
612
;
DisplayNumPara
.
MinDigits
=
2
;
}
else
{
;
}
// else if(Contect_totalnumber == 3)
// {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
//
// }
DisplayNumPara
.
NumList
=
Bluetooth_num_day
;
DisplayNumPara
.
NumInterval
=
GROUP_PIC_DIR_LEFT
|
14
;
DisplayNumPara
.
y
=
GROUP_PIC_USE_PSD_Y_POS
;
DisplayNumPara
.
DecimalNum
=
0
;
DisplayNum
(
GRAPHICS_PAGE_0
,
&
DisplayNumPara
,
connect_personnumber
);
}
else
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
{
;
if
((
connect_personnumber
>=
0
)
&&
(
connect_personnumber
<
10
))
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0223_590_287
);
/*【括号】 一位数 */
DisplayNumPara
.
x
=
605
;
DisplayNumPara
.
MinDigits
=
1
;
}
else
if
((
connect_personnumber
>=
10
)
&&
(
connect_personnumber
<
100
))
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0224_583_287
);
/*【括号】 两位数 */
DisplayNumPara
.
x
=
612
;
DisplayNumPara
.
MinDigits
=
2
;
}
else
{
;
}
// else if(Contect_totalnumber == 3)
// {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ /* 同步联系人最大位数未确定*/
//
// }
DisplayNumPara
.
NumList
=
Bluetooth_num_night
;
DisplayNumPara
.
NumInterval
=
GROUP_PIC_DIR_LEFT
|
14
;
DisplayNumPara
.
y
=
GROUP_PIC_USE_PSD_Y_POS
;
DisplayNumPara
.
DecimalNum
=
0
;
DisplayNum
(
GRAPHICS_PAGE_0
,
&
DisplayNumPara
,
connect_personnumber
);
}
// else if(Contect_totalnumber == 3)
// {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
//
// }
DisplayNumPara
.
NumList
=
Bluetooth_num_day
;
DisplayNumPara
.
NumInterval
=
GROUP_PIC_DIR_LEFT
|
14
;
DisplayNumPara
.
y
=
GROUP_PIC_USE_PSD_Y_POS
;
DisplayNumPara
.
DecimalNum
=
0
;
DisplayNum
(
GRAPHICS_PAGE_0
,
&
DisplayNumPara
,
connect_personnumber
);
}
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
else
/*蓝牙未连接或蓝牙关闭时 同步联系人显示0*/
{
if
((
connect_personnumber
>=
0
)
&&
(
connect_personnumber
<
10
))
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0223_590_287
);
/*【括号】 一位数 */
DisplayNumPara
.
x
=
605
;
DisplayNumPara
.
MinDigits
=
1
;
}
else
if
((
connect_personnumber
>=
10
)
&&
(
connect_personnumber
<
100
))
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0224_583_287
);
/*【括号】 两位数 */
DisplayNumPara
.
x
=
612
;
DisplayNumPara
.
MinDigits
=
2
;
}
else
{
;
}
// else if(Contect_totalnumber == 3)
// {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
//
// }
DisplayNumPara
.
NumList
=
Bluetooth_num_night
;
DisplayNumPara
.
NumInterval
=
GROUP_PIC_DIR_LEFT
|
14
;
DisplayNumPara
.
y
=
GROUP_PIC_USE_PSD_Y_POS
;
DisplayNumPara
.
DecimalNum
=
0
;
DisplayNum
(
GRAPHICS_PAGE_0
,
&
DisplayNumPara
,
connect_personnumber
);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0223_590_287
);
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0225_605_289
);
}
}
...
...
@@ -3157,8 +3031,8 @@ static void AMT630H_GUI_Telephone()
}
if
(
TextPara
[
TEXT_NUM_PHONE_NUMBER
].
Vaild
==
0X01
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
54
,
499
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
54
,
463
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
}
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
...
...
@@ -3170,8 +3044,8 @@ static void AMT630H_GUI_Telephone()
}
if
(
TextPara
[
TEXT_NUM_PHONE_NUMBER
].
Vaild
==
0X01
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
54
,
499
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0XFF
,
0XFF
,
0XFF
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
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()
}
if
(
TextPara
[
TEXT_NUM_PHONE_NUMBER
].
Vaild
==
0X01
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
54
,
499
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
54
,
463
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
}
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
...
...
@@ -3201,8 +3075,8 @@ static void AMT630H_GUI_Telephone()
}
if
(
TextPara
[
TEXT_NUM_PHONE_NUMBER
].
Vaild
==
0X01
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
54
,
499
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0XFF
,
0XFF
,
0XFF
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
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()
}
if
(
TextPara
[
TEXT_NUM_PHONE_NUMBER
].
Vaild
==
0X01
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
54
,
499
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
54
,
463
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
}
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
...
...
@@ -3232,8 +3106,8 @@ static void AMT630H_GUI_Telephone()
}
if
(
TextPara
[
TEXT_NUM_PHONE_NUMBER
].
Vaild
==
0X01
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
54
,
499
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0XFF
,
0XFF
,
0XFF
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
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()
{
if
(
BlueToothPhoneData
.
BlueToothPhoneSate
==
Phone_Outgoing
)
{
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
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
786
,
561
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
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);
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
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
786
,
561
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
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_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
)
{
PackedTransfer_LabelsList
(
0x40
09
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
09
,
786
,
561
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
PackedTransfer_LabelsList
(
0x40
22
,(
uint8_t
*
)
PhoneNumber
,
40
);
SetPageText
(
GRAPHICS_PAGE_0
,
0x40
22
,
786
,
561
,
200
,
ALIGN_LEFT
,
0
,
TEXT_COLOR
(
0
,
0
,
0
,
0XFF
),
TEXT_LINE_OFFSET
(
1
,
1
));
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment