Merge #3014 into fd272 from refs/changes/3014/head
Code review from 彭磊
* refs/changes/3014/head: (2 commits squashed)
- 272运动不启动活体检测
- Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3014
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge #2952 into sdk650pathc0423 from refs/changes/2952/head
Code review from 袁清梦
* refs/changes/2952/head: (18 commits squashed)
- release V1.3.114 FD272
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- 272 优化动画效果
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- release V1.3.115 -FD272
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
- 修复SOS储存
- 优化时间刷新
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2952
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423
Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423