新增630HV100已出货的量产版本
This commit is contained in:
Binary file not shown.
@ -8,7 +8,10 @@
|
||||
<tab_button name="tab_button3" load_ui="settingview3" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" with_focus_state="false" tr_text="蓝牙设置"/>
|
||||
<tab_button name="tab_button4" load_ui="settingview4" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:bg_image="" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" with_focus_state="false" tr_text="其他设置"/>
|
||||
<tab_button name="tab_button5" load_ui="settingview5" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" with_focus_state="false" tr_text="车辆信息"/>
|
||||
<tab_button name="tab_button6" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" style:pressed:text_align_h="center" style:pressed:icon="" style:over:text_align_h="left" style:over:icon="return" style:disable:text_align_h="left" style:disable:icon="return" style:focused:text_align_h="center" style:focused:icon="" style:normal_of_active:text_align_h="center" style:normal_of_active:icon="" style:pressed_of_active:text_align_h="center" style:pressed_of_active:icon="" style:over_of_active:text_align_h="center" style:over_of_active:icon="" style:disable_of_active:text_align_h="center">
|
||||
<tab_button name="tab_button6" load_ui="settingview6" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" style:pressed:text_align_h="center" style:pressed:icon="" style:over:text_align_h="left" style:over:icon="return" style:disable:text_align_h="left" style:disable:icon="return" style:focused:text_align_h="center" style:focused:icon="" style:normal_of_active:text_align_h="center" style:normal_of_active:icon="" style:pressed_of_active:text_align_h="center" style:pressed_of_active:icon="" style:over_of_active:text_align_h="center" style:over_of_active:icon="">
|
||||
<property name="style:disable_of_active:text_align_h">
|
||||
<![CDATA[center]]>
|
||||
</property>
|
||||
<property name="style:focused_of_active:text_align_h">
|
||||
<![CDATA[center]]>
|
||||
</property>
|
||||
|
Binary file not shown.
@ -0,0 +1,4 @@
|
||||
<?xml parent="{"x":"0","y":"0","w":"100%","h":"100%","name":"settingview6","style:normal:bg_color":"#00B050"}"?>
|
||||
<view w="100%" h="100%" x="0" y="0">
|
||||
<view name="view" x="c" y="m" w="90%" h="90%"/>
|
||||
</view>
|
File diff suppressed because one or more lines are too long
@ -9,6 +9,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview2[]);
|
||||
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview3[]);
|
||||
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview4[]);
|
||||
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview5[]);
|
||||
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview6[]);
|
||||
extern TK_CONST_DATA_ALIGN(const unsigned char ui_set_list[]);
|
||||
extern TK_CONST_DATA_ALIGN(const unsigned char ui_set_theme[]);
|
||||
extern TK_CONST_DATA_ALIGN(const unsigned char ui_set_theme_bg[]);
|
||||
@ -119,6 +120,7 @@ ret_t assets_init_dark(void) {
|
||||
assets_manager_add(am, ui_settingview3);
|
||||
assets_manager_add(am, ui_settingview4);
|
||||
assets_manager_add(am, ui_settingview5);
|
||||
assets_manager_add(am, ui_settingview6);
|
||||
assets_manager_add(am, ui_set_list);
|
||||
assets_manager_add(am, ui_set_theme);
|
||||
assets_manager_add(am, ui_set_theme_bg);
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include "default/inc/ui/settingview3.data"
|
||||
#include "default/inc/ui/settingview4.data"
|
||||
#include "default/inc/ui/settingview5.data"
|
||||
#include "default/inc/ui/settingview6.data"
|
||||
#include "default/inc/ui/set_list.data"
|
||||
#include "default/inc/ui/set_theme.data"
|
||||
#include "default/inc/ui/set_theme_bg.data"
|
||||
@ -119,6 +120,7 @@ ret_t assets_init_default(void) {
|
||||
assets_manager_add(am, ui_settingview3);
|
||||
assets_manager_add(am, ui_settingview4);
|
||||
assets_manager_add(am, ui_settingview5);
|
||||
assets_manager_add(am, ui_settingview6);
|
||||
assets_manager_add(am, ui_set_list);
|
||||
assets_manager_add(am, ui_set_theme);
|
||||
assets_manager_add(am, ui_set_theme_bg);
|
||||
|
Binary file not shown.
Binary file not shown.
@ -9,6 +9,7 @@
|
||||
#include "assets/default/inc/ui/settingview3.data"
|
||||
#include "assets/default/inc/ui/settingview4.data"
|
||||
#include "assets/default/inc/ui/settingview5.data"
|
||||
#include "assets/default/inc/ui/settingview6.data"
|
||||
#include "assets/default/inc/ui/set_list.data"
|
||||
#include "assets/default/inc/ui/set_theme.data"
|
||||
#include "assets/default/inc/ui/set_theme_bg.data"
|
||||
@ -120,6 +121,7 @@ ret_t assets_init(void) {
|
||||
assets_manager_add(am, ui_settingview3);
|
||||
assets_manager_add(am, ui_settingview4);
|
||||
assets_manager_add(am, ui_settingview5);
|
||||
assets_manager_add(am, ui_settingview6);
|
||||
assets_manager_add(am, ui_set_list);
|
||||
assets_manager_add(am, ui_set_theme);
|
||||
assets_manager_add(am, ui_set_theme_bg);
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include "assets/default/inc/ui/settingview3.data"
|
||||
#include "assets/default/inc/ui/settingview4.data"
|
||||
#include "assets/default/inc/ui/settingview5.data"
|
||||
#include "assets/default/inc/ui/settingview6.data"
|
||||
#include "assets/default/inc/ui/set_list.data"
|
||||
#include "assets/default/inc/ui/set_theme.data"
|
||||
#include "assets/default/inc/ui/set_theme_bg.data"
|
||||
@ -120,6 +121,7 @@ ret_t assets_init(void) {
|
||||
assets_manager_add(am, ui_settingview3);
|
||||
assets_manager_add(am, ui_settingview4);
|
||||
assets_manager_add(am, ui_settingview5);
|
||||
assets_manager_add(am, ui_settingview6);
|
||||
assets_manager_add(am, ui_set_list);
|
||||
assets_manager_add(am, ui_set_theme);
|
||||
assets_manager_add(am, ui_set_theme_bg);
|
||||
|
Binary file not shown.
@ -14,7 +14,7 @@
|
||||
#define MOTO_ICMX_GB518_A272O 2
|
||||
|
||||
|
||||
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A270T
|
||||
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272O
|
||||
|
||||
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270T)
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
#define TP_VERSION OVERSEAS_VERSION_2
|
||||
|
||||
#define HARD_WARE "MXC-A270T V4.5"
|
||||
#define HARD_WARE_LABEL "4.5"
|
||||
#define MCU_INFO_LABEL "A270T"
|
||||
|
||||
#define UI_TEMP_CLOSE 1
|
||||
@ -38,7 +37,6 @@
|
||||
#define TP_VERSION DOMESTIC_VERSION_1
|
||||
|
||||
#define HARD_WARE "MXC-A272O V4.5"
|
||||
#define HARD_WARE_LABEL "4.5"
|
||||
#define MCU_INFO_LABEL "A272O"
|
||||
|
||||
//胎压功能宏
|
||||
@ -53,7 +51,6 @@
|
||||
|
||||
//#define SOFT_WARE "MXC-A27-A V0.8"
|
||||
#define HARD_WARE "MXC-A27-A V4.3"
|
||||
#define HARD_WARE_LABEL "4.3"
|
||||
|
||||
#endif
|
||||
|
||||
@ -117,7 +114,7 @@
|
||||
#define LOW_BRIGHTNESS_MODE 20
|
||||
|
||||
// 打印
|
||||
// #define DEBUG 1
|
||||
#define DEBUG 1
|
||||
#ifdef DEBUG
|
||||
#define DEBUG_PRINT(fmt, ...) printf(fmt, ##__VA_ARGS__)
|
||||
#else
|
||||
|
@ -174,8 +174,9 @@ static void tp_init(widget_t *win) {
|
||||
// 关闭对应按钮
|
||||
widget_t *dis_tab = widget_lookup(win, "aa_tab", TRUE);
|
||||
widget_set_visible(dis_tab, FALSE);
|
||||
widget_t *ec_tab = widget_lookup(win, "cp_tab", TRUE);
|
||||
widget_set_visible(ec_tab, FALSE);
|
||||
widget_t *cp_tab = widget_lookup(win, "cp_tab", TRUE);
|
||||
widget_set_visible(cp_tab, FALSE);
|
||||
select_tab = widget_lookup(win, "ec_tab", TRUE);
|
||||
|
||||
widget_set_visible(p2p_view, TRUE);
|
||||
widget_set_visible(carplay_view, FALSE);
|
||||
|
@ -9,25 +9,33 @@ void theme_list_init(widget_t* win){
|
||||
widget_t* child =NULL;
|
||||
widget_t* widget =NULL;
|
||||
uint8_t count = 0 ;
|
||||
|
||||
if(win != NULL && strcmp(win->name,"set_list")==0){
|
||||
const char* language = locale_info()->language;
|
||||
|
||||
//if(win != NULL && strcmp(win->name,"set_list")==0){
|
||||
/*
|
||||
widget = widget_lookup(win,"theme",TRUE);
|
||||
if(widget!=NULL){
|
||||
widget_set_visible(widget,FALSE);
|
||||
widget_set_enable(widget,FALSE);
|
||||
}
|
||||
|
||||
child = widget_get_child(widget,0);
|
||||
count = Get_sys_theme();
|
||||
const char* language = locale_info()->language;
|
||||
/*
|
||||
#if 0
|
||||
if(count == 0)
|
||||
widget_set_text_utf8(child,"ui_demo1");
|
||||
else if(count == 1)
|
||||
widget_set_text_utf8(child,"demo2");
|
||||
else if(count == 2 )
|
||||
widget_set_text_utf8(child,"demo3");*/
|
||||
widget_set_text_utf8(child,"demo3");
|
||||
#endif
|
||||
|
||||
if (tk_str_eq(language, "en")) {//英文
|
||||
widget_set_text_utf8(child,"Improving...");
|
||||
}else{
|
||||
widget_set_text_utf8(child,"完善中...");
|
||||
}
|
||||
}*/
|
||||
|
||||
widget = widget_lookup(win,"theme_bg",TRUE);
|
||||
child = widget_get_child(widget,0);
|
||||
@ -35,19 +43,22 @@ void theme_list_init(widget_t* win){
|
||||
if (tk_str_eq(language, "en")) {//英文
|
||||
if(count == 0)
|
||||
widget_set_text_utf8(child,"Night");
|
||||
else if(count == 1)
|
||||
else if(count == 1)
|
||||
widget_set_text_utf8(child,"Daytime");
|
||||
else if(count == 2 )
|
||||
else if(count == 2 )
|
||||
widget_set_text_utf8(child,"Adaptive");
|
||||
}else{
|
||||
if(count == 0)
|
||||
widget_set_text_utf8(child,"黑夜");
|
||||
else if(count == 1)
|
||||
else if(count == 1)
|
||||
widget_set_text_utf8(child,"白天");
|
||||
else if(count == 2 )
|
||||
else if(count == 2 )
|
||||
widget_set_text_utf8(child,"自适应");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//}
|
||||
|
||||
}
|
||||
|
||||
@ -61,7 +72,6 @@ static ret_t visit_init_child(void* ctx, const void* iter) {
|
||||
|
||||
// 初始化指定名称的控件(设置属性或注册事件),请保证控件名称在窗口上唯一
|
||||
if (name != NULL && *name != '\0') {
|
||||
printf("*******************init2 *****************\r\n");
|
||||
}
|
||||
|
||||
return RET_OK;
|
||||
@ -76,7 +86,6 @@ ret_t settingview11_init(widget_t* component, void* ctx) {
|
||||
|
||||
widget_foreach(component, visit_init_child, component);
|
||||
|
||||
printf("*******************init *****************\r\n");
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
@ -0,0 +1,30 @@
|
||||
#include "awtk.h"
|
||||
#include "../common/navigator.h"
|
||||
|
||||
/**
|
||||
* 初始化窗口的子控件
|
||||
*/
|
||||
static ret_t visit_init_child(void* ctx, const void* iter) {
|
||||
//widget_t* component = WIDGET(ctx);
|
||||
widget_t* widget = WIDGET(iter);
|
||||
const char* name = widget->name;
|
||||
|
||||
// 初始化指定名称的控件(设置属性或注册事件),请保证控件名称在窗口上唯一
|
||||
if (name != NULL && *name != '\0') {
|
||||
|
||||
}
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化窗口
|
||||
*/
|
||||
ret_t settingview6_init(widget_t* component, void* ctx) {
|
||||
(void)ctx;
|
||||
return_value_if_fail(component != NULL, RET_BAD_PARAMS);
|
||||
|
||||
widget_foreach(component, visit_init_child, component);
|
||||
|
||||
return RET_OK;
|
||||
}
|
@ -230,12 +230,14 @@ void UI_init(void){
|
||||
|
||||
#elif (CARLINK_TP_CP)
|
||||
printf("only tp init cp.\r\n");
|
||||
Set_sys_tp_state(0);
|
||||
carlink_cp_enable(1);
|
||||
carlink_aa_enable(0);
|
||||
carlink_ec_enable(0);
|
||||
|
||||
#elif (CARLINK_TP_EC)
|
||||
printf("only tp init cp.\r\n");
|
||||
Set_sys_tp_state(1);
|
||||
carlink_cp_enable(0);
|
||||
carlink_aa_enable(0);
|
||||
carlink_ec_enable(1);
|
||||
|
Reference in New Issue
Block a user