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

@@ -4,7 +4,8 @@ import { BreakPointType, Logger } from 'wdKit';
 import { CompUtils } from '../../utils/CompUtils';
 import { ProcessUtils } from 'wdRouter';
 import { EmptyComponent } from '../view/EmptyComponent';
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
+import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 
 const TAG = 'Zh_Carousel_Layout-01';
 
@@ -163,6 +164,11 @@ export struct ZhCarouselLayout01 {
 struct CarouselLayout01CardView {
   private item: ContentDTO = {} as ContentDTO;
   private length: number = 1; // 轮播图数量
+  @State loadImg: boolean = false;
+
+  async aboutToAppear(): Promise<void> {
+    this.loadImg = await onlyWifiLoadImg();
+  }
 
   build() {
     Stack() {
@@ -170,6 +176,12 @@ struct CarouselLayout01CardView {
         .width(CommonConstants.FULL_PARENT)
         .height(CommonConstants.FULL_PARENT)
         .objectFit(ImageFit.Cover)
+        .visibility(this.loadImg ? Visibility.Visible : Visibility.None)
+
+      Row()
+        .width(CommonConstants.FULL_PARENT)
+        .height(CommonConstants.FULL_PARENT)
+        .visibility(this.loadImg ? Visibility.None : Visibility.Visible)
 
       Row()
         .width(CommonConstants.FULL_PARENT)

+import { NetworkUtil, SPHelper } from 'wdKit';
+import { SpConstants } from 'wdConstant';
+
+async function onlyWifiLoadImg() : Promise<boolean> {
+  let loadImageOnlyWifiSwitch = await SPHelper.default.get(SpConstants.SETTING_WIFI_IMAGE_SWITCH, '') || false;
+  let isNetConnected = NetworkUtil.isNetConnected();
+  let netWorkStatus = NetworkUtil.getNetworkType();
+
+  if (isNetConnected) {
+    if (netWorkStatus === NetworkUtil.TYPE_WIFI) {
+      return true;
+    } else {
+      if (loadImageOnlyWifiSwitch) {
+        return false
+      } else {
+        return true;
+      }
+    }
+  } else {
+    return false;
+  }
+}
+
+export { onlyWifiLoadImg }
\ No newline at end of file