fix:修正product版问题

Author: mahaaoo

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "MeshTalk",
     "slug": "MeshTalk",
-    "version": "1.1.3",
+    "version": "1.1.5",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",

src/app/_layout.tsx

@@ -2,13 +2,14 @@ import * as Sentry from "@sentry/react-native";
 import { isRunningInExpoGo } from "expo";
 import { Stack, useNavigationContainerRef } from "expo-router";
 import React, { useEffect } from "react";
-import { View } from "react-native";
+import { ActivityIndicator, View } from "react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { ModalProvider, modalRef } from "react-native-ma-modal";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import useAppStore from "../store/useAppStore";
 import useDeviceStore from "../store/useDeviceStore";
+import { Colors } from "../config";
 
 const routingInstrumentation = new Sentry.ReactNavigationInstrumentation();
 // SENTRY_AUTH_TOKEN 已存入eas环境变量中
@@ -45,7 +46,11 @@ const App: React.FC<object> = () => {
   }, [insets]);
 
   if (!isReady) {
-    return <View style={{ flex: 1 }} />;
+    return (
+      <View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
+        <ActivityIndicator animating color={Colors.theme} />
+      </View>
+    );
   }
 
   return (

src/app/welcome/index.tsx

@@ -40,14 +40,16 @@ const Guide: React.FC<object> = () => {
         <ScrollView contentContainerStyle={styles.guide_main}>
           <Text style={styles.guide_title}>欢迎来到MeshTalk</Text>
           <View style={{ height: 450, marginVertical: 25 }}>
-            <FlatList
-              data={recommend}
-              showsHorizontalScrollIndicator={false}
-              horizontal
-              renderItem={({ item }) => {
-                return <ServerCard server={item} />;
-              }}
-            />
+            {recommend.length > 0 ? (
+              <FlatList
+                data={recommend}
+                showsHorizontalScrollIndicator={false}
+                horizontal
+                renderItem={({ item }) => {
+                  return <ServerCard server={item} />;
+                }}
+              />
+            ) : null}
           </View>
           <Button
             text="寻找更多的实例"

src/components/Screen/index.tsx

@@ -1,9 +1,10 @@
-import { ErrorBoundary, Error } from "@components";
 import { Stack, router } from "expo-router";
 import React from "react";
 import { View, Text } from "react-native";
 
 import { Colors } from "../../config";
+import Error from "../Error";
+import { ErrorBoundary } from "../ErrorBoundary";
 
 interface ScreenProps {
   headerShown?: boolean;

src/store/useLoginStore.ts

@@ -1,6 +1,6 @@
 import { router } from "expo-router";
 import { Platform } from "react-native";
-import { Toast } from "react-native-ma-modal";
+import { Loading, Toast } from "react-native-ma-modal";
 import { create } from "zustand";
 
 import { AppInterface } from "../config/interface";
@@ -23,6 +23,7 @@ const useLoginStore = create<LoginStoreState>((set, get) => ({
   },
   onPressLogin: async () => {
     if (get().path.length > 0) {
+      Loading.show();
       const { data, ok } = await getAppConfig("https://" + get().path);
       if (data && ok) {
         set({ loginData: data });
@@ -42,6 +43,7 @@ const useLoginStore = create<LoginStoreState>((set, get) => ({
       } else {
         Toast.show("请检查网络设置");
       }
+      Loading.hide();
     } else {
       Toast.show("请输入应用实例地址");
     }

src/utils/request.ts

@@ -5,28 +5,28 @@ import { AxiosRequestConfig } from "axios";
 import { Response } from "../config/interface";
 
 const api = create({
-  timeout: 30000,
+  timeout: 15000,
   baseURL: "",
 });
 
 api.addRequestTransform((request) => {
   // console.log(Stores.appStore.token);
 
   console.log("\n===================请求拦截器=================");
-  console.log(`请求地址：${request.url}`);
-  console.log(`请求方式：${request.method}`);
+  console.log(`请求地址：${request?.url}`);
+  console.log(`请求方式：${request?.method}`);
   console.log("请求参数：");
-  console.log(request.data);
-  console.log(request.params);
-  console.log(request.headers);
+  console.log(request?.data);
+  console.log(request?.params);
+  console.log(request?.headers);
   console.log("============================================\n");
 });
 
 api.addResponseTransform((response) => {
   console.log("\n===================响应拦截器=================");
   console.log(`返回`);
-  console.dir(response);
-  console.log(`返回状态：${response.status}`);
+  console.log(response);
+  console.log(`返回状态：${response?.status}`);
   // console.log('返回数据：', response.data);
   console.log("============================================\n");
 });
@@ -50,7 +50,7 @@ const get = <T>(
             url,
             data: params,
           },
-          message: "request fail" + response.originalError,
+          message: "request fail" + response?.originalError,
         });
       }
       return response;
@@ -80,7 +80,7 @@ const post = <T>(
             url,
             data,
           },
-          message: "request fail" + response.originalError,
+          message: "request fail" + response?.originalError,
         });
       }
       return response;