From: 袁清梦 <3449750381@qq.com> Date: Mon, 13 Jan 2025 02:29:22 +0000 (+0000) Subject: Merge #1625 into sdk602patch0911 from refs/changes/1625/head X-Git-Tag: v1.3.113-repair_tp~39^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4c37ce5a6dfeb2c5c3a49734e8f45d145ebdefc2;p=mirrors%2FFD230.git Merge #1625 into sdk602patch0911 from refs/changes/1625/head Code review from 袁清梦 * refs/changes/1625/head: (24 commits squashed) - 表盘:【花蕾】 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 修改表盘;【沙皮狗】 - 表盘:【新年快乐】 - 表盘:【蛇年大吉】 - 表盘:【福娃贺岁】 - 表盘:【恭喜发财】 - 表盘:【好运连连】 - 表盘:【八方来财】 - 表盘:【喜迎2025】 - 表盘:【元旦快乐】 - 表盘:【新春快乐】 - 表盘【2025】 - 表盘:【蛇来运转】 - 表盘:【蛇年吉祥】 - 工具:优化表盘工具 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 表盘:关闭调试打印 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 表盘:【2025】 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1625 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp index c78db89bb..90f7e4f59 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/parser/DialBinParser.cpp @@ -544,11 +544,11 @@ int32_t DialBinParser::ParserDialArcProgress(FILE* fp) DialArcProgressView* view = new DialArcProgressView(); view->SetPosition(data->typeData.rect.x, data->typeData.rect.y, data->typeData.rect.w, data->typeData.rect.h); - GRAPHIC_LOGE("SetPosition: %d, %d, %d ,%d \n", data->typeData.rect.x , data->typeData.rect.w ,data->typeData.rect.y ,data->typeData.rect.h); + // GRAPHIC_LOGE("SetPosition: %d, %d, %d ,%d \n", data->typeData.rect.x , data->typeData.rect.w ,data->typeData.rect.y ,data->typeData.rect.h); view->SetCenterPosition( data->typeData.rect.x + data->typeData.rect.w / 2, // 2: half data->typeData.rect.y + data->typeData.rect.h / 2); // 2: half - GRAPHIC_LOGE("SetCenterPosition: %d, %d\n", data->typeData.rect.x + data->typeData.rect.w / 2,data->typeData.rect.y + data->typeData.rect.h / 2); + // GRAPHIC_LOGE("SetCenterPosition: %d, %d\n", data->typeData.rect.x + data->typeData.rect.w / 2,data->typeData.rect.y + data->typeData.rect.h / 2); view->SetRadius(data->radius); view->SetStartAngle(data->startAngle); view->SetEndAngle(data->endAngle); diff --git a/tools/dial_converter_tool/dial_lzma/147/sharpee.lzma b/tools/dial_converter_tool/dial_lzma/147/sharpee.lzma index 4858b2780..9d9183a63 100644 Binary files a/tools/dial_converter_tool/dial_lzma/147/sharpee.lzma and b/tools/dial_converter_tool/dial_lzma/147/sharpee.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/192/HappyNewYear.lzma b/tools/dial_converter_tool/dial_lzma/192/HappyNewYear.lzma new file mode 100644 index 000000000..9144e2c84 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/192/HappyNewYear.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/192/HappyNewYear.png b/tools/dial_converter_tool/dial_lzma/192/HappyNewYear.png new file mode 100644 index 000000000..5e3cc9f48 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/192/HappyNewYear.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/192/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/192/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..c5ce2d8a7 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/192/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:新年快乐 +英文名:Happy New Year +标签:数码表盘;节日活动;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.lzma b/tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.lzma new file mode 100644 index 000000000..ee1a111db Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.png b/tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.png new file mode 100644 index 000000000..fb461a3b2 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/193/SnakeYearLuck.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/193/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/193/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..78d22e357 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/193/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:蛇年大吉 +英文名:Snake Year Luck +标签:数码表盘;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.lzma b/tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.lzma new file mode 100644 index 000000000..d05475533 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.png b/tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.png new file mode 100644 index 000000000..18bed060c Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/194/LuckyDollNew.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/194/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/194/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..6e5119ce0 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/194/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:福娃贺岁 +英文名:Lucky Doll New +标签:数码表盘;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/195/WishYouWealth.lzma b/tools/dial_converter_tool/dial_lzma/195/WishYouWealth.lzma new file mode 100644 index 000000000..c0e5e7887 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/195/WishYouWealth.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/195/WishYouWealth.png b/tools/dial_converter_tool/dial_lzma/195/WishYouWealth.png new file mode 100644 index 000000000..defa13da8 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/195/WishYouWealth.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/195/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/195/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..ac7f43045 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/195/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:恭喜发财 +英文名:Wish You Wealth +标签:数码表盘;节日活动;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.lzma b/tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.lzma new file mode 100644 index 000000000..71aaba363 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.png b/tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.png new file mode 100644 index 000000000..083142959 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/196/GoodLuckForever.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/196/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/196/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..e64389b66 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/196/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:好运连连 +英文名:Good Luck Forever +标签:数码表盘;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/197/WealthfromAll.lzma b/tools/dial_converter_tool/dial_lzma/197/WealthfromAll.lzma new file mode 100644 index 000000000..f37b0421c Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/197/WealthfromAll.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/197/WealthfromAll.png b/tools/dial_converter_tool/dial_lzma/197/WealthfromAll.png new file mode 100644 index 000000000..8c4d48aff Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/197/WealthfromAll.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/197/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/197/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..fc9944851 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/197/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:八方来财 +英文名:Wealth from All +标签:数码表盘;节日活动;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/198/Welcome2025.lzma b/tools/dial_converter_tool/dial_lzma/198/Welcome2025.lzma new file mode 100644 index 000000000..601b2dada Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/198/Welcome2025.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/198/Welcome2025.png b/tools/dial_converter_tool/dial_lzma/198/Welcome2025.png new file mode 100644 index 000000000..4d63449d1 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/198/Welcome2025.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/198/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/198/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..51eb495f3 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/198/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:喜迎2025 +英文名:Welcome 2025 +标签:数码表盘;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/199/NewYearsDay.lzma b/tools/dial_converter_tool/dial_lzma/199/NewYearsDay.lzma new file mode 100644 index 000000000..160349169 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/199/NewYearsDay.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/199/NewYearsDay.png b/tools/dial_converter_tool/dial_lzma/199/NewYearsDay.png new file mode 100644 index 000000000..4a317fb86 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/199/NewYearsDay.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/199/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/199/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..e751829cd --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/199/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:元旦快乐 +英文名:New Year's Day +标签:数码表盘;节日活动;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/200/HappySpring.lzma b/tools/dial_converter_tool/dial_lzma/200/HappySpring.lzma new file mode 100644 index 000000000..d382b87b9 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/200/HappySpring.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/200/HappySpring.png b/tools/dial_converter_tool/dial_lzma/200/HappySpring.png new file mode 100644 index 000000000..69ddb7b51 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/200/HappySpring.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/200/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/200/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..13b8c8e8a --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/200/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:新春快乐 +英文名:Happy Spring +标签:数码表盘;节日活动;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/201/2025.lzma b/tools/dial_converter_tool/dial_lzma/201/2025.lzma new file mode 100644 index 000000000..ae925120a Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/201/2025.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/201/2025.png b/tools/dial_converter_tool/dial_lzma/201/2025.png new file mode 100644 index 000000000..18fe65475 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/201/2025.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/201/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/201/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..4ef3adcf9 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/201/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:2025 +英文名:2025 +标签:数码表盘;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.lzma b/tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.lzma new file mode 100644 index 000000000..c6d23e1af Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.png b/tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.png new file mode 100644 index 000000000..70ecebf6c Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/202/LuckwithSnake.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/202/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/202/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..303431a86 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/202/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:蛇来运转 +英文名:Luck with Snake +标签:数码表盘;新年表盘 diff --git a/tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.lzma b/tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.lzma new file mode 100644 index 000000000..72fdb3e62 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.png b/tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.png new file mode 100644 index 000000000..b0bba5257 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/203/GoodSnakeYear.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/203/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/203/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..4d9f3a144 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/203/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:蛇年吉祥 +英文名:Good Snake Year +标签:数码表盘;新年表盘 diff --git a/tools/dial_converter_tool/instance/147/sharpee.xml b/tools/dial_converter_tool/instance/147/sharpee.xml index 1796cc793..d13c2ce32 100644 --- a/tools/dial_converter_tool/instance/147/sharpee.xml +++ b/tools/dial_converter_tool/instance/147/sharpee.xml @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/192/Battery/Battery.png b/tools/dial_converter_tool/instance/192/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/192/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/192/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/192/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/192/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/192/HappyNewYear.png b/tools/dial_converter_tool/instance/192/HappyNewYear.png new file mode 100644 index 000000000..fcf3e24d6 Binary files /dev/null and b/tools/dial_converter_tool/instance/192/HappyNewYear.png differ diff --git a/tools/dial_converter_tool/instance/192/HappyNewYear.xml b/tools/dial_converter_tool/instance/192/HappyNewYear.xml new file mode 100644 index 000000000..8026429bc --- /dev/null +++ b/tools/dial_converter_tool/instance/192/HappyNewYear.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/192/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/192/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..51437b749 Binary files /dev/null and b/tools/dial_converter_tool/instance/192/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/193/Battery/Battery.png b/tools/dial_converter_tool/instance/193/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/193/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/193/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/193/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/193/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/193/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/193/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..4d6dfaad1 Binary files /dev/null and b/tools/dial_converter_tool/instance/193/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/193/SnakeYearLuck.png b/tools/dial_converter_tool/instance/193/SnakeYearLuck.png new file mode 100644 index 000000000..97fef3f4c Binary files /dev/null and b/tools/dial_converter_tool/instance/193/SnakeYearLuck.png differ diff --git a/tools/dial_converter_tool/instance/193/SnakeYearLuck.xml b/tools/dial_converter_tool/instance/193/SnakeYearLuck.xml new file mode 100644 index 000000000..5b3a7be42 --- /dev/null +++ b/tools/dial_converter_tool/instance/193/SnakeYearLuck.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/194/Battery/Battery.png b/tools/dial_converter_tool/instance/194/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/194/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/194/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/194/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/194/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/194/LuckyDollNew.png b/tools/dial_converter_tool/instance/194/LuckyDollNew.png new file mode 100644 index 000000000..4e6b575db Binary files /dev/null and b/tools/dial_converter_tool/instance/194/LuckyDollNew.png differ diff --git a/tools/dial_converter_tool/instance/194/LuckyDollNew.xml b/tools/dial_converter_tool/instance/194/LuckyDollNew.xml new file mode 100644 index 000000000..6cea7b5a7 --- /dev/null +++ b/tools/dial_converter_tool/instance/194/LuckyDollNew.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/194/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/194/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..33353f813 Binary files /dev/null and b/tools/dial_converter_tool/instance/194/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/195/Battery/Battery.png b/tools/dial_converter_tool/instance/195/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/195/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/195/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/195/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/195/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/195/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/195/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..4a59f19c7 Binary files /dev/null and b/tools/dial_converter_tool/instance/195/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/195/WishYouWealth.png b/tools/dial_converter_tool/instance/195/WishYouWealth.png new file mode 100644 index 000000000..5a9f2f1e8 Binary files /dev/null and b/tools/dial_converter_tool/instance/195/WishYouWealth.png differ diff --git a/tools/dial_converter_tool/instance/195/WishYouWealth.xml b/tools/dial_converter_tool/instance/195/WishYouWealth.xml new file mode 100644 index 000000000..b12421529 --- /dev/null +++ b/tools/dial_converter_tool/instance/195/WishYouWealth.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/196/Battery/Battery.png b/tools/dial_converter_tool/instance/196/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/196/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/196/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/196/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/196/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/196/GoodLuckForever.png b/tools/dial_converter_tool/instance/196/GoodLuckForever.png new file mode 100644 index 000000000..408c8cda7 Binary files /dev/null and b/tools/dial_converter_tool/instance/196/GoodLuckForever.png differ diff --git a/tools/dial_converter_tool/instance/196/GoodLuckForever.xml b/tools/dial_converter_tool/instance/196/GoodLuckForever.xml new file mode 100644 index 000000000..c08094c00 --- /dev/null +++ b/tools/dial_converter_tool/instance/196/GoodLuckForever.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/196/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/196/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..2bb604a12 Binary files /dev/null and b/tools/dial_converter_tool/instance/196/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/197/Battery/Battery.png b/tools/dial_converter_tool/instance/197/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/197/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/197/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/197/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/197/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/197/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/197/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..b45d94891 Binary files /dev/null and b/tools/dial_converter_tool/instance/197/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/197/WealthfromAll.png b/tools/dial_converter_tool/instance/197/WealthfromAll.png new file mode 100644 index 000000000..97989d864 Binary files /dev/null and b/tools/dial_converter_tool/instance/197/WealthfromAll.png differ diff --git a/tools/dial_converter_tool/instance/197/WealthfromAll.xml b/tools/dial_converter_tool/instance/197/WealthfromAll.xml new file mode 100644 index 000000000..6d7eba0f2 --- /dev/null +++ b/tools/dial_converter_tool/instance/197/WealthfromAll.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/198/Battery/Battery.png b/tools/dial_converter_tool/instance/198/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/198/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/198/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/198/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/198/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/198/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/198/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..5edfedcfb Binary files /dev/null and b/tools/dial_converter_tool/instance/198/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/198/Welcome2025.png b/tools/dial_converter_tool/instance/198/Welcome2025.png new file mode 100644 index 000000000..d06a162b8 Binary files /dev/null and b/tools/dial_converter_tool/instance/198/Welcome2025.png differ diff --git a/tools/dial_converter_tool/instance/198/Welcome2025.xml b/tools/dial_converter_tool/instance/198/Welcome2025.xml new file mode 100644 index 000000000..cd296cbca --- /dev/null +++ b/tools/dial_converter_tool/instance/198/Welcome2025.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/199/Battery/Battery.png b/tools/dial_converter_tool/instance/199/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/199/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/199/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/199/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/199/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/199/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/199/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..f3a1db90d Binary files /dev/null and b/tools/dial_converter_tool/instance/199/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/199/NewYearsDay.png b/tools/dial_converter_tool/instance/199/NewYearsDay.png new file mode 100644 index 000000000..6a62c9e52 Binary files /dev/null and b/tools/dial_converter_tool/instance/199/NewYearsDay.png differ diff --git a/tools/dial_converter_tool/instance/199/NewYearsDay.xml b/tools/dial_converter_tool/instance/199/NewYearsDay.xml new file mode 100644 index 000000000..01e0ee1bc --- /dev/null +++ b/tools/dial_converter_tool/instance/199/NewYearsDay.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/200/Battery/Battery.png b/tools/dial_converter_tool/instance/200/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/200/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/200/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/200/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/200/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/200/HappySpring.png b/tools/dial_converter_tool/instance/200/HappySpring.png new file mode 100644 index 000000000..7a0a13ffe Binary files /dev/null and b/tools/dial_converter_tool/instance/200/HappySpring.png differ diff --git a/tools/dial_converter_tool/instance/200/HappySpring.xml b/tools/dial_converter_tool/instance/200/HappySpring.xml new file mode 100644 index 000000000..cfb1f6796 --- /dev/null +++ b/tools/dial_converter_tool/instance/200/HappySpring.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/200/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/200/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..27415b676 Binary files /dev/null and b/tools/dial_converter_tool/instance/200/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/201/2025.png b/tools/dial_converter_tool/instance/201/2025.png new file mode 100644 index 000000000..5cbbd7070 Binary files /dev/null and b/tools/dial_converter_tool/instance/201/2025.png differ diff --git a/tools/dial_converter_tool/instance/201/2025.xml b/tools/dial_converter_tool/instance/201/2025.xml new file mode 100644 index 000000000..362d6d091 --- /dev/null +++ b/tools/dial_converter_tool/instance/201/2025.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/201/Battery/Battery.png b/tools/dial_converter_tool/instance/201/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/201/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/201/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/201/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/201/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/201/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/201/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..6d8cf7bc9 Binary files /dev/null and b/tools/dial_converter_tool/instance/201/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/202/Battery/Battery.png b/tools/dial_converter_tool/instance/202/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/202/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/202/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/202/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/202/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/202/LuckwithSnake.png b/tools/dial_converter_tool/instance/202/LuckwithSnake.png new file mode 100644 index 000000000..13e8be6cb Binary files /dev/null and b/tools/dial_converter_tool/instance/202/LuckwithSnake.png differ diff --git a/tools/dial_converter_tool/instance/202/LuckwithSnake.xml b/tools/dial_converter_tool/instance/202/LuckwithSnake.xml new file mode 100644 index 000000000..055cbe7fd --- /dev/null +++ b/tools/dial_converter_tool/instance/202/LuckwithSnake.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/202/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/202/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..a4db9d4e4 Binary files /dev/null and b/tools/dial_converter_tool/instance/202/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/203/Battery/Battery.png b/tools/dial_converter_tool/instance/203/Battery/Battery.png new file mode 100644 index 000000000..916febe86 Binary files /dev/null and b/tools/dial_converter_tool/instance/203/Battery/Battery.png differ diff --git a/tools/dial_converter_tool/instance/203/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/203/Battery/BatteryCharge.png new file mode 100644 index 000000000..4c26888f3 Binary files /dev/null and b/tools/dial_converter_tool/instance/203/Battery/BatteryCharge.png differ diff --git a/tools/dial_converter_tool/instance/203/GoodSnakeYear.png b/tools/dial_converter_tool/instance/203/GoodSnakeYear.png new file mode 100644 index 000000000..cde2d2f6d Binary files /dev/null and b/tools/dial_converter_tool/instance/203/GoodSnakeYear.png differ diff --git a/tools/dial_converter_tool/instance/203/GoodSnakeYear.xml b/tools/dial_converter_tool/instance/203/GoodSnakeYear.xml new file mode 100644 index 000000000..ed3e010f2 --- /dev/null +++ b/tools/dial_converter_tool/instance/203/GoodSnakeYear.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/203/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/203/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..77b0323ac Binary files /dev/null and b/tools/dial_converter_tool/instance/203/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/make_tools/gen_dial_bin.sh b/tools/dial_converter_tool/make_tools/gen_dial_bin.sh index 44c33d71b..18ff16a9a 100755 --- a/tools/dial_converter_tool/make_tools/gen_dial_bin.sh +++ b/tools/dial_converter_tool/make_tools/gen_dial_bin.sh @@ -13,18 +13,36 @@ cd .. mkdir -p out dial_lzma # 检查是否传入参数 -if [ "$#" -gt 1 ]; then - echo "Usage: $0 [dial_folder]" - exit 1 -fi +# if [ "$#" -gt 1 ]; then +# echo "Usage: $0 [dial_folder]" +# exit 1 +# fi -# 如果有参数,则处理指定的目录;否则处理所有子目录 +#功能1:如果有一个参数(制作单个表盘) if [ "$#" -eq 1 ]; then subdirs=("instance/$1/") if [ ! -d "instance/$1" ]; then echo "Error: Specified directory 'instance/$1' does not exist." exit 1 fi +#功能2:如果有两个参数(制作多个表盘,处理指定范围的表盘目录) +elif [ "$#" -eq 2 ]; then + start_dir=$(basename "$1") + end_dir=$(basename "$2") + subdirs=() + for dir in instance/*/; do + dir_name=$(basename "$dir") + # 将目录名转换为数字进行比较(使用算术比较 -gt 和 -lt) + if [ "$dir_name" -gt "$start_dir" ] && [ "$dir_name" -lt "$end_dir" ]; then + subdirs+=("$dir") + fi + done + if [ ${#subdirs[@]} -eq 0 ]; then + echo "Error: No directories found in the specified range." + exit 1 + fi + +#功能3:如果没有参数(则制作所有表盘) else subdirs=(instance/*/) fi diff --git "a/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.md" "b/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.md" index 93c2c128e..62e517022 100755 --- "a/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.md" +++ "b/tools/dial_converter_tool/make_tools/\350\241\250\347\233\230\345\210\266\344\275\234\350\204\232\346\234\254\344\275\277\347\224\250\350\257\264\346\230\216.md" @@ -1,6 +1,7 @@ ## 在liunx环境运行表盘脚本 # 1.下载对应模块 + pip install -i https://pypi.tuna.tsinghua.edu.cn/simple Pillow pip install -i https://pypi.tuna.tsinghua.edu.cn/simple opencv-python @@ -13,23 +14,33 @@ chmod +x gen_dial_bin.sh ./gen_dial_bin.sh ## 3.制作运行单个表盘 + python ./main.py -dir ./instance/1028/ -output ./out/ #使用lzma_tool工具需要赋权限 chmod +x ../lzma_tool/lzma_tool - ### 更新版本 0830 +### 更新版本 0830 + - 制作单个表盘以及lzma文件 **./gen_dial_bin.sh + 表盘文件夹路径** ``` 示例 ./gen_dial_bin.sh ../instance/114/ ``` - - 制作所有的表盘以及lzma文件 ``` ./gen_dial_bin.sh ``` - + +### 更新版本0110 + +制作指定段表盘 : start ->end 根据表盘Id 进行依次制作表盘 + +```c + 示例 ./gen_dial_bin.sh ../instance/114/ ../instance/124/ +``` + +- 效果会生成 114->124 一共11个表盘