Merge remote-tracking branch 'origin/main'

@@ -11,8 +11,13 @@ export class SpConstants{
    static  USER_TEMP_TOKEN="tempToken"
    static  USER_TEMP_TOKEN="tempToken"
    static  USER_PHONE = "user_phone"
    static  USER_PHONE = "user_phone"
    //协议相关
    //协议相关
-   static USER_PROTOCOL = "user_protocol" //用户协议
-   static PRIVATE_PROTOCOL = "private_protocol" //隐私协议
+   static NET_SERVICE_PROTOCOL = "user_protocol" //人民日报客户端网络服务使用协议
+   static PRIVATE_PROTOCOL = "private_protocol" //人民日报客户端用户隐私协议
+   static LOGOUT_PROTOCOL = "logout_protocol" //人民日报客户端app注销协议
+   static MESSAGE_BOARD_USER_PROTOCOL = "message_board_user_protocol" //"留言板-用户协议"
+   static MESSAGE_BOARD_NOTICE_PROTOCOL = "message_board_notice_protocol" //留言板-留言须知
+   static MESSAGE_BOARD_QUESTION_PROTOCOL = "message_board_question_protocol" //"留言板-发布提问规定""
+   static MESSAGE_BOARD_PRIVATE_PROTOCOL = "message_board_private_protocol" //"留言板-隐私政策"
    //设置页面
    //设置页面
    static SETTING_WIFI_IMAGE_SWITCH = "setting_wifi_switch" //wifi 图片开关
    static SETTING_WIFI_IMAGE_SWITCH = "setting_wifi_switch" //wifi 图片开关
    static SETTING_WIFI_VIDEO_SWITCH = "setting_wifi_switch" //wifi 视频开关
    static SETTING_WIFI_VIDEO_SWITCH = "setting_wifi_switch" //wifi 视频开关

+/**
+ * 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'
+}
+
+
+

 import { Action } from './Action';
 import { Action } from './Action';
-
+interface dataObject {
+  webViewHeight?: string
+  dataJson?: string
+}
 /**
 /**
  * 消息Message
  * 消息Message
  */
  */
@@ -7,7 +10,7 @@ export class Message {
   callbackId: string = ""; //callbackId
   callbackId: string = ""; //callbackId
   responseId: string = ""; //responseId
   responseId: string = ""; //responseId
   responseData: string = ""; //responseData
   responseData: string = ""; //responseData
-  data?: object; //data of message
+  data?: dataObject; //data of message
   handlerName: string = ""; //name of handler
   handlerName: string = ""; //name of handler
 
 
   /**
   /**

@@ -36,6 +36,10 @@ export { UserDataLocal } from './src/main/ets/utils/UserDataLocal'
 
 
 export { NumberFormatterUtils } from './src/main/ets/utils/NumberFormatterUtils'
 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
+}

-// import { abilityAccessCtrl, bundleManager, common, Permissions, Want } from '@kit.AbilityKit'
-// import { BusinessError } from '@kit.BasicServicesKit'
-// import { AppUtils } from './AppUtils'
-// import { Logger } from './Logger'
-//
-// /**
-//  * 权限工具类
-//  * */
-// export class PermissionUtils {
-//   //相机权限
-//   static CAMERA: Permissions = 'ohos.permission.CAMERA'
-//   //文件权限
-//   static READ_MEDIA: Permissions = 'ohos.permission.READ_MEDIA'
-//   static WRITE_MEDIA: Permissions = 'ohos.permission.WRITE_MEDIA'
-//   private static tokenId: number = 0
-//
-//   /**检查权限是否授权*/
-//   static async checkPermissions(permission: Permissions): Promise<boolean> {
-//     let hasPermissions = false;
-//     let grantStatus: abilityAccessCtrl.GrantStatus = await PermissionUtils.checkAccessToken(permission);
-//
-//     if (grantStatus === abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) {
-//       // 已经授权，可以继续访问目标操作
-//       hasPermissions = true;
-//     } else {
-//       hasPermissions = false;
-//       // 申请日历权限
-//     }
-//     return hasPermissions;
-//   }
-//
-//   /**动态申请权限*/
-//   static reqPermissionsFromUser(permissions: Array<Permissions>, component: Object): Promise<boolean> {
-//
-//     return new Promise((resolve, fail) => {
-//       let context = getContext(component) as common.UIAbilityContext;
-//       let atManager = abilityAccessCtrl.createAtManager();
-//       atManager.requestPermissionsFromUser(context, permissions).then((data) => {
-//         let grantStatus: Array<number> = data.authResults;
-//         let length: number = grantStatus.length;
-//
-//         for (let i = 0; i < length; i++) {
-//           if (grantStatus[i] === 0) {
-//             // 用户授权，可以继续访问目标操作
-//             resolve(true);
-//           } else {
-//             resolve(false)
-//           }
-//         }
-//       }).catch((err: Error) => {
-//         fail(err)
-//       })
-//     });
-//   }
-//
-//   /**跳转设置页面*/
-//   static openPermissionsInSystemSettings(context: Object): void {
-//     let uiContext = getContext(context) as common.UIAbilityContext;
-//     let wantInfo: Want = {
-//       bundleName: 'com.huawei.hmos.settings',
-//       abilityName: 'com.huawei.hmos.settings.MainAbility',
-//       uri: 'application_info_entry',
-//       parameters: {
-//         pushParams: AppUtils.getPackageName(uiContext) // 打开指定应用的设置页面
-//       }
-//     }
-//     uiContext.startAbility(wantInfo)
-//   }
-//
-//   private static async checkAccessToken(permission: Permissions): Promise<abilityAccessCtrl.GrantStatus> {
-//     let atManager: abilityAccessCtrl.AtManager = abilityAccessCtrl.createAtManager();
-//     let grantStatus: abilityAccessCtrl.GrantStatus = abilityAccessCtrl.GrantStatus.PERMISSION_DENIED;
-//
-//     // 获取应用程序的accessTokenID
-//     if (PermissionUtils.tokenId == 0) {
-//       try {
-//         let bundleInfo: bundleManager.BundleInfo = await bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
-//         let appInfo: bundleManager.ApplicationInfo = bundleInfo.appInfo;
-//         PermissionUtils.tokenId = appInfo.accessTokenId;
-//       } catch (error) {
-//         const err: BusinessError = error as BusinessError;
-//       }
-//     }
-//     // 校验应用是否被授予权限
-//     try {
-//       grantStatus = await atManager.checkAccessToken(PermissionUtils.tokenId, permission);
-//     } catch (error) {
-//       const err: BusinessError = error as BusinessError;
-//     }
-//
-//     return grantStatus;
-//   }
-//
-// }
+import { abilityAccessCtrl, bundleManager, common, Permissions, Want } from '@kit.AbilityKit'
+import { BusinessError } from '@kit.BasicServicesKit'
+import { AppUtils } from './AppUtils'
+import { Logger } from './Logger'
+
+/**
+ * 权限工具类
+ * */
+export class PermissionUtils {
+  //相机权限
+  static CAMERA: Permissions = 'ohos.permission.CAMERA'
+  //文件权限
+  static READ_MEDIA: Permissions = 'ohos.permission.READ_MEDIA'
+  static WRITE_MEDIA: Permissions = 'ohos.permission.WRITE_MEDIA'
+  private static tokenId: number = 0
+
+  /**检查权限是否授权*/
+  static async checkPermissions(permission: Permissions): Promise<boolean> {
+    let hasPermissions = false;
+    let grantStatus: abilityAccessCtrl.GrantStatus = await PermissionUtils.checkAccessToken(permission);
+
+    if (grantStatus === abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) {
+      // 已经授权，可以继续访问目标操作
+      hasPermissions = true;
+    } else {
+      hasPermissions = false;
+      // 申请日历权限
+    }
+    return hasPermissions;
+  }
+
+  /**动态申请权限*/
+  static reqPermissionsFromUser(permissions: Array<Permissions>, component: Object): Promise<boolean> {
+
+    return new Promise((resolve, fail) => {
+      let context = getContext(component) as common.UIAbilityContext;
+      let atManager = abilityAccessCtrl.createAtManager();
+      atManager.requestPermissionsFromUser(context, permissions).then((data) => {
+        let grantStatus: Array<number> = data.authResults;
+        let length: number = grantStatus.length;
+
+        for (let i = 0; i < length; i++) {
+          if (grantStatus[i] === 0) {
+            // 用户授权，可以继续访问目标操作
+            resolve(true);
+          } else {
+            resolve(false)
+          }
+        }
+      }).catch((err: Error) => {
+        fail(err)
+      })
+    });
+  }
+
+  /**跳转设置页面*/
+  static openPermissionsInSystemSettings(context: Object): void {
+    let uiContext = getContext(context) as common.UIAbilityContext;
+    let wantInfo: Want = {
+      bundleName: 'com.huawei.hmos.settings',
+      abilityName: 'com.huawei.hmos.settings.MainAbility',
+      uri: 'application_info_entry',
+      parameters: {
+        pushParams: AppUtils.getPackageName(uiContext) // 打开指定应用的设置页面
+      }
+    }
+    uiContext.startAbility(wantInfo)
+  }
+
+  private static async checkAccessToken(permission: Permissions): Promise<abilityAccessCtrl.GrantStatus> {
+    let atManager: abilityAccessCtrl.AtManager = abilityAccessCtrl.createAtManager();
+    let grantStatus: abilityAccessCtrl.GrantStatus = abilityAccessCtrl.GrantStatus.PERMISSION_DENIED;
+
+    // 获取应用程序的accessTokenID
+    if (PermissionUtils.tokenId == 0) {
+      try {
+        let bundleInfo: bundleManager.BundleInfo = await bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
+        let appInfo: bundleManager.ApplicationInfo = bundleInfo.appInfo;
+        PermissionUtils.tokenId = appInfo.accessTokenId;
+      } catch (error) {
+        const err: BusinessError = error as BusinessError;
+      }
+    }
+    // 校验应用是否被授予权限
+    try {
+      grantStatus = await atManager.checkAccessToken(PermissionUtils.tokenId, permission);
+    } catch (error) {
+      const err: BusinessError = error as BusinessError;
+    }
+
+    return grantStatus;
+  }
+
+}

 import window from '@ohos.window';
 import window from '@ohos.window';
-import { BusinessError } from '@ohos.base';
+import { AsyncCallback, BusinessError } from '@ohos.base';
 import deviceInfo from '@ohos.deviceInfo'
 import deviceInfo from '@ohos.deviceInfo'
 import display from '@ohos.display';
 import display from '@ohos.display';
 
 
+
+interface SystemBarProperties {
+  statusBarColor?: string;
+  isStatusBarLightIcon?: boolean;
+  statusBarContentColor?: string;
+  navigationBarColor?: string;
+  isNavigationBarLightIcon?: boolean;
+  navigationBarContentColor?: string;
+}
+
 export class Size {
 export class Size {
   width: number = 0
   width: number = 0
   height: number = 0
   height: number = 0
@@ -15,17 +25,23 @@ export class Size {
 
 
 export class WindowModel {
 export class WindowModel {
   private windowStage?: window.WindowStage;
   private windowStage?: window.WindowStage;
+  private windowClass?: window.Window;
   static shared: WindowModel = new WindowModel()
   static shared: WindowModel = new WindowModel()
   static TAG = "WindowModel";
   static TAG = "WindowModel";
 
 
   setWindowStage(windowStage: window.WindowStage) {
   setWindowStage(windowStage: window.WindowStage) {
     this.windowStage = windowStage;
     this.windowStage = windowStage;
+    this.windowClass = windowStage.getMainWindowSync();
   }
   }
 
 
   getWindowStage(): window.WindowStage {
   getWindowStage(): window.WindowStage {
     return this.windowStage as window.WindowStage
     return this.windowStage as window.WindowStage
   }
   }
 
 
+  getWindowClass(): window.Window {
+    return this.windowClass as window.Window
+  }
+
   setMainWindowFullScreen(fullScreen: boolean) {
   setMainWindowFullScreen(fullScreen: boolean) {
     if (deviceInfo.deviceType != "phone") {
     if (deviceInfo.deviceType != "phone") {
       return
       return
@@ -103,5 +119,17 @@ export class WindowModel {
       });
       });
     })
     })
   }
   }
+
+  /**
+   * 设置窗口全屏模式时窗口内导航栏、状态栏的属性，使用callback异步回调。
+   * @param systemBarProperties
+   * @param callback
+   */
+  setWindowSystemBarProperties(systemBarProperties: SystemBarProperties, callback?: AsyncCallback<void>): void {
+    this.windowClass?.setWindowSystemBarProperties(systemBarProperties, (err: BusinessError) => {
+      callback && callback(err)
+    })
+
+  }
 }
 }
 
 

@@ -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";
@@ -42,6 +46,10 @@ export class HttpUrlUtils {
    * 批查接口，查询互动相关数据，如收藏数、评论数等
    * 批查接口，查询互动相关数据，如收藏数、评论数等
    */
    */
   static readonly INTERACT_DATA_PATH: string = "/api/rmrb-contact/contact/zh/c/content/interactData";
   static readonly INTERACT_DATA_PATH: string = "/api/rmrb-contact/contact/zh/c/content/interactData";
+  /**
+   * 查询视频频道推荐楼层
+   */
+  static readonly DISPLAY_REC_COMPINFO: string = "/api/rmrb-bff-display-zh/display/zh/c/rec/compInfo";
   // 多图（图集）详情页
   // 多图（图集）详情页
   /**
   /**
    * 批量查询内容当前用户点赞、收藏状态
    * 批量查询内容当前用户点赞、收藏状态
@@ -108,6 +116,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 +143,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,22 +196,18 @@ 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";
-
   /**
   /**
    * 搜索联想词
    * 搜索联想词
    */
    */
   static readonly RELATED_SEARCH_CONTENT_DATA_PATH: string = "/api/rmrb-search-api/zh/c/suggestions/";
   static readonly RELATED_SEARCH_CONTENT_DATA_PATH: string = "/api/rmrb-search-api/zh/c/suggestions/";
-
   /**
   /**
    * 直播详情
    * 直播详情
    */
    */
   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";
-
   /**
   /**
    * 直播详情-直播间列表
    * 直播详情-直播间列表
    */
    */
   static readonly LIVE_LIST_PATH: string = "/api/live-center-message/zh/a/live/message/video/list";
   static readonly LIVE_LIST_PATH: string = "/api/live-center-message/zh/a/live/message/video/list";
-
   /**
   /**
    * 直播详情-大家聊列表
    * 直播详情-大家聊列表
    */
    */
@@ -205,6 +217,10 @@ export class HttpUrlUtils {
    * 搜索结果 显示tab 数
    * 搜索结果 显示tab 数
    */
    */
   static readonly SEARCH_RESULT_COUNT_DATA_PATH: string = "/api/rmrb-search-api/zh/c/count?keyword=";
   static readonly SEARCH_RESULT_COUNT_DATA_PATH: string = "/api/rmrb-search-api/zh/c/count?keyword=";
+  /**
+  * 搜索结果 显示list 详情
+  */
+  static readonly SEARCH_RESULT_LIST_DATA_PATH: string = "/api/rmrb-search-api/zh/c/search";
 
 
   /**
   /**
    * 早晚报列表
    * 早晚报列表
@@ -350,7 +366,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 +460,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 +500,21 @@ 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";
@@ -492,13 +527,24 @@ export class HttpUrlUtils {
     return url;
     return url;
   }
   }
 
 
+  //获取用户安全页信息
+  static querySecurity() {
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/security/query";
+    return url;
+  }
+
   static getAppointmentListDataUrl() {
   static getAppointmentListDataUrl() {
     let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
     let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
     return url
     return url
   }
   }
 
 
   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
   }
   }
 
 
@@ -612,6 +658,16 @@ export class HttpUrlUtils {
     return url
     return url
   }
   }
 
 
+  static getSearchResultListDataUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_RESULT_LIST_DATA_PATH
+    return url
+  }
+
+  static getInteractListDataUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.INTERACT_DATA_PATH
+    return url
+  }
+
   // static getYcgCommonHeaders(): HashMap<string, string> {
   // static getYcgCommonHeaders(): HashMap<string, string> {
   //   let headers: HashMap<string, string> = new HashMap<string, string>()
   //   let headers: HashMap<string, string> = new HashMap<string, string>()
   //
   //

@@ -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");
   //我的  预约
   //我的  预约

@@ -8,13 +8,17 @@ export class H5CallNativeType {
   static jsCall_getAppPublicInfo = 'jsCall_getAppPublicInfo'
   static jsCall_getAppPublicInfo = 'jsCall_getAppPublicInfo'
   static jsCall_getArticleDetailBussinessData = 'jsCall_getArticleDetailBussinessData'
   static jsCall_getArticleDetailBussinessData = 'jsCall_getArticleDetailBussinessData'
   static jsCall_callAppService = 'jsCall_callAppService'
   static jsCall_callAppService = 'jsCall_callAppService'
+  static jsCall_appInnerLinkMethod = 'jsCall_appInnerLinkMethod'
+  static jsCall_receiveH5Data = 'jsCall_receiveH5Data'
   // 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)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_callAppService)
     H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_callAppService)
+    H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_appInnerLinkMethod)
+    H5CallNativeType.JsCallTypeList.push(H5CallNativeType.jsCall_receiveH5Data)
   }
   }
 }
 }
 
 

@@ -2,6 +2,9 @@ import { Callback, BridgeWebViewControl } from 'wdJsBridge';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Logger, StringUtils, } from 'wdKit';
 import { Logger, StringUtils, } from 'wdKit';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
+import { ContentDTO } from 'wdBean';
+//TODO 这里引用了 features模块，是否考虑将跳转抽到公共模块
+import { ProcessUtils } from '../../../../../../features/wdComponent/src/main/ets/utils/ProcessUtils';
 
 
 const TAG = 'JsBridgeBiz'
 const TAG = 'JsBridgeBiz'
 
 
@@ -11,7 +14,7 @@ const TAG = 'JsBridgeBiz'
  * @param call
  * @param call
  */
  */
 export function performJSCallNative(data: Message, call: Callback) {
 export function performJSCallNative(data: Message, call: Callback) {
-  Logger.debug(TAG, 'performJSCallNative handlerName: ' + data.handlerName + ', data: ' + data.data)
+  Logger.debug(TAG, 'performJSCallNative handlerName: ' + data.handlerName + ', data: ' + JSON.stringify(data.data))
   switch (data.handlerName) {
   switch (data.handlerName) {
     case H5CallNativeType.jsCall_currentPageOperate:
     case H5CallNativeType.jsCall_currentPageOperate:
       break;
       break;
@@ -23,6 +26,9 @@ export function performJSCallNative(data: Message, call: Callback) {
       break;
       break;
     case H5CallNativeType.jsCall_callAppService:
     case H5CallNativeType.jsCall_callAppService:
       break;
       break;
+    case H5CallNativeType.jsCall_receiveH5Data:
+      handleH5Data(JSON.parse(data?.data?.dataJson || '{}'))
+      break;
     case 'changeNativeMessage':
     case 'changeNativeMessage':
       call("this is change Web Message")
       call("this is change Web Message")
       break;
       break;
@@ -50,4 +56,7 @@ function getAppPublicInfo(): string {
   return result;
   return result;
 }
 }
 
 
+function handleH5Data(content:ContentDTO) {
+  ProcessUtils.processPage(content)
+}
 
 

 import router from '@ohos.router';
 import router from '@ohos.router';
-import { Action } from 'wdBean';
-import { ConfigConstants } from 'wdConstant';
-import { Logger } from 'wdKit';
-import { BridgeHandler, BridgeUtil, BridgeWebViewControl, Callback } from 'wdJsBridge';
+import { BridgeUtil, BridgeWebViewControl, Callback } from 'wdJsBridge';
+import { Logger } from 'wdKit/Index';
 import { performJSCallNative } from './JsBridgeBiz';
 import { performJSCallNative } from './JsBridgeBiz';
-import { setDefaultNativeWebSettings } from './WebComponentUtil';
+import { H5CallNativeType } from './H5CallNativeType';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 
 
-const TAG = 'WdWebComponent';
+const TAG = 'WdWebLocalComponent';
 
 
 @Component
 @Component
 export struct WdWebComponent {
 export struct WdWebComponent {
-  private webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
-  //TODO 默认网页
-  webUrl: string | Resource = ConfigConstants.DETAIL_URL
-  /**
-   * 对外暴露webview的回调，能力
-   */
-  onPageBegin: (url?: string) => void = () => {
-  }
-  onPageEnd: (url?: string) => void = () => {
-  }
-  onLoadIntercept: (url?: string) => boolean = () => {
-    return false
-  }
-  onHttpErrorReceive: (url?: string) => boolean = () => {
-    return false
-  }
+  webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
+  @Prop backVisibility: boolean = false
+  @Prop webUrl: string = ''
   @Prop @Watch('onReloadStateChanged') reload: number = 0
   @Prop @Watch('onReloadStateChanged') reload: number = 0
-  /**
-   * 默认【CallNative】逻辑处理
-   */
-  private defaultPerformJSCallNative: (data: Message, f: Callback) => void = (data: Message, f: Callback) => {
-    performJSCallNative(data, f)
-  }
-  /**
-   * jsBridge的处理
-   */
-  handleInfo: [string, BridgeHandler][] = []
-  backVisibility: boolean = false
-
-  defaultRegisterHandler(): void {
-    this.webviewControl.registerHandler("CallNative", {
-      handle: (data: Message, f: Callback) => {
-        this.defaultPerformJSCallNative(data, f)
-      }
-    });
-
-  }
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -71,26 +36,13 @@ export struct WdWebComponent {
         .zoomAccess(false)
         .zoomAccess(false)
         .horizontalScrollBarAccess(false)
         .horizontalScrollBarAccess(false)
         .verticalScrollBarAccess(false)
         .verticalScrollBarAccess(false)
-        .onHttpErrorReceive((event) => {
-          //TODO 页面加载不成功的时候处理
-          Logger.info(TAG, 'onHttpErrorReceive event.request.getRequestUrl:' + event?.request.getRequestUrl());
-          Logger.info(TAG, 'onHttpErrorReceive event.response.getResponseCode:' + event?.response.getResponseCode());
+        .onPageBegin((event) => {
+          console.log(this.webUrl,"yzl")
+          this.onPageBegin(event?.url);
         })
         })
         .onPageEnd((event) => {
         .onPageEnd((event) => {
           this.onPageEnd(event?.url)
           this.onPageEnd(event?.url)
         })
         })
-        .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')
-        })
         .onLoadIntercept((event) => {
         .onLoadIntercept((event) => {
           let url: string = event.data.getRequestUrl().toString()
           let url: string = event.data.getRequestUrl().toString()
           url = url.replace("%(?![0-9a-fA-F]{2})", "%25")
           url = url.replace("%(?![0-9a-fA-F]{2})", "%25")
@@ -101,19 +53,51 @@ export struct WdWebComponent {
             return true
             return true
           }
           }
           if (url.startsWith(BridgeUtil.YY_OVERRIDE_SCHEMA)) {
           if (url.startsWith(BridgeUtil.YY_OVERRIDE_SCHEMA)) {
+            Logger.debug(TAG, 'flushMessageQueue');
             this.webviewControl.flushMessageQueue()
             this.webviewControl.flushMessageQueue()
             return true
             return true
           }
           }
-          return this.onLoadIntercept(event.data.getRequestUrl().toString())
+          return this.onLoadIntercept(event.data.getRequestUrl().toString());
         })
         })
     }
     }
   }
   }
 
 
+  private registerHandlers(): void {
+    // 注册h5调用js相关
+    for (let i = 0; i < H5CallNativeType.JsCallTypeList.length; i++) {
+      let handleName = H5CallNativeType.JsCallTypeList[i];
+      console.log('handleName:', handleName)
+      let handle = (data: Message, f: Callback) => {
+        this.defaultPerformJSCallNative(data, f)
+      };
+      this.webviewControl.registerHandler(handleName, { handle: handle });
+    }
+  }
+
+  /**
+   * 默认【CallNative】逻辑处理
+   */
+  private defaultPerformJSCallNative: (data: Message, f: Callback) => void = (data: Message, f: Callback) => {
+    performJSCallNative(data, f)
+  }
+  onPageBegin: (url?: string) => void = () => {
+    Logger.debug(TAG, 'onPageBegin');
+    this.registerHandlers();
+    BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
+  }
+  onPageEnd: (url?: string) => void = () => {
+    Logger.debug(TAG, 'onPageEnd');
+  }
+  onLoadIntercept: (url?: string) => boolean = () => {
+    Logger.debug(TAG, 'onLoadIntercept return false');
+    return false
+  }
   onReloadStateChanged() {
   onReloadStateChanged() {
     Logger.info(TAG, `onReloadStateChanged:::refresh, this.reload: ${this.reload}`);
     Logger.info(TAG, `onReloadStateChanged:::refresh, this.reload: ${this.reload}`);
     if (this.reload > 0) {
     if (this.reload > 0) {
       this.webviewControl.refresh()
       this.webviewControl.refresh()
     }
     }
   }
   }
+
 }
 }
 
 

@@ -11,9 +11,10 @@ const TAG = 'WdWebLocalComponent';
 
 
 @Component
 @Component
 export struct WdWebLocalComponent {
 export struct WdWebLocalComponent {
-  private webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
-  backVisibility: boolean = false
-  webResource: Resource = {} as Resource
+  webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
+  @Prop backVisibility: boolean = false
+  @Prop webResource: Resource = {} as Resource
+  @State webHeight : string = '100%'
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -31,30 +32,16 @@ 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)
+        .imageAccess(true)
+        .mixedMode(MixedMode.All)
+        .onlineImageAccess(true)
+        .enableNativeEmbedMode(true)
+        .height(this.webHeight === '100%' ? '100%' : Number(this.webHeight))
         .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();
-          setTimeout(() => {
-            BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
-          }, 200)
         })
         })
         .onPageEnd((event) => {
         .onPageEnd((event) => {
           this.onPageEnd(event?.url)
           this.onPageEnd(event?.url)
@@ -79,25 +66,24 @@ 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];
       let handle = (data: Message, f: Callback) => {
       let handle = (data: Message, f: Callback) => {
+        this.setCurrentPageOperate(data)
         this.defaultPerformJSCallNative(data, f)
         this.defaultPerformJSCallNative(data, f)
-      } ;
+      };
       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)
-    //   }
-    // });
-
   }
   }
 
 
+  //webview 高度设置
+  private setCurrentPageOperate: (data: Message) => void = (data) => {
+    console.log("setCurrentPageOperate",JSON.stringify(data))
+    if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate) {
+      this.webHeight = data?.data?.webViewHeight || '100%'
+    }
+  }
   /**
   /**
    * 默认【CallNative】逻辑处理
    * 默认【CallNative】逻辑处理
    */
    */
@@ -106,12 +92,16 @@ export struct WdWebLocalComponent {
   }
   }
   onPageBegin: (url?: string) => void = () => {
   onPageBegin: (url?: string) => void = () => {
     Logger.debug(TAG, 'onPageBegin');
     Logger.debug(TAG, 'onPageBegin');
+    this.registerHandlers();
+    // setTimeout(() => {
+    BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
+    // }, 100)
   }
   }
   onPageEnd: (url?: string) => void = () => {
   onPageEnd: (url?: string) => void = () => {
     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,15 @@ 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: number;
   photoNum: number;
-
+  corner: string;
+  rmhPlatform: number;
+  newTags: string;
+  isSearch?: boolean; // 是否是搜索的结果，区分搜索和主页的数据
 }
 }

+/**
+ * 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;
+}

@@ -43,20 +43,14 @@ export { ImageAndTextWebComponent } from "./src/main/ets/components/ImageAndText
 
 
 export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel"
 export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel"
 
 
-export { SingleImageCardComponent } from "./src/main/ets/components/view/SingleImageCardComponent"
-
-export { TriPicCardComponent } from "./src/main/ets/components/view/TriPicCardComponent"
-
 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent"
 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent"
 
 
-export { HeadPictureCardComponent } from "./src/main/ets/components/view/HeadPictureCardComponent"
-
-export { ZhGridLayoutComponent } from "./src/main/ets/components/view/ZhGridLayoutComponent"
-
 export { MultiPictureDetailPageComponent } from "./src/main/ets/components/MultiPictureDetailPageComponent"
 export { MultiPictureDetailPageComponent } from "./src/main/ets/components/MultiPictureDetailPageComponent"
 
 
 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent"
 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent"
 
 
+export { AudioSuspensionModel } from "./src/main/ets/viewmodel/AudioSuspensionModel"
+
 export { BroadcastPageComponent } from "./src/main/ets/components/broadcast/BroadcastPageComponent"
 export { BroadcastPageComponent } from "./src/main/ets/components/broadcast/BroadcastPageComponent"
 
 
 export { FirstTabTopSearchComponent } from "./src/main/ets/components/search/FirstTabTopSearchComponent"
 export { FirstTabTopSearchComponent } from "./src/main/ets/components/search/FirstTabTopSearchComponent"
@@ -64,3 +58,8 @@ 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 { SpacialTopicPageComponent } from './src/main/ets/components/SpacialTopicPageComponent'
+
+export { LogoutViewModel } from "./src/main/ets/viewmodel/LogoutViewModel"
+

@@ -12,6 +12,7 @@ import { Card17Component } from './cardview/Card17Component';
 import { Card15Component } from './cardview/Card15Component';
 import { Card15Component } from './cardview/Card15Component';
 import { Card19Component } from './cardview/Card19Component';
 import { Card19Component } from './cardview/Card19Component';
 import { Card20Component } from './cardview/Card20Component';
 import { Card20Component } from './cardview/Card20Component';
+import { Card21Component } from './cardview/Card21Component';
 
 
 /**
 /**
  * card适配器，卡片样式汇总，依据ContentDTO#appStyle
  * card适配器，卡片样式汇总，依据ContentDTO#appStyle
@@ -52,6 +53,8 @@ export struct CardParser {
       Card19Component({ contentDTO })
       Card19Component({ contentDTO })
     } else if (contentDTO.appStyle === CompStyle.Card_20) {
     } else if (contentDTO.appStyle === CompStyle.Card_20) {
       Card20Component({ contentDTO })
       Card20Component({ contentDTO })
+    } else if (contentDTO.appStyle === CompStyle.Card_21) {
+      Card21Component({ contentDTO })
     }
     }
     else {
     else {
       // todo:组件未实现 / Component Not Implemented
       // todo:组件未实现 / Component Not Implemented

+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))
+    }
+  }
+}

@@ -22,13 +22,6 @@ import { PageRepository } from '../repository/PageRepository';
 
 
 const TAG = 'ImageAndTextPageComponent'
 const TAG = 'ImageAndTextPageComponent'
 
 
-export interface OperationItem {
-  icon: Resource;
-  icon_check?: Resource;
-  text: string | Resource;
-  num?: number; // 个数
-}
-
 @Component
 @Component
 export struct ImageAndTextPageComponent {
 export struct ImageAndTextPageComponent {
   scroller: Scroller = new Scroller();
   scroller: Scroller = new Scroller();
@@ -37,7 +30,6 @@ export struct ImageAndTextPageComponent {
   @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
-
   build() {
   build() {
     Column() {
     Column() {
       // 发布时间
       // 发布时间
@@ -64,66 +56,28 @@ export struct ImageAndTextPageComponent {
           .objectFit(ImageFit.Cover)
           .objectFit(ImageFit.Cover)
           .margin({ top: 10 })
           .margin({ top: 10 })
       }
       }
-      .padding({ left: 15, right: 15, })
+      .padding({ left: 15, right: 15 })
       .backgroundColor(Color.White)
       .backgroundColor(Color.White)
 
 
       Stack({ alignContent: Alignment.Bottom }) {
       Stack({ alignContent: Alignment.Bottom }) {
-        List() {
-          //详情展示区
-          ListItem() {
+        Scroll(this.scroller) {
+          Column() {
+            ImageAndTextWebComponent({
+              contentDetailData: this.contentDetailData,
+              action: this.action
+            })
             Column() {
             Column() {
-              ImageAndTextWebComponent({
-                contentDetailData: this.contentDetailData,
-                action: this.action,
-              })
-            }.width(CommonConstants.FULL_WIDTH)
-            .height(CommonConstants.FULL_HEIGHT)
-          }
-
-          if (this.contentDetailData[0]?.openLikes === 1) {
-            ListItem() {
-              // 点赞
-              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()
-                })
-
-              }.width(CommonConstants.FULL_WIDTH).height(80)
-              .justifyContent(FlexAlign.Center)
+              if (this.recommendList.length > 0) {
+                RecommendList({ recommendList: this.recommendList })
+              }
             }
             }
-            .border({
-              width: { bottom: 5 },
-              color: '#f5f5f5',
-            })
           }
           }
 
 
-          // 相关推荐区
-          ListItem() {
-            RecommendList({ recommendList: this.recommendList })
-          }
         }
         }
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
         .height(CommonConstants.FULL_HEIGHT)
         .height(CommonConstants.FULL_HEIGHT)
-        .padding({ bottom: 56 })
-        .scrollBar(BarState.Off)
-        .edgeEffect(EdgeEffect.None)
+        .padding({ bottom: 76 })
+        // .scrollBar(BarState.Off)
 
 
         //底部交互区
         //底部交互区
         Row() {
         Row() {
@@ -163,11 +117,143 @@ export struct ImageAndTextPageComponent {
         .justifyContent(FlexAlign.SpaceBetween)
         .justifyContent(FlexAlign.SpaceBetween)
         .backgroundColor(Color.White)
         .backgroundColor(Color.White)
       }
       }
-    }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
-    .backgroundColor(Color.White)
-
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .height(CommonConstants.FULL_HEIGHT)
   }
   }
 
 
+  // build() {
+  //   Column() {
+  //     // 发布时间
+  //     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() {
+  //         //详情展示区
+  //         ListItem() {
+  //           Column() {
+  //             ImageAndTextWebComponent({
+  //               contentDetailData: this.contentDetailData,
+  //               action: this.action,
+  //             })
+  //           }.width(CommonConstants.FULL_WIDTH)
+  //           // .height(CommonConstants.FULL_HEIGHT)
+  //         }
+  //
+  //         if (this.contentDetailData[0]?.openLikes === 1) {
+  //           ListItem() {
+  //             // 点赞
+  //             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()
+  //               })
+  //
+  //             }.width(CommonConstants.FULL_WIDTH).height(80)
+  //             .justifyContent(FlexAlign.Center)
+  //           }
+  //           .border({
+  //             width: { bottom: 5 },
+  //             color: '#f5f5f5',
+  //           })
+  //         }
+  //
+  //         // 相关推荐区
+  //         ListItem() {
+  //           RecommendList({ recommendList: this.recommendList })
+  //         }
+  //       }
+  //       .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() {
+  //           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: 50, top: 20 })
+  //       .justifyContent(FlexAlign.SpaceBetween)
+  //       .backgroundColor(Color.White)
+  //     }
+  //
+  //   }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
+  //   .backgroundColor(Color.White)
+  //
+  // }
+
   private async getDetail() {
   private async getDetail() {
     let contentId: string = ''
     let contentId: string = ''
     let relId: string = ''
     let relId: string = ''
@@ -199,7 +285,6 @@ export struct ImageAndTextPageComponent {
     }
     }
   }
   }
 
 
-
   private async getRecommend() {
   private async getRecommend() {
     let params: postRecommendListParams = {
     let params: postRecommendListParams = {
       imei: "8272c108-4fa2-34ce-80b9-bc425a7c2a7e",
       imei: "8272c108-4fa2-34ce-80b9-bc425a7c2a7e",
@@ -211,9 +296,7 @@ export struct ImageAndTextPageComponent {
       channelId: String(this.contentDetailData[0]?.reLInfo?.channelId)
       channelId: String(this.contentDetailData[0]?.reLInfo?.channelId)
     }
     }
     let recommendList = await DetailViewModel.postRecommendList(params)
     let recommendList = await DetailViewModel.postRecommendList(params)
-    if (recommendList && recommendList.length > 0) {
-      this.recommendList = recommendList;
-    }
+    this.recommendList = recommendList;
   }
   }
 
 
   // 已登录->查询用户对作品点赞、收藏状态
   // 已登录->查询用户对作品点赞、收藏状态

@@ -7,7 +7,7 @@ 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 'wdJsBridge/Index';
 import { BridgeWebViewControl } from 'wdJsBridge/Index';
 
 
@@ -85,11 +85,6 @@ export struct ImageAndTextWebComponent {
         webResource: $rawfile('apph5/index.html'),
         webResource: $rawfile('apph5/index.html'),
         backVisibility: false,
         backVisibility: false,
       })
       })
-      // WdWebLocalComponent({
-      //   webviewControl: this.webviewControl,
-      //   webResource: "http://pd-people-uat.pdnews.cn/articletopic/35398-10000015965",
-      //   backVisibility: false,
-      // })
     }
     }
   }
   }
 
 
@@ -97,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, } from 'wdBean';
+import DetailViewModel from '../viewmodel/DetailViewModel';
+import { WdWebComponent } from 'wdWebComponent';
+import router from '@ohos.router';
+import { CommonConstants } from 'wdConstant'
+import { BridgeWebViewControl } from 'wdJsBridge/Index';
+
+const TAG = 'SpacialTopicPageComponent'
+
+@Component
+export struct SpacialTopicPageComponent {
+  webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
+  scroller: Scroller = new Scroller();
+  action: Action = {} as Action
+  @State webUrl: string = '';
+  build() {
+    Column() {
+      Stack({ alignContent: Alignment.Bottom }) {
+        Column() {
+          WdWebComponent({
+            webviewControl: this.webviewControl,
+            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)
+  }
+
+  aboutToAppear() {
+    let action: Action = router.getParams() as Action
+    if (action) {
+      this.webUrl = action.params?.url || ''
+    }
+  }
+
+  aboutToDisappear() {
+  }
+}

@@ -10,56 +10,60 @@ import { DateTimeUtils } from 'wdKit/Index'
 @Component
 @Component
 export struct CardMediaInfo {
 export struct CardMediaInfo {
   @State contentDTO: ContentDTO = {} as ContentDTO // 如果有duraion，代表点播，显示时长；如果不传或者传0，显示直播中
   @State contentDTO: ContentDTO = {} as ContentDTO // 如果有duraion，代表点播，显示时长；如果不传或者传0，显示直播中
+
   // objectType 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,
   // objectType 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,
   // 14动态图文,15动态视频16问政；100人民号,101标签
   // 14动态图文,15动态视频16问政；100人民号,101标签
 
 
   build() {
   build() {
     Row() {
     Row() {
-      if(this.contentDTO.objectType === '1' || this.contentDTO.objectType === '15' ) {
+      if (this.contentDTO.objectType === '1' || this.contentDTO.objectType === '15') {
         // 点播、动态视频
         // 点播、动态视频
-        Row(){
-          Image($r('app.media.videoTypeIcon'))
+        Row() {
+          Image($r('app.media.card_play'))
             .mediaLogo()
             .mediaLogo()
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
             .mediaText()
             .mediaText()
         }
         }
-        .backgroundColor('#4d000000')
-        .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暂停
         // liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
         // 显示直播信息
         // 显示直播信息
-        Row(){
-          if(this.contentDTO.liveInfo.liveState === 'running') {
-            Image($r('app.media.icon_live'))
+        Row() {
+          if(this.contentDTO.liveInfo.liveState === 'wait') {
+            Image($r('app.media.card_wait'))
+              .mediaLogo()
+            Text('预约')
+              .mediaText()
+          } else if (this.contentDTO.liveInfo.liveState === 'running') {
+            Image($r('app.media.card_live'))
               .mediaLogo()
               .mediaLogo()
             Text('直播中')
             Text('直播中')
               .mediaText()
               .mediaText()
-          } else if(this.contentDTO.liveInfo.liveState === 'end'){
-            Image($r('app.media.videoTypeIcon'))
+          } else if (this.contentDTO.liveInfo.liveState === 'end' && this.contentDTO.liveInfo.replayUri) {
+            Image($r('app.media.card_play'))
               .mediaLogo()
               .mediaLogo()
             Text('回看')
             Text('回看')
               .mediaText()
               .mediaText()
+          } else if(this.contentDTO.liveInfo.liveState === 'end' && this.contentDTO.liveInfo
+            .replayUri) {
+            // Image($r('app.media.card_live'))
+            //   .mediaLogo()
+            Text('直播结束')
+              .mediaText()
           }
           }
         }
         }
-        .backgroundColor('#4d000000')
-        .borderRadius($r('app.float.button_border_radius'))
-      } else if(this.contentDTO.objectType === '9') {
+      } else if (this.contentDTO.objectType === '9') {
         // 显示组图；图片数量
         // 显示组图；图片数量
-        Row(){
-          Image($r('app.media.album_card_shape'))
+        Row() {
+          Image($r('app.media.card_image'))
             .mediaLogo()
             .mediaLogo()
           Text(`${this.contentDTO.photoNum}`)
           Text(`${this.contentDTO.photoNum}`)
             .mediaText()
             .mediaText()
-            .width(20)
         }
         }
-        .backgroundColor('#4d000000')
-        .borderRadius($r('app.float.button_border_radius'))
-      } else if(this.contentDTO.objectType === '13') {
+      } else if (this.contentDTO.objectType === '13') {
         // 显示音频信息
         // 显示音频信息
-        Row(){
-          Image($r('app.media.broadcast_listen'))
-            .height(14)
-            .borderRadius($r('app.float.button_border_radius'))
+        Row() {
+          Image($r('app.media.card_audio'))
+            .mediaLogo()
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo.voiceDuration * 1000))
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo.voiceDuration * 1000))
             .mediaText()
             .mediaText()
         }
         }
@@ -68,18 +72,27 @@ export struct CardMediaInfo {
     .margin(6)
     .margin(6)
   }
   }
 
 
-  @Styles mediaLogo() {
-    .width(22)
-    .height(18)
-    .borderRadius($r('app.float.button_border_radius'))
+  @Styles
+  mediaLogo() {
+    .width(14)
+    .height(14)
+    .margin({ right: 3 })
+    .shadow({
+      radius: 2,
+      color: 'rgba(0,0,0,0.3)',
+      offsetY: 2
+    })
   }
   }
 }
 }
 
 
-@Extend(Text) function mediaText() {
+@Extend(Text)
+function mediaText() {
   .fontColor($r('app.color.color_fff'))
   .fontColor($r('app.color.color_fff'))
-  .fontSize($r('app.float.font_size_12'))
-  .width(40)
-  .height(18)
-  .textAlign(TextAlign.Center)
-  .margin({ left: -3 })
+  .fontSize($r('app.float.font_size_14'))
+  .lineHeight(18)
+  .textShadow({
+    radius: 2,
+    color: 'rgba(0,0,0,0.3)',
+    offsetY: 2
+  })
 }
 }

+import { ContentDTO } from 'wdBean'
+import { CommonConstants } from 'wdConstant/Index';
+import { DateTimeUtils } from 'wdKit/Index';
+
+@Component
+export struct CardSourceInfo {
+  @State contentDTO: ContentDTO = {} as ContentDTO;
+  build() {
+    Flex() {
+      if(this.contentDTO.corner) {
+        Text(this.contentDTO.corner)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_ED2800"))
+          .margin({right: 2})
+      }
+      if(this.contentDTO.rmhPlatform === 1) {
+        Text(this.contentDTO.rmhInfo.rmhName)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .maxLines(1)
+          .textOverflow({overflow: TextOverflow.Ellipsis})
+        Image($r("app.media.point"))
+          .width(16)
+          .height(16)
+      } else if(this.contentDTO.source) {
+        Text(`${this.contentDTO.source}`)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .maxLines(1)
+          .textOverflow({overflow: TextOverflow.Ellipsis})
+      }
+      // 新闻tab下的卡片，2天之前的不显示时间。但是如果是搜索情况下展示的卡片，显示时间
+      if(this.contentDTO.isSearch || !this.contentDTO.isSearch && DateTimeUtils.getCommentTime
+      (Number
+        .parseFloat(this
+        .contentDTO.publishTime))
+        .indexOf
+      ('-') === -1) {
+        Image($r("app.media.point"))
+          .width(16)
+          .height(16)
+        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .margin({ right: 6 })
+          .flexShrink(0)
+      }
+      if(this.contentDTO?.interactData?.commentNum) {
+        Text(`${this.contentDTO.interactData.commentNum}评`)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .flexShrink(0)
+      }
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .margin({ top: 8 })
+  }
+}

@@ -2,7 +2,8 @@ import { ContentDTO, slideShows } from 'wdBean';
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 
 
 /**
 /**
  * 大专题卡--CompStyle:  10
  * 大专题卡--CompStyle:  10
@@ -76,10 +77,10 @@ export struct Card10Component {
     }
     }
     .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 })
     .margin({ bottom: 8 })
@@ -95,25 +96,14 @@ export struct Card10Component {
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
           .maxLines(2)
           .maxLines(2)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })
-        Row() {
-          // 展示发稿人
-          if (item.source) {
-            Text(item.source)
-              .fontSize($r('app.float.font_size_12'))
-              .fontColor($r('app.color.color_B0B0B0'))
-              .textOverflow({ overflow: TextOverflow.Ellipsis })
-              .maxLines(1)
-              .width(item.source.length > 10 ? '60%' : '')
-
-            Image($r('app.media.point'))
-              .width(16)
-              .height(16)
+        CardSourceInfo(
+          {
+            contentDTO: {
+              publishTime: item.publishTime || '',
+              source: item.source || ''
+            } as ContentDTO
           }
           }
-          Text(DateTimeUtils.getCommentTime(Number.parseFloat(String(item.publishTime))))
-            .fontSize($r("app.float.font_size_12"))
-            .fontColor($r("app.color.color_B0B0B0"))
-        }
-        .margin({ top: 12 })
+        )
       }
       }
       .layoutWeight(1)
       .layoutWeight(1)
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)

@@ -3,7 +3,7 @@ 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';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG = 'Card11Component';
 const TAG = 'Card11Component';
 
 
 /**
 /**
@@ -21,29 +21,8 @@ export struct Card11Component {
         .maxLines(3)
         .maxLines(3)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
-      Row() {
-        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.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .fontSize($r("app.float.font_size_12"))
-          .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)
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
-
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }.width(CommonConstants.FULL_WIDTH)
     }.width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
       left: $r('app.float.card_comp_pagePadding_lf'),
       left: $r('app.float.card_comp_pagePadding_lf'),

+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 = 'Card14Component';
+
+/**
+ * 人民号-动态---14：人民号单图卡；
+ */
+@Component
+export struct Card14Component {
+  @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 })
+}

+import { ContentDTO } from 'wdBean';
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CommonConstants } from 'wdConstant/Index';
+
+const TAG = 'Card16Component';
+
+/**
+ * 人民号-动态---16：人民号三图卡；
+ */
+@Component
+export struct Card16Component {
+  @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;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;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后音乐人王烁然个人人民号',
+    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(2)
+          .margin({ bottom: 8 })
+          .lineHeight(25)
+      }
+      if (this.contentDTO.coverUrl) {
+        Flex() {
+          ForEach(this.contentDTO.coverUrl?.split(';'), (item: string) => {
+            Image(item).flexBasis(113).height(75).margin({right: 2})
+          })
+        }
+      }
+      //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 })
+}

@@ -4,7 +4,7 @@ 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'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG = 'Card17Component';
 const TAG = 'Card17Component';
 
 
 /**
 /**
@@ -81,25 +81,8 @@ export struct Card17Component {
         };
         };
         WDRouterRule.jumpWithAction(taskAction)
         WDRouterRule.jumpWithAction(taskAction)
       })
       })
-
-      Row() {
-        if (this.contentDTO.source) {
-          Text(this.contentDTO.source)
-            .fontSize($r('app.float.font_size_13'))
-            .fontColor($r('app.color.color_B0B0B0'))
-          Image($r('app.media.point'))
-            .width(16)
-            .height(16)
-        }
-        if (this.contentDTO.publishTime && this.contentDTO.publishTime.length === 13) {
-          Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-            .fontSize($r('app.float.font_size_13'))
-            .fontColor($r('app.color.color_B0B0B0'))
-        }
-      }
-      .width(CommonConstants.FULL_WIDTH)
-      .height(16)
-      .id('label')
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({

@@ -13,37 +13,37 @@ export struct Card19Component {
       // coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994160362418176.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
       // coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994160362418176.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
       // fullColumnImgUrls: [
       // fullColumnImgUrls: [
       //   {
       //   {
-      //     fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994160362418176.png?x-oss-process=image/quality,q_90/auto-orient,1',
-      //     height: 1500,
-      //     landscape: 1,
-      //     size: 1,
-      //     url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994160362418176.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
-      //     weight: 2000
-      //   },
-      //   {
       //     fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994155727712256.png?x-oss-process=image/quality,q_90/auto-orient,1',
       //     fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994155727712256.png?x-oss-process=image/quality,q_90/auto-orient,1',
       //     height: 1500,
       //     height: 1500,
       //     landscape: 1,
       //     landscape: 1,
       //     size: 1,
       //     size: 1,
-      //     url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994155727712256.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+      //     url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994160362418176.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
       //     weight: 2000
       //     weight: 2000
       //   },
       //   },
-      //   {
-      //     fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/quality,q_90/auto-orient,1',
-      //     height: 1280,
-      //     landscape: 1,
-      //     size: 1,
-      //     url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
-      //     weight: 1707
-      //   },
-      //   {
-      //     fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/quality,q_90/auto-orient,1',
-      //     height: 1280,
-      //     landscape: 1,
-      //     size: 1,
-      //     url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
-      //     weight: 1707
-      //   }
+        // {
+        //   fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994155727712256.png?x-oss-process=image/quality,q_90/auto-orient,1',
+        //   height: 1500,
+        //   landscape: 1,
+        //   size: 1,
+        //   url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994155727712256.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+        //   weight: 2000
+        // },
+        // {
+        //   fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/quality,q_90/auto-orient,1',
+        //   height: 1280,
+        //   landscape: 1,
+        //   size: 1,
+        //   url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+        //   weight: 1707
+        // },
+        // {
+        //   fullUrl: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/quality,q_90/auto-orient,1',
+        //   height: 1280,
+        //   landscape: 1,
+        //   size: 1,
+        //   url: 'https://rmrbcmsonline.peopleapp.com/upload/ueditor/image/20240323/a_955994132109586432.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg',
+        //   weight: 1707
+        // }
       // ],
       // ],
       // newsSummary: '#平安建设双提升#【进工地，送安全】3月21日下午，@合肥交警 包河大队走进辖区建筑工地为驾驶员、安全员们开展春季交通安全主题宣传活动。活动中，交警结合涉工程运输车、渣土车交通事故案例，详细讲解行驶注意事项，并普及了“一盔一带”“右转必停”等安全常识，要求驾驶员牢固树立交通安全意识，自觉遵守交通法律法规，确保出行安全。',
       // newsSummary: '#平安建设双提升#【进工地，送安全】3月21日下午，@合肥交警 包河大队走进辖区建筑工地为驾驶员、安全员们开展春季交通安全主题宣传活动。活动中，交警结合涉工程运输车、渣土车交通事故案例，详细讲解行驶注意事项，并普及了“一盔一带”“右转必停”等安全常识，要求驾驶员牢固树立交通安全意识，自觉遵守交通法律法规，确保出行安全。',
       // newsTitle: '#平安建设双提升#【进工地，送安全】3月21日下午，@合肥交警 包河大队走进辖区建筑工地为驾驶员、安全员们开展春季交通安全主题宣传活动。活动中，交警结合涉工程运输车、渣土车交通事故案例，详细讲解行驶注意事项，并普及了“一盔一带”“右转必停”等安全常识，要求驾驶员牢固树立交通安全意识，自觉遵守交通法律法规，确保出行安全。',
       // newsTitle: '#平安建设双提升#【进工地，送安全】3月21日下午，@合肥交警 包河大队走进辖区建筑工地为驾驶员、安全员们开展春季交通安全主题宣传活动。活动中，交警结合涉工程运输车、渣土车交通事故案例，详细讲解行驶注意事项，并普及了“一盔一带”“右转必停”等安全常识，要求驾驶员牢固树立交通安全意识，自觉遵守交通法律法规，确保出行安全。',
@@ -107,6 +107,8 @@ interface radiusType {
 @Component
 @Component
 struct createImg {
 struct createImg {
   @Prop fullColumnImgUrls: FullColumnImgUrlDTO[]
   @Prop fullColumnImgUrls: FullColumnImgUrlDTO[]
+  @State picWidth: number = 0;
+  @State picHeight: number = 0;
   aboutToAppear(): void {
   aboutToAppear(): void {
     if(this.fullColumnImgUrls.length === 4) { // 为了使用栅格布局以便于占用三分之二的宽度，加一个占位
     if(this.fullColumnImgUrls.length === 4) { // 为了使用栅格布局以便于占用三分之二的宽度，加一个占位
       this.fullColumnImgUrls.splice(2,0, {
       this.fullColumnImgUrls.splice(2,0, {
@@ -137,18 +139,77 @@ struct createImg {
     return radius
     return radius
   }
   }
 
 
+  getPicType(){
+    if (this.picWidth && this.picWidth) {
+      if (this.picWidth / this.picHeight > 343/172) {
+        return 1; //横长图
+      } else if (this.picHeight / this.picWidth > 305/228) {
+        return 2; //竖长图
+      } else {
+        return 3
+      }
+    } else {
+      return 3; //普通图
+    }
+  }
+
+
   build() {
   build() {
     GridRow({
     GridRow({
       gutter: { x: 2, y: 2 }
       gutter: { x: 2, y: 2 }
     }) {
     }) {
       ForEach(this.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
       ForEach(this.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
         if (this.fullColumnImgUrls.length === 1) {
         if (this.fullColumnImgUrls.length === 1) {
-          GridCol({
-            span: { xs: 8 }
-          }) {
-            Image(item.fullUrl)
-              .width('100%')
-              .borderRadius(this.caclImageRadius(index))
+          if (this.getPicType() !== 3) {
+            GridCol({
+              span: this.getPicType() === 1 ? 12 : 8
+            }){
+              Stack({
+                alignContent: Alignment.BottomEnd
+              }) {
+                if (this.getPicType() === 1) {
+                  Image(item.fullUrl)
+                    .width('100%')
+                    .height(172)
+                    .autoResize(true)
+                    .borderRadius(this.caclImageRadius(index))
+                } else if (this.getPicType() === 2) {
+                  Image(item.fullUrl)
+                    .width('100%')
+                    .height(305)
+                    .autoResize(true)
+                    .borderRadius(this.caclImageRadius(index))
+                }
+                Flex({ direction: FlexDirection.Row }) {
+                  Image($r('app.media.icon_long_pic'))
+                    .width(14)
+                    .height(14)
+                    .margin({right: 4})
+                  Text('长图')
+                    .fontSize(12)
+                    .fontWeight(400)
+                    .fontColor(0xffffff)
+                    .fontFamily('PingFang SC')
+                }
+                .width(48)
+                .padding({bottom: 9})
+
+              }
+            }
+          } else {
+            GridCol({
+              span: { xs: 8 }
+            }) {
+              Image(item.fullUrl)
+                .width('100%')
+                .borderRadius(this.caclImageRadius(index))
+                .autoResize(true)
+                .opacity(!this.picWidth && !this.picHeight ? 0 : 1)
+                .onComplete(callback => {
+                  this.picWidth = callback?.width || 0;
+                  this.picHeight = callback?.height || 0;
+                })
+            }
           }
           }
         } else if (this.fullColumnImgUrls.length === 4) {
         } else if (this.fullColumnImgUrls.length === 4) {
           GridCol({
           GridCol({

+import { ContentDTO } from 'wdBean';
+import { CommonConstants, CompStyle } from 'wdConstant';
+import { ProcessUtils } from '../../utils/ProcessUtils';
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+
+const TAG: string = 'Card6Component-Card13Component';
+
+/**
+ * 卡片样式："appStyle":"21" 小视频卡人民号
+ */
+@Component
+export struct Card21Component {
+  @State contentDTO: ContentDTO = {} as ContentDTO;
+
+  build() {
+    Column() {
+      // 顶部 rmh信息
+      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
+      // 中间内容
+      Grid() {
+        GridItem() {
+          Text(`${this.contentDTO.newsTitle}`)
+            .fontSize($r('app.float.selected_text_size'))
+            .fontColor($r('app.color.color_222222'))
+            .width(CommonConstants.FULL_WIDTH)
+            .maxLines(4)
+            .textOverflow({ overflow: TextOverflow.Ellipsis })
+            .padding({ right: 12 })
+            .lineHeight(26)
+        }
+
+        GridItem() {
+          Stack() {
+            Image(this.contentDTO.coverUrl)
+              .width(CommonConstants.FULL_WIDTH)
+              .borderRadius($r('app.float.image_border_radius'))
+            CardMediaInfo({ contentDTO: this.contentDTO })
+          }
+          .alignContent(Alignment.BottomEnd)
+        }
+      }
+      .columnsTemplate('2fr 1fr')
+      .maxCount(1)
+
+      //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
+    }
+    .onClick((event: ClickEvent) => {
+      ProcessUtils.processPage(this.contentDTO)
+    })
+    .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')
+    })
+    .width(CommonConstants.FULL_WIDTH)
+  }
+}

 //全标题 "appStyle":"2",
 //全标题 "appStyle":"2",
 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 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'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
 
 
 /**
 /**
@@ -60,21 +59,8 @@ export struct Card2Component {
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
 
 
       //bottom
       //bottom
-      Row() {
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        //间隔点
-        Image($r('app.media.point'))
-          .width(12)
-          .height(12)
-
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .bottomTextStyle()
-      }
-      .width(CommonConstants.FULL_WIDTH)
-      .height(18)
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
-import { DateTimeUtils } from 'wdKit/src/main/ets/utils/DateTimeUtils'
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 
 
 /**
 /**
  * 卡片样式："appStyle":"3"
  * 卡片样式："appStyle":"3"
@@ -27,30 +27,8 @@ export struct Card3Component {
         .fontSize($r("app.float.font_size_16"))
         .fontSize($r("app.float.font_size_16"))
         .fontColor($r("app.color.color_222222"))
         .fontColor($r("app.color.color_222222"))
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
-      Row() {
-        // 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"))
-          .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)
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({

 import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
 import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-import { DateTimeUtils } from 'wdKit/Index';
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG: string = 'Card4Component';
 const TAG: string = 'Card4Component';
 
 
 /**
 /**
@@ -110,25 +109,8 @@ export struct Card4Component {
       .onClick((event: ClickEvent) => {
       .onClick((event: ClickEvent) => {
         ProcessUtils.processPage(this.contentDTO)
         ProcessUtils.processPage(this.contentDTO)
       })
       })
-
-
-      //bottom
-      Row() {
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        //间隔点
-        Image($r('app.media.point'))
-          .width(12)
-          .height(12)
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-          .bottomTextStyle()
-        // TODO 评论字段取值
-        // Text('518条评论')
-        //   .bottomTextStyle()
-      }
-      .width('100%')
-      .justifyContent(FlexAlign.Start)
-      .margin({ top: 8 })
+      //bottom 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { CommonConstants, CompStyle } from 'wdConstant';
-import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 const TAG: string = 'Card6Component-Card13Component';
 const TAG: string = 'Card6Component-Card13Component';
-const FULL_PARENT: string = '100%';
 
 
 /**
 /**
- * 卡片样式："appStyle":"6"以及13
+ * 卡片样式："appStyle":"6"以及13--- 小视频卡
  */
  */
 @Component
 @Component
 export struct Card6Component {
 export struct Card6Component {
@@ -17,7 +16,17 @@ export struct Card6Component {
     Row() {
     Row() {
       Column() {
       Column() {
         Column() {
         Column() {
-          Text(this.contentDTO.newsTitle)
+          // TODO 这个tag涉及样式问题。待优化。
+          // if (this.contentDTO.newTags) {
+          //   Text(this.contentDTO.newTags)
+          //     .backgroundColor($r('app.color.color_ED2800'))
+          //     .borderRadius($r('app.float.button_border_radius'))
+          //     .fontColor($r('app.color.color_fff'))
+          //     .fontSize($r('app.float.font_size_12'))
+          //     .padding(2)
+          //     .margin({ right: 2 })
+          // }
+          Text(`${this.contentDTO.newsTitle}`)
             .fontSize(16)
             .fontSize(16)
             .fontWeight(FontWeight.Normal)
             .fontWeight(FontWeight.Normal)
             .maxLines(3)//
             .maxLines(3)//
@@ -26,93 +35,35 @@ export struct Card6Component {
         }.height("80%")
         }.height("80%")
         .justifyContent(FlexAlign.Start)
         .justifyContent(FlexAlign.Start)
 
 
-        Row() {
-          if (this.contentDTO.source) {
-            Text(this.contentDTO.source)
-              .fontSize($r('app.float.font_size_12'))
-              .fontColor(Color.Gray)
-              .maxLines(1)
-              .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-              .width(this.contentDTO.source.length > 8 ? '50%' : '')
-            Image($r('app.media.point'))
-              .width(16)
-              .height(16)
-          }
-          if (this.contentDTO.publishTime && this.contentDTO.publishTime.length === 13) {
-            Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
-              .fontSize($r('app.float.font_size_12'))
-              .fontColor(Color.Gray)
-          }
-          Text(this.contentDTO.visitorComment + '评')
-            .fontSize($r('app.float.font_size_12'))
-            .fontColor(Color.Gray)
-            .padding({
-              left: 5
-            })
-        }.alignSelf(ItemAlign.Start)
-        .height("20%")
-        .justifyContent(FlexAlign.Start)
+
+        //bottom 评论等信息
+        CardSourceInfo({ contentDTO: this.contentDTO })
       }
       }
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)
       .width('58%')
       .width('58%')
-
-      Blank(16)
       if (this.contentDTO.coverUrl) {
       if (this.contentDTO.coverUrl) {
         Stack() {
         Stack() {
           Image(this.contentDTO.coverUrl)
           Image(this.contentDTO.coverUrl)
             .borderRadius(5)
             .borderRadius(5)
             .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
             .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
             .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 90 : 180)
             .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 90 : 180)
-          if (this.contentDTO.videoInfo) {
-            Row() {
-              Image($r('app.media.iv_card_play_yellow_flag'))
-                .width(22)
-                .height(18)
-              Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
-                .fontSize($r('app.float.font_size_13'))
-                .fontWeight(400)
-                .fontColor($r('app.color.color_fff'))
-            }
-            .alignItems(VerticalAlign.Bottom)
-            .height(18)
-            .padding({ right: 4 })
-            .margin({
-              right: 4,
-              bottom: 4
-            })
-            .backgroundColor($r('app.color.color_4d000000'))
-          } else if (this.contentDTO.voiceInfo) {
-            Row() {
-              Image($r('app.media.icon_listen'))
-                .width(22)
-                .height(18)
-              Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo
-                .voiceDuration * 1000))
-                .fontSize($r('app.float.font_size_13'))
-                .fontWeight(400)
-                .fontColor($r('app.color.color_fff'))
-            }
-            .alignItems(VerticalAlign.Bottom)
-            .height(18)
-            .padding({ right: 4 })
-            .margin({
-              right: 4,
-              bottom: 4
-            })
-            .backgroundColor($r('app.color.color_4d000000'))
-          }
-        }.alignContent(Alignment.BottomEnd)
+          CardMediaInfo({ contentDTO: this.contentDTO })
+        }
+        .alignContent(Alignment.BottomEnd)
       }
       }
     }
     }
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
     })
     })
-    .padding(
-      { top: 16, bottom: 16, left: 14, right: 14 })
-    .width(FULL_PARENT)
+    .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')
+    })
+    .width(CommonConstants.FULL_WIDTH)
     .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 127 : 217)
     .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 127 : 217)
     .justifyContent(FlexAlign.SpaceBetween)
     .justifyContent(FlexAlign.SpaceBetween)
-
   }
   }
 }
 }

@@ -104,7 +104,7 @@ export struct Card9Component {
         Column() {
         Column() {
           Row() {
           Row() {
             // 标题
             // 标题
-            Image($r("app.media.point_icon"))
+            Image($r("app.media.timeline_rect"))
               .width(9)
               .width(9)
               .height(9)
               .height(9)
               .margin({ right: 5 })
               .margin({ right: 5 })

@@ -157,11 +157,11 @@ struct CreatorItem {
           .width(44)
           .width(44)
           .height(44)
           .height(44)
         if (this.isSelected) {
         if (this.isSelected) {
-          Image($r('app.media.MyCollection_selected_icon'))
+          Image($r('app.media.rmh_selected'))
             .width(16)
             .width(16)
             .height(16)
             .height(16)
         } else {
         } else {
-          Image($r('app.media.ic_succeed_refresh'))
+          Image($r('app.media.rmh_unselected'))
             .width(16)
             .width(16)
             .height(16)
             .height(16)
         }
         }

+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[] = []
+
+}
+
+@Observed
+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 = new 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 { DateTimeUtils, 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(DateTimeUtils.getCommentTime(Number.parseFloat(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 { DateTimeUtils, LazyDataSource, WindowModel } from 'wdKit/Index'
+import { commentItemModel, commentListModel } from '../model/CommentModel'
+import commentViewModel from '../viewmodel/CommentViewModel'
+import { window } from '@kit.ArkUI'
+
+const TAG = 'QualityCommentsComponent';
+
+@Entry
+@Preview
+@Component
+export struct QualityCommentsComponent {
+  bottomSafeHeight: string = AppStorage.get<number>('bottomSafeHeight') + 'px';
+  @State private browSingModel: commentListModel = new commentListModel()
+  isloading: boolean = false
+  lastWindowColor:string = '#ffffff'
+  currentWindowColor:string = '#FF4202'
+  @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
+
+  aboutToDisappear(): void {
+
+    const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
+    const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
+    windowClass.setWindowBackgroundColor(this.lastWindowColor)
+    windowClass.setWindowLayoutFullScreen(false)
+    // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
+
+  }
+
+  aboutToAppear(): void {
+
+    this.fullScreen();
+
+
+    commentViewModel.fetchQualityCommentListLocal(getContext()).then(commentListModel => {
+      this.allDatas.push(...commentListModel.list)
+    })
+
+    // 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;
+    //   }
+    // })
+  }
+
+  fullScreen() {
+    const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
+    const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
+    // windowClass.setWindowBackgroundColor(this.currentWindowColor)
+    windowClass.setWindowLayoutFullScreen(true)
+    // windowClass.setWindowSystemBarProperties({ statusBarColor: '#fff' })
+
+    // windowClass.setWindowLayoutFullScreen(true).then(() => {
+    //   console.log(TAG + 'setWindowLayoutFullScreen');
+    // })
+
+  }
+
+  @Builder
+  titleHeader() {
+    Row() {
+      Image($r('app.media.comment_img_banner')).width('100%').aspectRatio(375 / 283);
+    }
+  }
+
+  build() {
+    Column() {
+      // this.titleHeader()
+      List({ space: 28 }) {
+        ListItemGroup({ header: this.titleHeader() })
+
+        LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
+          ListItem() {
+            QualityCommentItem({ item: item }).margin({ left: 12, right: 12 })
+          }
+          // .offset({
+          //   y:-87
+          // })
+        })
+      }
+      // .contentStartOffset(- 87)
+      .edgeEffect(EdgeEffect.Spring)
+      .margin({bottom:this.bottomSafeHeight})
+      // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
+    }.backgroundColor(this.currentWindowColor).height('100%').width('100%')
+  }
+}
+
+
+@Component
+struct QualityCommentItem {
+  @ObjectLink item: commentItemModel
+
+  build() {
+    Column() {
+      /*头像以及昵称*/
+      RelativeContainer() {
+        Image(this.item.fromUserHeader)
+          .width(50)
+          .height(50)
+          .borderRadius(25)
+          .borderWidth(2)
+          .borderColor(Color.White)
+          .id('image1')
+          .alignRules({
+            top: { anchor: "__container__", align: VerticalAlign.Top },
+            left: { anchor: "__container__", align: HorizontalAlign.Start }
+          })
+          .offset(
+            {
+              y: -16
+            }
+          )
+        Text(this.item.fromUserName)
+          .fontSize(14)
+          .fontColor('#222222')
+          .fontWeight(FontWeight.Medium)
+          .id('text1')
+          .alignRules({
+            bottom: { anchor: "image1", align: VerticalAlign.Bottom },
+            left: { anchor: "image1", align: HorizontalAlign.End }
+          })
+          .offset(
+            {
+              x: 6,
+              y: -6 - 16
+            }
+          )
+      }.height(42)
+
+      Column() {
+        /*评论内容*/
+        Text() {
+          ImageSpan($r('app.media.WDBestCommentTitleDotIcon'))
+            .width(12)
+            .height(12)
+            .objectFit(ImageFit.Fill)
+            .offset({
+              y: -6
+            })
+          Span('  ' + this.item.commentContent)
+            .fontSize(16)
+            .fontColor('#222222')
+            .fontWeight(FontWeight.Medium)
+        }.margin({ top: 10 })
+
+        /*分割线*/
+        Row() {
+
+        }.width('100%').margin({ top: 10, left: 0, right: 0 }).backgroundColor('#EDEDED').height(2.5);
+
+        /*文章或者评论*/
+        Row() {
+          Row() {
+            Image($r('app.media.comment_img_link')).width(16).height(16)
+            Text(this.item.shareInfo.shareTitle)
+              .fontSize(14)
+              .fontColor('#666666')
+              .margin({ left: 6, right: 12 })
+              .maxLines(1)
+              .textOverflow({ overflow: TextOverflow.Ellipsis })
+          }.height(40).layoutWeight(1)
+
+          Image($r('app.media.more')).width(12).height(12)
+
+        }.width('100%').height(40).justifyContent(FlexAlign.SpaceBetween)
+
+      }
+      .backgroundColor('#F9F9F9')
+      .width('100%')
+      .alignItems(HorizontalAlign.Start)
+      .borderRadius(4)
+      .padding({ left: 12, right: 12 })
+
+      /*时间   点赞评论*/
+      Row() {
+
+        Text(DateTimeUtils.getCommentTime(DateTimeUtils.getDateTimestamp(this.item.createTime))).fontSize(14).fontColor('#999999')
+
+        Row({space:16}){
+          Row(){
+            Image($r('app.media.comment_icon_pinglun')).width(16).height(16)
+          }
+
+          Row(){
+            //comment_like_select
+            Image($r(this.item.likeNum?'app.media.comment_like_select':'app.media.comment_like_normal')).width(16).height(16)
+            if (this.item.likeNum){Text(this.item.likeNum).fontColor(this.item.isLike?'#ED2800':'#999999').fontSize(14).margin({left:3})}
+          }
+        }
+      }.height(38).width('100%').justifyContent(FlexAlign.SpaceBetween)
+
+    }.backgroundColor('#FFFFFF').padding({ top: 0, left: 16, right: 16 }).borderRadius(4)
+
+  }
+}

+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
+  }
+
+  /*获取本地mock数据*/
+  async fetchQualityCommentListLocal(context: Context): Promise<commentListModel> {
+    Logger.info(TAG, `getBottomNavDataMock start`);
+    let compRes: ResponseDTO<commentListModel> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<commentListModel>>(context,'qualityComment_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
+  }
+
+
+
+  //qualityComment_local.json
+  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

@@ -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%')
+    }
   }
   }
 
 
 }
 }

@@ -90,6 +90,7 @@ export struct OtherHomePageBottomCommentComponent{
       MinePageDatasModel.getOtherCommentListData(object,getContext(this)).then((value)=>{
       MinePageDatasModel.getOtherCommentListData(object,getContext(this)).then((value)=>{
         if (!this.data_comment || value.list.length == 0){
         if (!this.data_comment || value.list.length == 0){
           this.hasMore = false
           this.hasMore = false
+          this.isLoading = false
         }else{
         }else{
           this.getCommentListStatus(value)
           this.getCommentListStatus(value)
         }
         }

@@ -60,6 +60,7 @@ export struct BottomNavigationComponent {
               MinePageComponent()
               MinePageComponent()
             } else {
             } else {
               TopNavigationComponent({
               TopNavigationComponent({
+                groupId: navItem.id,
                 topNavList: navItem.topNavChannelList,
                 topNavList: navItem.topNavChannelList,
                 _currentNavIndex: this.currentNavIndex,
                 _currentNavIndex: this.currentNavIndex,
                 changeBarBackgroundColor: (color: Color) => {
                 changeBarBackgroundColor: (color: Color) => {

@@ -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)
@@ -84,9 +84,13 @@ struct EditUserInfoPage {
         Blank()
         Blank()
 
 
         Text(r.subTitle)
         Text(r.subTitle)
+          .textOverflow({overflow:TextOverflow.Ellipsis})
+          .maxLines(1)
           .fontSize(16)
           .fontSize(16)
           .fontColor(Color.Gray)
           .fontColor(Color.Gray)
           .padding({right:10})
           .padding({right:10})
+          .width('70%')
+          .textAlign(TextAlign.End)
 
 
         Image($r('app.media.mine_user_edit'))
         Image($r('app.media.mine_user_edit'))
           .width('12')
           .width('12')
@@ -130,10 +134,11 @@ struct EditUserInfoPage {
         })
         })
       }else if(i === 5){
       }else if(i === 5){
         TextPickerDialog.show({
         TextPickerDialog.show({
-          range:['女','男'],
+          range:['男','女'],
+          canLoop:false,
           selected:0,
           selected:0,
           onAccept:(value:TextPickerResult) => {
           onAccept:(value:TextPickerResult) => {
-            this.currentUserInfo.userExtend.sex = value.index as number;
+            this.currentUserInfo.userExtend.sex = value.index == 0?1:0;
             this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_sex
             this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_sex
             this.updateEditModel()
             this.updateEditModel()
           }
           }

@@ -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,9 @@ 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 { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
-import { CompDTO, LiveReviewDTO, PageDTO } from 'wdBean';
+import { GroupInfoDTO } from 'wdBean/src/main/ets/bean/navigation/PageInfoDTO';
+import { CompDTO, LiveReviewDTO, PageDTO, PageInfoBean } from 'wdBean';
+
 
 
 const TAG = 'PageComponent';
 const TAG = 'PageComponent';
 
 
@@ -38,7 +39,6 @@ export struct PageComponent {
     totalCount: 0,
     totalCount: 0,
     list: []
     list: []
   };
   };
-  name: string = "";
   @Link @Watch('onChange') currentTopNavSelectedIndex: number
   @Link @Watch('onChange') currentTopNavSelectedIndex: number
 
 
   build() {
   build() {
@@ -69,6 +69,7 @@ export struct PageComponent {
   @Builder
   @Builder
   ListLayout() {
   ListLayout() {
     List() {
     List() {
+
       // 下拉刷新
       // 下拉刷新
       ListItem() {
       ListItem() {
         RefreshLayout({
         RefreshLayout({
@@ -80,12 +81,7 @@ export struct PageComponent {
       LazyForEach(this.pageModel.compList, (compDTO: CompDTO, compIndex: number) => {
       LazyForEach(this.pageModel.compList, (compDTO: CompDTO, compIndex: number) => {
         ListItem() {
         ListItem() {
           Column() {
           Column() {
-            if (this.name == '视频') {
-              VideoChannelDetail()
-            } else {
-              CompParser({ compDTO: compDTO, compIndex: compIndex });
-            }
-
+            CompParser({ compDTO: compDTO, compIndex: compIndex });
           }
           }
         }
         }
       },
       },
@@ -103,6 +99,7 @@ export struct PageComponent {
           NoMoreLayout()
           NoMoreLayout()
         }
         }
       }
       }
+
     }
     }
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
     .cachedCount(8)
     .cachedCount(8)
@@ -135,7 +132,8 @@ export struct PageComponent {
 
 
   onChange() {
   onChange() {
     Logger.info(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , ${this.isFirstIn} , navIndex: ${this.currentTopNavSelectedIndex}`);
     Logger.info(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , ${this.isFirstIn} , navIndex: ${this.currentTopNavSelectedIndex}`);
-    if (this.navIndex === this.currentTopNavSelectedIndex && !this.isFirstIn) {
+    // if (this.navIndex === this.currentTopNavSelectedIndex && !this.isFirstIn) {
+    if (this.navIndex === this.currentTopNavSelectedIndex) {
       this.getData();
       this.getData();
     }
     }
   }
   }
@@ -155,10 +153,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 +269,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() {

@@ -6,6 +6,7 @@ import { ChannelSubscriptionLayout } from './ChannelSubscriptionLayout';
 import { FirstTabTopSearchComponent } from '../search/FirstTabTopSearchComponent';
 import { FirstTabTopSearchComponent } from '../search/FirstTabTopSearchComponent';
 import window from '@ohos.window';
 import window from '@ohos.window';
 import { WindowModel } from 'wdKit';
 import { WindowModel } from 'wdKit';
+import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
 
 
 const TAG = 'TopNavigationComponent';
 const TAG = 'TopNavigationComponent';
 
 
@@ -20,6 +21,7 @@ const storage = LocalStorage.getShared();
 @Entry(storage)
 @Entry(storage)
 @Component
 @Component
 export struct TopNavigationComponent {
 export struct TopNavigationComponent {
+  private groupId: number = 0
   private tabsController: TabsController = new TabsController()
   private tabsController: TabsController = new TabsController()
   private changeBarBackgroundColor: (color: Color) => void = () => {
   private changeBarBackgroundColor: (color: Color) => void = () => {
   }
   }
@@ -236,15 +238,23 @@ export struct TopNavigationComponent {
         Tabs({ index: this.currentTopNavSelectedIndex, controller: this.tabsController }) {
         Tabs({ index: this.currentTopNavSelectedIndex, controller: this.tabsController }) {
           ForEach(this._currentNavIndex === 0 ? this.myChannelList : this.topNavList, (navItem: TopNavDTO, index: number) => {
           ForEach(this._currentNavIndex === 0 ? this.myChannelList : this.topNavList, (navItem: TopNavDTO, index: number) => {
             TabContent() {
             TabContent() {
-              if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
-                PageComponent({
-                  currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
-                  navIndex: index,
+              if (this._currentNavIndex === 2 && navItem.name === '视频') {
+                VideoChannelDetail({
+                  bottomNavIndex: this._currentNavIndex,
+                  topNavIndex: this.currentTopNavSelectedIndex,
+                  groupId: this.groupId + '',
                   pageId: navItem.pageId + '',
                   pageId: navItem.pageId + '',
                   channelId: navItem.channelId + '',
                   channelId: navItem.channelId + '',
-                  name: navItem.name
                 })
                 })
-              }
+              } else
+                if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
+                  PageComponent({
+                    currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
+                    navIndex: index,
+                    pageId: navItem.pageId + '',
+                    channelId: navItem.channelId + '',
+                  })
+                }
             }
             }
             .tabBar(this.tabBarBuilder(navItem, index))
             .tabBar(this.tabBarBuilder(navItem, index))
 
 

@@ -128,7 +128,7 @@ export struct SearchComponent {
    * @param content
    * @param content
    */
    */
   getSearchHistoryResData(content:string,index:number){
   getSearchHistoryResData(content:string,index:number){
-    //删除单挑记录
+    //删除单条记录
     SearcherAboutDataModel.delSearchSingleHistoryData(index)
     SearcherAboutDataModel.delSearchSingleHistoryData(index)
     this.isClickedHistory = true
     this.isClickedHistory = true
     this.searchResData(content)
     this.searchResData(content)
@@ -149,33 +149,6 @@ export struct SearchComponent {
     this.getSearchResultCountData()
     this.getSearchResultCountData()
   }
   }
 
 
-  getSearchResultCountData() {
-    SearcherAboutDataModel.getSearchResultCountData(encodeURI(this.searchText),getContext(this)).then((value) => {
-      if (value != null) {
-        this.count = []
-        if(value.allTotal!=0){
-          this.count.push("全部")
-        }
-        if(value.cmsTotal!=0){
-          this.count.push("精选")
-        }
-        if(value.rmhTotal!=0){
-          this.count.push("人民号")
-        }
-        if(value.videoTotal!=0){
-          this.count.push("视频")
-        }
-        if(value.activityTotal!=0){
-          this.count.push("活动")
-        }
-      }
-    }).catch((err: Error) => {
-      console.log(TAG, JSON.stringify(err))
-    })
-  }
-
-
-
   /**
   /**
    * 点击联想搜索列表回调
    * 点击联想搜索列表回调
    * @param content
    * @param content
@@ -291,4 +264,30 @@ export struct SearchComponent {
     .padding({ left: '31lpx' })
     .padding({ left: '31lpx' })
     .alignItems(VerticalAlign.Center)
     .alignItems(VerticalAlign.Center)
   }
   }
+
+
+  getSearchResultCountData() {
+    SearcherAboutDataModel.getSearchResultCountData(encodeURI(this.searchText),getContext(this)).then((value) => {
+      if (value != null) {
+        this.count = []
+        if(value.allTotal!=0){
+          this.count.push("全部")
+        }
+        if(value.cmsTotal!=0){
+          this.count.push("精选")
+        }
+        if(value.rmhTotal!=0){
+          this.count.push("人民号")
+        }
+        if(value.videoTotal!=0){
+          this.count.push("视频")
+        }
+        if(value.activityTotal!=0){
+          this.count.push("活动")
+        }
+      }
+    }).catch((err: Error) => {
+      console.log(TAG, JSON.stringify(err))
+    })
+  }
 }
 }

+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({keywords:this.searchText,searchType:item})
           }.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"})
   }
   }
+
 }
 }

+import { ContentDTO,
+  contentListParams,
+  FullColumnImgUrlDTO, InteractDataDTO, RmhInfoDTO, VideoInfoDTO } from 'wdBean/Index'
+import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
+import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
+import { LazyDataSource, StringUtils } from 'wdKit/Index'
+import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
+import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
+import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
+import { CardParser } from '../CardParser'
+import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
+
+const TAG = "SearchResultContentComponent"
+
+@Component
+export struct SearchResultContentComponent{
+  @State keywords:string = ""
+  @State searchType:string = ""
+  @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
+  @State data_rmh: SearchRmhDescription[] = []
+  @State count:number = 0;
+  @State isLoading:boolean = false
+  @State hasMore:boolean = true
+  curPageNum:number = 1;
+
+
+  aboutToAppear(): void {
+    if(this.searchType == "全部"){
+      this.searchType = "all"
+    }else if(this.searchType == "精选"){
+      this.searchType = "cms"
+    }else if(this.searchType == "人民号"){
+      this.searchType = "rmh"
+    }else if(this.searchType == "视频"){
+      this.searchType = "video"
+    }else if(this.searchType == "活动"){
+      this.searchType = "activity"
+    }
+
+    this.keywords = encodeURI(this.keywords)
+    this.getNewSearchResultData()
+  }
+
+  getNewSearchResultData(){
+    this.isLoading = true
+    if(this.hasMore){
+      SearcherAboutDataModel.getSearchResultListData("20",`${this.curPageNum}`,this.searchType,this.keywords,getContext(this)).then((value)=>{
+        if (!this.data || value.list.length == 0){
+          this.hasMore = false
+          this.isLoading = false
+        }else{
+          if(value.list[0].dataList!=null){
+            this.data_rmh = value.list[0].dataList
+            //TODO 查询创作者详情接口
+
+          }
+          this.getInteractData(value)
+        }
+      }).catch((err:Error)=>{
+        console.log(TAG,JSON.stringify(err))
+        this.isLoading = false
+      })
+    }
+  }
+
+  getInteractData(resultData:SearchResultContentData){
+    if(resultData.list[0].dataList!=null){
+      resultData.list.splice(0,1)
+    }
+
+    let data : contentListParams = {
+      contentList: []
+    }
+    resultData.list.forEach((item)=>{
+      data.contentList.push({
+        contentId: item.data.id + '',
+        contentType: Number.parseInt(item.data.type)
+      })
+    })
+
+    SearcherAboutDataModel.getInteractListData(data,getContext(this)).then((newValue)=>{
+      newValue.forEach((item)=>{
+        resultData.list.forEach((data)=>{
+          if (item.contentId == data.data.id) {
+            data.data.collectNum = item.collectNum+""
+            data.data.commentNum = item.commentNum+""
+            data.data.likeNum = item.likeNum+""
+            data.data.readNum = item.readNum+""
+            data.data.shareNum = item.shareNum+""
+          }
+        })
+      })
+
+      resultData.list.forEach((value)=>{
+        let photos:FullColumnImgUrlDTO[] = []
+        if(value.data.appStyle === 4){
+          value.data.appStyleImages.split("&&").forEach((value)=>{
+            photos.push({url:value} as FullColumnImgUrlDTO)
+          })
+        }
+
+        //TODO 48 个赋值
+        let contentDTO:ContentDTO = {
+          appStyle: value.data.appStyle + "",
+          cityCode: value.data.cityCode,
+          coverSize: "",
+          coverType: -1,
+          coverUrl: value.data.appStyleImages.split("&&")[0],
+          description: value.data.description,
+          districtCode: value.data.districtCode,
+          endTime: value.data.endTime,
+          hImageUrl: "",
+          heatValue: "",
+          innerUrl: "",
+          landscape: Number.parseInt(value.data.landscape),
+          // lengthTime:null,
+          linkUrl: value.data.linkUrl,
+          openLikes: Number.parseInt(value.data.openLikes),
+          openUrl: "",
+          pageId: value.data.pageId,
+          programAuth: "",
+          programId: "",
+          programName: "",
+          programSource: -1,
+          programType: -1,
+          provinceCode: value.data.provinceCode,
+          showTitleEd: value.data.showTitleEd,
+          showTitleIng: value.data.showTitleIng,
+          showTitleNo: value.data.showTitleNo,
+          startTime: value.data.startTime,
+          subType: "",
+          subtitle: "",
+          title: value.data.title,
+          vImageUrl: "",
+          screenType: "",
+          source: StringUtils.isEmpty(value.data.creatorName) ? value.data.sourceName : value.data.creatorName,
+          objectId: "",
+          objectType: value.data.type,
+          channelId: value.data.channelId,
+          relId: value.data.relId,
+          relType: value.data.relType,
+          newsTitle: value.data.titleLiteral,
+          publishTime: value.data.publishTime,
+          visitorComment: -1,
+          fullColumnImgUrls: photos,
+          newsSummary: "",
+          hasMore: -1,
+          slideShows: [],
+          voiceInfo: {} as VoiceInfoDTO,
+          tagWord: -1,
+          isSelect: true,
+          rmhInfo: {} as RmhInfoDTO,
+          photoNum: -1,
+          liveInfo: {} as LiveInfoDTO,
+          videoInfo: {
+            videoDuration: Number.parseInt(value.data.duration)
+          } as VideoInfoDTO,
+          interactData: {} as InteractDataDTO,
+          corner: '',
+          rmhPlatform: 0,
+          newTags: '',
+          isSearch: true
+        }
+
+        this.data.push(contentDTO)
+      })
+      this.data.notifyDataReload()
+      this.count = this.data.totalCount()
+      if (this.data.totalCount() < resultData.totalCount) {
+        this.curPageNum++
+      }else {
+        this.hasMore = false
+      }
+      this.isLoading = false
+    }).catch((err:Error)=>{
+      console.log(TAG,"请求失败")
+      this.isLoading = false
+    })
+  }
+
+  build() {
+    Column() {
+      if(this.count == 0){
+        ListHasNoMoreDataUI({style:2})
+      }else{
+        Column(){
+          if (this.data_rmh!=null && this.data_rmh.length > 0) {
+            //List
+            List() {
+              ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
+                ListItem() {
+                  Column(){
+                    Image($r('app.media.default_head'))
+                      .width('84lpx')
+                      .height('84lpx')
+                      .margin({bottom:'15lpx'})
+                    Text(item.creatorName)
+                      .fontSize('20lpx')
+                  }.alignItems(HorizontalAlign.Center)
+
+                }.onClick(()=>{
+                  //TODO 跳转
+                })
+                .width('150lpx')
+              })
+            }
+            .cachedCount(6)
+            .edgeEffect(EdgeEffect.None)
+            .scrollBar(BarState.Off)
+            .listDirection(Axis.Horizontal)
+            .width('100%')
+            .height('150lpx')
+            .onReachEnd(()=>{
+              if(!this.isLoading){
+                //进入更多关注页
+              }
+            })
+          }
+          //List
+          List({ space: '6lpx' }) {
+            LazyForEach(this.data, (item: ContentDTO, index: number) => {
+              ListItem() {
+                Column(){
+                  CardParser({contentDTO:item})
+                  if(index != this.data.totalCount()-1 ){
+                    Divider()
+                      .width('100%')
+                      .height('1lpx')
+                      .color($r('app.color.color_F5F5F5'))
+                      .strokeWidth('1lpx')
+                  }
+                }
+              }
+              .onClick(()=>{
+                //TODO 跳转
+              })
+            }, (item: ContentDTO, index: number) => index.toString())
+
+            //没有更多数据  显示提示
+            if(!this.hasMore){
+              ListItem(){
+                ListHasNoMoreDataUI()
+              }
+            }
+          }.cachedCount(6)
+          .edgeEffect(EdgeEffect.None)
+          .scrollBar(BarState.Off)
+          .margin({top:'23lpx',left:'23lpx',right:'23lpx'})
+          .layoutWeight(1)
+          .onReachEnd(()=>{
+            console.log(TAG,"触底了");
+            if(!this.isLoading){
+              //加载分页数据
+              this.getNewSearchResultData()
+            }
+          })
+        }
+      }
+    }
+    .backgroundColor($r('app.color.white'))
+    .height('100%')
+    .width('100%')
+  }
+}