window info update

Signed-off-by: zzh <zhuzihao11@h-partners.com>
2024-11-23 15:01:17 +00:00 · 2024-05-08 19:17:30 +08:00 · 2024-05-08 19:17:30 +08:00 · 8aa8403763
commit 8aa8403763
parent c180a16b2e
4 changed files with 276 additions and 3 deletions
--- a/frameworks/common/src/accessibility_window_info.cpp
+++ b/frameworks/common/src/accessibility_window_info.cpp
@ -182,6 +182,42 @@ int64_t AccessibilityWindowInfo::GetUiNodeId() const
    return uiNodeId_;
 }

+void AccessibilityWindowInfo::SetScaleVal(const float scaleVal)
+{
+    scaleVal_ = scaleVal;
+    HILOG_DEBUG("set scaleVal_ [%{public}f]", scaleVal_);
+}
+
+float AccessibilityWindowInfo::GetScaleVal() const
+{
+    HILOG_DEBUG("get scaleVal_ [%{public}f]", scaleVal_);
+    return scaleVal_;
+}
+
+void AccessibilityWindowInfo::SetScaleX(const float scaleX)
+{
+    scaleX_ = scaleX;
+    HILOG_DEBUG("set scaleX_ [%{public}f]", scaleX_);
+}
+
+float AccessibilityWindowInfo::GetScaleX() const
+{
+    HILOG_DEBUG("get scaleX_ [%{public}f]", scaleX_);
+    return scaleX_;
+}
+
+void AccessibilityWindowInfo::SetScaleY(const float scaleY)
+{
+    scaleY_ = scaleY;
+    HILOG_DEBUG("set scaleY_ [%{public}f]", scaleY_);
+}
+
+float AccessibilityWindowInfo::GetScaleY() const
+{
+    HILOG_DEBUG("get scaleY_ [%{public}f]", scaleY_);
+    return scaleY_;
+}
+
 void AccessibilityWindowInfo::SetBundleName(const std::string bundleName)
 {
    bundleName_ = bundleName;
--- a/interfaces/innerkits/common/include/accessibility_window_info.h
+++ b/interfaces/innerkits/common/include/accessibility_window_info.h
@ -226,6 +226,48 @@ public:
     */
    int64_t GetUiNodeId() const;

+    /**
+     * @brief Set window scale val
+     * @param scaleVal_ WMS scale Val
+     * @sysCap Accessibility
+    */
+    void SetScaleVal(const float scaleVal);
+
+    /**
+     * @brief Get window scale val
+     * @return window scale val
+     * @sysCap Accessibility
+    */
+    float GetScaleVal() const;
+
+    /**
+     * @brief Set window scale x
+     * @param scaleX_ WMS scale x
+     * @sysCap Accessibility
+    */
+    void SetScaleX(const float scaleX);
+
+    /**
+     * @brief Get window Scale X
+     * @return window Scale X
+     * @sysCap Accessibility
+    */
+    float GetScaleX() const;
+
+    /**
+     * @brief Set window scale Y
+     * @param scaleY_ WMS scale Y
+     * @sysCap Accessibility
+    */
+    void SetScaleY(const float scaleY);
+
+    /**
+     * @brief Get window scale Y
+     * @return window scale Y
+     * @sysCap Accessibility
+    */
+    float GetScaleY() const;
+
    /**
     * @brief Set window bundle name
     * @param bundleName_ WMS bundle name
@ -268,6 +310,9 @@ protected:
    bool isDecorEnable_ = false;
    int32_t innerWid_ = 0; // used for window id 1, scene board
    int64_t uiNodeId_ = 0; // used for window id 1, scene board
+    float scaleVal_ = 0.0;
+    float scaleX_ = 0.0;
+    float scaleY_ = 0.0;
    std::string bundleName_ = "";
    std::vector<Rect> touchHotAreas_ = {};
 };
--- a/services/aams/include/accessibility_window_manager.h
+++ b/services/aams/include/accessibility_window_manager.h
@ -36,6 +36,7 @@ class AccessibilityWindowManager {
 public:
    bool Init();
    void DeInit();
+    void WinDeInit();
    static AccessibilityWindowInfo CreateAccessibilityWindowInfo(const sptr<Rosen::AccessibilityWindowInfo> windowInfo);
    static void UpdateAccessibilityWindowInfo(AccessibilityWindowInfo &accWindowInfo,
        const sptr<Rosen::AccessibilityWindowInfo> windowInfo);
@ -106,12 +107,20 @@ private:
        AccessibilityWindowManager &windInfoMgr_;
    };

+    bool CompareRect(const Rect &rectAccessibility, const Rosen::Rect &rectWindow);
+    bool EqualFocus(const Accessibility::AccessibilityWindowInfo &accWindowInfo,
+        const sptr<Rosen::AccessibilityWindowInfo> &windowInfo);
+    bool EqualBound(const Accessibility::AccessibilityWindowInfo &accWindowInfo,
+        const sptr<Rosen::AccessibilityWindowInfo> &windowInfo);
+    bool EqualProperty(Accessibility::AccessibilityWindowInfo &accWindowInfo,
+        const sptr<Rosen::AccessibilityWindowInfo> &windowInfo);
    void WindowUpdateAdded(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos);
    void WindowUpdateRemoved(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos);
    void WindowUpdateBounds(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos);
    void WindowUpdateActive(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos);
    void WindowUpdateFocused(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos);
    void WindowUpdateProperty(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos);
+    void WindowUpdateTypeEvent(const int32_t realWidId, Accessibility::WindowUpdateType type);
    void WindowUpdateAll(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos);
    void ClearOldActiveWindow();

--- a/services/aams/src/accessibility_window_manager.cpp
+++ b/services/aams/src/accessibility_window_manager.cpp
@ -74,6 +74,14 @@ void AccessibilityWindowManager::DeInit()
    a11yFocusedWindowId_ = INVALID_WINDOW_ID;
 }

+void AccessibilityWindowManager::WinDeInit()
+{
+    HILOG_DEBUG();
+    a11yWindows_.clear();
+    subWindows_.clear();
+    sceneBoardElementIdMap_.Clear();
+}
+
 AccessibilityWindowManager::~AccessibilityWindowManager()
 {
    DeregisterWindowListener();
@ -232,6 +240,9 @@ bool AccessibilityWindowManager::CheckIntegerOverflow(const Rosen::Rect& rect)
 void AccessibilityWindowManager::UpdateAccessibilityWindowInfo(AccessibilityWindowInfo &accWindowInfo,
    const sptr<Rosen::AccessibilityWindowInfo> windowInfo)
 {
+    accWindowInfo.SetScaleVal(windowInfo->scaleVal_);
+    accWindowInfo.SetScaleX(windowInfo->scaleX_);
+    accWindowInfo.SetScaleY(windowInfo->scaleY_);
    accWindowInfo.SetWindowId(windowInfo->wid_);
    accWindowInfo.SetWindowType(static_cast<uint32_t>(windowInfo->type_));
    accWindowInfo.SetWindowMode(static_cast<uint32_t>(windowInfo->mode_));
@ -465,6 +476,107 @@ void AccessibilityWindowManager::SetWindowSize(int32_t windowId, Rect rect)
    }
 }

+bool AccessibilityWindowManager::CompareRect(const Rect &rectAccessibility, const Rosen::Rect &rectWindow)
+{
+    HILOG_DEBUG();
+    int32_t leftTopX_ = rectWindow.posX_;
+    int32_t leftTopY_ = rectWindow.posY_;
+    int32_t rightBottomX_ = 0;
+    int32_t rightBottomY_ = 0;
+
+    if (!CheckIntegerOverflow(rectWindow)) {
+        rightBottomX_ = rectWindow.posX_;
+        rightBottomY_ = rectWindow.posY_;
+    } else {
+        rightBottomX_ = rectWindow.posX_ + static_cast<int32_t>(rectWindow.width_);
+        rightBottomY_ = rectWindow.posY_ + static_cast<int32_t>(rectWindow.height_);
+    }
+
+    if (rectAccessibility.GetLeftTopXScreenPostion() == leftTopX_ &&
+        rectAccessibility.GetLeftTopYScreenPostion() == leftTopY_ &&
+        rectAccessibility.GetRightBottomXScreenPostion() == rightBottomX_ &&
+        rectAccessibility.GetRightBottomYScreenPostion() == rightBottomY_) {
+        HILOG_DEBUG("rect values are the same");
+        return false;
+    }
+    return true;
+}
+
+bool AccessibilityWindowManager::EqualFocus(const Accessibility::AccessibilityWindowInfo &accWindowInfo,
+    const sptr<Rosen::AccessibilityWindowInfo> &windowInfo)
+{
+    HILOG_DEBUG();
+    if (accWindowInfo.IsFocused() == windowInfo->focused_) {
+        HILOG_DEBUG("focus values are the same");
+        return false;
+    }
+    return true;
+}
+
+bool AccessibilityWindowManager::EqualBound(const Accessibility::AccessibilityWindowInfo &accWindowInfo,
+    const sptr<Rosen::AccessibilityWindowInfo> &windowInfo)
+{
+    HILOG_DEBUG();
+    if (static_cast<int32_t>(windowInfo->type_) == 1 && (static_cast<int32_t>(windowInfo->windowRect_.width_) == 0 ||
+        static_cast<int32_t>(windowInfo->windowRect_.height_) == 0)) {
+        HILOG_ERROR("invalid window parameters, windowId(%{public}d), posX(%{public}d, posY(%{public}d))",
+            windowInfo->wid_, windowInfo->windowRect_.posX_, windowInfo->windowRect_.posY_);
+        return false;
+    }
+    return CompareRect(accWindowInfo.GetRectInScreen(), windowInfo->windowRect_);
+}
+
+bool AccessibilityWindowManager::EqualProperty(Accessibility::AccessibilityWindowInfo &accWindowInfo,
+    const sptr<Rosen::AccessibilityWindowInfo> &windowInfo)
+{
+    HILOG_DEBUG();
+    std::ostringstream  accInfoStr;
+    std::ostringstream  winInfoStr;
+
+    accInfoStr << accWindowInfo.GetWindowMode()
+               << accWindowInfo.GetWindowLayer()
+               << accWindowInfo.IsDecorEnable()
+               << accWindowInfo.GetWindowType()
+               << accWindowInfo.GetDisplayId()
+               << accWindowInfo.GetScaleVal()
+               << accWindowInfo.GetScaleX()
+               << accWindowInfo.GetScaleY();
+    HILOG_DEBUG("Create accinfoStr windowMode_[%{public}d] Layer_[%{public}d] isDecorEnable_[%{public}d]"
+        "windowType_[%{public}d] displayId:%{public}" PRIu64 " get scaleVal_ [%{public}f]"
+        "get scaleX_ [%{public}f] get scaleY_ [%{public}f]",
+        accWindowInfo.GetWindowMode(), accWindowInfo.GetWindowLayer(), accWindowInfo.IsDecorEnable(),
+        accWindowInfo.GetWindowType(), accWindowInfo.GetDisplayId(), accWindowInfo.GetScaleVal(),
+        accWindowInfo.GetScaleX(), accWindowInfo.GetScaleY());
+
+    winInfoStr << static_cast<uint32_t>(windowInfo->mode_)
+               << windowInfo->layer_
+               << windowInfo->isDecorEnable_
+               << static_cast<uint32_t>(windowInfo->type_)
+               << windowInfo->displayId_
+               << windowInfo->scaleVal_
+               << windowInfo->scaleX_
+               << windowInfo->scaleY_;
+    HILOG_DEBUG("Create wininfoStr Mode_[%{public}d] Layer_[%{public}d] isDecorEnable_[%{public}d]"
+        "Type_[%{public}d] displayId:%{public}" PRIu64 " scaleVal_ [%{public}f]"
+        "scaleX_ [%{public}f] scaleY_ [%{public}f]",
+        static_cast<uint32_t>(windowInfo->mode_), windowInfo->layer_, windowInfo->isDecorEnable_,
+        static_cast<uint32_t>(windowInfo->type_), windowInfo->displayId_, windowInfo->scaleVal_,
+        windowInfo->scaleX_, windowInfo->scaleY_);
+
+    if (accInfoStr.str() != winInfoStr.str() ||
+        windowInfo->touchHotAreas_.size() != accWindowInfo.GetTouchHotAreas().size()) {
+        HILOG_DEBUG("Property different");
+        return true;
+    }
+    for (auto i = 0; i < accWindowInfo.GetTouchHotAreas().size(); i++) {
+        if (CompareRect(accWindowInfo.GetTouchHotAreas()[i], windowInfo->touchHotAreas_[i])) {
+            HILOG_DEBUG("touchHotAreas different");
+            return true;
+        }
+    }
+    return false;
+}
+
 void AccessibilityWindowManager::WindowUpdateAdded(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos)
 {
    HILOG_DEBUG();
@ -611,11 +723,60 @@ void AccessibilityWindowManager::WindowUpdateProperty(const std::vector<sptr<Ros
    }
 }

+void AccessibilityWindowManager::WindowUpdateTypeEvent(const int32_t realWidId, Accessibility::WindowUpdateType type)
+{
+    HILOG_DEBUG();
+    HILOG_DEBUG("WindowUpdateType type[%{public}d]", type);
+    auto &aams = Singleton<AccessibleAbilityManagerService>::GetInstance();
+    switch (type) {
+        case WindowUpdateType::WINDOW_UPDATE_ADDED: {
+                AccessibilityEventInfo evtInfAdded(realWidId, WINDOW_UPDATE_ADDED);
+                Singleton<AccessibleAbilityManagerService>::GetInstance().SendEvent(evtInfAdded);
+                if (a11yWindows_[realWidId].IsFocused()) {
+                    SetActiveWindow(realWidId);
+                }
+                break;
+            }
+        case WindowUpdateType::WINDOW_UPDATE_REMOVED: {
+                if (realWidId == activeWindowId_) {
+                    SetActiveWindow(INVALID_WINDOW_ID);
+                }
+                if (realWidId == a11yFocusedWindowId_) {
+                    SetAccessibilityFocusedWindow(INVALID_WINDOW_ID);
+                }
+
+                AccessibilityEventInfo evtInfRemoved(realWidId, WINDOW_UPDATE_REMOVED);
+                aams.SendEvent(evtInfRemoved);
+                break;
+            }
+        case WindowUpdateType::WINDOW_UPDATE_BOUNDS: {
+                AccessibilityEventInfo evtInfBounds(realWidId, WINDOW_UPDATE_BOUNDS);
+                aams.SendEvent(evtInfBounds);
+                break;
+            }
+        case WindowUpdateType::WINDOW_UPDATE_FOCUSED: {
+                SetActiveWindow(realWidId);
+                AccessibilityEventInfo evtInfFocused(realWidId, WINDOW_UPDATE_FOCUSED);
+                aams.SendEvent(evtInfFocused);
+                break;
+            }
+        case WindowUpdateType::WINDOW_UPDATE_PROPERTY: {
+                AccessibilityEventInfo evtInfProperty(realWidId, WINDOW_UPDATE_PROPERTY);
+                aams.SendEvent(evtInfProperty);
+                break;
+            }
+        default:
+            break;
+        }
+}
+
 void AccessibilityWindowManager::WindowUpdateAll(const std::vector<sptr<Rosen::AccessibilityWindowInfo>>& infos)
 {
-    HILOG_DEBUG("WindowUpdateAll info size(%{public}u)", infos.size());
-    DeInit();
-    HILOG_DEBUG("WindowUpdateAll a11yWindowInfo_ size(%{public}u)", a11yWindows_.size());
+    HILOG_DEBUG();
+    auto oldA11yWindows_ = a11yWindows_;
+    HILOG_DEBUG("WindowUpdateAll info size(%{public}u), oldA11yWindows_ size(%{public}u)",
+        infos.size(), oldA11yWindows_.size());
+    WinDeInit();
    for (auto &window : infos) {
        if (!window) {
            HILOG_ERROR("window is nullptr");
@ -635,6 +796,28 @@ void AccessibilityWindowManager::WindowUpdateAll(const std::vector<sptr<Rosen::A
        if (a11yWindows_[realWid].IsFocused()) {
            SetActiveWindow(realWid);
        }
+
+        if (!oldA11yWindows_.count(realWid)) {
+            WindowUpdateTypeEvent(realWid, WINDOW_UPDATE_ADDED);
+        } else {
+            if (EqualFocus(oldA11yWindows_[realWid], window)) {
+                WindowUpdateTypeEvent(realWid, WINDOW_UPDATE_FOCUSED);
+            }
+            if (EqualBound(oldA11yWindows_[realWid], window)) {
+                WindowUpdateTypeEvent(realWid, WINDOW_UPDATE_BOUNDS);
+            }
+            if (EqualProperty(oldA11yWindows_[realWid], window)) {
+                WindowUpdateTypeEvent(realWid, WINDOW_UPDATE_PROPERTY);
+            }
+            auto itr = oldA11yWindows_.find(realWid);
+            if (itr != oldA11yWindows_.end()) {
+                oldA11yWindows_.erase(itr);
+            }
+        }
+    }
+
+    for (auto it = oldA11yWindows_.begin(); it != oldA11yWindows_.end(); ++it) {
+        WindowUpdateTypeEvent(it->first, WINDOW_UPDATE_REMOVED);
    }
    HILOG_DEBUG("WindowUpdateAll a11yWindowInfo_ size(%{public}u)", a11yWindows_.size());
 }