ipanel-rnapp-ajb-base 1.0.33 → 1.0.36

package/app/.local_dev/env.js

@@ -1,2 +1,2 @@
-export default 'production';
-// export default '__BASE_SINGLETON_MODE__'; // 单业务包开发模式时，启用该注释，注意，提交时不要提交该改动！！！
+export default "production";
+// export default "__BASE_SINGLETON_MODE__"; // 单业务包开发模式时，启用该注释，注意，提交时不要提交该改动！！！

package/app/.local_dev/polyfill.js

@@ -28,6 +28,8 @@ async function getRemoteComponentByName(componentName) {
           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;
         // __BASE_SINGLETON_MODE_APP__
         default:
           return () => {

package/app/App.js

@@ -45,8 +45,10 @@ import { appReport } from "./utils/common";
 
 // 基础导航页、登录页
 import BaseScreen from "./screens/BaseScreen";
+import SimpleBaseScreen from "./screens/SimpleBaseScreen.js";//简单导航：非爱家宝
 import LoginScreen from "./screens/LoginScreen";
 import NewLoginScreen from "./screens/LoginScreen/indexNew";
+import LoginEduScreen from "./screens/LoginScreen/indexEdu";//教鞭登录页
 import ResePasswordScreen from "./screens/ResePassword";
 import SbkScreen from "./screens/SbkScreen";
 
@@ -106,17 +108,20 @@ const Stack = createStackNavigator();
 const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || "alpha";
 // const envVersion = 'release';
 
+const appName = NativeModules?.RNToNativeEmitter?.appName;
+
 let eventEmitter;
 if (Platform.OS === "android") {
   // ----yusm：安卓使用DeviceEventEmitter
   eventEmitter = DeviceEventEmitter;
 } else {
+  // 走这个的话需要IOS对事件进行枚举定义
   eventEmitter = new NativeEventEmitter(NativeModules.NativeToRNEmitter);
 }
 // 公共 栈路由页面
 const CommonScreens = {
   Home: {
-    component: BaseScreen,
+    component: appName==='教鞭'?SimpleBaseScreen:BaseScreen,
     screenOptions: {
       title: "首页",
       headerShown: false,
@@ -124,11 +129,11 @@ const CommonScreens = {
     },
   },
   Login: {
-    component:
-      DeviceInfo.getBrand() === "Allwinner" ? LoginScreen : NewLoginScreen,
+    component: appName==='教鞭'?LoginEduScreen:(DeviceInfo.getBrand() === "Allwinner" ? LoginScreen : NewLoginScreen),
     screenOptions: {
       title: "登录",
       headerShown: false,
+      includeBottom: true,
     },
   },
   ResePasswordScreen: {
@@ -283,7 +288,7 @@ global.base.initialNavigationPackages = initialNavigationPackages;
 const App = () => {
   const { DynamicStackScreens } = useDynamicPackages();
   // 当前页面是否需要包括底部安全区
-  const [includeBottom, setIncludeBottom] = useState(false);
+  const [includeBottom, setIncludeBottom] = useState(true);
   const [versionUpdateConfirmVisible, setVersionUpdateConfirmVisible] =
     useState(false);
   const [latestBaseVersion, setLatestBaseVersion] = useState(null);
@@ -316,8 +321,10 @@ const App = () => {
       moduleName: "base",
     }); // 不用传参数
 
-    // 首次进入app登录鉴权
-    checkLogin();
+    if (appName !== "遥控键码库") {
+      // 首次进入app登录鉴权
+      checkLogin();
+    }
 
     // 获取最新版本并通知原生平台，由平台判断后弹出升级确认提示
     checkBaseVersion();
@@ -353,7 +360,7 @@ const App = () => {
       }
     );
 
-    const homedLogOutListener = eventEmitter.addListener(
+    const homedLogOutListener = DeviceEventEmitter.addListener(
       "HomedLogout",
       async (data) => {
         console.log("HomedLogout", data);
@@ -453,7 +460,8 @@ const App = () => {
     /* 加载之后每次navigate都鉴权一把登录状态（重置密码不需要检测） */
     if (
       routeName !== "ResePasswordScreen" &&
-      routeName !== "RegisteCountScreen"
+      routeName !== "RegisteCountScreen" &&
+      appName !== "遥控键码库"
     ) {
       checkLogin();
     }
@@ -465,81 +473,83 @@ const App = () => {
   const renderContent = () => {
     return (
       <>
-        <Provider>
-          <SheetProvider>
-            <NavigationContainer
-              ref={navigationRef}
-              onStateChange={handleStateChange}
+        <SheetProvider>
+          <NavigationContainer
+            ref={navigationRef}
+            onStateChange={handleStateChange}
+          >
+            <Stack.Navigator
+              initialRouteName={"Login"}
+              screenOptions={{
+                headerStyle: {},
+              }}
             >
-              <Stack.Navigator
-                initialRouteName={"Login"}
-                screenOptions={{
-                  headerStyle: {},
-                }}
-              >
-                {/* 首页 */}
-                {/*<Stack.Screen*/}
-                {/*  name="Home"*/}
-                {/*  component={BaseScreen}*/}
-                {/*  options={{*/}
-                {/*    title: '首页',*/}
-                {/*    headerShown: false,*/}
-                {/*  }}*/}
-                {/*/>*/}
-                {/* 登录页 */}
-                {/*<Stack.Screen*/}
-                {/*  name="Login"*/}
-                {/*  component={LoginScreen}*/}
-                {/*  options={{*/}
-                {/*    title: '登录',*/}
-                {/*    headerShown: false,*/}
-                {/*  }}*/}
-                {/*/>*/}
-
-                {/* 公共页面 */}
-                {StackScreenGroup(CommonScreens)}
-
-                {/* 动态注册的页面 */}
-                {StackScreenGroup(DynamicStackScreens)}
-              </Stack.Navigator>
-            </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)} />
-          {versionUpdateConfirmVisible && (
-            <VersionUpdateConfirm
-              onVisibleChange={setVersionUpdateConfirmVisible}
-              latestVersion={latestBaseVersion}
-              onUpdate={onUpdate}
-            />
-          )}
-        </Provider>
+              {/* 首页 */}
+              {/*<Stack.Screen*/}
+              {/*  name="Home"*/}
+              {/*  component={BaseScreen}*/}
+              {/*  options={{*/}
+              {/*    title: '首页',*/}
+              {/*    headerShown: false,*/}
+              {/*  }}*/}
+              {/*/>*/}
+              {/* 登录页 */}
+              {/*<Stack.Screen*/}
+              {/*  name="Login"*/}
+              {/*  component={LoginScreen}*/}
+              {/*  options={{*/}
+              {/*    title: '登录',*/}
+              {/*    headerShown: false,*/}
+              {/*  }}*/}
+              {/*/>*/}
+
+              {/* 公共页面 */}
+              {StackScreenGroup(CommonScreens)}
+
+              {/* 动态注册的页面 */}
+              {StackScreenGroup(DynamicStackScreens)}
+            </Stack.Navigator>
+          </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)} />
+        {versionUpdateConfirmVisible && (
+          <VersionUpdateConfirm
+            onVisibleChange={setVersionUpdateConfirmVisible}
+            latestVersion={latestBaseVersion}
+            onUpdate={onUpdate}
+          />
+        )}
       </>
     );
   };
 
   return Platform.OS === "ios" ? (
-    <SafeAreaProvider>
-      <SafeAreaView
-        style={{ flex: 1 }}
-        edges={includeBottom ? ["right", "left"] : ["right", "bottom", "left"]}
-      >
-        {renderContent()}
-      </SafeAreaView>
-    </SafeAreaProvider>
+    <Provider>
+      <SafeAreaProvider>
+        <SafeAreaView
+          style={{ flex: 1 }}
+          edges={
+            includeBottom ? ["right", "left"] : ["right", "bottom", "left"]
+          }
+        >
+          {renderContent()}
+        </SafeAreaView>
+      </SafeAreaProvider>
+    </Provider>
   ) : (
-    <>
+    <Provider>
       <StatusBar
         backgroundColor="transparent"
         translucent
         barStyle="dark-content"
       />
       <SafeAreaProvider>{renderContent()}</SafeAreaProvider>
-    </>
+    </Provider>
   );
 };
 

package/app/api/homedApi.js

@@ -20,7 +20,8 @@ export const getHomedUserInfo = async (data) => {
 // /account/device/get_list
 export const getUserList = async (data) => {
   const domain = await global.base.getHomedDomain();
-  const host = domain === "pyitv.com" ? 12690 : 80;
+  const host =
+    domain === "pyitv.com" ? 12690 : domain === "homed.hnzhzy.com" ? 30180 : 80;
   return homedHttp({
     url: `http://access.${domain}:${host}/account/user/get_list`,
     method: "GET",
@@ -36,20 +37,46 @@ export const getRegionList = async (data) => {
 };
 
 export const getAccessToken = async (data, domain) => {
-  const host = domain === "pyitv.com" ? 12690 : 80;
+  const host =
+    domain === "pyitv.com" ? 12690 : domain === "homed.hnzhzy.com" ? 30180 : 80;
   return homedHttp({
     url: `http://access.${domain}:${host}/account/get_accesstoken`,
     method: "POST",
     data,
+    timeout: 3000,
   });
 };
 
 export const mobileRelationLogin = async (data, domain) => {
   domain = domain || (await global.base.getHomedDomain());
-  const host = domain === "pyitv.com" ? 12690 : 80;
+  const host =
+    domain === "pyitv.com" ? 12690 : domain === "homed.hnzhzy.com" ? 30180 : 80;
   return homedHttp({
     url: `http://access.${domain}:${host}/account/mobile_relation_login`,
     method: "GET",
     data,
+    timeout: 3000,
+  });
+};
+
+/* �̱�APP idocshare �ĵ�����ƽ̨*/
+// ��ȡ������֤��
+export const getIdocSmscode = async (data, domain) => {
+  domain = domain || (await global.base.getHomedDomain());
+  const host = domain === "pyitv.com" ? 12690 : 80;
+  return homedHttp({
+    url: `http://idocshare.${domain}:${host}/wx/get_smscode`,
+    method: "GET",
+    data,
+  });
+};
+// �û���¼
+export const idocLogin = async (data, domain) => {
+  domain = domain || (await global.base.getHomedDomain());
+  const host = domain === "pyitv.com" ? 12690 : 80;
+  return homedHttp({
+    url: `http://idocshare.${domain}:${host}/member/login`,
+    method: "POST",
+    data,
   });
 };

package/app/api/ipanelCloudApi.js

@@ -5,15 +5,19 @@ import { homedHttp } from "../utils/http";
 
 const appName = NativeModules?.RNToNativeEmitter?.appName;
 
-const INVOICE_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/invoice`;
+
+const INVOICE_SERVICE = ["吉柿果"].includes(appName)?'https://icloud.homed.jishimedia.com:50443/s/invoice':
+`${config.IPANEL_CLOUD_BASE_URI}/s/invoice`;
 const IOT_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/iot`;
 const IR_433_DISCOVER_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/ir433discover`;
+const JINPENG_URL = `${config.IPANEL_CLOUD_BASE_URI}/s/smart_home/jinpeng`;
 
 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.22.194:47070/smartapartment";
+export const APARTMENT_SERVICE = `${config.IPANEL_CLOUD_BASE_URI}/s/smart_home_manage/admin-api`;
+
 
 // todo 云端获取token服务：https://ai.baidu.com/ai-doc/SPEECH/Mk38lxpgn
 export const baiduAsr = (cuid, len, speechBase64) => {
@@ -35,11 +39,14 @@ export const baiduAsr = (cuid, len, speechBase64) => {
 };
 
 export const getAreaOperatorModules = async (params) => {
-  let url = `${
-    ["禺乐慧家", "悦慧家", "吉柿果"].includes(appName)
-      ? config.PANYU_MODULE_VERSION_URI
-      : config.IPANEL_CLOUD_BASE_URI
-  }/jshomeapp/api/getAreaOperatorModules`;
+  let url;
+  if (["禺乐慧家", "悦慧家"].includes(appName)) {
+    url = `${config.PANYU_MODULE_VERSION_URI}/jshomeapp/api/getAreaOperatorModules`
+  } else if ('吉柿果' === appName) {
+    url = `${config.JILIN_MODULE_VERSION_URI}/jshomeapp/api/getAreaOperatorModules`
+  } else {
+    url = `${config.IPANEL_CLOUD_BASE_URI}/jshomeapp/api/getAreaOperatorModules`
+  }
 
   // todo 本地调试测试临时处理，本地调试时模块列表暂时对接的是dev集群
   if (!NativeModules?.RNToNativeEmitter?.serverCluster) {
@@ -62,15 +69,19 @@ export const getAreaOperatorModules = async (params) => {
         : "",
       ...params,
     },
+    timeout: 10 * 1000
   });
 };
 
 export const getModuleVersionInfo = async (params) => {
-  let url = `${
-    ["禺乐慧家", "悦慧家", "吉柿果"].includes(appName)
-      ? config.PANYU_MODULE_VERSION_URI
-      : config.IPANEL_CLOUD_BASE_URI
-  }/jshomeapp/api/moduleVersionInfo`;
+  let url;
+  if (["禺乐慧家", "悦慧家"].includes(appName)) {
+    url = `${config.PANYU_MODULE_VERSION_URI}/jshomeapp/api/moduleVersionInfo`
+  } else if ('吉柿果' === appName) {
+    url = `${config.JILIN_MODULE_VERSION_URI}/jshomeapp/api/moduleVersionInfo`
+  } else {
+    url = `${config.IPANEL_CLOUD_BASE_URI}/jshomeapp/api/moduleVersionInfo`
+  }
 
   // todo 本地调试测试临时处理，本地调试时模块列表暂时对接的是dev集群
   if (!NativeModules?.RNToNativeEmitter?.serverCluster) {
@@ -108,37 +119,49 @@ export const getUserInfo = (data) => {
 };
 
 export const obtainSmscode = (data, type) => {
+  const params = {
+    action: "obtain_smscode",
+    ...data,
+  };
+  if (["吉柿果"].includes(appName)) {
+    params.operator_id = "061aa081306a455da811639160763190";
+  }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
     method: "POST",
-    data: {
-      action: "obtain_smscode",
-      ...data,
-    },
+    data: params,
   });
 };
 
 export const smscodeLogin = (data, type) => {
+  const params = {
+    action: "smscode_regist", // 未注册的手机号会注册并登录，已注册的则直接登录
+    // action: 'smscode_login',
+    ...data,
+  };
+  if (["吉柿果"].includes(appName)) {
+    params.operator_id = "061aa081306a455da811639160763190";
+  }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
     method: "POST",
-    data: {
-      action: "smscode_regist", // 未注册的手机号会注册并登录，已注册的则直接登录
-      // action: 'smscode_login',
-      ...data,
-    },
+    data: params,
   });
 };
 
 // 账号密码登录的方式
 export const accountLogin = (data, type) => {
+  const params = {
+    action: "account_login",
+    ...data,
+  };
+  if (["吉柿果"].includes(appName)) {
+    params.operator_id = "061aa081306a455da811639160763190";
+  }
   return request({
     url: type === "adg" ? ADG_SERVICE : ACCOUNT_SERVICE,
     method: "POST",
-    data: {
-      action: "account_login",
-      ...data,
-    },
+    data: params,
   });
 };
 
@@ -243,9 +266,13 @@ export const delAddress = (data) => {
   });
 };
 
-export const addRoom = (data) => {
+export const addRoom = async (data) => {
+  const apartmentData = await storage.get('apartmentData');
   return request({
-    url: IOT_SERVICE,
+    url:
+      apartmentData && apartmentData?.userType
+        ? `${APARTMENT_SERVICE}/houseRoom/add`
+        : IOT_SERVICE,
     method: "POST",
     data: {
       action: "add_room",
@@ -288,10 +315,13 @@ export const getAddressRooms = (data) => {
   });
 };
 
-export const adjustRoom = (data) => {
+export const adjustRoom = async (data) => {
+  const apartmentData = await storage.get('apartmentData');
   return request({
-    url: IOT_SERVICE,
-    method: "POST",
+    url: apartmentData && apartmentData?.userType
+          ? `${APARTMENT_SERVICE}/houseRoom/edit`
+          : IOT_SERVICE,
+    method: apartmentData && apartmentData?.userType ? 'PUT' : 'POST',
     data: {
       action: "adjust_room",
       ...data,
@@ -299,9 +329,12 @@ export const adjustRoom = (data) => {
   });
 };
 
-export const delRoom = (data) => {
+export const delRoom = async (data) => {
+  const apartmentData = await storage.get('apartmentData');
   return request({
-    url: IOT_SERVICE,
+    url: apartmentData && apartmentData?.userType
+          ? `${APARTMENT_SERVICE}/houseRoom/del`
+          : IOT_SERVICE,
     method: "POST",
     data: {
       action: "del_room",
@@ -384,38 +417,79 @@ export const getDeviceList = async (data) => {
 };
 
 export const adjustDevice = async (data) => {
-  const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  // const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  // return request({
+  //   url: ROOMKEEPER_SERVICE,
+  //   method: "POST",
+  //   data: {
+  //     path: "device/adjust_device",
+  //     ...data,
+  //   },
+  // });
+  const apartmentData = await storage.get('apartmentData');
+  let url = '';
+  let params = {
+    path: 'device/adjust_device',
+    ...data,
+  };
+  let method = 'POST';
+  // 公寓的设备
+  if (apartmentData && apartmentData?.userType) {
+    url = `${APARTMENT_SERVICE}/houseFamilyDevice/edit`;
+    params.instanceName = await global.base.getHomeCloudServiceInstanceName();
+    method = 'PUT';
+  } else {
+    url = await getCurrentAddrRoomkeeperServiceBaseUri();
+  }
   return request({
-    url: ROOMKEEPER_SERVICE,
-    method: "POST",
-    data: {
-      path: "device/adjust_device",
-      ...data,
-    },
+    url: url,
+    method,
+    data: params,
   });
 };
 
 export const addDevice = async (data) => {
-  const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  const apartmentData = await storage.get('apartmentData');
+  let url = '';
+  let params = {
+    path: 'device/add_device',
+    ...data,
+  };
+  // 公寓的设备添加调志豪的接口
+  if (apartmentData && apartmentData?.userType) {
+    url = `${APARTMENT_SERVICE}/houseFamilyDevice/added`;
+    params.instanceName = await global.base.getHomeCloudServiceInstanceName();
+  } else {
+    url = await getCurrentAddrRoomkeeperServiceBaseUri();
+  }
   return request({
-    url: ROOMKEEPER_SERVICE,
-    method: "POST",
-    data: {
-      path: "device/add_device",
-      ...data,
-    },
+    url: url,
+    method: 'POST',
+    data: params,
   });
 };
 
 export const moveDevice = async (data) => {
-  const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  const apartmentData = await storage.get('apartmentData');
+  let url = '';
+  let params = {
+    path: 'device/move_device',
+    ...data,
+  };
+  let method = 'POST';
+  // const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  // 公寓的设备添加调志豪的接口
+  if (apartmentData && apartmentData?.userType) {
+    url = `${APARTMENT_SERVICE}/houseFamilyDevice/move`;
+    params.instanceName = await global.base.getHomeCloudServiceInstanceName();
+    method = 'PUT';
+  } else {
+    url = await getCurrentAddrRoomkeeperServiceBaseUri();
+  }
   return request({
-    url: ROOMKEEPER_SERVICE,
-    method: "POST",
-    data: {
-      path: "device/move_device",
-      ...data,
-    },
+    url: url,
+    method,
+    data: params,
   });
 };
 
@@ -428,14 +502,26 @@ export const getsn = (data) => {
 };
 
 export const delDevice = async (data) => {
-  const ROOMKEEPER_SERVICE = await getCurrentAddrRoomkeeperServiceBaseUri();
+  const apartmentData = await storage.get('apartmentData');
+  let url = '';
+  let params = {};
+  // 公寓的设备添加调志豪的接口
+  if (apartmentData && apartmentData?.userType) {
+    url = `${APARTMENT_SERVICE}/houseFamilyDevice/adel`;
+    params.homedRoomId = data.room_id;
+    params.homedDeviceId = data.device_id;
+    params.instanceName = await global.base.getHomeCloudServiceInstanceName();
+  } else {
+    url = await getCurrentAddrRoomkeeperServiceBaseUri();
+    params = {
+      path: 'device/delete_device',
+      ...data,
+    };
+  }
   return request({
-    url: ROOMKEEPER_SERVICE,
-    method: "POST",
-    data: {
-      path: "device/delete_device",
-      ...data,
-    },
+    url: url,
+    method: 'POST',
+    data: params,
   });
 };
 
@@ -790,8 +876,23 @@ export const getDeviceStatusReportHistory = async (data) => {
 // 获取公寓token
 export const switchToken = async (params) => {
   return request({
-    url: `${APARTMENT_SERVICE}/switch_token`,
-    method: "GET",
+    url: `${APARTMENT_SERVICE}/house/account/login`,
+    method: "POST",
+    data: params,
+  });
+};
+// 获取用户类型-用于切换角色
+export const getHouseType = async () => {
+  return request({
+    url: `${APARTMENT_SERVICE}/house/account/getType`,
+    method: 'GET',
+  });
+};
+// 通过用户类型登录
+export const loginByType = async (id, params) => {
+  return request({
+    url: `${APARTMENT_SERVICE}/house/account/loginByType?userType=${id}`,
+    method: 'POST',
     data: params,
   });
 };
@@ -873,3 +974,16 @@ export const checkCaptcha = (data) => {
     },
   }).then((res) => res.json());
 };
+
+//查询绑定情况
+export const getJinpengBindList = async (params)=>{
+  return request({
+      url: `${JINPENG_URL}/get_bind_list`,
+      method: 'POST',
+      data: {
+        page:1,
+        page_size:100,
+        ...params
+      },
+    });
+}