Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhenghy
2024-04-22 19:19:22 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6e5748eb06e7b098c421c7613c29af1246db1c93
6e5748eb
1 parent
e64d7c8c
修改直播入口
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
27 deletions
sight_harmony/commons/wdRouter/src/main/ets/router/Action2Page.ets
sight_harmony/commons/wdRouter/src/main/ets/router/WDRouterPage.ets
sight_harmony/commons/wdRouter/src/main/ets/utils/ProcessUtils.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/HorizontalStrokeCardThreeTwoRadioForOneComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveHorizontalReservationComponent.ets
sight_harmony/features/wdDetailPlayLive/src/main/resources/base/profile/main_pages.json
sight_harmony/commons/wdRouter/src/main/ets/router/Action2Page.ets
View file @
6e5748e
...
...
@@ -50,11 +50,7 @@ export function registerRouter() {
Action2Page.register("JUMP_DETAIL_PAGE", (action: Action) => {
if (action.params?.detailPageType == 2 || action.params?.detailPageType == 6) {
if (action.params?.liveStyle === 0) {
return WDRouterPage.detailPlayLivePage
} else {
return WDRouterPage.detailPlayVLivePage
}
return WDRouterPage.detailPlayLiveCommon
} else if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
return WDRouterPage.detailVideoListPage
} else if (action.params?.detailPageType == 9) {
...
...
sight_harmony/commons/wdRouter/src/main/ets/router/WDRouterPage.ets
View file @
6e5748e
...
...
@@ -54,6 +54,7 @@ export class WDRouterPage {
// 直播详情页
static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");
static detailPlayVLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayVLivePage");
static detailPlayLiveCommon = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLiveCommon");
// 多图(图集)详情页
static multiPictureDetailPage = new WDRouterPage("phone", "ets/pages/detail/MultiPictureDetailPage");
//大图列表页
...
...
sight_harmony/commons/wdRouter/src/main/ets/utils/ProcessUtils.ets
View file @
6e5748e
...
...
@@ -4,6 +4,7 @@ import { Logger } from 'wdKit';
import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
import { WDRouterRule } from '../router/WDRouterRule';
import { ContentConstants } from 'wdConstant';
// import { LiveModel } from '../viewmodel/LiveModel';
const TAG = 'ProcessUtils';
...
...
@@ -25,7 +26,7 @@ export class ProcessUtils {
return;
}
let type = content.objectType;
console.log(TAG,
'objectType',
`${JSON.stringify(content)}`);
console.log(TAG,
'objectType',
`${JSON.stringify(content)}`);
switch (type) {
case ContentConstants.TYPE_NONE:
Logger.debug(TAG, "processPage, do nothing");
...
...
@@ -164,15 +165,11 @@ export class ProcessUtils {
}
private static async gotoLive(content: ContentDTO) {
// const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
// const liveStyle = liveDetail[0].liveInfo.liveStyle
// const liveState = liveDetail[0].liveInfo.liveState
let taskAction: Action = {
type: 'JUMP_DETAIL_PAGE',
params: {
detailPageType: 2,
contentID: content?.objectId,
// liveStyle: liveState === 'wait' ? 0 : liveStyle,
extra: {
relType: content?.relType,
relId: content?.relId,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/view/HorizontalStrokeCardThreeTwoRadioForOneComponent.ets
View file @
6e5748e
...
...
@@ -68,20 +68,12 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
}
async gotoLive(content: ContentDTO) {
const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
const liveStyle = liveDetail[0].liveInfo.liveStyle
const liveState = liveDetail[0].liveInfo.liveState
console.error('liveDetail===', liveDetail)
let taskAction: Action = {
type: 'JUMP_DETAIL_PAGE',
params: {
detailPageType: 2,
contentID: content?.objectId,
liveStyle: liveState === 'wait' ? 0 : liveStyle,
extra: {
relType: content?.relType,
relId: content?.relId,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/view/LiveHorizontalReservationComponent.ets
View file @
6e5748e
...
...
@@ -108,20 +108,12 @@ export struct LiveHorizontalReservationComponent {
}
async gotoLive(content: ContentDTO) {
const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
const liveStyle = liveDetail[0].liveInfo.liveStyle
const liveState = liveDetail[0].liveInfo.liveState
console.error('liveDetail===', liveDetail)
let taskAction: Action = {
type: 'JUMP_DETAIL_PAGE',
params: {
detailPageType: 2,
contentID: content?.objectId,
liveStyle: liveState === 'wait' ? 0 : liveStyle,
extra: {
relType: content?.relType,
relId: content?.relId,
...
...
sight_harmony/features/wdDetailPlayLive/src/main/resources/base/profile/main_pages.json
View file @
6e5748e
{
"src"
:
[
"pages/DetailPlayLivePage"
,
"pages/DetailPlayVLivePage"
"pages/DetailPlayVLivePage"
,
"pages/DetailPlayLiveCommon"
]
}
\ No newline at end of file
...
...
Please
register
or
login
to post a comment