Compare commits
4 Commits
a
...
develop_si
| Author | SHA1 | Date | |
|---|---|---|---|
| 0cd22f4989 | |||
|
|
cb3a4e9bc7 | ||
|
|
3ce4398e67 | ||
|
|
78153bae0c |
@@ -106,7 +106,7 @@ export const panelHistoryMiddleware = (store) => (next) => (action) => {
|
||||
const stateAfter = store.getState();
|
||||
const panelHistoryAfter = stateAfter.panelHistory;
|
||||
const panelsAfter = stateAfter.panels.panels;
|
||||
console.log('[PANEL_HISTORY] After PUSH_PANEL:', {
|
||||
console.log(`[PANEL_HISTORY] PUSH_PANEL: ${panelName}`, {
|
||||
panelHistory: panelHistoryAfter,
|
||||
panels: panelsAfter,
|
||||
});
|
||||
@@ -162,7 +162,7 @@ export const panelHistoryMiddleware = (store) => (next) => (action) => {
|
||||
const stateAfter = store.getState();
|
||||
const panelHistoryAfter = stateAfter.panelHistory;
|
||||
const panelsAfter = stateAfter.panels.panels;
|
||||
console.log('[PANEL_HISTORY] After POP_PANEL:', {
|
||||
console.log(`[PANEL_HISTORY] POP_PANEL: ${topPanel.name}`, {
|
||||
panelHistory: panelHistoryAfter,
|
||||
panels: panelsAfter,
|
||||
});
|
||||
@@ -210,7 +210,7 @@ export const panelHistoryMiddleware = (store) => (next) => (action) => {
|
||||
const stateAfter = store.getState();
|
||||
const panelHistoryAfter = stateAfter.panelHistory;
|
||||
const panelsAfter = stateAfter.panels.panels;
|
||||
console.log('[PANEL_HISTORY] After UPDATE_PANEL:', {
|
||||
console.log(`[PANEL_HISTORY] UPDATE_PANEL: ${panelName}`, {
|
||||
panelHistory: panelHistoryAfter,
|
||||
panels: panelsAfter,
|
||||
});
|
||||
@@ -292,7 +292,10 @@ export const panelHistoryMiddleware = (store) => (next) => (action) => {
|
||||
const stateAfter = store.getState();
|
||||
const panelHistoryAfter = stateAfter.panelHistory;
|
||||
const panelsAfter = stateAfter.panels.panels;
|
||||
console.log('[PANEL_HISTORY] After RESET_PANELS:', {
|
||||
const resetPanelName = (action.payload && action.payload.length > 0)
|
||||
? action.payload[0].name
|
||||
: 'homepanel';
|
||||
console.log(`[PANEL_HISTORY] RESET_PANELS: ${resetPanelName}`, {
|
||||
panelHistory: panelHistoryAfter,
|
||||
panels: panelsAfter,
|
||||
});
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@import "../../../../../style/CommonStyle.module.less";
|
||||
@import "../../../../../style/utils.module.less";
|
||||
@import '../../../../../style/CommonStyle.module.less';
|
||||
@import '../../../../../style/utils.module.less';
|
||||
|
||||
.wrapper {
|
||||
height: 100%;
|
||||
@@ -30,7 +30,7 @@
|
||||
}
|
||||
.name {
|
||||
font-weight: bold;
|
||||
font-size: 36px;
|
||||
font-size: 30px;
|
||||
color: @COLOR_WHITE;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@import "../../../../../style/CommonStyle.module.less";
|
||||
@import "../../../../../style/utils.module.less";
|
||||
@import '../../../../../style/CommonStyle.module.less';
|
||||
@import '../../../../../style/utils.module.less';
|
||||
|
||||
.wrapper {
|
||||
height: 100%;
|
||||
@@ -30,7 +30,7 @@
|
||||
}
|
||||
.name {
|
||||
font-weight: bold;
|
||||
font-size: 36px;
|
||||
font-size: 30px;
|
||||
color: @COLOR_WHITE;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -4,16 +4,22 @@ import { useDispatch } from 'react-redux';
|
||||
|
||||
import Spotlight from '@enact/spotlight';
|
||||
|
||||
import { sendLogTotalRecommend } from '../../../../actions/logActions';
|
||||
// <<<<<<< HEAD
|
||||
import { updatePanel } from '../../../../actions/panelActions';
|
||||
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 PlayerItemCard, { TYPES } from '../../PlayerItemCard/PlayerItemCard';
|
||||
import ListEmptyContents from '../TabContents/ListEmptyContents/ListEmptyContents';
|
||||
import css from './LiveChannelContents.module.less';
|
||||
import cssV2 from './LiveChannelContents.v2.module.less';
|
||||
import { sendLogTotalRecommend } from '../../../../actions/logActions';
|
||||
|
||||
// =======
|
||||
// import { updatePanel } from "../../../../actions/panelActions";
|
||||
// import TVirtualGridList from "../../../../components/TVirtualGridList/TVirtualGridList";
|
||||
@@ -181,6 +187,7 @@ export default function LiveChannelContents({
|
||||
startDt={strtDt}
|
||||
endDt={endDt}
|
||||
currentTime={currentTime}
|
||||
currentVideoVisible={currentVideoShowId === liveInfos[index].showId}
|
||||
// <<<<<<< HEAD
|
||||
version={version}
|
||||
// =======
|
||||
@@ -189,7 +196,15 @@ export default function LiveChannelContents({
|
||||
/>
|
||||
);
|
||||
},
|
||||
[liveInfos, currentTime, currentVideoShowId, isClickBlocked, dispatch, handleFocus, version]
|
||||
[
|
||||
liveInfos,
|
||||
currentTime,
|
||||
currentVideoShowId,
|
||||
isClickBlocked,
|
||||
dispatch,
|
||||
handleFocus,
|
||||
version,
|
||||
]
|
||||
);
|
||||
|
||||
const containerClass = version === 2 ? cssV2.container : css.container;
|
||||
|
||||
Reference in New Issue
Block a user