diff --git a/ReadMe.md b/ReadMe.md index bc251f84..12b26380 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,3 +1,5 @@ +# v1.0.4 +* 1.正式出货版本 # v1.0.3 * 1.修复窗帘/灯/空调/投影仪界面的锁屏功能 diff --git a/application/rt-thread/t3e-pro/components/FontEnum.h b/application/rt-thread/t3e-pro/components/FontEnum.h index 034aa582..0b16a582 100644 --- a/application/rt-thread/t3e-pro/components/FontEnum.h +++ b/application/rt-thread/t3e-pro/components/FontEnum.h @@ -11,7 +11,7 @@ #define D_System_Storage "16MB+8MB" #define D_System_Hardware "1.0" #define D_System_Screen "480*480" -#define D_System_Ver 103 +#define D_System_Ver 104 enum { diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_curtain.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_curtain.c index 22255f14..aa69745a 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_curtain.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_curtain.c @@ -160,7 +160,7 @@ void setup_scr_curtain(lv_ui *ui) //Write codes curtain_cont_1 ui->curtain_cont_1 = lv_obj_create(ui->curtain_tabview_1_tab_1); - lv_obj_set_pos(ui->curtain_cont_1, 18, 5); + lv_obj_set_pos(ui->curtain_cont_1, 18-15, 5); lv_obj_set_size(ui->curtain_cont_1, 214, 142); lv_obj_set_scrollbar_mode(ui->curtain_cont_1, LV_SCROLLBAR_MODE_OFF); @@ -361,7 +361,7 @@ void setup_scr_curtain(lv_ui *ui) //Write codes curtain_cont_2 ui->curtain_cont_2 = lv_obj_create(ui->curtain_tabview_1_tab_1); - lv_obj_set_pos(ui->curtain_cont_2, 246, 5); + lv_obj_set_pos(ui->curtain_cont_2, 246-10, 5); lv_obj_set_size(ui->curtain_cont_2, 214, 142); lv_obj_set_scrollbar_mode(ui->curtain_cont_2, LV_SCROLLBAR_MODE_OFF); @@ -561,7 +561,7 @@ void setup_scr_curtain(lv_ui *ui) //Write codes curtain_cont_3 ui->curtain_cont_3 = lv_obj_create(ui->curtain_tabview_1_tab_1); - lv_obj_set_pos(ui->curtain_cont_3, 18, 156); + lv_obj_set_pos(ui->curtain_cont_3, 18-15, 156); lv_obj_set_size(ui->curtain_cont_3, 214, 142); lv_obj_set_scrollbar_mode(ui->curtain_cont_3, LV_SCROLLBAR_MODE_OFF); @@ -761,7 +761,7 @@ void setup_scr_curtain(lv_ui *ui) //Write codes curtain_cont_4 ui->curtain_cont_4 = lv_obj_create(ui->curtain_tabview_1_tab_1); - lv_obj_set_pos(ui->curtain_cont_4, 246, 156); + lv_obj_set_pos(ui->curtain_cont_4, 246-10, 156); lv_obj_set_size(ui->curtain_cont_4, 214, 142); lv_obj_set_scrollbar_mode(ui->curtain_cont_4, LV_SCROLLBAR_MODE_OFF); diff --git a/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a b/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a index eff24104..e6bf0e01 100644 Binary files a/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a and b/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a differ diff --git a/t3e_pro_v1.0.3.zip b/t3e_pro_v1.0.3.zip deleted file mode 100644 index c387b069..00000000 Binary files a/t3e_pro_v1.0.3.zip and /dev/null differ diff --git a/t3e_pro_v1.0.4.zip b/t3e_pro_v1.0.4.zip new file mode 100644 index 00000000..f8939e64 Binary files /dev/null and b/t3e_pro_v1.0.4.zip differ diff --git a/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig b/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig index 881a8764..3c2d3f80 100644 --- a/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig +++ b/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig @@ -793,8 +793,8 @@ CONFIG_CONFIG_LANAGUAGE_CHS=y # CONFIG_CONFIG_LANAGUAGE_CHT is not set # CONFIG_CONFIG_USER_RELAY_1 is not set # CONFIG_CONFIG_USER_RELAY_2 is not set -CONFIG_CONFIG_USER_RELAY_3=y -# CONFIG_CONFIG_USER_RELAY_4 is not set +# CONFIG_CONFIG_USER_RELAY_3 is not set +CONFIG_CONFIG_USER_RELAY_4=y CONFIG_CONFIG_DEVICE_SCR_ACT_JUMP=y CONFIG_CONFIG_OBJICT_IMAGE=y CONFIG_CONFIG_USER_MENU_TABLEVEW=y diff --git a/target/d12x/t3e-pro/pack/.image_cfg.json.tmp b/target/d12x/t3e-pro/pack/.image_cfg.json.tmp index 686b2558..d144df01 100644 --- a/target/d12x/t3e-pro/pack/.image_cfg.json.tmp +++ b/target/d12x/t3e-pro/pack/.image_cfg.json.tmp @@ -15,7 +15,7 @@ "info": { // Header information about image "platform": "d12x", "product": "t3e-pro", - "version": "1.0.3", + "version": "1.0.4", "media": { "type": "spi-nor", "device_id": 0, diff --git a/target/d12x/t3e-pro/pack/bootloader.bin b/target/d12x/t3e-pro/pack/bootloader.bin index 5b31e3bc..eb0989f4 100644 Binary files a/target/d12x/t3e-pro/pack/bootloader.bin and b/target/d12x/t3e-pro/pack/bootloader.bin differ diff --git a/target/d12x/t3e-pro/pack/image_cfg.json b/target/d12x/t3e-pro/pack/image_cfg.json index dbe1e18b..81017e38 100644 --- a/target/d12x/t3e-pro/pack/image_cfg.json +++ b/target/d12x/t3e-pro/pack/image_cfg.json @@ -15,7 +15,7 @@ "info": { // Header information about image "platform": "d12x", "product": "t3e-pro", - "version": "1.0.3", + "version": "1.0.4", "media": { "type": "spi-nor", "device_id": 0, diff --git a/tools/env/tools/ConEmu/ConEmu.xml b/tools/env/tools/ConEmu/ConEmu.xml index 15a2662d..1c0251ff 100644 --- a/tools/env/tools/ConEmu/ConEmu.xml +++ b/tools/env/tools/ConEmu/ConEmu.xml @@ -1,7 +1,7 @@ - + @@ -259,8 +259,8 @@ - - + + diff --git a/tools/env/tools/ConEmu/ConEmu/clink/profile/.history b/tools/env/tools/ConEmu/ConEmu/clink/profile/.history index 86dc9dce..d38cb4a5 100644 --- a/tools/env/tools/ConEmu/ConEmu/clink/profile/.history +++ b/tools/env/tools/ConEmu/ConEmu/clink/profile/.history @@ -100,3 +100,10 @@ me me me mc -j16 +me +me +me +me +me +mc -j16 +me diff --git a/ui/luban-lite-t3e-pre-navi_gui.zip b/ui/luban-lite-t3e-pre-navi_gui.zip new file mode 100644 index 00000000..c0c04a15 Binary files /dev/null and b/ui/luban-lite-t3e-pre-navi_gui.zip differ