罗正 [Tue, 27 Aug 2024 10:11:48 +0000 (10:11 +0000)]
Merge #789 into sdk602patch0626 from refs/changes/789/head
Code review from 罗正
* refs/changes/789/head: (21 commits squashed)
- 更改下拉蓝牙图标
添加睡眠图标更新函数，还未适配接口等待联调
- 1.修复applist心率图标大小不一致问题，修复卡片管理图片为透明背景
2.将applist中勿扰，卡片管理，更换表盘，省电模式移动到setting
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 添加按键拦截功能(目前只在function键双击添加)，若intercept_slice_ids数组中有给定的VIEWID则不触发该事件
- 修复设置视图死机问题
- 语言界面第一次启动逻辑修改
- 录音界面修改
- 解决指南针Slice内存泄漏
- 修复勿扰模式Slice图标消失问题
- 修复a2dp连接时候音乐播放器界面刷新死机问题
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- ConfigModel中取消保存系统音量和通话音量
- 解决点击4G开关点击死机问题
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 1.下拉菜单添加更新蓝牙，4G图标状态函数
2.开启和关闭蓝牙和4G和勿扰操作类似，都为未开启进入视图开启，关闭则可直接快捷关闭
- 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: 罗正 <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/789
cheng [Tue, 27 Aug 2024 09:57:25 +0000 (17:57 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Tue, 27 Aug 2024 09:46:08 +0000 (17:46 +0800)]
更换SOS与关机图标位置
hcj [Tue, 27 Aug 2024 09:36:55 +0000 (17:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 27 Aug 2024 09:36:34 +0000 (17:36 +0800)]
关机从重启替换成SOS
cheng [Tue, 27 Aug 2024 08:50:11 +0000 (16:50 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
cheng [Tue, 27 Aug 2024 08:48:43 +0000 (16:48 +0800)]
睡眠模式字符串图片资源；优化日程
袁清梦 [Tue, 27 Aug 2024 07:57:29 +0000 (07:57 +0000)]
Merge #800 into sdk602patch0626 from refs/changes/800/head
Code review from 袁清梦
* refs/changes/800/head: (2 commits squashed)
- 修改呼吸训练UI与设计同步；增加呼吸训练状态改变的震动效果
- Merge branch 'sdk602patch0626' 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/800
cheng [Tue, 27 Aug 2024 07:50:01 +0000 (15:50 +0800)]
移除睡眠监测触发睡眠模式；配置睡眠模式config value & runtime value
cheng [Tue, 27 Aug 2024 07:46:07 +0000 (15:46 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
程羽飞 [Tue, 27 Aug 2024 03:38:01 +0000 (03:38 +0000)]
Merge #796 into sdk602patch0626 from refs/changes/796/head
Code review from 程羽飞
* refs/changes/796/head: (2 commits squashed)
- 日程UI优化、数据存储及读取
- Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Signed-off-by: dingtalk_kaxuzp <2393524978@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/796
hcj [Tue, 27 Aug 2024 02:13:47 +0000 (10:13 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 27 Aug 2024 02:13:29 +0000 (10:13 +0800)]
活动每日目标语言文件提交
cheng [Mon, 26 Aug 2024 13:10:12 +0000 (21:10 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
cheng [Mon, 26 Aug 2024 13:09:52 +0000 (21:09 +0800)]
日程UI优化、数据存储及读取
Caisking [Mon, 26 Aug 2024 12:23:29 +0000 (20:23 +0800)]
修复自定义表盘刷新问题
Caisking [Mon, 26 Aug 2024 11:54:55 +0000 (19:54 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Mon, 26 Aug 2024 11:52:39 +0000 (19:52 +0800)]
获取表盘id修改
hcj [Mon, 26 Aug 2024 11:51:47 +0000 (19:51 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
袁清梦 [Mon, 26 Aug 2024 11:48:20 +0000 (11:48 +0000)]
Merge #791 into sdk602patch0626 from refs/changes/791/head
Code review from 袁清梦
* refs/changes/791/head: (3 commits squashed)
- 屏蔽不使用的字体注册
- 修改自定义表盘可配置Id(1~5)
- 关闭表盘Model类型打印
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/791
胡传军 [Mon, 26 Aug 2024 11:47:37 +0000 (11:47 +0000)]
Merge #792 into sdk602patch0626 from refs/changes/792/head
Code review from 胡传军
* refs/changes/792/head: (2 commits squashed)
- 自定义表盘下载修复
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
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/792
SnickerSun [Mon, 26 Aug 2024 11:46:54 +0000 (19:46 +0800)]
修复4G 开关点击死机问题
SnickerSun [Mon, 26 Aug 2024 11:46:37 +0000 (19:46 +0800)]
添加勿扰图标
hcj [Mon, 26 Aug 2024 11:18:20 +0000 (19:18 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Mon, 26 Aug 2024 11:18:08 +0000 (19:18 +0800)]
自定义表盘下载修复
Caisking [Mon, 26 Aug 2024 11:18:01 +0000 (19:18 +0800)]
关闭表盘Model类型打印
Caisking [Mon, 26 Aug 2024 11:17:22 +0000 (19:17 +0800)]
修改自定义表盘可配置Id(1~5)
Caisking [Mon, 26 Aug 2024 11:16:36 +0000 (19:16 +0800)]
屏蔽不使用的字体注册
SnickerSun [Mon, 26 Aug 2024 10:37:22 +0000 (18:37 +0800)]
指南针内存泄露
SnickerSun [Mon, 26 Aug 2024 10:32:18 +0000 (18:32 +0800)]
解决a2dp连接时音乐播放器状态刷新导致死机
hcj [Mon, 26 Aug 2024 06:38:08 +0000 (14:38 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Mon, 26 Aug 2024 06:37:25 +0000 (14:37 +0800)]
电话中UI增加多国语言
彭磊 [Mon, 26 Aug 2024 06:21:03 +0000 (06:21 +0000)]
Merge #786 into sdk602patch0626 from refs/changes/786/head
Code review from 彭磊
* refs/changes/786/head: (3 commits squashed)
- 修改蓝牙广播模式,降低广播功耗
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 修改蓝牙广播模式,降低广播功耗(补)
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/786
hcj [Mon, 26 Aug 2024 03:43:49 +0000 (11:43 +0800)]
增加多国语言电话UI
Caisking [Mon, 26 Aug 2024 03:02:35 +0000 (11:02 +0800)]
更新VIEW_ID
Caisking [Mon, 26 Aug 2024 02:57:55 +0000 (10:57 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Mon, 26 Aug 2024 01:53:55 +0000 (09:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Mon, 26 Aug 2024 01:53:33 +0000 (09:53 +0800)]
增加无法呼叫sos弹窗
彭磊 [Mon, 26 Aug 2024 00:54:31 +0000 (00:54 +0000)]
Merge #784 into sdk602patch0626 from refs/changes/784/head
修改蓝牙广播模式,降低广播功耗
* refs/changes/784/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/784
罗正 [Mon, 26 Aug 2024 00:53:50 +0000 (00:53 +0000)]
Merge #783 into sdk602patch0626 from refs/changes/783/head
Code review from 罗正
* refs/changes/783/head: (6 commits squashed)
- 更改下拉蓝牙图标
添加睡眠图标更新函数，还未适配接口等待联调
- 1.修复applist心率图标大小不一致问题，修复卡片管理图片为透明背景
2.将applist中勿扰，卡片管理，更换表盘，省电模式移动到setting
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 添加按键拦截功能(目前只在function键双击添加)，若intercept_slice_ids数组中有给定的VIEWID则不触发该事件
- 修复设置视图死机问题
- 语言界面第一次启动逻辑修改
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/783
cheng [Sat, 24 Aug 2024 11:25:13 +0000 (19:25 +0800)]
schedule ui
cheng [Sat, 24 Aug 2024 10:38:49 +0000 (18:38 +0800)]
str
cheng [Sat, 24 Aug 2024 09:29:58 +0000 (17:29 +0800)]
str
cheng [Sat, 24 Aug 2024 09:20:51 +0000 (17:20 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 24 Aug 2024 03:04:38 +0000 (11:04 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Sat, 24 Aug 2024 03:03:40 +0000 (11:03 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Sat, 24 Aug 2024 03:03:32 +0000 (11:03 +0800)]
移动入库软件默认开启4G
Caisking [Sat, 24 Aug 2024 02:56:47 +0000 (10:56 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
cheng [Sat, 24 Aug 2024 02:47:11 +0000 (10:47 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Sat, 24 Aug 2024 02:40:19 +0000 (10:40 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Sat, 24 Aug 2024 02:40:00 +0000 (10:40 +0800)]
自定义表盘增加保存配置文件接口
Caisking [Sat, 24 Aug 2024 02:04:01 +0000 (10:04 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Fri, 23 Aug 2024 22:09:29 +0000 (06:09 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Fri, 23 Aug 2024 22:09:16 +0000 (06:09 +0800)]
通过宏控制 电信volte开关
SnickerSun [Fri, 23 Aug 2024 10:56:22 +0000 (18:56 +0800)]
release V1.1.37
胡传军 [Fri, 23 Aug 2024 10:49:17 +0000 (10:49 +0000)]
Merge #778 into sdk602patch0626 from refs/changes/778/head
修复自定义表盘下载问题
* refs/changes/778/head: (1 commits squashed)
- 修复自定义表盘下载问题
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/778
luozheng [Fri, 23 Aug 2024 10:40:13 +0000 (18:40 +0800)]
纠正录音保存文件名不带空格
luozheng [Fri, 23 Aug 2024 10:36:45 +0000 (18:36 +0800)]
网络与通话添加宏判断电信有VoLTE开关，移动无VoLTE开关
hcj [Fri, 23 Aug 2024 10:36:28 +0000 (18:36 +0800)]
修复自定义表盘下载问题
luozheng [Fri, 23 Aug 2024 08:50:47 +0000 (16:50 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 23 Aug 2024 08:50:41 +0000 (16:50 +0800)]
下拉界面添加HD图标显示
cheng [Fri, 23 Aug 2024 08:15:42 +0000 (16:15 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Fri, 23 Aug 2024 08:13:54 +0000 (16:13 +0800)]
增加SOS功能（补)
cheng [Fri, 23 Aug 2024 08:13:44 +0000 (16:13 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Fri, 23 Aug 2024 08:03:58 +0000 (16:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Fri, 23 Aug 2024 08:03:39 +0000 (16:03 +0800)]
增加SOS功能
luozheng [Fri, 23 Aug 2024 08:01:53 +0000 (16:01 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 23 Aug 2024 08:00:27 +0000 (16:00 +0800)]
连接状态视图语言资源提交
程羽飞 [Fri, 23 Aug 2024 07:59:57 +0000 (07:59 +0000)]
Merge #773 into sdk602patch0626 from refs/changes/773/head
schedule list
* refs/changes/773/head: (1 commits squashed)
- schedule list
Signed-off-by: dingtalk_kaxuzp <2393524978@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/773
袁清梦 [Fri, 23 Aug 2024 07:59:04 +0000 (07:59 +0000)]
Merge #774 into sdk602patch0626 from refs/changes/774/head
Code review from 袁清梦
* refs/changes/774/head: (3 commits squashed)
- 修复省电模式表盘界面按键退出的异常
- Merge branch 'sdk602patch0626' 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/774
luozheng [Fri, 23 Aug 2024 07:37:23 +0000 (15:37 +0800)]
进入密码锁界面后按按键拦截再次进入
luozheng [Fri, 23 Aug 2024 07:32:17 +0000 (15:32 +0800)]
下拉界面优化修改：勿扰模式需开启进入该Slice，关闭则在下拉界面快捷关闭
Caisking [Fri, 23 Aug 2024 06:46:43 +0000 (14:46 +0800)]
修复心率检测界面刷新异常
luozheng [Fri, 23 Aug 2024 06:33:46 +0000 (14:33 +0800)]
1. 修改手表恢复出厂默认选择语言为zh
cheng [Fri, 23 Aug 2024 04:28:50 +0000 (12:28 +0800)]
schedule list
luozheng [Fri, 23 Aug 2024 03:54:09 +0000 (11:54 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 23 Aug 2024 03:53:06 +0000 (11:53 +0800)]
优化下拉星期显示，若当前系统为中文则显示中文，否则用星期的缩写表示
如：ch:星期五 other：Fri
Caisking [Fri, 23 Aug 2024 03:08:02 +0000 (11:08 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 23 Aug 2024 03:07:58 +0000 (11:07 +0800)]
修复省电模式表盘界面按键退出的异常
hcj [Fri, 23 Aug 2024 03:06:08 +0000 (11:06 +0800)]
修复弹窗可能无法显示BUG
luozheng [Fri, 23 Aug 2024 02:38:51 +0000 (10:38 +0800)]
解决下拉信号格显示错误问题
hcj [Fri, 23 Aug 2024 01:59:00 +0000 (09:59 +0800)]
调整日程蓝牙协议部分增加结束标志
cheng [Thu, 22 Aug 2024 13:20:05 +0000 (21:20 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
cheng [Thu, 22 Aug 2024 13:19:52 +0000 (21:19 +0800)]
schedule file
Caisking [Thu, 22 Aug 2024 13:00:11 +0000 (21:00 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Thu, 22 Aug 2024 13:00:05 +0000 (21:00 +0800)]
密码锁死机优化待测试
cheng [Thu, 22 Aug 2024 11:43:03 +0000 (19:43 +0800)]
schedule file
SnickerSun [Thu, 22 Aug 2024 11:22:22 +0000 (19:22 +0800)]
release V1.1.36
luozheng [Thu, 22 Aug 2024 11:04:07 +0000 (19:04 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Thu, 22 Aug 2024 11:03:06 +0000 (19:03 +0800)]
下拉界面优化更新
luozheng [Thu, 22 Aug 2024 10:32:36 +0000 (18:32 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Thu, 22 Aug 2024 10:28:00 +0000 (18:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Thu, 22 Aug 2024 10:27:56 +0000 (18:27 +0800)]
优化密码锁界面回退主界面功能
SnickerSun [Thu, 22 Aug 2024 10:07:22 +0000 (18:07 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Thu, 22 Aug 2024 10:05:53 +0000 (18:05 +0800)]
gitdiff.sh 添加diff最后存放路径打印
邓雪英 [Thu, 22 Aug 2024 10:04:36 +0000 (10:04 +0000)]
Merge #763 into sdk602patch0626 from refs/changes/763/head
Code review from 邓雪英
* refs/changes/763/head: (8 commits squashed)
- CAT1的TCP文件传输
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 修改文件名
- 删除文件名
- 优化CAT1文件升级：删除不必要的打印
- 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: d15521469561 <1731678236@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/763
hcj [Thu, 22 Aug 2024 09:52:36 +0000 (17:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Thu, 22 Aug 2024 09:52:25 +0000 (17:52 +0800)]
弹窗增加优先级判定
Caisking [Thu, 22 Aug 2024 09:47:58 +0000 (17:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Thu, 22 Aug 2024 09:45:14 +0000 (17:45 +0800)]
修复密码锁界面点击显示异常
projects / mirrors / FD230.git / log