From: 袁清梦 <3449750381@qq.com>
Date: Thu, 29 Aug 2024 04:11:20 +0000 (+0000)
Subject: Merge #822 into sdk602patch0626 from refs/changes/822/head
X-Git-Tag: release_V1.2.70_20241020_135402~564^2~1^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ab2d66d3a472844f221a0feaba82211a431ca8e9;p=mirrors%2FFD230.git

Merge #822 into sdk602patch0626 from refs/changes/822/head

Code review from 袁清梦

* refs/changes/822/head: (2 commits squashed)

  - 黑曜律动表盘资源汇总

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/822
---

diff --git a/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma
new file mode 100644
index 000000000..225405ceb
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.png b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.png
new file mode 100644
index 000000000..39917967a
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.png differ
diff --git "a/tools/dial_converter_tool/dial_lzma/114/\350\257\264\346\230\216.txt" "b/tools/dial_converter_tool/dial_lzma/114/\350\257\264\346\230\216.txt"
new file mode 100644
index 000000000..8d4b9dfc0
--- /dev/null
+++ "b/tools/dial_converter_tool/dial_lzma/114/\350\257\264\346\230\216.txt"
@@ -0,0 +1,9 @@
+中文名：黑曜律动
+英文名：Obsidian Rhythm
+标签：经典指针、动态表盘
+描述：
+“黑曜律动”表盘融合现代科技与独特个性，黑色基调搭配精致设计，
+彰显你的风格与效率。除了显示时间，它还提供便捷的快捷功能：
+● 点击12点位置进入天气应用，查看实时天气信息；
+● 点击6点位置查看今日步数，追踪健康数据；
+简约优雅的设计，让你在追求效率的同时，保持独一无二的风格。
\ No newline at end of file
diff --git a/tools/dial_converter_tool/make_tools/compressdial.sh b/tools/dial_converter_tool/make_tools/compressdial.sh
deleted file mode 100644
index db1fa0b26..000000000
--- a/tools/dial_converter_tool/make_tools/compressdial.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# 返回上一级目录
-cd ..
-
-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
diff --git a/tools/dial_converter_tool/make_tools/make_dial.sh b/tools/dial_converter_tool/make_tools/make_dial.sh
deleted file mode 100644
index 176743dca..000000000
--- a/tools/dial_converter_tool/make_tools/make_dial.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# 返回上一级目录
-cd ..
-
-# 遍历instance文件夹下的所有文件夹
-for dial_folder in ./instance/*/
-do
-    # 取文件夹名
-    dial_folder=$(basename "$dial_folder")
-
-    # 执行python命令，传入当前文件夹目录作为参数
-    python main.py -dir ./instance/$dial_folder
-done
\ No newline at end of file