feat:解决冲突

@@ -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 视频开关

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

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

 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'

@@ -25,11 +25,11 @@ export class CollectionUtils {
    * @returns  {boolean} true(empty)
    * @returns  {boolean} true(empty)
    */
    */
   static isEmpty(collection?: any[]): boolean {
   static isEmpty(collection?: any[]): boolean {
-    return !collection || collection.length === 0;
+    return!collection || collection.length === 0;
   }
   }
 
 
   static isEmptyList<T>(list1?: LinkList<T>): boolean {
   static isEmptyList<T>(list1?: LinkList<T>): boolean {
-    return !list1 || list1.length === 0;
+    return!list1 || list1.length === 0;
   }
   }
 
 
   static isEmptyHashMap(obj?: HashMap<any, any>): boolean {
   static isEmptyHashMap(obj?: HashMap<any, any>): boolean {
@@ -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;
   }
   }
@@ -179,5 +186,6 @@ export class CollectionUtils {
     ss;
     ss;
     return collection.slice(start, end);
     return collection.slice(start, end);
   }
   }
+
 }
 }
 
 

 import { StringUtils } from './StringUtils';
 import { StringUtils } from './StringUtils';
-import getLunar from './GetLunar'
+import getLunar from './GetLunar';
+
 /**
 /**
  * 日期/时间工具
  * 日期/时间工具
  */
  */
@@ -480,6 +481,34 @@ export class DateTimeUtils {
       return 0
       return 0
     }
     }
   }
   }
+  /**
+   * 进度值换算
+   * @param seconds
+   * @returns
+   */
+  static secondToTime(seconds: number) {
+    let time = '00:00'
+    let hourUnit = 60 * 60;
+    let hour = Math.floor(seconds / hourUnit);
+    let minute = Math.floor((seconds - hour * hourUnit) / 60);
+    let second = seconds - hour * hourUnit - minute * 60;
+    if (hour > 0) {
+      return `${DateTimeUtils.padding(hour.toString())}${':'}${DateTimeUtils.padding(minute.toString())}${':'}${DateTimeUtils.padding(second.toString())}`;
+    }
+    if (minute > 0) {
+      return `${DateTimeUtils.padding(minute.toString())}${':'}${DateTimeUtils.padding(second.toString())}`;
+    } else {
+      return `${'00'}${':'}${DateTimeUtils.padding(second.toString())}`;
+    }
+  }
+
+  static padding(num: string) {
+    let length = 2;
+    for (let len = (num.toString()).length; len < length; len = num.length) {
+      num = `${'0'}${num}`;
+    }
+    return num;
+  }
 }
 }
 
 
 // const dateTimeUtils = new DateTimeUtils()
 // const dateTimeUtils = new DateTimeUtils()

+/**
+ * 线程间通信事件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
+}

@@ -7,7 +7,17 @@ export namespace ErrorToastUtils {
     NET_CORE_PAGE_ERROR_NETWORK, //网络出小差了，请检查网络后重试
     NET_CORE_PAGE_ERROR_NETWORK, //网络出小差了，请检查网络后重试
     NET_CORE_LOAD_ERROR_NETWORK, //加载失败，请重试
     NET_CORE_LOAD_ERROR_NETWORK, //加载失败，请重试
     NET_CORE_ENTER_ERROR_NETWORK, //很抱歉，当前内容无法加载，请点击重试
     NET_CORE_ENTER_ERROR_NETWORK, //很抱歉，当前内容无法加载，请点击重试
-    LIVE_CORE_NO_NETWORK, //网络出小差了，请检查下网络
+
+    //直播异常
+    LIVE_CORE_NO_NETWORK, //直播 无网络 网络出小差了，请检查下网络
+    LIVE_CORE_WEAK_NETWORK, //直播 弱网 网络出小差了，请检查下网络
+    LIVE_CORE_IO_NETWORK, //直播 直播流异常 直播加载异常
+    LIVE_CORE_SERVICE_NETWORK, //直播 服务端接口异常 直播加载异常
+    LIVE_CORE_SWITCH_FLOW_NETWORK, //直播 网络切换到流量 正在使用流量，请注意流量使用
+
+    //审核后异常报错
+    AUDITING_CORE_CONTENT_DISTRIBUTE, //审核 内容分发下线规则 内容已下线
+    AUDITING_CORE_ACCOUNT_ERROR, //审核 账号有问题下线规则 内容已下线
 
 
   }
   }
 
 
@@ -32,6 +42,27 @@ export namespace ErrorToastUtils {
         case ErrorType.LIVE_CORE_NO_NETWORK:
         case ErrorType.LIVE_CORE_NO_NETWORK:
           ToastUtils.shortToast($r('app.string.live_core_no_network'))
           ToastUtils.shortToast($r('app.string.live_core_no_network'))
           break
           break
+        case ErrorType.LIVE_CORE_WEAK_NETWORK:
+          ToastUtils.shortToast($r('app.string.live_core_weak_network'))
+          break
+        case ErrorType.LIVE_CORE_IO_NETWORK:
+          ToastUtils.shortToast($r('app.string.live_core_io_network'))
+          break
+        case ErrorType.LIVE_CORE_SERVICE_NETWORK:
+          ToastUtils.shortToast($r('app.string.live_core_service_network'))
+          break
+        case ErrorType.LIVE_CORE_SWITCH_FLOW_NETWORK:
+          ToastUtils.shortToast($r('app.string.live_core_switch_flow_network'))
+          break
+        case ErrorType.LIVE_CORE_SWITCH_FLOW_NETWORK:
+          ToastUtils.shortToast($r('app.string.live_core_switch_flow_network'))
+          break
+        case ErrorType.AUDITING_CORE_CONTENT_DISTRIBUTE:
+          ToastUtils.shortToast($r('app.string.auditing_core_error'))
+          break
+        case ErrorType.AUDITING_CORE_ACCOUNT_ERROR:
+          ToastUtils.shortToast($r('app.string.auditing_core_error'))
+          break
       }
       }
 
 
     }
     }

-// 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,13 +25,21 @@ 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 {
+    return this.windowStage as window.WindowStage
+  }
+
+  getWindowClass(): window.Window {
+    return this.windowClass as window.Window
   }
   }
 
 
   setMainWindowFullScreen(fullScreen: boolean) {
   setMainWindowFullScreen(fullScreen: boolean) {
@@ -65,10 +83,10 @@ export class WindowModel {
       windowClass.setWindowKeepScreenOn(isKeepScreenOn, (err: BusinessError) => {
       windowClass.setWindowKeepScreenOn(isKeepScreenOn, (err: BusinessError) => {
         const errCode: number = err.code;
         const errCode: number = err.code;
         if (errCode) {
         if (errCode) {
-          console.error(WindowModel.TAG +'设置屏幕常亮：' + isKeepScreenOn + '，失败: ' + JSON.stringify(err));
+          console.error(WindowModel.TAG + '设置屏幕常亮：' + isKeepScreenOn + '，失败: ' + JSON.stringify(err));
           return;
           return;
         }
         }
-        console.info(WindowModel.TAG +'设置屏幕常亮：' + isKeepScreenOn + "，成功");
+        console.info(WindowModel.TAG + '设置屏幕常亮：' + isKeepScreenOn + "，成功");
       })
       })
     })
     })
   }
   }
@@ -101,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)
+    })
+
+  }
 }
 }
 
 

@@ -27,6 +27,26 @@
     {
     {
       "name": "live_core_no_network",
       "name": "live_core_no_network",
       "value": "网络出小差了，请检查下网络"
       "value": "网络出小差了，请检查下网络"
+    },
+    {
+      "name": "live_core_weak_network",
+      "value": "网络出小差了，请检查下网络"
+    },
+    {
+      "name": "live_core_io_network",
+      "value": "直播加载异常"
+    },
+    {
+      "name": "live_core_service_network",
+      "value": "直播加载异常"
+    },
+    {
+      "name": "live_core_switch_flow_network",
+      "value": "正在使用流量，请注意流量使用"
+    },
+    {
+      "name": "auditing_core_error",
+      "value": "内容已下线"
     }
     }
   ]
   ]
 }
 }

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

-import HashMap from '@ohos.util.HashMap'
-import { ConfigConstants, SpConstants } from 'wdConstant'
-import { DateTimeUtils, Logger, SPHelper, StringUtils } from 'wdKit'
+import HashMap from '@ohos.util.HashMap';
+import { SpConstants } from 'wdConstant';
+import { SPHelper, StringUtils } from 'wdKit';
 
 
 /**
 /**
  * 网络请求业务侧工具类
  * 网络请求业务侧工具类
@@ -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,43 @@ 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_CHAT_LIST_PATH: string = "/api/live-center-message/zh/a/live/message/chat/list";
+  /**
+   * 直播详情-直播数据
+   */
+  static readonly LIVE_ROOM_DATA_PATH: string = "/api/live-center-message/zh/a/live/room/number/all";
+  /**
+   * 直播详情-预约直播状态
+   */
+  static readonly LIVE_APPOINTMENT_STATUS_PATH: string = "/api/live-center-message/zh/c/live/subscribe/query";
+  /**
+   * 直播详情-预约/取消预约直播
+   */
+  static readonly LIVE_APPOINTMENT_PATH: string = "/api/live-center-message/zh/c/live/subscribe";
   /**
   /**
 
 
    * 搜索结果 显示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";
 
 
   /**
   /**
    * 早晚报列表
    * 早晚报列表
@@ -348,7 +385,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';
   }
   }
@@ -442,6 +479,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";
@@ -478,6 +519,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";
@@ -490,13 +546,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
   }
   }
 
 
@@ -601,11 +668,46 @@ export class HttpUrlUtils {
     return url
     return url
   }
   }
 
 
+  static getLiveListUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_LIST_PATH
+    return url
+  }
+
+  static getLiveChatListUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_CHAT_LIST_PATH
+    return url
+  }
+
+  static getLiveRoomDataUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_ROOM_DATA_PATH
+    return url
+  }
+
+  static getLiveAppointmentStatusUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_APPOINTMENT_STATUS_PATH
+    return url
+  }
+
+  static getLiveAppointmentUrl() {
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_APPOINTMENT_PATH
+    return url
+  }
+
   static getSearchResultCountDataUrl() {
   static getSearchResultCountDataUrl() {
     let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_RESULT_COUNT_DATA_PATH
     let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_RESULT_COUNT_DATA_PATH
     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
   })
   })

@@ -9,7 +9,7 @@ export class WDRouterPage {
     this.pagePath = pagePath
     this.pagePath = pagePath
   }
   }
 
 
-  static getBundleInfo(){
+  static getBundleInfo() {
     let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
     let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
     return `@bundle:${bundleInfo.name}/${"phone"}/${"ets/pages/MainPage"}`
     return `@bundle:${bundleInfo.name}/${"phone"}/${"ets/pages/MainPage"}`
   }
   }
@@ -32,9 +32,13 @@ 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");
+  static VideoChannelDetail = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/VideoChannelDetail");
+  static LottieViewDemo = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/LottieViewDemo");
   // 点播详情页
   // 点播详情页
   static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");
   static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");
   // 直播详情页
   // 直播详情页
@@ -43,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");
   //我的  预约
   //我的  预约
@@ -75,7 +81,6 @@ export class WDRouterPage {
   //其他普通用户 主页
   //其他普通用户 主页
   static otherNormalUserHomePagePage = new WDRouterPage("wdComponent", "ets/pages/OtherNormalUserHomePage");
   static otherNormalUserHomePagePage = new WDRouterPage("wdComponent", "ets/pages/OtherNormalUserHomePage");
   static guidePage = new WDRouterPage("wdLogin", "ets/pages/guide/GuidePages");
   static guidePage = new WDRouterPage("wdLogin", "ets/pages/guide/GuidePages");
-
   //隐私政策页面
   //隐私政策页面
   static privacyPage = new WDRouterPage("phone", "ets/pages/launchPage/PrivacyPage");
   static privacyPage = new WDRouterPage("phone", "ets/pages/launchPage/PrivacyPage");
   //启动广告页面
   //启动广告页面
@@ -85,7 +90,6 @@ export class WDRouterPage {
 
 
   static launchInterestsPage = new WDRouterPage("phone", "ets/pages/launchPage/LaunchInterestsHobbiesPage");
   static launchInterestsPage = new WDRouterPage("phone", "ets/pages/launchPage/LaunchInterestsHobbiesPage");
 
 
-
   // static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
   // static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");
 
 
   //播报页面
   //播报页面

@@ -18,7 +18,7 @@ export class WDRouterRule {
     if (page) {
     if (page) {
       if (params) {
       if (params) {
         // router.pushUrl({   url: 'pages/routerpage2', , params: params })
         // router.pushUrl({   url: 'pages/routerpage2', , params: params })
-        console.log('page.url()==',page.url())
+        console.log('page.url()==',page.url(),JSON.stringify(params))
         router.pushUrl({ url: page.url(), params: params })
         router.pushUrl({ url: page.url(), params: params })
       } else {
       } else {
         router.pushUrl({ url: page.url() }).catch((error:Error)=>{
         router.pushUrl({ url: page.url() }).catch((error:Error)=>{

@@ -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 | number = '100%'
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -34,23 +35,13 @@ export struct WdWebLocalComponent {
         .domStorageAccess(true)
         .domStorageAccess(true)
         .databaseAccess(true)
         .databaseAccess(true)
         .javaScriptAccess(true)
         .javaScriptAccess(true)
+        .imageAccess(true)
+        .mixedMode(MixedMode.All)
+        .onlineImageAccess(true)
+        .enableNativeEmbedMode(true)
+        .height(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)
@@ -75,25 +66,31 @@ 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) {
+      if (typeof this.webHeight === 'number') {
+        if (Number(data?.data?.webViewHeight) > this.webHeight) {
+          this.webHeight = Number(data?.data?.webViewHeight)
+        }
+      }
+      {
+        this.webHeight = Number(data?.data?.webViewHeight) || '100%'
+      }
+    }
+  }
   /**
   /**
    * 默认【CallNative】逻辑处理
    * 默认【CallNative】逻辑处理
    */
    */
@@ -102,12 +99,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';
 
 
@@ -50,6 +52,8 @@ export { GroupDTO } from './src/main/ets/bean/component/GroupDTO';
 
 
 export { CompDTO } from './src/main/ets/bean/component/CompDTO';
 export { CompDTO } from './src/main/ets/bean/component/CompDTO';
 
 
+export { LiveReviewDTO } from './src/main/ets/bean/component/LiveReviewDTO';
+
 export { NewspaperListBean } from './src/main/ets/bean/newspaper/NewspaperListBean';
 export { NewspaperListBean } from './src/main/ets/bean/newspaper/NewspaperListBean';
 
 
 export { NewspaperListItemBean } from './src/main/ets/bean/newspaper/NewspaperListItemBean';
 export { NewspaperListItemBean } from './src/main/ets/bean/newspaper/NewspaperListItemBean';
@@ -108,4 +112,13 @@ export { ShareInfo } from './src/main/ets/bean/morningevening/ShareInfo';
 
 
 export { slideShows } from './src/main/ets/bean/morningevening/slideShows';
 export { slideShows } from './src/main/ets/bean/morningevening/slideShows';
 
 
-export { LiveDetailsBean } from './src/main/ets/bean/live/LiveDetailsBean';
+export { LiveDetailsBean } from './src/main/ets/bean/live/LiveDetailsBean';
+
+export { ArticleListDTO } from './src/main/ets/bean/component/ArticleListDTO';
+
+export { appStyleImagesDTO } from './src/main/ets/bean/content/appStyleImagesDTO';
+
+export { LiveRoomBean,LiveRoomItemBean } from './src/main/ets/bean/live/LiveRoomBean';
+
+export { LiveRoomDataBean } from './src/main/ets/bean/live/LiveRoomDataBean';
+

+/**
+ * http://192.168.1.3:3300/project/3856/interface/api/190567
+ * 接口名称：客户端 客态主页页面-获取作品-从发布库获取该创作者下 稿件列表
+ * 接口路径：GET/zh/c/article/articleList
+ * 人民号-动态tab下列表数据
+ */
+import { appStyleImagesDTO } from '../content/appStyleImagesDTO'
+import {contentVideosDTO} from '../content/contentVideosDTO'
+export interface ArticleListDTO {
+  listTitle: string;
+  mainPicCount: string;
+  videosCount: string;
+  voicesCount: string;
+  landscape: number;
+  sourceName: string;
+  finalStatus: string;
+  score: string;
+  shareUrl: string;
+  sortPosId: string;
+  id: string;
+  serialsId: string;
+  oldContentId: string;
+  type: string;
+  tenancy: string;
+  clientPubFlag: string;
+  grayScale: string;
+  title: string
+  publishType: string;
+  publishTime: string;
+  firstPublishTime: string;
+  onlineStatus: string;
+  auditingStatus: string;
+  zhOnlineStatus: string;
+  zhAuditingStatus: string;
+  selectedStatus: string;
+  qualityScore: string;
+  levelScore: number;
+  isOrg: string;
+  articlePayment: number;
+  appStyle: number;
+  appStyleImages: appStyleImagesDTO[];
+  description: string;
+  introduction: string;
+  deleted: string;
+  keyArticle: string;
+  updateTime: string;
+  createTime: string;
+  createUserId: string;
+  createUserName: string;
+  creatorId: number;
+  creatorName: string;
+  articleExistVote: string;
+  rmhPlatform: string;
+  objectPos: string;
+  objectPosPictures: string;
+  shareFlag: string;
+  firstPublish: string;
+  readNum: string;
+  readFlag: string;
+  creatorLevel: string;
+  creatorTag: string;
+  joinActivity: string;
+  userType: string;
+  content: object;
+  contentShare: [];
+  contentLinkData: string;
+  contentExt: [];
+  contentVideos: contentVideosDTO[];
+  contentPictures: [];
+  contentPayments: string;
+  contentPaymentStaffs: string;
+  contentTxt: [];
+  contentSource: object;
+  contentTags: string;
+  contentVoices: string;
+  contentAuthorLocals: string;
+  contentEpaperArticle: string;
+  contentStatistics: string;
+  topicExistHeadImage: string;
+  topicComps: string;
+  live: string;
+  statusInfo: string;
+  askInfo: string;
+  askAttachmentList: string;
+  askAnswerList: string;
+  askFeedbackList: string;
+  ttopicInteracts: string;
+  ttopic: string;
+  mlive: string;
+  vlives: string
+}

@@ -29,5 +29,9 @@ 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;
+
+  /**
+   * 组件内容源类型  (LIVE_HORIZONTAL_CARD\LIVE_RESERVATION\LIVE_LARGE_CARD\LIVE_END\LIVE_MONTHLY_RANKING  )
+   */
+  dataSourceType: string;
 }
 }

+import { ContentDTO } from '../content/ContentDTO';
+
+export interface LiveReviewDTO {
+  hasNext: boolean;
+  pageNum: number;
+  pageSize: number;
+  totalCount: number;
+  list: ContentDTO[];
+}

@@ -2,6 +2,7 @@ import { CompDTO } from './CompDTO';
 
 
 /**
 /**
  * Page数据DTO
  * Page数据DTO
+ * 其实是comp接口（display/zh/c/compInfo）返回
  */
  */
 export interface PageDTO {
 export interface PageDTO {
   pageId: string; // 页面id
   pageId: string; // 页面id

@@ -66,5 +66,11 @@ export interface ContentDTO {
   slideShows: slideShows[],
   slideShows: slideShows[],
   voiceInfo: VoiceInfoDTO,
   voiceInfo: VoiceInfoDTO,
   tagWord: number,
   tagWord: number,
-  rmhInfo: RmhInfoDTO, // 人民号信息
+  isSelect: boolean;
+  rmhInfo: RmhInfoDTO; // 人民号信息
+  photoNum: number;
+  corner: string;
+  rmhPlatform: number;
+  newTags: string;
+  isSearch?: boolean; // 是否是搜索的结果，区分搜索和主页的数据
 }
 }

+export interface appStyleImagesDTO {
+  url: string;
+  bucket: string;
+  landscape: number;
+  sort: number;
+  height: number;
+  weight: number;
+  size: number;
+  format: number;
+  fullUrl: string
+}

+export interface contentVideosDTO {
+  id: number;
+  contentId: number;
+  ossVideoId: string;
+  url: string;
+  fullUrl: string;
+  bucket: string;
+  duration: number;
+  clarity: number;
+  resolutionWidth: number;
+  resolutionHeight: number;
+  type: number;
+  original: number;
+  originalVideoId: string;
+  landscape: number;
+  size: number;
+  templateId: string;
+  deleted: number;
+  coverPictureId: string;
+  framePictureId: string;
+  createUser: string;
+  createTime: string;
+  updateUser: string;
+  updateTime: string;
+  bak1: string;
+  bak2: string;
+  bak3: string;
+  bak4: string;
+  videoType: number;
+  objectPosId: string;
+}

@@ -3,6 +3,7 @@ export interface FullColumnImgUrlDTO {
   height: number;
   height: number;
   landscape: number;
   landscape: number;
   size: number | null;
   size: number | null;
-  url: string;
+  url: string; // 图片地址--列表显示
   weight: number;
   weight: number;
+  fullUrl: string; // 图片地址--预览地址使用；【人民号动态卡预览】
 }
 }

@@ -3,11 +3,11 @@ export interface RmhInfoDTO {
   authTitle: string;
   authTitle: string;
   authTitle2: string;
   authTitle2: string;
   banControl: number;
   banControl: number;
-  cnAttention: number;
+  cnIsAttention: number;
   cnMainControl: number;
   cnMainControl: number;
   cnShareControl: number;
   cnShareControl: number;
-  cnlsComment: number;
-  cnlsLike: number;
+  cnIsComment: number;
+  cnIsLike: number;
   posterShareControl: number;
   posterShareControl: number;
   rmhDesc: string;
   rmhDesc: string;
   rmhHeadUrl: string;
   rmhHeadUrl: string;

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

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

@@ -158,9 +158,12 @@ export interface LiveDetailsBean {
    */
    */
   liveInfo: LiveInfo
   liveInfo: LiveInfo
   fullColumnImgUrls: Array<FullColumnImgUrls>
   fullColumnImgUrls: Array<FullColumnImgUrls>
-  vlive: Array<Vlive>
   newsTitle: string
   newsTitle: string
+  newsId: string
   newIntroduction: string
   newIntroduction: string
+  //迁移id
+  oldNewsId: string
+  reLInfo: ReLInfo
 }
 }
 
 
 export interface LiveInfo {
 export interface LiveInfo {
@@ -168,8 +171,12 @@ export interface LiveInfo {
   liveState: string
   liveState: string
   //2024-04-12 15:00:00 直播开始时间
   //2024-04-12 15:00:00 直播开始时间
   planStartTime: string
   planStartTime: string
+  vlive: Array<Vlive>
+  mlive:MLive
+}
+export interface MLive {
+  mliveId:string
 }
 }
-
 export interface FullColumnImgUrls {
 export interface FullColumnImgUrls {
   url: string
   url: string
 }
 }
@@ -179,4 +186,8 @@ export interface Vlive {
   liveUrl: string
   liveUrl: string
   //直播回看地址，多路直播录制文件URL
   //直播回看地址，多路直播录制文件URL
   replayUri: string
   replayUri: string
+}
+
+export interface ReLInfo {
+  relId: string
 }
 }

+export interface LiveRoomBean {
+  pageNum: number
+  pageSize: number
+  totalCount: number
+  barrageResponses: Array<LiveRoomItemBean>
+}
+
+export interface LiveRoomItemBean {
+  text: string
+  senderUserAvatarUrl: string
+  senderUserName: string
+  pictureUrls: string[]
+  time: string
+  //1上墙0未上墙
+  isWall: number
+  //是否置顶 1置顶0不置顶
+  isTop: number
+  role: string
+}

+export interface LiveRoomDataBean {
+  barrageNum: number,
+  likeNum: number,
+  liveId: number,
+  pv: number,
+  subscribeNum: number,
+}

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

@@ -34,7 +34,8 @@ export { ENewspaperItemComponent } from "./src/main/ets/components/ENewspaperIte
 
 
 export { ENewspaperListDialog } from "./src/main/ets/dialog/ENewspaperListDialog"
 export { ENewspaperListDialog } from "./src/main/ets/dialog/ENewspaperListDialog"
 
 
-export { MorningEveningPaperComponent } from "./src/main/ets/components/MorningEveningPaper/MorningEveningPaperComponent"
+export { MorningEveningPaperComponent
+} from "./src/main/ets/components/MorningEveningPaper/MorningEveningPaperComponent"
 
 
 export { ImageAndTextPageComponent } from "./src/main/ets/components/ImageAndTextPageComponent"
 export { ImageAndTextPageComponent } from "./src/main/ets/components/ImageAndTextPageComponent"
 
 
@@ -42,23 +43,23 @@ 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"
 
 
 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 { SpacialTopicPageComponent } from './src/main/ets/components/SpacialTopicPageComponent'
+
+export { LogoutViewModel } from "./src/main/ets/viewmodel/LogoutViewModel"
+

@@ -7,13 +7,16 @@
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",
   "dependencies": {
   "dependencies": {
+    "@ohos/lottie": "2.0.0",
     "wdConstant": "file:../../commons/wdConstant",
     "wdConstant": "file:../../commons/wdConstant",
     "wdPlayer": "file:../../features/wdPlayer",
     "wdPlayer": "file:../../features/wdPlayer",
     "wdLogin": "file:../../features/wdLogin",
     "wdLogin": "file:../../features/wdLogin",
     "wdKit": "file:../../commons/wdKit",
     "wdKit": "file:../../commons/wdKit",
     "wdWebComponent": "file:../../commons/wdWebComponent",
     "wdWebComponent": "file:../../commons/wdWebComponent",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
+    "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
-    "wdNetwork": "file:../../commons/wdNetwork"
+    "wdNetwork": "file:../../commons/wdNetwork",
+    "wdJsBridge": "file:../../commons/wdJsBridge"
   }
   }
 }
 }

@@ -10,6 +10,9 @@ import { Card10Component } from './cardview/Card10Component';
 import { Card11Component } from './cardview/Card11Component';
 import { Card11Component } from './cardview/Card11Component';
 import { Card17Component } from './cardview/Card17Component';
 import { Card17Component } from './cardview/Card17Component';
 import { Card15Component } from './cardview/Card15Component';
 import { Card15Component } from './cardview/Card15Component';
+import { Card19Component } from './cardview/Card19Component';
+import { Card20Component } from './cardview/Card20Component';
+import { Card21Component } from './cardview/Card21Component';
 
 
 /**
 /**
  * card适配器，卡片样式汇总，依据ContentDTO#appStyle
  * card适配器，卡片样式汇总，依据ContentDTO#appStyle
@@ -40,12 +43,18 @@ export struct CardParser {
       Card9Component({ contentDTO })
       Card9Component({ contentDTO })
     } else if (contentDTO.appStyle === CompStyle.Card_10) {
     } else if (contentDTO.appStyle === CompStyle.Card_10) {
       Card10Component({ contentDTO })
       Card10Component({ contentDTO })
-    } else if (contentDTO.appStyle === CompStyle.Card_15) {
-      Card15Component({ contentDTO })
     } else if (contentDTO.appStyle === CompStyle.Card_11) {
     } else if (contentDTO.appStyle === CompStyle.Card_11) {
       Card11Component({ contentDTO })
       Card11Component({ contentDTO })
+    } else if (contentDTO.appStyle === CompStyle.Card_15) {
+      Card15Component({ contentDTO })
     } else if (contentDTO.appStyle === CompStyle.Card_17) {
     } else if (contentDTO.appStyle === CompStyle.Card_17) {
       Card17Component({ contentDTO })
       Card17Component({ contentDTO })
+    } else if (contentDTO.appStyle === CompStyle.Card_19) {
+      Card19Component({ contentDTO })
+    } else if (contentDTO.appStyle === CompStyle.Card_20) {
+      Card20Component({ contentDTO })
+    } else if (contentDTO.appStyle === CompStyle.Card_21) {
+      Card21Component({ contentDTO })
     }
     }
     else {
     else {
       // todo:组件未实现 / Component Not Implemented
       // todo:组件未实现 / Component Not Implemented

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

+import { Logger } from 'wdKit';
+import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
+import { ContentDetailDTO } from 'wdBean';
+import media from '@ohos.multimedia.media';
+import { OperRowListView } from './view/OperRowListView';
+import { WDPlayerController } from 'wdPlayer/Index';
+
+const TAG = 'DynamicDetailComponent'
+@Preview
+@Component
+export struct DynamicDetailComponent {
+  //入参
+  private relId: string = ''
+  private contentId: string = ''
+  private relType: string = ''
+  //出参
+  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
+  //变量
+  /**
+   * 默认未关注 点击去关注
+   */
+  private  followStatus: boolean = false;
+
+
+  async aboutToAppear() {
+    await this.getContentDetailData()
+  }
+  onPageHide() {
+
+  }
+
+  build() {
+    Row() {
+      Column(){
+        //logo、日期
+        Row() {
+          Image($r('app.media.ic_article_rmh'))
+            .width(80)
+            .height(28)
+            .margin({ left: 16 })
+          Blank()
+          Text("2023年03月14日 08:16")
+            .fontColor($r('app.color.color_B0B0B0'))
+            .fontSize(12)
+            .lineHeight(28)
+            .margin({ right: 16 })
+        }
+        .height(48)
+        .width('100%')
+        //分割线
+        Image($r('app.media.ic_news_detail_division'))
+            .width('100%')
+            .height(7)
+            .margin({left: 16, right: 16} )
+        //号主信息
+        Row() {
+          //头像
+          Stack() {
+            Image(this.contentDetailData.rmhInfo?.rmhHeadUrl)
+              .alt(this.contentDetailData.rmhInfo?.userType=='1'?$r('app.media.default_head'):$r('app.media.icon_default_head_mater'))
+              .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)
+          .alignContent(Alignment.Center)
+          Column(){
+            //昵称
+            Text("this.contentDetailData.rmhInfo?.rmhName")
+              .fontSize(14)
+              .fontColor($r('app.color.color_222222'))
+              .fontWeight(FontWeight.Medium)
+              .margin({ left: 5 })
+            //简介
+            Text("this.contentDetailData.rmhInfo?.rmhDesc")
+              .fontSize(14)
+              .fontColor($r('app.color.color_B0B0B0'))
+              .fontWeight(FontWeight.Medium)
+              .margin({ left: 5 })
+          }
+          if (!this.followStatus) {
+            Text('关注')
+              .width(60)
+              .height(24)
+              .textAlign(TextAlign.Center)
+              .fontSize($r('app.float.font_size_12'))
+              .borderRadius($r('app.float.button_border_radius'))
+              .backgroundColor($r('app.color.color_ED2800'))
+              .fontColor($r('app.color.color_fff'))
+              .onClick(() => {
+                // this.handleAccention(this.item, 1)
+              })
+          } else {
+            Text('已关注')
+              .width(60)
+              .height(24)
+              .borderWidth(1)
+              .textAlign(TextAlign.Center)
+              .fontSize($r('app.float.font_size_12'))
+              .borderRadius($r('app.float.button_border_radius'))
+              .borderColor($r('app.color.color_CCCCCC'))
+              .fontColor($r('app.color.color_CCCCCC'))
+              .onClick(() => {
+                // this.handleAccention(this.item, 0)
+              })
+          }
+        }
+        .width('100%')
+      }
+    }
+    .backgroundColor('#FFFFFFFF')
+  }
+  private async getContentDetailData() {
+    try {
+      let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
+      this.contentDetailData = data[0];
+      console.log('动态详情',JSON.stringify(this.contentDetailData))
+    } catch (exception) {
+    console.log('请求失败',JSON.stringify(exception))
+    }
+  }
+}

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

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

@@ -28,7 +28,7 @@ export struct MultiPictureDetailPageComponent {
   private picWidth: number = 0
   private picWidth: number = 0
   @State picHeight: number = 0
   @State picHeight: number = 0
   @State titleHeight: number = 0
   @State titleHeight: number = 0
-  @State contentDetailData: ContentDetailDTO  = {} as ContentDetailDTO
+  @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   @Provide @Watch('onCurrentPageNumUpdated') currentPageNum: string = '01'
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   @State swiperIndex: number = 0;
   @State swiperIndex: number = 0;
@@ -37,13 +37,12 @@ export struct MultiPictureDetailPageComponent {
 
 
   //watch监听页码回调
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
-    Logger.info(TAG, `currentPageNum：${this.currentPageNum}`, )
+    Logger.info(TAG, `currentPageNum：${this.currentPageNum}`,)
     let _swiperIndex = Number.parseInt(this.currentPageNum)
     let _swiperIndex = Number.parseInt(this.currentPageNum)
     Logger.info(TAG, `_swiperIndex：${_swiperIndex}`)
     Logger.info(TAG, `_swiperIndex：${_swiperIndex}`)
     this.swiperIndex = _swiperIndex > 0 ? _swiperIndex - 1 : _swiperIndex
     this.swiperIndex = _swiperIndex > 0 ? _swiperIndex - 1 : _swiperIndex
   }
   }
 
 
-
   async aboutToAppear() {
   async aboutToAppear() {
     //获取宽高尺寸
     //获取宽高尺寸
     this.screenWidth = this.displayTool.width
     this.screenWidth = this.displayTool.width
@@ -72,7 +71,7 @@ export struct MultiPictureDetailPageComponent {
       if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
       if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
         Swiper(this.swiperController) {
         Swiper(this.swiperController) {
           ForEach(this.contentDetailData.photoList, (item: PhotoListBean) => {
           ForEach(this.contentDetailData.photoList, (item: PhotoListBean) => {
-            MultiPictureDetailItemComponent({  MultiPictureDetailItem: item })
+            MultiPictureDetailItemComponent({ MultiPictureDetailItem: item })
           })
           })
         }
         }
         .index(this.swiperIndex)
         .index(this.swiperIndex)
@@ -91,10 +90,11 @@ export struct MultiPictureDetailPageComponent {
         .onChange((index: number) => {
         .onChange((index: number) => {
           this.swiperIndex = index
           this.swiperIndex = index
         })
         })
-        if(this.contentDetailData.rmhPlatform == 1) {
+
+        if (this.contentDetailData.rmhPlatform == 1) {
           Row() {
           Row() {
-            Row(){
-              Row({space: 8}) {
+            Row() {
+              Row({ space: 8 }) {
                 Image(this.contentDetailData?.rmhInfo?.rmhHeadUrl)
                 Image(this.contentDetailData?.rmhInfo?.rmhHeadUrl)
                   .borderRadius('50%')
                   .borderRadius('50%')
                   .alt($r('app.media.picture_loading'))
                   .alt($r('app.media.picture_loading'))
@@ -105,6 +105,7 @@ export struct MultiPictureDetailPageComponent {
               }
               }
               .width('13%')
               .width('13%')
               .height('100%')
               .height('100%')
+
               Row() {
               Row() {
                 Flex({
                 Flex({
                   direction: FlexDirection.Column,
                   direction: FlexDirection.Column,
@@ -124,7 +125,7 @@ export struct MultiPictureDetailPageComponent {
                     .fontWeight(400)
                     .fontWeight(400)
                     .lineHeight(14)
                     .lineHeight(14)
                     .textOverflow({ overflow: TextOverflow.Clip })
                     .textOverflow({ overflow: TextOverflow.Clip })
-                    .margin (0)
+                    .margin(0)
                 }
                 }
               }
               }
               .width('81%')
               .width('81%')
@@ -136,10 +137,11 @@ export struct MultiPictureDetailPageComponent {
               top: 0,
               top: 0,
               bottom: 0,
               bottom: 0,
               left: 16,
               left: 16,
-              right:0
+              right: 0
             })
             })
-            if(this.followStatus == '0') {
-              Row(){
+
+            if (this.followStatus == '0') {
+              Row() {
                 Button('+关注', { type: ButtonType.Normal, stateEffect: true })
                 Button('+关注', { type: ButtonType.Normal, stateEffect: true })
                   .borderRadius(4)
                   .borderRadius(4)
                   .backgroundColor('#ED2800')
                   .backgroundColor('#ED2800')
@@ -152,7 +154,7 @@ export struct MultiPictureDetailPageComponent {
                     top: 10,
                     top: 10,
                     bottom: 10,
                     bottom: 10,
                     left: 16,
                     left: 16,
-                    right:16
+                    right: 16
                   })
                   })
                   .fontSize(12)
                   .fontSize(12)
                   .fontColor(Color.White)
                   .fontColor(Color.White)
@@ -169,7 +171,7 @@ export struct MultiPictureDetailPageComponent {
           })
           })
           .id('e_attention')
           .id('e_attention')
         }
         }
-        Row(){
+        Row() {
           Scroll(this.scroller) {
           Scroll(this.scroller) {
             Row() {
             Row() {
               Flex({
               Flex({
@@ -177,22 +179,38 @@ export struct MultiPictureDetailPageComponent {
                 justifyContent: FlexAlign.Start
                 justifyContent: FlexAlign.Start
               }) {
               }) {
                 Text() {
                 Text() {
-                  Span(`${this.swiperIndex + 1}`).fontSize(24).fontFamily('PingFang SC-Medium').fontWeight(500).lineHeight(28)
-                  Span(`/${this.contentDetailData.photoList.length}`).fontSize(14).fontFamily('PingFang SC-Medium').fontWeight(500).lineHeight(19)
+                  Span(`${this.swiperIndex + 1}`)
+                    .fontSize(24)
+                    .fontFamily('PingFang SC-Medium')
+                    .fontWeight(500)
+                    .lineHeight(28)
+                  Span(`/${this.contentDetailData.photoList.length}`)
+                    .fontSize(14)
+                    .fontFamily('PingFang SC-Medium')
+                    .fontWeight(500)
+                    .lineHeight(19)
                 }.fontColor(Color.White).margin(4)
                 }.fontColor(Color.White).margin(4)
 
 
-                Text(`${this.contentDetailData.newsTitle}`).fontColor(Color.White).fontSize(16).fontFamily('PingFang SC-Semibold')
-                  .fontWeight(600).lineHeight(24)
-                  .margin ({
+                Text(`${this.contentDetailData.newsTitle}`)
+                  .fontColor(Color.White)
+                  .fontSize(16)
+                  .fontFamily('PingFang SC-Semibold')
+                  .fontWeight(600)
+                  .lineHeight(24)
+                  .margin({
                     top: 4,
                     top: 4,
                     left: 0,
                     left: 0,
                     bottom: 4,
                     bottom: 4,
                     right: 0
                     right: 0
                   })
                   })
-                Text(`${this.contentDetailData.photoList?.[this.swiperIndex].picDesc}`).fontColor(Color.White)
-                  .fontSize(14).fontFamily('PingFang SC-Regular').fontWeight(400).lineHeight(22)
+                Text(`${this.contentDetailData.photoList?.[this.swiperIndex].picDesc}`)
+                  .fontColor(Color.White)
+                  .fontSize(14)
+                  .fontFamily('PingFang SC-Regular')
+                  .fontWeight(400)
+                  .lineHeight(22)
                   .textOverflow({ overflow: TextOverflow.Ellipsis })
                   .textOverflow({ overflow: TextOverflow.Ellipsis })
-                  .margin ({
+                  .margin({
                     top: 4,
                     top: 4,
                     left: 0,
                     left: 0,
                     bottom: 4,
                     bottom: 4,
@@ -202,7 +220,7 @@ export struct MultiPictureDetailPageComponent {
               }
               }
             }
             }
             .width('100%')
             .width('100%')
-            .margin ({
+            .margin({
               top: 8,
               top: 8,
               left: 18,
               left: 18,
               bottom: 24,
               bottom: 24,
@@ -227,13 +245,15 @@ export struct MultiPictureDetailPageComponent {
             bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
             bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
             middle: { anchor: "__container__", align: HorizontalAlign.Center }
             middle: { anchor: "__container__", align: HorizontalAlign.Center }
           })
           })
-          .width('100%').height(56).margin({
-          top: 16,
-          left: 16,
-          right:16,
-          bottom: 0
-        })
-          .border({ width: {top: 0.5}, color: '#FFFFFF' })
+          .width('100%')
+          .height(56)
+          .margin({
+            top: 16,
+            left: 16,
+            right: 16,
+            bottom: 0
+          })
+          .border({ width: { top: 0.5 }, color: '#FFFFFF' })
           .id('e_oper_row')
           .id('e_oper_row')
       }
       }
     }
     }
@@ -241,6 +261,9 @@ export struct MultiPictureDetailPageComponent {
     .height('100%')
     .height('100%')
     .backgroundColor(Color.Black)
     .backgroundColor(Color.Black)
     .id('e_picture_container')
     .id('e_picture_container')
+    // 设置顶部绘制延伸到状态栏
+    // 设置底部绘制延伸到导航条
+    .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
   }
   }
 
 
   private async getContentDetailData() {
   private async getContentDetailData() {
@@ -285,6 +308,7 @@ export struct MultiPictureDetailPageComponent {
 
 
     }
     }
   }
   }
+
   /**
   /**
    * 关注号主
    * 关注号主
    */
    */

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

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

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

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

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

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

+import { ContentDTO } from 'wdBean/Index'
+import { DateTimeUtils } from 'wdKit/Index'
+
+/**
+ * 这里是样式卡中，右下角显示的音视频信息
+ * 目前已知：
+ * 音频： 音频图标+时长
+ * 视频：点播图标+时长；直播图标+'直播中'
+ */
+@Component
+export struct CardMediaInfo {
+  @State contentDTO: ContentDTO = {} as ContentDTO // 如果有duraion，代表点播，显示时长；如果不传或者传0，显示直播中
+
+  // objectType 0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,
+  // 14动态图文,15动态视频16问政；100人民号,101标签
+
+  build() {
+    Row() {
+      if (this.contentDTO.objectType === '1' || this.contentDTO.objectType === '15') {
+        // 点播、动态视频
+        Row() {
+          Image($r('app.media.card_play'))
+            .mediaLogo()
+          Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
+            .mediaText()
+        }
+      } else if (this.contentDTO.objectType === '2') {
+        // liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
+        // 显示直播信息
+        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()
+            Text('直播中')
+              .mediaText()
+          } else if (this.contentDTO.liveInfo.liveState === 'end' && this.contentDTO.liveInfo.replayUri) {
+            Image($r('app.media.card_play'))
+              .mediaLogo()
+            Text('回看')
+              .mediaText()
+          } else if(this.contentDTO.liveInfo.liveState === 'end' && this.contentDTO.liveInfo
+            .replayUri) {
+            // Image($r('app.media.card_live'))
+            //   .mediaLogo()
+            Text('直播结束')
+              .mediaText()
+          }
+        }
+      } else if (this.contentDTO.objectType === '9') {
+        // 显示组图；图片数量
+        Row() {
+          Image($r('app.media.card_image'))
+            .mediaLogo()
+          Text(`${this.contentDTO.photoNum}`)
+            .mediaText()
+        }
+      } else if (this.contentDTO.objectType === '13') {
+        // 显示音频信息
+        Row() {
+          Image($r('app.media.card_audio'))
+            .mediaLogo()
+          Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo.voiceDuration * 1000))
+            .mediaText()
+        }
+      }
+    }
+    .margin(6)
+  }
+
+  @Styles
+  mediaLogo() {
+    .width(14)
+    .height(14)
+    .margin({ right: 3 })
+  }
+}
+
+@Extend(Text)
+function mediaText() {
+  .fontColor($r('app.color.color_fff'))
+  .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 })
+      } 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"))
+          .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)
+          .margin({ left: 6 })
+      }
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .margin({ top: 8 })
+  }
+}

+/**
+ * 这里是人民号动态中的顶部信息：人民号logo,名字，描述，关注等
+ */
+import { RmhInfoDTO } from 'wdBean'
+import { CommonConstants } from 'wdConstant/Index';
+
+@Component
+export struct RmhTitle {
+  @Prop rmhInfo: RmhInfoDTO
+
+  build() {
+    Flex() {
+      Stack() {
+        Image(this.rmhInfo.rmhHeadUrl)
+          .width(36)
+          .height(36).borderRadius(50)
+        Image(this.rmhInfo.authIcon)
+          .width(14)
+          .height(14)
+          .borderRadius(50)
+      }
+      .margin({ right: 8 })
+      .alignContent(Alignment.BottomEnd)
+      .flexShrink(0)
+
+      Column() {
+        Text(this.rmhInfo.rmhName)
+          .fontSize($r('app.float.font_size_13'))
+          .fontColor($r('app.color.color_222222'))
+          .fontWeight(600)
+          .alignSelf(ItemAlign.Start)
+        Text(this.rmhInfo.rmhDesc)
+          .fontSize($r("app.float.font_size_12"))
+          .fontColor($r("app.color.color_B0B0B0"))
+          .maxLines(1)
+          .alignSelf(ItemAlign.Start)
+          .textOverflow({ overflow: TextOverflow.Ellipsis })
+      }
+
+      Blank()
+      if (this.rmhInfo.cnIsAttention) {
+        Row() {
+          Image($r('app.media.rmh_follow'))
+            .width(16)
+            .height(16)
+          Text('关注')
+            .fontSize($r('app.float.font_size_13'))
+            .fontColor($r('app.color.color_ED2800'))
+        }
+        .flexShrink(0)
+        .alignSelf(ItemAlign.Center)
+        .onClick(() => {
+          // TODO 调用关注接口
+        })
+      }
+    }
+    .width(CommonConstants.FULL_WIDTH)
+    .margin({ bottom: 10 })
+  }
+}

@@ -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)

@@ -2,11 +2,12 @@
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { ContentDTO } from 'wdBean'
 import { ContentDTO } from 'wdBean'
 import { DateTimeUtils } from 'wdKit'
 import { DateTimeUtils } from 'wdKit'
-
+import { ProcessUtils } from '../../utils/ProcessUtils';
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG = 'Card11Component';
 const TAG = 'Card11Component';
 
 
 /**
 /**
- * 无图卡(标题省略)
+ * 无图卡(标题省略) Card_11 = '11
  */
  */
 @Component
 @Component
 export struct Card11Component {
 export struct Card11Component {
@@ -20,34 +21,18 @@ export struct Card11Component {
         .maxLines(3)
         .maxLines(3)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
-      Row() {
-        Text("锐评")
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_ED2800"))
-        Text(this.contentDTO.source)
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_B0B0B0"))
-          .margin({ left: 6 })
-        Image($r("app.media.point"))
-          .width(16)
-          .height(16)
-
-        Text(DateTimeUtils.formatDate(Number.parseFloat(this.contentDTO.publishTime)))
-          .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({
-      top: 14,
-      left: 16,
-      right: 16,
-      bottom: 14
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
     .backgroundColor($r("app.color.white"))
     .backgroundColor($r("app.color.white"))
-    .margin({ bottom: 8 })
+    .onClick((event: ClickEvent) => {
+      ProcessUtils.processPage(this.contentDTO)
+    })
   }
   }
 }
 }

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

+import { ContentDTO } from 'wdBean';
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CommonConstants } from 'wdConstant/Index';
+
+const TAG = '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 })
+}

-//全标题 "appStyle":"2",
 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CommonConstants } from 'wdConstant/Index';
 
 
 const TAG: string = 'Card15Component';
 const TAG: string = 'Card15Component';
 
 
@@ -12,89 +13,91 @@ const TAG: string = 'Card15Component';
  * 卡片宽度:充满父窗口
  * 卡片宽度:充满父窗口
  * 卡片高度,仅包含横板图片：图片高度由图片的宽度及宽高比决定，图片宽度占父窗口'100%'，宽高比为16:9:
  * 卡片高度,仅包含横板图片：图片高度由图片的宽度及宽高比决定，图片宽度占父窗口'100%'，宽高比为16:9:
  */
  */
-// @Entry
 @Component
 @Component
 export struct Card15Component {
 export struct Card15Component {
-  @State contentDTO: ContentDTO = {} as ContentDTO;
+  @State contentDTO: ContentDTO = {
+    // appStyle: '15',
+    // coverType: 1,
+    // objectType: '9',
+    // coverUrl: 'https://rmrbcmsonline.peopleapp.com/rb_recsys/img/2024/0413/VL20Z09ISBEKXZU_963672030241091584.jpeg?x-oss-process=image/resize,m_fill,h_450,w_800/quality,q_90',
+    // fullColumnImgUrls: [
+    //   {
+    //     landscape: 2,
+    //     size: 1,
+    //     url: 'https://rmrbcmsonline.peopleapp.com/rb_recsys/img/2024/0413/VL20Z09ISBEKXZU_963672030241091584.jpeg?x-oss-process=image/resize,m_fill,h_450,w_800/quality,q_90',
+    //     weight: 1170
+    //   }
+    // ],
+    // newsTitle: '押解画面公开！被湖北民警从柬埔寨押解回国被湖北民警从柬埔寨押解回国的130名涉赌诈嫌疑人是他们被湖北民警从柬埔寨押解回国的130名涉赌诈嫌疑人是他们的130名涉赌诈嫌疑人是他们',
+    // publishTime: '1712993333000',
+    // rmhInfo: {
+    //   authIcon: '',
+    //   authTitle: '',
+    //   authTitle2: '',
+    //   banControl: 0,
+    //   cnIsAttention: 1,
+    //   rmhDesc: '中共武汉市委机关报长江日报官方人民号',
+    //   rmhHeadUrl: 'https://uatjdcdnphoto.aikan.pdnews.cn/vod/content/202302/202302Sa121448724/TUw.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
+    //   rmhId: '4255270',
+    //   rmhName: '长江日报',
+    //   userId: '513696944662469',
+    //   userType: '3'
+    // },
+    // videoInfo: {
+    //   firstFrameImageUri: '',
+    //   videoDuration: 12,
+    //   // videoLandscape: 2,
+    //   videoUrl: 'https://rmrbcmsonline.peopleapp.com/rb_recsys/video/2024/0413/VL20Z09ISBEKXZU_963672027208609792.mp4'
+    // },
+    // photoNum: '9',
+    // voiceInfo: {
+    //   voiceDuration: 12
+    // }
+  } as ContentDTO;
 
 
   build() {
   build() {
     Column() {
     Column() {
-
-      Column() {
-        //新闻标题
+      // rmh信息
+      RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
+      //新闻标题
+      if (this.contentDTO.newsTitle) {
         Text(this.contentDTO.newsTitle)
         Text(this.contentDTO.newsTitle)
-          .fontSize(17)
-          .fontColor('#222222')
-          .maxLines(3)
-          .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-          .align(Alignment.Start)
-        //大图
-        Stack() {
-          Image(this.contentDTO.coverUrl)
-            .borderRadius(4)
-
-
-          //播放状态+时长
-          Row() {
-            Image($r('app.media.icon_live'))
-              .width(22)
-              .height(18)
-
-            Stack() {
-              Text('直播中')
-                .fontColor('#FFFFFF')
-                .fontSize(11)
-            }
-            .width(44)
-            .height(18)
-            .backgroundColor('#4d000000')
-          }.margin({ right: 8, bottom: 8 })
-
-        }
-        .width('100%')
-        .height(192)
-        .alignContent(Alignment.BottomEnd)
-        .margin({ top: 8 })
-
+          .fontSize($r('app.float.font_size_17'))
+          .fontColor($r('app.color.color_222222'))
+          .width(CommonConstants.FULL_WIDTH)
+          .textOverflowStyle(2)
+          .margin({ bottom: 8 })
       }
       }
-      .width('100%')
-      .justifyContent(FlexAlign.Start)
-      .alignItems(HorizontalAlign.Start)
-      .padding({ top: 14 })
-
-      //bottom
-      Row() {
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        //间隔点
-        Image($r('app.media.point'))
-          .width(12)
-          .height(12)
-
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        Text(' ')
-
-        Text(this.contentDTO.subtitle)
-          .bottomTextStyle()
-
+      //大图
+      Stack() {
+        Image(this.contentDTO.coverUrl)
+          .borderRadius($r('app.float.image_border_radius'))
+        //播放状态+时长
+        CardMediaInfo({
+          contentDTO: this.contentDTO
+        })
       }
       }
-      .width('100%')
-      .height(18)
-      .justifyContent(FlexAlign.Start)
-      // .padding({bottom:14})
-      .margin({ top: 8 })
+      .width(CommonConstants.FULL_WIDTH)
+      .aspectRatio(16 / 9)
+      .alignContent(Alignment.BottomEnd)
+
+      //TODO  底部的：分享、评论、点赞 功能；需要引用一个公共组件
     }
     }
-    .width('100%')
-    .padding({ left: 16, right: 16 })
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
     })
     })
   }
   }
 }
 }
 
 
+
 @Extend(Text)
 @Extend(Text)
-function bottomTextStyle() {
-  .fontSize(12)
-  .fontColor('#B0B0B0')
+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 })
+}

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

+import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
+import { RmhTitle } from '../cardCommon/RmhTitle'
+import { ProcessUtils } from '../../utils/ProcessUtils';
+const TAG = 'Card19Component';
+
+/**
+ * 人民号-动态---19：动态图文卡人民号； 从无图--9图
+ */
+@Component
+export struct Card19Component {
+  @State contentDTO: ContentDTO = {
+      // appStyle: '19',
+      // 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: [
+      //   {
+      //     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_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',
+        //   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日下午，@合肥交警 包河大队走进辖区建筑工地为驾驶员、安全员们开展春季交通安全主题宣传活动。活动中，交警结合涉工程运输车、渣土车交通事故案例，详细讲解行驶注意事项，并普及了“一盔一带”“右转必停”等安全常识，要求驾驶员牢固树立交通安全意识，自觉遵守交通法律法规，确保出行安全。',
+      // newsTitle: '#平安建设双提升#【进工地，送安全】3月21日下午，@合肥交警 包河大队走进辖区建筑工地为驾驶员、安全员们开展春季交通安全主题宣传活动。活动中，交警结合涉工程运输车、渣土车交通事故案例，详细讲解行驶注意事项，并普及了“一盔一带”“右转必停”等安全常识，要求驾驶员牢固树立交通安全意识，自觉遵守交通法律法规，确保出行安全。',
+      // publishTime: '1711185754000',
+      // relType: '1',
+      // rmhInfo: {
+      //   authIcon: '',
+      //   authTitle: '',
+      //   authTitle2: '',
+      //   banControl: 0,
+      //   cnIsAttention: 1,
+      //   cnIsComment: 1,
+      //   cnIsLike: 1,
+      //   cnMainControl: 1,
+      //   cnShareControl: 1,
+      //   posterShareControl: 1,
+      //   rmhDesc: '合肥市公安局官方人民号',
+      //   rmhHeadUrl: 'https://uatjdcdnphoto.aikan.pdnews.cn/vod/content/202302/202302Sa121448724/TUw.png?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
+      //   rmhId: '4255290',
+      //   rmhName: '合肥警方',
+      //   userId: '513697181730757',
+      //   userType: '2'
+      // }
+  } 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'))
+          .textOverflowStyle(2)
+          .margin({ bottom: 8 })
+      }
+      // 图片-从无图到9图展示
+      createImg({ fullColumnImgUrls: this.contentDTO.fullColumnImgUrls })
+      //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')
+    })
+    .onClick((event: ClickEvent) => {
+      ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+interface radiusType {
+  topLeft: number | Resource;
+  topRight: number | Resource;
+  bottomLeft: number | Resource;
+  bottomRight: number | Resource;
+}
+
+@Component
+struct createImg {
+  @Prop fullColumnImgUrls: FullColumnImgUrlDTO[]
+  @State picWidth: number = 0;
+  @State picHeight: number = 0;
+  aboutToAppear(): void {
+    if(this.fullColumnImgUrls.length === 4) { // 为了使用栅格布局以便于占用三分之二的宽度，加一个占位
+      this.fullColumnImgUrls.splice(2,0, {
+        fullUrl: ''
+      } as FullColumnImgUrlDTO)
+    }
+  }
+  caclImageRadius(index: number) {
+    let radius: radiusType = {
+      topLeft: index === 0 ? $r('app.float.image_border_radius') : 0,
+      topRight: 0,
+      bottomLeft: 0,
+      bottomRight: 0,
+    }
+    if (this.fullColumnImgUrls.length === 1) {
+      radius.topRight = index === 0 ? $r('app.float.image_border_radius') : 0
+      radius.bottomLeft = index === 0 ? $r('app.float.image_border_radius') : 0
+      radius.bottomRight = index === 0 ? $r('app.float.image_border_radius') : 0
+    } else if (this.fullColumnImgUrls.length === 5 && !this.fullColumnImgUrls[2].fullUrl) {
+      radius.topRight = index === 1 ? $r('app.float.image_border_radius') : 0
+      radius.bottomLeft = index === 3 ? $r('app.float.image_border_radius') : 0
+      radius.bottomRight = index === 4 ? $r('app.float.image_border_radius') : 0
+    } else {
+      radius.topRight = index === 2 ? $r('app.float.image_border_radius') : 0
+      radius.bottomLeft = index === 6 ? $r('app.float.image_border_radius') : 0
+      radius.bottomRight = index === 8 ? $r('app.float.image_border_radius') : 0
+    }
+    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() {
+    GridRow({
+      gutter: { x: 2, y: 2 }
+    }) {
+      ForEach(this.fullColumnImgUrls, (item: FullColumnImgUrlDTO, index: number) => {
+        if (this.fullColumnImgUrls.length === 1) {
+          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) {
+          GridCol({
+            span: { xs: 4 }
+          }) {
+            Image(item.fullUrl)
+              .aspectRatio(1)
+              .borderRadius(this.caclImageRadius(index))
+          }
+        } else {
+          GridCol({
+            span: { sm: 4, lg: 3 }
+          }) {
+            Image(item.fullUrl)
+              .aspectRatio(1)
+              .borderRadius(this.caclImageRadius(index))
+          }
+        }
+      })
+    }
+  }
+}
+
+
+@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';
+import { ProcessUtils } from '../../utils/ProcessUtils';
+const TAG = 'Card20Component';
+
+/**
+ * 人民号-动态---20：动态视频卡人民号   分横屏和竖屏；
+ */
+@Component
+export struct Card20Component {
+  @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: '好玩！》',
+    // 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 })
+      }
+      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')
+    })
+    .onClick((event: ClickEvent) => {
+      ProcessUtils.processPage(this.contentDTO)
+    })
+  }
+}
+
+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 { 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 { ProcessUtils } from '../../utils/ProcessUtils';
 import { ProcessUtils } from '../../utils/ProcessUtils';
-
-
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
 
 
 /**
 /**
@@ -12,81 +13,62 @@ const TAG: string = 'Card2Component';
  * 卡片宽度:充满父窗口
  * 卡片宽度:充满父窗口
  * 卡片高度,仅包含横板图片：图片高度由图片的宽度及宽高比决定，图片宽度占父窗口'100%'，宽高比为16:9:
  * 卡片高度,仅包含横板图片：图片高度由图片的宽度及宽高比决定，图片宽度占父窗口'100%'，宽高比为16:9:
  */
  */
-// @Entry
 @Component
 @Component
 export struct Card2Component {
 export struct Card2Component {
-  @State contentDTO: ContentDTO = {} as ContentDTO;
+  @State contentDTO: ContentDTO = {
+    // appStyle: '2',
+    // objectType: '1',
+    // coverUrl:
+    // 'https://rmrbcmsonline.peopleapp.com/upload/image/202404/202404141115457926.png?x-oss-process=image/resize,m_fill,h_450,w_800/quality,q_90',
+    // newsTitle: '又见花开！新疆伊犁花海延绵清新怡人',
+    // publishTime: '1713067227000',
+    // source: '荔枝新闻',
+    // videoInfo: {
+    //   videoDuration: 25,
+    //   videoLandscape: 1,
+    //   videoUrl:
+    //   'https://rmrbcmsonline.peopleapp.com/upload/video/mp4/202404/1713064515901314d148763996.mp4'
+    // }
+  } as ContentDTO;
 
 
   build() {
   build() {
     Column() {
     Column() {
-
       Column() {
       Column() {
         //新闻标题
         //新闻标题
         Text(this.contentDTO.newsTitle)
         Text(this.contentDTO.newsTitle)
-          .fontSize(17)
-          .fontColor('#222222')
+          .fontSize($r('app.float.font_size_17'))
+          .fontColor($r('app.color.color_222222'))
           .maxLines(3)
           .maxLines(3)
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
           .align(Alignment.Start)
           .align(Alignment.Start)
         //大图
         //大图
         Stack() {
         Stack() {
           Image(this.contentDTO.coverUrl)
           Image(this.contentDTO.coverUrl)
-            .borderRadius(4)
-
-
+            .width(CommonConstants.FULL_WIDTH)
+            .aspectRatio(16 / 9)
+            .borderRadius($r('app.float.image_border_radius'))
           //播放状态+时长
           //播放状态+时长
-          Row() {
-            Image($r('app.media.icon_live'))
-              .width(22)
-              .height(18)
-
-            Stack() {
-              Text('直播中')
-                .fontColor('#FFFFFF')
-                .fontSize(11)
-            }
-            .width(44)
-            .height(18)
-            .backgroundColor('#4d000000')
-          }.margin({ right: 8, bottom: 8 })
-
+          CardMediaInfo({
+            contentDTO: this.contentDTO
+          })
         }
         }
-        .width('100%')
-        .height(192)
         .alignContent(Alignment.BottomEnd)
         .alignContent(Alignment.BottomEnd)
         .margin({ top: 8 })
         .margin({ top: 8 })
-
       }
       }
-      .width('100%')
-      .justifyContent(FlexAlign.Start)
+      .width(CommonConstants.FULL_WIDTH)
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
-      .padding({ top: 14 })
 
 
       //bottom
       //bottom
-      Row() {
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        //间隔点
-        Image($r('app.media.point'))
-          .width(12)
-          .height(12)
-
-        Text(this.contentDTO.source)
-          .bottomTextStyle()
-        Text(' ')
-
-        Text(this.contentDTO.subtitle)
-          .bottomTextStyle()
-
-      }
-      .width('100%')
-      .height(18)
-      .justifyContent(FlexAlign.Start)
-      // .padding({bottom:14})
-      .margin({ top: 8 })
+      // 评论等信息
+      CardSourceInfo({ contentDTO: this.contentDTO })
     }
     }
-    .width('100%')
-    .padding({ left: 16, right: 16 })
+    .width(CommonConstants.FULL_WIDTH)
+    .padding({
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
+    })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
     })
     })

 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"
+ * Card_03 = '3', // 无图卡(全标题)
  */
  */
 @Component
 @Component
 export struct Card3Component {
 export struct Card3Component {
-  @State contentDTO: ContentDTO = {} as ContentDTO;
+  @State contentDTO: ContentDTO = {
+    // appStyle: '3',
+    // channelId: '2002',
+    // newsTitle: '习近平向斯洛伐克当选总统佩',
+    // objectId: '30044351686',
+    // objectType: '8',
+    // publishTime: '1712967589000',
+    // relId: '500005307414',
+    // relType: '1',
+    // source: '新华社',
+  } as ContentDTO;
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -16,36 +27,16 @@ 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() {
-        Text("锐评")
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_ED2800"))
-        Text(this.contentDTO.source)
-          .fontSize($r("app.float.font_size_12"))
-          .fontColor($r("app.color.color_B0B0B0"))
-          .margin({ left: 6 })
-        Image($r("app.media.point"))
-          .width(16)
-          .height(16)
-
-        Text(DateTimeUtils.formatDate(Number.parseFloat(this.contentDTO.publishTime)))
-          .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("100%")
+    .width(CommonConstants.FULL_WIDTH)
     .padding({
     .padding({
-      top: 14,
-      left: 16,
-      right: 16,
-      bottom: 14
+      left: $r('app.float.card_comp_pagePadding_lf'),
+      right: $r('app.float.card_comp_pagePadding_lf'),
+      top: $r('app.float.card_comp_pagePadding_tb'),
+      bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     })
-    .backgroundColor($r("app.color.white"))
-    .margin({ bottom: 8 })
     .onClick((event: ClickEvent) => {
     .onClick((event: ClickEvent) => {
       ProcessUtils.processPage(this.contentDTO)
       ProcessUtils.processPage(this.contentDTO)
     })
     })

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

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