Merge remote-tracking branch 'origin/main'

-import HashMap from '@ohos.util.HashMap';
 import { SpConstants } from 'wdConstant';
 import { SpConstants } from 'wdConstant';
 import { SPHelper, StringUtils } from 'wdKit';
 import { SPHelper, StringUtils } from 'wdKit';
 import { HostEnum, HostManager } from './HttpHostManager';
 import { HostEnum, HostManager } from './HttpHostManager';
@@ -11,81 +10,73 @@ export class HttpParams {
   private static userType = ''
   private static userType = ''
   private static token = ''
   private static token = ''
 
 
-  static getCommonHeaders(): HashMap<string, string> {
-    let headers: HashMap<string, string> = new HashMap<string, string>()
-    headers.set('User-Agent', 'Dalvik/2.1.0 (Linux; U; Android 13; 22101317C Build/TKQ1.221013.002)')
-    headers.set('channel', HttpParams.getChannel())
-    //headers.set('appCode', ConfigConstants.appCode)
-    headers.set('plat', HttpParams.getPlat())
-    //headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a')
-    headers.set('Content-Type', 'application/json; charset=utf-8')
-    headers.set('timestamp', HttpParams.getTimestamp())
-    headers.set('RMRB-X-TOKEN', HttpParams.getXToken())
-    headers.set('device_id', HttpParams.getDeviceId())
+  static buildHeaders(): Record<string, string> {
+    let headers: Record<string, string> = {};
+    // 通用请求头
+    headers['User-Agent'] = 'Dalvik/2.1.0 (Linux; U; Android 13; 22101317C Build/TKQ1.221013.002)'
+    headers['channel'] = HttpParams.getChannel()
+    headers['plat'] = HttpParams.getPlat()
+    headers['Content-Type'] = 'application/json; charset=utf-8'
+    headers['timestamp'] = HttpParams.getTimestamp()
+    headers['RMRB-X-TOKEN'] = HttpParams.getXToken()
+    headers['device_id'] = HttpParams.getDeviceId()
     if (HttpParams.getXToken() != '') {
     if (HttpParams.getXToken() != '') {
-      headers.set('cookie', 'RMRB-X-TOKEN=' + HttpParams.getXToken())
+      headers['cookie'] = 'RMRB-X-TOKEN=' + HttpParams.getXToken()
     }
     }
-    headers.set('build_version', HttpParams.getVersion())
-    headers.set('adcode', HttpParams.getAdCode())
-    headers.set('os_version', HttpParams.getOsVersion())
-    //headers.set('X-Ca-Stage', 'PRE')
-    headers.set('versionCode', HttpParams.getVersionCode())
-    headers.set('system', HttpParams.getTerminalId())
-    headers.set('version_name', HttpParams.getVersionName())
-    headers.set('EagleEye-TraceID', 'D539562E48554A60977AF4BECB6D6C7A')
-    headers.set('imei', HttpParams.getImei())
-    headers.set('Accept-Language', 'zh')
+    headers['build_version'] = HttpParams.getVersion()
+    headers['adcode'] = HttpParams.getAdCode()
+    headers['os_version'] = HttpParams.getOsVersion()
+    headers['versionCode'] = HttpParams.getVersionCode()
+    headers['system'] = HttpParams.getTerminalId()
+    headers['version_name'] = HttpParams.getVersionName()
+    headers['EagleEye-TraceID'] = 'D539562E48554A60977AF4BECB6D6C7A'
+    headers['imei'] = HttpParams.getImei()
+    headers['Accept-Language'] = 'zh'
     HttpParams.setLocationHeader(headers)
     HttpParams.setLocationHeader(headers)
-    // TODO 判断是否登录
-    headers.set('userId', HttpParams.getUserId())
-    headers.set('userType', HttpParams.getUserType())
-
-    headers.set('mpassid', 'ZbHTMeTsfaYDAHqt8ZHIzcPs')
+    // // TODO 判断是否登录
+    headers['userId'] = HttpParams.getUserId()
+    headers['userType'] = HttpParams.getUserType()
+    //
+    headers['mpassid'] = 'ZbHTMeTsfaYDAHqt8ZHIzcPs'
     HttpParams.addSpecialHeaders(headers);
     HttpParams.addSpecialHeaders(headers);
-    // Logger.debug("TAG", '******************* commonHeaders headers start ******************************** ');
-    // headers.forEach((v,k)=>{
-    //   Logger.debug("TAG", 'getCommonHeaders header: ' + k + ': ' + v);
-    // })
-    // Logger.debug("TAG", '******************* commonHeaders headers end ******************************** ');
     return headers;
     return headers;
   }
   }
 
 
-  static addSpecialHeaders(headers: HashMap<string, string>) {
+  static addSpecialHeaders(headers: Record<string, string>) {
     switch (HostManager.getHost()) {
     switch (HostManager.getHost()) {
       case HostEnum.HOST_UAT:
       case HostEnum.HOST_UAT:
-      // TODO 待优化到常量类里
-        headers.set('X-Ca-Stage', 'PRE');
-        headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a');
-        headers.set('appCode', '83092caa603a421aa0222308b3f6b27a');
+        headers['X-Ca-Stage'] = 'PRE'
+        headers['Authorization'] = 'APPCODE 83092caa603a421aa0222308b3f6b27a'
+        headers['appCode'] = '83092caa603a421aa0222308b3f6b27a'
         break
         break
       case HostEnum.HOST_SIT:
       case HostEnum.HOST_SIT:
-        headers.set('X-Ca-Stage', 'TEST');
-        headers.set('Authorization', 'APPCODE 0af1f9085e484c97b2a44704bae72c07');
-        headers.set('appCode', '0af1f9085e484c97b2a44704bae72c07');
+        headers['X-Ca-Stage'] = 'TEST'
+        headers['Authorization'] = 'APPCODE 0af1f9085e484c97b2a44704bae72c07'
+        headers['appCode'] = '0af1f9085e484c97b2a44704bae72c07'
         break
         break
       case HostEnum.HOST_PRODUCT:
       case HostEnum.HOST_PRODUCT:
-        headers.set('X-Ca-Stage', 'RELEASE');
-        headers.set('Authorization', 'APPCODE 3d4181bceeb94d9780e10dbb6c67bbf6');
-        headers.set('appCode', '3d4181bceeb94d9780e10dbb6c67bbf6');
+        headers['X-Ca-Stage'] = 'RELEASE'
+        headers['Authorization'] = 'APPCODE 3d4181bceeb94d9780e10dbb6c67bbf6'
+        headers['appCode'] = '3d4181bceeb94d9780e10dbb6c67bbf6'
         break
         break
       case HostEnum.HOST_DEV:
       case HostEnum.HOST_DEV:
-        headers.set('X-Ca-Stage', 'TEST');
-        headers.set('Authorization', 'APPCODE ff33172859e14f9a8299e3bd769e79f9');
-        headers.set('appCode', 'ff33172859e14f9a8299e3bd769e79f9');
+        headers['X-Ca-Stage'] = 'TEST'
+        headers['Authorization'] = 'APPCODE ff33172859e14f9a8299e3bd769e79f9'
+        headers['appCode'] = 'ff33172859e14f9a8299e3bd769e79f9'
         break
         break
       default:
       default:
         break
         break
     }
     }
   }
   }
 
 
-  static setLocationHeader(headers: HashMap<string, string>) {
+  static setLocationHeader(headers: Record<string, string>) {
     let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
     let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
     if (StringUtils.isNotEmpty(cityName)) {
     if (StringUtils.isNotEmpty(cityName)) {
-      headers.set('city', encodeURI(cityName))
+      headers['city'] = encodeURI(cityName)
     }
     }
     let cityCode = SPHelper.default.getSync(SpConstants.LOCATION_CITY_CODE, '') as string
     let cityCode = SPHelper.default.getSync(SpConstants.LOCATION_CITY_CODE, '') as string
     if (StringUtils.isNotEmpty(cityCode)) {
     if (StringUtils.isNotEmpty(cityCode)) {
-      headers.set('city_dode', encodeURI(cityCode))
+      headers['city_dode'] = encodeURI(cityCode)
     }
     }
   }
   }
 
 

 import ArrayList from '@ohos.util.ArrayList';
 import ArrayList from '@ohos.util.ArrayList';
 import service from './AxiosRequest';
 import service from './AxiosRequest';
-import { HttpUtils } from '../utils/HttpUtils';
 import { AxiosError, AxiosHeaders, AxiosRequestConfig, RawAxiosRequestHeaders } from '@ohos/axios';
 import { AxiosError, AxiosHeaders, AxiosRequestConfig, RawAxiosRequestHeaders } from '@ohos/axios';
 import { ResponseDTO } from '../bean/ResponseDTO';
 import { ResponseDTO } from '../bean/ResponseDTO';
 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
+import { HttpParams } from './HttpCommonParams';
 
 
 export class HttpRequest {
 export class HttpRequest {
   private static globalHeaderProviders: ArrayList<() => Record<string, string>> = new ArrayList();
   private static globalHeaderProviders: ArrayList<() => Record<string, string>> = new ArrayList();
@@ -14,7 +14,7 @@ export class HttpRequest {
 
 
   static initHttpHeader() {
   static initHttpHeader() {
     HttpRequest.addGlobalHeaderProvider(() => {
     HttpRequest.addGlobalHeaderProvider(() => {
-      return HttpUtils.buildHeaders();
+      return HttpParams.buildHeaders();
     })
     })
   }
   }
 
 
@@ -34,15 +34,17 @@ export class HttpRequest {
 
 
   static buildHeaderWithGlobalHeader(headers?: HashMap<string, string>): AxiosHeaders {
   static buildHeaderWithGlobalHeader(headers?: HashMap<string, string>): AxiosHeaders {
     let commonHeader: AxiosHeaders = new AxiosHeaders()
     let commonHeader: AxiosHeaders = new AxiosHeaders()
-    headers?.forEach((v, k) => {
-      commonHeader.set(k, v);
-    });
+
     HttpRequest.globalHeaderProviders.forEach((func) => {
     HttpRequest.globalHeaderProviders.forEach((func) => {
       let headers = func();
       let headers = func();
       for (const obj of Object.entries(headers)) {
       for (const obj of Object.entries(headers)) {
         commonHeader.set(obj[0], obj[1]);
         commonHeader.set(obj[0], obj[1]);
       }
       }
     })
     })
+    // 业务headers，覆盖common（如果有冲突的话，取业务）
+    headers?.forEach((v, k) => {
+      commonHeader.set(k, v);
+    });
     if (!commonHeader.get('Content-Type')) {
     if (!commonHeader.get('Content-Type')) {
       commonHeader.set('Content-Type', 'application/json;charset=utf-8');
       commonHeader.set('Content-Type', 'application/json;charset=utf-8');
     }
     }
@@ -56,24 +58,13 @@ export class HttpRequest {
     return service.get(url, config)
     return service.get(url, config)
   }
   }
 
 
-  static post0<T = ResponseDTO<string>>(url: string, data?: object, headers?: HashMap<string, string>): Promise<T> {
+  static post<T = ResponseDTO<string>>(url: string, data?: object, headers?: HashMap<string, string>): Promise<T> {
     let config: AxiosRequestConfig = {
     let config: AxiosRequestConfig = {
       headers: HttpRequest.buildHeaderWithGlobalHeader(headers)
       headers: HttpRequest.buildHeaderWithGlobalHeader(headers)
     }
     }
     return service.post(url, data, config)
     return service.post(url, data, config)
   }
   }
 
 
-  static post<T = object>(url: string, data1?: object, headers?: HashMap<string, string>): Promise<T> {
-    let requestHeaders: AxiosHeaders = new AxiosHeaders()
-    headers?.forEach((v, k) => {
-      requestHeaders.set(k, v);
-    });
-    let config: AxiosRequestConfig = {
-      headers: requestHeaders as RawAxiosRequestHeaders,
-    }
-    return service.post(url, data1, config)
-  }
-
   static put<T = ResponseDTO<string>>(url: string, data?: object, headers?: HashMap<string, string>): Promise<T> {
   static put<T = ResponseDTO<string>>(url: string, data?: object, headers?: HashMap<string, string>): Promise<T> {
     let config: AxiosRequestConfig = {
     let config: AxiosRequestConfig = {
       headers: HttpRequest.buildHeaderWithGlobalHeader(headers)
       headers: HttpRequest.buildHeaderWithGlobalHeader(headers)

-// import { ResponseLogin } from '../bean/account/ResponseLogin';
-import { Logger } from 'wdKit';
-
-// import { UserInfo } from '../bean/account/UserInfo';
-// import { ConfigConstants } from '../constants/ConfigConstants';
-// import { AccountManagerUtils } from './AccountManagerUtils';
-// import { AppUtils } from './AppUtils';
-// import { DeviceUtil } from './DeviceUtil';
-// import { Logger } from './Logger';
-// import { StringUtils } from './StringUtils';
+import { HttpRequest } from '../http/HttpRequest';
 
 
 const TAG: string = '[HttpUtils]'
 const TAG: string = '[HttpUtils]'
 
 
 export class HttpUtils {
 export class HttpUtils {
-  static buildHeaders(): Record<string, string> {
-    let timestamp: number = new Date().getTime(); // 单位毫秒
-    // let clientId = DeviceUtil.clientId()
-
-    let headers: Record<string, string> = {};
-    // 通用请求头
-    headers["version"] = 'V3';
-    // headers["appId"] = ConfigConstants.appId; // 应用id
-    // headers["terminalId"] = ConfigConstants.terminalId; // 终端ID
-    // headers["sourceId"] = ConfigConstants.sourceId; // 咪咕视频
-    // headers["appType"] = ConfigConstants.appType; // 手机客户端App（安卓）
-    // headers["clientType"] = ConfigConstants.clientType; // 客户端类型
-    // headers["appVersion"] = AppUtils.getAppVersionCode() + ''; // 客户端版本号:2600010500
-    // headers["APP-VERSION-CODE"] = AppUtils.getAppVersionCode() + ''; // APP版本号:250006577
-    // headers["appVersionName"] = AppUtils.getAppVersionName() // app对外显示版本: '6.1.5.00'
-    // headers["appCode"] = ConfigConstants.appCode; // 应用编码：产品_渠道_应用的拼接串，用下划线_ 拼接而成
-    // headers["ptvCode"] = ConfigConstants.ptvCode; // 基线版本号_应用版本号 todo:
-    // headers["clientProvinceCode"] = ''; // 客户端分省号 // 02
-    // headers["provinceCode"] = ''; // 客户端分省号 // 02
-    // headers["clientCityId"] = ''; // 客户端城市ID // 0210
-    // headers["carrierCode"] = ''; // 运营商信息
-
-    // 设备信息请求头
-    // headers["User-Agent"] = ''; // 终端UA，自动获取
-    headers["Content-Type"] = 'application/json;charset=UTF-8'; // 返回/响应的HTTP内容类型
-    headers["os"] = 'android'; // 操作系统类型：鸿蒙、安卓或iOS
-    // headers["osInfo"] = 'AD'; // 操作系统信息
-    headers["Phone-Info"] = 'HUAWEI'; // 手机信息: todo
-    // headers["oaid"] = ''; // 开放匿名设备ID，是中国移动安全联盟(MSA)发起并制定标准用户识别ID
-    headers["networkInfo"] = 'WIFI'; // 网络类型: todo
-    headers["cache-control"] = 'no-cache'; // 请求和响应遵循的缓存机制
-    // headers["clientId"] = clientId; // 客户端编号：客户端初始化时生成的客户端ID，保证唯一性
-    headers["imei"] = 'd1de6d3ae0db44bea1b3f0e20a14d90a'; // 终端手机序列号: todo
-    headers["X-UP-CLIENT-CHANNEL-ID"] = '2600010500-99000-101700010130012'; // 客户端渠道ID: todo
-    headers["channelCode"] = 'VIDEO_APPMAIL'; // 渠道编码
-    // headers["l_c"] = clientId; // 客户端id，同clientId
-    // headers["l_t"] = timestamp + ''; // 本机时间戳
-    // headers["l_s"] = ''; // l_c和l_t拼接后的MD5校验
-
-    // 签名相关请求头
-    headers["timeStamp"] = timestamp + ''; // 服务端时间戳(毫秒):1701667763664
-    headers["signType"] = 'RSA'; // 签名类型，固定RSA
+  /**
+   * 添加公共参数，如登录后，添加登录信息
+   */
+  static addCommonHeader() {
+    HttpRequest.addGlobalHeaderProvider(() => {
+      let headers: Record<string, string> = {};
+      return headers;
+    })
+  }
 
 
-    // 业务请求头
-    // headers["promotionID"] = '54b0f421-a6df-41d3-9be2-92820b2c5d8c'; // 促销Id todo
-    // headers["tenantId"] = ''; // 租户Id
+  /**
+   * 添加公共参数，如登出后，移除登录信息
+   */
+  static removeCommonHeader() {
 
 
-    // 添加其他header
-    // headers["sdkCeId"] = '27fb3129-5a54-45bc-8af1-7dc8f1155501'; // 用户中台老接口定义的ID，保持不变,现网：咪咕视频Android版,27fb3129-5a54-45bc-8af1-7dc8f1155501 todo
-    headers["support-pendant"] = '1'; // 挂件标识, "1":客户端支持挂件节目结构;非"1":不支持挂件节目结构-展示通用对象
-    Logger.info(TAG, "buildHeader headers:" + JSON.stringify(headers));
-    return headers;
   }
   }
-}
-
-// export default new HttpUtils()
+}

@@ -4,37 +4,39 @@ import { TopNavDTO } from './TopNavDTO';
  * 底导(包含顶导列表）数据
  * 底导(包含顶导列表）数据
  */
  */
 export interface BottomNavDTO {
 export interface BottomNavDTO {
-  backgroundUrl: string;
-  channelChooseActionUrl: string;
-  channelChooseCColor: string;
-  channelChooseColor: string;
-  channelMoreColor: string;
+  backgroundUrl: string; // 迭代四：页面背景图
+  channelChooseActionUrl: string; // 迭代四：频道选中下划线动画
+  channelChooseCColor: string; // 迭代四：频道未选中颜色
+  channelChooseColor: string; // 迭代四：频道选中颜色
+  channelMoreColor: string; // 迭代四：更多频道颜色
   extraData: string;
   extraData: string;
-  homePageColor: string;
-  icon: string;
-  iconC: string;
+  homePageColor: string; // 迭代四：主页图标/文字颜色
+  icon: string; // 未选中图标
+  iconC: string; // 选中图标
   id: number;
   id: number;
-  immersiveIconCUrl: string;
-  immersiveIconUrl: string;
-  immersiveNameCColor: string;
-  immersiveNameColor: string;
-  logoUrl: string;
+  immersiveIconCUrl: string; // 迭代二新增-图标颜色-选中（沉浸式频道）
+  immersiveIconUrl: string; // 迭代二新增-图标颜色-未选中（沉浸式频道）
+  immersiveNameCColor: string; // 迭代二新增-文字颜色-选中（沉浸式频道）
+  immersiveNameColor: string; // 迭代二新增-文字颜色-未选中（沉浸式频道）
+  logoUrl: string; // 迭代四：logo图片
   morningAndEveningUrl: string;
   morningAndEveningUrl: string;
   name: string;
   name: string;
-  nameCColor: string;
-  nameColor: string;
-  nightIconCUrl: string;
-  nightIconUrl: string;
-  nightNameCColor: string;
-  nightNameColor: string;
-  noticeColor: string;
+  nameCColor: string; // 名字选中颜色
+  nameColor: string; // 名字颜色
+  nightIconCUrl: string; // 迭代三新增-图标颜色-选中（夜间模式）
+  nightIconUrl: string; // 迭代三新增-图标颜色-未选中（夜间模式）
+  nightNameCColor: string; // 迭代三新增-文字颜色-选中（夜间模式）
+  nightNameColor: string; // 迭代三新增-文字颜色-未选中（夜间模式）
+  noticeColor: string; // 迭代四：消息通知提醒颜色
   pageId?: string;
   pageId?: string;
   pageType?: string;
   pageType?: string;
-  searchBothColor: string;
-  searchUrl: string;
+  searchBothColor: string; // 迭代四：两侧文字图标颜色,搜索图标颜色
+  searchUrl: string; // 迭代四：搜索背景框
   sortValue: number;
   sortValue: number;
-  statusBarColor: number;
+  statusBarColor: number; // 迭代四：状态栏图标颜色，0：白色，1：黑色
   topNavChannelList: TopNavDTO[];
   topNavChannelList: TopNavDTO[];
-  topStyle: string;
-  type: string;
+  topStyle: string; // 顶部样式：中文的(11-新闻;12-人民号;13-视频;14-服务)
+  type: string; // 底部导航类型，1普通 2我的；【rmrb需要扩展】
+  fmorningAndEveningUrl: string; // 迭代四：早晚报背景框
+  dropDownAnimationColor: string; // 下拉加载动画颜色，1白色，2灰色。未配置值是null
 }
 }

@@ -4,9 +4,10 @@ import { BottomNavDTO } from './BottomNavDTO';
  * 导航Body数据
  * 导航Body数据
  */
  */
 export interface NavigationBodyDTO {
 export interface NavigationBodyDTO {
-  backgroundColor: string;
+  backgroundColor: string; // 迭代二新增-底部导航背景色（信息流频道）
   bottomNavList: BottomNavDTO[];
   bottomNavList: BottomNavDTO[];
-  // greyBottomNav: GreyBottomNav;
-  immersiveBackgroundColor: string;
-  nightBackgroundColor: string;
+
+  // greyBottomNav: GreyBottomNav; // 灰度皮肤
+  immersiveBackgroundColor: string; // 迭代二新增-底部导航背景色（沉浸式频道）
+  nightBackgroundColor: string; // 迭代三新增-底部导航背景色（夜间模式）
 }
 }

@@ -7,14 +7,14 @@ export interface TopNavDTO {
   channelType: number;
   channelType: number;
   defaultPermitted: number;
   defaultPermitted: number;
   delPermitted: number;
   delPermitted: number;
-  fontCColor: string;
-  fontColor: string;
+  fontCColor: string; // 频道展示样式颜色（选中状态)
+  fontColor: string; // 频道展示样式颜色（未选中状态)
   headlinesOn: number;
   headlinesOn: number;
   homeChannel: string;
   homeChannel: string;
-  iconCUrl: string;
-  iconCUrlSize: string;
-  iconUrl: string;
   iconUrlSize: string;
   iconUrlSize: string;
+  iconCUrlSize: string;
+  iconUrl: string; // 频道图片展示样式图片相对地址（未选中状态)
+  iconCUrl: string; //频道图片展示样式图片相对地址（选中状态
   localChannel: string;
   localChannel: string;
   moreChannel: string;
   moreChannel: string;
   movePermitted: number;
   movePermitted: number;
@@ -23,5 +23,5 @@ export interface TopNavDTO {
   num: number;
   num: number;
   pageId: number;
   pageId: number;
   pageType: string;
   pageType: string;
-  underlineCColor: string;
+  underlineCColor: string; // 选中下划线颜色
 }
 }

@@ -168,6 +168,11 @@ export struct MorningEveningPaperComponent {
     }
     }
   }
   }
 
 
+  async aboutToDisappear() {
+    let windowHight: window.Window = await window.getLastWindow(getContext(this));
+    await windowHight.setWindowLayoutFullScreen(false);
+  }
+
   onPageHide() {
   onPageHide() {
     this.status = PlayerConstants.STATUS_PAUSE;
     this.status = PlayerConstants.STATUS_PAUSE;
     this.playerController?.pause();
     this.playerController?.pause();

@@ -5,7 +5,6 @@ import commentViewModel from '../viewmodel/CommentViewModel'
 import { router, window } from '@kit.ArkUI'
 import { router, window } from '@kit.ArkUI'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
 import { MyCommentDataSource } from '../model/MyCommentDataSource'
 import { MyCommentDataSource } from '../model/MyCommentDataSource'
-import { HttpUtils } from 'wdNetwork/src/main/ets/utils/HttpUtils'
 import { HttpUrlUtils } from 'wdNetwork/Index'
 import { HttpUrlUtils } from 'wdNetwork/Index'
 import PageModel from '../../../viewmodel/PageModel'
 import PageModel from '../../../viewmodel/PageModel'
 import { ErrorComponent } from '../../view/ErrorComponent'
 import { ErrorComponent } from '../../view/ErrorComponent'

 import { BottomNavi, CommonConstants } from 'wdConstant';
 import { BottomNavi, CommonConstants } from 'wdConstant';
-import { BottomNavDTO } from 'wdBean';
+import { BottomNavDTO, TopNavDTO } from 'wdBean';
 import { DateTimeUtils, EmitterEventId, EmitterUtils, Logger } from 'wdKit';
 import { DateTimeUtils, EmitterEventId, EmitterUtils, Logger } from 'wdKit';
 import { TopNavigationComponent } from './TopNavigationComponent';
 import { TopNavigationComponent } from './TopNavigationComponent';
 import { MinePageComponent } from './MinePageComponent';
 import { MinePageComponent } from './MinePageComponent';
 import { CompUtils } from '../../utils/CompUtils';
 import { CompUtils } from '../../utils/CompUtils';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
 import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
+import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 
 
 const TAG = 'BottomNavigationComponent';
 const TAG = 'BottomNavigationComponent';
 let storage = LocalStorage.getShared();
 let storage = LocalStorage.getShared();
@@ -21,14 +22,13 @@ export struct BottomNavigationComponent {
   @Provide isLayoutFullScreen: boolean = false
   @Provide isLayoutFullScreen: boolean = false
   @Provide isImmersive: boolean = false // 是否开启沉浸式模式 http://192.168.1.3:3300/project/3802/interface/api/189229
   @Provide isImmersive: boolean = false // 是否开启沉浸式模式 http://192.168.1.3:3300/project/3802/interface/api/189229
   @Provide isNight: boolean = false // 是否开启夜间模式
   @Provide isNight: boolean = false // 是否开启夜间模式
+  @Provide currentBottomNavInfo: BottomNavDTO = {} as BottomNavDTO; // 当前底导信息
+  @Provide currentTopNavInfo: TopNavDTO = {} as TopNavDTO; // 当前顶导信息
+  @Provide barBackgroundColor: Color = Color.Transparent
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
-  // 底导/顶导全部数据
-  @State @Watch('onBottomNavigationDataUpdated') bottomNavList: BottomNavDTO[] = []
-  // 底导当前选中/焦点下标
-  @State currentNavIndex: number = BottomNavi.NEWS;
-  // @State currentTopNavSelectedIndex: number = 0; //
-  @State barBackgroundColor: Color = Color.Transparent
+  @State @Watch('onBottomNavigationDataUpdated') bottomNavList: BottomNavDTO[] = [] // 底导/顶导全部数据
+  @State currentNavIndex: number = BottomNavi.NEWS; // 底导当前选中/焦点下标
   // 底导TabsController
   // 底导TabsController
   private navController: TabsController = new TabsController();
   private navController: TabsController = new TabsController();
   readonly ASPECT_RATIO_1_1: number = 1 / 1; // 底导图片宽高比
   readonly ASPECT_RATIO_1_1: number = 1 / 1; // 底导图片宽高比
@@ -44,6 +44,7 @@ export struct BottomNavigationComponent {
   @State assignChannel: AssignChannelParam = new AssignChannelParam()
   @State assignChannel: AssignChannelParam = new AssignChannelParam()
   // 自动刷新触发（双击tab自动刷新）
   // 自动刷新触发（双击tab自动刷新）
   @State autoRefresh: number = 0
   @State autoRefresh: number = 0
+
   async aboutToAppear() {
   async aboutToAppear() {
     Logger.info(TAG, `aboutToAppear currentNavIndex: ${this.currentNavIndex}`);
     Logger.info(TAG, `aboutToAppear currentNavIndex: ${this.currentNavIndex}`);
     let bottomNav = await PageViewModel.getBottomNavData(getContext(this))
     let bottomNav = await PageViewModel.getBottomNavData(getContext(this))
@@ -84,7 +85,6 @@ export struct BottomNavigationComponent {
                 _currentNavIndex: $currentNavIndex,
                 _currentNavIndex: $currentNavIndex,
                 navIndex: index,
                 navIndex: index,
                 currentBottomNavName: navItem.name,
                 currentBottomNavName: navItem.name,
-                barBackgroundColor: $barBackgroundColor,
                 assignChannel: this.assignChannel,
                 assignChannel: this.assignChannel,
                 autoRefresh: this.autoRefresh
                 autoRefresh: this.autoRefresh
               })
               })
@@ -99,8 +99,8 @@ export struct BottomNavigationComponent {
     .animationDuration(0)
     .animationDuration(0)
     .barHeight($r('app.float.bottom_navigation_barHeight'))
     .barHeight($r('app.float.bottom_navigation_barHeight'))
     .barMode(BarMode.Fixed)
     .barMode(BarMode.Fixed)
-    // TODO:更详细的判断是视频频道
     .barBackgroundColor(this.barBackgroundColor)
     .barBackgroundColor(this.barBackgroundColor)
+    // 备注：鸿蒙目前只有修改三线导航背景方法，对于全面屏导航条手机需要设置背景色并使其扩散到导航区域
     .backgroundColor(this.barBackgroundColor)
     .backgroundColor(this.barBackgroundColor)
     .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
     .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
 
 
@@ -108,17 +108,6 @@ export struct BottomNavigationComponent {
 
 
   }
   }
 
 
-  /**
-   * TODO:更详细的判断视频频道
-   */
-  getFontColor(index: number): Color {
-    if (this.currentNavIndex === 2 && this.barBackgroundColor === Color.Black) {
-      return Color.White
-    } else {
-      return this.currentNavIndex === index ? Color.Red : Color.Gray
-    }
-  }
-
   @Builder
   @Builder
   tabBarBuilder(navItem: BottomNavDTO, index: number) {
   tabBarBuilder(navItem: BottomNavDTO, index: number) {
     Stack({ alignContent: Alignment.Bottom }) {
     Stack({ alignContent: Alignment.Bottom }) {
@@ -126,37 +115,39 @@ export struct BottomNavigationComponent {
         .height(CommonConstants.FULL_PARENT)
         .height(CommonConstants.FULL_PARENT)
         .padding({ bottom: 15, left: 10, right: 10, top: 2 })
         .padding({ bottom: 15, left: 10, right: 10, top: 2 })
         .aspectRatio(this.ASPECT_RATIO_1_1)
         .aspectRatio(this.ASPECT_RATIO_1_1)
+        .gesture(
+          TapGesture({ count: 2 })
+            .onAction((event: GestureEvent) => {
+              if (this.currentNavIndex === index) {
+                // 当前tab，双击事件
+                this.autoRefresh++
+              }
+            })
+        )
 
 
       Text(navItem.name)
       Text(navItem.name)
         .margin({ bottom: $r('app.float.bottom_navigation_margin_bottom') })
         .margin({ bottom: $r('app.float.bottom_navigation_margin_bottom') })
         .fontWeight(this.currentNavIndex === index ? FontWeight.Bold : FontWeight.Normal)
         .fontWeight(this.currentNavIndex === index ? FontWeight.Bold : FontWeight.Normal)
         .textAlign(TextAlign.Center)
         .textAlign(TextAlign.Center)
         .fontSize($r('app.float.font_size_10'))// .fontColor(this.currentNavIndex === index ? Color.Red : Color.Gray)
         .fontSize($r('app.float.font_size_10'))// .fontColor(this.currentNavIndex === index ? Color.Red : Color.Gray)
-        .fontColor(this.getFontColor(index))
+        .fontColor(this.currentNavIndex === index ? navItem.nameCColor : navItem.nameColor)
         .opacity(this.currentNavIndex === index ? this.FULL_OPACITY : this.SIXTY_OPACITY)
         .opacity(this.currentNavIndex === index ? this.FULL_OPACITY : this.SIXTY_OPACITY)
     }
     }
     .height($r('app.float.bottom_navigation_barHeight'))
     .height($r('app.float.bottom_navigation_barHeight'))
     .hoverEffect(HoverEffect.Highlight)
     .hoverEffect(HoverEffect.Highlight)
     .onClick(() => {
     .onClick(() => {
-      if (this.currentNavIndex === index) {
-        // 当前tab，双击事件
-        this.doubleClick(() => {
-          Logger.info(TAG, 'tab double click ')
-          this.autoRefresh++
-        })
+      if (navItem.name === '我的') {
+        this.barBackgroundColor = Color.White
+        this.currentBottomNavInfo = {} as BottomNavDTO
       } else {
       } else {
-        // 切换tab
-        this.currentNavIndex = index;
-        Logger.info(TAG, `onChange, index: ${index}`);
+        this.currentBottomNavInfo = navItem
       }
       }
+
+      this.currentNavIndex = index;
+      Logger.info(TAG, `onChange, index: ${index}`);
+
     })
     })
 
 
-    // .justifyContent(FlexAlign.Center)
-    // .onClick(() => {
-    //   Logger.info(TAG, `onClick, index: ${index}`);
-    //   this.currentNavIndex = index ?? 0;
-    //   this.navController.changeIndex(this.currentNavIndex);
-    // })
   }
   }
 
 
   // 底导切换函数
   // 底导切换函数
@@ -199,17 +190,17 @@ export struct BottomNavigationComponent {
   /**
   /**
    * 双击实现
    * 双击实现
    */
    */
-  doubleClickTime: number = 0
+  // doubleClickTime: number = 0
 
 
   /**
   /**
    * 双击实现
    * 双击实现
    */
    */
-  private doubleClick(fun: () => void) {
-    let now = DateTimeUtils.getTimeStamp()
-    if (now - this.doubleClickTime < 200) {
-      fun()
-    } else {
-      this.doubleClickTime = now
-    }
-  }
+  // private doubleClick(fun: () => void) {
+  //   let now = DateTimeUtils.getTimeStamp()
+  //   if (now - this.doubleClickTime < 200) {
+  //     fun()
+  //   } else {
+  //     this.doubleClickTime = now
+  //   }
+  // }
 }
 }

-import { CompDTO, TopNavDTO } from 'wdBean';
+import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean';
 import { LazyDataSource, Logger } from 'wdKit';
 import { LazyDataSource, Logger } from 'wdKit';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { PageComponent } from './PageComponent';
 import { PageComponent } from './PageComponent';
@@ -26,12 +26,14 @@ export struct TopNavigationComponent {
   @Consume isLayoutFullScreen: boolean
   @Consume isLayoutFullScreen: boolean
   @Consume bottomRectHeight: number
   @Consume bottomRectHeight: number
   @Consume topRectHeight: number
   @Consume topRectHeight: number
+  @Consume @Watch('topOrBottomNavChange') currentBottomNavInfo: BottomNavDTO // 当前底导信息
+  @Consume barBackgroundColor: Color
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
-  @Link barBackgroundColor: Color
   @Link _currentNavIndex?: number;
   @Link _currentNavIndex?: number;
   // 顶导当前选中/焦点下标
   // 顶导当前选中/焦点下标
-  @State currentTopNavSelectedIndex: number = 0;
+  @State @Watch('topOrBottomNavChange') currentTopNavSelectedIndex: number = 0;
+  @State currentTopNavName: string = '';
   // 顶导数据
   // 顶导数据
   @State @Watch('onTopNavigationDataUpdated') topNavList: TopNavDTO[] = []
   @State @Watch('onTopNavigationDataUpdated') topNavList: TopNavDTO[] = []
   @State compList: LazyDataSource<CompDTO> = new LazyDataSource();
   @State compList: LazyDataSource<CompDTO> = new LazyDataSource();
@@ -56,6 +58,21 @@ export struct TopNavigationComponent {
   // 当前底导index
   // 当前底导index
   @State navIndex: number = 0
   @State navIndex: number = 0
 
 
+  topOrBottomNavChange() {
+    if (this.currentBottomNavName === this.currentBottomNavInfo?.name) {
+      this.setBarBackgroundColor()
+    }
+  }
+
+  setBarBackgroundColor() {
+    console.error('setBarBackgroundColor', this.currentTopNavName, this.currentBottomNavInfo?.name)
+    if (this.currentTopNavName === '视频' && this.currentBottomNavInfo?.name === '视频') {
+      this.barBackgroundColor = Color.Black
+    } else {
+      this.barBackgroundColor = Color.White
+    }
+  }
+
   //处理新闻tab顶导频道数据
   //处理新闻tab顶导频道数据
   topNavListHandle() {
   topNavListHandle() {
     let _channelIds: number [] = []
     let _channelIds: number [] = []
@@ -126,10 +143,14 @@ export struct TopNavigationComponent {
     this.channelIds = _channelIds
     this.channelIds = _channelIds
     this.myChannelList = _myChannelList
     this.myChannelList = _myChannelList
 
 
+    this.currentTopNavName = this._currentNavIndex === 0 ? this.myChannelList[0].name : this.topNavList[0].name
+
+
     //缓存首页频道
     //缓存首页频道
     let index = this.myChannelList.findIndex(_item => _item.channelId === this.indexSettingChannelId)
     let index = this.myChannelList.findIndex(_item => _item.channelId === this.indexSettingChannelId)
     if (index > -1) {
     if (index > -1) {
       this.currentTopNavSelectedIndex = index
       this.currentTopNavSelectedIndex = index
+      this.currentTopNavName = this.myChannelList[index].name
     }
     }
   }
   }
 
 
@@ -196,7 +217,6 @@ export struct TopNavigationComponent {
                   groupId: this.groupId + '',
                   groupId: this.groupId + '',
                   pageId: navItem.pageId + '',
                   pageId: navItem.pageId + '',
                   channelId: navItem.channelId + '',
                   channelId: navItem.channelId + '',
-                  barBackgroundColor: $barBackgroundColor
                 })
                 })
               } else
               } else
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
@@ -216,9 +236,10 @@ export struct TopNavigationComponent {
         .barHeight($r('app.float.top_tab_bar_height'))
         .barHeight($r('app.float.top_tab_bar_height'))
         .barMode(BarMode.Scrollable)
         .barMode(BarMode.Scrollable)
         .vertical(false)
         .vertical(false)
-        // item.name === '视频' && this.currentTopNavSelectedIndex === 0 ?
         .barBackgroundColor(this.barBackgroundColor)
         .barBackgroundColor(this.barBackgroundColor)
         .onChange((index: number) => {
         .onChange((index: number) => {
+          this.currentTopNavName = this._currentNavIndex === 0 ? this.myChannelList[index].name : this.topNavList[index].name
+
           Logger.info(TAG, `onChange index : ${index}`);
           Logger.info(TAG, `onChange index : ${index}`);
           if (!this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index]) &&
           if (!this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index]) &&
             !this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])
             !this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])
@@ -256,15 +277,11 @@ export struct TopNavigationComponent {
   }
   }
 
 
   /**
   /**
-   * TODO:更详细的判断视频频道
+   * TODO:根据顶导配置获取颜色展示效果不对，待确认
    */
    */
-  getFontColor(item: TopNavDTO, index: number): Color | string {
-    if (this._currentNavIndex === 2) {
-      if (this.currentTopNavSelectedIndex == 0) {
-        return item.name === '视频' ? Color.White : '#e5e0e0'
-      } else {
-        return this.currentTopNavSelectedIndex === index ? Color.Black : "#999999"
-      }
+  getTopNavFontColor(item: TopNavDTO, index: number): Color | string {
+    if (item.name === '视频' && this.currentBottomNavInfo.name === '视频') {
+      return this.currentTopNavSelectedIndex === index ? Color.White : '#e5e0e0'
     } else {
     } else {
       return this.currentTopNavSelectedIndex === index ? Color.Black : "#999999"
       return this.currentTopNavSelectedIndex === index ? Color.Black : "#999999"
     }
     }
@@ -276,9 +293,10 @@ export struct TopNavigationComponent {
       Text(item.name)
       Text(item.name)
         .fontSize($r('app.float.selected_text_size'))
         .fontSize($r('app.float.selected_text_size'))
         .fontWeight(this.currentTopNavSelectedIndex === index ? FontWeight.Bold : FontWeight.Normal)
         .fontWeight(this.currentTopNavSelectedIndex === index ? FontWeight.Bold : FontWeight.Normal)
-        .fontColor(this.getFontColor(item, index))
-        .padding({ top: $r('app.float.top_tab_item_padding_top') , bottom: $r('app.float.top_tab_item_padding_bottom')})
+        .fontColor(this.getTopNavFontColor(item, index))
+        .padding({ top: $r('app.float.top_tab_item_padding_top'), bottom: $r('app.float.top_tab_item_padding_bottom') })
         .maxLines(this.MAX_LINE)
         .maxLines(this.MAX_LINE)
+      // .backgroundImage(this.currentTopNavSelectedIndex === index ? item.iconCUrl : item.iconUrl)
       if (this.currentTopNavSelectedIndex === index) {
       if (this.currentTopNavSelectedIndex === index) {
         Row()
         Row()
           .width(20)
           .width(20)
@@ -292,18 +310,20 @@ export struct TopNavigationComponent {
       minWidth: $r('app.float.top_tab_item_min_width'),
       minWidth: $r('app.float.top_tab_item_min_width'),
       maxWidth: $r('app.float.top_tab_item_max_width')
       maxWidth: $r('app.float.top_tab_item_max_width')
     })
     })
-    .backgroundColor(Color.Transparent)
+    // .backgroundColor(Color.Transparent)
     .padding({
     .padding({
       left: $r('app.float.top_tab_item_padding_horizontal'),
       left: $r('app.float.top_tab_item_padding_horizontal'),
       right: $r('app.float.top_tab_item_padding_horizontal'),
       right: $r('app.float.top_tab_item_padding_horizontal'),
     })
     })
     .id(`col_tabBar${index}`)
     .id(`col_tabBar${index}`)
     .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })
     .margin({ right: this.myChannelList.length === index + 1 ? 36 : 0 })
+
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
     //处理新闻tab顶导频道数据
     //处理新闻tab顶导频道数据
     this.topNavListHandle()
     this.topNavListHandle()
+    this.setBarBackgroundColor()
   }
   }
 
 
   aboutToDisappear() {
   aboutToDisappear() {

@@ -35,16 +35,8 @@ export class PageRepository {
   }
   }
 
 
   static getPageInfoUrl(pageId: string) {
   static getPageInfoUrl(pageId: string) {
-    let url = HttpUrlUtils.getHost() + HttpUrlUtils.PAGE_INFO_PATH;
-    // TODO 暂定只请求第一页，后续对接分页加载，参数再调整 first_load？
-    url = url + "?channelStrategy=2&loadStrategy=first_load"
-      + "&districtCode=" + HttpUrlUtils.getDistrictCode()
-      + "&provinceCode=" + HttpUrlUtils.getProvinceCode()
-      + "&cityCode=" + HttpUrlUtils.getCityCode()
-      + "&refreshTime=" + DateTimeUtils.getTimeStamp()
-      + "&pageId=" + pageId
-    // Logger.debug("TAG", 'getCompInfoUrl url: '+url);
-    Logger.info(TAG, "getPageInfoUrl url = " + url)
+    let url = HttpUrlUtils.getHost() + HttpUrlUtils.PAGE_INFO_PATH + "?pageId=" + pageId;
+    // Logger.info(TAG, "getPageInfoUrl url = " + url)
     return url;
     return url;
   }
   }
 
 
@@ -293,7 +285,7 @@ export class PageRepository {
   static postExecuteLike(params: postExecuteLikeParams): Promise<ResponseDTO> {
   static postExecuteLike(params: postExecuteLikeParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTELIKE
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTELIKE
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -304,7 +296,7 @@ export class PageRepository {
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTECOLLECTRECORD
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTECOLLECTRECORD
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -314,7 +306,7 @@ export class PageRepository {
   static getContentInteract(params: contentListParams): Promise<ResponseDTO<InteractDataDTO[]>> {
   static getContentInteract(params: contentListParams): Promise<ResponseDTO<InteractDataDTO[]>> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   // 浏览历史新增、删除接口
   // 浏览历史新增、删除接口
@@ -331,7 +323,7 @@ export class PageRepository {
   static fetchBatchAttentionStatus(params: postBatchAttentionStatusParams): Promise<ResponseDTO<postBatchAttentionStatusResult[]>> {
   static fetchBatchAttentionStatus(params: postBatchAttentionStatusParams): Promise<ResponseDTO<postBatchAttentionStatusResult[]>> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -340,7 +332,7 @@ export class PageRepository {
   static postInteractAccentionOperate(params: postInteractAccentionOperateParams): Promise<ResponseDTO> {
   static postInteractAccentionOperate(params: postInteractAccentionOperateParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_ACCENTION_OPERATION
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_ACCENTION_OPERATION
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   static fetchNewspaperInfo(date: string) {
   static fetchNewspaperInfo(date: string) {

@@ -245,7 +245,7 @@ export class ContentDetailRequest {
   static getContentInteract(params: contentListParams): Promise<ResponseDTO<InteractDataDTO[]>> {
   static getContentInteract(params: contentListParams): Promise<ResponseDTO<InteractDataDTO[]>> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -255,7 +255,7 @@ export class ContentDetailRequest {
   static postBatchLikeAndCollectStatus(params: batchLikeAndCollectParams): Promise<ResponseDTO<batchLikeAndCollectResult[]>> {
   static postBatchLikeAndCollectStatus(params: batchLikeAndCollectParams): Promise<ResponseDTO<batchLikeAndCollectResult[]>> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_STATUS
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_STATUS
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -265,7 +265,7 @@ export class ContentDetailRequest {
   static postBatchAttentionStatus(params: postBatchAttentionStatusParams): Promise<ResponseDTO<postBatchAttentionStatusResult[]>> {
   static postBatchAttentionStatus(params: postBatchAttentionStatusParams): Promise<ResponseDTO<postBatchAttentionStatusResult[]>> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
 
 
@@ -277,7 +277,7 @@ export class ContentDetailRequest {
   static postRecommendVideoList(params: recommentVideoListParams): Promise<ResponseDTO<ContentDetailDTO[]>> {
   static postRecommendVideoList(params: recommentVideoListParams): Promise<ResponseDTO<ContentDetailDTO[]>> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.RECOMMEND_VIDEOLIST
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.RECOMMEND_VIDEOLIST
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -288,7 +288,7 @@ export class ContentDetailRequest {
   static postExecuteLike(params: postExecuteLikeParams): Promise<ResponseDTO> {
   static postExecuteLike(params: postExecuteLikeParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTELIKE
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTELIKE
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -299,7 +299,7 @@ export class ContentDetailRequest {
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
   static postExecuteCollectRecord(params: postExecuteCollectRecordParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTECOLLECTRECORD
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_EXECUTECOLLECTRECORD
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -309,7 +309,7 @@ export class ContentDetailRequest {
   static postPointLevelOperate(params: postPointLevelOperateParams): Promise<ResponseDTO> {
   static postPointLevelOperate(params: postPointLevelOperateParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.USERPOINT_OPERATE
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.USERPOINT_OPERATE
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -318,7 +318,7 @@ export class ContentDetailRequest {
   static postCommentPublish(params: postCommentPublishParams): Promise<ResponseDTO> {
   static postCommentPublish(params: postCommentPublishParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.COMMENT_PUBLISH
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.COMMENT_PUBLISH
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
 
 
@@ -328,7 +328,7 @@ export class ContentDetailRequest {
   static postInteractBrowsOperate(params: postInteractBrowsOperateParams): Promise<ResponseDTO> {
   static postInteractBrowsOperate(params: postInteractBrowsOperateParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_BROWS_OPERATE
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_BROWS_OPERATE
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 
 
   /**
   /**
@@ -337,6 +337,6 @@ export class ContentDetailRequest {
   static postInteractAccentionOperate(params: postInteractAccentionOperateParams): Promise<ResponseDTO> {
   static postInteractAccentionOperate(params: postInteractAccentionOperateParams): Promise<ResponseDTO> {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_ACCENTION_OPERATION
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_ACCENTION_OPERATION
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    return WDHttp.post0(url, params, headers)
+    return WDHttp.post(url, params, headers)
   }
   }
 }
 }

@@ -32,15 +32,15 @@ export struct DetailPlayLivePage {
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     Logger.info(TAG, `wyj-aboutToAppear`)
     Logger.info(TAG, `wyj-aboutToAppear`)
-    // this.listener?.on("change", (mediaQueryResult) => {
-    //   Logger.info(TAG, `change;${mediaQueryResult.matches}`)
-    //   if (mediaQueryResult?.matches) {
-    //     this.displayDirection = DisplayDirection.VIDEO_HORIZONTAL
-    //   } else {
-    //     this.displayDirection = DisplayDirection.VERTICAL
-    //   }
-    //   WindowModel.shared.setMainWindowFullScreen(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL)
-    // })
+    this.listener?.on("change", (mediaQueryResult) => {
+      Logger.info(TAG, `change;${mediaQueryResult.matches}`)
+      if (mediaQueryResult?.matches) {
+        this.displayDirection = DisplayDirection.VIDEO_HORIZONTAL
+      } else {
+        this.displayDirection = DisplayDirection.VERTICAL
+      }
+      WindowModel.shared.setMainWindowFullScreen(this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL)
+    })
     this.getLiveDetails()
     this.getLiveDetails()
     this.getLiveRoomData()
     this.getLiveRoomData()
   }
   }
@@ -72,9 +72,8 @@ export struct DetailPlayLivePage {
 
 
   onPageHideCus(): void {
   onPageHideCus(): void {
     Logger.info(TAG, `wyj-onPageHideCus`)
     Logger.info(TAG, `wyj-onPageHideCus`)
-    devicePLSensorManager.devicePLSensorOff();
-    // WindowModel.shared.setPreferredOrientation(window.Orientation.AUTO_ROTATION_RESTRICTED);
-    this.playerController?.pause()
+    this.listener.off('change');
+    // devicePLSensorManager.devicePLSensorOff();
   }
   }
 
 
   onBackPressCus(): boolean | void {
   onBackPressCus(): boolean | void {
@@ -86,9 +85,9 @@ export struct DetailPlayLivePage {
     WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
     WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
     window.Orientation.PORTRAIT :
     window.Orientation.PORTRAIT :
     window.Orientation.LANDSCAPE)
     window.Orientation.LANDSCAPE)
-    devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
-    window.Orientation.PORTRAIT :
-    window.Orientation.LANDSCAPE);
+    // devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
+    // window.Orientation.PORTRAIT :
+    // window.Orientation.LANDSCAPE);
     return true
     return true
   }
   }
 
 

@@ -83,9 +83,9 @@ export struct TabLiveItemComponent {
         //图文
         //图文
         if (this.item.dataType === 'ZH_TEXT_AND_IMAGE_MSG') {
         if (this.item.dataType === 'ZH_TEXT_AND_IMAGE_MSG') {
           List({ space: this.item.pictureUrls.length == 1 ? 0 : 5 }) {
           List({ space: this.item.pictureUrls.length == 1 ? 0 : 5 }) {
-            ForEach(this.item.pictureUrls, (item: string, index: number) => {
+            ForEach(this.item.pictureUrls, (itemSub: string, index: number) => {
               ListItem() {
               ListItem() {
-                Image(item)
+                Image(itemSub)
                   .width(`${100 / this.item.pictureUrls.length}%`)
                   .width(`${100 / this.item.pictureUrls.length}%`)
                   .height(this.item.pictureUrls.length > 1 ? 70 : 174)
                   .height(this.item.pictureUrls.length > 1 ? 70 : 174)
                   .objectFit(ImageFit.Auto)
                   .objectFit(ImageFit.Auto)

 import { window } from '@kit.ArkUI'
 import { window } from '@kit.ArkUI'
 import { NumberFormatterUtils, WindowModel } from 'wdKit/Index'
 import { NumberFormatterUtils, WindowModel } from 'wdKit/Index'
-import { devicePLSensorManager } from 'wdDetailPlayApi/Index'
 import { DateFormatUtil, WDPlayerController } from 'wdPlayer/Index'
 import { DateFormatUtil, WDPlayerController } from 'wdPlayer/Index'
 import { LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index'
 import { LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index'
 import { DisplayDirection } from 'wdConstant/Index'
 import { DisplayDirection } from 'wdConstant/Index'
@@ -69,9 +68,9 @@ export struct PlayUIComponent {
             WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
             WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
             window.Orientation.PORTRAIT :
             window.Orientation.PORTRAIT :
             window.Orientation.LANDSCAPE)
             window.Orientation.LANDSCAPE)
-            devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
-            window.Orientation.PORTRAIT :
-            window.Orientation.LANDSCAPE);
+            // devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
+            // window.Orientation.PORTRAIT :
+            // window.Orientation.LANDSCAPE);
           })
           })
         if (this.liveDetailsBean.liveInfo?.liveState != 'wait') {
         if (this.liveDetailsBean.liveInfo?.liveState != 'wait') {
           Text(this.liveDetailsBean.newsTitle)
           Text(this.liveDetailsBean.newsTitle)
@@ -191,15 +190,12 @@ export struct PlayUIComponent {
 
 
   @Builder
   @Builder
   getMiddleUIComponent() {
   getMiddleUIComponent() {
-    Stack() {
-      Text('播放功能暂时关闭')
-        .fontColor(Color.White)
-    }.alignContent(Alignment.Center)
-    .layoutWeight(1)
-    .width('100%')
-    .onClick(() => {
-      this.isMenuVisible = !this.isMenuVisible
-    })
+    Stack()
+      .layoutWeight(1)
+      .width('100%')
+      .onClick(() => {
+        this.isMenuVisible = !this.isMenuVisible
+      })
   }
   }
 
 
   @Builder
   @Builder
@@ -238,9 +234,9 @@ export struct PlayUIComponent {
             WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
             WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
             window.Orientation.PORTRAIT :
             window.Orientation.PORTRAIT :
             window.Orientation.LANDSCAPE)
             window.Orientation.LANDSCAPE)
-            devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
-            window.Orientation.PORTRAIT :
-            window.Orientation.LANDSCAPE);
+            // devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
+            // window.Orientation.PORTRAIT :
+            // window.Orientation.LANDSCAPE);
           })
           })
       }
       }
     }
     }

@@ -13,7 +13,7 @@ export struct TopPlayComponent {
   aboutToAppear(): void {
   aboutToAppear(): void {
     if (this.playerController) {
     if (this.playerController) {
       this.playerController.onCanplay = () => {
       this.playerController.onCanplay = () => {
-        // this.playerController?.play()
+        this.playerController?.play()
       }
       }
     }
     }
   }
   }
@@ -31,7 +31,7 @@ export struct TopPlayComponent {
       } else if (this.liveDetailsBean.liveInfo.liveState == 'end') {
       } else if (this.liveDetailsBean.liveInfo.liveState == 'end') {
         playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
         playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
       }
       }
-      // this.playerController?.firstPlay(playUrl);
+      this.playerController?.firstPlay(playUrl);
     }
     }
   }
   }
 
 

@@ -133,7 +133,7 @@ export struct DetailPlayShortVideoPage {
   aboutToAppear() {
   aboutToAppear() {
     this.videoLandScape = this.contentDetailData?.videoInfo[0]?.videoLandScape
     this.videoLandScape = this.contentDetailData?.videoInfo[0]?.videoLandScape
     this.playerController.onCanplay = () => {
     this.playerController.onCanplay = () => {
-      if (this.index == 0 || this.currentIndex === this.index) {
+      if ((this.index == 0 || this.currentIndex === this.index) && this.switchVideoStatus) {
         this.playerController.play()
         this.playerController.play()
       }
       }
     }
     }

@@ -38,7 +38,7 @@ export struct VideoChannelDetail {
   // private recommend?: string = '' // 0.非推荐，1.推荐；
   // private recommend?: string = '' // 0.非推荐，1.推荐；
   @Link @Watch('navIndexChange') bottomNavIndex: number
   @Link @Watch('navIndexChange') bottomNavIndex: number
   @Link @Watch('navIndexChange') topNavIndex: number
   @Link @Watch('navIndexChange') topNavIndex: number
-  @Link barBackgroundColor: Color
+  @Consume barBackgroundColor: Color
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   @Provide showComment: boolean = false
   @Provide showComment: boolean = false
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
   @Provide windowWidth: number = AppStorage.get<number>('windowWidth') || 0
@@ -72,11 +72,11 @@ export struct VideoChannelDetail {
   navIndexChange() {
   navIndexChange() {
     console.log('navIndexChange', this.bottomNavIndex, this.topNavIndex)
     console.log('navIndexChange', this.bottomNavIndex, this.topNavIndex)
     if (this.bottomNavIndex === 2 && this.topNavIndex === 0) {
     if (this.bottomNavIndex === 2 && this.topNavIndex === 0) {
-      this.barBackgroundColor = Color.Black
+      // this.barBackgroundColor = Color.Black
       this.switchVideoStatus = true
       this.switchVideoStatus = true
       this.openFullScreen()
       this.openFullScreen()
     } else {
     } else {
-      this.barBackgroundColor = Color.Transparent
+      // this.barBackgroundColor = Color.Transparent
       this.switchVideoStatus = false
       this.switchVideoStatus = false
       this.closeFullScreen()
       this.closeFullScreen()
     }
     }

@@ -12,9 +12,14 @@ import { WDPlayerController } from 'wdPlayer/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 
 
+interface ILikeStyleResp {
+  url: Resource;
+  name: string;
+}
 
 
 const TAG = 'PlayerRightView';
 const TAG = 'PlayerRightView';
 
 
+
 //视频点播页右侧操作栏：点赞/收藏/评论/分享 竖着排列
 //视频点播页右侧操作栏：点赞/收藏/评论/分享 竖着排列
 @Component
 @Component
 export struct PlayerRightView {
 export struct PlayerRightView {
@@ -210,15 +215,26 @@ export struct PlayerRightView {
   /**
   /**
    * 将点赞样式转换为icon
    * 将点赞样式转换为icon
    */
    */
-  transLikeStyle2Icon(): Resource {
+  transLikeStyle(): ILikeStyleResp {
     if (this.likesStyle === 1) {
     if (this.likesStyle === 1) {
-      return this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_like_check`) : $r(`app.media.ic_like_uncheck`)
+      return {
+        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_like_check`) : $r(`app.media.ic_like_uncheck`),
+        name: '点赞'
+      }
     } else if (this.likesStyle === 2) {
     } else if (this.likesStyle === 2) {
-      return this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_thub_check`) : $r(`app.media.ic_thub_uncheck`)
+      return {
+        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_thub_check`) : $r(`app.media.ic_thub_uncheck`),
+        name: '祈祷'
+      }
     } else if (this.likesStyle === 3) {
     } else if (this.likesStyle === 3) {
-      return this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_candle_check`) : $r(`app.media.ic_candle_uncheck`)
+      return {
+        url: this.newsStatusOfUser.likeStatus === '1' ? $r(`app.media.ic_candle_check`) : $r(`app.media.ic_candle_uncheck`),
+        name: '默哀'
+      }
+    }
+    return {
+      url: $r(`app.media.icon_like_ckeck`), name: '点赞'
     }
     }
-    return $r(`app.media.icon_like_ckeck`)
   }
   }
 
 
   transNum2String(name: 'likeNum' | 'collectNum' | 'commentNum') {
   transNum2String(name: 'likeNum' | 'collectNum' | 'commentNum') {
@@ -238,14 +254,14 @@ export struct PlayerRightView {
   @Builder
   @Builder
   likeBuilderView() {
   likeBuilderView() {
     Column() {
     Column() {
-      Image(this.transLikeStyle2Icon())
+      Image(this.transLikeStyle().url)
         .width(32)
         .width(32)
         .aspectRatio(1)
         .aspectRatio(1)
         .onClick(() => {
         .onClick(() => {
           // TODO:点赞动画
           // TODO:点赞动画
           this.toggleLikeStatus()
           this.toggleLikeStatus()
         })
         })
-      Text(this.transNum2String('likeNum') || '赞')
+      Text(this.transNum2String('likeNum') || this.transLikeStyle().name)
         .width('100%')
         .width('100%')
         .fontWeight(500)
         .fontWeight(500)
         .textAlign(TextAlign.Center)
         .textAlign(TextAlign.Center)
@@ -253,6 +269,7 @@ export struct PlayerRightView {
         .fontColor('#FFFFFF')
         .fontColor('#FFFFFF')
         .maxLines(1)
         .maxLines(1)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
+        .margin({ top: 2 })
     }
     }
     .margin({ bottom: 20 })
     .margin({ bottom: 20 })
     .visibility(this.likesStyle !== 4 ? Visibility.Visible : Visibility.None)
     .visibility(this.likesStyle !== 4 ? Visibility.Visible : Visibility.None)
@@ -278,6 +295,7 @@ export struct PlayerRightView {
         .fontColor('#FFFFFF')
         .fontColor('#FFFFFF')
         .maxLines(1)
         .maxLines(1)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
+        .margin({ top: 2 })
     }
     }
     .margin({ bottom: 20 })
     .margin({ bottom: 20 })
   }
   }
@@ -302,6 +320,7 @@ export struct PlayerRightView {
         .fontColor('#FFFFFF')
         .fontColor('#FFFFFF')
         .maxLines(1)
         .maxLines(1)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
+        .margin({ top: 2 })
     }
     }
     .margin({ bottom: 20 })
     .margin({ bottom: 20 })
   }
   }
@@ -326,6 +345,7 @@ export struct PlayerRightView {
         .fontColor('#FFFFFF')
         .fontColor('#FFFFFF')
         .maxLines(1)
         .maxLines(1)
         .textOverflow({ overflow: TextOverflow.Ellipsis })
         .textOverflow({ overflow: TextOverflow.Ellipsis })
+        .margin({ top: 2 })
     }
     }
     .margin({ bottom: 20 })
     .margin({ bottom: 20 })
   }
   }