ipanel-rnapp-ajb-base 1.0.30 → 1.0.32

package/app/App.js

@@ -40,7 +40,7 @@ import storage from "./storage";
 
 import { navigationRef } from "./utils/RootNavigation";
 import checkLogin from "./hooks/checkLogin";
-import { getModuleVersionInfo } from "./api/";
+import { getModuleVersionInfo, getUserInfo, delThirdId } from "./api/";
 import { appReport } from "./utils/common";
 
 // 基础导航页、登录页
@@ -353,10 +353,55 @@ const App = () => {
       }
     );
 
+    const homedLogOutListener = eventEmitter.addListener(
+      "HomedLogout",
+      async (data) => {
+        console.log("HomedLogout", data);
+
+        const accountData = await storage.get("accountData");
+        // const activeAddr = await storage.get('activeAddr');
+        const res = await getUserInfo();
+        console.log(res, "HomedLogout getUserInfo");
+        const userList = res.result?.user_list || [];
+        const currentUser = userList.find(
+          (item) => item.user_id === accountData?.user.user_id
+        );
+        const bindList = currentUser?.bind_list || [];
+        console.log(bindList, "HomedLogout bindList");
+        const homedConfig = bindList.find(
+          (item) => item.third_type === "homed"
+        );
+        console.log("homedConfig", homedConfig);
+
+        if (homedConfig) {
+          // 解绑当前cloud用户对应的homed用户
+          const result = await delThirdId({
+            third_type: "homed",
+            third_id: homedConfig.third_id,
+            user_id: homedConfig.user_id,
+          }).catch((err) => {
+            console.error(err);
+          });
+          if (!result || result.code !== 0) {
+            console.error("解绑homed用户失败：", result);
+            global.toast.showToast("解绑电视用户失败");
+            return;
+          }
+          global.toast.showToast("已解绑电视用户");
+          await storage.remove("homedAccessToken");
+          await storage.remove("HomedLoginResult");
+        } else {
+          console.log("当前未绑定homed用户");
+          global.toast.showToast("当前没有绑定电视用户，无法解绑");
+        }
+      }
+    );
+
     return () => {
       keyboardDidShowListener.remove();
       keyboardDidHideListener.remove();
       cellularDataStateListener.remove();
+      homedLogOutListener.remove();
     };
   }, []);
 

package/app/api/homedApi.js

@@ -44,8 +44,8 @@ export const getAccessToken = async (data, domain) => {
   });
 };
 
-export const mobileRelationLogin = async (data) => {
-  const domain = await global.base.getHomedDomain();
+export const mobileRelationLogin = async (data, domain) => {
+  domain = domain || (await global.base.getHomedDomain());
   const host = domain === "pyitv.com" ? 12690 : 80;
   return homedHttp({
     url: `http://access.${domain}:${host}/account/mobile_relation_login`,

package/app/api/ipanelCloudApi.js

@@ -36,7 +36,7 @@ export const baiduAsr = (cuid, len, speechBase64) => {
 
 export const getAreaOperatorModules = async (params) => {
   let url = `${
-    ["禺乐慧家", "悦慧家"].includes(appName)
+    ["禺乐慧家", "悦慧家", "吉柿果"].includes(appName)
       ? config.PANYU_MODULE_VERSION_URI
       : config.IPANEL_CLOUD_BASE_URI
   }/jshomeapp/api/getAreaOperatorModules`;
@@ -67,7 +67,7 @@ export const getAreaOperatorModules = async (params) => {
 
 export const getModuleVersionInfo = async (params) => {
   let url = `${
-    ["禺乐慧家", "悦慧家"].includes(appName)
+    ["禺乐慧家", "悦慧家", "吉柿果"].includes(appName)
       ? config.PANYU_MODULE_VERSION_URI
       : config.IPANEL_CLOUD_BASE_URI
   }/jshomeapp/api/moduleVersionInfo`;
@@ -165,6 +165,17 @@ export const deviceReportThird = (data) => {
   });
 };
 
+export const delThirdId = (data) => {
+  return request({
+    url: ACCOUNT_SERVICE,
+    method: "POST",
+    data: {
+      action: "del_third_id",
+      ...data,
+    },
+  });
+};
+
 export const obtainThirdToken = (data) => {
   return request({
     url: ACCOUNT_SERVICE,
@@ -846,7 +857,7 @@ export const queryCountByName = (data) => {
 // 获取图形验证码
 export const getCaptcha = (data) => {
   return request({
-    url: "https://code.ipanel.cn/captcha/get",
+    url: `${config.IPANEL_CLOUD_BASE_URI}/captcha/get`,
     method: "GET",
     data,
   });
@@ -854,7 +865,7 @@ export const getCaptcha = (data) => {
 
 // 校验图形验证码
 export const checkCaptcha = (data) => {
-  return fetch("https://code.ipanel.cn/captcha/check", {
+  return fetch(`${config.IPANEL_CLOUD_BASE_URI}/captcha/check`, {
     method: "POST",
     body: data,
     headers: {

package/app/screens/BaseScreen.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useMemo } from "react";
 import {
   Alert,
   View,
@@ -154,6 +154,7 @@ function HomeTabScreen({ navigation, route }) {
         return {
           name: pack.moduleName,
           component: components[index],
+          meta: pack.meta || {},
           options: {
             title: pack.moduleChineseName,
             headerShown: false,
@@ -243,8 +244,10 @@ function HomeTabScreen({ navigation, route }) {
   // 刷新token
   const checkToken = async () => {
     const accountType = await storage.get("accountType");
-    const accessTokenKey = accountType === 'adg' ? 'adgAccessToken' : 'accessToken';
-    const refreshTokenKey = accountType === 'adg' ? 'adgRefreshToken' : 'refreshToken';
+    const accessTokenKey =
+      accountType === "adg" ? "adgAccessToken" : "accessToken";
+    const refreshTokenKey =
+      accountType === "adg" ? "adgRefreshToken" : "refreshToken";
     const access_token = await storage.get(accessTokenKey);
     const refresh_token = await storage.get(refreshTokenKey);
     const logout = () => {
@@ -283,6 +286,90 @@ function HomeTabScreen({ navigation, route }) {
     }
   };
 
+  const logoSource = useMemo(() => {
+    if (["禺乐慧家", "悦慧家"].includes(appName)) {
+      return require("../assets/img/launch_logo_panyu.png");
+    } else if (appName === "吉柿果") {
+      return require("../assets/img/launch_logo_jilin.png");
+    } else {
+      return require("../assets/img/launch_logo.png");
+    }
+  }, []);
+
+  // 启动页
+  const renderLaunch = () => {
+    if (appName === "吉柿果") {
+      return (
+        <View style={styles.loadingView}>
+          <Image
+            source={logoSource}
+            style={{
+              width: px(241 * 1.5),
+              height: px(310 * 1.5),
+              marginBottom: px(80),
+            }}
+            resizeMode="contain"
+          />
+          <ActivityIndicator size="large" />
+          <View style={styles.bottomLaunch}>
+            <Image
+              source={require("../assets/img/launch_logo_jilin_bottom1.png")}
+              style={{
+                width: px(600),
+                height: px(100),
+                marginBottom: px(30),
+              }}
+              resizeMode="contain"
+            />
+            <Image
+              source={require("../assets/img/launch_logo_jilin_bottom2.png")}
+              style={{
+                width: px(750),
+                height: px(100),
+              }}
+              resizeMode="contain"
+            />
+          </View>
+        </View>
+      );
+    } else {
+      return (
+        <ImageBackground
+          style={styles.loadingView}
+          source={
+            ["禺乐慧家", "悦慧家"].includes(appName)
+              ? require("../assets/img/launch_bg_panyu.png")
+              : require("../assets/img/launch_bg.png")
+          }
+        >
+          <Image
+            source={logoSource}
+            style={{
+              width: px(231),
+              height: px(231),
+              marginBottom: px(80),
+            }}
+            resizeMode="contain"
+          />
+          <Image
+            source={
+              ["禺乐慧家", "悦慧家"].includes(appName)
+                ? require("../assets/img/launch_text_panyu.png")
+                : require("../assets/img/launch_text.png")
+            }
+            style={{
+              width: px(687),
+              height: px(60),
+              marginBottom: px(80),
+            }}
+            resizeMode="contain"
+          />
+          <ActivityIndicator size="large" />
+        </ImageBackground>
+      );
+    }
+  };
+
   // smartHome专用
   const {
     handleTextSubmit,
@@ -335,56 +422,19 @@ function HomeTabScreen({ navigation, route }) {
             }}
           >
             {tabScreens.map((item, index) => (
-              <Tab.Screen
-                name={item.name}
-                component={item.component}
-                key={index}
-                options={item.options}
-              />
+              <Tab.Screen name={item.name} key={index} options={item.options}>
+                {(props) => {
+                  props.route.params = props.route.params || {};
+                  // 传递后台配置的模块业务元数据meta
+                  props.route.params.meta = item.meta || {};
+                  return <item.component {...props} />;
+                }}
+              </Tab.Screen>
             ))}
           </Tab.Navigator>
         </View>
       ) : (
-        <ImageBackground
-          style={styles.loadingView}
-          source={
-            ["禺乐慧家", "悦慧家"].includes(appName)
-              ? require("../assets/img/launch_bg_panyu.png")
-              : require("../assets/img/launch_bg.png")
-          }
-        >
-          {/*<Text style={styles.loadingText}>*/}
-          {/*  欢迎使用{appName.includes('安电工') ? '安电工' : '爱家宝'}*/}
-          {/*</Text>*/}
-          {/*<ActivityIndicator size="large" />*/}
-          <Image
-            source={
-              ["禺乐慧家", "悦慧家"].includes(appName)
-                ? require("../assets/img/launch_logo_panyu.png")
-                : require("../assets/img/launch_logo.png")
-            }
-            style={{
-              width: px(231),
-              height: px(231),
-              marginBottom: px(80),
-            }}
-            resizeMode="contain"
-          />
-          <Image
-            source={
-              ["禺乐慧家", "悦慧家"].includes(appName)
-                ? require("../assets/img/launch_text_panyu.png")
-                : require("../assets/img/launch_text.png")
-            }
-            style={{
-              width: px(687),
-              height: px(60),
-              marginBottom: px(80),
-            }}
-            resizeMode="contain"
-          />
-          <ActivityIndicator size="large" />
-        </ImageBackground>
+        renderLaunch()
       )}
     </View>
   );
@@ -395,12 +445,21 @@ const styles = StyleSheet.create({
     flex: 1,
     alignItems: "center",
     justifyContent: "center",
-    // backgroundColor: '#fff',
+    position: "relative",
+    backgroundColor: "#fff",
   },
   loadingText: {
     fontSize: 20,
     marginBottom: 10,
   },
+
+  bottomLaunch: {
+    position: "absolute",
+    bottom: px(100),
+    left: 0,
+    right: 0,
+    alignItems: "center",
+  },
 });
 
 export default HomeTabScreen;

package/app/screens/CommonScreens/HomedLoginScreen/index.js

@@ -30,6 +30,9 @@ function HomedLoginIndex(props) {
       const homedAccessToken = await storage.get("homedAccessToken");
       const homedLoginResult = await storage.get("homedLoginResult");
 
+      console.log("homedAccessToken", homedAccessToken);
+      console.log("homedLoginResult", homedLoginResult);
+
       if (homedAccessToken && homedLoginResult) {
         // 已登录，自动跳转回去
         const backParams = {
@@ -41,6 +44,7 @@ function HomedLoginIndex(props) {
           navigation.goBack(backParams);
         }
       } else {
+        onScanBtnPress();
         setIsCheckingLogin(false);
       }
       // // 临时测试时放开，不要让页面跳回去
@@ -59,6 +63,8 @@ function HomedLoginIndex(props) {
       });
       console.log("qrdata", qrdata);
 
+      global.loading.showLoading("正在登录...");
+
       // 绑定 & 登录
       const accountData = await storage.get("accountData");
       const activeAddr = await storage.get("activeAddr");
@@ -75,37 +81,57 @@ function HomedLoginIndex(props) {
           user_id: accountData?.user.user_id,
         };
 
-        // 绑定
+        // 扫码绑定
         const result = await deviceReportThird(params);
         if (result && result.code === 0) {
           global.toast.showToast("绑定成功");
           await updateAddrFromNetwork();
           await updateHomedToken();
 
-          // 登录
-          const homedLoginResult = await mobileRelationLogin({
-            deviceno: qrdata.deviceno,
-            deviceid: qrdata.deviceid,
-            userid: qrdata.userid,
-            devicetype: "3",
-            isforce: "1",
-            businessplatform: Platform.OS === "ios" ? 1 : 0,
-          });
-          if (homedLoginResult.ret === 0) {
-            console.log("homedLoginResult", homedLoginResult);
-            await storage.set("homedLoginResult", homedLoginResult);
-            global.toast.showToast("登录成功");
-            // 登录成功后跳转回目标页面
-            const backParams = {
-              loginResult: "success",
+          // 扫码登录
+          try {
+            const mobileRelationLoginParams = {
+              deviceno: qrdata.deviceno,
+              deviceid: "2" + qrdata.deviceid, // 给个假id，手机端走后门，免确认直接登录
+              userid: qrdata.userid,
+              devicetype: "3",
+              isforce: "1",
+              businessplatform: Platform.OS === "ios" ? 1 : 0,
             };
-            if (route.params?.redirectScreenName) {
-              navigation.navigate(route.params.redirectScreenName, backParams);
+            const homedLoginResult = await mobileRelationLogin(
+              mobileRelationLoginParams
+            ).catch((err) => {
+              console.log("mobileRelationLogin Err:", err);
+            });
+            if (homedLoginResult && homedLoginResult.ret === 0) {
+              console.log("homedLoginResult", homedLoginResult);
+              await storage.set("homedLoginResult", homedLoginResult);
+              // 保存登录参数，以便后续自动登录，自动登录前要先判断当前cloud用户是否已经绑定homed用户（即开通homed业务）
+              await storage.set(
+                "mobileRelationLoginParams",
+                mobileRelationLoginParams
+              );
+              global.toast.showToast("登录成功");
+              // 登录成功后跳转回目标页面
+              const backParams = {
+                loginResult: "success",
+              };
+              if (route.params?.redirectScreenName) {
+                navigation.navigate(
+                  route.params.redirectScreenName,
+                  backParams
+                );
+              } else {
+                navigation.goBack(backParams);
+              }
             } else {
-              navigation.goBack(backParams);
+              global.toast.showToast(
+                "登录失败：" +
+                  (homedLoginResult ? homedLoginResult.message : "接口异常")
+              );
             }
-          } else {
-            global.toast.showToast("登录失败：" + homedLoginResult.message);
+          } catch (e) {
+            global.toast.showToast("登录异常");
           }
         } else {
           console.error("绑定用户失败", result);
@@ -114,6 +140,7 @@ function HomedLoginIndex(props) {
       } else {
         global.toast.showToast("二维码数据不合法");
       }
+      global.loading.hideLoading();
     };
   };
 

package/app/screens/LoginScreen/indexNew.js

@@ -52,6 +52,7 @@ const errorCodeMap = {
 const appName =
   NativeModules?.RNToNativeEmitter?.appName || config.LOCALTEST_APP_NAME;
 
+
 const envVersion = NativeModules?.RNToNativeEmitter?.serverCluster || "alpha";
 
 const packageName = NativeModules?.RNToNativeEmitter?.packageName;
@@ -176,7 +177,7 @@ function LoginScreen({ navigation, route }) {
         }
 
         const entranceSelect = await storage.get("entranceSelect");
-        if (entranceSelect === "tyygq" && envVersion !== "release") {
+        if (entranceSelect === "tyygq" && envVersion !== "release" && !["禺乐慧家", "悦慧家", '吉柿果'].includes(appName)) {
           global.loading.showLoading("正在加载");
           await global.base.navigateModule({
             operatorId: "ipanel",
@@ -395,8 +396,8 @@ function LoginScreen({ navigation, route }) {
   const handleLogin = async () => {
     let adcode;
     let res;
-    const appName =
-      NativeModules?.RNToNativeEmitter?.appName || config.LOCALTEST_APP_NAME;
+    // const appName =
+    //   NativeModules?.RNToNativeEmitter?.appName || config.LOCALTEST_APP_NAME;
     // const appName = '遥控键码库';
     const { deviceModal } = NativeModules?.RNToNativeEmitter || {};
 
@@ -580,8 +581,8 @@ function LoginScreen({ navigation, route }) {
 
       console.log(activeType);
       console.log(envVersion);
-      console.log(9999);
-      if (activeType === "ajb" && envVersion !== "release") {
+      console.log(9999, appName);
+      if (activeType === "ajb" && envVersion !== "release" && !["禺乐慧家", "悦慧家", '吉柿果'].includes(appName)) {
         const entrance = await selectEntrance();
         await storage.set("entranceSelect", entrance);
         if (entrance === "tyygq") {

package/app/utils/common.js

@@ -13,6 +13,7 @@ import {
   getUserInfo,
   getAccessToken,
   refreshToken,
+  mobileRelationLogin,
 } from "../api";
 import storage from "../storage";
 import eventBus, { EVENTS } from "../eventBus";
@@ -23,13 +24,14 @@ async function updateHomedToken() {
   const accountData = await storage.get("accountData");
   const activeAddr = await storage.get("activeAddr");
   const res = await getUserInfo();
+  console.log(res, "getUserInfo");
   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, "bindList");
-  const homedConfig = bindList.find(item => item.third_type === "homed");
+  const homedConfig = bindList.find((item) => item.third_type === "homed");
   let domain = activeAddr?.domain || "homed.tv";
   // if (!["禺乐慧家", "悦慧家"].includes(appName)) {
   //   domain = 'homed.tv'
@@ -38,33 +40,61 @@ async function updateHomedToken() {
     domain = "homed.jishimedia.com";
   }
   console.log(domain, "domain");
+  // 有homedConfig和domain，说明当前cloud用户已经绑定了homed业务
   if (homedConfig && domain) {
-    const tokenRes = await getAccessToken(
-      {
-        userName: homedConfig.third_id,
-        deviceType: 1,
-      },
-      domain
-    ).catch(err => {});
-    console.log(tokenRes, "tokenRes");
-    if (tokenRes && tokenRes.ret === 0) {
+    const mobileRelationLoginParams = await storage.get(
+      "mobileRelationLoginParams"
+    );
+    let homedToken = "";
+    if (mobileRelationLoginParams) {
+      console.log("mobileRelationLoginParams", mobileRelationLoginParams);
+      // 未来优先走这个接口去登录homed，拿到并设置 homedLoginResult，以这个作为homed是否登录的判断——jilinHomed & tvShare
+      try {
+        const homedLoginResult = await mobileRelationLogin(
+          mobileRelationLoginParams,
+          domain
+        ).catch((err) => {});
+        if (homedLoginResult && homedLoginResult.ret === 0) {
+          homedToken = homedLoginResult.access_token;
+          await storage.set("homedLoginResult", homedLoginResult);
+        }
+      } catch (e) {
+        console.log("mobileRelationLogin Error:", e);
+      }
+    } else {
+      // 一般不走这个方式了，但还是放着，以防万一
+      const tokenRes = await getAccessToken(
+        {
+          userName: homedConfig.third_id,
+          deviceType: 1,
+        },
+        domain
+      ).catch((err) => {});
+      console.log(tokenRes, "tokenRes");
+      if (tokenRes && tokenRes.ret === 0) {
+        homedToken = tokenRes.access_token;
+      }
+    }
+
+    if (homedToken) {
       // 如果能获取到homed token，说明当前登录的家庭成员开通（绑定）了homed业务
-      await storage.set("homedAccessToken", tokenRes.access_token);
+      await storage.set("homedAccessToken", homedToken);
       const userListRes = await getUserList({}).catch(() => {});
       if (userListRes?.ret === 0) {
         const list = userListRes.user_list || [];
         await storage.set(
           "homedHomeMembers",
-          list.filter(item => item.user_id !== userListRes.bind_user_id)
+          list.filter((item) => item.user_id !== userListRes.bind_user_id)
         );
       }
     } else {
-      // global.toast.showToast(tokenRes?.ret_message || '获取homedtoken失败');
       // 置空
       await storage.set("homedAccessToken", "");
+      await storage.remove("homedLoginResult");
     }
   } else {
     await storage.set("homedAccessToken", "");
+    await storage.remove("homedLoginResult");
   }
 
   // const params = {
@@ -103,15 +133,15 @@ async function initOperatorHomedTouristAccount(opHomedConfig) {
   if (["吉柿果"].includes(appName)) {
     url = `http://access.${opHomedConfig.domain}/account/user/register`;
   }
-    await homedGet(url, {
-      username: opHomedConfig.touristUsername,
-      groupid: opHomedConfig.touristGroupId,
-      accounttype: 1,
-      iconid: 1,
-      pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
-    }).catch(e => {
-      console.log("Error: homed游客注册请求失败", e);
-    });
+  await homedGet(url, {
+    username: opHomedConfig.touristUsername,
+    groupid: opHomedConfig.touristGroupId,
+    accounttype: 1,
+    iconid: 1,
+    pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
+  }).catch((e) => {
+    console.log("Error: homed游客注册请求失败", e);
+  });
 
   await updateHomedTouristToken();
 }
@@ -129,7 +159,7 @@ async function updateHomedTouristToken() {
     devicetype: 3,
     accounttype: 2,
     pwd: "1bbd886460827015e5d605ed44252251", // md5("11111111")
-  }).catch(e => {
+  }).catch((e) => {
     console.log("Error: homed游客登录请求失败", e);
   });
 
@@ -332,8 +362,10 @@ async function appReport(tag, extraData = {}) {
 
 const checkToken = async () => {
   const accountType = await storage.get("accountType");
-  const accessTokenKey = accountType === 'adg' ? 'adgAccessToken' : 'accessToken';
-  const refreshTokenKey = accountType === 'adg' ? 'adgRefreshToken' : 'refreshToken';
+  const accessTokenKey =
+    accountType === "adg" ? "adgAccessToken" : "accessToken";
+  const refreshTokenKey =
+    accountType === "adg" ? "adgRefreshToken" : "refreshToken";
   const access_token = await storage.get(accessTokenKey);
   const refresh_token = await storage.get(refreshTokenKey);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.30",
-  "ipanelVersion": "1.0.378",
+  "version": "1.0.32",
+  "ipanelVersion": "1.0.384",
   "description": "",
   "main": "index.js",
   "keywords": [