ipanel-rnapp-ajb-base 1.0.39 → 1.0.41

package/app/screens/RegisteCountScreen/index.js

@@ -32,7 +32,7 @@ import {
   accountLogin,
   getHouseType,
   loginByType,
-} from '../../api';
+} from "../../api";
 import px from "../../utils/scaleSize";
 import storage from "../../storage";
 import { replace, goBack } from "../../utils/RootNavigation";
@@ -181,7 +181,7 @@ const Index = ({ route }) => {
     });
   };
 
-  const dealLoginInfo = async (ress, finallyAppID, callback) => {
+  const dealLoginInfo = async (ress, ipanelCloudAccountId, callback) => {
     await storage.set("accountType", activeType);
     await storage.set("accessToken", ress.result.access_token);
     await storage.set("refreshToken", ress.result.refresh_token);
@@ -236,7 +236,7 @@ const Index = ({ route }) => {
       ? 115017
       : 4664;
     await initOperatorHomedTouristAccount({
-      touristUsername: finallyAppID,
+      touristUsername: ipanelCloudAccountId,
       domain: domain,
       touristGroupId: touristGroupId, // 4664: tv集群的手机APP游客用户组. 115017: 运营集群手机APP游客用户组
     });
@@ -246,44 +246,46 @@ const Index = ({ route }) => {
       `${ress.result?.account?.account_id || ""}currentOperator`
     );
     // 获取公寓token
-    getHouseType().then(async apartmentRes => {
-      if (apartmentRes.code === 0) {
-        let list = apartmentRes.data || [];
-        if (list.length) {
-          // 拥有角色列表
-          const minUserType = list.reduce(
-            (min, current) =>
-              current.userType < min.userType ? current : min,
-            list[0],
-          );
-          if (minUserType?.userType) {
-            const loginRes = await loginByType(minUserType?.userType, {});
-            console.log(loginRes, 'loginRes');
-            if (loginRes.code === 0 && loginRes.data) {
-              await storage.set('apartmentData', {
-                ...loginRes.data,
-                userType: minUserType?.userType,
-                userTypeName: minUserType?.userTypeName,
-              });
-              await storage.set('apartmentToken', loginRes.data.accessToken);
-            } else {
-              await storage.set('apartmentData', {});
-              await storage.set('apartmentToken', '');
+    getHouseType()
+      .then(async (apartmentRes) => {
+        if (apartmentRes.code === 0) {
+          let list = apartmentRes.data || [];
+          if (list.length) {
+            // 拥有角色列表
+            const minUserType = list.reduce(
+              (min, current) =>
+                current.userType < min.userType ? current : min,
+              list[0]
+            );
+            if (minUserType?.userType) {
+              const loginRes = await loginByType(minUserType?.userType, {});
+              console.log(loginRes, "loginRes");
+              if (loginRes.code === 0 && loginRes.data) {
+                await storage.set("apartmentData", {
+                  ...loginRes.data,
+                  userType: minUserType?.userType,
+                  userTypeName: minUserType?.userTypeName,
+                });
+                await storage.set("apartmentToken", loginRes.data.accessToken);
+              } else {
+                await storage.set("apartmentData", {});
+                await storage.set("apartmentToken", "");
+              }
             }
+          } else {
+            await storage.set("apartmentData", {});
+            await storage.set("apartmentToken", "");
           }
         } else {
-          await storage.set('apartmentData', {});
-          await storage.set('apartmentToken', '');
+          await storage.set("apartmentData", {});
+          await storage.set("apartmentToken", "");
         }
-      } else {
-        await storage.set('apartmentData', {});
-        await storage.set('apartmentToken', '');
-      }
-    }).catch(async e => {
-      console.log(e, 'getHouseType');
-      await storage.set('apartmentData', {});
-      await storage.set('apartmentToken', '');
-    })
+      })
+      .catch(async (e) => {
+        console.log(e, "getHouseType");
+        await storage.set("apartmentData", {});
+        await storage.set("apartmentToken", "");
+      });
     callback();
   };
 
@@ -354,7 +356,7 @@ const Index = ({ route }) => {
         };
         const ress = await accountLogin(params, activeType);
         if (ress.code === 0) {
-          dealLoginInfo(ress, finallyAppID, async () => {
+          dealLoginInfo(ress, ress.result.account_id, async () => {
             console.log("12333appName:" + appName);
             appReport("APP_STARTUP");
             if (["禺乐慧家", "悦慧家"].includes(appName)) {
@@ -441,7 +443,7 @@ const Index = ({ route }) => {
         const ress = await accountLogin(params, activeType);
         console.log(ress, "login");
         if (ress.code === 0) {
-          dealLoginInfo(ress, finallyAppID, () => {
+          dealLoginInfo(ress, ress.result.account_id, () => {
             setStep(1);
           });
         } else {

package/app/screens/WebviewScreen.js

@@ -1,29 +1,172 @@
-import React, {useState, useEffect} from 'react';
-import {View, Text, StyleSheet, TouchableHighlight} from 'react-native';
+import React, { useState, useEffect, useRef } from "react";
+import {
+  View,
+  Text,
+  StyleSheet,
+  TouchableHighlight,
+  TouchableOpacity,
+  BackHandler,
+  Platform,
+  StatusBar,
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
-import {WebView} from 'react-native-webview';
-import ScreenBackHeader from '../components/common/ScreenBackHeader';
+import { WebView } from "react-native-webview";
+import ScreenBackHeader from "../components/common/ScreenBackHeader";
+
+const Index = ({ navigation, route }) => {
+  // WebView状态管理
+  const [canGoBack, setCanGoBack] = useState(false);
+  const webViewRef = useRef(null);
+  const insets = useSafeAreaInsets();
+
+  // Android回退键处理
+  useEffect(() => {
+    const onBackPress = () => {
+      if (canGoBack && webViewRef.current) {
+        webViewRef.current.goBack();
+        return true; // 阻止默认回退行为
+      }
+      return false; // 允许默认回退行为（退出WebView页面）
+    };
+
+    if (Platform.OS === "android") {
+      const backHandler = BackHandler.addEventListener(
+        "hardwareBackPress",
+        onBackPress
+      );
+      return () => backHandler.remove();
+    }
+  }, [canGoBack]);
+
+  // 主流方案：禁用手势避免冲突
+  useEffect(() => {
+    navigation.setOptions({
+      gestureEnabled: !canGoBack, // WebView可回退时禁用系统手势
+    });
+  }, [navigation, canGoBack]);
+
+  // 统一的智能回退处理逻辑
+  const handleSmartBack = () => {
+    if (canGoBack && webViewRef.current) {
+      webViewRef.current.goBack(); // WebView内回退
+    } else {
+      navigation.goBack(); // 退出WebView页面
+    }
+  };
+
+  // WebView导航状态变化处理
+  const handleNavigationStateChange = (navState) => {
+    setCanGoBack(navState.canGoBack);
+
+    // 支持外部传入的onNavigationStateChange回调
+    if (!navState.loading && route?.params?.onNavigationStateChange) {
+      route?.params?.onNavigationStateChange(navState);
+    }
+  };
+
+  // iOS需要onMessage处理器才能执行injectedJavaScript
+  const handleMessage = (event) => {
+    // 支持外部传入的onMessage回调
+    if (route?.params?.webviewParams?.onMessage) {
+      route.params.webviewParams.onMessage(event);
+    }
+    // 默认情况下什么都不做，但这个处理器必须存在，否则在IOS上injectedJavaScript不会执行
+  };
+
+  // 生成注入的JavaScript代码
+  const getInjectedJavaScript = () => {
+    const statusBarHeight =
+      Platform.OS === "ios" ? insets.top : StatusBar.currentHeight || 0;
+    const userJS = route.params.webviewParams?.injectedJavaScript || "";
+
+    // 如果设置了覆盖标志，直接返回用户JS
+    if (route.params.overrideStatusBarJS) {
+      return userJS || undefined;
+    }
+
+    // 构建状态栏处理JS
+    const statusBarJS = route.params.fullScreen
+      ? `document.body.style.paddingTop = '${statusBarHeight}px';`
+      : "";
+
+    // 如果都有，合并执行
+    if (statusBarJS && userJS) {
+      return `
+        (function() {
+          ${statusBarJS}
+          ${userJS}
+          true; // 必须返回true
+        })();
+      `;
+    }
+
+    // 只有状态栏JS
+    if (statusBarJS) {
+      return `
+        (function() {
+          ${statusBarJS}
+          true; // 必须返回true
+        })();
+      `;
+    }
+
+    // 只有用户JS或都没有
+    return userJS || undefined;
+  };
 
-const Index = ({navigation, route}) => {
   return (
     <View style={styles.container}>
-      <ScreenBackHeader title={route.params.title} />
+      {route.params.fullScreen ? null : (
+        <ScreenBackHeader
+          title={route.params.title}
+          onBackPress={handleSmartBack}
+        />
+      )}
 
       <View style={styles.webviewContainer}>
         <WebView
+          ref={webViewRef}
           bounces={false}
           domStorageEnabled
           javaScriptEnabled
           useWebKit
-          // onNavigationStateChange={val => {
-          //   if (!val.loading && route?.params?.onNavigationStateChange) {
-          //     route?.params?.onNavigationStateChange(val);
-          //   }
-          // }}
+          onNavigationStateChange={handleNavigationStateChange}
           source={{
             uri: route.params.url,
           }}
+          {...(() => {
+            const webviewParams = route.params.webviewParams || {};
+            const { injectedJavaScript, onMessage, ...otherParams } =
+              webviewParams;
+            return {
+              ...otherParams,
+              injectedJavaScript: getInjectedJavaScript(),
+              onMessage: handleMessage,
+            };
+          })()}
         />
+
+        {/* 悬浮返回按钮 - 仅在全屏模式且WebView可回退时显示 */}
+        {route.params.fullScreen && canGoBack && (
+          <TouchableOpacity
+            style={[
+              styles.floatingBackButton,
+              {
+                top:
+                  Platform.OS === "ios"
+                    ? insets.top + 10
+                    : StatusBar.currentHeight + 10,
+              },
+            ]}
+            onPress={handleSmartBack}
+            activeOpacity={0.8}
+          >
+            <View style={styles.backButtonInner}>
+              <Text style={styles.backButtonText}>‹</Text>
+            </View>
+          </TouchableOpacity>
+        )}
       </View>
     </View>
   );
@@ -35,6 +178,68 @@ const styles = StyleSheet.create({
   },
   webviewContainer: {
     flex: 1,
+    position: "relative",
+  },
+  floatingBackButton: {
+    position: "absolute",
+    left: 15,
+    width: 44,
+    height: 44,
+    zIndex: 9999,
+  },
+  backButtonOuterWrapper: {
+    width: 46, // 稍微大一点，确保阴影完整显示
+    height: 46,
+    borderRadius: 23,
+    backgroundColor: "transparent",
+    justifyContent: "center",
+    alignItems: "center",
+    elevation: 8, // 增加elevation让阴影更明显
+    // Android特有：强制圆形遮罩
+    overflow: "hidden",
+  },
+  backButtonInner: {
+    width: 44,
+    height: 44,
+    backgroundColor: "rgba(0, 0, 0, 0.6)",
+    justifyContent: "center",
+    alignItems: "center",
+    // 跨平台阴影统一处理
+    ...Platform.select({
+      ios: {
+        borderRadius: 22,
+        shadowColor: "#000",
+        shadowOffset: {
+          width: 0,
+          height: 2,
+        },
+        shadowOpacity: 0.25,
+        shadowRadius: 3.84,
+      },
+      android: {
+        borderRadius: 22,
+        elevation: 0,
+        // Android圆形强制方案
+        transform: [{ scaleX: 1 }, { scaleY: 1 }],
+      },
+    }),
+  },
+  backButtonText: {
+    fontSize: Platform.select({
+      ios: 28, // iOS上使用稍大的字号
+      android: 24, // Android保持原有字号
+    }),
+    color: "#fff",
+    fontWeight: Platform.select({
+      ios: "600", // iOS使用稍轻的字重
+      android: "bold", // Android保持bold
+    }),
+    marginTop: Platform.select({
+      ios: -3, // iOS的视觉居中调整
+      android: -2, // Android的视觉居中调整
+    }),
+    textAlign: "center",
+    includeFontPadding: false, // Android特有，移除字体padding
   },
 });
 

package/app/utils/common.js

@@ -263,6 +263,7 @@ const MSG_TYPES = {
   VIDEO: "video",
   EVENT: "event",
   TEMPLATE: "template",
+  CHAT: "chat",
 };
 
 const MSG_EVENT_TYPES = {
@@ -452,6 +453,12 @@ const checkToken = async () => {
   });
 };
 
+const CONNECT_STATUS = {
+  CONNECTING: -1,
+  CONNECTED: 0,
+  DISCONNECTED: 1,
+};
+
 export {
   updateHomedToken,
   initOperatorHomedTouristAccount,
@@ -465,4 +472,5 @@ export {
   appReport,
   checkToken,
   updateApartmentToken,
+  CONNECT_STATUS,
 };

package/app/utils/http.js

@@ -68,7 +68,7 @@ async function http(options) {
     if (TOKEN) {
       data.access_token = TOKEN;
     }
-    Object.keys(data).forEach(key => {
+    Object.keys(data).forEach((key) => {
       query.push(`${key}=${data[key]}`);
     });
     if (query.length > 0) {
@@ -93,38 +93,44 @@ async function http(options) {
   console.log("req:", url, config, "reqid=", reqid);
 
   return fetch(url, config)
-    .then(response => {
-      // console.log(response, "url");
-      return response.json();
-    })
-    .then(json => {
-      if (
-        typeof json.error_code !== "undefined" &&
-        typeof json.code === "undefined"
-      ) {
-        json.code = json.error_code;
-      }
+    .then(async (response) => {
+      const jsonText = await response.text();
+      try {
+        const json = JSON.parse(jsonText);
+
+        if (
+          typeof json.error_code !== "undefined" &&
+          typeof json.code === "undefined"
+        ) {
+          json.code = json.error_code;
+        }
 
-      if (typeof json.code !== "undefined") {
-        if (json.code !== 0 && !selfHandleErrCodes.includes(json.code)) {
-          // global.toast.showToast(
-          //   errCodes[json.code] ||
-          //     `${json.message || '请求失败'}(code:${json.code})`,
-          // );
+        if (typeof json.code !== "undefined") {
+          if (json.code !== 0 && !selfHandleErrCodes.includes(json.code)) {
+            // global.toast.showToast(
+            //   errCodes[json.code] ||
+            //     `${json.message || '请求失败'}(code:${json.code})`,
+            // );
+          }
         }
+        console.log("res:", url, config, "reqid=", reqid, "json=", json);
+
+        return json;
+      } catch (e) {
+        console.log("jsonText", jsonText);
+        console.log("status:", response.status);
+        console.log("headers:", response.headers);
+        throw new Error(e);
       }
-      console.log("res:", url, config, "reqid=", reqid, "json=", json);
-
-      return json;
     })
-    .catch(err => {
+    .catch((err) => {
       console.log("req error:", url, config, "reqid=", reqid, "error=", err);
       throw err;
       // Alert.alert('服务繁忙，请稍候重试');
     });
 }
 
-export const homedHttp = async options => {
+export const homedHttp = async (options) => {
   let url = options.url;
   const method = options.method.toLowerCase();
 
@@ -174,7 +180,7 @@ export const homedHttp = async options => {
     if (TOKEN) {
       data.accesstoken = TOKEN;
     }
-    Object.keys(data).forEach(key => {
+    Object.keys(data).forEach((key) => {
       query.push(`${key}=${data[key]}`);
     });
     if (query.length > 0) {
@@ -185,13 +191,13 @@ export const homedHttp = async options => {
   console.log(url, config);
 
   return fetch(url, config)
-    .then(response => {
+    .then((response) => {
       return response.json();
     })
-    .then(json => {
+    .then((json) => {
       return json;
     })
-    .catch(err => {
+    .catch((err) => {
       console.log(err);
       // Alert.alert('服务繁忙，请稍候重试');
       return Promise.reject(err);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.39",
-  "ipanelVersion": "1.0.521",
+  "version": "1.0.41",
+  "ipanelVersion": "1.0.533",
   "description": "",
   "main": "index.js",
   "keywords": [