From: Caisking <3449750381@qq.com> Date: Thu, 18 Jul 2024 08:37:55 +0000 (+0800) Subject: 同步lzma配置 X-Git-Tag: release_V1.2.70_20241020_135402~702^2~42 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f4e0c81dcf7b2d9b346d450b23d8abf3648fbc0d;p=mirrors%2FFD230.git 同步lzma配置 --- diff --git a/.gitignore b/.gitignore index 357b1a6c6..2a5b10553 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ code/sdk/build/config/target_config/brandy/mk_fs_image/z1/file_tmp.bin tools/dial_converter_tool/__pycache__/** tools/dial_converter_tool/out/** tools/dial_converter_tool/dial/** -tools/dial_converter_tool/dial_lzma/** tools/image_converter_tool/__pycache__/** tools/image_converter_tool/include/** tools/image_converter_tool/output/** diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.lzma b/tools/dial_converter_tool/dial_lzma/101/sport.lzma new file mode 100644 index 000000000..df0fb4eee Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/101/sport.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.png b/tools/dial_converter_tool/dial_lzma/101/sport.png new file mode 100644 index 000000000..7b684e6ef Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/101/sport.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/101/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/101/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..18d09fec2 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/101/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:运动 +英文名:Sport +标签:经典指针 运动 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.lzma b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.lzma new file mode 100644 index 000000000..500614381 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.png b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.png new file mode 100644 index 000000000..3f00083f2 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/102/kaleidoscope.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/102/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/102/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..1e9a45cef --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/102/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:万花筒 +英文名:Kaleidoscope +标签:经典指针;动态 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/1028/KUMI.lzma b/tools/dial_converter_tool/dial_lzma/1028/KUMI.lzma new file mode 100644 index 000000000..976e837a6 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1028/KUMI.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/1028/KUMI.png b/tools/dial_converter_tool/dial_lzma/1028/KUMI.png new file mode 100644 index 000000000..ee19ac9d1 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1028/KUMI.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/1028/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/1028/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..374c9c847 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/1028/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:KUMI +英文名:KUMI +标签:数码表盘 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish-app.png b/tools/dial_converter_tool/dial_lzma/103/jellyfish-app.png new file mode 100644 index 000000000..a795ad77e Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/103/jellyfish-app.png differ diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma new file mode 100644 index 000000000..636be6b98 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma differ diff --git "a/tools/dial_converter_tool/dial_lzma/103/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/103/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..cca31731d --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/103/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:水母 +英文名:Jellyfish +标签:数码表盘;动物 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/104/dog.lzma b/tools/dial_converter_tool/dial_lzma/104/dog.lzma new file mode 100644 index 000000000..d91b1555a Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/104/dog.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/104/dog.png b/tools/dial_converter_tool/dial_lzma/104/dog.png new file mode 100644 index 000000000..0ec165546 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/104/dog.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/104/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/104/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..5d5bd58b5 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/104/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:小狗 +英文名:Dog +标签:经典指针;动物 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/105/kitty.lzma b/tools/dial_converter_tool/dial_lzma/105/kitty.lzma new file mode 100644 index 000000000..bbdd418c7 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/105/kitty.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/105/kitty.png b/tools/dial_converter_tool/dial_lzma/105/kitty.png new file mode 100644 index 000000000..8bf1d8315 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/105/kitty.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/105/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/105/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..7445a7ffc --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/105/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:小猫 +英文名:Kitty +标签:数码表盘;动态;动物 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/1052/classic.lzma b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma new file mode 100644 index 000000000..e83cc22a6 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/1052/classic.png b/tools/dial_converter_tool/dial_lzma/1052/classic.png new file mode 100644 index 000000000..c28154e59 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/1052/classic.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/1052/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/1052/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..065092c6f --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/1052/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:指针几何 +英文名:Classic_Geometry +标签:经典指针 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma new file mode 100644 index 000000000..c5fb8934d Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/106/galaxy.png b/tools/dial_converter_tool/dial_lzma/106/galaxy.png new file mode 100644 index 000000000..a7a11bb5e Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/106/galaxy.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/106/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/106/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..8d6decaf4 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/106/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:星空 +英文名:Galaxy +标签:数码表盘;运动 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/107/geometry.lzma b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma new file mode 100644 index 000000000..ac2229828 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/107/geometry.png b/tools/dial_converter_tool/dial_lzma/107/geometry.png new file mode 100644 index 000000000..5e74676a8 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/107/geometry.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/107/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/107/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..bb6cd9f3f --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/107/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:数码几何 +英文名:Digital_Geometry +标签:数码表盘;动态 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/108/maomao.lzma b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma new file mode 100644 index 000000000..3097fe6f6 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/108/maomao.png b/tools/dial_converter_tool/dial_lzma/108/maomao.png new file mode 100644 index 000000000..51a0f5217 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/108/maomao.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/108/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/108/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..92fc4adbc --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/108/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:招财猫 +英文名:Luckycat +标签:经典指针;动物 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma new file mode 100644 index 000000000..5a04f6cc4 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/109/succulents.png b/tools/dial_converter_tool/dial_lzma/109/succulents.png new file mode 100644 index 000000000..f20518d25 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/109/succulents.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/109/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/109/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..4b8774f27 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/109/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:多肉 +英文名:Succulents +标签:数码表盘;植物 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma new file mode 100644 index 000000000..01c136c5e Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/110/spaceman.png b/tools/dial_converter_tool/dial_lzma/110/spaceman.png new file mode 100644 index 000000000..a9d708a10 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/110/spaceman.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/110/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/110/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..a3c8b2557 --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/110/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:宇航员 +英文名:Spaceman +标签:数码表盘;动态;人物 \ No newline at end of file diff --git a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma new file mode 100644 index 000000000..b68cb7f40 Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/111/satellite.png b/tools/dial_converter_tool/dial_lzma/111/satellite.png new file mode 100644 index 000000000..ba7d6fc0f Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/111/satellite.png differ diff --git "a/tools/dial_converter_tool/dial_lzma/111/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/111/\350\257\264\346\230\216.txt" new file mode 100644 index 000000000..ddad8ddac --- /dev/null +++ "b/tools/dial_converter_tool/dial_lzma/111/\350\257\264\346\230\216.txt" @@ -0,0 +1,3 @@ +中文名:卫星 +英文名:Satellite +标签:数码表盘;动态 \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/101/sport.xml b/tools/dial_converter_tool/instance/101/sport.xml index 3db248be2..63b0225bd 100644 --- a/tools/dial_converter_tool/instance/101/sport.xml +++ b/tools/dial_converter_tool/instance/101/sport.xml @@ -1,15 +1,40 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/tools/dial_converter_tool/instance/109/succulents.xml b/tools/dial_converter_tool/instance/109/succulents.xml index 985984bb4..bfb26e509 100644 --- a/tools/dial_converter_tool/instance/109/succulents.xml +++ b/tools/dial_converter_tool/instance/109/succulents.xml @@ -11,11 +11,11 @@ - + - + diff --git a/tools/dial_converter_tool/instance/110/spaceman.xml b/tools/dial_converter_tool/instance/110/spaceman.xml index 770893c34..f56d43500 100644 --- a/tools/dial_converter_tool/instance/110/spaceman.xml +++ b/tools/dial_converter_tool/instance/110/spaceman.xml @@ -13,7 +13,7 @@ - + diff --git a/tools/dial_converter_tool/instance/111/satellite.xml b/tools/dial_converter_tool/instance/111/satellite.xml index 363d928c5..9c9622bfb 100644 --- a/tools/dial_converter_tool/instance/111/satellite.xml +++ b/tools/dial_converter_tool/instance/111/satellite.xml @@ -13,7 +13,7 @@ - + diff --git a/tools/dial_converter_tool/make_tools/compressdial.sh b/tools/dial_converter_tool/make_tools/compressdial.sh index f960d923b..db1fa0b26 100644 --- a/tools/dial_converter_tool/make_tools/compressdial.sh +++ b/tools/dial_converter_tool/make_tools/compressdial.sh @@ -1,4 +1,7 @@ #!/bin/bash +# 返回上一级目录 +cd .. + dialist=`ls instance/` for dial in $dialist do 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 f7c84cac0..9a5d89f35 100644 --- a/tools/dial_converter_tool/make_tools/gen_dial_bin.sh +++ b/tools/dial_converter_tool/make_tools/gen_dial_bin.sh @@ -1,10 +1,48 @@ #!/bin/bash -dialist=`ls instance/` -for dial in $dialist -do -dialfilecount=`find instance/$dial |wc -l` -dialfilesize=`du -s instance/$dial|awk '{print $1}'` -echo $dial [$dialfilecount] $dialfilesize -python main.py -dir instance/$dial -output dial -../../code/sdk/tools/bin/lzma_tool/lzma_tool -d12 -lc0 -lp0 e dial/$dial.bin dial_lzma/$dial.lzma -done + +# 返回上一级目录 +cd .. + +# 检查并创建 out 和 dial_lzma 目录 +mkdir -p out dial_lzma + +# 获取 instance 目录下的所有子目录列表 +subdirs=(instance/*/) +for subdir in "${subdirs[@]}"; do + # 提取子目录名称 + dial=$(basename "$subdir") + + # 查找子目录中的 XML 文件并提取文件名 + xml_file=$(find "$subdir" -maxdepth 1 -type f -name "*.xml" -printf "%f\n" | head -n 1) + if [ -z "$xml_file" ]; then + echo "Error: XML file not found in $subdir" + continue + fi + + # 计算文件数量和大小 + dialfilecount=$(find "$subdir" -maxdepth 1 -type f | wc -l) + dialfilesize=$(du -sh "$subdir" | awk '{print $1}') + + # 输出统计信息 + echo "Processing $dial [$dialfilecount files, $dialfilesize size]" + + # 调用 main.py 处理子目录中的文件 + if ! python main.py -dir "$subdir" -output out/; then + echo "Error processing directory $dial" + continue + fi + + # 压缩 .bin 文件到 .lzma 文件 + bin_file="out/${xml_file%.xml}.bin" + lzma_file="dial_lzma/$dial/${xml_file%.xml}.lzma" + + # 创建必要的目录 + mkdir -p "$(dirname "$lzma_file")" + + # 使用 lzma_tool 压缩文件 + if ! ../lzma_tool/lzma_tool -d12 -lc0 -lp0 e "$bin_file" "$lzma_file"; then + echo "Compression failed for $dial" + else + echo "Compression successful for $dial" + fi +done \ No newline at end of file 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.txt" "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.txt" index 07860112c..b091aa46d 100644 --- "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.txt" +++ "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.txt" @@ -1,7 +1,7 @@ 在liunx环境运行表盘脚本 -下载对应模块 +#下载对应模块 pip install -i https://pypi.tuna.tsinghua.edu.cn/simple Pillow pip install -i https://pypi.tuna.tsinghua.edu.cn/simple opencv-python @@ -11,5 +11,8 @@ pip install -i https://pypi.tuna.tsinghua.edu.cn/simple matplotlib chmod +x make_dial.sh ./make_dial.sh -制作运行单个表盘 -python ./main.py -dir ./instance/1028/ -output ./out/ \ No newline at end of file +#制作运行单个表盘 +python ./main.py -dir ./instance/1028/ -output ./out/ + +#使用lzma_tool工具需要赋权限 + chmod +x ../lzma_tool/lzma_tool \ No newline at end of file