Compare commits
No commits in common. "7e0afd1186652e8da464122297c20457e11bdb3a" and "72158d6d330940208c9cef71c1fa93ac267d1592" have entirely different histories.
7e0afd1186
...
72158d6d33
@ -180,7 +180,6 @@ export const EachTrainInfoCore = ({
|
|||||||
if (!points) return () => {};
|
if (!points) return () => {};
|
||||||
if (points.length == 0) return () => {};
|
if (points.length == 0) return () => {};
|
||||||
const position = points.findIndex((d) => d == true);
|
const position = points.findIndex((d) => d == true);
|
||||||
let isThrew = false;
|
|
||||||
if (position == -1) return () => {};
|
if (position == -1) return () => {};
|
||||||
if (trainDataWidhThrough[position].split(",")[1] == "通過") {
|
if (trainDataWidhThrough[position].split(",")[1] == "通過") {
|
||||||
LayoutAnimation.configureNext({
|
LayoutAnimation.configureNext({
|
||||||
@ -188,18 +187,14 @@ export const EachTrainInfoCore = ({
|
|||||||
update: { type: "easeInEaseOut", springDamping: 0.6 },
|
update: { type: "easeInEaseOut", springDamping: 0.6 },
|
||||||
});
|
});
|
||||||
setShowThrew(true);
|
setShowThrew(true);
|
||||||
isThrew = true;
|
|
||||||
}
|
|
||||||
if (position < 5) {
|
|
||||||
} // 5駅以内の場合はスクロールしない
|
|
||||||
else {
|
|
||||||
const count = position * 44 - 50;
|
|
||||||
// 0.5秒待機してからスクロール
|
|
||||||
setTimeout(
|
|
||||||
() => ScrollViewRef.current?.scrollTo({ y: count, animated: true }),
|
|
||||||
400
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
if(position < 5) return() => {}; // 5駅以内の場合はスクロールしない
|
||||||
|
const count = position * 44-50;
|
||||||
|
// 0.5秒待機してからスクロール
|
||||||
|
setTimeout(
|
||||||
|
() => ScrollViewRef.current?.scrollTo({ y: count, animated: true }),
|
||||||
|
400
|
||||||
|
);
|
||||||
setIsJumped(true);
|
setIsJumped(true);
|
||||||
}, [points]);
|
}, [points]);
|
||||||
const trainName = useMemo(() => {
|
const trainName = useMemo(() => {
|
||||||
|
@ -12,7 +12,7 @@ import * as Updates from "expo-updates";
|
|||||||
import { useWindowDimensions } from "react-native";
|
import { useWindowDimensions } from "react-native";
|
||||||
import { ListItem } from "native-base";
|
import { ListItem } from "native-base";
|
||||||
|
|
||||||
const versionCode = "5.5";
|
const versionCode = "5.4.1";
|
||||||
|
|
||||||
export const SettingTopPage = ({ navigate, testNFC, updateAndReload }) => {
|
export const SettingTopPage = ({ navigate, testNFC, updateAndReload }) => {
|
||||||
const { width } = useWindowDimensions();
|
const { width } = useWindowDimensions();
|
||||||
|
@ -102,18 +102,14 @@ export const EachData: FC<Props> = (props) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const [platformNumber, setPlatformNumber] = useState<number>();
|
const [platformNumber, setPlatformNumber] = useState<number>();
|
||||||
const [platformDescription, setPlatformDescription] = useState<string>();
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetch(
|
fetch(
|
||||||
`https://n8n.haruk.in/webhook/JR-shikoku-PosID?PosNum=${currentTrainData?.PosNum}&Line=${currentTrainData?.Line}`
|
`https://n8n.haruk.in/webhook/JR-shikoku-PosID?PosNum=${currentTrainData?.PosNum}&Line=${currentTrainData?.Line}`
|
||||||
)
|
)
|
||||||
.then((res) => res.json())
|
.then((res) => res.json())
|
||||||
.then((data) => {
|
.then((data) =>
|
||||||
setPlatformNumber(data?.type == "Station" ? data?.platform : undefined);
|
setPlatformNumber(data?.type == "Station" ? data?.platform : undefined)
|
||||||
setPlatformDescription(
|
);
|
||||||
data?.type == "Station" ? data?.description : undefined
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}, [currentTrainData, currentTrain]);
|
}, [currentTrainData, currentTrain]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -145,11 +141,9 @@ export const EachData: FC<Props> = (props) => {
|
|||||||
<Description
|
<Description
|
||||||
info={`${
|
info={`${
|
||||||
trainIDSwitch
|
trainIDSwitch
|
||||||
? currentTrainData?.PosNum + currentTrainData?.Line
|
? currentTrainData?.PosNum+currentTrainData?.Line
|
||||||
: trainPositionText(currentTrainData)
|
: trainPositionText(currentTrainData)
|
||||||
} ${platformNumber ? platformNumber + "番線" : ""} ${
|
} ${platformNumber ? platformNumber + "番線" : ""}`}
|
||||||
platformDescription ? "("+platformDescription+")" : ""
|
|
||||||
}`}
|
|
||||||
onLongClick={() => {
|
onLongClick={() => {
|
||||||
Linking.openURL(
|
Linking.openURL(
|
||||||
"https://nexcloud.haruk.in/apps/forms/s/TEkBQW5WLcYjLyAzGxncQLtw"
|
"https://nexcloud.haruk.in/apps/forms/s/TEkBQW5WLcYjLyAzGxncQLtw"
|
||||||
|
@ -1 +1 @@
|
|||||||
export const news = "2024-11-01";
|
export const news = "2024-9-29";
|
||||||
|
@ -770,7 +770,6 @@ export const injectJavascriptData: InjectJavascriptData = (
|
|||||||
case "5210M":
|
case "5210M":
|
||||||
case "5108M":
|
case "5108M":
|
||||||
case "110M":
|
case "110M":
|
||||||
case "112M":
|
|
||||||
case "118M":
|
case "118M":
|
||||||
case "5218M":
|
case "5218M":
|
||||||
case "5120M":
|
case "5120M":
|
||||||
@ -818,6 +817,7 @@ export const injectJavascriptData: InjectJavascriptData = (
|
|||||||
setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7200.png');
|
setStationIcon(element.querySelector("img"),'https://storage.haruk.in/s7200.png');
|
||||||
break;
|
break;
|
||||||
// 上り7000系
|
// 上り7000系
|
||||||
|
case "112M":
|
||||||
case "114M":
|
case "114M":
|
||||||
case "122M":
|
case "122M":
|
||||||
case "4138M":
|
case "4138M":
|
||||||
@ -847,10 +847,6 @@ export const injectJavascriptData: InjectJavascriptData = (
|
|||||||
: ``;
|
: ``;
|
||||||
|
|
||||||
const normal_train_name = `
|
const normal_train_name = `
|
||||||
if(列車名データ.match("サンポート")){
|
|
||||||
const textBase = 列車名データ.split(":")[1];
|
|
||||||
行き先情報.innerText = textBase+行き先情報.innerText;
|
|
||||||
}
|
|
||||||
if(new RegExp(/^4[1-9]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^5[1-7]\\d\\d[DM]$/).test(列番データ) || 列番データ ==="3621D"){
|
if(new RegExp(/^4[1-9]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^5[1-7]\\d\\d[DM]$/).test(列番データ) || 列番データ ==="3621D"){
|
||||||
行き先情報.innerText = "ワンマン\\n"+行き先情報.innerText;
|
行き先情報.innerText = "ワンマン\\n"+行き先情報.innerText;
|
||||||
flag=true;
|
flag=true;
|
||||||
@ -958,7 +954,6 @@ const setStrings = () =>{
|
|||||||
}
|
}
|
||||||
var 行き先情報 = element.getElementsByTagName("p")[0];
|
var 行き先情報 = element.getElementsByTagName("p")[0];
|
||||||
var 列番データ = element.getAttribute('offclick').split('"')[1];
|
var 列番データ = element.getAttribute('offclick').split('"')[1];
|
||||||
var 列車名データ = element.getAttribute('offclick').split('"')[3];
|
|
||||||
var flag=false;
|
var flag=false;
|
||||||
var TrainType = undefined;
|
var TrainType = undefined;
|
||||||
setTrainMenuDialog(element)
|
setTrainMenuDialog(element)
|
||||||
|
Loading…
Reference in New Issue
Block a user