ipanel-rnapp-ajb-base 1.0.42 → 1.0.44

package/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+	"i18n-ally.localesPaths": [
+		"app/components/common/PickerV2Base/picker/locale"
+	]
+}

package/app/App.js

@@ -132,7 +132,9 @@ const CommonScreens = {
     screenOptions: {
       title: "首页",
       headerShown: false,
-      includeBottom: true,
+      includeBottom: appName.startsWith("爱家宝")
+        ? false /* 爱家宝现在的首页是聊天界面，页面需要避开底部安全区 */
+        : true,
     },
   },
   Login: {

package/app/screens/ChatModeScreen/components/SimpleProfileScreen.js

@@ -1,15 +1,15 @@
-import React from 'react';
+import React from "react";
 import {
   View,
   Text,
   StyleSheet,
-  SafeAreaView,
   StatusBar,
   TouchableOpacity,
   Platform,
   NativeModules,
-} from 'react-native';
-import { Icon } from '@rneui/themed';
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Icon } from "@rneui/themed";
 
 const { storage, replace, popToTop, px } = global.base;
 
@@ -18,33 +18,35 @@ const { storage, replace, popToTop, px } = global.base;
  * 专门为本地开发环境设计，只包含退出登录功能
  */
 function SimpleProfileScreen({ navigation }) {
+  const insets = useSafeAreaInsets();
+
   const handleLogout = async () => {
     try {
       // 清除所有认证相关的token
-      await storage.set('accessToken', null);
-      await storage.set('refreshToken', null);
-      await storage.set('adgAccessToken', null);
-      await storage.set('adgRefreshToken', null);
-      await storage.set('homedAccessToken', null);
-      await storage.set('homedTouristAccessToken', null);
+      await storage.set("accessToken", null);
+      await storage.set("refreshToken", null);
+      await storage.set("adgAccessToken", null);
+      await storage.set("adgRefreshToken", null);
+      await storage.set("homedAccessToken", null);
+      await storage.set("homedTouristAccessToken", null);
 
       // 清理其他用户相关数据
-      await storage.set('accountData', null);
-      await storage.set('activeAddr', null);
+      await storage.set("accountData", null);
+      await storage.set("activeAddr", null);
 
       // 处理导航栈
-      if (navigation.getState().type === 'stack') {
+      if (navigation.getState().type === "stack") {
         popToTop();
       }
 
       // 跳转到登录页面
-      replace('Login', {
+      replace("Login", {
         skip: true,
       });
     } catch (error) {
-      console.log('退出登录失败:', error);
+      console.log("退出登录失败:", error);
       // 即使出错也尝试跳转到登录页
-      replace('Login');
+      replace("Login");
     }
   };
 
@@ -53,13 +55,7 @@ function SimpleProfileScreen({ navigation }) {
   };
 
   return (
-    <SafeAreaView style={styles.container}>
-      <StatusBar
-        barStyle="dark-content"
-        backgroundColor="#f5f5f5"
-        translucent={false}
-      />
-
+    <View style={[styles.container, { paddingTop: insets.top }]}>
       {/* 顶部导航栏 */}
       <View style={styles.header}>
         <TouchableOpacity
@@ -67,12 +63,7 @@ function SimpleProfileScreen({ navigation }) {
           onPress={handleGoBack}
           activeOpacity={0.8}
         >
-          <Icon
-            name="chevron-back"
-            type="ionicon"
-            size={px(48)}
-            color="#333"
-          />
+          <Icon name="chevron-back" type="ionicon" size={px(48)} color="#333" />
         </TouchableOpacity>
 
         <View style={styles.headerCenter}>
@@ -118,78 +109,78 @@ function SimpleProfileScreen({ navigation }) {
           <Text style={styles.versionSubText}>LocalDev Mode</Text>
         </View>
       </View>
-    </SafeAreaView>
+    </View>
   );
 }
 
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: '#f5f5f5',
+    backgroundColor: "#f5f5f5",
   },
   header: {
     height: px(100),
-    backgroundColor: '#f5f5f5',
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between',
+    backgroundColor: "#f5f5f5",
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
     paddingHorizontal: px(32),
   },
   backButton: {
     width: px(48),
     height: px(48),
-    alignItems: 'center',
-    justifyContent: 'center',
+    alignItems: "center",
+    justifyContent: "center",
   },
   headerCenter: {
     flex: 1,
-    alignItems: 'center',
+    alignItems: "center",
   },
   headerTitle: {
-    fontSize: px(36),
-    fontWeight: '600',
-    color: '#333',
+    fontSize: px(38),
+    fontWeight: "600",
+    color: "#333",
   },
   headerRight: {
     width: px(48),
   },
   content: {
     flex: 1,
-    alignItems: 'center',
-    justifyContent: 'space-between',
+    alignItems: "center",
+    justifyContent: "space-between",
     paddingHorizontal: px(60),
     paddingVertical: px(120),
   },
   welcomeSection: {
-    alignItems: 'center',
+    alignItems: "center",
     flex: 1,
-    justifyContent: 'center',
+    justifyContent: "center",
   },
   welcomeText: {
     fontSize: px(48),
-    fontWeight: '600',
-    color: '#333',
+    fontWeight: "600",
+    color: "#333",
     marginTop: px(40),
   },
   subText: {
     fontSize: px(32),
-    color: '#666',
+    color: "#666",
     marginTop: px(16),
   },
   actionSection: {
-    width: '100%',
-    alignItems: 'center',
+    width: "100%",
+    alignItems: "center",
     marginBottom: px(80),
   },
   logoutButton: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center',
-    backgroundColor: '#FF6B6B',
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    backgroundColor: "#FF6B6B",
     paddingHorizontal: px(80),
     paddingVertical: px(32),
     borderRadius: px(50),
-    shadowColor: '#000',
+    shadowColor: "#000",
     shadowOffset: {
       width: 0,
       height: 2,
@@ -204,21 +195,21 @@ const styles = StyleSheet.create({
   },
   logoutText: {
     fontSize: px(36),
-    fontWeight: '600',
-    color: '#fff',
+    fontWeight: "600",
+    color: "#fff",
   },
   versionSection: {
-    alignItems: 'center',
+    alignItems: "center",
   },
   versionText: {
     fontSize: px(28),
-    color: '#999',
+    color: "#999",
   },
   versionSubText: {
     fontSize: px(24),
-    color: '#ccc',
+    color: "#ccc",
     marginTop: px(8),
   },
 });
 
-export default SimpleProfileScreen;
+export default SimpleProfileScreen;

package/app/screens/ChatModeScreen/index.js

@@ -4,13 +4,13 @@ import {
   StyleSheet,
   TouchableOpacity,
   Text,
-  SafeAreaView,
   KeyboardAvoidingView,
   Platform,
   StatusBar,
   Keyboard,
   NativeModules,
 } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Icon } from "@rneui/themed";
 import MyChat from "./chat/MyChat";
 import ChatInputBar from "./components/ChatInputBar";
@@ -22,6 +22,8 @@ const { px } = global.base;
  * 专门为爱家宝品牌提供全屏AI智能客服对话界面
  */
 function ChatModeScreen({ navigation }) {
+  const insets = useSafeAreaInsets();
+
   const handleProfilePress = () => {
     // 判断是否为本地开发环境（与polyfill.js中的逻辑一致）
     const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
@@ -54,12 +56,7 @@ function ChatModeScreen({ navigation }) {
   };
 
   return (
-    <SafeAreaView style={styles.container}>
-      <StatusBar
-        barStyle="dark-content"
-        backgroundColor="#f5f5f5"
-        translucent={false}
-      />
+    <View style={[styles.container, { paddingTop: insets.top }]}>
       <KeyboardAvoidingView
         style={styles.keyboardView}
         behavior={Platform.OS === "ios" ? "padding" : undefined}
@@ -73,7 +70,7 @@ function ChatModeScreen({ navigation }) {
           <TouchableOpacity
             style={styles.profileButton}
             onPress={handleProfilePress}
-            activeOpacity={0.8}
+            activeOpacity={0.7}
           >
             <Text style={styles.profileButtonText}>我的</Text>
           </TouchableOpacity>
@@ -88,7 +85,7 @@ function ChatModeScreen({ navigation }) {
           onMediaSelect={handleMediaSelect}
         />
       </KeyboardAvoidingView>
-    </SafeAreaView>
+    </View>
   );
 }
 
@@ -115,7 +112,7 @@ const styles = StyleSheet.create({
     alignItems: "center",
   },
   headerTitle: {
-    fontSize: px(36),
+    fontSize: px(38),
     fontWeight: "600",
     color: "#333",
   },
@@ -138,7 +135,7 @@ const styles = StyleSheet.create({
     elevation: 5,
   },
   profileButtonText: {
-    fontSize: px(32),
+    fontSize: px(38),
     fontWeight: "600",
     color: "#333",
   },

package/app/screens/LoginScreen/index.js

@@ -396,7 +396,7 @@ function LoginScreen({ navigation, route }) {
       Alert.alert("请输入手机号");
       return false;
     }
-    if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(phone)) {
+    if (!/^1[3-9]\d{9}$/.test(phone)) {
       // Alert.alert('请输入正确的手机号');
       global.toast.showToast("手机号无效，请检查！");
       return false;

package/app/screens/LoginScreen/indexEdu.js

@@ -198,7 +198,7 @@ function LoginScreen({ navigation, route }) {
       Alert.alert("请输入手机号");
       return false;
     }
-    if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(phone)) {
+    if (!/^1[3-9]\d{9}$/.test(phone)) {
       // Alert.alert('请输入正确的手机号');
       global.toast.showToast("手机号无效，请检查！");
       return false;

package/app/screens/LoginScreen/indexNew.js

@@ -395,7 +395,7 @@ function LoginScreen({ navigation, route }) {
       Alert.alert("请输入手机号");
       return false;
     }
-    if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(phone)) {
+    if (!/^1[3-9]\d{9}$/.test(phone)) {
       // Alert.alert('请输入正确的手机号');
       global.toast.showToast("手机号无效，请检查！");
       return false;

package/app/screens/LoginScreen/indexSbk.js

@@ -154,7 +154,7 @@ function LoginScreen({ navigation, route }) {
       Alert.alert("请输入手机号");
       return false;
     }
-    if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(phone)) {
+    if (!/^1[3-9]\d{9}$/.test(phone)) {
       Alert.alert("请输入正确的手机号");
       return false;
     }

package/app/screens/RegisteCountScreen/index.js

@@ -108,7 +108,7 @@ const Index = ({ route }) => {
       Alert.alert("请输入手机号");
       return false;
     }
-    if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(phoneNumber)) {
+    if (!/^1[3-9]\d{9}$/.test(phoneNumber)) {
       // Alert.alert('请输入正确的手机号');
       global.toast.showToast("手机号无效，请检查！");
       return false;

package/app/screens/ResePassword/index.js

@@ -45,7 +45,7 @@ const Index = ({route}) => {
       Alert.alert('请输入手机号');
       return false;
     }
-    if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(phoneNumber)) {
+    if (!/^1[3-9]\d{9}$/.test(phoneNumber)) {
       // Alert.alert('请输入正确的手机号');
       global.toast.showToast('手机号无效，请检查！');
       return false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.42",
-  "ipanelVersion": "1.0.534",
+  "version": "1.0.44",
+  "ipanelVersion": "1.0.590",
   "description": "",
   "main": "index.js",
   "keywords": [