From 5287d951bcd5274881f1c7187907fe1cd54626f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=8F=99=EC=98=81?= Date: Fri, 29 Mar 2024 17:33:08 +0900 Subject: [PATCH] =?UTF-8?q?moment.js=20uninstall=20&&=20LiveChannel=20new?= =?UTF-8?q?=20Date=EB=A1=9C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.twin.app.shoptime/package.json | 1 - .../PlayerItemCard/PlayerItemCard.jsx | 19 ++++++++++--------- .../src/views/PlayerPanel/PlayerPanel.jsx | 2 +- .../views/PlayerPanel/PlayerPanel.module.less | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/com.twin.app.shoptime/package.json b/com.twin.app.shoptime/package.json index 56755ab8..bf172829 100644 --- a/com.twin.app.shoptime/package.json +++ b/com.twin.app.shoptime/package.json @@ -41,7 +41,6 @@ "@enact/webos": "^3.3.0", "axios": "^0.21.1", "ilib": "^14.3.0", - "moment": "^2.30.1", "prop-types": "^15.6.2", "qrcode": "^1.5.3", "raw-loader": "^4.0.2", diff --git a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx index 25ca5509..929a5554 100644 --- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx +++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx @@ -1,7 +1,6 @@ import React, { memo, useCallback, useEffect, useMemo, useState } from "react"; import classNames from "classnames"; -import moment from "moment"; import Spottable from "@enact/spotlight/Spottable"; @@ -82,23 +81,25 @@ export default memo(function PlayerItemCard({ }, [onFocus]); useEffect(() => { - const today = moment(); - const startDtMoment = moment(startDt); - const endDtMoment = moment(endDt); + const today = new Date(); + const startDtMoment = new Date(startDt); + const endDtMoment = new Date(endDt); - //라이브 영상 시간 (분) - const liveTime = endDtMoment.diff(startDtMoment, "minutes"); - //경과시간 (분) - const elapsedTime = today.diff(startDtMoment, "minutes"); + // 라이브 영상 시간 (분) + const liveTime = Math.floor((endDtMoment - startDtMoment) / (1000 * 60)); + // 경과시간 (분) + const elapsedTime = Math.floor((today - startDtMoment) / (1000 * 60)); const progressPercentage = (elapsedTime / liveTime) * 100; + console.log("#progressPercentage", progressPercentage); if (elapsedTime > 0) { setGaugeWidth(progressPercentage); } else { setGaugeWidth(0); } - }, [gaugeWidth]); + }, [startDt, endDt, gaugeWidth]); + const progressStyle = useMemo( () => ({ width: `${gaugeWidth}%` }), [gaugeWidth] diff --git a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx index 565c8f42..16dade62 100644 --- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx +++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.jsx @@ -215,7 +215,7 @@ const PlayerPanel = ({ hideChildren, isTabActivated, ...props }) => {
- {/*
{"123"}
*/} +
{"123"}
diff --git a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.module.less b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.module.less index 802f7c46..06354cfc 100644 --- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.module.less +++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerPanel.module.less @@ -26,7 +26,7 @@ cursor: pointer; } &.arrowClose { - right: 0px; + right: -2px; > button { &.button { background-image: url(../../../assets/images/btn/btn-toopen-nor.svg);