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:49:36 +0000 (14:49 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
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 02:00:51 +0000 (10:00 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
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与久坐提醒误报的问题，添加步数保存和午夜清零运动数据功能。
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里
luozheng [Fri, 17 May 2024 11:36:15 +0000 (19:36 +0800)]
优化手表二维码slice
luozheng [Fri, 17 May 2024 10:18:59 +0000 (18:18 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Fri, 17 May 2024 10:18:49 +0000 (18:18 +0800)]
增加喝水提醒ui还未对接协议
DXY [Fri, 17 May 2024 02:22:39 +0000 (10:22 +0800)]
电信入库添加EventMesh.PY文件
hcj_ [Thu, 16 May 2024 23:57:20 +0000 (07:57 +0800)]
修改读取通讯录时的异常判断(2)
hcj_ [Thu, 16 May 2024 23:54:17 +0000 (07:54 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
hcj_ [Thu, 16 May 2024 23:53:24 +0000 (07:53 +0800)]
修改读取通讯录时的异常判断
Caisking [Thu, 16 May 2024 16:49:52 +0000 (00:49 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 16 May 2024 16:45:24 +0000 (00:45 +0800)]
通过json数据适配训练记录
SnickerSun [Thu, 16 May 2024 16:22:06 +0000 (00:22 +0800)]
1、优化内存，解决蓝牙和音乐task启动失败问题
2、优化getUserInfo 蓝牙协议，解决同步死机问题
Caisking [Thu, 16 May 2024 13:15:08 +0000 (21:15 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Thu, 16 May 2024 12:32:51 +0000 (20:32 +0800)]
重构ble通讯协议接收代码，增加 ota文件接收，实现ota升级能力
SnickerSun [Thu, 16 May 2024 07:29:32 +0000 (15:29 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
penglei [Thu, 16 May 2024 06:11:03 +0000 (14:11 +0800)]
补交
penglei [Thu, 16 May 2024 03:36:58 +0000 (11:36 +0800)]
解决cywee中断不触发的问题
SnickerSun [Wed, 15 May 2024 08:55:57 +0000 (16:55 +0800)]
修改部分变量名称，优化打印信息，方便代码分析。
添加OTA json数据接收和解析。
DXY [Wed, 15 May 2024 08:51:20 +0000 (16:51 +0800)]
电信入库
SnickerSun [Tue, 14 May 2024 11:43:48 +0000 (19:43 +0800)]
给编译脚本增加固件参数。版本号根据蓝牙协议改为三位major，mid，minor。通过修改autobuild.sh 中DEFAULT_CUSTOM_FW_VERSION=1.0.0 来改变版本号。
Caisking [Tue, 14 May 2024 10:06:12 +0000 (18:06 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Tue, 14 May 2024 10:05:54 +0000 (18:05 +0800)]
增加训练json文件读取
hcj_ [Tue, 14 May 2024 08:28:07 +0000 (16:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
DXY [Tue, 14 May 2024 08:02:12 +0000 (16:02 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
DXY [Tue, 14 May 2024 08:01:35 +0000 (16:01 +0800)]
优化蓝牙相关协议内存死机问题:还有一个问题需要胡传军看一下这个函数set_user_data会大概率死机
hcj_ [Tue, 14 May 2024 07:52:25 +0000 (15:52 +0800)]
修改sprintf为sprintf_s
Caisking [Tue, 14 May 2024 06:47:19 +0000 (14:47 +0800)]
优化sprintf函数
hcj_ [Tue, 14 May 2024 06:32:27 +0000 (14:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Tue, 14 May 2024 05:28:13 +0000 (13:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Tue, 14 May 2024 02:57:51 +0000 (10:57 +0800)]
开机重置一次充电IC, 尝试确保电压过低系统无法正常完整启动的情况下，可以正常充电。
SnickerSun [Tue, 14 May 2024 01:33:10 +0000 (09:33 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Mon, 13 May 2024 08:31:44 +0000 (16:31 +0800)]
更新lcd驱动，修复蜂窝显示切屏问题
SnickerSun [Mon, 13 May 2024 03:02:17 +0000 (11:02 +0800)]
恢复出厂设置中补充蓝牙连接的处理
DXY [Mon, 13 May 2024 12:32:54 +0000 (20:32 +0800)]
修复ble死机问题:修改蓝牙名称大写显示
luozheng [Mon, 13 May 2024 10:19:03 +0000 (18:19 +0800)]
增加手表二维码slice
DXY [Sat, 11 May 2024 11:43:30 +0000 (19:43 +0800)]
debug 1
DXY [Sat, 11 May 2024 09:47:00 +0000 (17:47 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
DXY [Sat, 11 May 2024 09:46:51 +0000 (17:46 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Sat, 11 May 2024 07:43:38 +0000 (15:43 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
彭磊 [Sat, 11 May 2024 07:41:29 +0000 (07:41 +0000)]
Merge #162 into xts_origin from refs/changes/162/head
修改gsensor为定时器模式，优化cywee运动模式与静态模式消息发送
* refs/changes/162/head: (1 commits squashed)
- 修改gsensor为定时器模式，优化cywee运动模式与静态模式消息发送
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/162
袁清梦 [Sat, 11 May 2024 07:40:29 +0000 (07:40 +0000)]
Merge #161 into xts_origin from refs/changes/161/head
增加训练记录json服务
* refs/changes/161/head: (1 commits squashed)
- 增加训练记录json服务
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/161
胡传军 [Sat, 11 May 2024 07:39:51 +0000 (07:39 +0000)]
Merge #159 into xts_origin from refs/changes/159/head
Code review from 胡传军
* refs/changes/159/head: (8 commits squashed)
- 喝水及睡眠协议对接
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 合并冲突
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- ota升级
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- ota升级
- 重构OTA升级
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/159
SnickerSun [Sat, 11 May 2024 07:19:08 +0000 (15:19 +0800)]
修改message queue 只有创建queue后才能wirte进去，解决 gsensor 和 cat1 中断 造成的系统不休眠问题。（特定中断开机会执行queue错误写入，从而造成nvwritetask 无线循环）
luozheng [Fri, 10 May 2024 12:10:32 +0000 (20:10 +0800)]
上传gif图片图片
DXY [Fri, 10 May 2024 09:51:33 +0000 (17:51 +0800)]
优化蓝牙数据接收：更改蓝牙名称为WatchSoar
hcj_ [Fri, 10 May 2024 09:31:22 +0000 (17:31 +0800)]
重构OTA升级
luozheng [Fri, 10 May 2024 09:13:22 +0000 (17:13 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Fri, 10 May 2024 09:06:24 +0000 (17:06 +0800)]
修改传统蓝牙，查找手机，勿扰模式适配多国语言，需要重新下载字体资源
hcj_ [Fri, 10 May 2024 06:45:33 +0000 (14:45 +0800)]
ota升级
hcj_ [Fri, 10 May 2024 06:44:31 +0000 (14:44 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
hcj_ [Fri, 10 May 2024 06:44:10 +0000 (14:44 +0800)]
ota升级
penglei [Fri, 10 May 2024 04:29:48 +0000 (12:29 +0800)]
优化蓝牙产测，解决cywee I2C异常问题，完善运动模式功能。
penglei [Fri, 10 May 2024 04:18:43 +0000 (12:18 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Fri, 10 May 2024 04:07:08 +0000 (12:07 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Fri, 10 May 2024 04:07:00 +0000 (12:07 +0800)]
经典蓝牙状态同步，修复a2dp snk 不能工作等问题。
罗正 [Fri, 10 May 2024 04:04:36 +0000 (04:04 +0000)]
Merge #156 into xts_origin from refs/changes/156/head
Code review from 罗正
* refs/changes/156/head: (4 commits squashed)
- 优化下拉界面的数据更新逻辑
如果当前是下拉界面,先更新一次下拉窗口的数据包括，电池电量时间，信号强度等等数据，然后开启一个每2秒更新数据的定时器。
如果不在下拉界面了停止定时器。
遗留一个问题：如果在下拉界面息屏时候停止了定时器，亮屏后需要手动上拉界面再下拉回到下拉界面才能更新数据。
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 1.优化天气显示主界面和applist已经同步显示
遗留问题，手机app同步天气数据时候如果当前界面再天气界面，需要先退出界面在进入才能刷新数据。
2.多国语言包更新需要重新下载资源
- 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/156
penglei [Fri, 10 May 2024 04:01:15 +0000 (12:01 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Fri, 10 May 2024 03:56:28 +0000 (11:56 +0800)]
打包文件统一管理生成ui头文件
luozheng [Fri, 10 May 2024 03:40:33 +0000 (11:40 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Fri, 10 May 2024 03:40:27 +0000 (11:40 +0800)]
1.优化天气显示主界面和applist已经同步显示
遗留问题，手机app同步天气数据时候如果当前界面再天气界面，需要先退出界面在进入才能刷新数据。
2.多国语言包更新需要重新下载资源
Caisking [Fri, 10 May 2024 03:00:38 +0000 (11:00 +0800)]
UI同步省电模式接口
Caisking [Fri, 10 May 2024 02:44:34 +0000 (10:44 +0800)]
建立统一的UI组件工具；【uicomponents/Uicomponents.h】
Caisking [Thu, 9 May 2024 11:57:00 +0000 (19:57 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 9 May 2024 10:26:55 +0000 (18:26 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 9 May 2024 10:26:51 +0000 (18:26 +0800)]
遥控拍照资源[user/res/takephotos/]
Caisking [Thu, 9 May 2024 10:26:15 +0000 (18:26 +0800)]
主界面Presenter增加内存函数接口
Caisking [Thu, 9 May 2024 10:25:45 +0000 (18:25 +0800)]
优化多国语言变量字符串更新
Caisking [Thu, 9 May 2024 10:25:10 +0000 (18:25 +0800)]
同步遥控拍照协议
SnickerSun [Thu, 9 May 2024 09:36:17 +0000 (17:36 +0800)]
1、runtime增加蓝牙各种状态，目前已经实现手机连接，耳机和经典蓝牙状态同步未完成。另pullupdownview还未正常更新
2、修改USE_CAT1_SLEEP_TIMER宏的有用法
Caisking [Thu, 9 May 2024 08:03:14 +0000 (16:03 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 9 May 2024 08:03:11 +0000 (16:03 +0800)]
修改训练存储以及读取
罗正 [Thu, 9 May 2024 07:58:50 +0000 (07:58 +0000)]
Merge #153 into xts_origin from refs/changes/153/head
Code review from 罗正
* refs/changes/153/head: (2 commits squashed)
- 优化下拉界面的数据更新逻辑
如果当前是下拉界面,先更新一次下拉窗口的数据包括，电池电量时间，信号强度等等数据，然后开启一个每2秒更新数据的定时器。
如果不在下拉界面了停止定时器。
遗留一个问题：如果在下拉界面息屏时候停止了定时器，亮屏后需要手动上拉界面再下拉回到下拉界面才能更新数据。
- 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/153
luozheng [Thu, 9 May 2024 03:29:56 +0000 (11:29 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Thu, 9 May 2024 03:29:51 +0000 (11:29 +0800)]
优化下拉界面的数据更新逻辑
如果当前是下拉界面,先更新一次下拉窗口的数据包括，电池电量时间，信号强度等等数据，然后开启一个每2秒更新数据的定时器。
如果不在下拉界面了停止定时器。
遗留一个问题：如果在下拉界面息屏时候停止了定时器，亮屏后需要手动上拉界面再下拉回到下拉界面才能更新数据。
DXY [Thu, 9 May 2024 01:24:59 +0000 (09:24 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
penglei [Thu, 9 May 2024 01:15:46 +0000 (09:15 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
hcj_ [Wed, 8 May 2024 15:12:43 +0000 (23:12 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Wed, 8 May 2024 15:11:39 +0000 (23:11 +0800)]
GSensor恢复中断为DEDGE双边触发，修复无法休眠问题
hcj_ [Wed, 8 May 2024 14:57:49 +0000 (22:57 +0800)]
合并冲突
SnickerSun [Wed, 8 May 2024 13:37:43 +0000 (21:37 +0800)]
修正 ConfigModel默认设置，保证每个enum都配对设置默认值。
projects / mirrors / FD230.git / log