修复界面无聚焦导致的按键无效问题
This commit is contained in:
Binary file not shown.
@ -194,10 +194,6 @@
|
||||
<language name="en_US">Quickly arrange</language>
|
||||
<language name="zh_CN">快排功能</language>
|
||||
</string>
|
||||
<string name="仪表蓝牙已关闭,不可连接">
|
||||
<language name="zh_CN">仪表蓝牙已关闭,不可连接</language>
|
||||
<language name="en_US">Instrument Bluetooth turned off, unable to connect</language>
|
||||
</string>
|
||||
<string name="热点: ">
|
||||
<language name="zh_CN">热点: </language>
|
||||
<language name="en_US">Hotspot:</language>
|
||||
@ -230,17 +226,9 @@
|
||||
<language name="en_US">4.After successful connection, allow Carplay to connect and start using the Carplay function.</language>
|
||||
<language name="zh_CN">4.连接成功后，允许Carplay连接，就可以开始使用CarPlay功能了。</language>
|
||||
</string>
|
||||
<string name="热点名称: ">
|
||||
<language name="en_US">Hotspot Name:</language>
|
||||
<language name="zh_CN">热点名称: </language>
|
||||
</string>
|
||||
<string name="快排功能">
|
||||
<language name="en_US">Quickly arrange</language>
|
||||
<language name="zh_CN">快排功能</language>
|
||||
</string>
|
||||
<string name="仪表蓝牙已关闭,不可连接">
|
||||
<language name="zh_CN">仪表蓝牙已关闭,不可连接</language>
|
||||
<language name="en_US">Instrument Bluetooth turned off, unable to connect</language>
|
||||
<string name="仪表蓝牙已关闭">
|
||||
<language name="zh_CN">仪表蓝牙已关闭</language>
|
||||
<language name="en_US">Instrument Bluetooth turned off</language>
|
||||
</string>
|
||||
<string name="1.解锁您的智能手机，找到并进入“设置”菜单，确保蓝牙功能已开启。">
|
||||
<language name="en_US">1. Unlock your smartphone, find and enter the "Settings" menu, and make sure the Bluetooth function is turned on.</language>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -29,7 +29,7 @@
|
||||
<label name="uuid" h="37" style:normal:text_align_h="left" style:normal:font_size="30" style:normal:text_color="#FFFFFF" line_wrap="true" word_wrap="true" x="239" y="210" w="510"/>
|
||||
</view>
|
||||
<label name="uuid_text" h="52" style:normal:text_align_h="left" style:normal:font_size="30" style:normal:text_color="#FFFFFF" word_wrap="true" line_wrap="true" style:normal:font_name="default" x="68" y="328" w="345"/>
|
||||
<label name="bt_hint" h="68" style:normal:text_align_h="left" style:normal:font_size="28" style:normal:text_color="#FF0000" word_wrap="true" line_wrap="true" style:normal:font_name="default" x="423" y="312" w="345" tr_text="仪表蓝牙已关闭,不可连接"/>
|
||||
<label name="bt_hint" h="52" style:normal:text_align_h="left" style:normal:font_size="28" style:normal:text_color="#FF0000" word_wrap="true" line_wrap="true" style:normal:font_name="default" x="423" y="328" w="367" tr_text="仪表蓝牙已关闭"/>
|
||||
</view>
|
||||
</view>
|
||||
<view name="view2" h="100" style:normal:border="none" style:normal:border_width="2" style:normal:border_color="#FFFFFF" opacity="255" style:normal:bg_color="#000000" style:normal:bg_image="" x="0" y="380" w="800" enable="true" visible="true">
|
||||
|
||||
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.
@ -15,8 +15,11 @@
|
||||
#define MOTO_ICMX_GB518_A272U 3
|
||||
#define MOTO_ICMX_GB518_A272W 4
|
||||
|
||||
#define MOTO_ICMX_GB518_A272T 5
|
||||
#define MOTO_ICMX_GB518_A272R 6
|
||||
|
||||
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272W
|
||||
|
||||
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272O
|
||||
|
||||
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270T)
|
||||
|
||||
@ -34,7 +37,7 @@
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272O)
|
||||
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 2
|
||||
#define SOFT_WARE_ORDER 4
|
||||
|
||||
#define TP_VERSION OVERSEAS_VERSION_2
|
||||
|
||||
@ -54,7 +57,7 @@
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272U)
|
||||
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 1
|
||||
#define SOFT_WARE_ORDER 2
|
||||
|
||||
#define TP_VERSION OVERSEAS_VERSION_2
|
||||
|
||||
@ -72,7 +75,7 @@
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272W)
|
||||
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 1
|
||||
#define SOFT_WARE_ORDER 2
|
||||
|
||||
#define TP_VERSION OVERSEAS_VERSION_2
|
||||
|
||||
@ -88,6 +91,47 @@
|
||||
#define UI_TEMP_CLOSE 1
|
||||
#define UI_ENGINE_CLOSE 1
|
||||
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272T)
|
||||
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 2
|
||||
|
||||
#define TP_VERSION OVERSEAS_VERSION_2
|
||||
|
||||
#define HARD_WARE "MXC-A272T V4.5"
|
||||
#define MCU_INFO_LABEL "A272T"
|
||||
|
||||
//胎压功能宏
|
||||
#define UI_VIEW_TIRE_PRESSURE 0
|
||||
|
||||
#define UI_TEMP_CLOSE 1
|
||||
// #define UI_ABS_CLOSE 1
|
||||
// #define UI_TCS_CLOSE 1
|
||||
#define UI_FAN_CLOSE 1
|
||||
|
||||
// #define UI_FAN_CLOSE 1
|
||||
|
||||
|
||||
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272R)
|
||||
|
||||
#define SOFT_WARE_HOST 0
|
||||
#define SOFT_WARE_ORDER 2
|
||||
|
||||
#define TP_VERSION OVERSEAS_VERSION_2
|
||||
|
||||
#define HARD_WARE "MXC-A272R V4.5"
|
||||
#define MCU_INFO_LABEL "A272R"
|
||||
|
||||
//胎压功能宏
|
||||
#define UI_VIEW_TIRE_PRESSURE 0
|
||||
|
||||
// #define UI_TEMP_CLOSE 1
|
||||
// #define UI_ABS_CLOSE 1
|
||||
// #define UI_TCS_CLOSE 1
|
||||
// #define UI_FAN_CLOSE 1
|
||||
|
||||
// #define UI_FAN_CLOSE 1
|
||||
|
||||
|
||||
#else
|
||||
#define SOFT_WARE_HOST 0
|
||||
@ -158,7 +202,7 @@
|
||||
#define LOW_BRIGHTNESS_MODE 20
|
||||
|
||||
// 打印
|
||||
#define DEBUG 1
|
||||
// #define DEBUG 1
|
||||
#ifdef DEBUG
|
||||
#define DEBUG_PRINT(fmt, ...) printf(fmt, ##__VA_ARGS__)
|
||||
#else
|
||||
|
||||
@ -22,16 +22,11 @@ extern void defect_code_win_init(widget_t* win);
|
||||
|
||||
void return_theme(void){
|
||||
widget_t* win = window_manager();
|
||||
widget_t* child = window_manager_get_top_main_window(win);
|
||||
widget_t* child = window_manager_get_top_window(win);
|
||||
|
||||
widget_t* widget = NULL;
|
||||
if(child == NULL)
|
||||
return;
|
||||
if((strcmp(child->name,"ui_demo1")==0))
|
||||
return;
|
||||
if((strcmp(child->name,"new")==0)){
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_PRINT("now them ==>> %d ,them_state ==>> %d\r\n",Get_sys_theme(),Get_sys_theme_state());
|
||||
|
||||
@ -39,16 +34,16 @@ void return_theme(void){
|
||||
navigator_close("set_list");
|
||||
}else if(strcmp(child->name,"set_time")==0){
|
||||
navigator_close("set_time");
|
||||
navigator_close("setting_list");
|
||||
navigator_close("set_list");
|
||||
}else if(strcmp(child->name,"set_theme_bg")==0){
|
||||
navigator_close("set_theme_bg");
|
||||
navigator_close("setting_list");
|
||||
navigator_close("set_list");
|
||||
}else if(strcmp(child->name,"set_tire_pressure")==0){
|
||||
navigator_close("set_tire_pressure");
|
||||
navigator_close("setting_list");
|
||||
navigator_close("set_list");
|
||||
}else if(strcmp(child->name,"set_theme")==0){
|
||||
navigator_close("set_theme");
|
||||
navigator_close("setting_list");
|
||||
navigator_close("set_list");
|
||||
}else if(strcmp(child->name,"new")==0){
|
||||
navigator_close("new");
|
||||
}
|
||||
@ -59,8 +54,8 @@ void return_theme(void){
|
||||
|
||||
void Return_demo_win(void){//按键返回函数，如果停止按键超过15s也会进入该函数 若界面不在demo界面则回到demo界面
|
||||
widget_t* win = window_manager();
|
||||
widget_t* child = window_manager_get_top_main_window(win);
|
||||
|
||||
widget_t* child = window_manager_get_top_window(win);
|
||||
|
||||
if(child != NULL &&strcmp(child->name,"ui_demo1")!=0 && strcmp(child->name,"new")!=0) {
|
||||
return_theme();
|
||||
}
|
||||
@ -222,16 +217,16 @@ ret_t long_key_event_handling(uint8_t key){
|
||||
if(!tire_pressure_loading)
|
||||
tire_pressure_loading = 2;
|
||||
}else{
|
||||
Set_sys_demo_position(4);
|
||||
Set_sys_return_demo(3);
|
||||
}
|
||||
}else{
|
||||
Set_sys_demo_position(4);
|
||||
Set_sys_return_demo(3);
|
||||
}
|
||||
}else{
|
||||
Set_sys_demo_position(4);
|
||||
Set_sys_return_demo(3);
|
||||
}
|
||||
}else{ //返回到dmo界面
|
||||
Set_sys_demo_position(4);
|
||||
Set_sys_return_demo(3);
|
||||
|
||||
}
|
||||
return RET_OK;
|
||||
|
||||
@ -444,6 +444,9 @@ static void ui_refresh_icons(widget_t *win)
|
||||
static widget_t *warn_fan_icon = NULL;
|
||||
|
||||
static widget_t *colon = NULL;
|
||||
static widget_t *right = NULL;
|
||||
static widget_t *left = NULL;
|
||||
|
||||
|
||||
// static widget_t *warn_tire_icon = NULL;
|
||||
|
||||
@ -459,6 +462,9 @@ static void ui_refresh_icons(widget_t *win)
|
||||
colon = widget_lookup(win, "colon", TRUE);
|
||||
|
||||
// warn_tire_icon = widget_lookup(win, "warn_tire_icon", TRUE);
|
||||
//转向灯组
|
||||
left = widget_lookup(win, "left", TRUE);//转向
|
||||
right = widget_lookup(win, "right", TRUE);//转向
|
||||
|
||||
}
|
||||
|
||||
@ -478,6 +484,25 @@ static void ui_refresh_icons(widget_t *win)
|
||||
Universal_widget_display(warn_fan_icon, Get_sys_warning_fan());
|
||||
#endif
|
||||
|
||||
switch(Get_sys_veer()){
|
||||
case 1:
|
||||
widget_set_visible(left,TRUE);
|
||||
widget_set_visible(right,FALSE);
|
||||
break;
|
||||
case 2:
|
||||
widget_set_visible(left,FALSE);
|
||||
widget_set_visible(right,TRUE);
|
||||
break;
|
||||
case 3:
|
||||
widget_set_visible(left,TRUE);
|
||||
widget_set_visible(right,TRUE);
|
||||
break;
|
||||
default:
|
||||
widget_set_visible(left,FALSE);
|
||||
widget_set_visible(right,FALSE);
|
||||
break;
|
||||
}
|
||||
|
||||
widget_set_visible(colon,refresh500ms_flag);
|
||||
|
||||
}
|
||||
@ -646,10 +671,12 @@ static void ui_refresh(widget_t *win)
|
||||
ui_refresh_theme(win);
|
||||
// 转速
|
||||
ui_refresh_rmp(win, Get_sys_veer_velocity());
|
||||
// 挡位
|
||||
ui_refresh_gear(win, Get_sys_grade());
|
||||
// 图标刷新
|
||||
ui_refresh_icons(win);
|
||||
// 速度
|
||||
ui_refresh_speed(win, Get_sys_velocity());
|
||||
// 挡位
|
||||
ui_refresh_gear(win, Get_sys_grade());
|
||||
// 油量
|
||||
ui_refresh_fuel(win, Get_sys_gas()); // 得到的是百分比
|
||||
#if !UI_TEMP_CLOSE
|
||||
@ -662,9 +689,7 @@ static void ui_refresh(widget_t *win)
|
||||
ui_refresh_call(win, Get_sys_call_state()); // 通话信息
|
||||
// 里程信息
|
||||
ui_refresh_mileage(win, Get_sys_total_mileage(), Get_sys_trip_mileage(), 0);
|
||||
// 图标刷新
|
||||
ui_refresh_icons(win);
|
||||
|
||||
|
||||
// 胎压
|
||||
#if UI_VIEW_TIRE_PRESSURE
|
||||
ui_refresh_tire(win, Get_sys_front_pressure(), Get_sys_rear_pressure());
|
||||
|
||||
@ -300,10 +300,10 @@ static ret_t on_timer(const idle_info_t* idle){
|
||||
|
||||
if(child != NULL && strcmp(child->name,"set_list")==0){
|
||||
list_win_init(child);
|
||||
}else if(child != NULL && strcmp(child->name,"ui_demo1")==0){
|
||||
// }else if(child != NULL && strcmp(child->name,"ui_demo1")==0){
|
||||
// new_refreshes(child);
|
||||
//灯光刷新
|
||||
light_refresh(child);
|
||||
// //灯光刷新
|
||||
// light_refresh(child);
|
||||
// //通话界面刷新
|
||||
// call_refresh(child);
|
||||
}
|
||||
@ -493,7 +493,7 @@ void* test_timer_queue(void *args){
|
||||
|
||||
#ifdef AMT630HV100
|
||||
}else if(Get_sys_power_on_self_test()==DEMO_UI_SELF_CHECKING){
|
||||
if(xTaskGetTickCount() - idletick > configTICK_RATE_HZ * 3.5){
|
||||
if(xTaskGetTickCount() - idletick > configTICK_RATE_HZ * 3){
|
||||
#ifdef AMT630HV100
|
||||
vTaskDelay(100);
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user