Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 系统设置暗黑模式，缺省页.backgroundColor(Color.White)
  fix: 系统设置暗黑模式，Web容器增加.backgroundColor(Color.White)
  fix: 图文稿件详情页，点击图片查看大图，双击图片，屏幕黑屏。系统升级原来的代码不兼容，

@@ -27,6 +27,7 @@ export struct WdWebComponent {
   build() {
   build() {
     Column() {
     Column() {
       Web({ src: this.webUrl, controller: this.webviewControl })
       Web({ src: this.webUrl, controller: this.webviewControl })
+        .backgroundColor(Color.White)
         .domStorageAccess(true)
         .domStorageAccess(true)
         .databaseAccess(true)
         .databaseAccess(true)
         .javaScriptAccess(true)
         .javaScriptAccess(true)

@@ -59,6 +59,7 @@ export struct WdWebLocalComponent {
             controller: this.webviewControl,
             controller: this.webviewControl,
             renderMode: RenderMode.SYNC_RENDER
             renderMode: RenderMode.SYNC_RENDER
           })// Web({ src: this.webResource, controller: this.webviewControl })
           })// Web({ src: this.webResource, controller: this.webviewControl })
+            .backgroundColor(Color.White)
             .domStorageAccess(true)
             .domStorageAccess(true)
             .databaseAccess(true)
             .databaseAccess(true)
             .javaScriptAccess(true)
             .javaScriptAccess(true)

@@ -3,7 +3,7 @@ import { matrix4, promptAction, window } from '@kit.ArkUI';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { ScaleModel } from '../model/ScaleModel';
 import { ScaleModel } from '../model/ScaleModel';
 import { OffsetModel } from '../model/OffsetModel';
 import { OffsetModel } from '../model/OffsetModel';
-import { windowSizeManager } from '../utils/Managers';
+import { WindowSizeManager } from '../utils/Managers';
 import { runWithAnimation } from '../utils/FuncUtils';
 import { runWithAnimation } from '../utils/FuncUtils';
 import { PhotoListBean } from 'wdBean/Index';
 import { PhotoListBean } from 'wdBean/Index';
 import { http } from '@kit.NetworkKit';
 import { http } from '@kit.NetworkKit';
@@ -31,12 +31,12 @@ export struct MultiPictureDetailItemComponent {
   private swiperControllerItem: SwiperController = new SwiperController()
   private swiperControllerItem: SwiperController = new SwiperController()
   @State currentOffset: number = 0
   @State currentOffset: number = 0
   @Consume duration: number
   @Consume duration: number
+  windowSizeManager: WindowSizeManager = new WindowSizeManager();
 
 
 
 
   async aboutToAppear() {
   async aboutToAppear() {
     this.imageUri = this.MultiPictureDetailItem.picPath
     this.imageUri = this.MultiPictureDetailItem.picPath
     this.getPicture()
     this.getPicture()
-    console.log(TAG, JSON.stringify(this.MultiPictureDetailItem))
   }
   }
 
 
   /**
   /**
@@ -113,15 +113,15 @@ export struct MultiPictureDetailItemComponent {
     // const imageSource: image.ImageSource = image.createImageSource(this.imageUri);
     // const imageSource: image.ImageSource = image.createImageSource(this.imageUri);
     imageSource.getImageInfo(0).then((data: image.ImageInfo) => {
     imageSource.getImageInfo(0).then((data: image.ImageInfo) => {
       this.imageWHRatio = data.size.width / data.size.height;
       this.imageWHRatio = data.size.width / data.size.height;
-      this.imageDefaultSize = this.calcImageDefaultSize(this.imageWHRatio, windowSizeManager.get());
-      if (this.imageDefaultSize.width === windowSizeManager.get().width) {
+      this.imageDefaultSize = this.calcImageDefaultSize(this.imageWHRatio, this.windowSizeManager.get());
+      if (this.imageDefaultSize.width === this.windowSizeManager.get().width) {
         this.fitWH = "width";
         this.fitWH = "width";
       } else {
       } else {
         this.fitWH = "height";
         this.fitWH = "height";
       }
       }
       this.imageScaleInfo.maxScaleValue += this.fitWH === "width" ?
       this.imageScaleInfo.maxScaleValue += this.fitWH === "width" ?
-        (windowSizeManager.get().height / this.imageDefaultSize.height) :
-        (windowSizeManager.get().width / this.imageDefaultSize.width);
+        (this.windowSizeManager.get().height / this.imageDefaultSize.height) :
+        (this.windowSizeManager.get().width / this.imageDefaultSize.width);
     }).catch((err: BusinessError) => {
     }).catch((err: BusinessError) => {
       console.error(`[error][getImageInfo]${err.message}`);
       console.error(`[error][getImageInfo]${err.message}`);
     });
     });
@@ -275,7 +275,7 @@ export struct MultiPictureDetailItemComponent {
               // 已经是缩小状态，双击放大
               // 已经是缩小状态，双击放大
               fn = () => {
               fn = () => {
                 this.isEnableSwipe = false;
                 this.isEnableSwipe = false;
-                const ratio: number = this.calcFitScaleRatio(this.imageDefaultSize, windowSizeManager.get());
+                const ratio: number = this.calcFitScaleRatio(this.imageDefaultSize, this.windowSizeManager.get());
                 this.imageScaleInfo.scaleValue = ratio;
                 this.imageScaleInfo.scaleValue = ratio;
                 this.imageOffsetInfo.reset();
                 this.imageOffsetInfo.reset();
                 this.matrix = matrix4.identity().scale({
                 this.matrix = matrix4.identity().scale({

@@ -144,7 +144,7 @@ export struct EmptyComponent {
             .type(ButtonType.Normal)
             .type(ButtonType.Normal)
             .width(80)
             .width(80)
             .height(28)
             .height(28)
-            .backgroundColor('#fffffff')
+            .backgroundColor(Color.White)
             .fontColor('#FF666666')
             .fontColor('#FF666666')
             .border({ width: 1 })
             .border({ width: 1 })
             .borderColor('#FFEDEDED')
             .borderColor('#FFEDEDED')

 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
+import { common } from '@kit.AbilityKit';
 
 
-class WindowSizeManager {
+export class WindowSizeManager {
   private size: window.Size = { width: 0, height: 0 };
   private size: window.Size = { width: 0, height: 0 };
+  // 获取UIAbility上下文
+  private context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
 
 
   constructor() {
   constructor() {
-    window.getLastWindow(getContext()).then((value: window.Window) => {
+    window.getLastWindow(this.context).then((value: window.Window) => {
       const rect: window.Rect = value.getWindowProperties().windowRect;
       const rect: window.Rect = value.getWindowProperties().windowRect;
       this.size.width = px2vp(rect.width);
       this.size.width = px2vp(rect.width);
       this.size.height = px2vp(rect.height);
       this.size.height = px2vp(rect.height);
-      console.log(`[windowWidth]${this.size.width} [windowHeight]${this.size.height}`);
+      // console.log('MultiPictureDetailItemComponent', `[windowWidth]${this.size.width} [windowHeight]${this.size.height}`);
     })
     })
   }
   }
 
 
   get(): window.Size {
   get(): window.Size {
     return this.size;
     return this.size;
   }
   }
-}
-
-export const windowSizeManager: WindowSizeManager = new WindowSizeManager();
+}

@@ -73,6 +73,7 @@ struct LoginProtocolWebview {
         .height(44)
         .height(44)
         if(this.isConnectNetwork){
         if(this.isConnectNetwork){
           Web({ src: this.webUrl, controller: this.webviewController })
           Web({ src: this.webUrl, controller: this.webviewController })
+            .backgroundColor(Color.White)
             .domStorageAccess(true)
             .domStorageAccess(true)
             .databaseAccess(true)
             .databaseAccess(true)
             .javaScriptAccess(true)
             .javaScriptAccess(true)