Merge remote-tracking branch 'origin/main'

-import { Callback, BridgeWebViewControl } from 'wdJsBridge';
+import { Callback } from 'wdJsBridge';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
-import { Logger, StringUtils, } from 'wdKit';
+import { Logger } from 'wdKit';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 //TODO 这里引用了 features模块，是否考虑将跳转抽到公共模块
 //TODO 这里引用了 features模块，是否考虑将跳转抽到公共模块
@@ -27,7 +27,10 @@ export function performJSCallNative(data: Message, call: Callback) {
     case H5CallNativeType.jsCall_callAppService:
     case H5CallNativeType.jsCall_callAppService:
       break;
       break;
     case H5CallNativeType.jsCall_receiveH5Data:
     case H5CallNativeType.jsCall_receiveH5Data:
-      handleH5Data(JSON.parse(data?.data?.dataJson || '{}'))
+     if(data?.data?.dataSource === 5){
+       handleH5Data(JSON.parse(data?.data?.dataJson || '{}'))
+
+     }
       break;
       break;
     case 'changeNativeMessage':
     case 'changeNativeMessage':
       call("this is change Web Message")
       call("this is change Web Message")
@@ -59,6 +62,7 @@ function getAppPublicInfo(): string {
 }
 }
 
 
 function handleH5Data(content:ContentDTO) {
 function handleH5Data(content:ContentDTO) {
+  Logger.debug(TAG, 'handleH5Data' + ', content: ' + JSON.stringify(content))
   ProcessUtils.processPage(content)
   ProcessUtils.processPage(content)
 }
 }
 
 

 import router from '@ohos.router';
 import router from '@ohos.router';
-import { BridgeUtil, BridgeWebViewControl, Callback } from 'wdJsBridge';
+import { BridgeHandler, BridgeUtil, BridgeWebViewControl, Callback } from 'wdJsBridge';
 import { Logger } from 'wdKit/Index';
 import { Logger } from 'wdKit/Index';
+import { setDefaultNativeWebSettings } from './WebComponentUtil';
+import { Action } from 'wdBean';
 import { performJSCallNative } from './JsBridgeBiz';
 import { performJSCallNative } from './JsBridgeBiz';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
@@ -10,9 +12,9 @@ const TAG = 'WdWebLocalComponent';
 @Component
 @Component
 export struct WdWebComponent {
 export struct WdWebComponent {
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
+  onWebPrepared: () => void = () => {}
   @Prop backVisibility: boolean = false
   @Prop backVisibility: boolean = false
   @Prop webUrl: string = ''
   @Prop webUrl: string = ''
-  @Prop @Watch('onReloadStateChanged') reload: number = 0
   @Link isPageEnd: boolean
   @Link isPageEnd: boolean
 
 
   build() {
   build() {
@@ -34,9 +36,10 @@ export struct WdWebComponent {
         .domStorageAccess(true)
         .domStorageAccess(true)
         .databaseAccess(true)
         .databaseAccess(true)
         .javaScriptAccess(true)
         .javaScriptAccess(true)
-        .zoomAccess(false)
-        .horizontalScrollBarAccess(false)
-        .verticalScrollBarAccess(false)
+        .imageAccess(true)
+        .mixedMode(MixedMode.All)
+        .onlineImageAccess(true)
+        .enableNativeEmbedMode(true)
         .onPageBegin((event) => {
         .onPageBegin((event) => {
           this.onPageBegin(event?.url);
           this.onPageBegin(event?.url);
         })
         })
@@ -66,14 +69,13 @@ export struct WdWebComponent {
     // 注册h5调用js相关
     // 注册h5调用js相关
     for (let i = 0; i < H5CallNativeType.JsCallTypeList.length; i++) {
     for (let i = 0; i < H5CallNativeType.JsCallTypeList.length; i++) {
       let handleName = H5CallNativeType.JsCallTypeList[i];
       let handleName = H5CallNativeType.JsCallTypeList[i];
-      console.log('handleName:', handleName)
       let handle = (data: Message, f: Callback) => {
       let handle = (data: Message, f: Callback) => {
+        Logger.debug('registerHandlers handlerName: ' + JSON.stringify(data))
         this.defaultPerformJSCallNative(data, f)
         this.defaultPerformJSCallNative(data, f)
       };
       };
       this.webviewControl.registerHandler(handleName, { handle: handle });
       this.webviewControl.registerHandler(handleName, { handle: handle });
     }
     }
   }
   }
-
   /**
   /**
    * 默认【CallNative】逻辑处理
    * 默认【CallNative】逻辑处理
    */
    */
@@ -83,22 +85,18 @@ export struct WdWebComponent {
   onPageBegin: (url?: string) => void = () => {
   onPageBegin: (url?: string) => void = () => {
     Logger.debug(TAG, 'onPageBegin');
     Logger.debug(TAG, 'onPageBegin');
     this.registerHandlers();
     this.registerHandlers();
+    // setTimeout(() => {
     BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
     BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
+    // }, 100)
   }
   }
   onPageEnd: (url?: string) => void = () => {
   onPageEnd: (url?: string) => void = () => {
-    this.isPageEnd = true
     Logger.debug(TAG, 'onPageEnd');
     Logger.debug(TAG, 'onPageEnd');
+    this.onWebPrepared()
+    this.isPageEnd = true
   }
   }
   onLoadIntercept: (url?: string) => boolean = () => {
   onLoadIntercept: (url?: string) => boolean = () => {
     Logger.debug(TAG, 'onLoadIntercept return false');
     Logger.debug(TAG, 'onLoadIntercept return false');
     return false
     return false
   }
   }
-
-  onReloadStateChanged() {
-    Logger.info(TAG, `onReloadStateChanged:::refresh, this.reload: ${this.reload}`);
-    if (this.reload > 0) {
-      this.webviewControl.refresh()
-    }
-  }
 }
 }
 
 

@@ -12,8 +12,7 @@ const TAG = 'WdWebLocalComponent';
 @Component
 @Component
 export struct WdWebLocalComponent {
 export struct WdWebLocalComponent {
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
-  onWebPrepared: () => void = () => {
-  }
+  onWebPrepared: () => void = () => {}
   @Prop backVisibility: boolean = false
   @Prop backVisibility: boolean = false
   @Prop webResource: Resource = {} as Resource
   @Prop webResource: Resource = {} as Resource
   @State webHeight: string | number = '100%'
   @State webHeight: string | number = '100%'
@@ -73,6 +72,7 @@ export struct WdWebLocalComponent {
     for (let i = 0; i < H5CallNativeType.JsCallTypeList.length; i++) {
     for (let i = 0; i < H5CallNativeType.JsCallTypeList.length; i++) {
       let handleName = H5CallNativeType.JsCallTypeList[i];
       let handleName = H5CallNativeType.JsCallTypeList[i];
       let handle = (data: Message, f: Callback) => {
       let handle = (data: Message, f: Callback) => {
+        Logger.debug('registerHandlers handlerName: ' + JSON.stringify(data.data))
         this.setCurrentPageOperate(data)
         this.setCurrentPageOperate(data)
         this.defaultPerformJSCallNative(data, f)
         this.defaultPerformJSCallNative(data, f)
       };
       };

@@ -19,7 +19,7 @@ export interface CompDTO {
   name: string;
   name: string;
   objectId: string; // 跳转页面id?
   objectId: string; // 跳转页面id?
   objectTitle: string; // comp标题
   objectTitle: string; // comp标题
-  objectType?: string; // 跳转类型，枚举：
+  // objectType?: string; // 跳转类型，枚举：
   operDataList: ContentDTO[]; // 运营数据列表【正常运营配置的强运营数据，部分推荐场景的配置（自动源兜底数据）】
   operDataList: ContentDTO[]; // 运营数据列表【正常运营配置的强运营数据，部分推荐场景的配置（自动源兜底数据）】
   // pageId?: any;
   // pageId?: any;
   posterSize: string;
   posterSize: string;

-import { Action, ContentDetailDTO, } from 'wdBean';
-import DetailViewModel from '../viewmodel/DetailViewModel';
+import { Action, H5ReceiveDetailBean } from 'wdBean';
 import { WdWebComponent } from 'wdWebComponent';
 import { WdWebComponent } from 'wdWebComponent';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { BridgeWebViewControl } from 'wdJsBridge/Index';
 import { BridgeWebViewControl } from 'wdJsBridge/Index';
 import { detailedSkeleton } from './skeleton/detailSkeleton'
 import { detailedSkeleton } from './skeleton/detailSkeleton'
-
+import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
 const TAG = 'SpacialTopicPageComponent'
 const TAG = 'SpacialTopicPageComponent'
 
 
 @Component
 @Component
@@ -15,6 +14,28 @@ export struct SpacialTopicPageComponent {
   action: Action = {} as Action
   action: Action = {} as Action
   @State webUrl: string = '';
   @State webUrl: string = '';
   @State isPageEnd: boolean = false
   @State isPageEnd: boolean = false
+  private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
+  private webPrepared = false;
+  private dataPrepared = false;
+
+  private trySendData2H5() {
+    if (!this.webPrepared || !this.dataPrepared) {
+      return
+    }
+    // 数据、web组件，都准备好了，开始塞详情数据
+    this.sendContentData2H5(this.h5ReceiveAppData)
+  }
+
+  private onWebPrepared() {
+    this.webPrepared = true
+    this.trySendData2H5()
+  }
+
+  private sendContentData2H5(h5ReceiveAppData: H5ReceiveDetailBean) {
+    this.webviewControl.callHandle(NativeCallH5Type.jsCall_receiveAppData,
+      JSON.stringify(h5ReceiveAppData), (data: string) => {
+      })
+  }
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -27,7 +48,8 @@ export struct SpacialTopicPageComponent {
             webviewControl: this.webviewControl,
             webviewControl: this.webviewControl,
             webUrl: this.webUrl,
             webUrl: this.webUrl,
             backVisibility: false,
             backVisibility: false,
-            isPageEnd:$isPageEnd
+            onWebPrepared: this.onWebPrepared.bind(this),
+            isPageEnd: $isPageEnd
           })
           })
         }
         }
         .padding({ bottom: 56 })
         .padding({ bottom: 56 })
@@ -72,7 +94,6 @@ export struct SpacialTopicPageComponent {
         .justifyContent(FlexAlign.SpaceBetween)
         .justifyContent(FlexAlign.SpaceBetween)
         .backgroundColor(Color.White)
         .backgroundColor(Color.White)
 
 
-
       }
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
@@ -83,8 +104,10 @@ export struct SpacialTopicPageComponent {
     if (action) {
     if (action) {
       this.webUrl = action.params?.url || ''
       this.webUrl = action.params?.url || ''
     }
     }
+    this.trySendData2H5()
   }
   }
 
 
   aboutToDisappear() {
   aboutToDisappear() {
+
   }
   }
 }
 }

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { CollectionUtils, DateTimeUtils, Logger, StringUtils, ToastUtils } from 'wdKit/Index';
+import { Logger } from 'wdKit/Index';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 
 
 const TAG = 'Zh_Grid_Layout-02';
 const TAG = 'Zh_Grid_Layout-02';
@@ -31,8 +31,6 @@ export struct ZhGridLayout02 {
 
 
   build() {
   build() {
     Column() {
     Column() {
-
-
       Scroll() {
       Scroll() {
         Column() {
         Column() {
           Row() {
           Row() {
@@ -46,10 +44,12 @@ export struct ZhGridLayout02 {
               .fontWeight(600)
               .fontWeight(600)
           }
           }
           .justifyContent(FlexAlign.Start)
           .justifyContent(FlexAlign.Start)
+
           .margin({ top: 8, bottom: 8 })
           .margin({ top: 8, bottom: 8 })
           .width(CommonConstants.FULL_WIDTH)
           .width(CommonConstants.FULL_WIDTH)
 
 
           GridRow({
           GridRow({
+            gutter: { x: 12, y: 22 },
             columns: { sm: listSize, md: 2 },
             columns: { sm: listSize, md: 2 },
             breakpoints: { value: ['320vp', '520vp', '840vp'] }
             breakpoints: { value: ['320vp', '520vp', '840vp'] }
           }) {
           }) {
@@ -60,7 +60,6 @@ export struct ZhGridLayout02 {
             })
             })
           }
           }
         }
         }
-
       }
       }
       .width("100%")
       .width("100%")
       .height("100%")
       .height("100%")
@@ -82,12 +81,9 @@ export struct ZhGridLayout02 {
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     // .width("100%")
     // .width("100%")
     .height("100%")
     .height("100%")
+    .padding({ left: 16, right: 16 })
+
     // .layoutWeight(1)
     // .layoutWeight(1)
-    .padding({
-      top: 14,
-      left: 16,
-      right: 16
-    })
 
 
   }
   }
 
 
@@ -100,9 +96,9 @@ export struct ZhGridLayout02 {
   buildItemCard(item: ContentDTO) {
   buildItemCard(item: ContentDTO) {
     Column() {
     Column() {
       Image(item.fullColumnImgUrls[0].url)
       Image(item.fullColumnImgUrls[0].url)
-        .width(170)
+        .width('100%')
         .height(95)
         .height(95)
-        .margin(16)
+        .borderRadius(4)
       Text(item.newsTitle)
       Text(item.newsTitle)
         .fontSize(13)
         .fontSize(13)
         .maxLines(2)
         .maxLines(2)

@@ -68,6 +68,7 @@ export struct PeopleShipHomeArticleListComponent {
           }
           }
           if(!this.isLoading && this.hasMore){
           if(!this.isLoading && this.hasMore){
             //加载分页数据
             //加载分页数据
+            this.currentPage++;
             this.getPeopleShipPageArticleList(resolve)
             this.getPeopleShipPageArticleList(resolve)
           }else  {
           }else  {
             if(resolve)  {
             if(resolve)  {
@@ -132,7 +133,7 @@ export struct PeopleShipHomeArticleListComponent {
   }
   }
 
 
   onChange() {
   onChange() {
-    if (this.currentIndex == this.currentTopSelectedIndex) {
+    if (this.currentIndex == this.currentTopSelectedIndex && this.arr.length == 0) {
       this.currentPage = 1
       this.currentPage = 1
       this.getPeopleShipPageArticleList()
       this.getPeopleShipPageArticleList()
     }
     }
@@ -163,7 +164,6 @@ export struct PeopleShipHomeArticleListComponent {
       if (listData && listData.list && listData.list.length > 0) {
       if (listData && listData.list && listData.list.length > 0) {
         this.viewType = 3;
         this.viewType = 3;
         if (listData.list.length === 20) {
         if (listData.list.length === 20) {
-          this.currentPage++;
           this.hasMore = true;
           this.hasMore = true;
         } else {
         } else {
           this.hasMore = false;
           this.hasMore = false;
@@ -211,6 +211,9 @@ export struct PeopleShipHomeArticleListComponent {
   private articleListDTOChangeContentDTO(listData: ArticleListData, listCom: InteractDataDTO[]) {
   private articleListDTOChangeContentDTO(listData: ArticleListData, listCom: InteractDataDTO[]) {
     this.isLoading = false
     this.isLoading = false
     if (listData.list.length) {
     if (listData.list.length) {
+      if (this.currentPage == 1) {
+        this.arr = []
+      }
       for (const element of listData.list) {
       for (const element of listData.list) {
         let contentDTO = {} as ContentDTO
         let contentDTO = {} as ContentDTO
         contentDTO.appStyle = this.changeCommon(element.appStyle)
         contentDTO.appStyle = this.changeCommon(element.appStyle)

@@ -10,7 +10,7 @@ export  struct CustomPullToRefresh {
   onLoadMore: (resolve?: (value: string | PromiseLike<string>) => void) => void = () => {
   onLoadMore: (resolve?: (value: string | PromiseLike<string>) => void) => void = () => {
   }
   }
   ///是否存在上拉更多
   ///是否存在上拉更多
-  @Prop hasMore: boolean = true
+  @Prop @Watch('hasMoreChange') hasMore: boolean = true
   refreshConfigurator: PullToRefreshConfigurator = new PullToRefreshConfigurator().setHasLoadMore(this.hasMore);
   refreshConfigurator: PullToRefreshConfigurator = new PullToRefreshConfigurator().setHasLoadMore(this.hasMore);
   build() {
   build() {
     Column(){
     Column(){
@@ -36,4 +36,8 @@ export  struct CustomPullToRefresh {
       })
       })
     }
     }
   }
   }
+
+  hasMoreChange() {
+    this.refreshConfigurator.setHasLoadMore(this.hasMore)
+  }
 }
 }

@@ -25,6 +25,7 @@ export class ProcessUtils {
       return;
       return;
     }
     }
     let type = content.objectType;
     let type = content.objectType;
+    console.log(TAG,'objectType',`${JSON.stringify(content)}`);
     switch (type) {
     switch (type) {
       case ContentConstants.TYPE_NONE:
       case ContentConstants.TYPE_NONE:
         Logger.debug(TAG, "processPage, do nothing");
         Logger.debug(TAG, "processPage, do nothing");
@@ -59,7 +60,7 @@ export class ProcessUtils {
         break;
         break;
     //动态详情页（动态视频）
     //动态详情页（动态视频）
       case ContentConstants.TYPE_FIFTEEN:
       case ContentConstants.TYPE_FIFTEEN:
-        ProcessUtils.gotoDynamicDetailPage(content);
+        ProcessUtils.gotoWeb(content);
         break;
         break;
       default:
       default:
         break;
         break;

@@ -32,7 +32,7 @@ struct DefaultWebPage {
       WdWebComponent({
       WdWebComponent({
         webUrl: this.url,
         webUrl: this.url,
         backVisibility: false,
         backVisibility: false,
-        reload: this.reload,
+        // reload: this.reload,
         isPageEnd:$isPageEnd
         isPageEnd:$isPageEnd
       })
       })
     }
     }