@huaapp001/m-play 0.0.4 → 0.0.6

package/lib/module/package/hooks/useAppGetUID.js

@@ -7,9 +7,12 @@ import { NativeModules, Platform } from 'react-native';
 import deviceInfo from 'react-native-device-info';
 import { STORAGE_USER_ID } from "../const/storage.js";
 import useGetNetwork from "./useGetNetwork.js";
+import { useAtomValue } from 'jotai';
+import { schemeDeepLinkParamsAtom } from "../atoms/global.js";
 const useAppGetUID = () => {
   const [isLoading, setIsLoading] = useState(false);
-  const [isAPackage, setIsAPackage] = useState(false);
+  const [isAPackage, setIsAPackage] = useState(true);
+  const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
   const [isConnectNetwork] = useGetNetwork();
   useEffect(() => {
     if (!isConnectNetwork) return;
@@ -24,11 +27,17 @@ const useAppGetUID = () => {
           system_version: deviceInfo.getSystemVersion(),
           language: Platform.OS === 'ios' ? NativeModules.SettingsManager?.settings?.AppleLocale || NativeModules.SettingsManager?.settings?.AppleLanguages[0] : NativeModules?.I18nManager?.localeIdentifier,
           app_version: deviceInfo.getVersion(),
-          unique_id: deviceInfo.getUniqueIdSync() + '1112',
+          unique_id: __DEV__ ? deviceInfo.getUniqueIdSync() + '1112' : deviceInfo.getUniqueIdSync(),
           ip: ipRes.data.ip
         });
         console.log('resresres', res);
-        setIsAPackage(res.data.publishStatus !== '1');
+        setIsAPackage(prev => {
+          if (!prev) {
+            return false;
+          }
+          return (res.data?.source ?? '').length === 0;
+        });
+        // setIsAPackage(res.data.publishStatus !== '1');
         global.GLOBAL_USER_UID = res.data.user_id;
         AsyncStorage.setItem(STORAGE_USER_ID, String(res.data.user_id));
         setIsLoading(true);
@@ -38,6 +47,23 @@ const useAppGetUID = () => {
     };
     getUserId();
   }, [isConnectNetwork]);
+  useEffect(() => {
+    if (!isConnectNetwork) return;
+    if (schemeDeepLinkParams.qd) {
+      axiosPost('/get_version/', {
+        phone_version: deviceInfo.getBrand(),
+        system_version: deviceInfo.getSystemVersion(),
+        language: Platform.OS === 'ios' ? NativeModules.SettingsManager?.settings?.AppleLocale || NativeModules.SettingsManager?.settings?.AppleLanguages[0] : NativeModules?.I18nManager?.localeIdentifier,
+        app_version: deviceInfo.getVersion(),
+        unique_id: __DEV__ ? deviceInfo.getUniqueIdSync() + '1112' : deviceInfo.getUniqueIdSync(),
+        source: schemeDeepLinkParams.qd,
+        user_type: global.wakeUpDeepLinkType,
+        ...schemeDeepLinkParams
+      }).then(res => {
+        setIsAPackage((res.data?.source ?? '').length === 0);
+      });
+    }
+  }, [schemeDeepLinkParams, isConnectNetwork, setIsAPackage]);
   return {
     isLoading,
     isAPackage

package/lib/module/package/hooks/useAppGetUID.js.map

@@ -1 +1 @@
-{"version":3,"names":["axiosGet","axiosPost","AsyncStorage","useEffect","useState","NativeModules","Platform","deviceInfo","STORAGE_USER_ID","useGetNetwork","useAppGetUID","isLoading","setIsLoading","isAPackage","setIsAPackage","isConnectNetwork","getUserId","ipRes","console","log","res","phone_version","getBrand","system_version","getSystemVersion","language","OS","SettingsManager","settings","AppleLocale","AppleLanguages","I18nManager","localeIdentifier","app_version","getVersion","unique_id","getUniqueIdSync","ip","data","publishStatus","global","GLOBAL_USER_UID","user_id","setItem","String","ex"],"sourceRoot":"../../../../src","sources":["package/hooks/useAppGetUID.ts"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,qBAAY;AAChD,OAAOC,YAAY,MAAM,2CAA2C;AACpE,SAASC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC3C,SAASC,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AACtD,OAAOC,UAAU,MAAM,0BAA0B;AACjD,SAASC,eAAe,QAAQ,qBAAkB;AAClD,OAAOC,aAAa,MAAM,oBAAiB;AAE3C,MAAMC,YAAY,GAAGA,CAAA,KAAM;EACzB,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAGR,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAM,CAACS,UAAU,EAAEC,aAAa,CAAC,GAAGV,QAAQ,CAAC,KAAK,CAAC;EACnD,MAAM,CAACW,gBAAgB,CAAC,GAAGN,aAAa,CAAC,CAAC;EAC1CN,SAAS,CAAC,MAAM;IACd,IAAG,CAACY,gBAAgB,EAAE;IACtB,MAAMC,SAAS,GAAG,MAAAA,CAAA,KAAY;MAC5B,IAAI;QACF;QACA,MAAMC,KAAK,GAAG,MAAMjB,QAAQ,CAAC,eAAe,CAAC;QAC7CkB,OAAO,CAACC,GAAG,CAAC,OAAO,EAAEF,KAAK,CAAC;QAC3B;QACA,MAAMG,GAAG,GAAG,MAAMnB,SAAS,CAAC,eAAe,EAAE;UAC3CoB,aAAa,EAAEd,UAAU,CAACe,QAAQ,CAAC,CAAC;UACpCC,cAAc,EAAEhB,UAAU,CAACiB,gBAAgB,CAAC,CAAC;UAC7CC,QAAQ,EACNnB,QAAQ,CAACoB,EAAE,KAAK,KAAK,GACjBrB,aAAa,CAACsB,eAAe,EAAEC,QAAQ,EAAEC,WAAW,IACpDxB,aAAa,CAACsB,eAAe,EAAEC,QAAQ,EAAEE,cAAc,CAAC,CAAC,CAAC,GAC1DzB,aAAa,EAAE0B,WAAW,EAAEC,gBAAgB;UAClDC,WAAW,EAAE1B,UAAU,CAAC2B,UAAU,CAAC,CAAC;UACpCC,SAAS,EAAE5B,UAAU,CAAC6B,eAAe,CAAC,CAAC,GAAG,MAAM;UAChDC,EAAE,EAAEpB,KAAK,CAACqB,IAAI,CAACD;QACjB,CAAC,CAAC;QAEFnB,OAAO,CAACC,GAAG,CAAC,WAAW,EAACC,GAAG,CAAC;QAC5BN,aAAa,CAACM,GAAG,CAACkB,IAAI,CAACC,aAAa,KAAK,GAAG,CAAC;QAC7CC,MAAM,CAACC,eAAe,GAAGrB,GAAG,CAACkB,IAAI,CAACI,OAAO;QACzCxC,YAAY,CAACyC,OAAO,CAACnC,eAAe,EAAEoC,MAAM,CAACxB,GAAG,CAACkB,IAAI,CAACI,OAAO,CAAC,CAAC;QAC/D9B,YAAY,CAAC,IAAI,CAAC;MACpB,CAAC,CAAC,OAAOiC,EAAE,EAAE;QACX3B,OAAO,CAACC,GAAG,CAAC,OAAO,EAAE0B,EAAE,CAAC;MAC1B;IACF,CAAC;IACD7B,SAAS,CAAC,CAAC;EACb,CAAC,EAAE,CAACD,gBAAgB,CAAC,CAAC;EAEtB,OAAO;IACLJ,SAAS;IACTE;EACF,CAAC;AACH,CAAC;AAED,eAAeH,YAAY","ignoreList":[]}
+{"version":3,"names":["axiosGet","axiosPost","AsyncStorage","useEffect","useState","NativeModules","Platform","deviceInfo","STORAGE_USER_ID","useGetNetwork","useAtomValue","schemeDeepLinkParamsAtom","useAppGetUID","isLoading","setIsLoading","isAPackage","setIsAPackage","schemeDeepLinkParams","isConnectNetwork","getUserId","ipRes","console","log","res","phone_version","getBrand","system_version","getSystemVersion","language","OS","SettingsManager","settings","AppleLocale","AppleLanguages","I18nManager","localeIdentifier","app_version","getVersion","unique_id","__DEV__","getUniqueIdSync","ip","data","prev","source","length","global","GLOBAL_USER_UID","user_id","setItem","String","ex","qd","user_type","wakeUpDeepLinkType","then"],"sourceRoot":"../../../../src","sources":["package/hooks/useAppGetUID.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/package/screens/home/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Platform, View } from 'react-native';
 import { createJsbridge } from '@tianzhitong/js-bridge';
 import WebView from "../../components/webview/index.js";
@@ -14,7 +14,10 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { getConfig } from "../../../config/index.js";
 import useIsShowAttModal from "../../hooks/useIsShowAttModal.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const Home = () => {
+const Home = props => {
+  const {
+    isAPackage
+  } = props;
   const safeAreaInsets = useSafeAreaInsets();
   const systemConfig = getConfig();
   const {
@@ -24,6 +27,7 @@ const Home = () => {
   const webRef = useRef(null);
   const middleScreenLoadingFinish = useAtomValue(MiddleScreenLoadingFinishAtom);
   const [bPackageWebviewLoadingFinish, setBPackageWebviewLoadingFinish] = useAtom(bPackageWebviewLoadingFinishAtom);
+  const [h5mounted, setH5mounted] = useState(false);
   const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
   const jsbridge = useMemo(() => {
     return createJsbridge({
@@ -31,17 +35,30 @@ const Home = () => {
     });
   }, []);
   useEffect(() => {
+    jsbridge.addEventListener('H5_MOUNTED', () => {
+      setH5mounted(true);
+    });
+  }, []);
+  useEffect(() => {
+    if (!h5mounted) {
+      return;
+    }
     if (!(bPackageWebviewLoadingFinish && middleScreenLoadingFinish)) {
       return;
     }
     if (schemeDeepLinkParams.pageName) {
-      jsbridge.postMessage({
-        type: 'SEND_H5_PARAMS',
-        payload: schemeDeepLinkParams
-      });
+      setTimeout(() => {
+        jsbridge.postMessage({
+          type: 'SEND_H5_PARAMS',
+          payload: schemeDeepLinkParams
+        });
+      }, 200);
     }
-  }, [schemeDeepLinkParams, bPackageWebviewLoadingFinish, middleScreenLoadingFinish, jsbridge]);
+  }, [schemeDeepLinkParams, bPackageWebviewLoadingFinish, middleScreenLoadingFinish, jsbridge, h5mounted]);
   useGetUserToken(jsbridge);
+  if (isAPackage) {
+    return null;
+  }
   return /*#__PURE__*/_jsx(View, {
     style: {
       flex: 1,
@@ -64,28 +81,28 @@ const ProviderBPackageIndex = props => {
   const {
     children
   } = props;
+  /** 获取用户uid */
   const {
     isLoading,
     isAPackage
   } = useAppGetUID();
+  /** 显示att弹窗逻辑 */
   useIsShowAttModal();
+  /** 中间页是否加载完成 true-成功 false-还在加载 */
   const middleScreenLoadingFinish = useAtomValue(MiddleScreenLoadingFinishAtom);
   const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
   console.log('schemeDeepLinkParams', schemeDeepLinkParams);
-  useInitAfInfo();
-  if (!isLoading) {
-    return null;
-  }
-  console.log('isAPackage', isAPackage);
-  if (isAPackage) {
-    return children;
-  }
   console.log('middleScreenLoadingFinish', middleScreenLoadingFinish);
+  useInitAfInfo();
   return /*#__PURE__*/_jsxs(View, {
     style: {
       flex: 1
     },
-    children: [!middleScreenLoadingFinish && /*#__PURE__*/_jsx(MiddleScreen, {}), /*#__PURE__*/_jsx(Home, {})]
+    children: [isLoading && !middleScreenLoadingFinish ? /*#__PURE__*/_jsx(MiddleScreen, {
+      isAPackage: isAPackage
+    }) : null, /*#__PURE__*/_jsx(Home, {
+      isAPackage: middleScreenLoadingFinish && isAPackage
+    }), middleScreenLoadingFinish && isAPackage ? children : null]
   });
 };
 export default ProviderBPackageIndex;

package/lib/module/package/screens/home/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useMemo","useRef","Platform","View","createJsbridge","WebView","useGetUserToken","useAtom","useAtomValue","bPackageWebviewLoadingFinishAtom","MiddleScreenLoadingFinishAtom","schemeDeepLinkParamsAtom","MiddleScreen","useAppGetUID","useInitAfInfo","useSafeAreaInsets","getConfig","useIsShowAttModal","jsx","_jsx","jsxs","_jsxs","Home","safeAreaInsets","systemConfig","top","bottom","webRef","middleScreenLoadingFinish","bPackageWebviewLoadingFinish","setBPackageWebviewLoadingFinish","schemeDeepLinkParams","jsbridge","getWebViewRef","pageName","postMessage","type","payload","style","flex","opacity","children","ref","source","uri","webviewUrl","OS","global","GLOBAL_USER_UID","onInvokeMessage","onLoadEnd","console","log","ProviderBPackageIndex","props","isLoading","isAPackage"],"sourceRoot":"../../../../../src","sources":["package/screens/home/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useMemo","useRef","useState","Platform","View","createJsbridge","WebView","useGetUserToken","useAtom","useAtomValue","bPackageWebviewLoadingFinishAtom","MiddleScreenLoadingFinishAtom","schemeDeepLinkParamsAtom","MiddleScreen","useAppGetUID","useInitAfInfo","useSafeAreaInsets","getConfig","useIsShowAttModal","jsx","_jsx","jsxs","_jsxs","Home","props","isAPackage","safeAreaInsets","systemConfig","top","bottom","webRef","middleScreenLoadingFinish","bPackageWebviewLoadingFinish","setBPackageWebviewLoadingFinish","h5mounted","setH5mounted","schemeDeepLinkParams","jsbridge","getWebViewRef","addEventListener","pageName","setTimeout","postMessage","type","payload","style","flex","opacity","children","ref","source","uri","webviewUrl","OS","global","GLOBAL_USER_UID","onInvokeMessage","onLoadEnd","console","log","ProviderBPackageIndex","isLoading"],"sourceRoot":"../../../../../src","sources":["package/screens/home/index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/package/screens/middle/index.js

@@ -8,7 +8,10 @@ import { bPackageWebviewLoadingFinishAtom, isFirstInitAfSuccessAtom, MiddleScree
 import { rwd } from "../../utils/rwd.js";
 import { getConfig } from "../../../config/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const MiddleScreen = () => {
+const MiddleScreen = props => {
+  const {
+    isAPackage
+  } = props;
   const systemConfig = getConfig();
   const progressRef = useRef(null);
   /** 深度链接是否成功 */
@@ -16,8 +19,8 @@ const MiddleScreen = () => {
   /** b包webview是否加载完成 */
   const bPackageWebviewLoadingFinish = useAtomValue(bPackageWebviewLoadingFinishAtom);
   /** 100%动画是否执行完毕 */
-  const setIsAnimationSuccess = useSetAtom(MiddleScreenLoadingFinishAtom);
-  const [isLoading, setIsLoading] = useState(false);
+  const setMiddleScreenLoadingFinishAtom = useSetAtom(MiddleScreenLoadingFinishAtom);
+  const [isLoading, setIsLoading] = useState(isAPackage ? false : true);
   useEffect(() => {
     // 深度链接成功，等于成功一半，无需走进度条
     if (isFirstInitAfSuccess) {
@@ -27,9 +30,9 @@ const MiddleScreen = () => {
   useEffect(() => {
     if (bPackageWebviewLoadingFinish && isLoading) {
       progressRef.current?.completeProgress();
-      setIsAnimationSuccess(true);
+      setMiddleScreenLoadingFinishAtom(true);
     }
-  }, [isLoading, bPackageWebviewLoadingFinish, setIsAnimationSuccess]);
+  }, [isLoading, bPackageWebviewLoadingFinish, setMiddleScreenLoadingFinishAtom]);
   return /*#__PURE__*/_jsxs(View, {
     style: {
       width: '100%',

package/lib/module/package/screens/middle/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAtomValue","useSetAtom","useEffect","useRef","useState","Image","StatusBar","Text","View","CustomProgressBar","bPackageWebviewLoadingFinishAtom","isFirstInitAfSuccessAtom","MiddleScreenLoadingFinishAtom","rwd","getConfig","jsx","_jsx","jsxs","_jsxs","MiddleScreen","systemConfig","progressRef","isFirstInitAfSuccess","bPackageWebviewLoadingFinish","setIsAnimationSuccess","isLoading","setIsLoading","current","completeProgress","style","width","height","children","translucent","barStyle","backgroundColor","flex","paddingTop","justifyContent","alignItems","source","uri","adjustConfig","bgImage","color","fontSize","fontWeight","marginTop","appName","position","bottom","ref","duration","fillColor","textStyle","onComplete","console","log","textAlign","loadingText"],"sourceRoot":"../../../../../src","sources":["package/screens/middle/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useAtomValue","useSetAtom","useEffect","useRef","useState","Image","StatusBar","Text","View","CustomProgressBar","bPackageWebviewLoadingFinishAtom","isFirstInitAfSuccessAtom","MiddleScreenLoadingFinishAtom","rwd","getConfig","jsx","_jsx","jsxs","_jsxs","MiddleScreen","props","isAPackage","systemConfig","progressRef","isFirstInitAfSuccess","bPackageWebviewLoadingFinish","setMiddleScreenLoadingFinishAtom","isLoading","setIsLoading","current","completeProgress","style","width","height","children","translucent","barStyle","backgroundColor","flex","paddingTop","justifyContent","alignItems","source","uri","adjustConfig","bgImage","color","fontSize","fontWeight","marginTop","appName","position","bottom","ref","duration","fillColor","textStyle","onComplete","console","log","textAlign","loadingText"],"sourceRoot":"../../../../../src","sources":["package/screens/middle/index.tsx"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huaapp001/m-play",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "m-play",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/package/hooks/useAppGetUID.ts

@@ -5,13 +5,16 @@ import { NativeModules, Platform } from 'react-native';
 import deviceInfo from 'react-native-device-info';
 import { STORAGE_USER_ID } from '../const/storage';
 import useGetNetwork from './useGetNetwork';
+import { useAtomValue } from 'jotai';
+import { schemeDeepLinkParamsAtom } from '../atoms/global';
 
 const useAppGetUID = () => {
   const [isLoading, setIsLoading] = useState(false);
-  const [isAPackage, setIsAPackage] = useState(false);
+  const [isAPackage, setIsAPackage] = useState(true);
+  const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
   const [isConnectNetwork] = useGetNetwork();
   useEffect(() => {
-    if(!isConnectNetwork) return;
+    if (!isConnectNetwork) return;
     const getUserId = async () => {
       try {
         // 获取ip地址
@@ -24,15 +27,21 @@ const useAppGetUID = () => {
           language:
             Platform.OS === 'ios'
               ? NativeModules.SettingsManager?.settings?.AppleLocale ||
-                NativeModules.SettingsManager?.settings?.AppleLanguages[0]
+              NativeModules.SettingsManager?.settings?.AppleLanguages[0]
               : NativeModules?.I18nManager?.localeIdentifier,
           app_version: deviceInfo.getVersion(),
-          unique_id: deviceInfo.getUniqueIdSync() + '1112',
+          unique_id: __DEV__ ? deviceInfo.getUniqueIdSync() + '1112' : deviceInfo.getUniqueIdSync(),
           ip: ipRes.data.ip,
         });
 
-        console.log('resresres',res)
-        setIsAPackage(res.data.publishStatus !== '1');
+        console.log('resresres', res)
+        setIsAPackage((prev) => {
+          if (!prev) {
+            return false;
+          }
+          return (res.data?.source ?? '').length === 0;
+        })
+        // setIsAPackage(res.data.publishStatus !== '1');
         global.GLOBAL_USER_UID = res.data.user_id;
         AsyncStorage.setItem(STORAGE_USER_ID, String(res.data.user_id));
         setIsLoading(true);
@@ -43,6 +52,28 @@ const useAppGetUID = () => {
     getUserId();
   }, [isConnectNetwork]);
 
+  useEffect(() => {
+      if (!isConnectNetwork) return;
+      if (schemeDeepLinkParams.qd) {
+          axiosPost('/get_version/', {
+              phone_version: deviceInfo.getBrand(),
+              system_version: deviceInfo.getSystemVersion(),
+              language: Platform.OS === 'ios'
+                  ? NativeModules.SettingsManager?.settings?.AppleLocale ||
+                  NativeModules.SettingsManager?.settings?.AppleLanguages[0]
+                  : NativeModules?.I18nManager?.localeIdentifier,
+              app_version: deviceInfo.getVersion(),
+              unique_id: __DEV__ ? deviceInfo.getUniqueIdSync() + '1112' : deviceInfo.getUniqueIdSync(),
+              source: schemeDeepLinkParams.qd,
+              user_type: global.wakeUpDeepLinkType,
+              ...schemeDeepLinkParams,
+          } as any)
+              .then((res) => {
+                setIsAPackage((res.data?.source ?? '').length === 0)
+              });
+      }
+  }, [schemeDeepLinkParams, isConnectNetwork,setIsAPackage]);
+
   return {
     isLoading,
     isAPackage,

package/src/package/screens/home/index.tsx

@@ -1,4 +1,4 @@
-import React, { PropsWithChildren, useEffect, useMemo, useRef } from 'react';
+import React, { PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react';
 import { Platform, View } from 'react-native';
 import { createJsbridge } from '@tianzhitong/js-bridge';
 import WebView from '../../components/webview';
@@ -16,8 +16,8 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { getConfig } from '../../../config';
 import useIsShowAttModal from '../../hooks/useIsShowAttModal';
 
-
-const Home = () => {
+const Home = (props: { isAPackage: boolean}) => {
+  const { isAPackage } = props;
   const safeAreaInsets = useSafeAreaInsets();
   const systemConfig = getConfig();
   const { top, bottom } = safeAreaInsets;
@@ -26,32 +26,49 @@ const Home = () => {
   const [bPackageWebviewLoadingFinish, setBPackageWebviewLoadingFinish] =
     useAtom(bPackageWebviewLoadingFinishAtom);
 
+  const [h5mounted, setH5mounted] = useState(false)
+
   const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
 
   const jsbridge = useMemo(() => {
     return createJsbridge({ getWebViewRef: () => webRef });
   }, []);
 
+
   useEffect(() => {
+    jsbridge.addEventListener('H5_MOUNTED', () => {
+      setH5mounted(true)
+    })
+  }, [])
+
+  useEffect(() => {
+    if (!h5mounted) {
+      return
+    }
     if (!(bPackageWebviewLoadingFinish && middleScreenLoadingFinish)) {
       return;
     }
     if (schemeDeepLinkParams.pageName) {
-      jsbridge.postMessage({
-        type: 'SEND_H5_PARAMS',
-        payload: schemeDeepLinkParams,
-      });
+      setTimeout(() => {
+        jsbridge.postMessage({
+          type: 'SEND_H5_PARAMS',
+          payload: schemeDeepLinkParams,
+        });
+      }, 200)
     }
-  }, [schemeDeepLinkParams, bPackageWebviewLoadingFinish,middleScreenLoadingFinish, jsbridge]);
+  }, [schemeDeepLinkParams, bPackageWebviewLoadingFinish, middleScreenLoadingFinish, jsbridge, h5mounted]);
 
   useGetUserToken(jsbridge);
 
+  if(isAPackage) {
+    return null;
+  }
+
   return (
     <View
       style={{
         flex: 1,
-        opacity:
-          bPackageWebviewLoadingFinish && middleScreenLoadingFinish ? 1 : 0,
+        opacity: bPackageWebviewLoadingFinish && middleScreenLoadingFinish ? 1 : 0,
       }}
     >
       <WebView
@@ -72,29 +89,25 @@ const Home = () => {
 };
 
 
-const ProviderBPackageIndex = (props: PropsWithChildren)  => {
-  const {
-    children,
-  } = props;
-  const { isLoading,isAPackage, } = useAppGetUID();
+const ProviderBPackageIndex = (props: PropsWithChildren) => {
+  const { children } = props;
+  /** 获取用户uid */
+  const { isLoading, isAPackage } = useAppGetUID();
+  /** 显示att弹窗逻辑 */
   useIsShowAttModal();
+  /** 中间页是否加载完成 true-成功 false-还在加载 */
   const middleScreenLoadingFinish = useAtomValue(MiddleScreenLoadingFinishAtom);
   const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
-  console.log('schemeDeepLinkParams',schemeDeepLinkParams)
+  console.log('schemeDeepLinkParams', schemeDeepLinkParams)
+  console.log('middleScreenLoadingFinish', middleScreenLoadingFinish)
   useInitAfInfo();
-
-  if (!isLoading) {
-    return null;
-  }
-  console.log('isAPackage',isAPackage)
-  if (isAPackage) {
-    return children;
-  }
-  console.log('middleScreenLoadingFinish',middleScreenLoadingFinish)
   return (
     <View style={{ flex: 1 }}>
-      {!middleScreenLoadingFinish && <MiddleScreen />}
-      <Home  />
+      {isLoading && !middleScreenLoadingFinish ? <MiddleScreen isAPackage={isAPackage} /> : null}
+      <Home isAPackage={middleScreenLoadingFinish && isAPackage} />
+      {
+        middleScreenLoadingFinish && isAPackage ? children : null
+      }
     </View>
   );
 };

package/src/package/screens/middle/index.tsx

@@ -12,7 +12,8 @@ import { rwd } from '../../utils/rwd';
 import { getConfig } from '../../../config';
 
 
-const MiddleScreen = () => {
+const MiddleScreen = (props: { isAPackage: boolean }) => {
+  const { isAPackage } = props;
   const systemConfig = getConfig();
   const progressRef = useRef<any>(null);
   /** 深度链接是否成功 */
@@ -22,9 +23,9 @@ const MiddleScreen = () => {
     bPackageWebviewLoadingFinishAtom
   );
   /** 100%动画是否执行完毕 */
-  const setIsAnimationSuccess = useSetAtom(MiddleScreenLoadingFinishAtom);
+  const setMiddleScreenLoadingFinishAtom = useSetAtom(MiddleScreenLoadingFinishAtom);
 
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(isAPackage ? false : true);
 
   useEffect(() => {
     // 深度链接成功，等于成功一半，无需走进度条
@@ -36,9 +37,9 @@ const MiddleScreen = () => {
   useEffect(() => {
     if (bPackageWebviewLoadingFinish && isLoading) {
       progressRef.current?.completeProgress();
-      setIsAnimationSuccess(true);
+      setMiddleScreenLoadingFinishAtom(true);
     }
-  }, [isLoading, bPackageWebviewLoadingFinish, setIsAnimationSuccess]);
+  }, [isLoading, bPackageWebviewLoadingFinish, setMiddleScreenLoadingFinishAtom]);
 
   return (
     <View style={{ width: '100%', height: '100%' }}>