From: 袁清梦 <3449750381@qq.com> Date: Fri, 16 Aug 2024 07:37:53 +0000 (+0000) Subject: Merge #706 into sdk602patch0626 from refs/changes/706/head X-Git-Tag: release_V1.2.70_20241020_135402~653^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=96247ce4462bc9271b7ba719261005d1864b9db6;p=mirrors%2FFD230.git Merge #706 into sdk602patch0626 from refs/changes/706/head Code review from 袁清梦 * refs/changes/706/head: (10 commits squashed) - 更新主界面心率卡片UI - 增加当日历史心率数据处理 - 同步心率UI资源文件更新 - 更新多国语言脚本 实现自动copy - ● 修改卡片管理样式与figma保持一致纵向 ● 增加卡片管理表冠控制 ● 增加卡片管理滑动条效果 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - 修复脚本的路径问题 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/706 --- diff --git a/tools/language_tool/make_language.sh b/tools/language_tool/make_language.sh index 18705d3aa..fddddbc3d 100644 --- a/tools/language_tool/make_language.sh +++ b/tools/language_tool/make_language.sh @@ -2,7 +2,7 @@ ### # @Date: 2024-07-11 20:53:59 # @LastEditors: Caisking 3449750381@qq.com - # @LastEditTime: 2024-08-15 15:59:04 + # @LastEditTime: 2024-08-16 10:20:31 # @FilePath: /FD230/tools/language_tool/make_language.sh ### @@ -27,10 +27,10 @@ python language_trans.py ../Language_xml/ ../font/ ../font/ echo "脚本生成文件执行完成。" #复制头文件 -cp ./font/ui_resource_string.h ../../../code/sdk/application/wearable/fd230app/nativelauncher/include/ +cp ../font/ui_resource_string.h ../../../code/sdk/application/wearable/fd230app/nativelauncher/include/ #复制资源文件 -cp -r ./font ../../../code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ +cp -r ../font ../../../code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ # 打印完成信息 echo "脚本复制文件执行完成。" \ No newline at end of file