ipanel-rnapp-ajb-base 1.0.26 → 1.0.28

package/app/App.js

@@ -1,4 +1,4 @@
-import React, {useState, useEffect, useMemo} from 'react';
+import React, { useState, useEffect, useMemo } from "react";
 import {
   View,
   LogBox,
@@ -11,64 +11,64 @@ import {
   AppState,
   NativeEventEmitter,
   DeviceEventEmitter,
-} from 'react-native';
-import {NavigationContainer} from '@react-navigation/native';
-import {createStackNavigator} from '@react-navigation/stack';
-import {SheetProvider} from 'react-native-actions-sheet';
-import DeviceInfo from 'react-native-device-info';
-import {SafeAreaProvider, SafeAreaView} from 'react-native-safe-area-context';
-import VersionUpdateConfirm from './components/VersionUpdateConfirm';
+} from "react-native";
+import { NavigationContainer } from "@react-navigation/native";
+import { createStackNavigator } from "@react-navigation/stack";
+import { SheetProvider } from "react-native-actions-sheet";
+import DeviceInfo from "react-native-device-info";
+import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
+import VersionUpdateConfirm from "./components/VersionUpdateConfirm";
 // import NetInfo from '@react-native-community/netinfo';
-import {Provider} from '@ant-design/react-native';
+import { Provider } from "@ant-design/react-native";
 
 // 重要：base.js需放在一切自定义代码之前初始化
-import './base.js';
+import "./base.js";
 // 版本升级相关代码
-import './utils/bundleUpdater';
+import "./utils/bundleUpdater";
 // 对接声必可屏幕
-import './utils/SBK_plugin';
+import "./utils/SBK_plugin";
 
 // 注册actionSheet组件
-import './components/sheets.js';
+import "./components/sheets.js";
 
-import Loading from './components/common/Loading';
-import Toast from './components/common/Toast';
-import Dialog from './components/common/Dialog';
-import Notify from './components/common/Notify';
-import SheetManage from './components/common/SheetManage';
-import storage from './storage';
+import Loading from "./components/common/Loading";
+import Toast from "./components/common/Toast";
+import Dialog from "./components/common/Dialog";
+import Notify from "./components/common/Notify";
+import SheetManage from "./components/common/SheetManage";
+import storage from "./storage";
 
-import {navigationRef} from './utils/RootNavigation';
-import checkLogin from './hooks/checkLogin';
-import {getModuleVersionInfo} from './api/';
-import {appReport} from './utils/common';
+import { navigationRef } from "./utils/RootNavigation";
+import checkLogin from "./hooks/checkLogin";
+import { getModuleVersionInfo } from "./api/";
+import { appReport } from "./utils/common";
 
 // 基础导航页、登录页
-import BaseScreen from './screens/BaseScreen';
-import LoginScreen from './screens/LoginScreen';
-import NewLoginScreen from './screens/LoginScreen/indexNew';
-import ResePasswordScreen from './screens/ResePassword';
-import SbkScreen from './screens/SbkScreen';
+import BaseScreen from "./screens/BaseScreen";
+import LoginScreen from "./screens/LoginScreen";
+import NewLoginScreen from "./screens/LoginScreen/indexNew";
+import ResePasswordScreen from "./screens/ResePassword";
+import SbkScreen from "./screens/SbkScreen";
 
-import eventBus, {EVENTS} from './eventBus';
+import eventBus, { EVENTS } from "./eventBus";
 
-import useDynamicPackages from './hooks/useDynamicPackages';
-import useAddress from './hooks/useAddress';
-import useAddress2 from './hooks/useAddress2';
-import useNavigationFocus from './hooks/useNavigationFocus';
-import useLatest from './hooks/useLatest';
-import useDebounceFn from './hooks/useDebounceFn';
-import useUser from './hooks/useUser';
-import useKeyboard from './hooks/useKeyboard';
+import useDynamicPackages from "./hooks/useDynamicPackages";
+import useAddress from "./hooks/useAddress";
+import useAddress2 from "./hooks/useAddress2";
+import useNavigationFocus from "./hooks/useNavigationFocus";
+import useLatest from "./hooks/useLatest";
+import useDebounceFn from "./hooks/useDebounceFn";
+import useUser from "./hooks/useUser";
+import useKeyboard from "./hooks/useKeyboard";
 
-import RegisteCountScreen from './screens/RegisteCountScreen';
+import RegisteCountScreen from "./screens/RegisteCountScreen";
 
 LogBox.ignoreLogs([
-  'ViewPropTypes will be removed',
-  'ColorPropType will be removed',
+  "ViewPropTypes will be removed",
+  "ColorPropType will be removed",
 ]);
 
-if (DeviceInfo.getBrand() === 'Allwinner') {
+if (DeviceInfo.getBrand() === "Allwinner") {
   NativeModules.Orientation?.lockToLandscapeLeft();
 
   setTimeout(() => {
@@ -88,25 +88,26 @@ global.base.hooks = {
 };
 
 // 公共页面
-import WebviewScreen from './screens/WebviewScreen';
-import ScanQRCodeScreen from './screens/CommonScreens/ScanQRCodeScreen';
-import OperatorSelectScreen from './screens/CommonScreens/OperatorSelectScreen';
-import EditInvoiceTitleScreen from './screens/CommonScreens/EditInvoiceTitleScreen';
-import InvoiceTitleListScreen from './screens/CommonScreens/InvoiceTitleListScreen';
-import TvAlbumScreen from './screens/CommonScreens/TvAlbumScreen';
-import DeviceFeedbackScreen from './screens/CommonScreens/DeviceFeedbackScreen';
-import DeviceAnswerDetailScreen from './screens/CommonScreens/DeviceAnswerDetailScreen';
+import WebviewScreen from "./screens/WebviewScreen";
+import HomedLoginScreen from "./screens/CommonScreens/HomedLoginScreen";
+import ScanQRCodeScreen from "./screens/CommonScreens/ScanQRCodeScreen";
+import OperatorSelectScreen from "./screens/CommonScreens/OperatorSelectScreen";
+import EditInvoiceTitleScreen from "./screens/CommonScreens/EditInvoiceTitleScreen";
+import InvoiceTitleListScreen from "./screens/CommonScreens/InvoiceTitleListScreen";
+import TvAlbumScreen from "./screens/CommonScreens/TvAlbumScreen";
+import DeviceFeedbackScreen from "./screens/CommonScreens/DeviceFeedbackScreen";
+import DeviceAnswerDetailScreen from "./screens/CommonScreens/DeviceAnswerDetailScreen";
 
 // Boss绑定页面
-import BindBossScreen from './screens/CommonScreens/BossScreen';
+import BindBossScreen from "./screens/CommonScreens/BossScreen";
 
 const Stack = createStackNavigator();
 
-const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || 'alpha';
+const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || "alpha";
 // const envVersion = 'release';
 
 let eventEmitter;
-if (Platform.OS === 'android') {
+if (Platform.OS === "android") {
   // ----yusm：安卓使用DeviceEventEmitter
   eventEmitter = DeviceEventEmitter;
 } else {
@@ -117,30 +118,36 @@ const CommonScreens = {
   Home: {
     component: BaseScreen,
     screenOptions: {
-      title: '首页',
+      title: "首页",
       headerShown: false,
       includeBottom: true,
     },
   },
   Login: {
     component:
-      DeviceInfo.getBrand() === 'Allwinner' ? LoginScreen : NewLoginScreen,
+      DeviceInfo.getBrand() === "Allwinner" ? LoginScreen : NewLoginScreen,
     screenOptions: {
-      title: '登录',
+      title: "登录",
       headerShown: false,
     },
   },
   ResePasswordScreen: {
     component: ResePasswordScreen,
     screenOptions: {
-      title: '重置密码',
+      title: "重置密码",
       headerShown: false,
     },
   },
   RegisteCountScreen: {
     component: RegisteCountScreen,
     screenOptions: {
-      title: '注册',
+      title: "注册",
+      headerShown: false,
+    },
+  },
+  HomedLoginScreen: {
+    component: HomedLoginScreen,
+    screenOptions: {
       headerShown: false,
     },
   },
@@ -153,62 +160,62 @@ const CommonScreens = {
   OperatorSelectScreen: {
     component: OperatorSelectScreen,
     screenOptions: {
-      title: '选择运营商',
+      title: "选择运营商",
       headerShown: false,
     },
   },
   InvoiceTitleListScreen: {
     component: InvoiceTitleListScreen,
     screenOptions: {
-      title: '发票抬头',
+      title: "发票抬头",
       headerShown: false,
     },
   },
   EditInvoiceTitleScreen: {
     component: EditInvoiceTitleScreen,
     screenOptions: {
-      title: '编辑发票抬头',
+      title: "编辑发票抬头",
       headerShown: false,
     },
   },
   WebviewScreen: {
     component: WebviewScreen,
     screenOptions: {
-      title: '',
+      title: "",
       headerShown: false,
     },
   },
   TvAlbumScreen: {
     component: TvAlbumScreen,
     screenOptions: {
-      title: '电视相册',
+      title: "电视相册",
     },
   },
   DeviceFeedbackScreen: {
     component: DeviceFeedbackScreen,
     screenOptions: {
-      title: '帮助与反馈',
+      title: "帮助与反馈",
       headerShown: false,
     },
   },
   DeviceAnswerDetailScreen: {
     component: DeviceAnswerDetailScreen,
     screenOptions: {
-      title: '解答',
+      title: "解答",
       headerShown: false,
     },
   },
   SbkScreen: {
     component: SbkScreen,
     screenOptions: {
-      title: '爱家宝',
+      title: "爱家宝",
       headerShown: false,
     },
   },
   BindBossScreen: {
     component: BindBossScreen,
     screenOptions: {
-      title: '绑定boss账号',
+      title: "绑定boss账号",
       headerShown: false,
     },
   },
@@ -216,7 +223,7 @@ const CommonScreens = {
 
 // screen分组
 function StackScreenGroup(screens) {
-  return Object.entries(screens).map(([name, {component, screenOptions}]) => (
+  return Object.entries(screens).map(([name, { component, screenOptions }]) => (
     <Stack.Screen
       name={name}
       component={component}
@@ -229,24 +236,24 @@ function StackScreenGroup(screens) {
 // 兜底的底部导航模块
 const initialNavigationPackages = [
   {
-    bundleName: 'index.ios.bundle',
+    bundleName: "index.ios.bundle",
     isMain: 1,
-    md5: '7284896d821f9e206efc979590561e18',
-    moduleName: 'tvShare',
-    modulePublishDesc: '电视分享ios',
-    upgradeMode: 'force',
-    url: 'https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/tvShare/v1.0.2/20230601120633/ipanel_ios_tvShare_v1.0.2_20230601120633.zip',
-    version: 'v1.0.2',
+    md5: "7284896d821f9e206efc979590561e18",
+    moduleName: "tvShare",
+    modulePublishDesc: "电视分享ios",
+    upgradeMode: "force",
+    url: "https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/tvShare/v1.0.2/20230601120633/ipanel_ios_tvShare_v1.0.2_20230601120633.zip",
+    version: "v1.0.2",
   },
   {
-    bundleName: 'index.ios.bundle',
+    bundleName: "index.ios.bundle",
     isMain: 1,
-    md5: '0fd7a6212a7b70baa54ce2a9cc99698b',
-    moduleName: 'smartHome',
-    modulePublishDesc: '智能家居ios',
-    upgradeMode: 'force',
-    url: 'https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/smartHome/v1.0.2/20230601120752/ipanel_ios_smartHome_v1.0.2_20230601120752.zip',
-    version: 'v1.0.2',
+    md5: "0fd7a6212a7b70baa54ce2a9cc99698b",
+    moduleName: "smartHome",
+    modulePublishDesc: "智能家居ios",
+    upgradeMode: "force",
+    url: "https://dev.ipanelcloud2.ipanel.cn:50443/jshomeapp/appFiles/packFiles/ipanel/ios/smartHome/v1.0.2/20230601120752/ipanel_ios_smartHome_v1.0.2_20230601120752.zip",
+    version: "v1.0.2",
   },
   // {
   //   bundleName: 'index.ios.bundle',
@@ -274,7 +281,7 @@ global.base.initialNavigationPackages = initialNavigationPackages;
 // updateNavigationPackagesFromStorage(1);
 
 const App = () => {
-  const {DynamicStackScreens} = useDynamicPackages();
+  const { DynamicStackScreens } = useDynamicPackages();
   // 当前页面是否需要包括底部安全区
   const [includeBottom, setIncludeBottom] = useState(false);
   const [versionUpdateConfirmVisible, setVersionUpdateConfirmVisible] =
@@ -295,18 +302,18 @@ const App = () => {
 
   // mounted
   useEffect(() => {
-    if (Platform.OS === 'android') {
-      StatusBar.setBackgroundColor('transparent');
+    if (Platform.OS === "android") {
+      StatusBar.setBackgroundColor("transparent");
     }
-    StatusBar.setBarStyle('dark-content');
-    storage.get('accountType').then(res => {
-      global.base.accountType = res || 'ajb';
+    StatusBar.setBarStyle("dark-content");
+    storage.get("accountType").then((res) => {
+      global.base.accountType = res || "ajb";
     });
 
     const rnToNative = NativeModules.RNToNativeEmitter;
     // 应用通知app可正常显示，页面正常运行了，在componentDidMount 中加
     rnToNative?.notifyApplicationReady({
-      moduleName: 'base',
+      moduleName: "base",
     }); // 不用传参数
 
     // 首次进入app登录鉴权
@@ -315,35 +322,35 @@ const App = () => {
     // 获取最新版本并通知原生平台，由平台判断后弹出升级确认提示
     checkBaseVersion();
 
-    AppState.addEventListener('change', async nextAppState => {
-      console.log('nextAppState', nextAppState);
-      if (nextAppState === 'active') {
-        appReport('APP_STARTUP');
+    AppState.addEventListener("change", async (nextAppState) => {
+      console.log("nextAppState", nextAppState);
+      if (nextAppState === "active") {
+        appReport("APP_STARTUP");
       }
     });
 
     const keyboardDidShowListener = Keyboard.addListener(
-      'keyboardDidShow',
+      "keyboardDidShow",
       () => {
         setIsKeyboardVisible(true);
-      },
+      }
     );
 
     const keyboardDidHideListener = Keyboard.addListener(
-      'keyboardDidHide',
+      "keyboardDidHide",
       () => {
         setIsKeyboardVisible(false);
-      },
+      }
     );
 
     const cellularDataStateListener = eventEmitter.addListener(
-      'CellularDataState',
-      data => {
-        console.log(JSON.stringify(data), 'CellularDataState');
+      "CellularDataState",
+      (data) => {
+        console.log(JSON.stringify(data), "CellularDataState");
         if (data?.state && data?.state !== 0) {
           checkBaseVersion();
         }
-      },
+      }
     );
 
     return () => {
@@ -355,23 +362,23 @@ const App = () => {
 
   const checkBaseVersion = async () => {
     // 当前版本
-    const baseVersionInfo = await global.base.getBundleInfo('base');
+    const baseVersionInfo = await global.base.getBundleInfo("base");
     if (!baseVersionInfo) {
       return false;
     }
     try {
       const res = await getModuleVersionInfo({
         platform: Platform.OS,
-        operatorId: 'ipanel',
-        moduleName: 'base',
+        operatorId: "ipanel",
+        moduleName: "base",
       });
       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);
@@ -385,23 +392,23 @@ const App = () => {
   global.base.checkBaseVersion = checkBaseVersion;
 
   // 升级测试
-  const onUpdate = versionInfo => {
+  const onUpdate = (versionInfo) => {
     const rnToNative = NativeModules.RNToNativeEmitter;
     rnToNative?.selectedInfo({
       packages: [versionInfo],
-      operatorId: 'ipanel',
+      operatorId: "ipanel",
     });
   };
 
-  const handleStateChange = ({routes}) => {
+  const handleStateChange = ({ routes }) => {
     const routeName = routes[routes.length - 1].name;
     setIncludeBottom(
-      allStackScreens[routeName]?.screenOptions?.includeBottom || false,
+      allStackScreens[routeName]?.screenOptions?.includeBottom || false
     );
     /* 加载之后每次navigate都鉴权一把登录状态（重置密码不需要检测） */
     if (
-      routeName !== 'ResePasswordScreen' &&
-      routeName !== 'RegisteCountScreen'
+      routeName !== "ResePasswordScreen" &&
+      routeName !== "RegisteCountScreen"
     ) {
       checkLogin();
     }
@@ -417,12 +424,14 @@ const App = () => {
           <SheetProvider>
             <NavigationContainer
               ref={navigationRef}
-              onStateChange={handleStateChange}>
+              onStateChange={handleStateChange}
+            >
               <Stack.Navigator
-                initialRouteName={'Login'}
+                initialRouteName={"Login"}
                 screenOptions={{
                   headerStyle: {},
-                }}>
+                }}
+              >
                 {/* 首页 */}
                 {/*<Stack.Screen*/}
                 {/*  name="Home"*/}
@@ -451,11 +460,11 @@ const App = () => {
             </NavigationContainer>
           </SheetProvider>
 
-          <Loading onRef={ref => (global.loading = ref)} />
-          <Toast onRef={ref => (global.toast = ref)} />
-          <Notify onRef={ref => (global.notify = ref)} />
-          <Dialog onRef={ref => (global.dialog = ref)} />
-          <SheetManage onRef={ref => (global.sheetManager = ref)} />
+          <Loading onRef={(ref) => (global.loading = ref)} />
+          <Toast onRef={(ref) => (global.toast = ref)} />
+          <Notify onRef={(ref) => (global.notify = ref)} />
+          <Dialog onRef={(ref) => (global.dialog = ref)} />
+          <SheetManage onRef={(ref) => (global.sheetManager = ref)} />
           {versionUpdateConfirmVisible && (
             <VersionUpdateConfirm
               onVisibleChange={setVersionUpdateConfirmVisible}
@@ -468,11 +477,12 @@ const App = () => {
     );
   };
 
-  return Platform.OS === 'ios' ? (
+  return Platform.OS === "ios" ? (
     <SafeAreaProvider>
       <SafeAreaView
-        style={{flex: 1}}
-        edges={includeBottom ? ['right', 'left'] : ['right', 'bottom', 'left']}>
+        style={{ flex: 1 }}
+        edges={includeBottom ? ["right", "left"] : ["right", "bottom", "left"]}
+      >
         {renderContent()}
       </SafeAreaView>
     </SafeAreaProvider>

package/app/api/homedApi.js

@@ -1,45 +1,55 @@
-import {homedHttp} from '../utils/http';
-import config from '../utils/config';
+import { homedHttp } from "../utils/http";
+import config from "../utils/config";
 
 export const homedGet = (url, data) => {
   return homedHttp({
     url: url,
-    method: 'GET',
+    method: "GET",
     data,
   });
 };
 
-export const getHomedUserInfo = async data => {
+export const getHomedUserInfo = async (data) => {
   return homedHttp({
     url: `http://access.${await global.base.getHomedDomain()}/account/user/get_info`,
-    method: 'GET',
+    method: "GET",
     data,
   });
 };
 
 // /account/device/get_list
-export const getUserList = async data => {
-  const domain = await global.base.getHomedDomain()
-  const host = domain === 'pyitv.com' ? 12690 : 80
+export const getUserList = async (data) => {
+  const domain = await global.base.getHomedDomain();
+  const host = domain === "pyitv.com" ? 12690 : 80;
   return homedHttp({
     url: `http://access.${domain}:${host}/account/user/get_list`,
-    method: 'GET',
+    method: "GET",
     data,
   });
 };
-export const getRegionList = async data => {
+export const getRegionList = async (data) => {
   return homedHttp({
     url: `http://iusm.${await global.base.getHomedDomain()}/account/get_region_list`,
-    method: 'GET',
+    method: "GET",
     data,
   });
 };
 
 export const getAccessToken = async (data, domain) => {
-  const host = domain === 'pyitv.com' ? 12690 : 80
+  const host = domain === "pyitv.com" ? 12690 : 80;
   return homedHttp({
     url: `http://access.${domain}:${host}/account/get_accesstoken`,
-    method: 'POST',
+    method: "POST",
+    data,
+  });
+};
+
+export const mobileRelationLogin = async (data) => {
+  const domain = await global.base.getHomedDomain();
+  const host = domain === "pyitv.com" ? 12690 : 80;
+  return homedHttp({
+    url: `http://access.${domain}:${host}/account/mobile_relation_login`,
+    method: "GET",
     data,
   });
 };

package/app/api/ipanelCloudApi.js

@@ -13,7 +13,7 @@ export const ACCOUNT_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/account`;
 
 export const ADG_SERVICE = `${config.IPANEL_CLOUD_BASE_ADG_URI}/s/install_ea`;
 
-export const APARTMENT_SERVICE = "http://192.168.101.193:47070/smartapartment";
+export const APARTMENT_SERVICE = "http://192.168.22.194:47070/smartapartment";
 
 // todo 云端获取token服务：https://ai.baidu.com/ai-doc/SPEECH/Mk38lxpgn
 export const baiduAsr = (cuid, len, speechBase64) => {
@@ -154,6 +154,17 @@ export const accountRegiste = (data, type) => {
   });
 };
 
+export const deviceReportThird = (data) => {
+  return request({
+    url: ACCOUNT_SERVICE,
+    method: "POST",
+    data: {
+      action: "device_report_third",
+      ...data,
+    },
+  });
+};
+
 export const obtainThirdToken = (data) => {
   return request({
     url: ACCOUNT_SERVICE,
@@ -831,3 +842,23 @@ export const queryCountByName = (data) => {
     },
   });
 };
+
+// 获取图形验证码
+export const getCaptcha = (data) => {
+  return request({
+    url: "https://code.ipanel.cn/captcha/get",
+    method: "GET",
+    data,
+  });
+};
+
+// 校验图形验证码
+export const checkCaptcha = (data) => {
+  return fetch("https://code.ipanel.cn/captcha/check", {
+    method: "POST",
+    body: data,
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+    },
+  }).then((res) => res.json());
+};