Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

增加4G ai对话 有bug待后续完善

Merge #1851 into sdk602patch0911 from refs/changes/1851/head

Code review from 袁清梦

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

  - 删除applist不需要的应用

  - 关闭错误宏

  - 修改血压检测Slice位置

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: 罗正 <1732036298@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1851

血压slice上次校准界面提交

修复bug

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

增加界面

二次校准界面

校准提醒界面

校准完成界面

图片

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

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

增加血压结果展示UI

1

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

增加血压检测UI；增加血压model服务相关函数

血压slice姿势校准界面Cmake文件提交

血压slice姿势校准界面UI添加

增加血压检测SOSUI

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

1.支付宝-乘车码界面修改
2.添加支付宝界面投票

增加血压测量Slice框架，实现测量界面UI

修改多国语言脚本，适配多项目使用

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

增加setting的宏控制

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

Merge #1842 into sdk602patch0911 from refs/changes/1842/head

增加font文件

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

  - 增加font文件

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1842

Merge #1844 into sdk602patch0911 from refs/changes/1844/head

Code review from 罗正

* refs/changes/1844/head: (2 commits squashed)

  - AI界面取消notify更新界面，聆听和思考界面隐藏界面时停止动画

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1844

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

AI界面取消notify更新界面，聆听和思考界面隐藏界面时停止动画

增加图片资源

增加font文件

修改血压校准入口到设置

增加血压测量Slice以及主UI

修改其他界面的container_的添加问题

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

血压model增加获取时间str函数

1.校准界面，输入血压界面

修复编译问题

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

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

修复编译问题

Merge #1833 into sdk602patch0911 from refs/changes/1833/head

Code review from aliyun3243248791

* refs/changes/1833/head: (2 commits squashed)

  - 增加图片资源

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

Signed-off-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1833

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

增加图片资源

增加血压测量的宏控制

血氧Slice增加宏控制入口

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

Merge #1831 into sdk602patch0911 from refs/changes/1831/head

增加血压测量/血压校准/情绪/压力/疲倦度/ECG VIEW_ID

* refs/changes/1831/head: (2 commits squashed)

  - 增加血压测量/血压校准/情绪/压力/疲倦度/ECG VIEW_ID

  - 修改血压测量VIEW_ID

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1831

修改血压测量VIEW_ID

增加血压测量/血压校准/情绪/压力/疲倦度/ECG VIEW_ID

增加n9编译选项，添加GPS,血压服务，优化原像心率计算(补)

增加n9编译选项，添加GPS,血压服务，优化原像心率计算

增加W9与N9的资源路径

血压

Merge #1816 into sdk602patch0911 from refs/changes/1816/head

Code review from 袁清梦

* refs/changes/1816/head: (2 commits squashed)

  - 修复N9电池文本显示

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

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1816

Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

把user_app_reserved ram加到heapsize里，增加可用内存
lwip配置优化，降低不必要的缓存，
优化sys_thread_new函数，从heap创建stack

Merge #1822 into sdk602patch0911 from refs/changes/1822/head

Code review from snickersun@163.com

* refs/changes/1822/head: (2 commits)
  添加socket poll select 函数支持
  Merge branch &#39;sdk602patch0911&#39; of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD...

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: aliyun8003852482 <1224667075@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1822

Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

添加socket poll select 函数支持

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

4GAIUI提交

Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

1、修复230编译烧录失败或启动失败问题
2、修改cat1 at指令，nettest指令增加测试项参数
3、添加w9的modem 固件（替换fd230的rf.bin）

修改录音采集

Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

Merge #1814 into sdk602patch0911 from refs/changes/1814/head

Code review from 胡传军

* refs/changes/1814/head: (5 commits squashed)

  - 增加4Gai对话，待联调，且处于测试用服务器

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

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

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

  - 增加tts服务,增加ai接口

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1814

N9默认表盘增加电池

增加tts服务,增加ai接口

Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

N9 UI增加项目宏控制

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

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

0911添加W9代码，增加fd230，w9编译选项

N9资源文件变更增加宏控制

Merge #1811 into sdk602patch0911 from refs/changes/1811/head

Code review from 罗正

* refs/changes/1811/head: (2 commits squashed)

  - 解决蓝牙AI不能用问题

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1811

Revert "修改开机关机动画；修改开机logo"

This reverts commit 1b9b379d732e33d7fe362a95103ce0de395eea3c.

增加N9 res

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

修改开机动画播放效果

修改“FD230"相关项目名称

修改开机关机动画；修改开机logo

修改blename

修改产品信息：KUMI->Watch

修改默认表盘（暂定）

Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

修复编译问题

Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

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

添加适配4GAIUI视图和逻辑

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

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

1.SUPPORT_CHINA_MOBILE_AI_REGULATION控制移动AI纳管相关功能宏控 2.增加china_mobile_ai_regulation.py文件

Merge #1803 into sdk602patch0911 from refs/changes/1803/head

Code review from 罗正

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

  - 解决香港乘车码获取不了问题

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

  - 解决乘车码未知错误问题

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1803

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

Merge #1804 into sdk602patch0911 from refs/changes/1804/head

增加4Gai对话，待联调，且处于测试用服务器

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

  - 增加4Gai对话，待联调，且处于测试用服务器

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1804

Merge #1718 into sdk602patch0911 from refs/changes/1718/head

Code review from snickersun@163.com

* refs/changes/1718/head: (4 commits squashed)

  - 默认不定义 single_user_partition 开启单分区模式

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

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

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

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1718

增加4Gai对话，待联调，且处于测试用服务器