Merge commit '261ff58e843671d44db0c85e9fbd8f2717838b9e' into develop

This commit is contained in:
harukin-DeskMini 2022-09-29 23:56:00 +09:00
commit 66e3fb3d75
3 changed files with 6 additions and 3 deletions

View File

@ -9,6 +9,7 @@ import {
import { WebView } from "react-native-webview"; import { WebView } from "react-native-webview";
import Constants from "expo-constants"; import Constants from "expo-constants";
import AsyncStorage from "@react-native-async-storage/async-storage"; import AsyncStorage from "@react-native-async-storage/async-storage";
import { news } from "./config/newsUpdate";
/* /*
import StatusbarDetect from './StatusbarDetect'; import StatusbarDetect from './StatusbarDetect';
var Status = StatusbarDetect(); */ var Status = StatusbarDetect(); */
@ -799,7 +800,7 @@ modal_observer.observe(modal_content, {
useEffect(() => { useEffect(() => {
AsyncStorage.getItem("status") AsyncStorage.getItem("status")
.then((d) => { .then((d) => {
if (d != "2022/06/11") { if (d != news) {
navigate("news"); navigate("news");
} }
}) })

View File

@ -3,6 +3,7 @@ import { View, Text, TouchableOpacity } from "react-native";
import { WebView } from "react-native-webview"; import { WebView } from "react-native-webview";
import StatusbarDetect from "../StatusbarDetect"; import StatusbarDetect from "../StatusbarDetect";
import AsyncStorage from "@react-native-async-storage/async-storage"; import AsyncStorage from "@react-native-async-storage/async-storage";
import { news } from "../config/newsUpdate";
var Status = StatusbarDetect(); var Status = StatusbarDetect();
export default function News(props) { export default function News(props) {
const { const {
@ -13,7 +14,7 @@ export default function News(props) {
<WebView <WebView
useWebKit={true} useWebKit={true}
source={{ source={{
uri: "https://nexcloud.haruk.in/sites/press-harukin/JRShikokuApps/2022-6-11", uri: `https://nexcloud.haruk.in/sites/press-harukin/JRShikokuApps/${news}`,
}} }}
mixedContentMode={"compatibility"} mixedContentMode={"compatibility"}
javaScriptEnabled={true} javaScriptEnabled={true}
@ -29,7 +30,7 @@ export default function News(props) {
alignItems: "center", alignItems: "center",
}} }}
onPress={() => { onPress={() => {
AsyncStorage.setItem("status", "2022/06/11"); AsyncStorage.setItem("status", news);
navigate("Apps"); navigate("Apps");
}} }}
> >

1
config/newsUpdate.js Normal file
View File

@ -0,0 +1 @@
export const news = "2022-6-11";