Merge #28 into xts_origin from refs/changes/28/head 29/target/1 30/target/1 31/target/1
author罗正 <1732036298@qq.com>
Wed, 17 Apr 2024 06:39:42 +0000 (06:39 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 17 Apr 2024 06:39:42 +0000 (06:39 +0000)
commit84f8313944dd0c237a3bebb6e5be1fcde74d7a1d
tree5f5afc42dc36631c6020b9601e22c3f7a02434ff
parentd995f5b2c29fdd130d7142b72eb1cf3a5b4732a5
Merge #28 into xts_origin from refs/changes/28/head

Code review from 罗正

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

  - 实现导航历史栈功能:
    1.当从一个Slice进入另一个Slice时调用NativeAbility::GetInstance().EnterSlice(sliceId)
    2.NativeAbility::GetInstance().Back 处理后退操作
    3.ChangeSlice不压栈

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

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

  - 1.优化亮屏时长视图,增加30,60,300秒时长
    2.ConfigModel 增加设置亮屏时长函数
    3.优化Ability.h的EnterSlice和Back函数

  - Merge branch &#39;xts_origin&#39; 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/28
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/ScreenDurationView.h
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
code/sdk/application/wearable/nativeabilityfwk/include/Ability.h