harukin/jrshikoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd8ce2a7f8aac23e1001bbe16690d37c57d1c704f' into develop

Browse Source
This commit is contained in:
harukin-expo-dev-env 2024-03-13 13:44:57 +00:00
commit 1daf888795
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/ActionSheetComponents/EachTrainInfoCore.js
View File

@ -206,7 +206,7 @@ export const EachTrainInfoCore = ({
}, },
navigate, navigate,
originalStationList, originalStationList,
from: "NearTrainDiagramView", from: from == "LED" ? "LED2" : "NearTrainDiagramView",
}; };
if (setTrainInfo) { if (setTrainInfo) {
setTrainInfo(payload.data); setTrainInfo(payload.data);
@ -288,17 +288,23 @@ export const EachTrainInfoCore = ({
}, },
}} }}
Max_Header_Height={ Max_Header_Height={
from == "AllTrainDiagramView" || from == "NearTrainDiagramView" from == "AllTrainDiagramView" ||
from == "NearTrainDiagramView" ||
from == "LED2"
? 0 ? 0
: 200 : 200
} }
Min_Header_Height={ Min_Header_Height={
from == "AllTrainDiagramView" || from == "NearTrainDiagramView" from == "AllTrainDiagramView" ||
from == "NearTrainDiagramView" ||
from == "LED2"
? 0 ? 0
: 80 : 80
} }
shortHeader={ shortHeader={
from == "AllTrainDiagramView" || from == "NearTrainDiagramView" ? ( from == "AllTrainDiagramView" ||
from == "NearTrainDiagramView" ||
from == "LED2" ? (
<></> <></>
) : ( ) : (
<ShortHeader <ShortHeader

2
components/settings.js
View File

@ -174,7 +174,7 @@ export default function Setting(props) {
textAlignVertical: "center", textAlignVertical: "center",
}} }}
> >
内部バージョン: 5.0.2.2 内部バージョン: 5.0.2.3
</Text> </Text>
<View style={{ flex: 1 }} /> <View style={{ flex: 1 }} />
</View> </View>

2
trainbaseview.js
View File

@ -36,7 +36,7 @@ export default function TrainBase({ route, navigation }) {
setSupportMultipleWindows={false} setSupportMultipleWindows={false}
onMessage={(event) => {}} onMessage={(event) => {}}
/> />
{(from == "LED" || from == "AllTrainDiagramView") && ( {(from == "LED" || from == "LED2" || from == "AllTrainDiagramView") && (
<TouchableOpacity <TouchableOpacity
style={{ style={{
padding: 10, padding: 10,