Merge branch 'develop'

Author: KageRyo

.gitignore

@@ -37,3 +37,6 @@ yarn-error.*
 # API config file
 ./WaterMirror/src/config.json
 WaterMirror/src/config.json
+
+# config files
+./src/config.json

WaterMirror/App.js App.js

@@ -2,7 +2,7 @@
   "expo": {
     "name": "WaterMirror",
     "slug": "WaterMirror",
-    "version": "1.0.7",
+    "version": "1.1.2",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",

WaterMirror/.gitignore

@@ -1,8 +1,8 @@
 {
   "app": {
     "name": "WaterMirror",
-    "subtitle": "Smart Water Quality Analysis and Assessment System",
-    "version": "Version: WaterMirror-{{platform}}-v1.1.1"
+    "subtitle": "Intelligent Water Quality Analysis and Improvement Assessment System",
+    "version": "Version: WaterMirror-{{platform}}-v1.1.2"
   },
   "nav": {
     "home": "Home",

WaterMirror/src/config.json

@@ -1,8 +1,8 @@
 {
     "app": {
       "name": "WaterMirror",
-      "subtitle": "スマート水質分析評価システム",
-      "version": "バージョン：WaterMirror-{{platform}}-v1.1.1"
+      "subtitle": "インテリジェント水質分析と改善評価システム",
+      "version": "バージョン：WaterMirror-{{platform}}-v1.1.2"
     },
     "nav": {
       "home": "ホーム",

WaterMirror/app.json app.json

@@ -1,8 +1,8 @@
 {
   "app": {
     "name": "WaterMirror",
-    "subtitle": "智能化水质分析与评估系统",
-    "version": "版本：WaterMirror-{{platform}}-v1.1.1"
+    "subtitle": "智能水质分析与改善评估系统",
+    "version": "版本：WaterMirror-{{platform}}-v1.1.2"
   },
   "nav": {
     "home": "首页",

WaterMirror/assets/adaptive-icon.png assets/adaptive-icon.png

@@ -1,8 +1,8 @@
 {
   "app": {
     "name": "WaterMirror",
-    "subtitle": "智慧化水質分析與評估系統",
-    "version": "版本：WaterMirror-{{platform}}-v1.1.1"
+    "subtitle": "智慧水質分析與改善評估系統",
+    "version": "版本：WaterMirror-{{platform}}-v1.1.2"
   },
   "nav": {
     "home": "首頁",

WaterMirror/assets/favicon.png assets/favicon.png

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@expo/ngrok": "^4.1.3",
+    "@expo/react-native-action-sheet": "^4.1.0",
     "@react-native-async-storage/async-storage": "^1.24.0",
     "@react-native-picker/picker": "2.7.5",
     "@react-navigation/native": "^6.1.17",

WaterMirror/assets/github-mark.png assets/github-mark.png

@@ -35,7 +35,7 @@ const useServerConnection = (apiUrl) => {
   const [status, setStatus] = useState(t('calc.connection.connecting'));
 
   useEffect(() => {
-    const checkTimeout = 5000;
+    const checkTimeout = 3000;
     const intervalId = setInterval(() => checkConnection(), checkTimeout);
     return () => clearInterval(intervalId);
   }, []);

WaterMirror/assets/icon.png assets/icon.png

@@ -1,9 +1,10 @@
 import React from 'react';
-import { Alert, Image, Linking, Platform, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { Alert, Image, Linking, Platform, StyleSheet, Text, TouchableOpacity, View, ActionSheet } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { useTranslation } from 'react-i18next';
 import { useLanguage } from '../contexts/LanguageContext';
+import { ActionSheetProvider, useActionSheet } from '@expo/react-native-action-sheet';
 
 import GitHubMark from '../assets/github-mark.png';
 const githubUrl = 'https://github.com/KageRyo/WaterMirror';
@@ -27,33 +28,45 @@ const TopSection = () => {
 const BtnSection = ({ navigation }) => {
   const { t } = useTranslation();
   const { currentLanguage, changeLanguage } = useLanguage();
+  const { showActionSheetWithOptions } = useActionSheet();
 
   const handleLanguageSwitch = () => {
-    Alert.alert(
-      t('language.select'),
-      '',
-      [
-        {
-          text: '正體中文',
-          onPress: () => changeLanguage('zh-TW')
-        },
-        {
-          text: '简体中文',
-          onPress: () => changeLanguage('zh-CN')
-        },
-        {
-          text: 'English',
-          onPress: () => changeLanguage('en')
-        },
-        {
-          text: '日本語',
-          onPress: () => changeLanguage('ja')
-        },
-        {
-          text: t('buttons.cancel'),
-          style: 'cancel'
+    const options = [
+      {
+        text: '正體中文',
+        onPress: () => changeLanguage('zh-TW')
+      },
+      {
+        text: '简体中文',
+        onPress: () => changeLanguage('zh-CN')
+      },
+      {
+        text: 'English',
+        onPress: () => changeLanguage('en')
+      },
+      {
+        text: '日本語',
+        onPress: () => changeLanguage('ja')
+      },
+      {
+        text: t('buttons.cancel'),
+        style: 'cancel'
+      }
+    ];
+
+    // 使用 ActionSheet 顯示選單
+    const buttonTitles = options.map(option => option.text);
+    showActionSheetWithOptions(
+      {
+        options: buttonTitles,
+        cancelButtonIndex: options.length - 1,
+        title: t('language.select')
+      },
+      buttonIndex => {
+        if (buttonIndex !== options.length - 1) {
+          options[buttonIndex].onPress();
         }
-      ]
+      }
     );
   };
 
@@ -97,8 +110,12 @@ const BtnSection = ({ navigation }) => {
         Alert.alert(t('alerts.notice'), t('alerts.pleaseInputData'));
         return;
       }
-    } else if (route.startsWith('http')) {
-      Linking.openURL(route);
+    } else if (route.startsWith('http') || route.startsWith('mailto:')) {
+      try {
+        await Linking.openURL(route);
+      } catch {
+        // 不執行任何操作以隱藏錯誤訊息
+      }
     } else {
       navigation.navigate(route);
     }
@@ -164,7 +181,7 @@ const openGitHub = () => {
 };
 
 // 畫面視窗
-export default function HomeScreen() {
+export function HomeScreen() {
   const navigation = useNavigation();
   return (
     <View style={styles.container}>
@@ -268,3 +285,12 @@ const bottomStyles = StyleSheet.create({
     height: 50,
   },
 });
+
+// 確保在應用的根組件中包裹 ActionSheetProvider
+export default function App() {
+  return (
+    <ActionSheetProvider>
+      <HomeScreen />
+    </ActionSheetProvider>
+  );
+}

WaterMirror/assets/splash.png assets/splash.png

@@ -0,0 +1,4 @@
+{
+    "api_url": "http://34.80.131.233", //例如：http://0.0.0.0
+    "port": "8000"  // 例如：8000
+}