19 Commits

Author SHA1 Message Date
harukin-DeskMini
5ec8081a84 smile忘れを追加 2023-03-30 07:52:58 +09:00
harukin-DeskMini
7e67ac198d Merge commit 'bca2b300d3a4a35360f451fc78428dba50278119' into feature/ap2023 2023-03-30 03:26:06 +09:00
harukin-DeskMini
bca2b300d3 4.5.2リリース(封印開放) 2023-03-30 03:25:28 +09:00
harukin-DeskMini
406808ee58 Merge commit '47d84777e2a26235d5442a68ae3b6bcb07f580cb' 2023-03-30 03:21:25 +09:00
harukin-DeskMini
d2800f4d51 駅名標にえきちゃんを追加 2023-03-30 02:33:52 +09:00
harukin-DeskMini
fd90b82a0e アイコン変更 2023-03-27 08:01:24 +09:00
harukin-DeskMini
673cb6eecf 暴走えきちゃん復活 2023-03-27 07:10:41 +09:00
harukin-DeskMini
fef3367599 Merge commit '47d84777e2a26235d5442a68ae3b6bcb07f580cb' into feature/ap2023 2023-03-27 07:04:44 +09:00
harukin-DeskMini
a8aadb7f08 4.5.1 2023-03-27 07:01:47 +09:00
harukin-DeskMini
b810405573 Merge commit '65dd6dd0fdd41f06cfb686d578f9d604185510d3' 2023-03-27 07:01:20 +09:00
harukin-DeskMini
6f62418426 Merge commit '9eca67901906b8852f1f1f2dfa814ed658514b4b' 2023-03-27 01:06:04 +09:00
harukin-DeskMini
88621dd1c8 Merge commit '98b22db4dbea611907c4d7a6a60b7323dbec7a76' 2023-03-27 01:02:57 +09:00
harukin-DeskMini
12d9c1f49d 封印忘れ物 2023-03-26 21:45:04 +09:00
harukin-DeskMini
30c2b8a2f9 4.5.0-リリース用一部封印 2023-03-26 21:42:49 +09:00
harukin-DeskMini
8bc7069c4e Merge commit '816d96d37be6537c9ebcf0be30c74fd154b80dc5' 2023-03-26 21:09:24 +09:00
harukin-OneMix4
737cd25539 Merge commit '64538e33f317c6fe395859673922f63c2e3b0514' 2023-03-02 17:37:40 +09:00
harukin-DeskMini
2c50e5af67 Merge commit 'e93fe7095ef717bd0ddebeb18f28038a374d83f6' 2023-02-01 17:16:10 +09:00
harukin-DeskMini
ea677b4da5 Merge commit '40fb55c8cf5462a40a499ddcc69cb5313e559f84' 2023-01-29 22:10:09 +09:00
harukin-DeskMini
4525443e39 Merge commit 'e35ab09002641b3813d2055ff8107bd8088c4629' 2023-01-29 09:11:58 +09:00
7 changed files with 60 additions and 5 deletions

BIN
assets/素材.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

BIN
assets/素材2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

BIN
assets/素材3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

View File

@@ -86,7 +86,7 @@ export const StationDeteilView = (props) => {
/> />
</View> </View>
)} )}
{currentStation && {/* {currentStation &&
currentStation.map((d) => ( currentStation.map((d) => (
<NexPreStationLine <NexPreStationLine
currentStation={d} currentStation={d}
@@ -94,7 +94,7 @@ export const StationDeteilView = (props) => {
favoriteStation={favoriteStation} favoriteStation={favoriteStation}
setFavoriteStation={setFavoriteStation} setFavoriteStation={setFavoriteStation}
/> />
))} ))} */}
{currentStation && {currentStation &&
currentStation[0].JrHpUrl && currentStation[0].JrHpUrl &&
currentStation[0].StationNumber != "M12" && ( currentStation[0].StationNumber != "M12" && (

View File

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

View File

@@ -12,6 +12,7 @@ import {
widthPercentageToDP as wp, widthPercentageToDP as wp,
heightPercentageToDP as hp, heightPercentageToDP as hp,
} from "react-native-responsive-screen"; } from "react-native-responsive-screen";
import AutoHeightImage from "react-native-auto-height-image";
import LottieView from "lottie-react-native"; import LottieView from "lottie-react-native";
import { useInterval } from "../../lib/useInterval"; import { useInterval } from "../../lib/useInterval";
import { AS } from "../../storageControl"; import { AS } from "../../storageControl";
@@ -57,6 +58,29 @@ export default function Sign(props) {
setNexPrePosition(0); setNexPrePosition(0);
getPreNextStation(currentStation[0]); getPreNextStation(currentStation[0]);
}, [currentStation]); }, [currentStation]);
const [smileUrl, setSmileUrl] = useState(undefined);
useEffect(() => {
const smile = currentStation[0].JrHpUrl.replace("/index.html", "/");
const stationSplit = smile.split("/");
const smileName = stationSplit[stationSplit.length - 2];
if (smileName == "takamatsu") {
setSmileUrl(smile + "/images/illustration.png");
} else if (smileName == "iyomishima") {
setSmileUrl(smile + "/images/iyo-mishima_smile.png");
} else if (smileName == "iyosaijo") {
setSmileUrl(smile + "/images/iyo-saijo_smile.png");
} else if (smileName == "nyugawa") {
setSmileUrl(smile + "/images/newgawa_smile.png");
} else if (smileName == "iyohojo") {
setSmileUrl(smile + "/images/iyo-hojo_smile.png");
} else if (smileName == "iyozu") {
setSmileUrl(smile + "/images/iyo-ozu_smile.png");
} else if (smileName == "oboke") {
setSmileUrl(smile + "/images/ooboke_smile.png");
} else {
setSmileUrl(smile + "images/" + smileName + "_smile.png");
}
}, [currentStation]);
useEffect(() => { useEffect(() => {
if (!currentStation[nexPrePosition]) return () => {}; if (!currentStation[nexPrePosition]) return () => {};
@@ -92,10 +116,18 @@ export default function Sign(props) {
const lottieRef = useRef(); const lottieRef = useRef();
return ( return (
<TouchableOpacity style={styleSheet.外枠} onPress={oP}> <TouchableOpacity style={styleSheet.外枠} onPress={oP}>
<AutoHeightImage
source={{
uri: smileUrl,
}}
resizeMode="contain"
width={wp("30%")}
style={{ position: "absolute", bottom: "30%" }}
/>
<StationNumberMaker currentStation={currentStation} /> <StationNumberMaker currentStation={currentStation} />
<StationNameArea currentStation={currentStation} /> <StationNameArea currentStation={currentStation} />
<TouchableOpacity <TouchableOpacity
style={{ position: "absolute", right: -15, top: -20 }} style={{ position: "absolute", right: -15, top: -13 }}
onPress={() => { onPress={() => {
if (testButtonStatus) { if (testButtonStatus) {
const otherData = favoriteStation.filter((d) => { const otherData = favoriteStation.filter((d) => {
@@ -118,7 +150,7 @@ export default function Sign(props) {
setTestButtonStatus(!testButtonStatus); setTestButtonStatus(!testButtonStatus);
}} }}
> >
<LottieDelayView <LottieDelayViews
progress={testButtonStatus ? 1 : 0} progress={testButtonStatus ? 1 : 0}
speed={1.4} speed={1.4}
style={{ width: 80, height: 80 }} style={{ width: 80, height: 80 }}
@@ -137,6 +169,26 @@ export default function Sign(props) {
); );
} }
const LottieDelayViews = ({
progress,
speed,
style,
source,
lottieRef,
loop,
}) => {
return (
<AutoHeightImage
source={
progress == 0
? require("../../assets/素材2.png")
: require("../../assets/素材3.png")
}
resizeMode="contain"
width={style.width}
/>
);
};
const LottieDelayView = ({ const LottieDelayView = ({
progress, progress,
speed, speed,

View File

@@ -461,6 +461,9 @@ break;
default: default:
break; break;
} }
//2023AP
setStationIcon(element.getElementsByTagName("img")[0],'https://nexcloud.haruk.in/s/4zcJWFmiAq3iqPS/preview');
` `
: ``; : ``;