fix(ohos): fix dimensions of window for pc

Author: etkmao

framework/ohos/src/main/ets/support/utils/DimensionsUtil.ets

@@ -20,7 +20,7 @@
 import { HippyMap, HippyValue } from '../common/HippyTypes';
 import deviceinfo from '@ohos.deviceInfo';
 import { TextUtils } from './TextUtils';
-import { display } from '@kit.ArkUI';
+import { display, window } from '@kit.ArkUI';
 import { LogUtils } from './LogUtils';
 import { PixelUtil } from './PixelUtil';
 
@@ -33,14 +33,30 @@ export class DimensionsUtil {
   private static SHOW_NAV_BAR_RES_NAME = "config_showNavigationBar";
   private static NAVIGATE_BAR_HEIGHT = 0;
 
+  static async getLastWindowRect(context: Context): Promise<window.Rect> {
+    const windowObj = await window.getLastWindow(context);
+    return windowObj.getWindowProperties().windowRect;
+  }
+
   static async getDimensions(ww: number, wh: number, context: Context): Promise<HippyMap> {
     let displayClass: display.Display = display.getDefaultDisplaySync();
     await DimensionsUtil.getStatusBarHeight(displayClass);
     let dimensionMap = new Map<string, HippyValue | Map<string, HippyValue>>()
 
+    let windowRect = await DimensionsUtil.getLastWindowRect(context);
+    let w = 0;
+    let h = 0;
+    if (windowRect.width > 0 && windowRect.height > 0) {
+      w = windowRect.width;
+      h = windowRect.height;
+    } else {
+      w = displayClass.width;
+      h = displayClass.height;
+    }
+
     let windowDisplayMetricsMap = new Map<string, HippyValue>()
-    windowDisplayMetricsMap.set("width", ww >= 0 ? ww : displayClass.width);
-    windowDisplayMetricsMap.set("height", wh >= 0 ? wh : displayClass.height);
+    windowDisplayMetricsMap.set("width", ww >= 0 ? ww : w);
+    windowDisplayMetricsMap.set("height", wh >= 0 ? wh : h);
     windowDisplayMetricsMap.set("scale", displayClass.densityPixels / PixelUtil.getDensityScale());
     windowDisplayMetricsMap.set("fontScale", displayClass.scaledDensity / PixelUtil.getDensityScale());
     windowDisplayMetricsMap.set("densityDpi", displayClass.densityDPI / PixelUtil.getDensityScale());
@@ -49,8 +65,8 @@ export class DimensionsUtil {
     dimensionMap.set("windowPhysicalPixels", windowDisplayMetricsMap);
 
     let screenDisplayMetricsMap = new Map<string, HippyValue>()
-    screenDisplayMetricsMap.set("width", displayClass.width);
-    screenDisplayMetricsMap.set("height", displayClass.height);
+    screenDisplayMetricsMap.set("width", w);
+    screenDisplayMetricsMap.set("height", h);
     screenDisplayMetricsMap.set("scale", displayClass.densityPixels / PixelUtil.getDensityScale());
     screenDisplayMetricsMap.set("fontScale", displayClass.scaledDensity / PixelUtil.getDensityScale());
     screenDisplayMetricsMap.set("densityDpi", displayClass.densityDPI / PixelUtil.getDensityScale());