ipanel-rnapp-ajb-base 1.0.44 → 1.0.45

package/app/.local_dev/polyfill.js

@@ -1,5 +1,5 @@
-import React from 'react';
-import {AppRegistry, NativeModules, View, Text} from 'react-native';
+import React from "react";
+import { AppRegistry, NativeModules, View, Text } from "react-native";
 
 // isMultiBundle：是否为分包加载方式（不是的话就是不分包方式，用于本地调试）
 const isLocalDev = !NativeModules.RNToNativeEmitter?.isMultiBundle;
@@ -12,38 +12,44 @@ async function getRemoteComponentByName(componentName) {
     try {
       // 用于本地开发测试，每加一个业务包这里都需要加一下
       switch (componentName) {
-        case 'tvShare':
-          return (await import('../../app_tvShare/App.js')).default;
-        case 'smartHome':
-          return (await import('../../app_smartHome/App.js')).default;
-        case 'shop':
-          return (await import('../../app_shop/App.js')).default;
-        case 'panYuGovData':
-          return (await import('../../app_panYuGovData/App.js')).default;
-        case 'myProfile':
-          return (await import('../../app_myProfile/App.js')).default;
-        case 'adg':
-          return (await import('../../app_adg/App.js')).default;
-        case 'orderFood':
-          return (await import('../../app_orderFood/App.js')).default;
-        case 'apartment':
-          return (await import('../../app_apartment/App.js')).default;
-        case 'jinpeng':
-          return (await import('../../app_jinpeng/App.js')).default;
+        case "tvShare":
+          return (await import("../../app_tvShare/App.js")).default;
+        case "smartHome":
+          return (await import("../../app_smartHome/App.js")).default;
+        case "shop":
+          return (await import("../../app_shop/App.js")).default;
+        case "panYuGovData":
+          return (await import("../../app_panYuGovData/App.js")).default;
+        case "myProfile":
+          return (await import("../../app_myProfile/App.js")).default;
+        case "adg":
+          return (await import("../../app_adg/App.js")).default;
+        case "orderFood":
+          return (await import("../../app_orderFood/App.js")).default;
+        case "apartment":
+          return (await import("../../app_apartment/App.js")).default;
+        case "jinpeng":
+          return (await import("../../app_jinpeng/App.js")).default;
+        // 山东享TV（整包里平铺的 app_shandongXxx，对应各业务仓的 app/ 目录）
+        case 'shandongHome':
+          return (await import('../../app_shandongHome/App.js')).default;
+        case 'shandongMyProfile':
+          return (await import('../../app_shandongMyProfile/App.js')).default;
         // __BASE_SINGLETON_MODE_APP__
         default:
           return () => {
             return (
-            <View>
-              <Text>__BASE_SINGLETON_MODE_APP__</Text>
-            </View>)
+              <View>
+                <Text>__BASE_SINGLETON_MODE_APP__</Text>
+              </View>
+            );
           };
       }
     } catch (e) {
-      console.log(componentName, e);
+      global.base.logger.info("component error", { componentName, error: e });
       return false;
     }
   }
 }
 
-export {getRemoteComponentByName};
+export { getRemoteComponentByName };

package/app/App.js

@@ -11,6 +11,7 @@ import {
   AppState,
   NativeEventEmitter,
   DeviceEventEmitter,
+  Linking,
 } from "react-native";
 import { NavigationContainer } from "@react-navigation/native";
 import { createStackNavigator } from "@react-navigation/stack";
@@ -40,12 +41,15 @@ import storage from "./storage";
 
 import { navigationRef } from "./utils/RootNavigation";
 import checkLogin from "./hooks/checkLogin";
+import { isShandongApp } from "./sdApp/config";
 import {
   getModuleVersionInfo,
   getUserInfo,
   delThirdId,
+  deviceReportThird,
 } from "./api/ipanelCloudApi";
 import { appReport } from "./utils/common";
+import JPushService from "./utils/JPushService";
 
 // 基础导航页、登录页
 import BaseScreen from "./screens/BaseScreen";
@@ -117,6 +121,8 @@ const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || "alpha";
 
 const appName = NativeModules?.RNToNativeEmitter?.appName;
 
+const JPushModule = NativeModules.JPushModule;
+
 let eventEmitter;
 if (Platform.OS === "android") {
   // ----yusm：安卓使用DeviceEventEmitter
@@ -301,7 +307,7 @@ global.base.initialNavigationPackages = initialNavigationPackages;
 //   const packages = await global.base.storage.get('base.navigationPackages');
 //   if (packages) {
 //     global.base.navigationPackages = packages;
-//     console.log('成功从本地读取上一次的底部导航模块,flag=', flag);
+//     global.base.logger.info('成功从本地读取上一次的底部导航模块,flag=', flag);
 //   }
 // };
 // updateNavigationPackagesFromStorage(1);
@@ -323,9 +329,80 @@ const App = () => {
 
   const [isKeyboardVisible, setIsKeyboardVisible] = useState(false);
 
+  // 用于跟踪应用状态变化，只在从后台进入前台时上报
+  const [previousAppState, setPreviousAppState] = useState(
+    AppState.currentState,
+  );
+
   // 更新global.base
   global.base.DynamicStackScreens = DynamicStackScreens;
 
+  // 处理扫码启动的URL跳转 - 支持冷启动和事件监听
+  useEffect(() => {
+    // 添加URL事件监听器（冷/热启动时都会通过事件或onReady接收URL）
+    const subscription = Linking.addEventListener("url", (event) => {
+      global.base.logger.info("URL event received:", event);
+      global.base.parseURLAndSetRedirectParams(event.url, "event");
+    });
+
+    // 清理订阅
+    return () => {
+      subscription?.remove();
+    };
+  }, []);
+
+  // 检查并上报极光RegistrationID
+  const checkJPush = async (registrationIdEvent) => {
+    try {
+      if (appName === "遥控键码库") return;
+
+      // registrationIdEvent 可能是直接的ID字符串(iOS回调) 或 对象(Android回调)
+      // 如果是通过 addConnectListener 回调过来的，我们约定传的是 ID 字符串
+      const rid =
+        typeof registrationIdEvent === "string"
+          ? registrationIdEvent
+          : registrationIdEvent?.registerID || registrationIdEvent;
+      if (!rid) {
+        // 如果没有 ID，可能需要主动获取（兼容旧逻辑，但一般通过监听器过来都会有ID）
+        return;
+      }
+      global.base.logger.info("checkJPush with ID:", rid);
+      // 检查登录状态
+      const accountType = await storage.get("accountType");
+      const token = await storage.get(
+        accountType === "adg" ? "adgAccessToken" : "accessToken",
+      );
+
+      if (token) {
+        // 获取用户信息确认有效性
+        const accountData = await storage.get("accountData");
+        // const activeAddr = await storage.get('activeAddr');
+        const res = await getUserInfo();
+        const userList = res.result?.user_list || [];
+        const currentUser = userList.find(
+          (item) => item.user_id === accountData?.user.user_id,
+        );
+        const bindList = currentUser?.bind_list || [];
+        const jpushBindId = bindList.find(
+          (item) => item.third_type === "jpush",
+        )?.third_id;
+
+        if (rid !== jpushBindId) {
+          // 上报RegistrationID
+          await deviceReportThird({
+            third_type: "jpush",
+            third_id: rid,
+            user_id: currentUser?.user_id,
+          }).catch((e) => console.log("JPush report failed", e));
+        } else {
+          global.base.logger.info("JPush ID already bound:", rid);
+        }
+      }
+    } catch (error) {
+      global.base.logger.info("checkJPush error", error);
+    }
+  };
+
   // mounted
   useEffect(() => {
     if (Platform.OS === "android") {
@@ -336,6 +413,11 @@ const App = () => {
       global.base.accountType = res || "ajb";
     });
 
+    // 在App.js这里尽可能早地加载聊天输入类型设置，避免聊天输入框的闪动
+    storage.get("base.chatInputType").then((res) => {
+      global.base.chatInputType = res || "voice";
+    });
+
     const rnToNative = NativeModules.RNToNativeEmitter;
     // 应用通知app可正常显示，页面正常运行了，在componentDidMount 中加
     rnToNative?.notifyApplicationReady({
@@ -347,59 +429,73 @@ const App = () => {
       checkLogin();
     }
 
+    // 注册连接监听 (需要在 init 之前注册，防止 init 过快导致错过事件)
+    const removeConnectListener = JPushService.addConnectListener(checkJPush);
+    // 初始化极光推送
+    JPushService.init();
+
     // 获取最新版本并通知原生平台，由平台判断后弹出升级确认提示
     checkBaseVersion();
 
     AppState.addEventListener("change", async (nextAppState) => {
-      console.log("nextAppState", nextAppState);
-      if (nextAppState === "active") {
-        appReport("APP_STARTUP");
+      global.base.logger.info("AppState change", {
+        previousAppState,
+        nextAppState,
+      });
+
+      // 只有当从后台状态进入前台时才上报，避免APP启动时的误触发
+      if (previousAppState === "background" && nextAppState === "active") {
+        global.base.logger.info("[appReport] by AppState active");
+        appReport("APP_STARTUP", {
+          location: "热启动",
+        });
       }
+      setPreviousAppState(nextAppState);
     });
 
     const keyboardDidShowListener = Keyboard.addListener(
       "keyboardDidShow",
       () => {
         setIsKeyboardVisible(true);
-      }
+      },
     );
 
     const keyboardDidHideListener = Keyboard.addListener(
       "keyboardDidHide",
       () => {
         setIsKeyboardVisible(false);
-      }
+      },
     );
 
     const cellularDataStateListener = eventEmitter.addListener(
       "CellularDataState",
       (data) => {
-        console.log(JSON.stringify(data), "CellularDataState");
+        global.base.logger.info("CellularDataState", data);
         if (data?.state && data?.state !== 0) {
           checkBaseVersion();
         }
-      }
+      },
     );
 
     const homedLogOutListener = DeviceEventEmitter.addListener(
       "HomedLogout",
       async (data) => {
-        console.log("HomedLogout", data);
+        global.base.logger.info("HomedLogout", data);
 
         const accountData = await storage.get("accountData");
         // const activeAddr = await storage.get('activeAddr');
         const res = await getUserInfo();
-        console.log(res, "HomedLogout getUserInfo");
+        global.base.logger.info("HomedLogout getUserInfo", res);
         const userList = res.result?.user_list || [];
         const currentUser = userList.find(
-          (item) => item.user_id === accountData?.user.user_id
+          (item) => item.user_id === accountData?.user.user_id,
         );
         const bindList = currentUser?.bind_list || [];
-        console.log(bindList, "HomedLogout bindList");
+        global.base.logger.info("HomedLogout bindList", bindList);
         const homedConfig = bindList.find(
-          (item) => item.third_type === "homed"
+          (item) => item.third_type === "homed",
         );
-        console.log("homedConfig", homedConfig);
+        global.base.logger.info("homedConfig", homedConfig);
 
         if (homedConfig) {
           // 解绑当前cloud用户对应的homed用户
@@ -408,10 +504,10 @@ const App = () => {
             third_id: homedConfig.third_id,
             user_id: homedConfig.user_id,
           }).catch((err) => {
-            console.error(err);
+            global.base.logger.error("delThirdId failed", err);
           });
           if (!result || result.code !== 0) {
-            console.error("解绑homed用户失败：", result);
+            global.base.logger.error("解绑homed用户失败：", result);
             global.toast.showToast("解绑电视用户失败");
             return;
           }
@@ -419,10 +515,10 @@ const App = () => {
           await storage.remove("homedAccessToken");
           await storage.remove("HomedLoginResult");
         } else {
-          console.log("当前未绑定homed用户");
+          global.base.logger.info("当前未绑定homed用户");
           global.toast.showToast("当前没有绑定电视用户，无法解绑");
         }
-      }
+      },
     );
 
     return () => {
@@ -430,6 +526,7 @@ const App = () => {
       keyboardDidHideListener.remove();
       cellularDataStateListener.remove();
       homedLogOutListener.remove();
+      removeConnectListener && removeConnectListener();
     };
   }, []);
 
@@ -448,10 +545,10 @@ const App = () => {
       if (res.code === 0) {
         const versionInfo = res.data.packages[0];
         const newVersion = Number(
-          versionInfo.version.slice(1).replace(/\./g, "")
+          versionInfo.version.slice(1).replace(/\./g, ""),
         );
         const currentVersion = Number(
-          baseVersionInfo.version.slice(1).replace(/\./g, "")
+          baseVersionInfo.version.slice(1).replace(/\./g, ""),
         );
         if (newVersion > currentVersion) {
           setVersionUpdateConfirmVisible(true);
@@ -476,7 +573,7 @@ const App = () => {
   const handleStateChange = ({ routes }) => {
     const routeName = routes[routes.length - 1].name;
     setIncludeBottom(
-      allStackScreens[routeName]?.screenOptions?.includeBottom || false
+      allStackScreens[routeName]?.screenOptions?.includeBottom || false,
     );
     /* 加载之后每次navigate都鉴权一把登录状态（重置密码不需要检测） */
     if (
@@ -500,7 +597,11 @@ const App = () => {
             onStateChange={handleStateChange}
           >
             <Stack.Navigator
-              initialRouteName={"Login"}
+              /**
+               * 山东享TV：起始路由走 `Home`，不再一进来就落登录页。
+               * 登录入口在「我的」页（`navigate('Login')`）；其余产品仍是 `Login`，不受影响。
+               */
+              initialRouteName={isShandongApp() ? "Home" : "Login"}
               screenOptions={{
                 headerStyle: {},
               }}

package/app/api/ipanelCloudApi.js

@@ -22,8 +22,8 @@ const CLOUDHOMECENTER_URL = `${config.IPANEL_CLOUD_BASE_URI}/s/smart_home/cloudh
 
 // 获取百度ASR token，支持缓存和自动刷新
 export const getBaiduAsrToken = async () => {
-  const BAIDU_ASR_TOKEN_KEY = 'baiduasrtoken';
-  const {storage} = global.base;
+  const BAIDU_ASR_TOKEN_KEY = "baiduasrtoken";
+  const { storage } = global.base;
 
   try {
     const cachedTokenInfo = await storage.get(BAIDU_ASR_TOKEN_KEY);
@@ -36,17 +36,20 @@ export const getBaiduAsrToken = async () => {
       return cachedTokenInfo.accessToken;
     }
   } catch (error) {
-    console.error('Get baidu asr token from storage error', error);
+    global.base.logger.error("Get baidu asr token from storage error", error);
   }
 
   const result = await request({
     url: CLOUDHOMECENTER_URL,
-    method: 'POST',
+    method: "POST",
     data: {
-      path: 'asrproxy/token',
+      path: "asrproxy/token",
     },
-  }).catch(err => {
-    console.error('Failed to fetch Baidu ASR token', err);
+  }).catch((err) => {
+    global.base.logger.info(
+      "asrproxy/token Error: Failed to fetch Baidu ASR token",
+      err,
+    );
   });
 
   if (result && result.code === 0) {
@@ -60,26 +63,26 @@ export const getBaiduAsrToken = async () => {
           expiresAt: expiresAt,
         });
       } catch (error) {
-        console.error('Set baidu asr token to storage error', error);
+        global.base.logger.error("Set baidu asr token to storage error", error);
       }
       return tokenData.access_token;
     }
   }
-  return '';
+  return "";
 };
 
 // 百度ASR语音识别服务，支持动态token获取
-export const baiduAsr = async (cuid, len, speechBase64) => {
+export const baiduAsr = async (cuid, len, speechBase64, format = "m4a") => {
   const token = await getBaiduAsrToken();
   if (!token) {
-    throw new Error('Failed to obtain Baidu ASR token');
+    throw new Error("Failed to obtain Baidu ASR token");
   }
 
   return request({
     url: "https://vop.baidu.com/pro_api", // 语音识别极速版调用地址
     method: "POST",
     data: {
-      format: "m4a",
+      format,
       rate: 16000,
       dev_pid: 80001,
       channel: 1,
@@ -1002,6 +1005,18 @@ export const queryCountByName = (data) => {
   });
 };
 
+// 扫码登录tv端的cloud账号
+export const accountLoginCode = data => {
+  return request({
+    url: ACCOUNT_SERVICE,
+    method: 'POST',
+    data: {
+      action: 'homed_login',
+      ...data,
+    },
+  });
+};
+
 // 获取图形验证码
 export const getCaptcha = (data) => {
   return request({
@@ -1034,3 +1049,57 @@ export const getJinpengBindList = async (params) => {
     },
   });
 };
+
+// 获取智能推荐问题列表
+export const getRecommendQuestions = async (data, abortSignal) => {
+  const MSGCENTER_URL = `${config.IPANEL_CLOUD_BASE_URI}/1/cs_agent/api/families/${data.address_id}/recommend_questions`;
+  return request({
+    url: MSGCENTER_URL,
+    method: "GET",
+    signal: abortSignal, // 支持取消信号
+    data: {
+      user_id: data.user_id,
+    },
+  });
+};
+
+// 家庭画像问卷API
+
+/**
+ * 获取家庭画像问卷数据
+ * @param {string} storageRoomId - 家庭默认储物间房间uuid
+ * @returns {Promise} API响应
+ */
+export const getFamilyQuestionnaire = async (storageRoomId) => {
+  const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  return request({
+    url: ROOMKEEPER_SERVICE,
+    method: "POST",
+    data: {
+      path: "family/get_questionnaire",
+      storage_room_id: storageRoomId,
+    },
+  });
+};
+
+/**
+ * 保存家庭画像问卷数据
+ * @param {string} storageRoomId - 家庭默认储物间房间uuid
+ * @param {object} questionnaireData - 问卷数据
+ * @returns {Promise} API响应
+ */
+export const saveFamilyQuestionnaire = async (
+  storageRoomId,
+  questionnaireData,
+) => {
+  const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  return request({
+    url: ROOMKEEPER_SERVICE,
+    method: "POST",
+    data: {
+      path: "family/save_questionnaire",
+      storage_room_id: storageRoomId,
+      data: questionnaireData,
+    },
+  });
+};