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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 楼层数据请求失败回调补充
  fix |> 修复竖屏直播回放播放控制层底部间距距离屏幕边缘过小问题

@@ -169,8 +169,6 @@ export class BridgeWebViewControl extends webview.WebviewController {
     // messageJson = messageJson.replace("%7B", encodeURIComponent("%7B"));
     // messageJson = messageJson.replace("%7D", encodeURIComponent("%7D"));
     // messageJson = messageJson.replace("%22", encodeURIComponent("%22"));
-    // messageJson = messageJson.replace("/\n/g", "\\n").replace("/\r/g", "\\r").replace("/\f/g", "\\f").replace("/\"/g", "\\\"").replace("/\'/g", "\\\'").replace("/\u2028/g", "\\u2028").replace("/\u2029/g", "\\u2029");
-
 
     let javascriptCommand: string = StringUtils.formatStringForJS(BridgeUtil.JS_HANDLE_MESSAGE_FROM_JAVA, messageJson);
     // hilog.error(0xFF00, TAG, 'dispatchMessage111 '+ javascriptCommand.slice(0,2000));

@@ -54,7 +54,15 @@ export struct PageComponent {
           emptyType: this.pageModel.emptyType,
           emptyButton: true,
           retry: () => {
+            this.pageModel.viewType = ViewType.LOADING;
             this.getData()
+            // this.pageModel.pageId = this.pageId;
+            // this.pageModel.groupId = this.pageId;
+            // this.pageModel.channelId = this.channelId;
+            // this.pageModel.currentPage = 1;
+            // this.pageModel.pageTotalCompSize = 0;
+            // this.listScroller.scrollToIndex(0)
+            // autoRefresh(this.pageModel, this.pageAdvModel)
           }
         })
           .backgroundColor(Color.White)
@@ -277,6 +285,7 @@ export struct PageComponent {
     Logger.info(TAG,
       `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
     if (this.navIndex === this.currentTopNavSelectedIndex) {
+      Logger.debug(TAG, 'page onAutoRefresh111 ' + this.needload)
       if (this.needload) {
         this.getData();
       }

@@ -66,7 +66,7 @@ export class PageViewModel extends BaseViewModel {
    * @returns
    */
   async getPageGroupCompData(pageModel: PageUIReqBean): Promise<PageDTO> {
-    Logger.debug(TAG, 'getPageData pageId: ' + pageModel.pageId);
+    Logger.debug(TAG, 'getPageGroupCompData pageId: ' + pageModel.pageId);
     if (pageModel.isRecGroup) {
       return this.parseComp(PageRepository.fetchRecCompData(pageModel))
     } else {
@@ -75,6 +75,7 @@ export class PageViewModel extends BaseViewModel {
   }
 
   private parseComp(getData: Promise<ResponseDTO<PageDTO>>): Promise<PageDTO> {
+    Logger.debug(TAG, 'parseComp11111111 ');
     return new Promise<PageDTO>((success, error) => {
       getData
         .then((resDTO: ResponseDTO<PageDTO>) => {
@@ -225,6 +226,7 @@ export class PageViewModel extends BaseViewModel {
   }
 
   async getPageInfo(pageId: string): Promise<PageInfoDTO> {
+    Logger.info(TAG, "getPageInfo：" + pageId);
     return new Promise<PageInfoDTO>((success, error) => {
       PageRepository.fetchPageData(pageId).then((resDTO: ResponseDTO<PageInfoDTO>) => {
         if (!resDTO || !resDTO.data) {
@@ -235,6 +237,9 @@ export class PageViewModel extends BaseViewModel {
         Logger.info(TAG, "getPageInfo then,resDTO.timeStamp:" + resDTO.timestamp);
         resDTO.data.md5 = resDTO.meta?.md5 || ''
         success(resDTO.data as PageInfoDTO);
+      }).catch((err: Error) => {
+        Logger.error(TAG, `getPageInfo then,error.name : ${err.name},  error.message:${err.message}`);
+        error(err);
       });
     });
   }

@@ -18,7 +18,7 @@ export struct PlayerVideoControlComponent {
   @Consume contentDetailData: ContentDetailDTO
   @Consume isSmall:boolean
   @Consume isFullScreen: boolean
-
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   aboutToAppear(): void {
     if (this.playerController) {
       //播放进度监听
@@ -100,7 +100,7 @@ export struct PlayerVideoControlComponent {
       left: 10,
       right: 10,
       top: 15,
-      bottom: 15
+      bottom:`${this.bottomSafeHeight}px`
     })
   }