yuzhilin

fix

@@ -9,6 +9,10 @@ export class HttpUrlUtils { @@ -9,6 +9,10 @@ export class HttpUrlUtils {
9 */ 9 */
10 static readonly BOTTOM_NAV_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup"; 10 static readonly BOTTOM_NAV_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup";
11 /** 11 /**
  12 + * 底导详情接口
  13 + */
  14 + static readonly BOTTOM_NAV_DETAIL_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup/detail";
  15 + /**
12 * 展现pageInfo接口 16 * 展现pageInfo接口
13 */ 17 */
14 static readonly PAGE_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/pageInfo"; 18 static readonly PAGE_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/pageInfo";
1 // navigation 1 // navigation
2 -export { NavigationBodyDTO } from './src/main/ets/bean/navigation/NavigationBodyDTO'; 2 +export { NavigationBodyDTO, NavigationDetailDTO } from './src/main/ets/bean/navigation/NavigationBodyDTO';
3 3
4 export { BottomNavDTO } from './src/main/ets/bean/navigation/BottomNavDTO'; 4 export { BottomNavDTO } from './src/main/ets/bean/navigation/BottomNavDTO';
5 5
@@ -40,3 +40,20 @@ export interface BottomNavDTO { @@ -40,3 +40,20 @@ export interface BottomNavDTO {
40 fmorningAndEveningUrl: string; // 迭代四:早晚报背景框 40 fmorningAndEveningUrl: string; // 迭代四:早晚报背景框
41 dropDownAnimationColor: string; // 下拉加载动画颜色,1白色,2灰色。未配置值是null 41 dropDownAnimationColor: string; // 下拉加载动画颜色,1白色,2灰色。未配置值是null
42 } 42 }
  43 +
  44 +export interface BottomNavCompDTO {
  45 + id: string;
  46 + navId: string;
  47 + compType: string;
  48 + compStyle: string;
  49 + extraData: string;
  50 + leftIconUrl: string;
  51 + leftObjectId: string;
  52 + leftRelId: string;
  53 + leftObjectType: string; //0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,14动态图文,15动态视频
  54 + leftObjectLevel: string; // 对象分类;频道(1:一级频道,2:二级频道),专题(21:文章专题,22:音频专题,23:直播专题,24:话题专题)
  55 + leftObjectPageId: string; //leftObjectType=5,11;返回对应页面id
  56 + leftLinkUrl: string;
  57 + rightIconUrl: string;
  58 + immersiveRightIconUrl: string;
  59 +}
1 -import { BottomNavDTO } from './BottomNavDTO'; 1 +import { BottomNavDTO, BottomNavCompDTO } from './BottomNavDTO';
  2 +import { TopNavDTO } from './TopNavDTO';
2 3
3 /** 4 /**
4 * 导航Body数据 5 * 导航Body数据
@@ -11,3 +12,9 @@ export interface NavigationBodyDTO { @@ -11,3 +12,9 @@ export interface NavigationBodyDTO {
11 immersiveBackgroundColor: string; // 迭代二新增-底部导航背景色(沉浸式频道) 12 immersiveBackgroundColor: string; // 迭代二新增-底部导航背景色(沉浸式频道)
12 nightBackgroundColor: string; // 迭代三新增-底部导航背景色(夜间模式) 13 nightBackgroundColor: string; // 迭代三新增-底部导航背景色(夜间模式)
13 } 14 }
  15 +
  16 +export interface NavigationDetailDTO {
  17 + id: string; // 迭代二新增-底部导航背景色(信息流频道)
  18 + bottomNavCompList: BottomNavCompDTO[];
  19 + topNavChannelList: TopNavDTO[];
  20 +}
@@ -61,7 +61,7 @@ export struct ImageAndTextPageComponent { @@ -61,7 +61,7 @@ export struct ImageAndTextPageComponent {
61 .height(28) 61 .height(28)
62 Text(this.publishTime) 62 Text(this.publishTime)
63 .fontColor($r('app.color.color_B0B0B0')) 63 .fontColor($r('app.color.color_B0B0B0'))
64 - .fontSize($r('app.float.font_size_13')) 64 + .fontSize(13)
65 } 65 }
66 .width(CommonConstants.FULL_WIDTH) 66 .width(CommonConstants.FULL_WIDTH)
67 .height(32) 67 .height(32)
@@ -64,8 +64,8 @@ export struct ImageAndTextWebComponent { @@ -64,8 +64,8 @@ export struct ImageAndTextWebComponent {
64 creatorId: creatorId, 64 creatorId: creatorId,
65 cnsTraceId: '', 65 cnsTraceId: '',
66 isLogin: isLogin, 66 isLogin: isLogin,
67 - loadImageOnlyWifiSwitch: loadImageOnlyWifiSwitch ? '2' : '1',  
68 - networkStatus: Number(NetworkUtil.isNetConnected()), 67 + loadImageOnlyWifiSwitch: loadImageOnlyWifiSwitch ? '1' : '2',
  68 + networkStatus: Number(NetworkUtil.getNetworkType()),
69 darkMode: 'light', 69 darkMode: 'light',
70 fontSizes: 'small' 70 fontSizes: 'small'
71 71