From 1c67d1d48648a7d6a36ac521914a0249302677cb Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Wed, 22 Feb 2023 20:03:39 +0900 Subject: [PATCH 1/4] =?UTF-8?q?ios=E3=81=A7=E3=82=82lottie=E3=82=A2?= =?UTF-8?q?=E3=83=8B=E3=83=A1=E3=81=8C=E5=8B=95=E4=BD=9C=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/駅名表/Sign.js | 37 ++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/components/駅名表/Sign.js b/components/駅名表/Sign.js index af44437..c415cc1 100644 --- a/components/駅名表/Sign.js +++ b/components/駅名表/Sign.js @@ -99,7 +99,6 @@ export default function Sign(props) { style={{ position: "absolute", right: -15, top: -20 }} onPress={() => { if (testButtonStatus) { - lottieRef.current.play(35, 7); const otherData = favoriteStation.filter((d) => { const compare = JSON.stringify(d); const current = JSON.stringify(currentStation); @@ -112,7 +111,6 @@ export default function Sign(props) { AS.setItem("favoriteStation", JSON.stringify(otherData)); setFavoriteStation(otherData); } else { - lottieRef.current.play(7, 35); let ret = favoriteStation; console.log(currentStation); ret.push(currentStation); @@ -122,12 +120,12 @@ export default function Sign(props) { setTestButtonStatus(!testButtonStatus); }} > - @@ -141,6 +139,37 @@ export default function Sign(props) { ); } +const LottieDelayView = ({ + progress, + speed, + style, + source, + lottieRef, + loop, +}) => { + const [progressState, setProgressState] = useState(undefined); + useEffect(() => { + if (progress == 0) { + lottieRef.current.play(progressState !== undefined ? 35 : 7, 7); + } else { + lottieRef.current.play(progressState !== undefined ? 7 : 35, 35); + } + }, [progress]); + return ( + { + console.log("finish"); + setProgressState(progress); + }} + /> + ); +}; const NexPreStationLine = ({ nexStation, preStation }) => { return ( From 0230f5409a8d72d5da5c455fdd585df6e3e819d5 Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Wed, 22 Feb 2023 20:13:16 +0900 Subject: [PATCH 2/4] =?UTF-8?q?iOS=E3=81=A7=E2=86=92=E3=81=8C=E7=9C=9F?= =?UTF-8?q?=E3=82=93=E4=B8=AD=E3=81=AB=E6=9D=A5=E3=81=AA=E3=81=8B=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/駅名表/Sign.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/駅名表/Sign.js b/components/駅名表/Sign.js index c415cc1..e641f97 100644 --- a/components/駅名表/Sign.js +++ b/components/駅名表/Sign.js @@ -342,6 +342,7 @@ const styleSheet = { flex: 1, flexDirection: "row", alignContent: "center", + alignItems: "center", }, 下枠左右マーク: { fontWeight: "bold", From 9959fbe5c9a23a98f0c2755880420909260012eb Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Wed, 22 Feb 2023 20:27:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?LED=E3=81=AE=E6=96=87=E5=AD=97=E3=82=B5?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/発車時刻表/LED_vidion.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js index 9d52ca9..e538c9b 100644 --- a/components/発車時刻表/LED_vidion.js +++ b/components/発車時刻表/LED_vidion.js @@ -404,7 +404,7 @@ const TrainName = ({ train, trainIDSwitch, d, getTrainType }) => { 6 ? 15 : 20, + fontSize: trainName.length > 6 ? parseInt("13%") : parseInt("18%"), color: getTrainType.color, fontWeight: "bold", }} @@ -422,7 +422,8 @@ const LastStation = ({ d }) => { 4 ? 15 : 20, + fontSize: + d.lastStation.length > 4 ? parseInt("13%") : parseInt("18%"), color: "white", fontWeight: "bold", }} @@ -437,7 +438,7 @@ const DependTime = ({ d }) => { { {status} @@ -512,7 +514,7 @@ const Description = ({ train }) => { Date: Wed, 22 Feb 2023 20:29:28 +0900 Subject: [PATCH 4/4] =?UTF-8?q?iOS=E3=81=AELED=E3=83=9C=E3=83=88=E3=83=A0?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=88=97=E3=81=8C=E5=A4=89=E3=81=AA=E5=A0=B4?= =?UTF-8?q?=E6=89=80=E3=81=AB=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/発車時刻表/LED_vidion.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js index e538c9b..d25229b 100644 --- a/components/発車時刻表/LED_vidion.js +++ b/components/発車時刻表/LED_vidion.js @@ -280,7 +280,7 @@ const Footer = ({ setFinalSwitch, }) => { return ( - +