mirrors/FD230.git
2 years agoMerge #977 into sdk602patch0626 from refs/changes/977/head 979/target/1
罗正 [Wed, 18 Sep 2024 02:52:42 +0000 (02:52 +0000)]
Merge #977 into sdk602patch0626 from refs/changes/977/head

Code review from 罗正

* refs/changes/977/head: (8 commits squashed)

  - #524,解决:录音删除,删除后不是返回到录音列表界面,返回的是录音界面bug
    #658,解决,手表,录音频繁点击会有蓝色效果

  - #656,解决,手表,闹钟偶现0000闹钟提醒bug

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 4G界面添加“注:启用4G,可能会加速消耗电量”提醒

  -  运动识别界面添加提醒标签,#192,解决,运动识别界面单一bug

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 根据禅道上期望:APP查找手表和闹钟,勿扰睡眠静音模式下都有响铃和震动提醒
    #421解决, 睡眠模式,闹钟无响铃震动bug

  - 解决静音模式错误开启后会全局静音bug,根据禅道期望“来电铃声、短信消息提醒,勿扰睡眠静音模式下只有亮屏提醒”

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/977
2 years agoMerge #978 into sdk602patch0626 from refs/changes/978/head
袁清梦 [Wed, 18 Sep 2024 02:28:23 +0000 (02:28 +0000)]
Merge #978 into sdk602patch0626 from refs/changes/978/head

安全模式:下载修复文件增加repari_file_start接口

* refs/changes/978/head: (7 commits squashed)

  - 安全模式:下载修复文件增加repari_file_start接口

  - 心率:增加心率动画的资源文件

  - 心率:修改心率UI;增加上一次检测数据以及检测间隔

  - 心率:同步心率卡片更新

  - 心率:修复心率卡片显示异常

  - 心率:心率动画修改

  - 心率:使用图片icon替换动画

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/978
2 years ago修复通话记录存在的内存泄漏(补) 976/3 976/head
hcj [Wed, 18 Sep 2024 02:01:57 +0000 (10:01 +0800)]
修复通话记录存在的内存泄漏(补)

2 years ago修复通话记录存在的内存泄漏 976/2
hcj [Sat, 14 Sep 2024 09:30:04 +0000 (17:30 +0800)]
修复通话记录存在的内存泄漏

2 years ago日历修复(补 ) 976/1
hcj [Sat, 14 Sep 2024 08:31:30 +0000 (16:31 +0800)]
日历修复(补 )

2 years agoRevert "给project cm,ct,z1,fd230,obu 同步0911的静态库 976/target/1 977/target/1 978/target/1
snickersun@163.com [Sat, 14 Sep 2024 07:19:43 +0000 (15:19 +0800)]
Revert "给project cm,ct,z1,fd230,obu 同步0911的静态库
"

2 years agoRevert "更新sdk602 patch 0812 to 0911
snickersun@163.com [Sat, 14 Sep 2024 07:19:27 +0000 (15:19 +0800)]
Revert "更新sdk602 patch 0812 to 0911
"

2 years ago优化创建睡眠文件夹(补交) 975/2 975/head 980/target/1
penglei [Sat, 14 Sep 2024 07:05:25 +0000 (15:05 +0800)]
优化创建睡眠文件夹(补交)

2 years ago优化睡眠模式文件存储,优化读取cywee密钥 975/1
penglei [Sat, 14 Sep 2024 06:29:01 +0000 (14:29 +0800)]
优化睡眠模式文件存储,优化读取cywee密钥

2 years ago给project cm,ct,z1,fd230,obu 同步0911的静态库 974/1 974/head 975/target/1
SnickerSun [Sat, 14 Sep 2024 06:05:52 +0000 (14:05 +0800)]
给project cm,ct,z1,fd230,obu 同步0911的静态库

2 years ago更新sdk602 patch 0812 to 0911 973/1 973/head 974/target/1
SnickerSun [Sat, 14 Sep 2024 05:53:41 +0000 (13:53 +0800)]
更新sdk602 patch 0812 to 0911

2 years agoCat1 升级脚本到PY_OTA_V13 支持 接听和挂断电话带 电话号
SnickerSun [Sat, 14 Sep 2024 05:52:12 +0000 (13:52 +0800)]
Cat1 升级脚本到PY_OTA_V13 支持 接听和挂断电话带 电话号

2 years ago修复ble广播无法关闭BUG 972/3 972/head 973/target/1
hcj [Sat, 14 Sep 2024 04:07:15 +0000 (12:07 +0800)]
修复ble广播无法关闭BUG

2 years ago系统升级更改 BUG先延期,后续再统一修复(补) 972/2
hcj [Sat, 14 Sep 2024 03:32:06 +0000 (11:32 +0800)]
系统升级更改 BUG先延期,后续再统一修复(补)

2 years ago系统升级更改 BUG先延期,后续再统一修复 972/1
hcj [Sat, 14 Sep 2024 03:30:51 +0000 (11:30 +0800)]
系统升级更改 BUG先延期,后续再统一修复

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 971/1 971/head 972/target/1
hcj [Sat, 14 Sep 2024 01:59:08 +0000 (09:59 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago日历修改
hcj [Sat, 14 Sep 2024 01:58:55 +0000 (09:58 +0800)]
日历修改

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 970/1 970/head 971/target/1
Caisking [Fri, 13 Sep 2024 13:28:32 +0000 (21:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago安全模式:增加资源文件修复功能
Caisking [Fri, 13 Sep 2024 13:28:12 +0000 (21:28 +0800)]
安全模式:增加资源文件修复功能

2 years agorelease V1.1.50 1068/target/1 969/1 969/head 970/target/1
SnickerSun [Fri, 13 Sep 2024 11:08:34 +0000 (19:08 +0800)]
release V1.1.50

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 968/1 968/head 969/target/1
luozheng [Fri, 13 Sep 2024 11:05:33 +0000 (19:05 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago#662,解决手表,手电筒设置,5个灯光颜色都选择一遍,灯光颜色不会改变bug
luozheng [Fri, 13 Sep 2024 11:05:23 +0000 (19:05 +0800)]
#662,解决手表,手电筒设置,5个灯光颜色都选择一遍,灯光颜色不会改变bug

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 967/1 967/head 968/target/1
penglei [Fri, 13 Sep 2024 11:00:57 +0000 (19:00 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago添加mac密钥,chipinfo激活转为mac激活
penglei [Fri, 13 Sep 2024 11:00:45 +0000 (19:00 +0800)]
添加mac密钥,chipinfo激活转为mac激活

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 13 Sep 2024 10:34:06 +0000 (18:34 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago通话音量修改为PhoneService中接口
luozheng [Fri, 13 Sep 2024 10:33:58 +0000 (18:33 +0800)]
通话音量修改为PhoneService中接口

2 years ago修复不define LEANTEST 时的编译问题 966/1 966/head 967/target/1
SnickerSun [Fri, 13 Sep 2024 10:32:46 +0000 (18:32 +0800)]
修复不define LEANTEST 时的编译问题

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Fri, 13 Sep 2024 10:17:29 +0000 (18:17 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修改音量映射(补交) 965/2 965/head 966/target/1
penglei [Fri, 13 Sep 2024 10:14:10 +0000 (18:14 +0800)]
修改音量映射(补交)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 965/1
penglei [Fri, 13 Sep 2024 09:51:30 +0000 (17:51 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化睡眠模式初始化流程与时间戳计算
penglei [Fri, 13 Sep 2024 09:51:18 +0000 (17:51 +0800)]
优化睡眠模式初始化流程与时间戳计算
睡眠UI增加查看当前睡眠数据功能
增加蓝牙通话与4G通话音量映射
增加PING网站的蓝牙指令
优化运动配速数据计算

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Fri, 13 Sep 2024 09:50:16 +0000 (17:50 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago添加数字钱包库测试程序
SnickerSun [Fri, 13 Sep 2024 09:50:08 +0000 (17:50 +0800)]
添加数字钱包库测试程序

2 years agoMerge #964 into sdk602patch0626 from refs/changes/964/head 965/target/1
罗正 [Fri, 13 Sep 2024 09:48:14 +0000 (09:48 +0000)]
Merge #964 into sdk602patch0626 from refs/changes/964/head

Code review from 罗正

* refs/changes/964/head: (21 commits squashed)

  - 闹钟UI优化:
    1.#636,解决,手表,闹钟只响铃3次bug
    2.闹钟编辑界面优化
    3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun

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

  - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug

  - 解决#534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug
    修改闹钟弹窗无操作50s后自动关闭

  - #642,解决:删除多余闹钟后,界面不能显示剩余闹钟bug

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

  - #370,解决:下拉状态栏中,开启4G开关,停留在下拉菜单中,信号格状态不刷新(息屏时不会刷新)bug
    #618,解决:4G开关开启,重启手表,4G开关状态颜色响应比较慢bug

  - #639,解决:设置-图标不圆,有缺失,勿扰模式,更换卡片,省电模式bug

  - #154,解决:手表端超时不操作后,绑定请求会继续留在手表界面bug

  - 6.天气界面UI修改,与figma上设计保持一致

  - 优化弧形列表,调整应用之间间隔,调整文字对齐为左对齐

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

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

  - #663,解决:手表,APP开启消息提醒后,手表喝水提醒不弹窗bug

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

  - #644,解决,计时器显示问题bug
    #645,解决,  计时器显示错误bug

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

  - #661,解决,手表,天气天气图标显示多云,文字显示中雨bug

  - 闹钟界面多国语言资源添加

  - 闹钟界面适配多国语言

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/964
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 13 Sep 2024 09:46:51 +0000 (17:46 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago流畅感优化 #500 963/2 963/head
hcj [Fri, 13 Sep 2024 09:29:24 +0000 (17:29 +0800)]
流畅感优化 #500

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 964/1 964/head
luozheng [Fri, 13 Sep 2024 08:26:24 +0000 (16:26 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago闹钟界面适配多国语言
luozheng [Fri, 13 Sep 2024 08:26:09 +0000 (16:26 +0800)]
闹钟界面适配多国语言

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 13 Sep 2024 08:13:46 +0000 (16:13 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 963/1
hcj [Fri, 13 Sep 2024 07:59:02 +0000 (15:59 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago传输界面增加提示 #668
hcj [Fri, 13 Sep 2024 07:58:44 +0000 (15:58 +0800)]
传输界面增加提示 #668

2 years ago闹钟界面多国语言资源添加
luozheng [Fri, 13 Sep 2024 07:54:33 +0000 (15:54 +0800)]
闹钟界面多国语言资源添加

2 years agoMerge #962 into sdk602patch0626 from refs/changes/962/head 963/target/1 964/target/1
罗正 [Fri, 13 Sep 2024 07:30:45 +0000 (07:30 +0000)]
Merge #962 into sdk602patch0626 from refs/changes/962/head

Code review from 罗正

* refs/changes/962/head: (18 commits squashed)

  - 闹钟UI优化:
    1.#636,解决,手表,闹钟只响铃3次bug
    2.闹钟编辑界面优化
    3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun

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

  - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug

  - 解决#534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug
    修改闹钟弹窗无操作50s后自动关闭

  - #642,解决:删除多余闹钟后,界面不能显示剩余闹钟bug

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

  - #370,解决:下拉状态栏中,开启4G开关,停留在下拉菜单中,信号格状态不刷新(息屏时不会刷新)bug
    #618,解决:4G开关开启,重启手表,4G开关状态颜色响应比较慢bug

  - #639,解决:设置-图标不圆,有缺失,勿扰模式,更换卡片,省电模式bug

  - #154,解决:手表端超时不操作后,绑定请求会继续留在手表界面bug

  - 6.天气界面UI修改,与figma上设计保持一致

  - 优化弧形列表,调整应用之间间隔,调整文字对齐为左对齐

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

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

  - #663,解决:手表,APP开启消息提醒后,手表喝水提醒不弹窗bug

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

  - #644,解决,计时器显示问题bug
    #645,解决,  计时器显示错误bug

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

  - #661,解决,手表,天气天气图标显示多云,文字显示中雨bug

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/962
2 years ago修复每日目标数据刷新 #53 #54 961/2 961/head
hcj [Fri, 13 Sep 2024 06:54:08 +0000 (14:54 +0800)]
修复每日目标数据刷新 #53 #54

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 961/1
hcj [Fri, 13 Sep 2024 04:07:24 +0000 (12:07 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago计算器综合修改 #186
hcj [Fri, 13 Sep 2024 04:07:14 +0000 (12:07 +0800)]
计算器综合修改 #186

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 13 Sep 2024 03:48:56 +0000 (11:48 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago#661,解决,手表,天气天气图标显示多云,文字显示中雨bug 962/1 962/head
luozheng [Fri, 13 Sep 2024 02:45:19 +0000 (10:45 +0800)]
#661,解决,手表,天气天气图标显示多云,文字显示中雨bug

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 13 Sep 2024 02:07:16 +0000 (10:07 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago#644,解决,计时器显示问题bug
luozheng [Fri, 13 Sep 2024 02:07:06 +0000 (10:07 +0800)]
#644,解决,计时器显示问题bug
#645,解决,  计时器显示错误bug

2 years agoMerge #959 into sdk602patch0626 from refs/changes/959/head 961/target/1 962/target/1
胡传军 [Fri, 13 Sep 2024 01:47:52 +0000 (01:47 +0000)]
Merge #959 into sdk602patch0626 from refs/changes/959/head

Code review from 胡传军

* refs/changes/959/head: (3 commits squashed)

  - 计步有遮挡 #685

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

  - 修复通话号码过长显示问题 二级拨号盘点击特效问题 #508 #676 #488

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/959
2 years ago更新modem固件 PY_OTA_V12 960/1 960/head
SnickerSun [Fri, 13 Sep 2024 01:30:13 +0000 (09:30 +0800)]
更新modem固件 PY_OTA_V12

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 13 Sep 2024 01:22:34 +0000 (09:22 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复通话号码过长显示问题 二级拨号盘点击特效问题 #508 #676 #488 959/2 959/head
hcj [Thu, 12 Sep 2024 13:18:03 +0000 (21:18 +0800)]
修复通话号码过长显示问题 二级拨号盘点击特效问题 #508 #676 #488

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 959/1
hcj [Thu, 12 Sep 2024 13:12:09 +0000 (21:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 12 Sep 2024 13:11:59 +0000 (21:11 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago计步有遮挡 #685
hcj [Thu, 12 Sep 2024 13:11:57 +0000 (21:11 +0800)]
计步有遮挡 #685

2 years ago#663,解决:手表,APP开启消息提醒后,手表喝水提醒不弹窗bug
luozheng [Thu, 12 Sep 2024 13:11:42 +0000 (21:11 +0800)]
#663,解决:手表,APP开启消息提醒后,手表喝水提醒不弹窗bug

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 958/1 958/head 959/target/1 960/target/1
SnickerSun [Thu, 12 Sep 2024 12:58:18 +0000 (20:58 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 957/2
SnickerSun [Thu, 12 Sep 2024 12:56:44 +0000 (20:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago删除不必预先生成的ConfigModel.json
SnickerSun [Thu, 12 Sep 2024 12:56:28 +0000 (20:56 +0800)]
删除不必预先生成的ConfigModel.json

2 years agorelease V1.1.49 957/1 957/3 957/head 958/target/1
SnickerSun [Thu, 12 Sep 2024 12:41:51 +0000 (20:41 +0800)]
release V1.1.49

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 12 Sep 2024 12:41:21 +0000 (20:41 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 12 Sep 2024 12:30:45 +0000 (20:30 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago安全模式:修复错误的配置 955/2 955/head 957/target/1
Caisking [Thu, 12 Sep 2024 12:26:29 +0000 (20:26 +0800)]
安全模式:修复错误的配置

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 955/1
Caisking [Thu, 12 Sep 2024 12:21:51 +0000 (20:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago安全模式:优化repair界面配置
Caisking [Thu, 12 Sep 2024 12:21:42 +0000 (20:21 +0800)]
安全模式:优化repair界面配置

2 years ago闹钟定时器:删除在原闹钟定时器里面的安全模式处理
Caisking [Thu, 12 Sep 2024 12:11:59 +0000 (20:11 +0800)]
闹钟定时器:删除在原闹钟定时器里面的安全模式处理

2 years ago安全模式:增加修复文件状态以及对应管理接口
Caisking [Thu, 12 Sep 2024 12:11:25 +0000 (20:11 +0800)]
安全模式:增加修复文件状态以及对应管理接口

2 years agoMerge #952 into sdk602patch0626 from refs/changes/952/head 955/target/1
罗正 [Thu, 12 Sep 2024 12:10:58 +0000 (12:10 +0000)]
Merge #952 into sdk602patch0626 from refs/changes/952/head

Code review from 罗正

* refs/changes/952/head: (13 commits squashed)

  - 闹钟UI优化:
    1.#636,解决,手表,闹钟只响铃3次bug
    2.闹钟编辑界面优化
    3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun

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

  - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug

  - 解决#534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug
    修改闹钟弹窗无操作50s后自动关闭

  - #642,解决:删除多余闹钟后,界面不能显示剩余闹钟bug

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

  - #370,解决:下拉状态栏中,开启4G开关,停留在下拉菜单中,信号格状态不刷新(息屏时不会刷新)bug
    #618,解决:4G开关开启,重启手表,4G开关状态颜色响应比较慢bug

  - #639,解决:设置-图标不圆,有缺失,勿扰模式,更换卡片,省电模式bug

  - #154,解决:手表端超时不操作后,绑定请求会继续留在手表界面bug

  - 6.天气界面UI修改,与figma上设计保持一致

  - 优化弧形列表,调整应用之间间隔,调整文字对齐为左对齐

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

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/952
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 12 Sep 2024 12:10:28 +0000 (20:10 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago安全模式:增加安全模式单独定时器进行安全模式所有状态监控
Caisking [Thu, 12 Sep 2024 12:10:28 +0000 (20:10 +0800)]
安全模式:增加安全模式单独定时器进行安全模式所有状态监控

2 years ago安全模式:优化资源校验列表显示
Caisking [Thu, 12 Sep 2024 12:09:53 +0000 (20:09 +0800)]
安全模式:优化资源校验列表显示

2 years agoMerge #953 into sdk602patch0626 from refs/changes/953/head
彭磊 [Thu, 12 Sep 2024 12:09:48 +0000 (12:09 +0000)]
Merge #953 into sdk602patch0626 from refs/changes/953/head

优化音量映射 暂时只处理本地媒体音

* refs/changes/953/head: (1 commits squashed)

  - 优化音量映射 暂时只处理本地媒体音

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/953
2 years ago安全模式:增加校验文件失败错误返回
Caisking [Thu, 12 Sep 2024 12:07:31 +0000 (20:07 +0800)]
安全模式:增加校验文件失败错误返回

2 years ago密码锁:增加屏幕管理相关状态日志打印
Caisking [Thu, 12 Sep 2024 12:06:57 +0000 (20:06 +0800)]
密码锁:增加屏幕管理相关状态日志打印

2 years ago安全模式:增加资源修复下载UI
Caisking [Thu, 12 Sep 2024 12:06:04 +0000 (20:06 +0800)]
安全模式:增加资源修复下载UI

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 954/1 954/head
hcj [Thu, 12 Sep 2024 12:06:03 +0000 (20:06 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加4G通话音量调节 及SIM改成大写 #606
hcj [Thu, 12 Sep 2024 12:05:49 +0000 (20:05 +0800)]
增加4G通话音量调节 及SIM改成大写 #606

2 years ago安全模式:增加修复下载runtime
Caisking [Thu, 12 Sep 2024 12:05:30 +0000 (20:05 +0800)]
安全模式:增加修复下载runtime

2 years ago优化音量映射 暂时只处理本地媒体音 953/1 953/head
penglei [Thu, 12 Sep 2024 11:53:13 +0000 (19:53 +0800)]
优化音量映射 暂时只处理本地媒体音

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 952/1 952/head
luozheng [Thu, 12 Sep 2024 11:49:55 +0000 (19:49 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 951/1 951/head 952/target/1 953/target/1 954/target/1
SnickerSun [Thu, 12 Sep 2024 11:48:43 +0000 (19:48 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago4G打开就阻断接收UART输入指令,解决4G干扰造成的uart死机
SnickerSun [Thu, 12 Sep 2024 11:46:32 +0000 (19:46 +0800)]
4G打开就阻断接收UART输入指令,解决4G干扰造成的uart死机

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 12 Sep 2024 11:35:42 +0000 (19:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化弧形列表,调整应用之间间隔,调整文字对齐为左对齐
luozheng [Thu, 12 Sep 2024 11:35:32 +0000 (19:35 +0800)]
优化弧形列表,调整应用之间间隔,调整文字对齐为左对齐

2 years ago优化cywee chipinfo转mac密钥激活(补交) 947/3 947/head 951/target/1
penglei [Thu, 12 Sep 2024 10:39:53 +0000 (18:39 +0800)]
优化cywee chipinfo转mac密钥激活(补交)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 947/2
penglei [Thu, 12 Sep 2024 10:28:39 +0000 (18:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化cywee chipinfo转mac密钥激活
penglei [Thu, 12 Sep 2024 10:28:32 +0000 (18:28 +0800)]
优化cywee chipinfo转mac密钥激活

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 12 Sep 2024 08:47:59 +0000 (16:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加资源修复界面
Caisking [Thu, 12 Sep 2024 08:47:53 +0000 (16:47 +0800)]
增加资源修复界面

2 years ago修复可能因2ae2 read值更新不及时,导致APP可能无法及时获取到最新表盘 #28 947/target/2 950/1 950/head
hcj [Thu, 12 Sep 2024 08:34:17 +0000 (16:34 +0800)]
修复可能因2ae2 read值更新不及时,导致APP可能无法及时获取到最新表盘 #28

2 years ago修复恢复出厂无法解绑 #323 #324 949/1 949/head 950/target/1
hcj [Thu, 12 Sep 2024 08:14:40 +0000 (16:14 +0800)]
修复恢复出厂无法解绑 #323 #324

2 years ago安全模式:恢复出厂删除文件操作修复
penglei [Thu, 12 Sep 2024 07:31:31 +0000 (15:31 +0800)]
安全模式:恢复出厂删除文件操作修复

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 948/1 948/head 949/target/1
hcj [Thu, 12 Sep 2024 03:57:47 +0000 (11:57 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago添加日历
hcj [Thu, 12 Sep 2024 03:57:22 +0000 (11:57 +0800)]
添加日历

2 years ago修复手表重启后不进入睡眠、小睡或久坐模式的BUG 947/1
penglei [Thu, 12 Sep 2024 03:47:01 +0000 (11:47 +0800)]
修复手表重启后不进入睡眠、小睡或久坐模式的BUG
修复BUG #220 手表耳机模式音乐,音量调节跨度太大,最小三格几乎没有声音,最大三格一格的声音都很明显
修复BUG #617 手表,抬碗亮屏太灵敏,小幅度转腕也会亮屏
添加睡眠标志文件存储
优化chipinfo转mac的change函数

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 12 Sep 2024 02:22:40 +0000 (10:22 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 946/1 946/head 947/target/1 948/target/1
SnickerSun [Thu, 12 Sep 2024 01:56:35 +0000 (09:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #944 into sdk602patch0626 from refs/changes/944/head 946/target/1
袁清梦 [Thu, 12 Sep 2024 01:56:24 +0000 (01:56 +0000)]
Merge #944 into sdk602patch0626 from refs/changes/944/head

Code review from 袁清梦

* refs/changes/944/head: (10 commits squashed)

  - 修复 训练健身类多余的项

  - #637手表,遥控拍照,APP先退出会导致手表卡死机(必现)

  - #389密码-最后一个数字没有动画效果

  - 修复密码锁的错误处理

  - #456睡眠界面,紫色进度条外面有刻度未遮挡完全

  - #657手表,运动-健身类-滑倒最底部点击,室内运动,黑屏后电源键无法唤醒问题

  - 睡眠进度条优化

  - 优化睡眠进度条背景的线条

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

  - 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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/944