修复投屏界面亿连翻译错误
This commit is contained in:
@ -263,9 +263,9 @@
|
||||
|
||||
#ifdef WIFI_SUPPORT
|
||||
#define CARLINK_EY 0
|
||||
#define CARLINK_EC 1
|
||||
#define CARLINK_CP 0
|
||||
#define CARLINK_AA 0
|
||||
#define CARLINK_EC 0
|
||||
#define CARLINK_CP 1
|
||||
#define CARLINK_AA 1
|
||||
|
||||
#if !DEVICE_MXC_A27
|
||||
#define WIFI_RESET_IO 12
|
||||
|
||||
Binary file not shown.
@ -245,4 +245,8 @@
|
||||
<string name="4.连接成功后，系统此界面会自动弹出对应界面，就可以开始使用CarPlay功能了。">
|
||||
<language name="en_US">4.After successful connection, the system will automatically pop up the corresponding interface, and you can start using the CarPlay function.</language>
|
||||
<language name="zh_CN">4.连接成功后，系统此界面会自动弹出对应界面，就可以开始使用CarPlay功能了。</language>
|
||||
</string>
|
||||
<string name="亿连">
|
||||
<language name="en_US">YiLian</language>
|
||||
<language name="zh_CN">亿连</language>
|
||||
</string>
|
||||
Binary file not shown.
Binary file not shown.
@ -5,7 +5,7 @@
|
||||
<view name="Tab" x="250" y="10" w="300" h="50" style:normal:bg_color="#00000000" style:normal:border_width="0" style:normal:round_radius="10" children_layout="default(r=1,c=0,a=center)" visible="true">
|
||||
<tab_button name="cp_tab" style="select_btn" floating="false" w="99" visible="true" enable="true" value="true" text="IOS"/>
|
||||
<tab_button name="aa_tab" style="select_btn" enable="true" visible="true" floating="false" w="99" text="Android"/>
|
||||
<tab_button name="ec_tab" style="select_btn" w="99" visible="true" text="亿连"/>
|
||||
<tab_button name="ec_tab" style="select_btn" w="99" visible="true" tr_text="亿连"/>
|
||||
</view>
|
||||
<view name="carplay_view" x="68" y="52" w="722" h="328" children_layout="default(r=0,c=1,s=5)" visible="false">
|
||||
<label name="label" h="70" style:normal:text_align_h="left" style:normal:font_size="30" style:normal:text_color="#FFFFFF" style:normal:font_name="default" word_wrap="true" line_wrap="true" tr_text="1.解锁您的智能手机，找到并进入“设置”菜单，确保蓝牙功能已开启。"/>
|
||||
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -294,7 +294,25 @@ uint16_t Get_sys_veer_velocity(void)//转速
|
||||
void Set_sys_veer_velocity(uint16_t value)
|
||||
{
|
||||
if(value != custom_data.veer_velocity){
|
||||
custom_data.veer_velocity = value;
|
||||
uint16_t diff = 0;
|
||||
uint8_t type = 0;//1为增 0为减
|
||||
if(value>custom_data.veer_velocity){
|
||||
diff = value-custom_data.veer_velocity;
|
||||
type = 1;
|
||||
}else{
|
||||
diff = custom_data.veer_velocity-value;
|
||||
type = 0;
|
||||
}
|
||||
|
||||
if(diff<500){
|
||||
custom_data.veer_velocity = value;
|
||||
// }else if(diff>4000){
|
||||
// return;
|
||||
// }else if(diff<1000){
|
||||
}else{
|
||||
if(type) custom_data.veer_velocity+=500;
|
||||
else custom_data.veer_velocity-=500;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -18,8 +18,9 @@
|
||||
#define MOTO_ICMX_GB518_A272M 5
|
||||
|
||||
#define MOTO_ICMX_GB518_A272S 6
|
||||
#define MOTO_ICMX_GB518_A27S_F3 7
|
||||
|
||||
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A270S_KP
|
||||
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A27S_F3
|
||||
|
||||
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270M)
|
||||
#define SOFT_WARE_HOST 1
|
||||
@ -49,7 +50,7 @@
|
||||
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S_KP)
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 4
|
||||
#define SOFT_WARE_ORDER 6
|
||||
#define HARD_WARE "MXC-A27-S-KP V4.5"
|
||||
#define KEY_EXCHANGE 1
|
||||
#define UI_VIEW_QUICKLY_ARRANGE 1//快排功能宏
|
||||
@ -57,6 +58,15 @@
|
||||
|
||||
#define SCREEN_MIRRORING_FUNCTION TP_WIN_EC
|
||||
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A27S_F3)
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 1
|
||||
#define HARD_WARE "MXC-A27-S-F3 V4.5"
|
||||
#define KEY_EXCHANGE 1
|
||||
#define MCU_INFO_LABEL "A27S-F3"
|
||||
|
||||
#define SCREEN_MIRRORING_FUNCTION TP_WIN_CP_AA
|
||||
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272M)
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 1
|
||||
|
||||
@ -398,7 +398,7 @@ extern uint8_t speed_flag;
|
||||
void speed_convert_mile_calculation(void){
|
||||
uint32_t trip = 0;
|
||||
uint32_t total = 0;
|
||||
uint8_t value = 0;
|
||||
// uint8_t value = 0;
|
||||
// printf("%d.\r\n",mile_total);
|
||||
|
||||
if(mile_total>KILOMETER_COUNT){//一万公里
|
||||
@ -414,15 +414,43 @@ void speed_convert_mile_calculation(void){
|
||||
Set_sys_trip_mileage(trip);
|
||||
Set_sys_total_mileage(total);
|
||||
|
||||
if(speed_flag){
|
||||
// if(speed_flag){
|
||||
// display_speed = (uint32_t)(display_can_speed*1.08);//UI显示上浮8%
|
||||
// if(display_speed>=255)
|
||||
// display_speed = 255;
|
||||
// Set_sys_velocity(display_speed);
|
||||
// veer_velocity *= 0.25;
|
||||
// if(veer_velocity>16384)
|
||||
// veer_velocity = 16384;
|
||||
// Set_sys_veer_velocity(veer_velocity);
|
||||
// if(eng_temp>5280)
|
||||
// value = 255;
|
||||
// else if(eng_temp>2730)
|
||||
// value = ((eng_temp*0.1)-273);
|
||||
// else
|
||||
// value = 0;
|
||||
// Set_sys_can_temp(value);
|
||||
// }
|
||||
}
|
||||
|
||||
void speed_flag_event_handl(void){
|
||||
uint8_t value = 0;
|
||||
uint16_t data = 0;
|
||||
// if(speed_flag){
|
||||
#if UI_VIEW_QUICKLY_ARRANGE
|
||||
display_speed = (uint32_t)(display_can_speed);//快排取消上浮
|
||||
#else
|
||||
display_speed = (uint32_t)(display_can_speed*1.08);//UI显示上浮8%
|
||||
#endif
|
||||
if(display_speed>=255)
|
||||
display_speed = 255;
|
||||
Set_sys_velocity(display_speed);
|
||||
veer_velocity *= 0.25;
|
||||
if(veer_velocity>16384)
|
||||
veer_velocity = 16384;
|
||||
Set_sys_veer_velocity(veer_velocity);
|
||||
|
||||
data = veer_velocity * 0.25;
|
||||
if(data>16384)
|
||||
data = 16384;
|
||||
Set_sys_veer_velocity(data);
|
||||
|
||||
if(eng_temp>5280)
|
||||
value = 255;
|
||||
else if(eng_temp>2730)
|
||||
@ -430,7 +458,7 @@ void speed_convert_mile_calculation(void){
|
||||
else
|
||||
value = 0;
|
||||
Set_sys_can_temp(value);
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
void speed_event_handing(uint8_t *buf){
|
||||
|
||||
@ -355,6 +355,7 @@ static ret_t on_timer(const idle_info_t* idle){
|
||||
|
||||
if(speed_flag){
|
||||
speed_flag--;
|
||||
speed_flag_event_handl();
|
||||
}else{
|
||||
veer_velocity = Get_sys_veer_velocity();
|
||||
if(veer_velocity){
|
||||
@ -611,6 +612,13 @@ void* test_timer_queue(void *args){
|
||||
A27_BT_init();
|
||||
Set_sys_power_on_self_test(DEMO_UI_SELF_CHECKING);//设置为自检中
|
||||
console_send_atcmd("AT+NAME=A27_MOTO_Phone,1\r\n", strlen("AT+NAME=A27_MOTO_Phone,1\r\n"));//修改蓝牙名
|
||||
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A27S_F3)
|
||||
#ifdef AMT630HV100
|
||||
vTaskDelay(800);
|
||||
#else
|
||||
sleep_ms(800);
|
||||
#endif
|
||||
#endif
|
||||
// #ifdef AMT630HV100
|
||||
// vTaskDelay(800);
|
||||
// #else
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@ -19,7 +19,7 @@
|
||||
<LeaveTargetRunning>_ 0</LeaveTargetRunning>
|
||||
</JLinkDriver>
|
||||
<DebugChecksum>
|
||||
<Checksum>4277336360</Checksum>
|
||||
<Checksum>171845345</Checksum>
|
||||
</DebugChecksum>
|
||||
<Exceptions>
|
||||
<StopOnUncaught>_ 0</StopOnUncaught>
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user