3 Commits

Author SHA1 Message Date
junghoon86.park
cb3a4e9bc7 [live영상] now playing노출 관련 수정
- currentVideoVisible 추가
2025-12-15 15:22:09 +09:00
junghoon86.park
3ce4398e67 [상품상세] 폰트수정
- 폰트수정
2025-12-15 14:31:13 +09:00
junghoon86.park
78153bae0c [상품상세] 폰트수정
- 글자크기가 디자인과 맞지 않아 이부분 수정.
2025-12-15 14:29:54 +09:00
3 changed files with 36 additions and 21 deletions

View File

@@ -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%;
} }

View File

@@ -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%;
} }

View File

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