SnickerSun [Wed, 5 Jun 2024 11:00:36 +0000 (19:00 +0800)]
同步代码
commit
29559b455d06414d9f375e9b9adae66388907667
优化移动入库，已完成移动入库测试默认是适配地址，待用户测试没有问题修改为商用地址必须手动更改代码
SnickerSun [Wed, 5 Jun 2024 08:41:34 +0000 (16:41 +0800)]
修正表盘配置，适配466x466分辨率，解决 万花筒表盘不工作问题
SnickerSun [Wed, 5 Jun 2024 08:38:39 +0000 (16:38 +0800)]
添加RTC时间测试指令 AT^TIMESYNC
SnickerSun [Wed, 5 Jun 2024 08:36:19 +0000 (16:36 +0800)]
优化电池曲线
SnickerSun [Tue, 4 Jun 2024 07:52:00 +0000 (15:52 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Tue, 4 Jun 2024 07:46:41 +0000 (15:46 +0800)]
根据 'SUPPORT_CHINA_MOBILE_DMP', 'SUPPORT_TELECOM_DMP', 判定 固件是移动还是电信入库版本，并在版本号后通过_CM , _CT字样做区分。
luozheng [Tue, 4 Jun 2024 07:20:19 +0000 (15:20 +0800)]
修改ConfigModel.h文件中部分枚举变量单词的拼写错误
luozheng [Tue, 4 Jun 2024 06:50:12 +0000 (14:50 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Tue, 4 Jun 2024 06:50:03 +0000 (14:50 +0800)]
1.喝水提醒弹窗增加右滑退出功能
2.修改ConfigModel.h文件中有关喝水提醒的枚举变量单词的拼写错误，增加其对应的set和get函数
SnickerSun [Tue, 4 Jun 2024 06:40:52 +0000 (14:40 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Tue, 4 Jun 2024 06:40:02 +0000 (14:40 +0800)]
同步 xts_origin cat1 入库提交:
commit
38d4e128ac840ca950a158a7bf671d374e0df921
移动入库未完善，待完善优化;添加py压缩文件
commit
07a4673939b3f4a0c71fc2204ddb38c706ac94df
添加中国移动入库.py文件 china_mobile_dmp.py
罗正 [Tue, 4 Jun 2024 03:49:10 +0000 (03:49 +0000)]
Merge #220 into sdk602patch0521 from refs/changes/220/head
Code review from 罗正
* refs/changes/220/head: (3 commits squashed)
- 优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接
- 久坐提醒添加右滑退出视图功能
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
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/220
luozheng [Tue, 4 Jun 2024 02:14:40 +0000 (10:14 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Tue, 4 Jun 2024 02:11:47 +0000 (10:11 +0800)]
久坐提醒添加右滑退出视图功能
SnickerSun [Mon, 3 Jun 2024 15:02:56 +0000 (23:02 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Mon, 3 Jun 2024 15:02:46 +0000 (23:02 +0800)]
1、lwip 添加 sntp,smtp,mbedtls 编译选项
2、取消cat1 gettime 指令, 改用 sntp标准网络方案同步时间
3、bleEvent里 采用和sntp相同的设置指令设置时间
4、custom_utils_at_cmd 修改ota_download为 https方案，暂时未调通。
SnickerSun [Mon, 3 Jun 2024 14:04:30 +0000 (22:04 +0800)]
解决刚刚开机时不触摸屏幕不息屏问题
袁清梦 [Mon, 3 Jun 2024 13:26:34 +0000 (13:26 +0000)]
Merge #218 into sdk602patch0521 from refs/changes/218/head
调整训练结束状态发送顺序
* refs/changes/218/head: (1 commits squashed)
- 调整训练结束状态发送顺序
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/218
罗正 [Mon, 3 Jun 2024 13:25:41 +0000 (13:25 +0000)]
Merge #217 into sdk602patch0521 from refs/changes/217/head
优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接
* refs/changes/217/head: (1 commits squashed)
- 优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接
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/217
luozheng [Mon, 3 Jun 2024 10:28:54 +0000 (18:28 +0800)]
优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接
penglei [Mon, 3 Jun 2024 07:24:35 +0000 (15:24 +0800)]
添加设置久坐提醒间隔功能，优化动态心率获取方法。
luozheng [Fri, 31 May 2024 15:43:59 +0000 (23:43 +0800)]
解决了applist列表显示方式不支持支持表观问题
SnickerSun [Fri, 31 May 2024 15:17:14 +0000 (23:17 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
snickersun@163.com [Fri, 31 May 2024 15:17:06 +0000 (15:17 +0000)]
Merge #212 into sdk602patch0521 from refs/changes/212/head
Code review from snickersun@163.com
* refs/changes/212/head: (4 commits squashed)
- 解决触摸屏触摸后无法休眠问题
- 解决表冠转动时仍然会息屏问题
- 修复ft6x46内存泄漏问题
- WEARABLE_LOG_DEBUG放到 config.py中，保证所有模块都受控。优化部分打印以及去掉无用代码
Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/212
SnickerSun [Fri, 31 May 2024 15:15:56 +0000 (23:15 +0800)]
WEARABLE_LOG_DEBUG放到 config.py中，保证所有模块都受控。优化部分打印以及去掉无用代码
SnickerSun [Fri, 31 May 2024 15:14:34 +0000 (23:14 +0800)]
修复ft6x46内存泄漏问题
SnickerSun [Fri, 31 May 2024 15:14:02 +0000 (23:14 +0800)]
解决表冠转动时仍然会息屏问题
SnickerSun [Fri, 31 May 2024 15:13:25 +0000 (23:13 +0800)]
解决触摸屏触摸后无法休眠问题
penglei [Fri, 31 May 2024 12:12:50 +0000 (20:12 +0800)]
解决表盘界面不显示步数的问题
luozheng [Fri, 31 May 2024 08:35:11 +0000 (16:35 +0800)]
applist 优化更新
luozheng [Fri, 31 May 2024 07:46:36 +0000 (15:46 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
penglei [Thu, 30 May 2024 12:33:30 +0000 (20:33 +0800)]
添加获取cywee chipinfo蓝牙产测指令
luozheng [Fri, 31 May 2024 07:00:40 +0000 (15:00 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Fri, 31 May 2024 07:00:30 +0000 (15:00 +0800)]
下拉视图 更新
SnickerSun [Fri, 31 May 2024 06:59:13 +0000 (14:59 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
snickersun@163.com [Fri, 31 May 2024 06:59:06 +0000 (06:59 +0000)]
Merge #204 into sdk602patch0521 from refs/changes/204/head
AT^PMMODEGET中直接打印出PM_ID的名字
* refs/changes/204/head: (2 commits squashed)
- AT^PMMODEGET中直接打印出PM_ID的名字
- 添加补丁解决trace无法用工具解析问题
Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/204
SnickerSun [Fri, 31 May 2024 06:56:14 +0000 (14:56 +0800)]
添加补丁解决trace无法用工具解析问题
luozheng [Thu, 30 May 2024 10:20:59 +0000 (18:20 +0800)]
添加久坐提醒图片
SnickerSun [Thu, 30 May 2024 09:19:15 +0000 (17:19 +0800)]
AT^PMMODEGET中直接打印出PM_ID的名字
luozheng [Thu, 30 May 2024 08:19:40 +0000 (16:19 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Thu, 30 May 2024 08:19:30 +0000 (16:19 +0800)]
settings 文件夹优化更新
penglei [Thu, 30 May 2024 07:34:14 +0000 (15:34 +0800)]
更新cywee算法，修改gsensor为中断模式，优化久坐提醒，优化next day触发机制。
SnickerSun [Thu, 30 May 2024 07:46:24 +0000 (15:46 +0800)]
添加短信解析分条例子数据，暂时解析有瑕疵，但数据完整
hcj_ [Thu, 30 May 2024 05:17:13 +0000 (13:17 +0800)]
修改步数同步协议
hcj_ [Wed, 29 May 2024 16:09:57 +0000 (00:09 +0800)]
整机产测蓝牙部分（得不到扫描结果，未能确认问题）
hcj_ [Wed, 29 May 2024 16:07:30 +0000 (00:07 +0800)]
增加步数数据整点存储及协议数据发送
luozheng [Thu, 30 May 2024 06:55:55 +0000 (14:55 +0800)]
rebootdevice 文件夹更新
hcj_ [Thu, 30 May 2024 06:03:19 +0000 (14:03 +0800)]
修改notif编译问题
SnickerSun [Thu, 30 May 2024 04:52:32 +0000 (12:52 +0800)]
更新cat1 蓝牙通讯协议解析，同时支持旧版和新版协议。
SnickerSun [Thu, 30 May 2024 01:52:26 +0000 (09:52 +0800)]
修复PSRAM 设置成16MB 时 不生效的问题。
SnickerSun [Wed, 29 May 2024 09:44:54 +0000 (17:44 +0800)]
cat1 server中添加sms解析
SnickerSun [Wed, 29 May 2024 08:19:54 +0000 (16:19 +0800)]
更新checkota.py到V7，支持多个python文件一起更新。
修复imei解析错误问题
SnickerSun [Wed, 29 May 2024 06:48:37 +0000 (14:48 +0800)]
添加短信PDU格式解析函数，并提供AT指令测试。
DXY [Wed, 29 May 2024 02:36:10 +0000 (10:36 +0800)]
修改SMS短信cmd格式
DXY [Wed, 29 May 2024 01:59:33 +0000 (09:59 +0800)]
CAT1增加SMS指令:添加python压缩文件
penglei [Tue, 28 May 2024 10:48:23 +0000 (18:48 +0800)]
解决gsensor fatal error与久坐提醒误报的问题，添加步数保存和午夜清零运动数据功能。
luozheng [Wed, 29 May 2024 08:12:33 +0000 (16:12 +0800)]
部分代码更新
luozheng [Wed, 29 May 2024 08:06:21 +0000 (16:06 +0800)]
该三个头文件需要胡工对比602patch修改，注释了一些函数以通过编译
luozheng [Wed, 29 May 2024 08:04:02 +0000 (16:04 +0800)]
删除不必要头文件
luozheng [Wed, 29 May 2024 06:56:57 +0000 (14:56 +0800)]
key 文件夹优化更新
luozheng [Wed, 29 May 2024 06:56:29 +0000 (14:56 +0800)]
phoneservice 文件夹更新
luozheng [Wed, 29 May 2024 04:45:12 +0000 (12:45 +0800)]
makephone 文件夹更新
luozheng [Wed, 29 May 2024 04:23:45 +0000 (12:23 +0800)]
callerlog 文件夹更新
luozheng [Tue, 28 May 2024 14:32:46 +0000 (22:32 +0800)]
修复部分更改
luozheng [Tue, 28 May 2024 13:52:03 +0000 (21:52 +0800)]
main 文件夹更新
luozheng [Tue, 28 May 2024 13:24:59 +0000 (21:24 +0800)]
alarmclockmanage 文件夹更改
luozheng [Tue, 28 May 2024 13:21:26 +0000 (21:21 +0800)]
alarmclocktimerconfig 文件夹更新
luozheng [Tue, 28 May 2024 13:19:44 +0000 (21:19 +0800)]
applist 文件夹修改
luozheng [Tue, 28 May 2024 13:00:25 +0000 (21:00 +0800)]
compass 文件夹更新
luozheng [Tue, 28 May 2024 12:54:32 +0000 (20:54 +0800)]
heartrate 文件夹更新
luozheng [Tue, 28 May 2024 12:50:17 +0000 (20:50 +0800)]
indoorwalk 文件夹修改
luozheng [Tue, 28 May 2024 12:45:42 +0000 (20:45 +0800)]
offlinevoice 文件夹更新
luozheng [Tue, 28 May 2024 12:35:45 +0000 (20:35 +0800)]
rtcservice 文件夹更新
luozheng [Tue, 28 May 2024 12:30:14 +0000 (20:30 +0800)]
screennotify 文件夹更新
luozheng [Tue, 28 May 2024 12:23:23 +0000 (20:23 +0800)]
screensetting 文件夹更新
luozheng [Tue, 28 May 2024 12:21:43 +0000 (20:21 +0800)]
set_card 文件夹更新
luozheng [Tue, 28 May 2024 12:14:49 +0000 (20:14 +0800)]
set_dial 文件夹更新
luozheng [Tue, 28 May 2024 12:05:07 +0000 (20:05 +0800)]
set_desktop 文件夹更新
luozheng [Tue, 28 May 2024 12:00:40 +0000 (20:00 +0800)]
设置视图修改
luozheng [Tue, 28 May 2024 11:51:52 +0000 (19:51 +0800)]
temperature 文件夹更新
luozheng [Tue, 28 May 2024 11:49:39 +0000 (19:49 +0800)]
uisample文件夹更新
luozheng [Tue, 28 May 2024 11:47:57 +0000 (19:47 +0800)]
uiservice 文件夹更新
luozheng [Tue, 28 May 2024 11:06:55 +0000 (19:06 +0800)]
alarm文件夹修改
luozheng [Tue, 28 May 2024 10:42:14 +0000 (18:42 +0800)]
add_card文件夹更新
luozheng [Tue, 28 May 2024 10:30:03 +0000 (18:30 +0800)]
activity文件夹更新
SnickerSun [Tue, 28 May 2024 07:11:12 +0000 (15:11 +0800)]
更新SDK到 patch_602_base_to_0521 ，只验证了nativeapp，fd230app 还未升级验证
SnickerSun [Mon, 27 May 2024 02:08:46 +0000 (10:08 +0800)]
添加表盘市场下载能力
SnickerSun [Sun, 26 May 2024 06:59:57 +0000 (14:59 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [Sat, 25 May 2024 08:06:30 +0000 (08:06 +0000)]
Merge #181 into xts_origin from refs/changes/181/head
Code review from 罗正
* refs/changes/181/head: (4 commits squashed)
- 1.添加查找手表，来电，闹钟的铃声，
2.修改查找手表的铃声为新添加铃声
3.，修改下来视图中RefreshData函数中注释错误
- 修改CustomEventPublish的第二和第三个参数，将c_activity_result_t更正为c_inactivity_result_t，以确保参数与实际类型匹配。
- 添加久坐视功能，久坐开关，久坐时间间隔，就做时间段设置需要协议配合设置
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
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/181
penglei [Sat, 25 May 2024 05:43:35 +0000 (13:43 +0800)]
修改gsensor为定时器模式
snickersun@163.com [Fri, 24 May 2024 13:58:36 +0000 (13:58 +0000)]
Merge #180 into xts_origin from refs/changes/180/head
添加 lzma dec 解压缩接口，目前试过解压缩单个压缩表盘。
* refs/changes/180/head: (1 commits squashed)
- 添加 lzma dec 解压缩接口，目前试过解压缩单个压缩表盘。
Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/180
SnickerSun [Fri, 24 May 2024 12:35:08 +0000 (20:35 +0800)]
协议接收函数已经验证，取消以前的接收方案
SnickerSun [Fri, 24 May 2024 12:18:32 +0000 (20:18 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Fri, 24 May 2024 12:15:47 +0000 (20:15 +0800)]
添加 lzma dec 解压缩接口，目前试过解压缩单个压缩表盘。
DXY [Fri, 24 May 2024 02:20:41 +0000 (10:20 +0800)]
添加python的固件包zip
DXY [Fri, 24 May 2024 02:12:36 +0000 (10:12 +0800)]
优化电信入库功能:
DXY [Thu, 23 May 2024 11:02:28 +0000 (19:02 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
DXY [Thu, 23 May 2024 11:02:23 +0000 (19:02 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Wed, 22 May 2024 08:58:29 +0000 (16:58 +0800)]
修复size为0的协议数据的处理
SnickerSun [Tue, 21 May 2024 16:18:03 +0000 (00:18 +0800)]
在新解析代码中添加android app的版本支持
cywee算法 stackoverflow，增加了stacksize 并放到EXT_MEM里
projects / mirrors / FD230.git / log