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

# Conflicts:
#	sight_harmony/features/wdComponent/Index.ets

@@ -20,47 +20,47 @@ export const enum CompStyle {
   Masonry_Layout_01 = 'Masonry_Layout-01', // 双列瀑布流/瀑布流卡：视频、直播、专题、活动
   Masonry_Layout_01 = 'Masonry_Layout-01', // 双列瀑布流/瀑布流卡：视频、直播、专题、活动
 
 
 
 
-  Zh_Carousel_Layout_01 = 'Zh_Carousel_Layout-01', //1 轮播图卡---1
-  Zh_Single_Row_01 = 'Zh_Single_Row-01', //2 横划卡 imageScale-封面图比例 1-4:3, 2-16:9, 3-3:2---1
-  Zh_Single_Row_02 = 'Zh_Single_Row-02', //3 小视频横划卡---1
+  Zh_Carousel_Layout_01 = 'Zh_Carousel_Layout-01', //1 轮播图卡
+  Zh_Single_Row_01 = 'Zh_Single_Row-01', //2 横划卡 imageScale-封面图比例 1-4:3, 2-16:9, 3-3:2
+  Zh_Single_Row_02 = 'Zh_Single_Row-02', //3 小视频横划卡
   Zh_Single_Row_03 = 'Zh_Single_Row-03', //6 直播预约卡
   Zh_Single_Row_03 = 'Zh_Single_Row-03', //6 直播预约卡
-  Zh_Single_Row_04 = 'Zh_Single_Row-04', // 地方精选卡---2
-  Zh_Single_Row_05 = 'Zh_Single_Row-05', //15 人民号横划卡---1
-  Zh_Single_Row_06 = 'Zh_Single_Row-06', //20 热门评论卡--精选评论卡-1
+  Zh_Single_Row_04 = 'Zh_Single_Row-04', // 地方精选卡
+  Zh_Single_Row_05 = 'Zh_Single_Row-05', //15 人民号横划卡
+  Zh_Single_Row_06 = 'Zh_Single_Row-06', //20 热门评论卡--精选评论卡
   Zh_Single_Column_01 = 'Zh_Single_Column-01', //5 专题时间链卡
   Zh_Single_Column_01 = 'Zh_Single_Column-01', //5 专题时间链卡
-  Zh_Single_Column_02 = 'Zh_Single_Column-02', //10 头图卡---2
+  Zh_Single_Column_02 = 'Zh_Single_Column-02', //10 头图卡
   Zh_Single_Column_03 = 'Zh_Single_Column-03', //9 直播大图卡
   Zh_Single_Column_03 = 'Zh_Single_Column-03', //9 直播大图卡
-  Zh_Single_Column_04 = 'Zh_Single_Column-04', //17 人民号主题卡---1
-  Zh_Single_Column_05 = 'Zh_Single_Column-05', //16 人民号入驻卡---1
+  Zh_Single_Column_04 = 'Zh_Single_Column-04', //17 人民号主题卡
+  Zh_Single_Column_05 = 'Zh_Single_Column-05', //16 人民号入驻卡
   Zh_Single_Column_06 = 'Zh_Single_Column-06', //12 本地问政卡
   Zh_Single_Column_06 = 'Zh_Single_Column-06', //12 本地问政卡
   Zh_Single_Column_07 = 'Zh_Single_Column-07', //14 热门留言卡
   Zh_Single_Column_07 = 'Zh_Single_Column-07', //14 热门留言卡
   Zh_Single_Column_08 = 'Zh_Single_Column-08', //12 问政提问卡
   Zh_Single_Column_08 = 'Zh_Single_Column-08', //12 问政提问卡
   Zh_Single_Column_10 = 'Zh_Single_Column-10', //18 服务组合卡
   Zh_Single_Column_10 = 'Zh_Single_Column-10', //18 服务组合卡
   Zh_Single_Column_11 = 'Zh_Single_Column-11', //19 问政组合卡
   Zh_Single_Column_11 = 'Zh_Single_Column-11', //19 问政组合卡
   Zh_Grid_Layout_01 =  'Zh_Grid_Layout-01', //4 信息流组合卡
   Zh_Grid_Layout_01 =  'Zh_Grid_Layout-01', //4 信息流组合卡
-  Zh_Grid_Layout_02 = 'Zh_Grid_Layout-02', //7 双列流小视频,一行两图卡---1
-  Zh_Grid_Layout_03 = 'Zh_Grid_Layout-03', //11 金刚位卡---2
+  Zh_Grid_Layout_02 = 'Zh_Grid_Layout-02', //7 双列流小视频,一行两图卡
+  Zh_Grid_Layout_03 = 'Zh_Grid_Layout-03', //11 金刚位卡
   Card_01 = '1', // 小图卡
   Card_01 = '1', // 小图卡
-  Card_02 = '2', // 大图卡---2
-  Card_03 = '3', // 无图卡(全标题)---2
-  Card_04 = '4', // 三图卡---2
-  Card_05 = '5', // 头图卡---2
-  Card_06 = '6', // 小视频卡---2
+  Card_02 = '2', // 大图卡
+  Card_03 = '3', // 无图卡(全标题)
+  Card_04 = '4', // 三图卡
+  Card_05 = '5', // 头图卡
+  Card_06 = '6', // 小视频卡
   Card_07 = '7', // 作者卡
   Card_07 = '7', // 作者卡
   Card_08 = '8', // 财经快讯卡
   Card_08 = '8', // 财经快讯卡
-  Card_09 = '9', // 时间轴卡---2
-  Card_10 = '10', // 大专题卡---2
-  Card_11 = '11', // 无图卡(标题省略)---2
-  Card_12 = '12', // 无图卡人民号---1
-  Card_13 = '13', // 单图卡---2--同6
-  Card_14 = '14', // 单图卡人民号---1
-  Card_15 = '15', // 大图卡人民号---1
-  Card_16 = '16', // 三图卡人民号---1
-  Card_17 = '17', // 图卡集---2
+  Card_09 = '9', // 时间轴卡
+  Card_10 = '10', // 大专题卡
+  Card_11 = '11', // 无图卡(标题省略)
+  Card_12 = '12', // 无图卡人民号
+  Card_13 = '13', // 单图卡--同6
+  Card_14 = '14', // 单图卡人民号
+  Card_15 = '15', // 大图卡人民号
+  Card_16 = '16', // 三图卡人民号
+  Card_17 = '17', // 图卡集
   Card_18 = '18', // 图卡集人民号
   Card_18 = '18', // 图卡集人民号
-  Card_19 = '19', // 动态图文卡人民号---1
-  Card_20 = '20', // 动态视频卡人民号---1
-  Card_21 = '21', // 小视频卡人民号---1
+  Card_19 = '19', // 动态图文卡人民号
+  Card_20 = '20', // 动态视频卡人民号
+  Card_21 = '21', // 小视频卡人民号
   Card_22 = '22', // 时间链
   Card_22 = '22', // 时间链
   Card_23 = '23', // 问政卡
   Card_23 = '23', // 问政卡
 }
 }

+/**
+ * https://developer.huawei.com/consumer/cn/doc/harmonyos-references/js-apis-window-0000001820880785#ZH-CN_TOPIC_0000001811317218__systembarproperties
+ * 状态栏、导航栏的属性。
+ */
+
+/**
+ * 状态栏背景颜色 statusBarColor
+ * 导航栏背景颜色 navigationBarColor
+ */
+export const enum SysStatusBarColor {
+  WHITE = '#ffffff',
+  BLACK = '#000000',
+  DEFAULT = '#0x66000000'
+}
+
+
+/**
+ * 状态栏文字颜色 statusBarContentColor8
+ * 导航栏文字颜色 navigationBarContentColor8
+ */
+export const enum SysBarContentColor {
+  WHITE = '#ffffff',
+  BLACK = '#000000',
+  DEFAULT = '0xE5FFFFFF'
+}
+
+
+

@@ -38,4 +38,8 @@ export { NumberFormatterUtils } from './src/main/ets/utils/NumberFormatterUtils'
 
 
 // export { PermissionUtils } from './src/main/ets/utils/PermissionUtils'
 // export { PermissionUtils } from './src/main/ets/utils/PermissionUtils'
 
 
-export { ErrorToastUtils } from './src/main/ets/utils/ErrorToastUtils'
+export { ErrorToastUtils } from './src/main/ets/utils/ErrorToastUtils'
+
+export { EmitterUtils } from './src/main/ets/utils/EmitterUtils'
+
+export { EmitterEventId } from './src/main/ets/utils/EmitterEventId'

@@ -65,6 +65,13 @@ export class CollectionUtils {
     return collection.length > 0;
     return collection.length > 0;
   }
   }
 
 
+  static getElement(collection?: any[], index?: number): any {
+    if (CollectionUtils.isEmpty(collection) || index === undefined) {
+      return null;
+    }
+    return index >= 0 && index < collection.length ? collection[index] : null;
+  }
+
   static getListSize(collection?: any[]): number {
   static getListSize(collection?: any[]): number {
     return CollectionUtils.isEmpty(collection) ? 0 : collection.length;
     return CollectionUtils.isEmpty(collection) ? 0 : collection.length;
   }
   }
@@ -180,12 +187,5 @@ export class CollectionUtils {
     return collection.slice(start, end);
     return collection.slice(start, end);
   }
   }
 
 
-
-  static getElement(collection?: any[], index?: number): any {
-    if (CollectionUtils.isEmpty(collection) || index === undefined) {
-      return null;
-    }
-    return index >= 0 && index < collection.length ? collection[index] : null;
-  }
 }
 }
 
 

+/**
+ * 线程间通信事件id枚举
+ */
+export enum EmitterEventId {
+  // 通知登出，事件id
+  FORCE_USER_LOGIN_OUT = 1
+}
+

+import emitter from '@ohos.events.emitter';
+
+const TAG: string = 'EmitterUtils';
+
+/**
+ * 线程间通信简单工具
+ */
+export class EmitterUtils {
+  /**
+   * 发送空消息
+   * @param eventId 事件id
+   */
+  static sendEmptyEvent(eventId: number) {
+    let event: emitter.InnerEvent = {
+      eventId: eventId,
+      priority: emitter.EventPriority.LOW
+    };
+    emitter.emit(event);
+  }
+
+  /**
+   * 发送消息
+   * @param eventId 事件id
+   * @param str 字符串数据
+   */
+  static sendEvent(eventId: number, str?: string) {
+    let event: emitter.InnerEvent = {
+      eventId: eventId,
+      priority: emitter.EventPriority.LOW
+    };
+    let eventData: emitter.EventData = {
+      data: {
+        jsonStr: str
+      }
+    };
+    emitter.emit(event, eventData);
+  }
+
+  /**
+   * 接收消息
+   * @param eventId 事件id
+   * @param callback 回调函数
+   */
+  static receiveEvent(eventId: number, callback: (str?: string) => void) {
+    let event: emitter.InnerEvent = {
+      eventId: eventId
+    };
+
+    // 收到eventId事件后执行该回调
+    let callback1 = (eventData?: emitter.EventData): void => {
+      if (eventData && eventData.data) {
+        try {
+          let jsonObject: EmitterBean = JSON.parse(JSON.stringify(eventData.data))
+          callback(jsonObject.jsonStr)
+        } catch (err) {
+          callback()
+        }
+      } else {
+        callback()
+      }
+    };
+    // 订阅eventId事件
+    emitter.on(event, callback1);
+  }
+}
+
+interface EmitterBean {
+  jsonStr: string
+}

@@ -4,3 +4,5 @@ export { HttpRequest as WDHttp } from "./src/main/ets/http/HttpRequest"
 
 
 export { HttpUrlUtils } from "./src/main/ets/http/HttpUrlUtils"
 export { HttpUrlUtils } from "./src/main/ets/http/HttpUrlUtils"
 
 
+export { HttpBizUtil } from "./src/main/ets/http/HttpBizUtil"
+

+/*
+ * refresh token接口返回
+ */
+export interface RefreshTokenRes {
+  jwtToken: string;
+  refreshToken: string;
+}

+import { SpConstants } from 'wdConstant/Index';
+import { EmitterEventId, EmitterUtils, Logger, SPHelper, ToastUtils } from 'wdKit/Index';
+import HashMap from '@ohos.util.HashMap';
+import { ResponseDTO } from '../bean/ResponseDTO';
+import { HttpUrlUtils, WDHttp } from '../../../../Index';
+import { RefreshTokenRes } from '../bean/RefreshTokenRes';
+
+const TAG: string = 'HttpBizUtil'
+
+/**
+ * 网络请求工具，业务封装http，暂添加TokenInterceptor功能
+ * TODO 待优化，将HttpBizUtil接入 AxiosInstance.interceptors.response.use
+ */
+export class HttpBizUtil {
+  /**
+   * get请求，封装了刷新token逻辑，接口选用，不涉及业务接口可以用原来的接口（如page接口）。
+   *
+   * @param url 请求地址
+   * @param headers 请求header参数
+   * @returns 返回值
+   */
+  static get<T = string>(url: string, headers?: HashMap<string, string>): Promise<ResponseDTO<T>> {
+    return new Promise<ResponseDTO<T>>((success, debug) => {
+      WDHttp.get<ResponseDTO<T>>(url, headers).then((resDTO: ResponseDTO<T>) => {
+        Logger.debug(TAG, 'get: ' + resDTO.code)
+        Logger.debug(TAG, 'get: ' + resDTO.message)
+        // 403：临时token；406：强制下线、封禁、清空登录信息还要跳转登录页面
+        if (resDTO.code == 403 || resDTO.code == 406) {
+          HttpBizUtil.refreshToken().then((token: string) => {
+            if (headers) {
+              headers.replace('RMRB-X-TOKEN', token)
+              headers.replace('cookie', 'RMRB-X-TOKEN=' + token)
+            }
+            Logger.debug(TAG, 'get again send: ' + token)
+            // refreshToken为空场景不处理，直接请求接口。
+            WDHttp.get<ResponseDTO<T>>(url, headers).then((resDTO: ResponseDTO<T>) => {
+              Logger.debug(TAG, 'get again: ' + resDTO.message)
+              success(resDTO)
+            }).catch((res: object) => {
+              debug(res)
+            })
+          });
+        } else {
+          success(resDTO)
+        }
+      }).catch((res: object) => {
+        debug(res)
+      })
+    })
+  }
+
+  /**
+   * post请求，封装了刷新token逻辑，接口选用，不涉及业务接口可以用原来的接口（如page接口）。
+   *
+   * @param url 请求地址
+   * @param headers 请求header参数
+   * @returns 返回值
+   */
+  static post<T = string>(url: string, data?: object, headers?: HashMap<string, string>): Promise<ResponseDTO<T>> {
+    return new Promise<ResponseDTO<T>>((success, debug) => {
+      WDHttp.post<ResponseDTO<T>>(url, data, headers).then((resDTO: ResponseDTO<T>) => {
+        Logger.debug(TAG, 'post: ' + resDTO.code)
+        Logger.debug(TAG, 'post: ' + resDTO.message)
+        // 403：临时token；406：强制下线、封禁、清空登录信息还要跳转登录页面
+        if (resDTO.code == 0 || resDTO.code == 406) {
+          HttpBizUtil.refreshToken().then((token: string) => {
+            if (headers) {
+              headers.replace('RMRB-X-TOKEN', token)
+              headers.replace('cookie', 'RMRB-X-TOKEN=' + token)
+            }
+            // refreshToken为空场景不处理，直接请求接口。
+            WDHttp.post<ResponseDTO<T>>(url, headers).then((resDTO: ResponseDTO<T>) => {
+              success(resDTO)
+            }).catch((res: object) => {
+              debug(res)
+            })
+          });
+        } else {
+          success(resDTO)
+        }
+      }).catch((res: object) => {
+        debug(res)
+      })
+    })
+  }
+
+  /*
+   * 获取刷新后的token，可能为空
+   */
+  static refreshToken(): Promise<string> {
+    let url = HttpUrlUtils.getRefreshTokenUrl();
+    let params: HashMap<string, string> = new HashMap<string, string>()
+    params.set('refreshToken', HttpUrlUtils.getRefreshToken())
+    params.set('deviceId', HttpUrlUtils.getDeviceId())
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    Logger.debug(TAG, 'refreshToken getRefreshToken: ' + HttpUrlUtils.getRefreshToken())
+    // // 请求刷新token接口
+    return new Promise<string>((success, debug) => {
+      WDHttp.post<ResponseDTO<RefreshTokenRes>>(url, params, headers).then((resDTO: ResponseDTO<RefreshTokenRes>) => {
+        let newToken = ''
+        if (resDTO) {
+          Logger.debug(TAG, 'refreshToken getRefreshToken: ' + resDTO.message)
+          Logger.debug(TAG, 'refreshToken getRefreshToken: ' + resDTO.code)
+          if (resDTO.code == 377) {
+            // 377强制用户下线、重新登录、封禁等场景；refreshToken 失效
+            ToastUtils.showToast("已登出，请重新登入", 1000);
+            EmitterUtils.sendEmptyEvent(EmitterEventId.FORCE_USER_LOGIN_OUT)
+            // WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+          } else if (resDTO.code == 0 && resDTO.data) {
+            newToken = resDTO.data.jwtToken
+            let refreshToken = resDTO.data.refreshToken
+            SPHelper.default.save(SpConstants.USER_JWT_TOKEN, newToken)
+            SPHelper.default.save(SpConstants.USER_REFRESH_TOKEN, refreshToken)
+            Logger.debug(TAG, 'refreshToken jwtToken: ' + resDTO.data.jwtToken)
+            Logger.debug(TAG, 'refreshToken refreshToken: ' + resDTO.data.refreshToken)
+          }
+        }
+        success(newToken)
+      });
+    })
+  }
+}

@@ -35,6 +35,10 @@ export class HttpUrlUtils {
    */
    */
   static readonly COMP_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/compInfo";
   static readonly COMP_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/compInfo";
   /**
   /**
+   * 展现comp接口(推荐)
+   */
+  static readonly COMP_REC_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/rec/compInfo";
+  /**
    * 详情页面详情接口
    * 详情页面详情接口
    */
    */
   static readonly DETAIL_PATH: string = "/api/rmrb-bff-display-zh/content/zh/c/content/detail";
   static readonly DETAIL_PATH: string = "/api/rmrb-bff-display-zh/content/zh/c/content/detail";
@@ -108,6 +112,10 @@ export class HttpUrlUtils {
    */
    */
   static readonly APPOINTMENT_userArea_PATH: string = "/api/rmrb-content-center/c/service/sys-area/treeselect";
   static readonly APPOINTMENT_userArea_PATH: string = "/api/rmrb-content-center/c/service/sys-area/treeselect";
   /**
   /**
+   * 用户token刷新接口（token过期，需要刷新）
+   */
+  static readonly REFRESH_TOKEN_PATH: string = "/api/rmrb-user-center/auth/zh/c/refreshToken";
+  /**
    /**
    /**
    * 个人中心  关注列表详情
    * 个人中心  关注列表详情
    */
    */
@@ -131,7 +139,11 @@ export class HttpUrlUtils {
   /**
   /**
    * 我的收藏
    * 我的收藏
    */
    */
-  static readonly APPOINTMENT_MyCollectionList_PATH: string = "/api/rmrb-interact/content/zh/c/interact";
+  static readonly APPOINTMENT_MyCollectionList_PATH: string = "/api/rmrb-bff-display-zh/content/zh/c/interact";
+  /**
+   * 收藏/取消收藏  status ：收藏状态 1添加收藏 0取消收藏
+   */
+  static readonly APPOINTMENT_ExecuteCollcet_PATH: string = "/api/rmrb-interact/interact/zh/c/collect/executeCollcetRecord";
   /**
   /**
    * 个人中心  我的评论列表
    * 个人中心  我的评论列表
    */
    */
@@ -180,7 +192,6 @@ export class HttpUrlUtils {
    * 搜索主页 热词
    * 搜索主页 热词
    */
    */
   static readonly SEARCH_HOTS_DATA_PATH: string = "/api/rmrb-search-api/zh/c/hots";
   static readonly SEARCH_HOTS_DATA_PATH: string = "/api/rmrb-search-api/zh/c/hots";
-
   /**
   /**
    * 搜索联想词
    * 搜索联想词
    */
    */
@@ -190,7 +201,6 @@ export class HttpUrlUtils {
    * 直播详情
    * 直播详情
    */
    */
   static readonly LIVE_DETAILS_PATH: string = "/api/rmrb-bff-display-zh/content/zh/c/content/detail";
   static readonly LIVE_DETAILS_PATH: string = "/api/rmrb-bff-display-zh/content/zh/c/content/detail";
-
   /**
   /**
    * 直播详情-直播间列表
    * 直播详情-直播间列表
    */
    */
@@ -350,7 +360,7 @@ export class HttpUrlUtils {
     return '';
     return '';
   }
   }
 
 
-  private static getDeviceId() {
+  public static getDeviceId() {
     // TODO
     // TODO
     return '8a81226a-cabd-3e1b-b630-b51db4a720ed';
     return '8a81226a-cabd-3e1b-b630-b51db4a720ed';
   }
   }
@@ -444,6 +454,10 @@ export class HttpUrlUtils {
     return url;
     return url;
   }
   }
 
 
+  static getRefreshTokenUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.REFRESH_TOKEN_PATH;
+    return url;
+  }
 
 
   static getResetPassworddUrl() {
   static getResetPassworddUrl() {
     let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/resetPassword";
     let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/resetPassword";
@@ -480,6 +494,20 @@ export class HttpUrlUtils {
     return url;
     return url;
   }
   }
 
 
+
+  /*优质评论页*/
+  static getQualityCommentUrl() {
+    let url = HttpUrlUtils._hostUrl + "api/rmrb-comment/comment/zh/c/highQuality"
+    return url
+  }
+
+  /*获取详情页评论列表*/
+  static getContentCommentListDataUrl() {
+    let url = HttpUrlUtils._hostUrl + "api/rmrb-comment/comment/zh/c/contentCommentList"
+    return url
+  }
+
+
   //账户注销
   //账户注销
   static accountLogoutUrl() {
   static accountLogoutUrl() {
     let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/logoff";
     let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/logoff";
@@ -498,7 +526,12 @@ export class HttpUrlUtils {
   }
   }
 
 
   static getMyCollectionListDataUrl() {
   static getMyCollectionListDataUrl() {
-    let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.APPOINTMENT_MyCollectionList_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_MyCollectionList_PATH
+    return url
+  }
+
+  static getExecuteCollcetUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_ExecuteCollcet_PATH
     return url
     return url
   }
   }
 
 

@@ -53,6 +53,12 @@ export function registerRouter() {
       return WDRouterPage.detailPlayLivePage
       return WDRouterPage.detailPlayLivePage
     } else if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
     } else if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
       return WDRouterPage.detailVideoListPage
       return WDRouterPage.detailVideoListPage
+    }else if(action.params?.detailPageType == 9){
+      //图集详情页
+      return WDRouterPage.multiPictureDetailPage
+    }else if(action.params?.detailPageType == 14 || action.params?.detailPageType == 15){
+      //动态详情页
+      return WDRouterPage.dynamicDetailPage
     } else if (action.params?.detailPageType == 17) {
     } else if (action.params?.detailPageType == 17) {
       return WDRouterPage.multiPictureDetailPage
       return WDRouterPage.multiPictureDetailPage
     } else if (action.params?.detailPageType == 13) {
     } else if (action.params?.detailPageType == 13) {
@@ -74,6 +80,8 @@ export function registerRouter() {
       return WDRouterPage.imageTextDetailPage
       return WDRouterPage.imageTextDetailPage
     } else if (action.params?.pageID == "BroadcastPage") {
     } else if (action.params?.pageID == "BroadcastPage") {
       return WDRouterPage.broadcastPage
       return WDRouterPage.broadcastPage
+    } else if (action.params?.pageID == "SPACIAL_TOPIC_PAGE") {
+      return WDRouterPage.spacialTopicPage
     }
     }
     return undefined
     return undefined
   })
   })

@@ -32,6 +32,8 @@ export class WDRouterPage {
   static morningEveningPaperPage = new WDRouterPage("phone", "ets/pages/MorningEveningPaperPage")
   static morningEveningPaperPage = new WDRouterPage("phone", "ets/pages/MorningEveningPaperPage")
   // 图文详情页
   // 图文详情页
   static imageTextDetailPage = new WDRouterPage("phone", "ets/pages/ImageAndTextDetailPage");
   static imageTextDetailPage = new WDRouterPage("phone", "ets/pages/ImageAndTextDetailPage");
+  // 专题页
+  static spacialTopicPage = new WDRouterPage("phone", "ets/pages/SpacialTopicPage");
   // 短视频详情页
   // 短视频详情页
   static detailVideoListPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailVideoListPage");
   static detailVideoListPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailVideoListPage");
   static detailPlayShortVideoPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailPlayShortVideoPage");
   static detailPlayShortVideoPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailPlayShortVideoPage");
@@ -45,6 +47,8 @@ export class WDRouterPage {
   static multiPictureDetailPage = new WDRouterPage("phone", "ets/pages/detail/MultiPictureDetailPage");
   static multiPictureDetailPage = new WDRouterPage("phone", "ets/pages/detail/MultiPictureDetailPage");
   // 音乐详情页
   // 音乐详情页
   static audioDetail = new WDRouterPage("phone", "ets/pages/detail/AudioDetail");
   static audioDetail = new WDRouterPage("phone", "ets/pages/detail/AudioDetail");
+  // 动态详情页
+  static dynamicDetailPage = new WDRouterPage("phone", "ets/pages/detail/DynamicDetailPage");
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
   static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");
   static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");
   //我的  预约
   //我的  预约

@@ -10,7 +10,7 @@ export class H5CallNativeType {
   static jsCall_callAppService = 'jsCall_callAppService'
   static jsCall_callAppService = 'jsCall_callAppService'
   // TODO 业务自行新增类型、自行在JsBridgeBiz#performJSCallNative里添加接收分支处理。
   // TODO 业务自行新增类型、自行在JsBridgeBiz#performJSCallNative里添加接收分支处理。
 
 
-  static init() {
+  static {
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_currentPageOperate)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_currentPageOperate)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_getAppPublicInfo)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_getAppPublicInfo)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_getArticleDetailBussinessData)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_getArticleDetailBussinessData)

@@ -6,6 +6,7 @@ import { BridgeHandler, BridgeUtil, BridgeWebViewControl, Callback } from 'wdJsB
 import { performJSCallNative } from './JsBridgeBiz';
 import { performJSCallNative } from './JsBridgeBiz';
 import { setDefaultNativeWebSettings } from './WebComponentUtil';
 import { setDefaultNativeWebSettings } from './WebComponentUtil';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
+import { H5CallNativeType } from './H5CallNativeType';
 
 
 const TAG = 'WdWebComponent';
 const TAG = 'WdWebComponent';
 
 
@@ -80,16 +81,11 @@ export struct WdWebComponent {
           this.onPageEnd(event?.url)
           this.onPageEnd(event?.url)
         })
         })
         .onPageBegin((event) => {
         .onPageBegin((event) => {
-          // setDefaultNativeWebSettings(this.webviewControl, this.webUrl).then(()=>{
-          //   this.handleInfo && this.handleInfo.length > 1 ? this.handleInfo.forEach(value => {
-          //     this.webviewControl.registerHandler(value[0], value[1])
-          //   }) : this.defaultRegisterHandler()
-          //   setTimeout(()=>{
-          //     BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
-          //   },500)
-          // })
-          // this.onPageBegin(event?.url)
-          // this.webviewControl?.setCustomUserAgent('Mozilla/5.0 (Linux; Android 12; HarmonyOS; OXF-AN00; HMSCore 6.13.0.302) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/14.0.6.300 Mobile Safari/537.36')
+          this.onPageBegin(event?.url);
+          this.registerHandlers();
+          setTimeout(() => {
+            BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
+          }, 200)
         })
         })
         .onLoadIntercept((event) => {
         .onLoadIntercept((event) => {
           let url: string = event.data.getRequestUrl().toString()
           let url: string = event.data.getRequestUrl().toString()
@@ -115,5 +111,16 @@ export struct WdWebComponent {
       this.webviewControl.refresh()
       this.webviewControl.refresh()
     }
     }
   }
   }
+
+  private registerHandlers(): void {
+    // 注册h5调用js相关
+    for (let i = 0; i < H5CallNativeType.JsCallTypeList.length; i++) {
+      let handleName = H5CallNativeType.JsCallTypeList[i];
+      let handle = (data: Message, f: Callback) => {
+        this.defaultPerformJSCallNative(data, f)
+      } ;
+      this.webviewControl.registerHandler(handleName, { handle: handle });
+    }
+  }
 }
 }
 
 

@@ -31,21 +31,14 @@ export struct WdWebLocalComponent {
       .visibility(this.backVisibility ? Visibility.Visible : Visibility.None)
       .visibility(this.backVisibility ? Visibility.Visible : Visibility.None)
 
 
       Web({ src: this.webResource, controller: this.webviewControl })
       Web({ src: this.webResource, controller: this.webviewControl })
+        .layoutMode(WebLayoutMode.FIT_CONTENT)
         .domStorageAccess(true)
         .domStorageAccess(true)
         .databaseAccess(true)
         .databaseAccess(true)
         .javaScriptAccess(true)
         .javaScriptAccess(true)
+        // .imageAccess(true)
+        // .onlineImageAccess(true)
+        // .fileAccess(true)
         .onPageBegin((event) => {
         .onPageBegin((event) => {
-
-          // setDefaultNativeWebSettings(this.webviewControl, this.webResource).then(()=>{
-          //   this.handleInfo && this.handleInfo.length > 1 ? this.handleInfo.forEach(value => {
-          //     this.webviewControl.registerHandler(value[0], value[1])
-          //   }) : this.defaultRegisterHandler()
-          //   setTimeout(()=>{
-          //     BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
-          //   },500)
-          // })
-          // this.onPageBegin(event?.url)
-          // BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl);
           this.onPageBegin(event?.url);
           this.onPageBegin(event?.url);
           this.registerHandlers();
           this.registerHandlers();
           setTimeout(() => {
           setTimeout(() => {
@@ -75,8 +68,6 @@ export struct WdWebLocalComponent {
   }
   }
 
 
   private registerHandlers(): void {
   private registerHandlers(): void {
-    // TODO 待优化
-    H5CallNativeType.init();
     // 注册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];
@@ -85,13 +76,6 @@ export struct WdWebLocalComponent {
       } ;
       } ;
       this.webviewControl.registerHandler(handleName, { handle: handle });
       this.webviewControl.registerHandler(handleName, { handle: handle });
     }
     }
-    // // TODO test
-    // this.webviewControl.registerHandler('changeNativeMessage', {
-    //   handle: (data: Message, f: Callback) => {
-    //     this.defaultPerformJSCallNative(data, f)
-    //   }
-    // });
-
   }
   }
 
 
   /**
   /**
@@ -107,7 +91,7 @@ export struct WdWebLocalComponent {
     Logger.debug(TAG, 'onPageEnd');
     Logger.debug(TAG, 'onPageEnd');
   }
   }
   onLoadIntercept: (url?: string) => boolean = () => {
   onLoadIntercept: (url?: string) => boolean = () => {
-    Logger.debug(TAG, 'onPageBegin return false');
+    Logger.debug(TAG, 'onLoadIntercept return false');
     return false
     return false
   }
   }
 }
 }

@@ -5,6 +5,8 @@ export { BottomNavDTO } from './src/main/ets/bean/navigation/BottomNavDTO';
 
 
 export { TopNavDTO } from './src/main/ets/bean/navigation/TopNavDTO';
 export { TopNavDTO } from './src/main/ets/bean/navigation/TopNavDTO';
 
 
+export { PageInfoDTO } from './src/main/ets/bean/navigation/PageInfoDTO';
+
 // entity
 // entity
 export { ItemDTO } from './src/main/ets/bean/ItemDTO';
 export { ItemDTO } from './src/main/ets/bean/ItemDTO';
 
 

@@ -29,5 +29,4 @@ export interface CompDTO {
   subType: string;
   subType: string;
   imageScale: number; // 封面图比例 1-4:3, 2-16:9, 3-3:2
   imageScale: number; // 封面图比例 1-4:3, 2-16:9, 3-3:2
   audioDataList: AudioDTO[];
   audioDataList: AudioDTO[];
-  isSelect: boolean;
 }
 }

@@ -62,11 +62,13 @@ export interface ContentDTO {
   // 二次请求接口，返回的数据，这里组装到content里；
   // 二次请求接口，返回的数据，这里组装到content里；
   interactData:InteractDataDTO;
   interactData:InteractDataDTO;
 
 
-  hasMore: number;
-  slideShows: slideShows[];
-  voiceInfo: VoiceInfoDTO;
-  tagWord: number;
+  hasMore: number,
+  slideShows: slideShows[],
+  voiceInfo: VoiceInfoDTO,
+  tagWord: number,
+  isSelect: boolean;
   rmhInfo: RmhInfoDTO; // 人民号信息
   rmhInfo: RmhInfoDTO; // 人民号信息
-  photoNum: string;
+  photoNum: number;
+
 
 
 }
 }

@@ -4,6 +4,7 @@ export interface VideoInfoDTO {
   resolutionWidth: number;
   resolutionWidth: number;
   videoDuration: number; // 视频时长
   videoDuration: number; // 视频时长
   videoLandScape: number; // 1横屏 2竖屏
   videoLandScape: number; // 1横屏 2竖屏
+  videoLandscape: number; // 1横屏 2竖屏
   videoType: number;
   videoType: number;
   videoUrl: string; //视频播放地址
   videoUrl: string; //视频播放地址
   firstFrameImageUri: string; // 首帧图；【视频内容，contentPictures中】
   firstFrameImageUri: string; // 首帧图；【视频内容，contentPictures中】

@@ -10,7 +10,7 @@ export interface ResponseBean{
   message: string;
   message: string;
 
 
   // 响应结果
   // 响应结果
-  data:ContentDetailDTO;
+  data:ContentDetailDTO[];
 
 
   // 请求响应时间戳（unix格式）
   // 请求响应时间戳（unix格式）
   timestamp?: number;
   timestamp?: number;

+/**
+ * page接口返回的Page数据DTO
+ */
+export interface PageInfoDTO {
+  pageId: string; // 页面id
+  id: number; // 楼层id
+  name: string; // 名称
+  hasAdInfo: number;
+  hasPopUp: number;
+  baselineShow: number;
+  groups: GroupInfoDTO[];
+  channelInfo: ChannelInfoDTO;
+}
+
+export interface ChannelInfoDTO {
+  channelId: string;
+  channelLevel: string;
+  channelName: string;
+  channelStrategy: string;
+  channelStyle: string;
+  pageId: string;
+}
+
+export interface GroupInfoDTO {
+  blockDesc: string;
+  groupStrategy: number;
+  id: string;
+  showType: number;
+  sortValue: number;
+}

@@ -64,5 +64,3 @@ export { FirstTabTopSearchComponent } from "./src/main/ets/components/search/Fir
 export { ListHasNoMoreDataUI } from "./src/main/ets/components/reusable/ListHasNoMoreDataUI"
 export { ListHasNoMoreDataUI } from "./src/main/ets/components/reusable/ListHasNoMoreDataUI"
 
 
 export { LottieView } from './src/main/ets/lottie/LottieView'
 export { LottieView } from './src/main/ets/lottie/LottieView'
-
-export { AudioSuspensionModel } from "./src/main/ets/viewmodel/AudioSuspensionModel"

@@ -16,6 +16,7 @@
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
     "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
-    "wdNetwork": "file:../../commons/wdNetwork"
+    "wdNetwork": "file:../../commons/wdNetwork",
+    "wdJsBridge": "file:../../commons/wdJsBridge"
   }
   }
 }
 }

@@ -16,6 +16,7 @@ import { ZhGridLayout03 } from './compview/ZhGridLayout03';
 import { CardParser } from './CardParser';
 import { CardParser } from './CardParser';
 import { LiveHorizontalReservationComponent } from './view/LiveHorizontalReservationComponent';
 import { LiveHorizontalReservationComponent } from './view/LiveHorizontalReservationComponent';
 import { ZhGridLayout02 } from './compview/ZhGridLayout02';
 import { ZhGridLayout02 } from './compview/ZhGridLayout02';
+import { Card5Component } from './cardview/Card5Component'
 
 
 /**
 /**
  * comp适配器.
  * comp适配器.
@@ -53,6 +54,9 @@ export struct CompParser {
       ZhGridLayout03({ compDTO: compDTO })
       ZhGridLayout03({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
       ZhSingleRow04({ compDTO: compDTO })
       ZhSingleRow04({ compDTO: compDTO })
+    } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
+      //头图卡 和comStyle 2相同，
+      Card5Component({ contentDTO: compDTO.operDataList[0] })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
       ZhSingleColumn04({ compDTO: compDTO })
       ZhSingleColumn04({ compDTO: compDTO })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Column_05) {

+import { Logger } from 'wdKit';
+import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
+import { ContentDetailDTO } from 'wdBean';
+import media from '@ohos.multimedia.media';
+import { OperRowListView } from './view/OperRowListView';
+import { WDPlayerController } from 'wdPlayer/Index';
+
+const TAG = 'DynamicDetailComponent'
+@Preview
+@Component
+export struct DynamicDetailComponent {
+  //入参
+  private relId: string = ''
+  private contentId: string = ''
+  private relType: string = ''
+  //出参
+  @State contentDetailData: ContentDetailDTO[] = [] as ContentDetailDTO[]
+
+
+  async aboutToAppear() {
+    await this.getContentDetailData()
+  }
+  onPageHide() {
+
+  }
+
+  build() {
+      Row() {
+        Column(){
+        Text("this is a test!")
+        }
+      }
+
+  }
+  private async getContentDetailData() {
+    try {
+      let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
+      this.contentDetailData = data;
+      console.log('动态详情',JSON.stringify(this.contentDetailData))
+    } catch (exception) {
+    console.log('请求失败',JSON.stringify(exception))
+    }
+  }
+}

@@ -33,156 +33,139 @@ export interface OperationItem {
 export struct ImageAndTextPageComponent {
 export struct ImageAndTextPageComponent {
   scroller: Scroller = new Scroller();
   scroller: Scroller = new Scroller();
   action: Action = {} as Action
   action: Action = {} as Action
-  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
+  @State contentDetailData: ContentDetailDTO [] = [] as ContentDetailDTO []
   @State recommendList: ContentDTO[] = []
   @State recommendList: ContentDTO[] = []
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
-  @State operationList: OperationItem[] = [
-    {
-      icon: $r('app.media.ic_comment'),
-      text: "评论",
-    },
-    {
-      icon: $r('app.media.ic_like_uncheck'),
-      icon_check: $r('app.media.ic_like_check'),
-      text: "点赞",
-    },
-    {
-      icon: $r('app.media.ic_collect_uncheck'),
-      icon_check: $r('app.media.ic_collect_check'),
-      text: "收藏",
-    },
-    {
-      icon: $r('app.media.ic_share'),
-      text: "分享"
-    }
-  ]
 
 
   build() {
   build() {
     Column() {
     Column() {
-      Column() {
-        // 发布时间
-        // Row() {
-        //   Image($r('app.media.icon_ren_min_ri_bao'))
-        //     .width(70)
-        //     .height(28)
-        //   Text(this.contentDetailData.publishTime)
-        //     .fontColor($r('app.color.color_B0B0B0'))
-        //     .fontSize($r('app.float.font_size_13'))
-        //     .height('100%')
-        //     .align(Alignment.End)
-        // }
-        // .width(CommonConstants.FULL_WIDTH)
-        // .height(32)
-        // .padding({ left: 15, right: 15, })
-        // .justifyContent(FlexAlign.SpaceBetween)
-        // .backgroundColor(Color.White)
-        // Row() {
-        //   Image($r('app.media.line'))
-        //     .width('100%')
-        //     .height(6)
-        //     .objectFit(ImageFit.Cover)
-        //     .margin({ top: 10 })
-        // }
-        // .padding({ left: 15, right: 15, })
-        // .backgroundColor(Color.White)
+      // 发布时间
+      Row() {
+        Image($r('app.media.icon_ren_min_ri_bao'))
+          .width(70)
+          .height(28)
+        Text(this.contentDetailData[0]?.publishTime)
+          .fontColor($r('app.color.color_B0B0B0'))
+          .fontSize($r('app.float.font_size_13'))
+          .height('100%')
+          .align(Alignment.End)
+      }
+      .width(CommonConstants.FULL_WIDTH)
+      .height(32)
+      .padding({ left: 15, right: 15, })
+      .justifyContent(FlexAlign.SpaceBetween)
+      .backgroundColor(Color.White)
 
 
+      Row() {
+        Image($r('app.media.line'))
+          .width('100%')
+          .height(6)
+          .objectFit(ImageFit.Cover)
+          .margin({ top: 10 })
+      }
+      .padding({ left: 15, right: 15, })
+      .backgroundColor(Color.White)
 
 
-        Stack({ alignContent: Alignment.Bottom }) {
-          List() {
-            //详情展示区
+      Stack({ alignContent: Alignment.Bottom }) {
+        List() {
+          //详情展示区
+          ListItem() {
+            Column() {
+              ImageAndTextWebComponent({
+                contentDetailData: this.contentDetailData,
+                action: this.action,
+              })
+            }.width(CommonConstants.FULL_WIDTH)
+            .height(CommonConstants.FULL_HEIGHT)
+          }
+
+          if (this.contentDetailData[0]?.openLikes === 1) {
             ListItem() {
             ListItem() {
-              Column() {
-                ImageAndTextWebComponent({ contentDetailData: this.contentDetailData, action: this.action })
-              }.width(CommonConstants.FULL_WIDTH)
-              .height(CommonConstants.FULL_HEIGHT)
-            }
-            .backgroundColor(Color.White)
+              // 点赞
+              Row() {
+                Row() {
+                  if (this.newsStatusOfUser?.likeStatus === '1') {
+                    Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.ic_like_check') : (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer_active') : $r('app.media.icon_candle_active')))
+                      .width(24)
+                      .height(24)
+                      .margin({ right: 5 })
+                  } else {
+                    Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.icon_like') : (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer') : $r('app.media.icon_candle')))
+                      .width(24)
+                      .height(24)
+                      .margin({ right: 5 })
+                  }
+                  Text(`${this.interactData?.likeNum || 0}`)
+                    .fontSize(16)
+                    .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999')
+                    .fontWeight(500)
+                }.alignItems(VerticalAlign.Center)
+                .onClick(() => {
+                  this.toggleLikeStatus()
+                })
 
 
-            // if (this.contentDetailData.openLikes === 1) {
-            //   ListItem() {
-            //     // 点赞
-            //     Row() {
-            //       Row() {
-            //         if (this.newsStatusOfUser?.likeStatus === '1') {
-            //           Image(this.contentDetailData.likesStyle === 1 ? $r('app.media.ic_like_check') : (this.contentDetailData.likesStyle === 2 ? $r('app.media.icon_prayer_active') : $r('app.media.icon_candle_active')))
-            //             .width(24)
-            //             .height(24)
-            //             .margin({ right: 5 })
-            //         } else {
-            //           Image(this.contentDetailData.likesStyle === 1 ? $r('app.media.icon_like') : (this.contentDetailData.likesStyle === 2 ? $r('app.media.icon_prayer') : $r('app.media.icon_candle')))
-            //             .width(24)
-            //             .height(24)
-            //             .margin({ right: 5 })
-            //         }
-            //         Text(`${this.interactData?.likeNum || 0}`)
-            //           .fontSize(16)
-            //           .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999')
-            //           .fontWeight(500)
-            //       }.alignItems(VerticalAlign.Center)
-            //       .onClick(() => {
-            //         this.toggleLikeStatus()
-            //       })
-            //
-            //     }.width(CommonConstants.FULL_WIDTH).height(80)
-            //     .justifyContent(FlexAlign.Center)
-            //   }
-            //   .backgroundColor(Color.White)
-            //   .margin({ bottom: 5 })
-            // }
+              }.width(CommonConstants.FULL_WIDTH).height(80)
+              .justifyContent(FlexAlign.Center)
+            }
+            .border({
+              width: { bottom: 5 },
+              color: '#f5f5f5',
+            })
+          }
 
 
-            //相关推荐区
-            // ListItem() {
-            //   RecommendList({ recommendList: this.recommendList })
-            // }
-            // .backgroundColor(Color.White)
+          // 相关推荐区
+          ListItem() {
+            RecommendList({ recommendList: this.recommendList })
           }
           }
-          .width(CommonConstants.FULL_WIDTH)
-          .height(CommonConstants.FULL_HEIGHT)
-          .padding({ bottom: 56 })
-          .scrollBar(BarState.Off)
-          .edgeEffect(EdgeEffect.None)
+        }
+        .width(CommonConstants.FULL_WIDTH)
+        .height(CommonConstants.FULL_HEIGHT)
+        .padding({ bottom: 56 })
+        .scrollBar(BarState.Off)
+        .edgeEffect(EdgeEffect.None)
+
+        //底部交互区
+        Row() {
+          Image($r('app.media.icon_arrow_left'))
+            .width(24)
+            .height(24)
+            .onClick((event: ClickEvent) => {
+              router.back()
+            })
 
 
-          //底部交互区
           Row() {
           Row() {
-            Image($r('app.media.icon_arrow_left'))
+            Image($r('app.media.icon_comment'))
               .width(24)
               .width(24)
               .height(24)
               .height(24)
-              .onClick((event: ClickEvent) => {
-                router.back()
-              })
-
-            Row() {
-              Image($r('app.media.icon_comment'))
-                .width(24)
-                .height(24)
-                .margin({ right: 24 })
-                .id('comment')
+              .margin({ right: 24 })
+              .id('comment')
 
 
-              Image($r('app.media.icon_star'))
-                .width(24)
-                .height(24)
-                .margin({ right: 24 })
+            Image($r('app.media.icon_star'))
+              .width(24)
+              .height(24)
+              .margin({ right: 24 })
 
 
-              Image($r('app.media.icon_listen'))
-                .width(24)
-                .height(24)
-                .margin({ right: 24 })
+            Image($r('app.media.icon_listen'))
+              .width(24)
+              .height(24)
+              .margin({ right: 24 })
 
 
-              Image($r('app.media.icon_forward'))
-                .width(24)
-                .height(24)
+            Image($r('app.media.icon_forward'))
+              .width(24)
+              .height(24)
 
 
-            }
           }
           }
-          .width(CommonConstants.FULL_WIDTH)
-          .height(56)
-          .backgroundColor(Color.White)
-          .padding({ left: 15, right: 15, })
-          .justifyContent(FlexAlign.SpaceBetween)
         }
         }
-      }.backgroundColor("#f5f5f5")
+        .width(CommonConstants.FULL_WIDTH)
+        .height(56)
+        .padding({ left: 15, right: 15, bottom: 50, top: 20 })
+        .justifyContent(FlexAlign.SpaceBetween)
+        .backgroundColor(Color.White)
+      }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
+    .backgroundColor(Color.White)
+
   }
   }
 
 
   private async getDetail() {
   private async getDetail() {
@@ -204,28 +187,28 @@ export struct ImageAndTextPageComponent {
       }
       }
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       if (detailBeans && detailBeans.length > 0) {
       if (detailBeans && detailBeans.length > 0) {
-        this.contentDetailData = detailBeans[0];
-        //TODO
-        // if (this.contentDetailData.recommendShow === 1) {
-        //   this.getRecommend()
-        // }
-        // if (this.contentDetailData.openLikes === 1) {
-        //   this.getInteractDataStatus()
-        //   this.queryContentInteractCount()
-        // }
+        this.contentDetailData = detailBeans;
+        if (this.contentDetailData[0]?.recommendShow === 1) {
+          this.getRecommend()
+        }
+        if (this.contentDetailData[0]?.openLikes === 1) {
+          this.getInteractDataStatus()
+          this.queryContentInteractCount()
+        }
       }
       }
     }
     }
   }
   }
 
 
+
   private async getRecommend() {
   private async getRecommend() {
     let params: postRecommendListParams = {
     let params: postRecommendListParams = {
       imei: "8272c108-4fa2-34ce-80b9-bc425a7c2a7e",
       imei: "8272c108-4fa2-34ce-80b9-bc425a7c2a7e",
       userId: HttpUrlUtils.getUserId(),
       userId: HttpUrlUtils.getUserId(),
-      contentId: String(this.contentDetailData.newsId),
+      contentId: String(this.contentDetailData[0]?.newsId),
       recType: 1,
       recType: 1,
-      contentType: this.contentDetailData.newsType,
-      relId: this.contentDetailData?.reLInfo?.relId,
-      channelId: String(this.contentDetailData?.reLInfo?.channelId)
+      contentType: this.contentDetailData[0]?.newsType,
+      relId: this.contentDetailData[0]?.reLInfo?.relId,
+      channelId: String(this.contentDetailData[0]?.reLInfo?.channelId)
     }
     }
     let recommendList = await DetailViewModel.postRecommendList(params)
     let recommendList = await DetailViewModel.postRecommendList(params)
     if (recommendList && recommendList.length > 0) {
     if (recommendList && recommendList.length > 0) {
@@ -239,8 +222,8 @@ export struct ImageAndTextPageComponent {
       const params: batchLikeAndCollectParams = {
       const params: batchLikeAndCollectParams = {
         contentList: [
         contentList: [
           {
           {
-            contentId: this.contentDetailData?.newsId + '',
-            contentType: this.contentDetailData?.newsType + '',
+            contentId: this.contentDetailData[0]?.newsId + '',
+            contentType: this.contentDetailData[0]?.newsType + '',
           }
           }
         ]
         ]
       }
       }
@@ -265,8 +248,8 @@ export struct ImageAndTextPageComponent {
     }
     }
     const params: postExecuteLikeParams = {
     const params: postExecuteLikeParams = {
       status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
       status: this.newsStatusOfUser?.likeStatus === '1' ? '0' : '1',
-      contentId: this.contentDetailData?.newsId + '',
-      contentType: this.contentDetailData?.newsType + '',
+      contentId: this.contentDetailData[0]?.newsId + '',
+      contentType: this.contentDetailData[0]?.newsType + '',
     }
     }
     PageRepository.postExecuteLike(params).then(res => {
     PageRepository.postExecuteLike(params).then(res => {
       console.log(TAG, '点赞、取消点赞', 'toggleLikeStatus==',)
       console.log(TAG, '点赞、取消点赞', 'toggleLikeStatus==',)
@@ -285,8 +268,8 @@ export struct ImageAndTextPageComponent {
     console.error(TAG, 'contentDetailData2222', JSON.stringify(this.contentDetailData))
     console.error(TAG, 'contentDetailData2222', JSON.stringify(this.contentDetailData))
     const params: contentListParams = {
     const params: contentListParams = {
       contentList: [{
       contentList: [{
-        contentId: this.contentDetailData?.newsId + '',
-        contentType: this.contentDetailData?.newsType,
+        contentId: this.contentDetailData[0]?.newsId + '',
+        contentType: this.contentDetailData[0]?.newsType,
       }]
       }]
     }
     }
     PageRepository.getContentInteract(params).then(res => {
     PageRepository.getContentInteract(params).then(res => {

@@ -7,15 +7,15 @@ import {
   ResponseBean
   ResponseBean
 } from 'wdBean';
 } from 'wdBean';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
-import { WdWebComponent, WdWebLocalComponent } from 'wdWebComponent';
+import { WdWebLocalComponent } from 'wdWebComponent';
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
-import { BridgeWebViewControl } from '../../../../../../commons/wdWebComponent/oh_modules/wdJsBridge/Index';
+import { BridgeWebViewControl } from 'wdJsBridge/Index';
 
 
 @Component
 @Component
 export struct ImageAndTextWebComponent {
 export struct ImageAndTextWebComponent {
   action: Action = {} as Action
   action: Action = {} as Action
   @State reload: number = 0;
   @State reload: number = 0;
-  @Prop @Watch('onDetailDataUpdated') contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
+  @Prop @Watch('onDetailDataUpdated') contentDetailData: ContentDetailDTO [] = [] as ContentDetailDTO []
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
 
 
   onDetailDataUpdated() {
   onDetailDataUpdated() {
@@ -72,7 +72,7 @@ export struct ImageAndTextWebComponent {
       // TODO 暂延时1s，考虑业务流程再优化
       // TODO 暂延时1s，考虑业务流程再优化
       setTimeout(() => {
       setTimeout(() => {
         this.sendContentData2H5(h5ReceiveAppData);
         this.sendContentData2H5(h5ReceiveAppData);
-      }, 1000)
+      }, 2000)
 
 
     }
     }
 
 
@@ -92,7 +92,7 @@ export struct ImageAndTextWebComponent {
     Logger.debug('ImageAndTextWebComponent', 'jsCall_receiveAppData');
     Logger.debug('ImageAndTextWebComponent', 'jsCall_receiveAppData');
     this.webviewControl.callHandle(NativeCallH5Type.jsCall_receiveAppData,
     this.webviewControl.callHandle(NativeCallH5Type.jsCall_receiveAppData,
       JSON.stringify(h5ReceiveAppData), (data: string) => {
       JSON.stringify(h5ReceiveAppData), (data: string) => {
-        // Logger.debug('ImageAndTextWebComponent', "from js data = " + data);
+        Logger.debug('ImageAndTextWebComponent', "from js data = " + data);
       })
       })
   }
   }
 }
 }

+import { Action, ContentDetailDTO, ContentDTO, batchLikeAndCollectResult, InteractDataDTO, } from 'wdBean';
+import DetailViewModel from '../viewmodel/DetailViewModel';
+import { OperRowListView } from './view/OperRowListView';
+import { WdWebComponent } from 'wdWebComponent';
+import router from '@ohos.router';
+import { CommonConstants } from 'wdConstant'
+
+const TAG = 'SpacialTopicPageComponent'
+
+@Component
+export struct SpacialTopicPageComponent {
+  scroller: Scroller = new Scroller();
+  action: Action = {} as Action
+  private webUrl?: string;
+  @State contentDetailData: ContentDetailDTO [] = [] as ContentDetailDTO []
+  @State recommendList: ContentDTO[] = []
+  @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
+  @State interactData: InteractDataDTO = {} as InteractDataDTO
+
+  build() {
+    Column() {
+      Stack({ alignContent: Alignment.Bottom }) {
+        Column() {
+          WdWebComponent({
+            webUrl: this.webUrl,
+            backVisibility: false
+          })
+        }
+        .padding({bottom:56})
+        .width(CommonConstants.FULL_WIDTH)
+        .height(CommonConstants.FULL_HEIGHT)
+
+        //底部交互区
+        Row() {
+          Image($r('app.media.icon_arrow_left'))
+            .width(24)
+            .height(24)
+            .onClick((event: ClickEvent) => {
+              router.back()
+            })
+
+          Row() {
+            Image($r('app.media.icon_comment'))
+              .width(24)
+              .height(24)
+              .margin({ right: 24 })
+              .id('comment')
+
+            Image($r('app.media.icon_star'))
+              .width(24)
+              .height(24)
+              .margin({ right: 24 })
+
+            Image($r('app.media.icon_listen'))
+              .width(24)
+              .height(24)
+              .margin({ right: 24 })
+
+            Image($r('app.media.icon_forward'))
+              .width(24)
+              .height(24)
+
+          }
+        }
+        .width(CommonConstants.FULL_WIDTH)
+        .height(56)
+        .padding({ left: 15, right: 15, bottom: 20, top: 20 })
+        .justifyContent(FlexAlign.SpaceBetween)
+        .backgroundColor(Color.White)
+      }
+    }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
+    .backgroundColor(Color.White)
+  }
+
+  // private async getDetail() {
+  //   let contentId: string = ''
+  //   let relId: string = ''
+  //   let relType: string = ''
+  //   if (this.action && this.action.params) {
+  //     if (this.action.params.contentID) {
+  //       contentId = this.action.params.contentID;
+  //     }
+  //     if (this.action && this.action.params && this.action.params.extra) {
+  //       if (this.action.params.extra.relId) {
+  //         relId = this.action.params.extra.relId;
+  //       }
+  //       if (this.action.params.extra.relType) {
+  //         relType = this.action.params.extra.relType
+  //       }
+  //
+  //     }
+  //     let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
+  //     if (detailBeans && detailBeans.length > 0) {
+  //       this.contentDetailData = detailBeans;
+  //     }
+  //   }
+  // }
+
+  aboutToAppear() {
+    let action: Action = router.getParams() as Action
+    if (action) {
+      this.webUrl = action.params?.url
+    }
+    // this.getDetail()
+  }
+
+  aboutToDisappear() {
+  }
+}

@@ -14,7 +14,6 @@ import { CommonConstants } from 'wdConstant/Index';
 
 
 const TAG = 'BroadcastPageComponent';
 const TAG = 'BroadcastPageComponent';
 
 
-@Entry
 @Component
 @Component
 export struct BroadcastPageComponent {
 export struct BroadcastPageComponent {
   @State params:Params = router.getParams() as Params;
   @State params:Params = router.getParams() as Params;

@@ -4,7 +4,6 @@ import { CommonConstants } from 'wdConstant/Index';
 /**
 /**
  * 今日推荐顶部标题--fixed标题
  * 今日推荐顶部标题--fixed标题
  */
  */
-@Entry
 @Component
 @Component
 export struct RecommendHeader {
 export struct RecommendHeader {
   build() {
   build() {

@@ -4,7 +4,6 @@ import { ProcessUtils } from '../../utils/ProcessUtils';
 /**
 /**
  * 播报--今日推荐列表
  * 播报--今日推荐列表
  */
  */
-@Entry
 @Component
 @Component
 export  struct RecommendLists {
 export  struct RecommendLists {
   @Prop recommendCompInfoBean: CompInfoBean = {} as CompInfoBean // 推荐-组件信息
   @Prop recommendCompInfoBean: CompInfoBean = {} as CompInfoBean // 推荐-组件信息

@@ -3,7 +3,6 @@ import {  DateTimeUtils } from 'wdKit';
 /**
 /**
  * 播报标题描述
  * 播报标题描述
  */
  */
-@Entry
 @Component
 @Component
 export struct RecommendTitle {
 export struct RecommendTitle {
   build() {
   build() {

@@ -5,7 +5,6 @@ import { ProcessUtils } from '../../utils/ProcessUtils';
 /**
 /**
  * 精选栏目
  * 精选栏目
  */
  */
-@Entry
 @Component
 @Component
 export  struct SelectedColumns {
 export  struct SelectedColumns {
   @Prop columnsCompInfoBean: CompInfoBean = {} as CompInfoBean // 精选栏目组件信息
   @Prop columnsCompInfoBean: CompInfoBean = {} as CompInfoBean // 精选栏目组件信息

@@ -15,37 +15,31 @@ export struct CardMediaInfo {
 
 
   build() {
   build() {
     Row() {
     Row() {
-      if(this.contentDTO.objectType === '1') {
-        // 显示点播
+      if(this.contentDTO.objectType === '1' || this.contentDTO.objectType === '15' ) {
+        // 点播、动态视频
         Row(){
         Row(){
           Image($r('app.media.videoTypeIcon'))
           Image($r('app.media.videoTypeIcon'))
-            .width(22)
-            .height(18)
-            .borderRadius($r('app.float.button_border_radius'))
+            .mediaLogo()
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
-            .fontColor($r('app.color.color_fff'))
-            .fontSize($r('app.float.font_size_12'))
-            .width(40)
-            .height(18)
-            .textAlign(TextAlign.Center)
-            .margin({ left: -3 })
+            .mediaText()
         }
         }
         .backgroundColor('#4d000000')
         .backgroundColor('#4d000000')
         .borderRadius($r('app.float.button_border_radius'))
         .borderRadius($r('app.float.button_border_radius'))
       } else if(this.contentDTO.objectType === '2') {
       } else if(this.contentDTO.objectType === '2') {
+        // liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
         // 显示直播信息
         // 显示直播信息
         Row(){
         Row(){
-          Image($r('app.media.icon_live'))
-            .width(22)
-            .height(18)
-            .borderRadius($r('app.float.button_border_radius'))
-          Text('直播中')
-            .fontColor($r('app.color.color_fff'))
-            .fontSize($r('app.float.font_size_12'))
-            .width(40)
-            .height(18)
-            .textAlign(TextAlign.Center)
-            .margin({ left: -3 })
+          if(this.contentDTO.liveInfo.liveState === 'running') {
+            Image($r('app.media.icon_live'))
+              .mediaLogo()
+            Text('直播中')
+              .mediaText()
+          } else if(this.contentDTO.liveInfo.liveState === 'end'){
+            Image($r('app.media.videoTypeIcon'))
+              .mediaLogo()
+            Text('回看')
+              .mediaText()
+          }
         }
         }
         .backgroundColor('#4d000000')
         .backgroundColor('#4d000000')
         .borderRadius($r('app.float.button_border_radius'))
         .borderRadius($r('app.float.button_border_radius'))
@@ -53,16 +47,10 @@ export struct CardMediaInfo {
         // 显示组图；图片数量
         // 显示组图；图片数量
         Row(){
         Row(){
           Image($r('app.media.album_card_shape'))
           Image($r('app.media.album_card_shape'))
-            .width(22)
-            .height(18)
-            .borderRadius($r('app.float.button_border_radius'))
-          Text(this.contentDTO.photoNum)
-            .fontColor($r('app.color.color_fff'))
-            .fontSize($r('app.float.font_size_12'))
+            .mediaLogo()
+          Text(`${this.contentDTO.photoNum}`)
+            .mediaText()
             .width(20)
             .width(20)
-            .height(18)
-            .textAlign(TextAlign.Center)
-            .margin({ left: -3 })
         }
         }
         .backgroundColor('#4d000000')
         .backgroundColor('#4d000000')
         .borderRadius($r('app.float.button_border_radius'))
         .borderRadius($r('app.float.button_border_radius'))
@@ -73,15 +61,25 @@ export struct CardMediaInfo {
             .height(14)
             .height(14)
             .borderRadius($r('app.float.button_border_radius'))
             .borderRadius($r('app.float.button_border_radius'))
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo.voiceDuration * 1000))
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo.voiceDuration * 1000))
-            .fontColor($r('app.color.color_fff'))
-            .fontSize($r('app.float.font_size_12'))
-            .width(40)
-            .height(18)
-            .textAlign(TextAlign.Center)
-            .margin({ left: -3 })
+            .mediaText()
         }
         }
       }
       }
     }
     }
     .margin(6)
     .margin(6)
   }
   }
+
+  @Styles mediaLogo() {
+    .width(22)
+    .height(18)
+    .borderRadius($r('app.float.button_border_radius'))
+  }
+}
+
+@Extend(Text) function mediaText() {
+  .fontColor($r('app.color.color_fff'))
+  .fontSize($r('app.float.font_size_12'))
+  .width(40)
+  .height(18)
+  .textAlign(TextAlign.Center)
+  .margin({ left: -3 })
 }
 }

@@ -4,7 +4,6 @@
 import { RmhInfoDTO } from 'wdBean'
 import { RmhInfoDTO } from 'wdBean'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 
 
-@Entry
 @Component
 @Component
 export struct RmhTitle {
 export struct RmhTitle {
   @Prop rmhInfo: RmhInfoDTO
   @Prop rmhInfo: RmhInfoDTO

@@ -2,11 +2,12 @@
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { ContentDTO } from 'wdBean'
 import { ContentDTO } from 'wdBean'
 import { DateTimeUtils } from 'wdKit'
 import { DateTimeUtils } from 'wdKit'
+import { ProcessUtils } from '../../utils/ProcessUtils';
 
 
 const TAG = 'Card11Component';
 const TAG = 'Card11Component';
 
 
 /**
 /**
- * 无图卡(标题省略)
+ * 无图卡(标题省略) Card_11 = '11
  */
  */
 @Component
 @Component
 export struct Card11Component {
 export struct Card11Component {
@@ -21,33 +22,38 @@ export struct Card11Component {
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
       Row() {
       Row() {
-        Text("锐评")
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_ED2800"))
-        Text(this.contentDTO.source)
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_B0B0B0"))
-          .margin({ left: 6 })
-        Image($r("app.media.point"))
-          .width(16)
-          .height(16)
+        if (this.contentDTO.source) {
+          Text(this.contentDTO.source)
+            .fontSize($r("app.float.font_size_12"))
+            .fontColor($r("app.color.color_B0B0B0"))
+            .margin({ left: 6 })
+          Image($r("app.media.point"))
+            .width(16)
+            .height(16)
+        }
 
 
-        Text(DateTimeUtils.formatDate(Number.parseFloat(this.contentDTO.publishTime)))
+        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
           .fontSize($r("app.float.font_size_12"))
           .fontSize($r("app.float.font_size_12"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
-
+          .margin({ right: 6 })
+        // TODO '评论取哪个字段'
+        // Text(`1806评`)
+        //   .fontSize($r("app.float.font_size_12"))
+        //   .fontColor($r("app.color.color_B0B0B0"))
       }.width(CommonConstants.FULL_WIDTH)
       }.width(CommonConstants.FULL_WIDTH)
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
       .margin({ top: 8 })
       .margin({ top: 8 })
 
 
     }.width(CommonConstants.FULL_WIDTH)
     }.width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      top: 14,
-      left: 16,
-      right: 16,
-      bottom: 14
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
-    .margin({ bottom: 8 })
+    .onClick((event: ClickEvent) => {
+      ProcessUtils.processPage(this.contentDTO)
+    })
   }
   }
 }
 }

+import { ContentDTO } from 'wdBean';
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CommonConstants } from 'wdConstant/Index';
+
+const TAG = 'Card12Component';
+
+/**
+ * 人民号-动态---12：人民号无图卡；
+ */
+@Component
+export struct Card12Component {
+  @State contentDTO: ContentDTO = {
+    appStyle: '20',
+    coverType: 1,
+    coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+    fullColumnImgUrls: [
+      {
+        landscape: 1,
+        size: 1,
+        url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+        weight: 1600
+      }
+    ],
+    newsTitle: '好玩！》10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
+    rmhInfo: {
+      authIcon:
+      'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',
+      authTitle: '10后音乐人王烁然个人人民号',
+      authTitle2: '10后音乐人王烁然个人人民号',
+      banControl: 0,
+      cnIsAttention: 1,
+      rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
+      rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
+      rmhName: '王烁然',
+      userId: '522435359667845',
+      userType: '2'
+    },
+    objectType: '1',
+    videoInfo: {
+      firstFrameImageUri: '',
+      videoDuration: 37,
+      videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'
+    }
+  } as ContentDTO;
+
+  aboutToAppear(): void {
+  }
+
+  build() {
+    Column() {
+      // rmh信息
+      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
+      // 标题
+      if (this.contentDTO.newsTitle) {
+        Text(this.contentDTO.newsTitle)
+          .fontSize($r('app.float.font_size_17'))
+          .fontColor($r('app.color.color_222222'))
+          .width(CommonConstants.FULL_WIDTH)
+          .textOverflowStyle(3)
+          .margin({ bottom: 8 })
+          .height(75)
+          .lineHeight(25)
+          .fontFamily('PingFang SC-Regular')
+      }
+
+      // if (this.contentDTO.fullColumnImgUrls?.[0]) {
+      //   createImg({ contentDTO: this.contentDTO })
+      // }
+      //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
+    }
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+  }
+}
+
+interface radiusType {
+  topLeft: number | Resource;
+  topRight: number | Resource;
+  bottomLeft: number | Resource;
+  bottomRight: number | Resource;
+}
+
+@Component
+struct createImg {
+  @Prop contentDTO: ContentDTO
+
+  build() {
+    GridRow() {
+      if (this.contentDTO.fullColumnImgUrls[0].landscape === 1) {
+        // 横屏
+        GridCol({
+          span: { xs: 12 }
+        }) {
+          Stack() {
+            Image(this.contentDTO.coverUrl)
+              .width(CommonConstants.FULL_WIDTH)
+              .aspectRatio(16 / 9)
+              .borderRadius($r('app.float.image_border_radius'))
+            CardMediaInfo({ contentDTO: this.contentDTO })
+          }
+          .align(Alignment.BottomEnd)
+        }
+      } else {
+        // 竖图显示，宽度占50%，高度自适应
+        GridCol({
+          span: { xs: 6 }
+        }) {
+          Stack() {
+            Image(this.contentDTO.coverUrl)
+              .width(CommonConstants.FULL_WIDTH)
+              .borderRadius($r('app.float.image_border_radius'))
+            CardMediaInfo({ contentDTO: this.contentDTO })
+          }
+          .align(Alignment.BottomEnd)
+        }
+      }
+    }
+  }
+}
+
+
+@Extend(Text)
+function textOverflowStyle(maxLine: number) {
+  .maxLines(maxLine)
+  .textOverflow({ overflow: TextOverflow.Ellipsis })
+}

+import { ContentDTO } from 'wdBean';
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CommonConstants } from 'wdConstant/Index';
+
+const TAG = 'Card12Component';
+
+/**
+ * 人民号-动态---12：人民号无图卡；
+ */
+@Entry
+@Component
+export struct Card12Component {
+  @State contentDTO: ContentDTO = {
+    appStyle: '20',
+    coverType: 1,
+    coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+    fullColumnImgUrls: [
+      {
+        landscape: 1,
+        size: 1,
+        url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
+        weight: 1600
+      }
+    ],
+    newsTitle: '好玩！》10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
+    rmhInfo: {
+      authIcon:
+      'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',
+      authTitle: '10后音乐人王烁然个人人民号',
+      authTitle2: '10后音乐人王烁然个人人民号',
+      banControl: 0,
+      cnIsAttention: 1,
+      rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
+      rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
+      rmhName: '王烁然',
+      userId: '522435359667845',
+      userType: '2'
+    },
+    objectType: '1',
+    videoInfo: {
+      firstFrameImageUri: '',
+      videoDuration: 37,
+      videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'
+    }
+  } as ContentDTO;
+
+  aboutToAppear(): void {
+  }
+
+  build() {
+    Column() {
+      // rmh信息
+      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
+      // 左标题，右图
+      Flex({ direction: FlexDirection.Row }) {
+
+        Text(this.contentDTO.newsTitle)
+          .fontSize($r('app.float.font_size_17'))
+          .fontColor($r('app.color.color_222222'))
+          .textOverflowStyle(3)
+          .lineHeight(25)
+          .fontFamily('PingFang SC-Regular')
+          .textAlign(TextAlign.Start)
+          .flexBasis('auto')
+          .margin({right: 12})
+
+        Image(this.contentDTO.coverUrl)
+          .flexBasis(174)
+          .height(75)
+          .borderRadius($r('app.float.image_border_radius'))
+        // .flexBasis(160)
+        .backgroundImageSize(ImageSize.Auto)
+
+      }
+      .width(CommonConstants.FULL_WIDTH)
+      .margin({ bottom: 8 })
+      .height(75)
+
+
+      //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
+    }
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
+  }
+}
+
+interface radiusType {
+  topLeft: number | Resource;
+  topRight: number | Resource;
+  bottomLeft: number | Resource;
+  bottomRight: number | Resource;
+}
+
+@Extend(Text)
+function textOverflowStyle(maxLine: number) {
+  .maxLines(maxLine)
+  .textOverflow({ overflow: TextOverflow.Ellipsis })
+}

@@ -3,12 +3,13 @@ import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterRule } from 'wdRouter';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 
 
 const TAG = 'Card17Component';
 const TAG = 'Card17Component';
-/**
-* 图卡集---2
-*/
 
 
+/**
+ * 图卡集---2
+ */
 @Component
 @Component
 export struct Card17Component {
 export struct Card17Component {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
@@ -18,82 +19,54 @@ export struct Card17Component {
     Column({ space: 8 }) {
     Column({ space: 8 }) {
       Text(this.contentDTO.newsTitle)
       Text(this.contentDTO.newsTitle)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
-        .fontSize(17)
-        .fontColor(0x222222)
+        .fontSize($r('app.float.font_size_17'))
+        .fontColor($r('app.color.color_222222'))
         .lineHeight(25)
         .lineHeight(25)
         .maxLines(3)
         .maxLines(3)
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
 
 
-      RelativeContainer() {
-        Image(this.contentDTO.fullColumnImgUrls[0].url)
-          .width('66.6%')
-          .aspectRatio(16 / 9)
-          .alignRules({
-            top: { anchor: "__container__", align: VerticalAlign.Top },
-            left: { anchor: "__container__", align: HorizontalAlign.Start }
-          })
-          .id('mainImage')
-
-        Image(this.contentDTO.fullColumnImgUrls[1].url)
-          .width('33%')
-          .aspectRatio(16 / 9)
-          .alignRules({
-            top: { anchor: "__container__", align: VerticalAlign.Top },
-            right: { anchor: "__container__", align: HorizontalAlign.End }
-          })
-          .id('subTopImage')
+      Stack({ alignContent: Alignment.BottomEnd }) {
+        // 三个图，
+        GridRow({ gutter: 2 }) {
+          GridCol({ span: { xs: 8 } }) {
+            Image(this.contentDTO.fullColumnImgUrls[0].url)
+              .width(CommonConstants.FULL_WIDTH)
+              .aspectRatio(16 / 9)
+              .borderRadius({
+                topLeft: $r('app.float.image_border_radius'),
+                bottomLeft: $r('app.float.image_border_radius'),
+              })
+          }
 
 
-        Image(this.contentDTO.fullColumnImgUrls[2].url)
-          .width('33%')
-          .aspectRatio(16 / 9)
-          .alignRules({
-            right: { anchor: "__container__", align: HorizontalAlign.End },
-            bottom: { anchor: "__container__", align: VerticalAlign.Bottom }
-          })
-          .id('subBottomImage')
-        // 下面是渲染右下角图标
-        Shape() {
-          Rect().width(33).height(18)
+          GridCol({ span: { xs: 4 } }) {
+            Image(this.contentDTO.fullColumnImgUrls[1].url)
+              .width(CommonConstants.FULL_WIDTH)
+              .aspectRatio(16 / 9)
+              .margin({ bottom: 1 })
+              .borderRadius({
+                topRight: $r('app.float.image_border_radius'),
+              })
+          }
         }
         }
-        .fill(0x000000)
-        .fillOpacity(0.3)
-        .strokeLineCap(LineCapStyle.Round)
-        .strokeLineJoin(LineJoinStyle.Round)
-        .antiAlias(true)
-        .id('shape')
-        .alignRules({
-          right: { anchor: "__container__", align: HorizontalAlign.End },
-          bottom: { anchor: "__container__", align: VerticalAlign.Bottom }
-        })
-        .margin({
-          right: 4,
-          bottom: 4
-        })
 
 
-        Image($r('app.media.album_card_shape'))
-          .width(22)
-          .height(18)
-          .alignRules({
-            left: { anchor: "shape", align: HorizontalAlign.Start },
-            top: { anchor: "shape", align: VerticalAlign.Top }
-          })
-          .id('shapeSubImage')
+        GridRow({ gutter: 2 }) {
+          GridCol({ span: { xs: 8 } }) {
+          }
+
+          GridCol({ span: { xs: 4 } }) {
+            Image(this.contentDTO.fullColumnImgUrls[2].url)
+              .width(CommonConstants.FULL_WIDTH)
+              .aspectRatio(16 / 9)
+              .margin({ top: 1 })
+              .borderRadius({
+                bottomRight: $r('app.float.image_border_radius'),
+              })
+          }
+        }
 
 
-        Text(this.contentDTO.fullColumnImgUrls.length + '')
-          .fontSize(13)
-          .fontColor(0xFFFFFF)
-          .id('pageIndex')
-          .alignRules({
-            right: { anchor: "shape", align: HorizontalAlign.End },
-            top: { anchor: "shape", align: VerticalAlign.Top }
-          })
-          .margin({ right: 2 })
-          .textAlign(TextAlign.Center)
-          .width(17)
-          .height(17)
+        CardMediaInfo({ contentDTO: this.contentDTO })
       }
       }
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)
-      .aspectRatio(24 / 9)
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
         let taskAction: Action = {
         let taskAction: Action = {
           type: 'JUMP_DETAIL_PAGE',
           type: 'JUMP_DETAIL_PAGE',
@@ -112,23 +85,17 @@ export struct Card17Component {
       Row() {
       Row() {
         if (this.contentDTO.source) {
         if (this.contentDTO.source) {
           Text(this.contentDTO.source)
           Text(this.contentDTO.source)
-            .fontSize(13)
-            .fontColor(0xB0B0B0)
+            .fontSize($r('app.float.font_size_13'))
+            .fontColor($r('app.color.color_B0B0B0'))
           Image($r('app.media.point'))
           Image($r('app.media.point'))
             .width(16)
             .width(16)
             .height(16)
             .height(16)
         }
         }
         if (this.contentDTO.publishTime && this.contentDTO.publishTime.length === 13) {
         if (this.contentDTO.publishTime && this.contentDTO.publishTime.length === 13) {
           Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
           Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-            .fontSize(13)
-            .fontColor(0xB0B0B0)
+            .fontSize($r('app.float.font_size_13'))
+            .fontColor($r('app.color.color_B0B0B0'))
         }
         }
-        Text('328评')
-          .fontSize(13)
-          .fontColor(0xB0B0B0)
-          .margin({
-            left: 6
-          })
       }
       }
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)
       .height(16)
       .height(16)
@@ -136,10 +103,10 @@ export struct Card17Component {
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      top: 14,
-      left: 16,
-      right: 16,
-      bottom: 14
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
   }
   }
 }
 }

@@ -6,7 +6,6 @@ const TAG = 'Card19Component';
 /**
 /**
  * 人民号-动态---19：动态图文卡人民号； 从无图--9图
  * 人民号-动态---19：动态图文卡人民号； 从无图--9图
  */
  */
-@Entry
 @Component
 @Component
 export struct Card19Component {
 export struct Card19Component {
   @State contentDTO: ContentDTO = {
   @State contentDTO: ContentDTO = {

@@ -8,7 +8,6 @@ const TAG = 'Card20Component';
 /**
 /**
  * 人民号-动态---20：动态视频卡人民号   分横屏和竖屏；
  * 人民号-动态---20：动态视频卡人民号   分横屏和竖屏；
  */
  */
-@Entry
 @Component
 @Component
 export struct Card20Component {
 export struct Card20Component {
   @State contentDTO: ContentDTO = {
   @State contentDTO: ContentDTO = {

 //全标题 "appStyle":"2",
 //全标题 "appStyle":"2",
 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
+import { DateTimeUtils } from 'wdKit/Index';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 
 
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
 
 
@@ -12,55 +14,50 @@ const TAG: string = 'Card2Component';
  * 卡片宽度:充满父窗口
  * 卡片宽度:充满父窗口
  * 卡片高度,仅包含横板图片：图片高度由图片的宽度及宽高比决定，图片宽度占父窗口'100%'，宽高比为16:9:
  * 卡片高度,仅包含横板图片：图片高度由图片的宽度及宽高比决定，图片宽度占父窗口'100%'，宽高比为16:9:
  */
  */
-// @Entry
 @Component
 @Component
 export struct Card2Component {
 export struct Card2Component {
-  @State contentDTO: ContentDTO = {} as ContentDTO;
+  @State contentDTO: ContentDTO = {
+    // appStyle: '2',
+    // objectType: '1',
+    // coverUrl:
+    // 'https://rmrbcmsonline.peopleapp.com/upload/image/202404/202404141115457926.png?x-oss-process=image/resize,m_fill,h_450,w_800/quality,q_90',
+    // newsTitle: '又见花开！新疆伊犁花海延绵清新怡人',
+    // publishTime: '1713067227000',
+    // source: '荔枝新闻',
+    // videoInfo: {
+    //   videoDuration: 25,
+    //   videoLandscape: 1,
+    //   videoUrl:
+    //   'https://rmrbcmsonline.peopleapp.com/upload/video/mp4/202404/1713064515901314d148763996.mp4'
+    // }
+  } as ContentDTO;
 
 
   build() {
   build() {
     Column() {
     Column() {
-
       Column() {
       Column() {
         //新闻标题
         //新闻标题
         Text(this.contentDTO.newsTitle)
         Text(this.contentDTO.newsTitle)
-          .fontSize(17)
-          .fontColor('#222222')
+          .fontSize($r('app.float.font_size_17'))
+          .fontColor($r('app.color.color_222222'))
           .maxLines(3)
           .maxLines(3)
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .align(Alignment.Start)
           .align(Alignment.Start)
         //大图
         //大图
         Stack() {
         Stack() {
           Image(this.contentDTO.coverUrl)
           Image(this.contentDTO.coverUrl)
-            .borderRadius(4)
-
-
+            .width(CommonConstants.FULL_WIDTH)
+            .aspectRatio(16 / 9)
+            .borderRadius($r('app.float.image_border_radius'))
           //播放状态+时长
           //播放状态+时长
-          Row() {
-            Image($r('app.media.icon_live'))
-              .width(22)
-              .height(18)
-
-            Stack() {
-              Text('直播中')
-                .fontColor('#FFFFFF')
-                .fontSize(11)
-            }
-            .width(44)
-            .height(18)
-            .backgroundColor('#4d000000')
-          }.margin({ right: 8, bottom: 8 })
-
+          CardMediaInfo({
+            contentDTO: this.contentDTO
+          })
         }
         }
-        .width('100%')
-        .height(192)
         .alignContent(Alignment.BottomEnd)
         .alignContent(Alignment.BottomEnd)
         .margin({ top: 8 })
         .margin({ top: 8 })
-
       }
       }
-      .width('100%')
-      .justifyContent(FlexAlign.Start)
+      .width(CommonConstants.FULL_WIDTH)
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
-      .padding({ top: 14 })
 
 
       //bottom
       //bottom
       Row() {
       Row() {
@@ -71,22 +68,21 @@ export struct Card2Component {
           .width(12)
           .width(12)
           .height(12)
           .height(12)
 
 
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        Text(' ')
-
-        Text(this.contentDTO.subtitle)
+        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
           .bottomTextStyle()
           .bottomTextStyle()
-
       }
       }
-      .width('100%')
+      .width(CommonConstants.FULL_WIDTH)
       .height(18)
       .height(18)
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
-      // .padding({bottom:14})
       .margin({ top: 8 })
       .margin({ top: 8 })
     }
     }
-    .width('100%')
-    .padding({ left: 16, right: 16 })
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
     })
     })

@@ -5,10 +5,21 @@ import { ProcessUtils } from '../../utils/ProcessUtils';
 
 
 /**
 /**
  * 卡片样式："appStyle":"3"
  * 卡片样式："appStyle":"3"
+ * Card_03 = '3', // 无图卡(全标题)
  */
  */
 @Component
 @Component
 export struct Card3Component {
 export struct Card3Component {
-  @State contentDTO: ContentDTO = {} as ContentDTO;
+  @State contentDTO: ContentDTO = {
+    // appStyle: '3',
+    // channelId: '2002',
+    // newsTitle: '习近平向斯洛伐克当选总统佩',
+    // objectId: '30044351686',
+    // objectType: '8',
+    // publishTime: '1712967589000',
+    // relId: '500005307414',
+    // relType: '1',
+    // source: '新华社',
+  } as ContentDTO;
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -17,35 +28,37 @@ export struct Card3Component {
         .fontColor($r("app.color.color_222222"))
         .fontColor($r("app.color.color_222222"))
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
       Row() {
       Row() {
-        Text("锐评")
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_ED2800"))
-        Text(this.contentDTO.source)
+        // TODO "锐评"取得哪个字段，什么时候显示。
+        // Text("锐评")
+        //   .fontSize($r("app.float.font_size_12"))
+        //   .fontColor($r("app.color.color_ED2800"))
+        if(this.contentDTO.source) {
+          Text(this.contentDTO.source)
+            .fontSize($r("app.float.font_size_12"))
+            .fontColor($r("app.color.color_B0B0B0"))
+          Image($r("app.media.point"))
+            .width(16)
+            .height(16)
+        }
+        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
           .fontSize($r("app.float.font_size_12"))
           .fontSize($r("app.float.font_size_12"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
-          .margin({ left: 6 })
-        Image($r("app.media.point"))
-          .width(16)
-          .height(16)
-
-        Text(DateTimeUtils.formatDate(Number.parseFloat(this.contentDTO.publishTime)))
+          .margin({ right: 6 })
+        // TODO '评论取哪个字段'
+        Text(`${this.contentDTO?.interactData?.commentNum}评`)
           .fontSize($r("app.float.font_size_12"))
           .fontSize($r("app.float.font_size_12"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
-
       }.width(CommonConstants.FULL_WIDTH)
       }.width(CommonConstants.FULL_WIDTH)
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
       .margin({ top: 8 })
       .margin({ top: 8 })
-
     }
     }
-    .width("100%")
+    .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      top: 14,
-      left: 16,
-      right: 16,
-      bottom: 14
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
-    .backgroundColor($r("app.color.white"))
-    .margin({ bottom: 8 })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
     })
     })

-//全标题 "appStyle":"4",
-import { ContentDTO } from 'wdBean';
+import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
+import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
+import { DateTimeUtils } from 'wdKit/Index';
 
 
 const TAG: string = 'Card4Component';
 const TAG: string = 'Card4Component';
 
 
@@ -13,50 +14,100 @@ const TAG: string = 'Card4Component';
  */
  */
 @Component
 @Component
 export struct Card4Component {
 export struct Card4Component {
-  @State contentDTO: ContentDTO = {} as ContentDTO;
+  @State contentDTO: ContentDTO = {
+    // appStyle: '4',
+    // fullColumnImgUrls: [
+    //   {
+    //     format: null,
+    //     fullUrl: '',
+    //     height: 187,
+    //     landscape: 1,
+    //     size: 1,
+    //     url: 'https://rmrbcmsonline.peopleapp.com/upload/article_resource/image/1648118198_0c20f7c31c7b4eca6b0d0871e7771c62.png?x-oss-process=image/resize,m_fill,h_160,w_240/quality,q_90',
+    //     weight: 248
+    //   },
+    //   {
+    //     format: null,
+    //     fullUrl: '',
+    //     height: 187,
+    //     landscape: 1,
+    //     size: 1,
+    //     url: 'https://rmrbcmsonline.peopleapp.com/upload/article_resource/image/1648118198_0c20f7c31c7b4eca6b0d0871e7771c62.png?x-oss-process=image/resize,m_fill,h_160,w_240/quality,q_90',
+    //     weight: 248
+    //   },
+    //   {
+    //     format: null,
+    //     fullUrl: '',
+    //     height: 187,
+    //     landscape: 1,
+    //     size: 1,
+    //     url: 'https://rmrbcmsonline.peopleapp.com/upload/article_resource/image/1648118200_d10309bee894a67311e6c8f77df676d4.png?x-oss-process=image/resize,m_fill,h_160,w_240/quality,q_90',
+    //     weight: 248
+    //   },
+    //   {
+    //     format: null,
+    //     fullUrl: '',
+    //     height: 187,
+    //     landscape: 1,
+    //     size: 1,
+    //     url: 'https://rmrbcmsonline.peopleapp.com/upload/article_resource/image/1648118202_f33743e452fb69ee2c45c18a56eccdf6.png?x-oss-process=image/resize,m_fill,h_160,w_240/quality,q_90',
+    //     weight: 248
+    //   }
+    // ],
+    // newsTitle: '科普：如何发现家中是否有白蚁危害？丨又到白蚁分飞季②',
+    // rmhInfo: {
+    //   authIcon:
+    //   'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/blue.png',
+    //   authTitle: '封面新闻',
+    //   rmhDesc: '封面新闻，亿万年轻人的生活方式。',
+    //   rmhHeadUrl:
+    //   'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221212/122faff796.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
+    //   rmhId: '2016608',
+    //   rmhName: '封面新闻',
+    //   userId: '522390888224390',
+    //   userType: '2'
+    // },
+    // source: '头条号',
+    // publishTime: '1651204607000',
+  } as ContentDTO;
 
 
   build() {
   build() {
     Column() {
     Column() {
-
-
       //body
       //body
       Column() {
       Column() {
         //新闻标题
         //新闻标题
         Text(this.contentDTO.newsTitle)
         Text(this.contentDTO.newsTitle)
-          .fontSize(17)
-          .fontColor('#222222')
+          .fontSize($r('app.float.font_size_17'))
+          .fontColor($r('app.color.color_222222'))
           .maxLines(3)
           .maxLines(3)
           .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
         //三图
         //三图
         Row() {
         Row() {
-          Image(this.contentDTO.fullColumnImgUrls[0]?.url)
-            .width('32%')
-
-            .height(75)
-            .borderRadius({ topLeft:4,bottomLeft:4 })
-
-          Image(this.contentDTO.fullColumnImgUrls[1]?.url)
-            .width('32%')
-            .height(75)
-
-          Image(this.contentDTO.fullColumnImgUrls[2]?.url)
-            .width('32%')
-            .height(75)
-            .borderRadius({ topRight:4,bottomRight:4 })
-
+          GridRow({ gutter: 2 }) {
+            ForEach(this.contentDTO.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
+              if (index < 3) {
+                GridCol({ span: { xs: 4 } }) {
+                  Image(item.url)
+                    .width('100%')
+                    .aspectRatio(113 / 75)
+                    .borderRadius({
+                      topLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
+                      topRight: index === 2 ? $r('app.float.image_border_radius') : 0,
+                      bottomLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
+                      bottomRight: index === 2 ? $r('app.float.image_border_radius') : 0,
+                    })
+                }
+              }
+            })
+          }
         }
         }
-        .justifyContent(FlexAlign.SpaceBetween)
         .width('100%')
         .width('100%')
-        .height(75)
-        .margin({top:8})
-        .borderRadius(8)
-
+        .margin({ top: 8 })
       }
       }
       .width('100%')
       .width('100%')
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
-      .padding({top:14})
-      .onClick((event: ClickEvent)=>{
+      .onClick((event: ClickEvent) => {
         ProcessUtils.processPage(this.contentDTO)
         ProcessUtils.processPage(this.contentDTO)
       })
       })
 
 
@@ -69,31 +120,29 @@ export struct Card4Component {
         Image($r('app.media.point'))
         Image($r('app.media.point'))
           .width(12)
           .width(12)
           .height(12)
           .height(12)
-
-        Text(this.contentDTO.publishTime)
-          .bottomTextStyle()
-        Text(' ')
-
-        Text('518条评论')
+        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
           .bottomTextStyle()
           .bottomTextStyle()
-
+        // TODO 评论字段取值
+        // Text('518条评论')
+        //   .bottomTextStyle()
       }
       }
       .width('100%')
       .width('100%')
-
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
-      // .padding({bottom:14})
-      .margin({top:8})
-      .padding({bottom:14})
-
+      .margin({ top: 8 })
     }
     }
-    .width('100%')
-    .padding({top:8,left:16,right:16})
-
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
   }
   }
 }
 }
 
 
 
 
-@Extend(Text) function bottomTextStyle() {
+@Extend(Text)
+function bottomTextStyle() {
   .fontSize(12)
   .fontSize(12)
   .fontColor('#B0B0B0')
   .fontColor('#B0B0B0')
 }
 }

@@ -5,11 +5,21 @@ import { ProcessUtils } from '../../utils/ProcessUtils';
 const TAG: string = 'Card5Component';
 const TAG: string = 'Card5Component';
 
 
 /**
 /**
- * 卡片样式："appStyle":"5"
+ * 卡片样式："appStyle":"5" 头图卡
  */
  */
+// @Entry
 @Component
 @Component
 export struct Card5Component {
 export struct Card5Component {
-  @State contentDTO: ContentDTO = {} as ContentDTO;
+  @State contentDTO: ContentDTO = {
+    // coverSize: '850*478',
+    // coverType: 1,
+    // coverUrl:
+    // 'https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20240323/image/display/54ce2de0d20842839e96a644c78361b7.jpg?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+    // linkUrl:
+    // 'https://pd-people-uat.pdnews.cn/h/atv/collect/1000000472?hiddenNavigator=1',
+    // newsTitle: '今天是周日，天气阴天，明天是周一。',
+    // objectType: '6'
+  } as ContentDTO;
 
 
   build() {
   build() {
     Stack() {
     Stack() {
@@ -43,8 +53,12 @@ export struct Card5Component {
     }
     }
     .alignContent(Alignment.Bottom)
     .alignContent(Alignment.Bottom)
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
-    .padding(
-      { top: 16, bottom: 16, left: 14, right: 14 })
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
     })
     })

@@ -3,11 +3,11 @@ import { CommonConstants, CompStyle } from 'wdConstant';
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 
 
-const TAG: string = 'Card6Component';
+const TAG: string = 'Card6Component-Card13Component';
 const FULL_PARENT: string = '100%';
 const FULL_PARENT: string = '100%';
 
 
 /**
 /**
- * 卡片样式："appStyle":"6"
+ * 卡片样式："appStyle":"6"以及13
  */
  */
 @Component
 @Component
 export struct Card6Component {
 export struct Card6Component {

+import PageModel from '../../../viewmodel/PageModel'
+
+
+/// 所有用户类型定义
+/// 1--普通账户正常；--不能直播、点播
+/// 2--视频号，可以直播、点播；显示查看修改都是自己的信息；
+/// 3--矩阵号，是有视频号升级来的；可以登陆app,我的里面是自己的信息；发评论、发视频、直播都是自己；矩阵号下面可以挂视频号、运营子账号；
+/// 4--运营子账号，登陆使用的是自己的userId手机，密码；显示是对应视频号的信息，我的里面是视频号的信息，无法更改基本信息，自己没有头像，昵称信息；发点播、发直播、发评论，都是对应视频号的身份发送的；还是需要记录子账号的userId;（评论表 userId,userType,creatorId）
+export enum WDPublicUserType {
+  /// 未知类型
+  WDPublicUserType_Unkown = 0,
+
+  /// 普通用户
+  WDPublicUserType_NormalUser   = 1,
+
+  /// 号主
+  WDPublicUserType_AccountOwner   = 2,
+
+  ///  矩阵号
+  WDPublicUserType_Matrix     = 3,
+
+  ///  运营子账号
+  WDPublicUserType_OperatingSubAccount = 4,
+
+  /// 内容源账号
+  WDPublicUserType_ContentSourceAccount = 5,
+}
+
+@Observed
+export class commentListModel extends PageModel{
+  pageNum: number = 0
+  pageSize: number = 0
+  totalCount: number = 0
+  hasNext: number = 0
+  list: commentItemModel[] = []
+
+}
+
+export class commentItemModel {
+  authorLike: string = ''
+  avatarFrame: string = ''
+  checkStatus: string = ''
+  childCommentNum: string = ''
+  childComments: commentItemModel[] = []
+  commentContent: string = ''
+  commentContentSensitive: string = ''
+  commentLevel: number = 0
+  commentPics: string = ''
+  commentSensitive: string = ''
+  commentType: number = 0
+  contentAuthor: number = 0
+  createTime: string = ''
+  creatorFlag: string = ''
+  fromCreatorId: string = ''
+  fromDeviceId: string = ''
+  fromUserHeader: string = ''
+  fromUserId: string = ''
+  fromUserName: string = ''
+  fromUserType: WDPublicUserType = 0
+  id: string = ''
+  likeNum: string = ''
+  /*是否点赞*/
+  isLike: boolean = false
+  mySelf: string = ''
+  parentId: string = ''
+  region: string = ''
+  replyNum: string = ''
+  rootCommentId: string = ''
+  sensitiveExist: string = ''
+  sensitiveShow: string = ''
+  toUserContentAuthor: string = ''
+  toUserId: string = ''
+  toUserName: string = ''
+  toUserType: string = ''
+  topFlag: string = ''
+  uuid: string = ''
+  /*本地使用，收起时默认3行 -1为不限制行数*/
+  maxLine: number = 3
+
+  /*是否有展示更多*/
+  hasMore:boolean = false
+  /*当有展示更多的时候，当前的状态是展开还是收起*/
+  expanded:boolean = false
+
+  highQualityExpireTime:string = '';
+  highQualityTime:string = '';
+  targetTitle:string = '';
+  targetStatus:string = '';
+  targetId:string = '';
+  targetRelId:string = '';
+  targetRelObjectId:string = '';
+  targetRelType:string = '';
+  targetType:string = '';
+  visitorComment:string = '';
+  shareInfo:commentItemShareInfoModel[] = []
+  // targetId:string = '';
+  // targetId:string = '';
+  // targetId:string = '';
+
+}
+
+export class commentItemShareInfoModel {
+  shareCoverUrl: string = ''
+  shareSummary: string = ''
+  shareTitle: string = ''
+  shareUrl: string = ''
+}

+import ArrayList from '@ohos.util.ArrayList'
+import { ViewType } from 'wdConstant/Index';
+import { LazyDataSource } from 'wdKit/Index';
+import PageModel from '../../../viewmodel/PageModel';
+import { commentItemModel, commentListModel, WDPublicUserType } from '../model/CommentModel';
+import commentViewModel from '../viewmodel/CommentViewModel'
+import { CommentText } from './CommentText';
+import measure from '@ohos.measure'
+
+@Entry
+@Preview
+@Component
+export struct CommentComponent {
+  @State private browSingModel: commentListModel = new commentListModel()
+  isloading: boolean = false
+  // @State allDatas :commentItemModel[] = [];
+
+  @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
+
+  aboutToAppear() {
+    this.getData();
+    this.getData();
+    this.getData();
+    this.getData();
+  }
+
+  /*标题：全部评论*/
+  @Builder
+  titleHeader() {
+    Row() {
+      Row() {
+        Image($r('app.media.redLine'))
+          .height(16)
+          .width(3)
+        Text('全部评论')
+          .fontSize(18)// .fontColor('#222222')
+          .fontColor($r('app.color.color_222222'))
+          .fontWeight(FontWeight.Medium)
+          .margin({ left: 5 })
+
+      }
+      .margin({ left: 16 })
+
+    }.height(44)
+    .width('100%')
+    .justifyContent(FlexAlign.SpaceBetween);
+  }
+
+  /*1级评论作为titleHeader*/
+  @Builder
+  CommentHeaderItem(item: commentItemModel) {
+    Column() {
+      Row() {
+        //头像
+        Stack() {
+          Image(item.fromUserHeader)
+            .alt($r('app.media.default_head'))
+            .width('32')
+            .height('32')
+            .objectFit(ImageFit.Cover)
+            .borderRadius(16)
+          Image($r('app.media.icon_border_test'))
+            .width('48')
+            .height('48')
+            .objectFit(ImageFit.Cover)
+            .borderRadius(24)
+        }
+        .width(48)
+        .height(48)
+        .margin({ left: 8 })
+        .alignContent(Alignment.Center)
+        .onClick(() => {
+          // TODO 跳转个人详情
+        })
+
+        //昵称
+        Text(item.fromUserName)
+          .fontSize(14)
+          .fontColor($r('app.color.color_222222'))
+          .fontWeight(FontWeight.Medium)
+          .margin({ left: 5 })
+
+
+        /// 暂时不显示 “我” 的标签了
+        /// 人民号＞置顶＞作者
+
+        //人民号
+        // if (item.fromUserType === WDPublicUserType.WDPublicUserType_Matrix) {
+        Image($r('app.media.comment_rmh_tag')).width(20).height(20).margin({ left: 5 });
+        // }
+        //置顶
+        // if (item.topFlag) {
+        Image($r('app.media.comment_icon_zhiding')).width(30).height(18).margin({ left: 5 });
+        // }
+        //作者
+        // if (item.contentAuthor === 1) {
+        Text('作者')
+          .fontSize(11)
+          .fontColor('#968562')
+          .backgroundColor('#F1EFEB')
+          .textAlign(TextAlign.Center)
+          .borderRadius(2)
+          .width(30)
+          .height(18)
+          .margin({ left: 5 });
+        // }
+      }
+
+      CommentText({
+        longMessage: item.commentContent,
+        maxline: 3,
+        fontSize: 16,
+        fontWeight: FontWeight.Regular,
+        marginWidth: (59 + 16)
+      })
+        .margin({ left: 59, right: 16 })
+
+
+      this.CommentFooterView(item);
+    }.alignItems(HorizontalAlign.Start)
+
+  }
+
+  /*查看更多和收起*/
+  @Builder
+  GroupFooterView(item: commentItemModel) {
+    Row() {
+      if (item.expanded){
+        Row() {
+          Text('收起').fontColor($r('app.color.color_222222')).fontSize(14)
+          Image($r('app.media.comment_pickUp')).width(12).height(12)
+        }.margin({ left: 213 })
+      }else {
+        Row() {
+          Text().backgroundColor($r('app.color.color_EDEDED')).width(24).height(1)
+          Text('查看更多回复').fontColor($r('app.color.color_222222')).fontSize(14).margin({ left: 6 })
+          Image($r('app.media.comment_unfold')).width(12).height(12)
+        }.margin({ left: 53 })
+      }
+
+
+
+
+    }.height(30)
+  }
+
+  /*评论内容下面的IP地址时间点赞*/
+  @Builder
+  CommentFooterView(item: commentItemModel) {
+    Row() {
+
+      Row({ space: 6 }) {
+        Text(item.region ? (item.region + '网友') : '人民日报客户端网友')
+          .fontColor($r('app.color.color_B0B0B0'))
+          .fontSize(12);
+        Image($r('app.media.comment_hyphen'))
+          .size({
+            width: 4,
+            height: 4
+          })
+
+        //TODO:  时间格式需要本地调整
+        // / 展现专用，用于获取多久之前
+        // ///小于1分钟：刚刚
+        // ///1~60分钟：x分钟前
+        // ///1小时~1天：x小时前
+        // ///1天~2天：1天前
+        // ///2天~：日期隐藏
+        Text(item.createTime)
+          .fontColor($r('app.color.color_B0B0B0'))
+          .fontSize(12)
+
+        Image($r('app.media.comment_hyphen_block'))
+          .size({
+            width: 4,
+            height: 4
+          })
+
+        Text('回复')
+          .fontColor($r('app.color.color_222222'))
+          .fontSize(12)
+          .onClick(() => {
+            //TODO:  回复
+          })
+      }
+
+      Row({ space: 6 }) {
+        Text(item.likeNum)
+          .fontColor($r('app.color.color_666666'))
+          .fontSize(14)
+
+        Image($r('app.media.comment_like_normal'))
+          .size({
+            width: 16,
+            height: 16
+          })
+          .onClick(() => {
+            //TODO:  点赞
+          })
+      }
+
+    }
+    .justifyContent(FlexAlign.SpaceBetween)
+    .height(30)
+    .margin({ left: 59, right: 16 })
+  }
+
+  build() {
+    Column() {
+
+      List() {
+        ListItemGroup({ header: this.titleHeader() })
+        LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
+          if (item.hasMore) {
+            ListItemGroup({ header: this.CommentHeaderItem(item), footer: this.GroupFooterView(item) }) {
+              ForEach(item.childComments, (childItem: commentItemModel, subIndex: number) => {
+                ListItem() {
+                  ChildCommentItem();
+                }
+              })
+            }
+          }else {
+            ListItemGroup({ header: this.CommentHeaderItem(item)}) {
+              ForEach(item.childComments, (childItem: commentItemModel, subIndex: number) => {
+                ListItem() {
+                  ChildCommentItem();
+                }
+              })
+            }
+          }
+        })
+      }.layoutWeight(1)
+    }
+  }
+
+  //获取数据
+  async getData() {
+    this.browSingModel.currentPage = 1
+    commentViewModel.getCommentLocal(getContext()).then(commentListModel => {
+      if (commentListModel && commentListModel.list && commentListModel.list.length > 0) {
+        commentListModel.hasMore = true;
+        this.browSingModel.viewType = ViewType.LOADED;
+        this.allDatas.push(...commentListModel.list)
+        if (commentListModel.list.length === this.browSingModel.pageSize) {
+          this.browSingModel.currentPage++;
+          this.browSingModel.hasMore = true;
+        } else {
+          this.browSingModel.hasMore = false;
+        }
+      } else {
+        this.browSingModel.viewType = ViewType.EMPTY;
+      }
+
+
+
+    })
+  }
+
+  /*回复评论*/
+  ReplyComment() {
+
+  }
+}
+
+
+@Component
+struct ChildCommentItem {
+  build() {
+    Text('child')
+  }
+}
+

+import measure from '@ohos.measure'
+import curves from '@ohos.curves';
+import { BusinessError } from '@ohos.base';
+import display from '@ohos.display';
+
+const collapseString = '...展开全文'
+const uncollapseString = '...收起'
+
+@Component
+@Preview
+export struct CommentText {
+  // 长文本
+  @State longMessage: string = ''
+  // 最大显示行数
+  @State maxLineMesssage: string = '';
+
+  @State lines: number = 3;
+  @State maxline: number = 3;
+  @State marginWidth:number = 0;
+  // 长文本状态（展开 or 收起）
+  @State collapseText: string = collapseString
+  // 屏幕宽度（单位px）
+  screenWidth: number = 0;
+  // 是否需要显示"展开"字样（注：当文本长度较短时就不需要“展开”）
+  @State isExpanded: boolean = false
+  /*当前展开状态*/
+  @State expandedStates: boolean = false;
+  @State fontSize: number = 18;
+  @State fontWeight: FontWeight = FontWeight.Regular
+  fontColor: ResourceColor = $r('app.color.color_222222')
+  // 测量文本宽度（单位px）
+  @State textWidth: number = 0;
+
+  // constructor(longMessage?:string,) {
+  //   super();
+  //   this.longMessage = longMessage;
+  // }
+  // 获取当前所有的display对象
+  promise: Promise<Array<display.Display>> = display.getAllDisplays()
+
+
+
+  aboutToAppear() {
+    console.log(`文本宽度为：${this.textWidth}`)
+    let padding = vp2px(5 + this.marginWidth)
+
+    this.textWidth = measure.measureText({
+      textContent: this.longMessage,
+      fontSize: this.fontSize,
+      fontWeight: this.fontWeight,
+      constraintWidth:(this.screenWidth - padding)
+    })
+
+    console.log(`文本宽度为：${this.textWidth}`)
+
+    this.promise.then((data: Array<display.Display>) => {
+      console.log(`所有的屏幕信息：${JSON.stringify(data)}`)
+      //单位为像素
+      this.screenWidth = data[0]["width"]
+      // 屏幕宽度 * 最大行数 * 组件宽度比例 和 文字测量宽度
+      this.isExpanded = (this.screenWidth - padding) * this.lines <= this.textWidth
+      // this.expandedStates = this.isExpanded;
+
+      //需要展开的话计算3行需要显示的文字
+      if (this.isExpanded) {
+
+
+        let padding = vp2px(5 + this.marginWidth)
+        let maxLineTextWidth =  (this.screenWidth - padding) * this.maxline;
+
+        for (let index = 0; index < this.longMessage.length; index++) {
+          const element = this.longMessage.substring(0, index)
+          const string = element + this.collapseText; //截取
+          const thisTextWidth = measure.measureText({
+            textContent: string,
+            fontSize: this.fontSize,
+            fontWeight: this.fontWeight,
+            constraintWidth:(this.screenWidth - padding)
+          })
+
+          //计算有误差20
+
+          if (thisTextWidth >= maxLineTextWidth) {
+            break
+          }
+          this.maxLineMesssage = element;
+
+        }
+      }
+
+
+    }).catch((err: BusinessError) => {
+      console.error(`Failed to obtain all the display objects. Code: ${JSON.stringify(err)}`)
+    })
+
+
+  }
+
+  build() {
+    Row() {
+      Column() {
+        if (this.isExpanded) {
+          // Stack({ alignContent: Alignment.BottomEnd }) {
+            Text(this.longMessage) {
+              Span(this.expandedStates ? this.longMessage : this.maxLineMesssage)
+              Span(this.collapseText).onClick(() => {
+                if (this.collapseText == collapseString) {
+                  this.collapseText = uncollapseString;
+                  this.expandedStates = true;
+                  this.lines = -1; // 使得设置的最大行属性无效
+                  // 展开动画
+                  // animateTo({
+                  //   duration: 150,
+                  //   curve: curves.springMotion(),
+                  // }, () => {
+                  // this.lines = -1; // 使得设置的最大行属性无效
+                  // })
+                } else {
+                  this.collapseText = collapseString;
+                  this.expandedStates = false;
+                  this.lines = this.maxline; // 只显示3行
+                  // 收起动画
+                  // animateTo({
+                  //   duration: 100,
+                  //   curve: Curve.Friction,
+                  // }, () => {
+                  //   this.lines = this.maxline; // 只显示3行
+                  // })
+                }
+              })
+            }
+            .width('100%')
+            .fontSize(this.fontSize)
+            .fontWeight(this.fontWeight)
+            .fontColor(this.fontColor)
+            .maxLines(this.lines)
+            // .backgroundColor(Color.Red)
+
+          // }
+        }
+        else {
+          Text('我没有展开收起')
+            .width('100%')
+            .fontSize(this.fontSize)
+            .fontWeight(this.fontWeight)
+            .fontColor(this.fontColor)
+        }
+      }
+      // .backgroundColor(Color.Brown)
+      .width('100%')
+    }
+
+    // .height('100%')
+  }
+}
+
+
+// Index.ets
+@Entry
+@Component
+struct Index {
+  build() {
+    Column() {
+      CommentText()
+    }
+  }
+}

+import { ViewType } from 'wdConstant/Index'
+import { LazyDataSource } from 'wdKit/Index'
+import { commentItemModel, commentListModel } from '../model/CommentModel'
+import commentViewModel from '../viewmodel/CommentViewModel'
+
+@Entry
+@Preview
+@Component
+export struct QualityCommentsComponent {
+  @State private browSingModel: commentListModel = new commentListModel()
+  isloading: boolean = false
+  @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
+
+  aboutToAppear(): void {
+
+    commentViewModel.fetchQualityCommentList('1').then((commentListModel)=>{
+      if (commentListModel && commentListModel.list && commentListModel.list.length > 0) {
+        commentListModel.hasMore = true;
+        this.browSingModel.viewType = ViewType.LOADED;
+        this.allDatas.push(...commentListModel.list)
+        if (commentListModel.list.length === this.browSingModel.pageSize) {
+          this.browSingModel.currentPage++;
+          this.browSingModel.hasMore = true;
+        } else {
+          this.browSingModel.hasMore = false;
+        }
+      } else {
+        this.browSingModel.viewType = ViewType.EMPTY;
+      }
+    })
+  }
+
+  build() {
+
+  }
+}

+import { Logger, ResourcesUtils } from 'wdKit/Index';
+import { HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
+import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
+import { commentItemModel, commentListModel } from '../model/CommentModel';
+import HashMap from '@ohos.util.HashMap';
+
+const TAG = "CommentViewModel"
+
+class CommentViewModel {
+  private static instance: CommentViewModel
+  /**
+   * 单例模式
+   * @returns
+   */
+  public static getInstance(): CommentViewModel {
+    if (!CommentViewModel.instance) {
+      CommentViewModel.instance = new CommentViewModel();
+    }
+    return CommentViewModel.instance;
+  }
+
+
+  /*获取本地mock数据*/
+  async getCommentLocal(context: Context): Promise<commentListModel> {
+    Logger.info(TAG, `getBottomNavDataMock start`);
+    let compRes: ResponseDTO<commentListModel> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<commentListModel>>(context,'comment_local.json' );
+    if (!compRes || !compRes.data) {
+      Logger.info(TAG, `getAppointmentListDataLocal compRes  is empty`);
+      return new commentListModel()
+    }
+    Logger.info(TAG, `getAppointmentListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
+    return compRes.data
+  }
+
+
+  fetchQualityCommentList(pageNum: string) {
+    let url = HttpUrlUtils.getQualityCommentUrl() + `?&pageSize=${10}&pageNum=${pageNum}`
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return new Promise<commentListModel>((success, fail) => {
+      HttpRequest.get<ResponseDTO<commentListModel>>(url, headers).then((data: ResponseDTO<commentListModel>) => {
+        if (!data || !data.data) {
+          fail("数据为空")
+          return
+        }
+        if (data.code != 0) {
+          fail(data.message)
+          return
+        }
+        let listData = data.data as commentListModel
+
+        success(listData)
+      }, (error: Error) => {
+        fail(error.message)
+        Logger.debug(TAG, error.toString())
+      })
+    })
+  }
+
+
+  // BaseGetRequest(contentID:number,contentType:string,pageNum:string){
+  //   let url = HttpUrlUtils.getMyCollectionListDataUrl()+ `?type=${type}&operateTag=${1}&pageSize=${10}&pageNum=${pageNum}`
+  //   if (tagId.length > 0) {
+  //     url = url + `&tagId=${tagId}`
+  //   }
+  //   let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
+  //   return WDHttp.get<ResponseDTO<commentListModel>>(url, headers)
+  // }
+  //
+  //
+  // fetchCommentList(contentID:number,contentType:string,pageNum:string):Promise<commentListModel>{
+  //   return new Promise<commentListModel>((success,error) => {
+  //     this.BaseGetRequest(contentID,contentType,pageNum).then((navResDTO: ResponseDTO<commentListModel>) => {
+  //       if (!navResDTO || navResDTO.code != 0) {
+  //         // success(this.getAppointmentListDataLocal(context))
+  //         return
+  //       }
+  //       Logger.info(TAG, "getAppointmentList then,AppointmentResDTO.timeStamp:" + navResDTO.timestamp);
+  //       let listData =  navResDTO.data as commentListModel
+  //       success(listData)
+  //     }).catch((err: Error) => {
+  //       Logger.error(TAG, `fetchAppointmentListDataApi catch, error.name : ${err.name},  error.message:${err.message}`);
+  //       error("page data invalid");
+  //     })
+  //   })
+  // }
+
+
+}
+
+
+const commentViewModel = CommentViewModel.getInstance();
+
+export default commentViewModel as CommentViewModel

@@ -8,7 +8,6 @@ const TAG = 'Zh_Single_Column-04';
  * 人民号主题卡
  * 人民号主题卡
  * 枚举值 Zh_Single_Column-04
  * 枚举值 Zh_Single_Column-04
  */
  */
-@Entry
 @Component
 @Component
 export struct ZhSingleColumn04 {
 export struct ZhSingleColumn04 {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO

@@ -8,7 +8,6 @@ const TAG = 'Zh_Single_Column-05';
  * 人民号入住卡
  * 人民号入住卡
  * 枚举值 Zh_Single_Column-05
  * 枚举值 Zh_Single_Column-05
  */
  */
-@Entry
 @Component
 @Component
 export struct ZhSingleColumn05 {
 export struct ZhSingleColumn05 {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO

@@ -33,8 +33,8 @@ export default struct MinePageUserSimpleInfoUI {
       Stack(){
       Stack(){
         Image(this.headPhotoUrl)
         Image(this.headPhotoUrl)
           .alt($r('app.media.default_head'))
           .alt($r('app.media.default_head'))
-          .width('108lpx')
-          .height('108lpx')
+          .width('100lpx')
+          .height('100lpx')
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
           .borderRadius(50)
           .borderRadius(50)
         Image(this.levelHead)
         Image(this.levelHead)

@@ -18,7 +18,7 @@ export struct FollowFirstTabsComponent{
         value.forEach((element)=>{
         value.forEach((element)=>{
           this.data.push(element)
           this.data.push(element)
         })
         })
-      console.log("ycg",this.data.length.toString());
+
       if(this.controller != null && this.data.length>1 && this.changeIndex === 1){
       if(this.controller != null && this.data.length>1 && this.changeIndex === 1){
         //个人主页 跳转 关注页 tab 2
         //个人主页 跳转 关注页 tab 2
         let intervalID = setInterval(() => {
         let intervalID = setInterval(() => {

@@ -171,6 +171,7 @@ struct ChildComponent {
             .fontSize('31lpx')
             .fontSize('31lpx')
             .lineHeight('38lpx')
             .lineHeight('38lpx')
             .fontColor($r('app.color.color_222222'))
             .fontColor($r('app.color.color_222222'))
+            .maxLines(1)
           Text(`粉丝${this.data.cnFansNum}`)
           Text(`粉丝${this.data.cnFansNum}`)
             .fontColor($r('app.color.color_B0B0B0'))
             .fontColor($r('app.color.color_B0B0B0'))
             .fontSize('23lpx')
             .fontSize('23lpx')

@@ -35,25 +35,45 @@ export struct FollowSecondTabsComponent{
 
 
   @Builder FollowSecondUI(){
   @Builder FollowSecondUI(){
     Row() {
     Row() {
+      Row(){
+        // 页签
+        Column({ space: 7 }) {
+          Scroll() {
+            Column() {
+              ForEach(this.data[this.firstIndex].children, (item: FollowSecondListItem, index: number ) => {
+                this.TabBuilder(index,item)
+              })
+            }
+            .justifyContent(FlexAlign.Start)
+          }
+          .align(Alignment.Top)
+          .scrollable(ScrollDirection.Vertical)
+          .scrollBar(BarState.Off)
+          .height('100%')
+        }.height('100%')
+        .alignItems(HorizontalAlign.Center)
+      }
+      .alignItems(VerticalAlign.Top)
+      .height('100%')
+
       Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
       Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
         ForEach(this.data[this.firstIndex].children, (item: FollowSecondListItem, index: number ) => {
         ForEach(this.data[this.firstIndex].children, (item: FollowSecondListItem, index: number ) => {
           TabContent(){
           TabContent(){
             FollowThirdTabsComponent({data:$data,firstIndex:$firstIndex,secondIndex:index})
             FollowThirdTabsComponent({data:$data,firstIndex:$firstIndex,secondIndex:index})
-          }.tabBar(this.TabBuilder(index,item))
+          }
           .backgroundColor($r('app.color.white'))
           .backgroundColor($r('app.color.white'))
         }, (item: FollowListItem, index: number) => index.toString())
         }, (item: FollowListItem, index: number) => index.toString())
       }
       }
       .vertical(true)
       .vertical(true)
       .barMode(BarMode.Scrollable)
       .barMode(BarMode.Scrollable)
-      .barWidth('140lpx')
       .animationDuration(0)
       .animationDuration(0)
       .onChange((index: number) => {
       .onChange((index: number) => {
         this.currentIndex = index
         this.currentIndex = index
       })
       })
-      .width('100%')
+      .barWidth(0)
+      .height('100%')
+      .layoutWeight(1)
     }.width('100%')
     }.width('100%')
-    .alignItems(VerticalAlign.Top)
-    .backgroundColor('#0FF')
   }
   }
 
 
   @Builder TabBuilder(index: number, item: FollowSecondListItem) {
   @Builder TabBuilder(index: number, item: FollowSecondListItem) {
@@ -73,6 +93,7 @@ export struct FollowSecondTabsComponent{
     })
     })
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
     .height('84lpx')
     .height('84lpx')
+    .width('140lpx')
     .backgroundColor(this.currentIndex === index?$r('app.color.white'):$r('app.color.color_F9F9F9'))
     .backgroundColor(this.currentIndex === index?$r('app.color.white'):$r('app.color.color_F9F9F9'))
   }
   }
 
 

@@ -34,19 +34,45 @@ export struct FollowThirdTabsComponent{
         .lineHeight('38lpx')
         .lineHeight('38lpx')
         .backgroundColor($r('app.color.color_F9F9F9'))
         .backgroundColor($r('app.color.color_F9F9F9'))
         .padding('13lpx')
         .padding('13lpx')
+        .maxLines(1)
     }
     }
     .onClick(()=>{
     .onClick(()=>{
       this.currentIndex = index
       this.currentIndex = index
       this.controller.changeIndex(this.currentIndex)
       this.controller.changeIndex(this.currentIndex)
     })
     })
-    .height('100%')
+    .height('84lpx')
     .margin({right:'9lpx'})
     .margin({right:'9lpx'})
     .padding({left:'20lpx',right:index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?"20lpx":"0lpx"})
     .padding({left:'20lpx',right:index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?"20lpx":"0lpx"})
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
   }
   }
 
 
   @Builder FollowThirdUI(){
   @Builder FollowThirdUI(){
-    Row() {
+
+    Column(){
+      Column() {
+        // 页签
+        Row({ space: 7 }) {
+          Scroll() {
+            Row() {
+              ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
+                this.TabBuilder(index,item)
+              })
+            }
+            .justifyContent(FlexAlign.Start)
+          }
+          .align(Alignment.Start)
+          .scrollable(ScrollDirection.Horizontal)
+          .scrollBar(BarState.Off)
+          .width('90%')
+          .padding({left:'11lpx'})
+        }
+        .alignItems(VerticalAlign.Bottom)
+        .width('100%')
+      }
+      .backgroundColor($r('app.color.white'))
+      .alignItems(HorizontalAlign.Start)
+      .width('100%')
+
       Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
       Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
         ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
         ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
           TabContent(){
           TabContent(){
@@ -58,20 +84,19 @@ export struct FollowThirdTabsComponent{
                 .margin({left:'20lpx'})
                 .margin({left:'20lpx'})
               FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].children[this.secondIndex].children[index].id})
               FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].children[this.secondIndex].children[index].id})
             }
             }
-          }.tabBar(this.TabBuilder(index,item))
+          }
           .backgroundColor($r('app.color.white'))
           .backgroundColor($r('app.color.white'))
         }, (item: FollowListItem, index: number) => index.toString())
         }, (item: FollowListItem, index: number) => index.toString())
       }
       }
+      .barHeight(0)
       .vertical(false)
       .vertical(false)
       .barMode(BarMode.Scrollable)
       .barMode(BarMode.Scrollable)
-      .barWidth('100%')
-      .barHeight('84lpx')
       .animationDuration(0)
       .animationDuration(0)
       .onChange((index: number) => {
       .onChange((index: number) => {
         this.currentIndex = index
         this.currentIndex = index
       })
       })
       .width('100%')
       .width('100%')
-    }.width('100%')
+    }
   }
   }
 
 
 }
 }

@@ -6,13 +6,14 @@ import { EmptyComponent } from '../view/EmptyComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import RefreshLayout from './RefreshLayout'
 import RefreshLayout from './RefreshLayout'
 import { RefreshLayoutBean } from './RefreshLayoutBean';
 import { RefreshLayoutBean } from './RefreshLayoutBean';
-import { CompDTO } from 'wdBean'
+import { CompDTO, ContentDTO } from 'wdBean'
 import LoadMoreLayout from './LoadMoreLayout'
 import LoadMoreLayout from './LoadMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
 import { CompParser } from '../CompParser'
 import { CompParser } from '../CompParser'
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
+import { BigPicCardComponent } from '../view/BigPicCardComponent';
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -20,8 +21,8 @@ struct BrowsingHistoryPage {
   @State private browSingModel: PageModel = new PageModel()
   @State private browSingModel: PageModel = new PageModel()
   isloading : boolean = false
   isloading : boolean = false
   @Provide isEditState:boolean = false
   @Provide isEditState:boolean = false
-  @State allDatas :CompDTO[] = [];
-  @State selectDatas :CompDTO[] = [];
+  @State allDatas :ContentDTO[] = [];
+  @State selectDatas :ContentDTO[] = [];
   @Provide deleteNum :number = 0;
   @Provide deleteNum :number = 0;
   @Provide isAllSelect:boolean = false
   @Provide isAllSelect:boolean = false
   aboutToAppear(){
   aboutToAppear(){
@@ -72,7 +73,7 @@ struct BrowsingHistoryPage {
         })
         })
       }
       }
 
 
-      ForEach(this.allDatas, (compDTO: CompDTO, compIndex: number) => {
+      ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
         ListItem() {
         ListItem() {
           this.newCompParser(compDTO,compIndex)
           this.newCompParser(compDTO,compIndex)
         }
         }
@@ -94,7 +95,7 @@ struct BrowsingHistoryPage {
   }
   }
 
 
   @Builder
   @Builder
-  newCompParser(compDTO: CompDTO, compIndex: number){
+  newCompParser(compDTO: ContentDTO, compIndex: number){
     Row(){
     Row(){
       if (this.isEditState){
       if (this.isEditState){
         CustomSelectUI({
         CustomSelectUI({
@@ -106,7 +107,7 @@ struct BrowsingHistoryPage {
           .margin({left:16})
           .margin({left:16})
       }
       }
       Column() {
       Column() {
-        CompParser({ compDTO: compDTO, compIndex: compIndex })
+        BigPicCardComponent({contentDTO:compDTO})
       }
       }
     }
     }
   }
   }
@@ -118,11 +119,11 @@ struct BrowsingHistoryPage {
 
 
   async getData() {
   async getData() {
     this.browSingModel.currentPage = 1
     this.browSingModel.currentPage = 1
-    MyCollectionViewModel.newFetchMyCollectList(2,'1',this.browSingModel.currentPage,getContext(this)).then(pageDto => {
-      if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
+    MyCollectionViewModel.fetchMyCollectList(2,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => {
+      if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
         this.browSingModel.viewType = ViewType.LOADED;
         this.browSingModel.viewType = ViewType.LOADED;
-        this.allDatas.push(...pageDto.compList)
-        if (pageDto.compList.length === this.browSingModel.pageSize) {
+        this.allDatas.push(...collectionItem.list)
+        if (collectionItem.list.length === this.browSingModel.pageSize) {
           this.browSingModel.currentPage++;
           this.browSingModel.currentPage++;
           this.browSingModel.hasMore = true;
           this.browSingModel.hasMore = true;
         } else {
         } else {
@@ -136,7 +137,7 @@ struct BrowsingHistoryPage {
 
 
   //数据处理
   //数据处理
   //单个选择
   //单个选择
-  addCompDTO(isOn:boolean , compDTO: CompDTO){
+  addCompDTO(isOn:boolean , compDTO: ContentDTO){
     compDTO.isSelect = isOn;
     compDTO.isSelect = isOn;
     if (isOn === true){
     if (isOn === true){
       this.selectDatas.push(compDTO)
       this.selectDatas.push(compDTO)
@@ -150,7 +151,7 @@ struct BrowsingHistoryPage {
 
 
   //全选
   //全选
   allSelectDatas(isOn:boolean){
   allSelectDatas(isOn:boolean){
-    let datas: CompDTO[] = [];
+    let datas: ContentDTO[] = [];
     for (let index = 0; index < this.allDatas.length; index++) {
     for (let index = 0; index < this.allDatas.length; index++) {
       const compDTO = this.allDatas[index];
       const compDTO = this.allDatas[index];
       compDTO.isSelect = isOn
       compDTO.isSelect = isOn

@@ -287,9 +287,7 @@ struct ChannelDialog {
                 .height('100%')
                 .height('100%')
                 .justifyContent(FlexAlign.Center)
                 .justifyContent(FlexAlign.Center)
                 .backgroundColor(item.homeChannel === '1' || item.movePermitted === 0 ? '#F5F5F5' : '#ffffff')
                 .backgroundColor(item.homeChannel === '1' || item.movePermitted === 0 ? '#F5F5F5' : '#ffffff')
-                .onTouch((event?: TouchEvent) => {
-                 if(event&&event.type === TouchType.Down){
-                   console.log('onTouch')
+                .onClick(() => {
                    if (this.isEditIng) {
                    if (this.isEditIng) {
                      if (item.delPermitted === 1) {
                      if (item.delPermitted === 1) {
                        this.delChannelItem(index)
                        this.delChannelItem(index)
@@ -298,7 +296,6 @@ struct ChannelDialog {
                      this.confirm(index)
                      this.confirm(index)
                      this.controller?.close()
                      this.controller?.close()
                    }
                    }
-                 }
                 })
                 })
               }
               }
               .width('23%')
               .width('23%')

@@ -42,7 +42,7 @@ struct EditUserInfoPage {
   build() {
   build() {
     Row() {
     Row() {
       Column() {
       Column() {
-        CustomTitleUI({titleName:'资料编辑'})
+        CustomTitleUI({titleName:'编辑资料'})
         Image(this.headerImg)
         Image(this.headerImg)
           .alt($r('app.media.default_head'))
           .alt($r('app.media.default_head'))
           .backgroundColor(Color.Gray)
           .backgroundColor(Color.Gray)

@@ -6,13 +6,15 @@ import { EmptyComponent } from '../view/EmptyComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import { ErrorComponent } from '../view/ErrorComponent'
 import RefreshLayout from './RefreshLayout'
 import RefreshLayout from './RefreshLayout'
 import { RefreshLayoutBean } from './RefreshLayoutBean';
 import { RefreshLayoutBean } from './RefreshLayoutBean';
-import { CompDTO } from 'wdBean'
+import { CompDTO, ContentDTO } from 'wdBean'
 import LoadMoreLayout from './LoadMoreLayout'
 import LoadMoreLayout from './LoadMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
 import NoMoreLayout from './NoMoreLayout'
 import { CompParser } from '../CompParser'
 import { CompParser } from '../CompParser'
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomSelectUI } from '../view/CustomSelectUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
+import { BigPicCardComponent } from '../view/BigPicCardComponent';
+import { contentListItemParams } from '../../model/MyCollectionModel';
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -20,8 +22,8 @@ struct MyCollectionListPage {
   @State private browSingModel: PageModel = new PageModel()
   @State private browSingModel: PageModel = new PageModel()
   isloading : boolean = false
   isloading : boolean = false
   @Provide isEditState:boolean = false
   @Provide isEditState:boolean = false
-  @State allDatas :CompDTO[] = [];
-  @State selectDatas :CompDTO[] = [];
+  @State allDatas :ContentDTO[] = [];
+  @State selectDatas :ContentDTO[] = [];
   @Provide deleteNum :number = 0;
   @Provide deleteNum :number = 0;
   @Provide isAllSelect:boolean = false
   @Provide isAllSelect:boolean = false
   aboutToAppear(){
   aboutToAppear(){
@@ -72,7 +74,7 @@ struct MyCollectionListPage {
         })
         })
       }
       }
 
 
-      ForEach(this.allDatas, (compDTO: CompDTO, compIndex: number) => {
+      ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
         ListItem() {
         ListItem() {
           this.newCompParser(compDTO,compIndex)
           this.newCompParser(compDTO,compIndex)
         }
         }
@@ -94,7 +96,7 @@ struct MyCollectionListPage {
   }
   }
 
 
   @Builder
   @Builder
-  newCompParser(compDTO: CompDTO, compIndex: number){
+  newCompParser(compDTO: ContentDTO, compIndex: number){
     Row(){
     Row(){
       if (this.isEditState){
       if (this.isEditState){
         CustomSelectUI({
         CustomSelectUI({
@@ -106,7 +108,7 @@ struct MyCollectionListPage {
           .margin({left:16})
           .margin({left:16})
       }
       }
       Column() {
       Column() {
-        CompParser({ compDTO: compDTO, compIndex: compIndex })
+        BigPicCardComponent({contentDTO:compDTO})
       }
       }
     }
     }
   }
   }
@@ -118,11 +120,11 @@ struct MyCollectionListPage {
 
 
   async getData() {
   async getData() {
     this.browSingModel.currentPage = 1
     this.browSingModel.currentPage = 1
-    MyCollectionViewModel.newFetchMyCollectList(1,'1',this.browSingModel.currentPage,getContext(this)).then(pageDto => {
-      if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
+    MyCollectionViewModel.fetchMyCollectList(1,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => {
+      if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
         this.browSingModel.viewType = ViewType.LOADED;
         this.browSingModel.viewType = ViewType.LOADED;
-        this.allDatas.push(...pageDto.compList)
-        if (pageDto.compList.length === this.browSingModel.pageSize) {
+        this.allDatas.push(...collectionItem.list)
+        if (collectionItem.list.length === this.browSingModel.pageSize) {
           this.browSingModel.currentPage++;
           this.browSingModel.currentPage++;
           this.browSingModel.hasMore = true;
           this.browSingModel.hasMore = true;
         } else {
         } else {
@@ -136,7 +138,7 @@ struct MyCollectionListPage {
 
 
   //数据处理
   //数据处理
   //单个选择
   //单个选择
-  addCompDTO(isOn:boolean , compDTO: CompDTO){
+  addCompDTO(isOn:boolean , compDTO: ContentDTO){
     compDTO.isSelect = isOn;
     compDTO.isSelect = isOn;
     if (isOn === true){
     if (isOn === true){
       this.selectDatas.push(compDTO)
       this.selectDatas.push(compDTO)
@@ -150,7 +152,7 @@ struct MyCollectionListPage {
 
 
   //全选
   //全选
   allSelectDatas(isOn:boolean){
   allSelectDatas(isOn:boolean){
-    let datas: CompDTO[] = [];
+    let datas: ContentDTO[] = [];
     for (let index = 0; index < this.allDatas.length; index++) {
     for (let index = 0; index < this.allDatas.length; index++) {
       const compDTO = this.allDatas[index];
       const compDTO = this.allDatas[index];
       compDTO.isSelect = isOn
       compDTO.isSelect = isOn
@@ -169,13 +171,22 @@ struct MyCollectionListPage {
 
 
   //删除
   //删除
   deleteDatas(){
   deleteDatas(){
+    let deleteDatas:contentListItemParams[] = [];
     for (let index = 0; index < this.selectDatas.length; index++) {
     for (let index = 0; index < this.selectDatas.length; index++) {
-      const compDTO = this.allDatas[index];
-      this.allDatas.splice(this.selectDatas.indexOf(compDTO),1)
+      const compDTO = this.selectDatas[index];
+      this.allDatas.splice(this.allDatas.indexOf(compDTO),1)
+      deleteDatas.push({contentId:compDTO.objectId,contentType:compDTO.objectType,relType:compDTO.relType,contentRelId:compDTO.relId})
     }
     }
 
 
+    MyCollectionViewModel.executeCollcet({
+      delAll:this.isAllSelect === true?1:0,
+      status:0,
+      contentList:deleteDatas
+    })
+
     //重置删除状态
     //重置删除状态
     this.isEditState = false
     this.isEditState = false
     this.isAllSelect = false
     this.isAllSelect = false
   }
   }
+
 }
 }

+import { CollectionUtils, DateTimeUtils, Logger } from 'wdKit';
 import { CommonConstants, CompStyle, ViewType } from 'wdConstant';
 import { CommonConstants, CompStyle, ViewType } from 'wdConstant';
-import { DateTimeUtils, Logger } from 'wdKit';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { ErrorComponent } from '../view/ErrorComponent';
 import { ErrorComponent } from '../view/ErrorComponent';
@@ -11,8 +11,10 @@ import NoMoreLayout from './NoMoreLayout';
 import LoadMoreLayout from './LoadMoreLayout';
 import LoadMoreLayout from './LoadMoreLayout';
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
 import { CompParser } from '../CompParser';
 import { CompParser } from '../CompParser';
+import { GroupInfoDTO } from 'wdBean/src/main/ets/bean/navigation/PageInfoDTO';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
-import { CompDTO, LiveReviewDTO, PageDTO } from 'wdBean';
+import { CompDTO, LiveReviewDTO, PageDTO, PageInfoBean } from 'wdBean';
+
 
 
 const TAG = 'PageComponent';
 const TAG = 'PageComponent';
 
 
@@ -69,40 +71,44 @@ export struct PageComponent {
   @Builder
   @Builder
   ListLayout() {
   ListLayout() {
     List() {
     List() {
-      // 下拉刷新
-      ListItem() {
-        RefreshLayout({
-          refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullDown, this.pageModel.pullDownRefreshImage,
-            this.pageModel.pullDownRefreshText, this.pageModel.pullDownRefreshHeight)
-        })
+      if (this.name !== '视频') {
+        // 下拉刷新
+        ListItem() {
+          RefreshLayout({
+            refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullDown, this.pageModel.pullDownRefreshImage,
+              this.pageModel.pullDownRefreshText, this.pageModel.pullDownRefreshHeight)
+          })
+        }
       }
       }
 
 
-      LazyForEach(this.pageModel.compList, (compDTO: CompDTO, compIndex: number) => {
-        ListItem() {
-          Column() {
-            if (this.name == '视频') {
-              VideoChannelDetail()
-            } else {
+      if (this.name === '视频') {
+        VideoChannelDetail()
+      } else {
+        LazyForEach(this.pageModel.compList, (compDTO: CompDTO, compIndex: number) => {
+          ListItem() {
+            Column() {
               CompParser({ compDTO: compDTO, compIndex: compIndex });
               CompParser({ compDTO: compDTO, compIndex: compIndex });
             }
             }
-
           }
           }
-        }
-      },
-        (compDTO: CompDTO, compIndex: number) => compDTO.id + compIndex.toString() + this.pageModel.timestamp
-      )
-
-      // 加载更多
-      ListItem() {
-        if (this.pageModel.hasMore) {
-          LoadMoreLayout({
-            refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
-              this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
-          })
-        } else {
-          NoMoreLayout()
+        },
+          (compDTO: CompDTO, compIndex: number) => compDTO.id + compIndex.toString() + this.pageModel.timestamp
+        )
+      }
+      
+      if (this.name !== '视频') {
+        // 加载更多
+        ListItem() {
+          if (this.pageModel.hasMore) {
+            LoadMoreLayout({
+              refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
+                this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
+            })
+          } else {
+            NoMoreLayout()
+          }
         }
         }
       }
       }
+
     }
     }
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
     .cachedCount(8)
     .cachedCount(8)
@@ -155,10 +161,105 @@ export struct PageComponent {
       this.pageModel.viewType = ViewType.EMPTY;
       this.pageModel.viewType = ViewType.EMPTY;
       return;
       return;
     }
     }
+    if (this.navIndex === 0) {
+      await this.getVideoListData(pageInfo);
+    } else {
+      await this.getLiveListData(pageInfo);
+    }
+
+
+  }
+
+  private async getVideoListData(pageInfo: PageInfoBean) {
+    let groupInfo: GroupInfoDTO = CollectionUtils.getElement(pageInfo.groups, 0);
+    if (groupInfo != null) {
+      this.pageModel.isRecGroup = groupInfo.groupStrategy === 1;
+      this.pageModel.groupId = groupInfo.id;
+    }
+    // pageInfo.groups.forEach(async (group) => { 不能按顺序加载用for...of替代
+    // for (const group of pageInfo.groups) {
+    this.pageDto = await PageViewModel.getPageData(this.pageModel, getContext(this));
+    this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString();
+    if (this.pageDto && this.pageDto.compList && this.pageDto.compList.length > 0) {
+      this.pageDto.compList.forEach((comp) => {
+        if (comp.compStyle === CompStyle.Zh_Grid_Layout_02 && this.liveReviewDTO && this.liveReviewDTO.list && this.liveReviewDTO.list.length > 0) {
+          comp.operDataList.push(...this.liveReviewDTO.list);
+        }
+      });
+
+      this.pageModel.viewType = ViewType.LOADED;
+      this.pageModel.compList.push(...this.pageDto.compList);
+      if (this.pageDto.compList.length === this.pageModel.pageSize) {
+        this.pageModel.currentPage++;
+        this.pageModel.hasMore = true;
+      } else {
+        this.pageModel.hasMore = false;
+      }
+      // // 二次请求，批查互动数据
+      // PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
+      //   // 刷新，替换所有数据
+      //   this.pageModel.compList.replaceAll(...data)
+      //   this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+      // })
+      this.isFirstIn = false;
+      Logger.debug(TAG, 'cj111');
+      // } else {
+      //   Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
+      //   this.pageModel.viewType = ViewType.EMPTY;
+      // }
+    }
+  }
+
+  // private async getLiveListData(pageInfo: PageInfoBean) {
+  //   // pageInfo.groups.forEach(async (group) => { 不能按顺序加载用for...of替代
+  //   for (const group of pageInfo.groups) {
+  //     this.pageDto = await PageViewModel.getPageData(this.pageModel, getContext(this));
+  //     this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString();
+  //     if (this.pageDto && this.pageDto.compList && this.pageDto.compList.length > 0) {
+  //       this.pageDto.compList.forEach((comp) => {
+  //         if (comp.compStyle === CompStyle.Zh_Grid_Layout_02 && this.liveReviewDTO && this.liveReviewDTO.list && this.liveReviewDTO.list.length > 0) {
+  //           comp.operDataList.push(...this.liveReviewDTO.list);
+  //         }
+  //       });
+  //
+  //       this.pageModel.viewType = ViewType.LOADED;
+  //       this.pageModel.compList.push(...this.pageDto.compList);
+  //       if (this.pageDto.compList.length === this.pageModel.pageSize) {
+  //         this.pageModel.currentPage++;
+  //         this.pageModel.hasMore = true;
+  //       } else {
+  //         this.pageModel.hasMore = false;
+  //       }
+  //       // // 二次请求，批查互动数据
+  //       // PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
+  //       //   // 刷新，替换所有数据
+  //       //   this.pageModel.compList.replaceAll(...data)
+  //       //   this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+  //       // })
+  //       this.isFirstIn = false;
+  //       Logger.debug(TAG, 'cj111');
+  //       // } else {
+  //       //   Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
+  //       //   this.pageModel.viewType = ViewType.EMPTY;
+  //     }
+  //   }
+  // }
+
+  async getLiveListData(pageInfo: PageInfoBean) {
+    // Logger.info(TAG, `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
+    // this.pageModel.pageId = this.pageId;
+    // this.pageModel.groupId = this.pageId;
+    // this.pageModel.channelId = this.channelId;
+    // this.pageModel.currentPage = 1;
+    // let pageInfo = await PageViewModel.getPageUrlData(this.pageModel.pageId);
+    // if (pageInfo == null) {
+    //   this.pageModel.viewType = ViewType.EMPTY;
+    //   return;
+    // }
     Logger.debug(TAG, 'getPageUrlData ' + pageInfo.id);
     Logger.debug(TAG, 'getPageUrlData ' + pageInfo.id);
     // pageInfo.groups.forEach(async (group) => { 不能按顺序加载用for...of替代
     // pageInfo.groups.forEach(async (group) => { 不能按顺序加载用for...of替代
     for (const group of pageInfo.groups) {
     for (const group of pageInfo.groups) {
-      this.pageDto = await PageViewModel.getPageData(this.pageModel.pageId, `${group.id}`, this.pageModel.channelId
+      this.pageDto = await PageViewModel.getLivePageData(this.pageModel.pageId, `${group.id}`, this.pageModel.channelId, group.groupStrategy
         , this.pageModel.currentPage, this.pageModel.pageSize, getContext(this))
         , this.pageModel.currentPage, this.pageModel.pageSize, getContext(this))
       this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
       this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
       if (this.pageDto && this.pageDto.compList && this.pageDto.compList.length > 0) {
       if (this.pageDto && this.pageDto.compList && this.pageDto.compList.length > 0) {
@@ -176,50 +277,18 @@ export struct PageComponent {
         } else {
         } else {
           this.pageModel.hasMore = false;
           this.pageModel.hasMore = false;
         }
         }
-        // // 二次请求，批查互动数据
-        // PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
-        //   // 刷新，替换所有数据
-        //   this.pageModel.compList.replaceAll(...data)
-        //   this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-        // })
+        // 二次请求，批查互动数据
+        PageViewModel.getInteractData(this.pageDto.compList).then((data: CompDTO[]) => {
+          // 刷新，替换所有数据
+          this.pageModel.compList.replaceAll(...data)
+          this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+        })
         this.isFirstIn = false
         this.isFirstIn = false
-        Logger.debug(TAG, 'cj111');
       } else {
       } else {
         Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
         Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
         this.pageModel.viewType = ViewType.EMPTY;
         this.pageModel.viewType = ViewType.EMPTY;
       }
       }
     }
     }
-
-    // this.isFirstIn = false
-    // let groupInfo: Group = CollectionUtils.getElement(pageInfo.groups, 0);
-    // if (groupInfo != null) {
-    //   this.pageModel.groupStrategy = groupInfo.groupStrategy;
-    //   this.pageModel.isRecGroup = groupInfo.groupStrategy === 1;
-    //   this.pageModel.groupId = "" + groupInfo.id;
-    // }
-    // let pageDto = await PageViewModel.getPageData(this.pageModel.pageId, this.pageModel.pageId, this.pageModel.channelId
-    //   , this.pageModel.currentPage, this.pageModel.pageSize, getContext(this))
-    // this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-    // if (pageDto && pageDto.compList && pageDto.compList.length > 0) {
-    //   this.pageModel.viewType = ViewType.LOADED;
-    //   this.pageModel.compList.push(...pageDto.compList)
-    //   if (pageDto.compList.length === this.pageModel.pageSize) {
-    //     this.pageModel.currentPage++;
-    //     this.pageModel.hasMore = true;
-    //   } else {
-    //     this.pageModel.hasMore = false;
-    //   }
-    //   // 二次请求，批查互动数据
-    //   PageViewModel.getInteractData(pageDto.compList).then((data: CompDTO[]) => {
-    //     // 刷新，替换所有数据
-    //     this.pageModel.compList.replaceAll(...data)
-    //     this.pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-    //   })
-    // } else {
-    //   Logger.debug(TAG, 'aboutToAppear, data response page ' + this.pageId + ', comp list is empty.');
-    //   this.pageModel.viewType = ViewType.EMPTY;
-    // }
-
   }
   }
 
 
   async getPreviewData() {
   async getPreviewData() {

+import { SearchResultContentComponent } from './SearchResultContentComponent'
 
 
 const TAG = "SearchResultComponent"
 const TAG = "SearchResultComponent"
 /**
 /**
@@ -19,7 +20,7 @@ export struct SearchResultComponent{
       Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
       Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
         ForEach(this.count, (item: string, index: number ) => {
         ForEach(this.count, (item: string, index: number ) => {
           TabContent(){
           TabContent(){
-            Text(item)
+            SearchResultContentComponent()
           }.tabBar(this.TabBuilder(index,item))
           }.tabBar(this.TabBuilder(index,item))
         }, (item: string, index: number) => index.toString())
         }, (item: string, index: number) => index.toString())
       }
       }
@@ -63,4 +64,5 @@ export struct SearchResultComponent{
     .margin({right:'9lpx'})
     .margin({right:'9lpx'})
     .padding({left:'31lpx',right:index === this.count.length-1?"31lpx":"0lpx"})
     .padding({left:'31lpx',right:index === this.count.length-1?"31lpx":"0lpx"})
   }
   }
+
 }
 }

+const TAG = "SearchResultContentComponent"
+
+@Component
+export struct SearchResultContentComponent{
+
+  aboutToAppear(): void {
+
+  }
+
+
+
+  build() {
+
+  }
+}

@@ -54,7 +54,6 @@ export struct BannerComponent {
       .cachedCount(2)
       .cachedCount(2)
       .index(1) // The default index of Swiper.
       .index(1) // The default index of Swiper.
       .autoPlay(true)
       .autoPlay(true)
-      .interval(DurationEnum.DURATION_4)
       .indicator(Indicator.dot()
       .indicator(Indicator.dot()
         .right(5)
         .right(5)
         .itemWidth(4)
         .itemWidth(4)
@@ -62,7 +61,6 @@ export struct BannerComponent {
         .selectedItemWidth(10)
         .selectedItemWidth(10)
         .selectedItemHeight(6))
         .selectedItemHeight(6))
       .loop(true)
       .loop(true)
-      .duration(DurationEnum.DURATION_4)
       .vertical(false)
       .vertical(false)
       .curve(Curve.Linear)
       .curve(Curve.Linear)
       .onChange((index: number) => {
       .onChange((index: number) => {

@@ -19,8 +19,10 @@ export struct BigPicCardComponent {
 
 
   aboutToAppear() {
   aboutToAppear() {
     // 取第一个数据
     // 取第一个数据
-    this.contentDTO = this.compDTO.operDataList[0];
-    this.contentDTO.appStyle = "2";
+    if (this.compDTO.operDataList) {
+      this.contentDTO = this.compDTO.operDataList[0];
+      this.contentDTO.appStyle = "2";
+    }
   }
   }
 
 
   build() {
   build() {

@@ -9,7 +9,6 @@ const TAG = 'LabelComponent';
  * Label-03
  * Label-03
  * 重磅推荐/精选/电视剧/电影/综艺/短剧/更多>/
  * 重磅推荐/精选/电视剧/电影/综艺/短剧/更多>/
  */
  */
-@Entry
 @Component
 @Component
 export struct LabelComponent {
 export struct LabelComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO

 // 视频直播横划卡16:9
 // 视频直播横划卡16:9
 import { LiveVideoTypeComponent } from './LiveVideoTypeComponent'
 import { LiveVideoTypeComponent } from './LiveVideoTypeComponent'
 import { LiveHorizontalCardForOneComponent } from './LiveHorizontalCardForOneComponent'
 import { LiveHorizontalCardForOneComponent } from './LiveHorizontalCardForOneComponent'
-import { CompDTO, ContentDTO } from 'wdBean'
+import { Action, CompDTO, ContentDTO, Params } from 'wdBean'
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
+import { WDRouterRule } from 'wdRouter/Index'
 
 
 @Component
 @Component
 export struct LiveHorizontalCardComponent {
 export struct LiveHorizontalCardComponent {
@@ -22,7 +23,7 @@ export struct LiveHorizontalCardComponent {
             .fontWeight(600)
             .fontWeight(600)
         }
         }
 
 
-        if (this.compDTO.operDataList.length > 10) {
+        if (this.compDTO.operDataList.length > 8) {
           Row() {
           Row() {
             Text("更多")
             Text("更多")
               .fontSize($r("app.float.font_size_14"))
               .fontSize($r("app.float.font_size_14"))
@@ -32,6 +33,15 @@ export struct LiveHorizontalCardComponent {
               .width(14)
               .width(14)
               .height(14)
               .height(14)
           }
           }
+          .onClick(() => {
+            let taskAction: Action = {
+              type: 'JUMP_H5_BY_WEB_VIEW',
+              params: {
+                url: this.compDTO.linkUrl
+              } as Params,
+            };
+            WDRouterRule.jumpWithAction(taskAction)
+          })
         }
         }
       }.justifyContent(FlexAlign.SpaceBetween)
       }.justifyContent(FlexAlign.SpaceBetween)
       .padding({ left: 16, right: 16 })
       .padding({ left: 16, right: 16 })

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
-import { Card3Component } from '../cardview/Card3Component'
-import { Card6Component } from '../cardview/Card6Component'
+import { CardParser } from '../CardParser';
 
 
 const RECOMMEND_LIST_TITLE = '相关推荐'
 const RECOMMEND_LIST_TITLE = '相关推荐'
 
 
@@ -28,12 +27,13 @@ export struct RecommendList {
         .width(CommonConstants.FULL_PARENT)
         .width(CommonConstants.FULL_PARENT)
         .justifyContent(FlexAlign.Start)
         .justifyContent(FlexAlign.Start)
       }
       }
-      ForEach(this.recommendList, (item: ContentDTO, index: number) => {
-          if (item.coverUrl) {
-            Card6Component({ contentDTO: item })
-          } else {
-            Card3Component({ contentDTO: item })
-          }
+      ForEach(this.recommendList, (item: ContentDTO) => {
+        Row(){
+          CardParser({ contentDTO: item });
+        }.border({
+          width:{bottom: 1},
+          color: '#f5f5f5'
+        })
       }, (item: ContentDTO) => JSON.stringify(item))
       }, (item: ContentDTO) => JSON.stringify(item))
     }.width('100%')
     }.width('100%')
   }
   }

@@ -56,6 +56,9 @@ export struct ZhGridLayoutComponent {
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
     }
     }
     .width('100%')
     .width('100%')
+    .onClick((event: ClickEvent) => {
+      ProcessUtils.processPage(item)
+    })
   }
   }
 }
 }
 
 

-import { Logger } from 'wdKit';
 import { AreaListManageModel, AreaListModel } from '../../../model/AreaListModel';
 import { AreaListManageModel, AreaListModel } from '../../../model/AreaListModel';
-import EditInfoViewModel from '../../../viewmodel/EditInfoViewModel';
 import { FirstLevelComponent } from './FirstLevelComponent';
 import { FirstLevelComponent } from './FirstLevelComponent';
 import { SecondLevelComponent } from './SecondLevelComponent';
 import { SecondLevelComponent } from './SecondLevelComponent';
 import { ThirdLevelComponent } from './ThirdLevelComponent';
 import { ThirdLevelComponent } from './ThirdLevelComponent';
 @CustomDialog
 @CustomDialog
+
 export  struct AreaPickerDialog {
 export  struct AreaPickerDialog {
   @Provide currentFirst: AreaListManageModel = new AreaListManageModel('','','',[])
   @Provide currentFirst: AreaListManageModel = new AreaListManageModel('','','',[])
   @Provide currentSecondBean: AreaListManageModel = new AreaListManageModel('','','',[])
   @Provide currentSecondBean: AreaListManageModel = new AreaListManageModel('','','',[])

@@ -21,7 +21,23 @@ export class ContentConstants {
    */
    */
   static readonly TYPE_TELETEXT: string = "8";
   static readonly TYPE_TELETEXT: string = "8";
   /**
   /**
+   * 9:图集
+   */
+  static readonly TYPE_NINE: string = "9";
+  /**
    * 13:音频详情
    * 13:音频详情
    */
    */
   static readonly TYPE_AUDIO: string = "13";
   static readonly TYPE_AUDIO: string = "13";
+
+  /**
+   * 14:动态图文
+   */
+  static readonly TYPE_FOURTEEN: string = "14";
+
+  /**
+   * 15:动态视频
+   */
+  static readonly TYPE_FIFTEEN: string = "15";
+
+
 }
 }

@@ -3,7 +3,7 @@ import MinePagePersonalFunctionsItem from '../viewmodel/MinePagePersonalFunction
 import MinePageCreatorFunctionsItem from '../viewmodel/MinePageCreatorFunctionsItem'
 import MinePageCreatorFunctionsItem from '../viewmodel/MinePageCreatorFunctionsItem'
 import MinePageMoreFunctionModel from '../viewmodel/MinePageMoreFunctionModel';
 import MinePageMoreFunctionModel from '../viewmodel/MinePageMoreFunctionModel';
 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
-import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
+import { HttpBizUtil, HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { MineAppointmentListItem } from '../viewmodel/MineAppointmentListItem';
 import { MineAppointmentListItem } from '../viewmodel/MineAppointmentListItem';
 import { Logger, ResourcesUtils, StringUtils } from 'wdKit';
 import { Logger, ResourcesUtils, StringUtils } from 'wdKit';
 import { MineFollowListDetailItem } from '../viewmodel/MineFollowListDetailItem';
 import { MineFollowListDetailItem } from '../viewmodel/MineFollowListDetailItem';
@@ -371,7 +371,8 @@ class MinePageDatasModel{
   fetchMineUserLevelData() {
   fetchMineUserLevelData() {
     let url = HttpUrlUtils.getMineUserLevelDataUrl()
     let url = HttpUrlUtils.getMineUserLevelDataUrl()
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.get<ResponseDTO<MineUserLevelItem>>(url, headers)
+    // return WDHttp.get<ResponseDTO<MineUserLevelItem>>(url, headers)
+    return HttpBizUtil.get<MineUserLevelItem>(url, headers)
   };
   };
 
 
   async getMineUserLevelDataLocal(context: Context): Promise<MineUserLevelItem> {
   async getMineUserLevelDataLocal(context: Context): Promise<MineUserLevelItem> {
@@ -409,7 +410,8 @@ class MinePageDatasModel{
   fetchMineUserDetailData() {
   fetchMineUserDetailData() {
     let url = HttpUrlUtils.getMineUserDetailDataUrl()
     let url = HttpUrlUtils.getMineUserDetailDataUrl()
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.get<ResponseDTO<MineUserDetailItem>>(url, headers)
+    // return WDHttp.get<ResponseDTO<MineUserDetailItem>>(url, headers)
+    return HttpBizUtil.get<MineUserDetailItem>(url, headers)
   };
   };
 
 
   async getMineUserDetailDataLocal(context: Context): Promise<MineUserDetailItem> {
   async getMineUserDetailDataLocal(context: Context): Promise<MineUserDetailItem> {

+import { ContentDTO } from 'wdBean/Index';
 
 
 // {
 // {
 //   "hasNext": 0,
 //   "hasNext": 0,
@@ -22,24 +23,38 @@ export  class MyCollectionModel{
   }
   }
 }
 }
 
 
-@Observed
-export class MyCollectionItem{
+export class  MyCollectionItem{
   pageNum:number = 0
   pageNum:number = 0
   pageSize:number = 0
   pageSize:number = 0
   totalCount:number = 0
   totalCount:number = 0
   hasNext:number = 0
   hasNext:number = 0
-  list:MyCollectionModel[] = []
+  list:ContentDTO[] = []
+
+  constructor(list?:ContentDTO[],pageNum?: number,pageSize?: number,totalCount?: number,hasNext?:number) {
+  }
 }
 }
 
 
+export interface  MyCollectionListModel{
+  data: MyCollectionItem
+  code: number
+  message: string
+  success: string
+  timestamp: number
+}
 
 
-export  class MyCollectionListModel{
-  list:MyCollectionModel[] = []
 
 
-  pageNum: number = 0
-  pageSize: number = 20
-  totalCount: number = 0
 
 
-  constructor(list?:MyCollectionModel[],pageNum?: number,pageSize?: number,totalCount?: number) {
-  }
+export interface contentListItemParams{
+  contentId?:string;
+  contentType?:string;
+  relType?:string;
+  contentRelId?:string;
 }
 }
 
 
+export interface collcetRecordParams {
+  delAll?: number;
+
+  status?: number;
+
+  contentList?: contentListItemParams[];
+}

@@ -2,6 +2,7 @@ import router from '@ohos.router'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { StringUtils } from 'wdKit';
 import { StringUtils } from 'wdKit';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
+import { CardParser } from '../components/CardParser';
 import { HomePageBottomComponent } from '../components/mine/home/HomePageBottomComponent';
 import { HomePageBottomComponent } from '../components/mine/home/HomePageBottomComponent';
 import MinePageDatasModel from '../model/MinePageDatasModel';
 import MinePageDatasModel from '../model/MinePageDatasModel';
 
 
@@ -182,21 +183,46 @@ struct MineHomePage {
 
 
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
 
 
-            //tab 页面
-            Tabs({controller: this.controller}) {
-              TabContent() {
-                HomePageBottomComponent({style:0})
-              }.tabBar(this.TabBuilder(0,"评论"))
-              TabContent() {
-                HomePageBottomComponent({style:1})
-              }.tabBar(this.TabBuilder(1,"关注"))
+            Column(){
+              Column() {
+                // 页签
+                Row({ space: 7 }) {
+                  Scroll() {
+                    Row() {
+                      this.TabBuilder(0,"评论")
+                      this.TabBuilder(1,"关注")
+                    }
+                    .justifyContent(FlexAlign.Start)
+                  }
+                  .align(Alignment.Start)
+                  .scrollable(ScrollDirection.Horizontal)
+                  .scrollBar(BarState.Off)
+                  .width('90%')
+                  .padding({left:'31lpx'})
+                }
+                .alignItems(VerticalAlign.Bottom)
+                .width('100%')
+              }
+              .alignItems(HorizontalAlign.Start)
+              .width('100%')
+
+              //tab 页面
+              Tabs({controller: this.controller}) {
+                TabContent() {
+                  HomePageBottomComponent({style:0})
+                }
+                TabContent() {
+                  HomePageBottomComponent({style:1})
+                }
+              }
+              .backgroundColor($r('app.color.white'))
+              .animationDuration(0)
+              .onChange((index: number) => {
+                this.currentIndex = index
+              })
+              .vertical(false)
+              .barHeight(0)
             }
             }
-            .backgroundColor($r('app.color.white'))
-            .animationDuration(0)
-            .onChange((index: number) => {
-              this.currentIndex = index
-            })
-            .vertical(false)
           }.width("100%")
           }.width("100%")
         }
         }
         .edgeEffect(EdgeEffect.None)
         .edgeEffect(EdgeEffect.None)
@@ -206,8 +232,8 @@ struct MineHomePage {
       }
       }
     }.width('100%')
     }.width('100%')
     .layoutWeight(1)
     .layoutWeight(1)
-
   }
   }
+
   @Builder MineHomeTitleTransparent() {
   @Builder MineHomeTitleTransparent() {
     RelativeContainer() {
     RelativeContainer() {
       //标题栏目
       //标题栏目
@@ -342,9 +368,9 @@ struct MineHomePage {
       this.currentIndex = index
       this.currentIndex = index
       this.controller.changeIndex(this.currentIndex)
       this.controller.changeIndex(this.currentIndex)
     })
     })
-    .height('100%')
-    .width('100%')
-    .margin({right:'9lpx'})
+    .height('77lpx')
+    .width('70lpx')
+    .margin({right:'29lpx'})
   }
   }
 
 
   /**
   /**

@@ -172,24 +172,51 @@ struct OtherNormalUserHomePage {
               .width('100%')
               .width('100%')
               .backgroundColor($r('app.color.white'))
               .backgroundColor($r('app.color.white'))
             }
             }
+
             //间隔符
             //间隔符
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
             Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
 
 
-            //tab 页面
-            Tabs({controller: this.controller}) {
-              TabContent() {
-                OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.levelHead,commentNum:$commentNum})
-              }.tabBar(this.TabBuilder(0,"评论"))
-              TabContent() {
-                OtherHomePageBottomFollowComponent({curUserId:this.curUserId})
-              }.tabBar(this.TabBuilder(1,"关注"))
+            Column(){
+              Column() {
+                // 页签
+                Row({ space: 7 }) {
+                  Scroll() {
+                    Row() {
+                      this.TabBuilder(0,"评论")
+                      this.TabBuilder(1,"关注")
+                    }
+                    .justifyContent(FlexAlign.Start)
+                  }
+                  .align(Alignment.Start)
+                  .scrollable(ScrollDirection.Horizontal)
+                  .scrollBar(BarState.Off)
+                  .width('90%')
+                  .padding({left:'31lpx'})
+                }
+                .alignItems(VerticalAlign.Bottom)
+                .width('100%')
+              }
+              .backgroundColor($r('app.color.white'))
+              .alignItems(HorizontalAlign.Start)
+              .width('100%')
+
+              //tab 页面
+              Tabs({controller: this.controller}) {
+                TabContent() {
+                  OtherHomePageBottomCommentComponent({curUserId:this.curUserId,levelHead:this.levelHead,commentNum:$commentNum})
+                }
+                TabContent() {
+                  OtherHomePageBottomFollowComponent({curUserId:this.curUserId})
+                }
+              }
+              .backgroundColor($r('app.color.white'))
+              .animationDuration(0)
+              .onChange((index: number) => {
+                this.currentIndex = index
+              })
+              .vertical(false)
+              .barHeight(0)
             }
             }
-            .backgroundColor($r('app.color.white'))
-            .animationDuration(0)
-            .onChange((index: number) => {
-              this.currentIndex = index
-            })
-            .vertical(false)
           }.width("100%")
           }.width("100%")
         }
         }
         .edgeEffect(EdgeEffect.None)
         .edgeEffect(EdgeEffect.None)
@@ -300,9 +327,9 @@ struct OtherNormalUserHomePage {
       this.currentIndex = index
       this.currentIndex = index
       this.controller.changeIndex(this.currentIndex)
       this.controller.changeIndex(this.currentIndex)
     })
     })
-    .height('100%')
-    .width('100%')
-    .margin({right:'9lpx'})
+    .height('77lpx')
+    .width('70lpx')
+    .margin({right:'29lpx'})
   }
   }
 
 
 
 

@@ -15,6 +15,7 @@ import {
   NewspaperTimeInfoBean,
   NewspaperTimeInfoBean,
   PageDTO,
   PageDTO,
   PageInfoBean,
   PageInfoBean,
+  PageInfoDTO,
   postBatchAttentionStatusParams,
   postBatchAttentionStatusParams,
   postBatchAttentionStatusResult,
   postBatchAttentionStatusResult,
   postExecuteCollectRecordParams,
   postExecuteCollectRecordParams,
@@ -45,8 +46,15 @@ export class PageRepository {
     return url;
     return url;
   }
   }
 
 
-  static getCompInfoUrl(pageId: string, groupId: string, channelId: string, currentPage: number, pageSize: number) {
-    let url = HttpUrlUtils.getHost() + HttpUrlUtils.COMP_PATH;
+  static getCompInfoUrl(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number, pageSize: number) {
+    let url = HttpUrlUtils.getHost();
+    if (1 == groupStrategy) {
+      //推荐
+      url = url + HttpUrlUtils.COMP_REC_PATH;
+    } else {
+      //非推荐
+      url = url + HttpUrlUtils.COMP_PATH;
+    }
     // TODO 暂定只请求第一页，后续对接分页加载，参数再调整 first_load？
     // TODO 暂定只请求第一页，后续对接分页加载，参数再调整 first_load？
     url = url + "?channelStrategy=2&loadStrategy=first_load"
     url = url + "?channelStrategy=2&loadStrategy=first_load"
       + "&districtCode=" + HttpUrlUtils.getDistrictCode()
       + "&districtCode=" + HttpUrlUtils.getDistrictCode()
@@ -178,10 +186,22 @@ export class PageRepository {
     let url = PageRepository.getPageUrl(pageId)
     let url = PageRepository.getPageUrl(pageId)
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     return WDHttp.get<ResponseDTO<PageInfoBean>>(url, headers)
     return WDHttp.get<ResponseDTO<PageInfoBean>>(url, headers)
+  }
+
+  static fetchPageData(pageId: string) {
+    let url = PageRepository.getPageInfoUrl(pageId)
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.get<ResponseDTO<PageInfoDTO>>(url, headers)
+  };
+
+  static fetchLivePageData(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number, pageSize: number) {
+    let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId, groupStrategy, currentPage, pageSize)
+    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
+    return WDHttp.get<ResponseDTO<PageDTO>>(url, headers)
   };
   };
 
 
-  static fetchPageData(pageId: string, groupId: string, channelId: string, currentPage: number, pageSize: number) {
-    let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId, currentPage, pageSize)
+  static fetchCompData(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number, pageSize: number) {
+    let url = PageRepository.getCompInfoUrl(pageId, groupId, channelId, groupStrategy, currentPage, pageSize)
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     return WDHttp.get<ResponseDTO<PageDTO>>(url, headers)
     return WDHttp.get<ResponseDTO<PageDTO>>(url, headers)
   };
   };

@@ -42,19 +42,71 @@ export class ProcessUtils {
       // 图文详情，跳转h5
       // 图文详情，跳转h5
         ProcessUtils.gotoWeb(content);
         ProcessUtils.gotoWeb(content);
         break;
         break;
+      //图集详情页
+      case ContentConstants.TYPE_NINE:
+        ProcessUtils.gotoAtlasDetailPage(content);
+        break;
       case ContentConstants.TYPE_SPECIAL_TOPIC:
       case ContentConstants.TYPE_SPECIAL_TOPIC:
         // 专题详情，跳转h5
         // 专题详情，跳转h5
         ProcessUtils.gotoSpecialTopic(content);
         ProcessUtils.gotoSpecialTopic(content);
         break;
         break;
+    //动态详情页（动态图文）
+      case ContentConstants.TYPE_FOURTEEN:
+    //动态详情页（动态视频）
+      case ContentConstants.TYPE_FIFTEEN:
+        ProcessUtils.gotoDynamicDetailPage(content);
+        break;
       default:
       default:
         break;
         break;
     }
     }
   }
   }
+
+  /**
+   * 动态详情页（动态视频/动态图片）
+   * @param content
+   * */
+  private static gotoDynamicDetailPage(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 14,
+        contentID: content?.objectId,
+        extra:{
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoDynamicDetailPage, ${content.objectId}`);
+  }
+
+  /**
+   * 图集详情页
+   * @param content
+   * */
+  private static gotoAtlasDetailPage(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 17,
+        contentID: content?.objectId,
+        extra:{
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoAtlasDetailPage, ${content.objectId}`);
+  }
+
   private static gotoSpecialTopic(content: ContentDTO) {
   private static gotoSpecialTopic(content: ContentDTO) {
     let taskAction: Action = {
     let taskAction: Action = {
-      type: 'JUMP_H5_BY_WEB_VIEW',
+      type: 'JUMP_INNER_NEW_PAGE',
       params: {
       params: {
-        url: content.linkUrl
+        url: content.linkUrl,
+        pageID: 'SPACIAL_TOPIC_PAGE',
       } as Params,
       } as Params,
     };
     };
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)

@@ -71,8 +71,7 @@ export function touchUpPullRefresh(pageModel: PageModel) {
     pageModel.currentPage = 1;
     pageModel.currentPage = 1;
     setTimeout(() => {
     setTimeout(() => {
       let self: PageModel = pageModel;
       let self: PageModel = pageModel;
-
-      PageViewModel.getPageData(self.pageId, self.groupId, self.channelId, self.currentPage, self.pageSize, getContext())
+      PageViewModel.getPageData(self, getContext())
         .then((data: PageDTO) => {
         .then((data: PageDTO) => {
           self.timestamp = DateTimeUtils.getTimeStamp().toString()
           self.timestamp = DateTimeUtils.getTimeStamp().toString()
           if (data == null || data.compList == null || data.compList.length == 0) {
           if (data == null || data.compList == null || data.compList.length == 0) {

@@ -28,7 +28,7 @@ export function touchUpLoadMore(model: PageModel) {
     self.isLoading = true;
     self.isLoading = true;
     setTimeout(() => {
     setTimeout(() => {
       closeLoadMore(model);
       closeLoadMore(model);
-      PageViewModel.getPageData(self.pageId, self.groupId, self.channelId, self.currentPage, self.pageSize, getContext())
+      PageViewModel.getPageData(self, getContext())
         .then((data: PageDTO) => {
         .then((data: PageDTO) => {
           self.timestamp = DateTimeUtils.getTimeStamp().toString()
           self.timestamp = DateTimeUtils.getTimeStamp().toString()
           if (data == null || data.compList == null || data.compList.length == 0) {
           if (data == null || data.compList == null || data.compList.length == 0) {

@@ -11,22 +11,26 @@ export class LogoutViewModel{
   requestLogout(){
   requestLogout(){
     return new Promise<string>((success, fail) => {
     return new Promise<string>((success, fail) => {
       this.logout.requestLogout().then((data) => {
       this.logout.requestLogout().then((data) => {
-        SPHelper.default.save(SpConstants.USER_FIRST_MARK, '')
-        SPHelper.default.save(SpConstants.USER_ID, '')
-        SPHelper.default.save(SpConstants.USER_JWT_TOKEN, '')
-        SPHelper.default.save(SpConstants.USER_LONG_TIME_NO_LOGIN_MARK, '')
-        SPHelper.default.save(SpConstants.USER_REFRESH_TOKEN, '')
-        SPHelper.default.save(SpConstants.USER_STATUS, '')
-        SPHelper.default.save(SpConstants.USER_Type, '')
-        SPHelper.default.save(SpConstants.USER_NAME, '')
-        SPHelper.default.save(SpConstants.USER_PHONE, '')
-        HttpUrlUtils.setUserId("")
-        HttpUrlUtils.setUserType("")
-        HttpUrlUtils.setUserToken('')
+        LogoutViewModel.clearLoginInfo()
         success(data)
         success(data)
       }).catch((message: string) => {
       }).catch((message: string) => {
         fail(message)
         fail(message)
       })
       })
     })
     })
   }
   }
+
+  static clearLoginInfo() {
+    SPHelper.default.save(SpConstants.USER_FIRST_MARK, '')
+    SPHelper.default.save(SpConstants.USER_ID, '')
+    SPHelper.default.save(SpConstants.USER_JWT_TOKEN, '')
+    SPHelper.default.save(SpConstants.USER_LONG_TIME_NO_LOGIN_MARK, '')
+    SPHelper.default.save(SpConstants.USER_REFRESH_TOKEN, '')
+    SPHelper.default.save(SpConstants.USER_STATUS, '')
+    SPHelper.default.save(SpConstants.USER_Type, '')
+    SPHelper.default.save(SpConstants.USER_NAME, '')
+    SPHelper.default.save(SpConstants.USER_PHONE, '')
+    HttpUrlUtils.setUserId("")
+    HttpUrlUtils.setUserType("")
+    HttpUrlUtils.setUserToken('')
+  }
 }
 }

-import { MyCollectionListModel } from '../model/MyCollectionModel';
+import { collcetRecordParams, MyCollectionItem, MyCollectionListModel } from '../model/MyCollectionModel';
 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { Logger, ResourcesUtils } from 'wdKit';
 import { Logger, ResourcesUtils } from 'wdKit';
 import { PageDTO } from 'wdBean';
 import { PageDTO } from 'wdBean';
+import promptAction from '@ohos.promptAction';
 
 
 const TAG = "MyCollectionViewModel"
 const TAG = "MyCollectionViewModel"
 
 
 class MyCollectionViewModel {
 class MyCollectionViewModel {
   private static instance:MyCollectionViewModel
   private static instance:MyCollectionViewModel
-
   /**
   /**
    * 单例模式
    * 单例模式
    * @returns
    * @returns
@@ -20,84 +20,48 @@ class MyCollectionViewModel {
     return MyCollectionViewModel.instance;
     return MyCollectionViewModel.instance;
   }
   }
 
 
-  BaseGetRequest(type:number,tagId:string,pageNum:string){
-    let url = HttpUrlUtils.getMyCollectionListDataUrl()+ `?type=${type}&operateTag=${1}&pageSize=${20}&pageNum=${pageNum}`
-    if (tagId.length > 0) {
-      url = url + `&tagId=${tagId}`
-    }
+  //Type 1 收藏 2 浏览历史
+  //tagId 收藏界面 标签筛选
+  BaseGetRequest(type:number,tagId:string,pageNum:number){
+    let url = HttpUrlUtils.getMyCollectionListDataUrl()+ `?type=${type}&operateTag=${2}&pageSize=${20}&pageNum=${pageNum.toString()}`
+    // if (tagId.length > 0) {
+    //   url = url + `&tagId=${tagId}`
+    // }
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
-    return WDHttp.get<ResponseDTO<MyCollectionListModel>>(url, headers)
+    return WDHttp.get<MyCollectionListModel>(url, headers)
   }
   }
 
 
-  async getAppointmentListDataLocal(context: Context): Promise<MyCollectionListModel> {
-    Logger.info(TAG, `getBottomNavDataMock start`);
-    let compRes: ResponseDTO<MyCollectionListModel> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<MyCollectionListModel>>(context,'browsingHistory_list_data.json' );
-    if (!compRes || !compRes.data) {
-      Logger.info(TAG, `getAppointmentListDataLocal compRes  is empty`);
-      return new MyCollectionListModel()
-    }
-    Logger.info(TAG, `getAppointmentListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
-    return compRes.data
-  }
 
 
-  //Type 1 收藏 2 浏览历史
-  //tagId 收藏界面 标签筛选
-  fetchMyCollectList(type:number,tagId:string,pageNum:string,context: Context):Promise<MyCollectionListModel>{
-    return new Promise<MyCollectionListModel>((success,error) => {
-      this.BaseGetRequest(type,tagId,pageNum).then((navResDTO: ResponseDTO<MyCollectionListModel>) => {
+  fetchMyCollectList(type:number,tagId:string,pageNum:number,context: Context):Promise<MyCollectionItem>{
+    return new Promise((success,error) => {
+      this.BaseGetRequest(type,tagId,pageNum).then((navResDTO: MyCollectionListModel) => {
         if (!navResDTO || navResDTO.code != 0) {
         if (!navResDTO || navResDTO.code != 0) {
-          success(this.getAppointmentListDataLocal(context))
           return
           return
         }
         }
-        Logger.info(TAG, "getAppointmentList then,AppointmentResDTO.timeStamp:" + navResDTO.timestamp);
-        let listData =  navResDTO.data as MyCollectionListModel
-        success(listData)
+        Logger.info(TAG, "fetchMyCollectList then,navResDTO.timeStamp:" + navResDTO.timestamp);
+        success(navResDTO.data)
       }).catch((err: Error) => {
       }).catch((err: Error) => {
-        Logger.error(TAG, `fetchAppointmentListDataApi catch, error.name : ${err.name},  error.message:${err.message}`);
+        Logger.error(TAG, `fetchMyCollectList catch, error.name : ${err.name},  error.message:${err.message}`);
         error("page data invalid");
         error("page data invalid");
       })
       })
     })
     })
   }
   }
 
 
-
-  newBaseGetRequest(type:number,tagId:string,pageNum:number){
-    let url = HttpUrlUtils.getMyCollectionListDataUrl()+ `?type=${type}&operateTag=${1}&pageSize=${20}&pageNum=${pageNum.toString()}`
-    if (tagId.length > 0) {
-      url = url + `&tagId=${tagId}`
-    }
-    let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
-    return WDHttp.get<ResponseDTO<PageDTO>>(url, headers)
-  }
-
-  newFetchMyCollectList(type:number,tagId:string,pageNum:number,context: Context):Promise<PageDTO>{
-    return new Promise<PageDTO>((success,error) => {
-      success(this.newGetAppointmentListDataLocal(type,context))
-      return
-      this.newBaseGetRequest(type,tagId,pageNum).then((navResDTO: ResponseDTO<PageDTO>) => {
-        if (!navResDTO || navResDTO.code != 0) {
-          success(this.newGetAppointmentListDataLocal(type,context))
-          return
+  //收藏/取消收藏  status ：收藏状态 1添加收藏 0取消收藏
+  executeCollcet(params: collcetRecordParams):Promise<ResponseDTO>{
+    return new Promise(() => {
+      let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
+      WDHttp.post<ResponseDTO>(HttpUrlUtils.getExecuteCollcetUrl(),params,headers).then((navResDTO: ResponseDTO) => {
+        if (navResDTO.code == 0) {
+          promptAction.showToast({ message: '删除成功' })
         }
         }
-        Logger.info(TAG, "getAppointmentList then,AppointmentResDTO.timeStamp:" + navResDTO.timestamp);
-        let listData =  navResDTO.data as PageDTO
-        success(listData)
-      }).catch((err: Error) => {
-        Logger.error(TAG, `fetchAppointmentListDataApi catch, error.name : ${err.name},  error.message:${err.message}`);
-        error("page data invalid");
       })
       })
+        .catch((error: Error) => {
+          Logger.info(TAG,'executeCollcet','ResponseDTO')
+        })
     })
     })
   }
   }
 
 
-  async newGetAppointmentListDataLocal(type:number, context: Context): Promise<PageDTO> {
-    Logger.info(TAG, `getBottomNavDataMock start`);
-    let compRes: ResponseDTO<PageDTO> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<PageDTO>>(context,type == 1?'MyCollection_list_data.json':'browsingHistory_list_data.json');
-    if (!compRes || !compRes.data) {
-      Logger.info(TAG, `getAppointmentListDataLocal compRes  is empty`);
-      return {} as PageDTO
-    }
-    Logger.info(TAG, `getAppointmentListDataLocal getResourcesJsonSync compRes : ${JSON.stringify(compRes)}`);
-    return compRes.data
-  }
 }
 }
 
 
 const collectionViewModel = MyCollectionViewModel.getInstance();
 const collectionViewModel = MyCollectionViewModel.getInstance();

@@ -8,6 +8,7 @@ export default class PageModel {
   pageId: string = "";
   pageId: string = "";
   groupId: string = "";
   groupId: string = "";
   channelId: string = "";
   channelId: string = "";
+  isRecGroup: boolean = false;
   compList: LazyDataSource<CompDTO> = new LazyDataSource();
   compList: LazyDataSource<CompDTO> = new LazyDataSource();
   // 页面状态，刷新、加载更多等
   // 页面状态，刷新、加载更多等
   currentPage: number = 1;
   currentPage: number = 1;
@@ -35,5 +36,4 @@ export default class PageModel {
   // keyGenerator相关字符串，用于刷新list布局
   // keyGenerator相关字符串，用于刷新list布局
   timestamp: String = '1';
   timestamp: String = '1';
   groupStrategy: number = 0;
   groupStrategy: number = 0;
-  isRecGroup: boolean = false;
 }
 }

@@ -14,6 +14,7 @@ import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
 import { ResponseDTO, } from 'wdNetwork';
 import { ResponseDTO, } from 'wdNetwork';
 import { PageRepository } from '../repository/PageRepository';
 import { PageRepository } from '../repository/PageRepository';
 import { BaseViewModel } from './BaseViewModel';
 import { BaseViewModel } from './BaseViewModel';
+import PageModel from './PageModel';
 
 
 const TAG = 'PageViewModel';
 const TAG = 'PageViewModel';
 /**
 /**
@@ -140,14 +141,43 @@ export class PageViewModel extends BaseViewModel {
     return compRes.data
     return compRes.data
   }
   }
 
 
-  async getPageData(pageId: string, groupId: string, channelId: string, currentPage: number
+  async getPageData(pageModel: PageModel, context?: Context): Promise<PageDTO> {
+    Logger.debug(TAG, 'getPageData pageId: ' + pageModel.pageId);
+    return this.parseComp(PageRepository.fetchCompData(pageModel.pageId, pageModel.groupId, pageModel.channelId, pageModel.isRecGroup == true ? 1 : 0, pageModel.currentPage, pageModel.pageSize))
+  }
+
+  async getLivePageData(pageId: string, groupId: string, channelId: string, groupStrategy: number, currentPage: number
     , pageSize: number, context: Context): Promise<PageDTO> {
     , pageSize: number, context: Context): Promise<PageDTO> {
     Logger.debug(TAG, 'getPageData pageId: ' + pageId);
     Logger.debug(TAG, 'getPageData pageId: ' + pageId);
     if (mock_switch) {
     if (mock_switch) {
       return this.getPageData1(currentPage, context);
       return this.getPageData1(currentPage, context);
     }
     }
     return new Promise<PageDTO>((success, error) => {
     return new Promise<PageDTO>((success, error) => {
-      PageRepository.fetchPageData(pageId, groupId, channelId, currentPage, pageSize)
+      PageRepository.fetchLivePageData(pageId, groupId, channelId, groupStrategy, currentPage, pageSize)
+        .then((resDTO: ResponseDTO<PageDTO>) => {
+          if (!resDTO || !resDTO.data) {
+            Logger.error(TAG, 'getNavData then resDTO is empty');
+            error('resDTO is empty');
+            return
+          }
+          if (resDTO.code != 0) {
+            Logger.error(TAG, `getNavData then code:${resDTO.code}, message:${resDTO.message}`);
+            error('resDTO Response Code is failure');
+            return
+          }
+          Logger.info(TAG, "getNavData then,resDTO.timestamp:" + resDTO.timestamp);
+          success(resDTO.data);
+        })
+        .catch((err: Error) => {
+          Logger.error(TAG, `getPageData catch, error.name : ${err.name},  error.message:${err.message}`);
+          error(err);
+        })
+    })
+  }
+
+  private parseComp(getData: Promise<ResponseDTO<PageDTO>>): Promise<PageDTO> {
+    return new Promise<PageDTO>((success, error) => {
+      getData
         .then((resDTO: ResponseDTO<PageDTO>) => {
         .then((resDTO: ResponseDTO<PageDTO>) => {
           if (!resDTO || !resDTO.data) {
           if (!resDTO || !resDTO.data) {
             Logger.error(TAG, 'getNavData then resDTO is empty');
             Logger.error(TAG, 'getNavData then resDTO is empty');

+import { SearchResultContentItem } from './SearchResultContentItem'
+
+@Observed
+export class SearchResultContentData{
+  list:SearchResultContentItem[] = []
+
+  keyword:string = ""
+  pageNum: number = 0
+  pageSize: number = 20
+  totalCount: number = 0
+
+
+}

+import { ContentDTO } from 'wdBean/Index'
+
+export interface  SearchResultContentItem{
+  data:ContentDTO
+  resultType:string
+
+}