Compare commits
3 Commits
a
...
develop_si
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb3a4e9bc7 | ||
|
|
3ce4398e67 | ||
|
|
78153bae0c |
@@ -1,5 +1,5 @@
|
|||||||
@import "../../../../../style/CommonStyle.module.less";
|
@import '../../../../../style/CommonStyle.module.less';
|
||||||
@import "../../../../../style/utils.module.less";
|
@import '../../../../../style/utils.module.less';
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
}
|
}
|
||||||
.name {
|
.name {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 36px;
|
font-size: 30px;
|
||||||
color: @COLOR_WHITE;
|
color: @COLOR_WHITE;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
@import "../../../../../style/CommonStyle.module.less";
|
@import '../../../../../style/CommonStyle.module.less';
|
||||||
@import "../../../../../style/utils.module.less";
|
@import '../../../../../style/utils.module.less';
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
}
|
}
|
||||||
.name {
|
.name {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 36px;
|
font-size: 30px;
|
||||||
color: @COLOR_WHITE;
|
color: @COLOR_WHITE;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.btmLayer2 {
|
.btmLayer2 {
|
||||||
margin: 5px 0;
|
margin: 5px 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@@ -4,16 +4,22 @@ import { useDispatch } from 'react-redux';
|
|||||||
|
|
||||||
import Spotlight from '@enact/spotlight';
|
import Spotlight from '@enact/spotlight';
|
||||||
|
|
||||||
|
import { sendLogTotalRecommend } from '../../../../actions/logActions';
|
||||||
// <<<<<<< HEAD
|
// <<<<<<< HEAD
|
||||||
import { updatePanel } from '../../../../actions/panelActions';
|
import { updatePanel } from '../../../../actions/panelActions';
|
||||||
import TVirtualGridList from '../../../../components/TVirtualGridList/TVirtualGridList';
|
import TVirtualGridList from '../../../../components/TVirtualGridList/TVirtualGridList';
|
||||||
import { LOG_CONTEXT_NAME, LOG_MENU, LOG_MESSAGE_ID, panel_names } from '../../../../utils/Config';
|
import {
|
||||||
|
LOG_CONTEXT_NAME,
|
||||||
|
LOG_MENU,
|
||||||
|
LOG_MESSAGE_ID,
|
||||||
|
panel_names,
|
||||||
|
} from '../../../../utils/Config';
|
||||||
import { $L } from '../../../../utils/helperMethods';
|
import { $L } from '../../../../utils/helperMethods';
|
||||||
import PlayerItemCard, { TYPES } from '../../PlayerItemCard/PlayerItemCard';
|
import PlayerItemCard, { TYPES } from '../../PlayerItemCard/PlayerItemCard';
|
||||||
import ListEmptyContents from '../TabContents/ListEmptyContents/ListEmptyContents';
|
import ListEmptyContents from '../TabContents/ListEmptyContents/ListEmptyContents';
|
||||||
import css from './LiveChannelContents.module.less';
|
import css from './LiveChannelContents.module.less';
|
||||||
import cssV2 from './LiveChannelContents.v2.module.less';
|
import cssV2 from './LiveChannelContents.v2.module.less';
|
||||||
import { sendLogTotalRecommend } from '../../../../actions/logActions';
|
|
||||||
// =======
|
// =======
|
||||||
// import { updatePanel } from "../../../../actions/panelActions";
|
// import { updatePanel } from "../../../../actions/panelActions";
|
||||||
// import TVirtualGridList from "../../../../components/TVirtualGridList/TVirtualGridList";
|
// import TVirtualGridList from "../../../../components/TVirtualGridList/TVirtualGridList";
|
||||||
@@ -40,7 +46,7 @@ export default function LiveChannelContents({
|
|||||||
handleItemFocus,
|
handleItemFocus,
|
||||||
tabTitle,
|
tabTitle,
|
||||||
panelInfo,
|
panelInfo,
|
||||||
// <<<<<<< HEAD
|
// <<<<<<< HEAD
|
||||||
direction = 'vertical',
|
direction = 'vertical',
|
||||||
version = 1,
|
version = 1,
|
||||||
isFilteredByPatnr19,
|
isFilteredByPatnr19,
|
||||||
@@ -49,13 +55,13 @@ export default function LiveChannelContents({
|
|||||||
const isClickBlocked = useRef(false);
|
const isClickBlocked = useRef(false);
|
||||||
const blockTimeoutRef = useRef(null);
|
const blockTimeoutRef = useRef(null);
|
||||||
|
|
||||||
// =======
|
// =======
|
||||||
// isFilteredByPatnr19,
|
// isFilteredByPatnr19,
|
||||||
// }) {
|
// }) {
|
||||||
// const dispatch = useDispatch();
|
// const dispatch = useDispatch();
|
||||||
// const isClickBlocked = useRef(false);
|
// const isClickBlocked = useRef(false);
|
||||||
const scrollToRef = useRef(null);
|
const scrollToRef = useRef(null);
|
||||||
// >>>>>>> gitlab/develop
|
// >>>>>>> gitlab/develop
|
||||||
const handleFocus = useCallback(
|
const handleFocus = useCallback(
|
||||||
() => () => {
|
() => () => {
|
||||||
if (handleItemFocus) {
|
if (handleItemFocus) {
|
||||||
@@ -181,15 +187,24 @@ export default function LiveChannelContents({
|
|||||||
startDt={strtDt}
|
startDt={strtDt}
|
||||||
endDt={endDt}
|
endDt={endDt}
|
||||||
currentTime={currentTime}
|
currentTime={currentTime}
|
||||||
// <<<<<<< HEAD
|
currentVideoVisible={currentVideoShowId === liveInfos[index].showId}
|
||||||
|
// <<<<<<< HEAD
|
||||||
version={version}
|
version={version}
|
||||||
// =======
|
// =======
|
||||||
// currentVideoVisible={currentVideoShowId === liveInfos[index].showId}
|
// currentVideoVisible={currentVideoShowId === liveInfos[index].showId}
|
||||||
// >>>>>>> gitlab/develop
|
// >>>>>>> gitlab/develop
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
[liveInfos, currentTime, currentVideoShowId, isClickBlocked, dispatch, handleFocus, version]
|
[
|
||||||
|
liveInfos,
|
||||||
|
currentTime,
|
||||||
|
currentVideoShowId,
|
||||||
|
isClickBlocked,
|
||||||
|
dispatch,
|
||||||
|
handleFocus,
|
||||||
|
version,
|
||||||
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
const containerClass = version === 2 ? cssV2.container : css.container;
|
const containerClass = version === 2 ? cssV2.container : css.container;
|
||||||
|
|||||||
Reference in New Issue
Block a user