ipanel-rnapp-ajb-base 1.0.30 → 1.0.31

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/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 = {
@@ -59,6 +62,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 +80,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 +139,7 @@ function HomedLoginIndex(props) {
       } else {
         global.toast.showToast("二维码数据不合法");
       }
+      global.loading.hideLoading();
     };
   };
 

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.31",
+  "ipanelVersion": "1.0.379",
   "description": "",
   "main": "index.js",
   "keywords": [