已合并
foldstatus algorithm ext #19548
wulong158创建于 7月2日
foldstatus algorithm ext #19548
已合并
共 2 个文件变更+4-3
| @@ -47,7 +47,7 @@ protected: | |||
| 47 | virtual ~SensorFoldStateMgr(); | 47 | virtual ~SensorFoldStateMgr(); |
| 48 | FoldStatus GetNextFoldStatus(const SensorStatus& sensorStatus); | 48 | FoldStatus GetNextFoldStatus(const SensorStatus& sensorStatus); |
| 49 | virtual FoldStatus GetNextFoldStatusByAxis( | 49 | virtual FoldStatus GetNextFoldStatusByAxis( |
| 50 | - const ScreenAxis& axis, FoldStatus currentStatus, int32_t algorithmStrategy); | 50 | + const ScreenAxis& axis, FoldStatus currentStatus, int32_t algorithmStrategy, size_t axisIndex); |
| 51 | virtual FoldStatus GetNextGlobalFoldStatus(const std::vector<FoldStatus>& foldStatus); | 51 | virtual FoldStatus GetNextGlobalFoldStatus(const std::vector<FoldStatus>& foldStatus); |
| 52 | virtual sptr<AppExecFwk::IApplicationStateObserver> GetAppStateObserver(); | 52 | virtual sptr<AppExecFwk::IApplicationStateObserver> GetAppStateObserver(); |
| 53 | virtual void HandleTentChange(const SensorStatus& sensorStatus); | 53 | virtual void HandleTentChange(const SensorStatus& sensorStatus); |
| @@ -124,15 +124,16 @@ FoldStatus SensorFoldStateMgr::GetNextFoldStatus(const SensorStatus& sensorStatu | |||
| 124 | std::vector<FoldStatus> nextFoldStatus; | 124 | std::vector<FoldStatus> nextFoldStatus; |
| 125 | for (size_t i = 0; i < sensorStatus.axis_.size(); ++i) { | 125 | for (size_t i = 0; i < sensorStatus.axis_.size(); ++i) { |
| 126 | nextFoldStatus.emplace_back( | 126 | nextFoldStatus.emplace_back( |
| 127 | - GetNextFoldStatusByAxis(sensorStatus.axis_[i], currentFoldStatus_[i], foldAlgorithmStrategy_[i])); | 127 | + GetNextFoldStatusByAxis(sensorStatus.axis_[i], currentFoldStatus_[i], foldAlgorithmStrategy_[i], i)); |
| 128 | } | 128 | } |
| 129 | currentFoldStatus_ = nextFoldStatus; | 129 | currentFoldStatus_ = nextFoldStatus; |
| 130 | return GetNextGlobalFoldStatus(nextFoldStatus); | 130 | return GetNextGlobalFoldStatus(nextFoldStatus); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | FoldStatus SensorFoldStateMgr::GetNextFoldStatusByAxis( | 133 | FoldStatus SensorFoldStateMgr::GetNextFoldStatusByAxis( |
| 134 | - const ScreenAxis& axis, FoldStatus currentStatus, int32_t algorithmStrategy) | 134 | + const ScreenAxis& axis, FoldStatus currentStatus, int32_t algorithmStrategy, size_t axisIndex) |
| 135 | { | 135 | { |
| 136 | + (void)axisIndex; | ||
| 136 | if (std::isless(axis.angle_, ANGLE_MIN_VAL)) { | 137 | if (std::isless(axis.angle_, ANGLE_MIN_VAL)) { |
| 137 | return currentStatus; | 138 | return currentStatus; |
| 138 | } | 139 | } |