@huaapp001/m-play 0.0.9 → 0.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/config/index.js.map +1 -1
- package/lib/module/package/atoms/global.js +3 -0
- package/lib/module/package/atoms/global.js.map +1 -1
- package/lib/module/package/const/storage.js +1 -0
- package/lib/module/package/const/storage.js.map +1 -1
- package/lib/module/package/hooks/useAppGetUID.js +7 -3
- package/lib/module/package/hooks/useAppGetUID.js.map +1 -1
- package/lib/module/package/hooks/useLoadStorage.js +32 -0
- package/lib/module/package/hooks/useLoadStorage.js.map +1 -0
- package/lib/module/package/request/index.js +4 -4
- package/lib/module/package/request/index.js.map +1 -1
- package/lib/module/package/screens/home/index.js +17 -4
- package/lib/module/package/screens/home/index.js.map +1 -1
- package/lib/module/package/screens/middle/components/CustomProgressBar.js +7 -10
- package/lib/module/package/screens/middle/components/CustomProgressBar.js.map +1 -1
- package/lib/module/package/screens/middle/index.js +15 -13
- package/lib/module/package/screens/middle/index.js.map +1 -1
- package/package.json +1 -1
- package/src/config/index.ts +2 -0
- package/src/package/atoms/global.ts +3 -0
- package/src/package/const/storage.ts +3 -0
- package/src/package/hooks/useAppGetUID.ts +7 -3
- package/src/package/hooks/useLoadStorage.ts +34 -0
- package/src/package/request/index.ts +4 -4
- package/src/package/screens/home/index.tsx +11 -3
- package/src/package/screens/middle/components/CustomProgressBar.tsx +3 -4
- package/src/package/screens/middle/index.tsx +15 -14
- package/src/types/global.d.ts +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["global","__MPLAY_CONFIG__","initializeConfig","config","getConfig","Error","resetConfig"],"sourceRoot":"../../../src","sources":["config/index.ts"],"mappings":";;AAAA;;
|
1
|
+
{"version":3,"names":["global","__MPLAY_CONFIG__","initializeConfig","config","getConfig","Error","resetConfig"],"sourceRoot":"../../../src","sources":["config/index.ts"],"mappings":";;AAAA;;AAuBA;;AAKA;AACA,IAAI,CAACA,MAAM,CAACC,gBAAgB,EAAE;EAC1BD,MAAM,CAACC,gBAAgB,GAAG,IAAI;AAClC;;AAEA;AACA,OAAO,MAAMC,gBAAgB,GAAIC,MAAkB,IAAK;EACpDH,MAAM,CAACC,gBAAgB,GAAGE,MAAM;AACpC,CAAC;;AAED;AACA,OAAO,MAAMC,SAAS,GAAGA,CAAA,KAAkB;EACvC,IAAI,CAACJ,MAAM,CAACC,gBAAgB,EAAE;IAC1B,MAAM,IAAII,KAAK,CAAC,6DAA6D,CAAC;EAClF;EACA,OAAOL,MAAM,CAACC,gBAAgB;AAClC,CAAC;;AAED;AACA,OAAO,MAAMK,WAAW,GAAGA,CAAA,KAAM;EAC7BN,MAAM,CAACC,gBAAgB,GAAG,IAAI;AAClC,CAAC","ignoreList":[]}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["atom","Platform","isAllowAttAccessAtom","OS","schemeDeepLinkParamsAtom","isFirstInitAfSuccessAtom","bPackageWebviewLoadingFinishAtom","MiddleScreenLoadingFinishAtom"],"sourceRoot":"../../../../src","sources":["package/atoms/global.ts"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,QAAQ,QAAQ,cAAc;;AAEvC;AACA,OAAO,MAAMC,oBAAoB,GAAGF,IAAI,CACtCC,QAAQ,CAACE,EAAE,KAAK,SAAS,GAAG,IAAI,GAAG,KACrC,CAAC;;AAED;AACA,OAAO,MAAMC,wBAAwB,GAAGJ,IAAI,CAAyB,CAAC,CAAC,CAAC;;AAExE;AACA,OAAO,MAAMK,wBAAwB,GAAGL,IAAI,CAAC,KAAK,CAAC;;AAEnD;AACA,OAAO,MAAMM,gCAAgC,GAAGN,IAAI,CAAC,KAAK,CAAC;;AAE3D;AACA,OAAO,MAAMO,6BAA6B,GAAGP,IAAI,CAAC,KAAK,CAAC","ignoreList":[]}
|
1
|
+
{"version":3,"names":["atom","Platform","isAllowAttAccessAtom","OS","schemeDeepLinkParamsAtom","isFirstInitAfSuccessAtom","bPackageWebviewLoadingFinishAtom","MiddleScreenLoadingFinishAtom","uidAtom"],"sourceRoot":"../../../../src","sources":["package/atoms/global.ts"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,QAAQ,QAAQ,cAAc;;AAEvC;AACA,OAAO,MAAMC,oBAAoB,GAAGF,IAAI,CACtCC,QAAQ,CAACE,EAAE,KAAK,SAAS,GAAG,IAAI,GAAG,KACrC,CAAC;;AAED;AACA,OAAO,MAAMC,wBAAwB,GAAGJ,IAAI,CAAyB,CAAC,CAAC,CAAC;;AAExE;AACA,OAAO,MAAMK,wBAAwB,GAAGL,IAAI,CAAC,KAAK,CAAC;;AAEnD;AACA,OAAO,MAAMM,gCAAgC,GAAGN,IAAI,CAAC,KAAK,CAAC;;AAE3D;AACA,OAAO,MAAMO,6BAA6B,GAAGP,IAAI,CAAC,KAAK,CAAC;;AAExD;AACA,OAAO,MAAMQ,OAAO,GAAGR,IAAI,CAAC,EAAE,CAAC","ignoreList":[]}
|
@@ -9,4 +9,5 @@ export const APP_FIRST_INIT_ADJUST_KEY = 'APP_FIRST_INIT_ADJUST_KEY';
|
|
9
9
|
export const ONELINK_NO_HTTP_VALUE = 'com.play.flamshort://';
|
10
10
|
/** TODO 链接需要替换 */
|
11
11
|
export const ONELINK_SHARE_VALUE = 'https://flamshort.onelink.me/';
|
12
|
+
export const STORAGE_HAVE_SOURCE = 'M_SDK_STORAGE_HAVE_SOURCE';
|
12
13
|
//# sourceMappingURL=storage.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["STORAGE_USER_ID","STORAGE_USER_TOKEN","APP_FIRST_INIT_ADJUST_KEY","ONELINK_NO_HTTP_VALUE","ONELINK_SHARE_VALUE"],"sourceRoot":"../../../../src","sources":["package/const/storage.ts"],"mappings":";;AAAA,OAAO,MAAMA,eAAe,GAAG,iBAAiB;AAEhD,OAAO,MAAMC,kBAAkB,GAAG,oBAAoB;;AAEtD;AACA,OAAO,MAAMC,yBAAyB,GAAG,2BAA2B;AACpE;AACA,OAAO,MAAMC,qBAAqB,GAAG,uBAAuB;AAC5D;AACA,OAAO,MAAMC,mBAAmB,GAAG,+BAA+B","ignoreList":[]}
|
1
|
+
{"version":3,"names":["STORAGE_USER_ID","STORAGE_USER_TOKEN","APP_FIRST_INIT_ADJUST_KEY","ONELINK_NO_HTTP_VALUE","ONELINK_SHARE_VALUE","STORAGE_HAVE_SOURCE"],"sourceRoot":"../../../../src","sources":["package/const/storage.ts"],"mappings":";;AAAA,OAAO,MAAMA,eAAe,GAAG,iBAAiB;AAEhD,OAAO,MAAMC,kBAAkB,GAAG,oBAAoB;;AAEtD;AACA,OAAO,MAAMC,yBAAyB,GAAG,2BAA2B;AACpE;AACA,OAAO,MAAMC,qBAAqB,GAAG,uBAAuB;AAC5D;AACA,OAAO,MAAMC,mBAAmB,GAAG,+BAA+B;AAGlE,OAAO,MAAMC,mBAAmB,GAAG,2BAA2B","ignoreList":[]}
|
@@ -5,15 +5,16 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
|
|
5
5
|
import { useEffect, useState } from 'react';
|
6
6
|
import { NativeModules, Platform } from 'react-native';
|
7
7
|
import deviceInfo from 'react-native-device-info';
|
8
|
-
import { STORAGE_USER_ID } from "../const/storage.js";
|
8
|
+
import { STORAGE_HAVE_SOURCE, STORAGE_USER_ID } from "../const/storage.js";
|
9
9
|
import useGetNetwork from "./useGetNetwork.js";
|
10
|
-
import { useAtomValue } from 'jotai';
|
11
|
-
import { schemeDeepLinkParamsAtom } from "../atoms/global.js";
|
10
|
+
import { useAtomValue, useSetAtom } from 'jotai';
|
11
|
+
import { schemeDeepLinkParamsAtom, uidAtom } from "../atoms/global.js";
|
12
12
|
const useAppGetUID = () => {
|
13
13
|
const [isLoading, setIsLoading] = useState(false);
|
14
14
|
const [isAPackage, setIsAPackage] = useState(true);
|
15
15
|
const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
|
16
16
|
const [isConnectNetwork] = useGetNetwork();
|
17
|
+
const setUid = useSetAtom(uidAtom);
|
17
18
|
useEffect(() => {
|
18
19
|
if (!isConnectNetwork) return;
|
19
20
|
const getUserId = async () => {
|
@@ -39,6 +40,8 @@ const useAppGetUID = () => {
|
|
39
40
|
});
|
40
41
|
// setIsAPackage(res.data.publishStatus !== '1');
|
41
42
|
global.GLOBAL_USER_UID = res.data.user_id;
|
43
|
+
setUid(res.data.user_id);
|
44
|
+
AsyncStorage.setItem(STORAGE_HAVE_SOURCE, (res.data?.source ?? '').length === 0 ? 'false' : 'true');
|
42
45
|
AsyncStorage.setItem(STORAGE_USER_ID, String(res.data.user_id));
|
43
46
|
setIsLoading(true);
|
44
47
|
} catch (ex) {
|
@@ -60,6 +63,7 @@ const useAppGetUID = () => {
|
|
60
63
|
user_type: global.wakeUpDeepLinkType,
|
61
64
|
...schemeDeepLinkParams
|
62
65
|
}).then(res => {
|
66
|
+
AsyncStorage.setItem(STORAGE_HAVE_SOURCE, (res.data?.source ?? '').length === 0 ? 'false' : 'true');
|
63
67
|
setIsAPackage((res.data?.source ?? '').length === 0);
|
64
68
|
});
|
65
69
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"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":";;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;
|
1
|
+
{"version":3,"names":["axiosGet","axiosPost","AsyncStorage","useEffect","useState","NativeModules","Platform","deviceInfo","STORAGE_HAVE_SOURCE","STORAGE_USER_ID","useGetNetwork","useAtomValue","useSetAtom","schemeDeepLinkParamsAtom","uidAtom","useAppGetUID","isLoading","setIsLoading","isAPackage","setIsAPackage","schemeDeepLinkParams","isConnectNetwork","setUid","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":[]}
|
@@ -0,0 +1,32 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
import AsyncStorage from "@react-native-async-storage/async-storage";
|
4
|
+
import { useEffect, useState } from "react";
|
5
|
+
import { STORAGE_HAVE_SOURCE, STORAGE_USER_ID } from "../const/storage.js";
|
6
|
+
import { useSetAtom } from "jotai";
|
7
|
+
import { uidAtom } from "../atoms/global.js";
|
8
|
+
const useLoadStorage = () => {
|
9
|
+
const [isHaveSource, setIsHaveSource] = useState(false);
|
10
|
+
const [isLoading, setIsLoading] = useState(false);
|
11
|
+
const setUid = useSetAtom(uidAtom);
|
12
|
+
useEffect(() => {
|
13
|
+
(async () => {
|
14
|
+
try {
|
15
|
+
const value = await AsyncStorage.getItem(STORAGE_HAVE_SOURCE);
|
16
|
+
const uid = await AsyncStorage.getItem(STORAGE_USER_ID);
|
17
|
+
global.GLOBAL_USER_UID = uid;
|
18
|
+
setUid(uid);
|
19
|
+
setIsHaveSource(value === 'true');
|
20
|
+
setIsLoading(true);
|
21
|
+
} catch (ex) {
|
22
|
+
setIsLoading(true);
|
23
|
+
}
|
24
|
+
})();
|
25
|
+
}, []);
|
26
|
+
return {
|
27
|
+
isHaveSource,
|
28
|
+
isLoading
|
29
|
+
};
|
30
|
+
};
|
31
|
+
export default useLoadStorage;
|
32
|
+
//# sourceMappingURL=useLoadStorage.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"names":["AsyncStorage","useEffect","useState","STORAGE_HAVE_SOURCE","STORAGE_USER_ID","useSetAtom","uidAtom","useLoadStorage","isHaveSource","setIsHaveSource","isLoading","setIsLoading","setUid","value","getItem","uid","global","GLOBAL_USER_UID","ex"],"sourceRoot":"../../../../src","sources":["package/hooks/useLoadStorage.ts"],"mappings":";;AAAA,OAAOA,YAAY,MAAM,2CAA2C;AACpE,SAASC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC3C,SAASC,mBAAmB,EAAEC,eAAe,QAAQ,qBAAkB;AACvE,SAASC,UAAU,QAAQ,OAAO;AAClC,SAASC,OAAO,QAAQ,oBAAiB;AAGzC,MAAMC,cAAc,GAAGA,CAAA,KAAM;EAC3B,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAGP,QAAQ,CAAC,KAAK,CAAC;EACvD,MAAM,CAACQ,SAAS,EAAEC,YAAY,CAAC,GAAGT,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAMU,MAAM,GAAGP,UAAU,CAACC,OAAO,CAAC;EAElCL,SAAS,CAAC,MAAM;IACd,CAAC,YAAY;MACX,IAAI;QACF,MAAMY,KAAK,GAAG,MAAMb,YAAY,CAACc,OAAO,CAACX,mBAAmB,CAAC;QAC7D,MAAMY,GAAG,GAAG,MAAMf,YAAY,CAACc,OAAO,CAACV,eAAe,CAAC;QACvDY,MAAM,CAACC,eAAe,GAAGF,GAAG;QAC5BH,MAAM,CAACG,GAAG,CAAC;QACXN,eAAe,CAACI,KAAK,KAAK,MAAM,CAAC;QACjCF,YAAY,CAAC,IAAI,CAAC;MACpB,CAAC,CAAC,OAAOO,EAAE,EAAE;QACXP,YAAY,CAAC,IAAI,CAAC;MACpB;IACF,CAAC,EAAE,CAAC;EACN,CAAC,EAAE,EAAE,CAAC;EAEN,OAAO;IACLH,YAAY;IACZE;EACF,CAAC;AACH,CAAC;AAED,eAAeH,cAAc","ignoreList":[]}
|
@@ -18,14 +18,14 @@ const createAxiosInstance = () => {
|
|
18
18
|
...config
|
19
19
|
};
|
20
20
|
mergedConfig.headers = mergedConfig.headers || {};
|
21
|
-
if (global.
|
22
|
-
mergedConfig.headers.Authorization = global.
|
21
|
+
if (global.GLOBAL_USER_TOKEN) {
|
22
|
+
mergedConfig.headers.Authorization = global.GLOBAL_USER_TOKEN;
|
23
23
|
}
|
24
24
|
mergedConfig.headers.TYPE = Platform.OS;
|
25
25
|
mergedConfig.headers.NID = systemConfig.header.appId;
|
26
26
|
mergedConfig.headers.PACKAGENAME = systemConfig.header.PACKAGENAME;
|
27
|
-
if (!global.
|
28
|
-
mergedConfig.headers.UID = global.
|
27
|
+
if (!global.GLOBAL_USER_TOKEN && global.GLOBAL_USER_UID) {
|
28
|
+
mergedConfig.headers.UID = global.GLOBAL_USER_UID;
|
29
29
|
}
|
30
30
|
return mergedConfig;
|
31
31
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["Platform","axios","CONTENT_TYPE","getConfig","createAxiosInstance","systemConfig","instance","create","baseURL","header","apiUrl","timeout","headers","JSON","interceptors","request","use","config","mergedConfig","global","
|
1
|
+
{"version":3,"names":["Platform","axios","CONTENT_TYPE","getConfig","createAxiosInstance","systemConfig","instance","create","baseURL","header","apiUrl","timeout","headers","JSON","interceptors","request","use","config","mergedConfig","global","GLOBAL_USER_TOKEN","Authorization","TYPE","OS","NID","appId","PACKAGENAME","GLOBAL_USER_UID","UID","response","data","code","error","Promise","reject","message","axiosInstance","axiosGet","url","params","get","axiosPost","post","axiosPostFormData"],"sourceRoot":"../../../../src","sources":["package/request/index.ts"],"mappings":"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","ignoreList":[]}
|
@@ -6,7 +6,7 @@ import { createJsbridge } from '@tianzhitong/js-bridge';
|
|
6
6
|
import WebView from "../../components/webview/index.js";
|
7
7
|
import useGetUserToken from "../../hooks/useGetUserToken.js";
|
8
8
|
import { useAtom, useAtomValue } from 'jotai';
|
9
|
-
import { bPackageWebviewLoadingFinishAtom, MiddleScreenLoadingFinishAtom, schemeDeepLinkParamsAtom } from "../../atoms/global.js";
|
9
|
+
import { bPackageWebviewLoadingFinishAtom, MiddleScreenLoadingFinishAtom, schemeDeepLinkParamsAtom, uidAtom } from "../../atoms/global.js";
|
10
10
|
import MiddleScreen from "../middle/index.js";
|
11
11
|
import useAppGetUID from "../../hooks/useAppGetUID.js";
|
12
12
|
import useInitAfInfo from "../../hooks/useInitAfInfo.js";
|
@@ -14,6 +14,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
14
14
|
import { getConfig } from "../../../config/index.js";
|
15
15
|
import useIsShowAttModal from "../../hooks/useIsShowAttModal.js";
|
16
16
|
import useGetNetwork from "../../hooks/useGetNetwork.js";
|
17
|
+
import useLoadStorage from "../../hooks/useLoadStorage.js";
|
17
18
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
18
19
|
const Home = props => {
|
19
20
|
const {
|
@@ -84,9 +85,13 @@ const ProviderBPackageIndex = props => {
|
|
84
85
|
} = props;
|
85
86
|
/** 获取用户uid */
|
86
87
|
const {
|
87
|
-
isLoading,
|
88
88
|
isAPackage
|
89
89
|
} = useAppGetUID();
|
90
|
+
const uid = useAtomValue(uidAtom);
|
91
|
+
const {
|
92
|
+
isHaveSource,
|
93
|
+
isLoading
|
94
|
+
} = useLoadStorage();
|
90
95
|
/** 显示att弹窗逻辑 */
|
91
96
|
useIsShowAttModal();
|
92
97
|
const [isConnectNetwork] = useGetNetwork();
|
@@ -98,13 +103,21 @@ const ProviderBPackageIndex = props => {
|
|
98
103
|
console.log('middleScreenLoadingFinish', middleScreenLoadingFinish);
|
99
104
|
console.log('bPackageWebviewLoadingFinish', bPackageWebviewLoadingFinish);
|
100
105
|
useInitAfInfo();
|
106
|
+
if (!isLoading) {
|
107
|
+
return /*#__PURE__*/_jsx(View, {
|
108
|
+
style: {
|
109
|
+
flex: 1,
|
110
|
+
backgroundColor: 'black'
|
111
|
+
}
|
112
|
+
});
|
113
|
+
}
|
101
114
|
return /*#__PURE__*/_jsxs(View, {
|
102
115
|
style: {
|
103
116
|
flex: 1
|
104
117
|
},
|
105
118
|
children: [!middleScreenLoadingFinish ? /*#__PURE__*/_jsx(MiddleScreen, {
|
106
|
-
isAPackage:
|
107
|
-
}) : null, isConnectNetwork ? /*#__PURE__*/_jsx(Home, {
|
119
|
+
isAPackage: !isHaveSource
|
120
|
+
}) : null, isConnectNetwork && uid ? /*#__PURE__*/_jsx(Home, {
|
108
121
|
isAPackage: middleScreenLoadingFinish && isAPackage
|
109
122
|
}) : null, middleScreenLoadingFinish && isAPackage ? children : null]
|
110
123
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","useEffect","useMemo","useRef","useState","Platform","View","createJsbridge","WebView","useGetUserToken","useAtom","useAtomValue","bPackageWebviewLoadingFinishAtom","MiddleScreenLoadingFinishAtom","schemeDeepLinkParamsAtom","MiddleScreen","useAppGetUID","useInitAfInfo","useSafeAreaInsets","getConfig","useIsShowAttModal","useGetNetwork","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","isConnectNetwork"],"sourceRoot":"../../../../../src","sources":["package/screens/home/index.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAuBC,SAAS,EAAEC,OAAO,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AACtF,SAASC,QAAQ,EAAEC,IAAI,QAAQ,cAAc;AAC7C,SAASC,cAAc,QAAQ,wBAAwB;AACvD,OAAOC,OAAO,MAAM,mCAA0B;AAC9C,OAAOC,eAAe,MAAM,gCAA6B;AACzD,SAASC,OAAO,EAAEC,YAAY,QAAQ,OAAO;AAC7C,SACEC,gCAAgC,EAChCC,6BAA6B,EAC7BC,wBAAwB,
|
1
|
+
{"version":3,"names":["React","useEffect","useMemo","useRef","useState","Platform","View","createJsbridge","WebView","useGetUserToken","useAtom","useAtomValue","bPackageWebviewLoadingFinishAtom","MiddleScreenLoadingFinishAtom","schemeDeepLinkParamsAtom","uidAtom","MiddleScreen","useAppGetUID","useInitAfInfo","useSafeAreaInsets","getConfig","useIsShowAttModal","useGetNetwork","useLoadStorage","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","uid","isHaveSource","isLoading","isConnectNetwork","backgroundColor"],"sourceRoot":"../../../../../src","sources":["package/screens/home/index.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAuBC,SAAS,EAAEC,OAAO,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AACtF,SAASC,QAAQ,EAAEC,IAAI,QAAQ,cAAc;AAC7C,SAASC,cAAc,QAAQ,wBAAwB;AACvD,OAAOC,OAAO,MAAM,mCAA0B;AAC9C,OAAOC,eAAe,MAAM,gCAA6B;AACzD,SAASC,OAAO,EAAEC,YAAY,QAAQ,OAAO;AAC7C,SACEC,gCAAgC,EAChCC,6BAA6B,EAC7BC,wBAAwB,EACxBC,OAAO,QACF,uBAAoB;AAC3B,OAAOC,YAAY,MAAM,oBAAW;AACpC,OAAOC,YAAY,MAAM,6BAA0B;AACnD,OAAOC,aAAa,MAAM,8BAA2B;AACrD,SAASC,iBAAiB,QAAQ,gCAAgC;AAClE,SAASC,SAAS,QAAQ,0BAAiB;AAC3C,OAAOC,iBAAiB,MAAM,kCAA+B;AAC7D,OAAOC,aAAa,MAAM,8BAA2B;AACrD,OAAOC,cAAc,MAAM,+BAA4B;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAExD,MAAMC,IAAI,GAAIC,KAA6B,IAAK;EAC9C,MAAM;IAAEC;EAAW,CAAC,GAAGD,KAAK;EAC5B,MAAME,cAAc,GAAGZ,iBAAiB,CAAC,CAAC;EAC1C,MAAMa,YAAY,GAAGZ,SAAS,CAAC,CAAC;EAChC,MAAM;IAAEa,GAAG;IAAEC;EAAO,CAAC,GAAGH,cAAc;EACtC,MAAMI,MAAM,GAAGhC,MAAM,CAAM,IAAI,CAAC;EAChC,MAAMiC,yBAAyB,GAAGzB,YAAY,CAACE,6BAA6B,CAAC;EAC7E,MAAM,CAACwB,4BAA4B,EAAEC,+BAA+B,CAAC,GACnE5B,OAAO,CAACE,gCAAgC,CAAC;EAE3C,MAAM,CAAC2B,SAAS,EAAEC,YAAY,CAAC,GAAGpC,QAAQ,CAAC,KAAK,CAAC;EAEjD,MAAMqC,oBAAoB,GAAG9B,YAAY,CAACG,wBAAwB,CAAC;EAEnE,MAAM4B,QAAQ,GAAGxC,OAAO,CAAC,MAAM;IAC7B,OAAOK,cAAc,CAAC;MAAEoC,aAAa,EAAEA,CAAA,KAAMR;IAAO,CAAC,CAAC;EACxD,CAAC,EAAE,EAAE,CAAC;EAGNlC,SAAS,CAAC,MAAM;IACdyC,QAAQ,CAACE,gBAAgB,CAAC,YAAY,EAAE,MAAM;MAC5CJ,YAAY,CAAC,IAAI,CAAC;IACpB,CAAC,CAAC;EACJ,CAAC,EAAE,EAAE,CAAC;EAENvC,SAAS,CAAC,MAAM;IACd,IAAI,CAACsC,SAAS,EAAE;MACd;IACF;IACA,IAAI,EAAEF,4BAA4B,IAAID,yBAAyB,CAAC,EAAE;MAChE;IACF;IACA,IAAIK,oBAAoB,CAACI,QAAQ,EAAE;MACjCC,UAAU,CAAC,MAAM;QACfJ,QAAQ,CAACK,WAAW,CAAC;UACnBC,IAAI,EAAE,gBAAgB;UACtBC,OAAO,EAAER;QACX,CAAC,CAAC;MACJ,CAAC,EAAE,GAAG,CAAC;IACT;EACF,CAAC,EAAE,CAACA,oBAAoB,EAAEJ,4BAA4B,EAAED,yBAAyB,EAAEM,QAAQ,EAAEH,SAAS,CAAC,CAAC;EAExG9B,eAAe,CAACiC,QAAQ,CAAC;EAEzB,IAAGZ,UAAU,EAAE;IACb,OAAO,IAAI;EACb;EAEA,oBACEL,IAAA,CAACnB,IAAI;IACH4C,KAAK,EAAE;MACLC,IAAI,EAAE,CAAC;MACPC,OAAO,EAAEf,4BAA4B,IAAID,yBAAyB,GAAG,CAAC,GAAG;IAC3E,CAAE;IAAAiB,QAAA,eAEF5B,IAAA,CAACjB,OAAO;MACN8C,GAAG,EAAEnB,MAAO;MACZoB,MAAM,EAAE;QACNC,GAAG,EAAE,GAAGxB,YAAY,CAACyB,UAAU,aAAapD,QAAQ,CAACqD,EAAE,gBACrC,OAAO,YAAYC,MAAM,CAACC,eAAe,QACjD3B,GAAG,WAAWC,MAAM;MAChC,CAAE;MACF2B,eAAe,EAAEA,CAAA,KAAM,CAAE,CAAE;MAC3BC,SAAS,EAAEA,CAAA,KAAM;QACfC,OAAO,CAACC,GAAG,CAAC,WAAW,CAAC;QACxB1B,+BAA+B,CAAC,IAAI,CAAC;MACvC;IAAE,CACH;EAAC,CACE,CAAC;AAEX,CAAC;AAGD,MAAM2B,qBAAqB,GAAIpC,KAAwB,IAAK;EAC1D,MAAM;IAAEwB;EAAS,CAAC,GAAGxB,KAAK;EAC1B;EACA,MAAM;IAAEC;EAAW,CAAC,GAAGb,YAAY,CAAC,CAAC;EACrC,MAAMiD,GAAG,GAAGvD,YAAY,CAACI,OAAO,CAAC;EACjC,MAAM;IAAEoD,YAAY;IAACC;EAAU,CAAC,GAAG7C,cAAc,CAAC,CAAC;EACnD;EACAF,iBAAiB,CAAC,CAAC;EACnB,MAAM,CAACgD,gBAAgB,CAAC,GAAG/C,aAAa,CAAC,CAAC;EAC1C;EACA,MAAMc,yBAAyB,GAAGzB,YAAY,CAACE,6BAA6B,CAAC;EAC7E,MAAM4B,oBAAoB,GAAG9B,YAAY,CAACG,wBAAwB,CAAC;EACnE,MAAMuB,4BAA4B,GAAG1B,YAAY,CAACC,gCAAgC,CAAC;EACnFmD,OAAO,CAACC,GAAG,CAAC,sBAAsB,EAAEvB,oBAAoB,CAAC;EACzDsB,OAAO,CAACC,GAAG,CAAC,2BAA2B,EAAE5B,yBAAyB,CAAC;EACnE2B,OAAO,CAACC,GAAG,CAAC,8BAA8B,EAAC3B,4BAA4B,CAAC;EACxEnB,aAAa,CAAC,CAAC;EAEf,IAAG,CAACkD,SAAS,EAAE;IACb,oBAAO3C,IAAA,CAACnB,IAAI;MAAC4C,KAAK,EAAE;QAAEC,IAAI,EAAE,CAAC;QAACmB,eAAe,EAAE;MAAQ;IAAE,CAAO,CAAC;EACnE;EACA,oBACE3C,KAAA,CAACrB,IAAI;IAAC4C,KAAK,EAAE;MAAEC,IAAI,EAAE;IAAE,CAAE;IAAAE,QAAA,GACtB,CAACjB,yBAAyB,gBAAGX,IAAA,CAACT,YAAY;MAACc,UAAU,EAAE,CAACqC;IAAa,CAAE,CAAC,GAAG,IAAI,EAE9EE,gBAAgB,IAAIH,GAAG,gBAAGzC,IAAA,CAACG,IAAI;MAACE,UAAU,EAAEM,yBAAyB,IAAIN;IAAW,CAAE,CAAC,GAAE,IAAI,EAG7FM,yBAAyB,IAAIN,UAAU,GAAGuB,QAAQ,GAAG,IAAI;EAAA,CAEvD,CAAC;AAEX,CAAC;AAED,eAAeY,qBAAqB","ignoreList":[]}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
3
|
import React, { useState, useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
|
4
|
-
import { View,
|
4
|
+
import { View, StyleSheet, Animated, Easing } from 'react-native';
|
5
5
|
import { rwd } from "../../../utils/rwd.js";
|
6
|
-
import { jsx as _jsx
|
6
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
7
7
|
const CustomProgressBar = /*#__PURE__*/forwardRef(({
|
8
8
|
duration = 5000,
|
9
|
-
height = rwd(
|
9
|
+
height = rwd(25),
|
10
10
|
backgroundColor = '#e0e0e0',
|
11
11
|
fillColor = '#4CAF50',
|
12
12
|
showPercentage = true,
|
@@ -89,9 +89,9 @@ const CustomProgressBar = /*#__PURE__*/forwardRef(({
|
|
89
89
|
inputRange: [0, 100],
|
90
90
|
outputRange: ['0%', '100%']
|
91
91
|
});
|
92
|
-
return /*#__PURE__*/
|
92
|
+
return /*#__PURE__*/_jsx(View, {
|
93
93
|
style: [styles.container, containerStyle],
|
94
|
-
children:
|
94
|
+
children: /*#__PURE__*/_jsx(View, {
|
95
95
|
style: [styles.progressBar, {
|
96
96
|
height,
|
97
97
|
backgroundColor,
|
@@ -104,16 +104,13 @@ const CustomProgressBar = /*#__PURE__*/forwardRef(({
|
|
104
104
|
borderRadius
|
105
105
|
}]
|
106
106
|
})
|
107
|
-
})
|
108
|
-
style: [styles.progressText, textStyle],
|
109
|
-
children: [currentProgress, "%"]
|
110
|
-
})]
|
107
|
+
})
|
111
108
|
});
|
112
109
|
});
|
113
110
|
const styles = StyleSheet.create({
|
114
111
|
container: {
|
115
112
|
width: '100%',
|
116
|
-
padding: rwd(
|
113
|
+
padding: rwd(40)
|
117
114
|
},
|
118
115
|
progressBar: {
|
119
116
|
overflow: 'hidden'
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","useState","useEffect","useRef","useImperativeHandle","forwardRef","View","
|
1
|
+
{"version":3,"names":["React","useState","useEffect","useRef","useImperativeHandle","forwardRef","View","StyleSheet","Animated","Easing","rwd","jsx","_jsx","CustomProgressBar","duration","height","backgroundColor","fillColor","showPercentage","borderRadius","textStyle","containerStyle","onComplete","ref","progress","Value","currentProgress","setCurrentProgress","animationRef","listenerId","animateTo","value","callback","current","stop","remainingDuration","timing","toValue","easing","linear","useNativeDriver","start","addListener","Math","floor","removeListener","completeProgress","setValue","setProgress","clampedValue","min","max","startAnimation","widthInterpolation","interpolate","inputRange","outputRange","style","styles","container","children","progressBar","progressFill","width","create","padding","overflow","progressText","marginTop","textAlign","fontSize"],"sourceRoot":"../../../../../../src","sources":["package/screens/middle/components/CustomProgressBar.tsx"],"mappings":"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","ignoreList":[]}
|
@@ -64,7 +64,7 @@ const MiddleScreen = props => {
|
|
64
64
|
}), /*#__PURE__*/_jsx(Text, {
|
65
65
|
style: {
|
66
66
|
color: '#fff',
|
67
|
-
fontSize: rwd(
|
67
|
+
fontSize: rwd(40),
|
68
68
|
fontWeight: 600,
|
69
69
|
marginTop: rwd(50)
|
70
70
|
},
|
@@ -74,12 +74,23 @@ const MiddleScreen = props => {
|
|
74
74
|
style: {
|
75
75
|
position: 'absolute',
|
76
76
|
bottom: '20%',
|
77
|
-
|
77
|
+
left: '10%',
|
78
|
+
width: '80%'
|
78
79
|
},
|
79
|
-
children: [/*#__PURE__*/_jsx(
|
80
|
+
children: [/*#__PURE__*/_jsx(Text, {
|
81
|
+
style: {
|
82
|
+
color: '#fff',
|
83
|
+
fontSize: rwd(40),
|
84
|
+
fontWeight: 400,
|
85
|
+
marginTop: rwd(30),
|
86
|
+
textAlign: 'center'
|
87
|
+
},
|
88
|
+
children: systemConfig.adjustConfig.loadingText
|
89
|
+
}), /*#__PURE__*/_jsx(CustomProgressBar, {
|
80
90
|
ref: progressRef,
|
81
91
|
duration: 8000,
|
82
|
-
|
92
|
+
backgroundColor: systemConfig.adjustConfig.loadingTransBg,
|
93
|
+
fillColor: systemConfig.adjustConfig.loadingbg // 蓝色进度条
|
83
94
|
,
|
84
95
|
textStyle: {
|
85
96
|
color: '#3498db',
|
@@ -90,15 +101,6 @@ const MiddleScreen = props => {
|
|
90
101
|
setIsLoading(true);
|
91
102
|
console.log('进度完成!');
|
92
103
|
}
|
93
|
-
}), /*#__PURE__*/_jsx(Text, {
|
94
|
-
style: {
|
95
|
-
color: '#fff',
|
96
|
-
fontSize: rwd(24),
|
97
|
-
fontWeight: 600,
|
98
|
-
marginTop: rwd(30),
|
99
|
-
textAlign: 'center'
|
100
|
-
},
|
101
|
-
children: systemConfig.adjustConfig.loadingText
|
102
104
|
})]
|
103
105
|
})]
|
104
106
|
})]
|
@@ -1 +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","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","
|
1
|
+
{"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","left","textAlign","loadingText","ref","duration","loadingTransBg","fillColor","loadingbg","textStyle","onComplete","console","log"],"sourceRoot":"../../../../../src","sources":["package/screens/middle/index.tsx"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
package/src/config/index.ts
CHANGED
@@ -8,3 +8,6 @@ export const APP_FIRST_INIT_ADJUST_KEY = 'APP_FIRST_INIT_ADJUST_KEY';
|
|
8
8
|
export const ONELINK_NO_HTTP_VALUE = 'com.play.flamshort://';
|
9
9
|
/** TODO 链接需要替换 */
|
10
10
|
export const ONELINK_SHARE_VALUE = 'https://flamshort.onelink.me/';
|
11
|
+
|
12
|
+
|
13
|
+
export const STORAGE_HAVE_SOURCE = 'M_SDK_STORAGE_HAVE_SOURCE';
|
@@ -3,16 +3,17 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
|
|
3
3
|
import { useEffect, useState } from 'react';
|
4
4
|
import { NativeModules, Platform } from 'react-native';
|
5
5
|
import deviceInfo from 'react-native-device-info';
|
6
|
-
import { STORAGE_USER_ID } from '../const/storage';
|
6
|
+
import { STORAGE_HAVE_SOURCE, STORAGE_USER_ID } from '../const/storage';
|
7
7
|
import useGetNetwork from './useGetNetwork';
|
8
|
-
import { useAtomValue } from 'jotai';
|
9
|
-
import { schemeDeepLinkParamsAtom } from '../atoms/global';
|
8
|
+
import { useAtomValue, useSetAtom } from 'jotai';
|
9
|
+
import { schemeDeepLinkParamsAtom, uidAtom } from '../atoms/global';
|
10
10
|
|
11
11
|
const useAppGetUID = () => {
|
12
12
|
const [isLoading, setIsLoading] = useState(false);
|
13
13
|
const [isAPackage, setIsAPackage] = useState(true);
|
14
14
|
const schemeDeepLinkParams = useAtomValue(schemeDeepLinkParamsAtom);
|
15
15
|
const [isConnectNetwork] = useGetNetwork();
|
16
|
+
const setUid = useSetAtom(uidAtom);
|
16
17
|
useEffect(() => {
|
17
18
|
if (!isConnectNetwork) return;
|
18
19
|
const getUserId = async () => {
|
@@ -43,6 +44,8 @@ const useAppGetUID = () => {
|
|
43
44
|
})
|
44
45
|
// setIsAPackage(res.data.publishStatus !== '1');
|
45
46
|
global.GLOBAL_USER_UID = res.data.user_id;
|
47
|
+
setUid(res.data.user_id)
|
48
|
+
AsyncStorage.setItem(STORAGE_HAVE_SOURCE,(res.data?.source ?? '').length === 0 ? 'false': 'true')
|
46
49
|
AsyncStorage.setItem(STORAGE_USER_ID, String(res.data.user_id));
|
47
50
|
setIsLoading(true);
|
48
51
|
} catch (ex) {
|
@@ -69,6 +72,7 @@ const useAppGetUID = () => {
|
|
69
72
|
...schemeDeepLinkParams,
|
70
73
|
} as any)
|
71
74
|
.then((res) => {
|
75
|
+
AsyncStorage.setItem(STORAGE_HAVE_SOURCE,(res.data?.source ?? '').length === 0 ? 'false': 'true')
|
72
76
|
setIsAPackage((res.data?.source ?? '').length === 0)
|
73
77
|
});
|
74
78
|
}
|
@@ -0,0 +1,34 @@
|
|
1
|
+
import AsyncStorage from "@react-native-async-storage/async-storage";
|
2
|
+
import { useEffect, useState } from "react";
|
3
|
+
import { STORAGE_HAVE_SOURCE, STORAGE_USER_ID } from "../const/storage";
|
4
|
+
import { useSetAtom } from "jotai";
|
5
|
+
import { uidAtom } from "../atoms/global";
|
6
|
+
|
7
|
+
|
8
|
+
const useLoadStorage = () => {
|
9
|
+
const [isHaveSource, setIsHaveSource] = useState(false);
|
10
|
+
const [isLoading, setIsLoading] = useState(false);
|
11
|
+
const setUid = useSetAtom(uidAtom);
|
12
|
+
|
13
|
+
useEffect(() => {
|
14
|
+
(async () => {
|
15
|
+
try {
|
16
|
+
const value = await AsyncStorage.getItem(STORAGE_HAVE_SOURCE);
|
17
|
+
const uid = await AsyncStorage.getItem(STORAGE_USER_ID);
|
18
|
+
global.GLOBAL_USER_UID = uid;
|
19
|
+
setUid(uid);
|
20
|
+
setIsHaveSource(value === 'true');
|
21
|
+
setIsLoading(true)
|
22
|
+
} catch (ex) {
|
23
|
+
setIsLoading(true)
|
24
|
+
}
|
25
|
+
})();
|
26
|
+
}, []);
|
27
|
+
|
28
|
+
return {
|
29
|
+
isHaveSource,
|
30
|
+
isLoading
|
31
|
+
}
|
32
|
+
};
|
33
|
+
|
34
|
+
export default useLoadStorage;
|
@@ -27,16 +27,16 @@ const createAxiosInstance = (): AxiosInstance => {
|
|
27
27
|
const mergedConfig = { ...config };
|
28
28
|
mergedConfig.headers = mergedConfig.headers || {};
|
29
29
|
|
30
|
-
if (global.
|
31
|
-
mergedConfig.headers.Authorization = global.
|
30
|
+
if (global.GLOBAL_USER_TOKEN) {
|
31
|
+
mergedConfig.headers.Authorization = global.GLOBAL_USER_TOKEN;
|
32
32
|
}
|
33
33
|
|
34
34
|
mergedConfig.headers.TYPE = Platform.OS;
|
35
35
|
mergedConfig.headers.NID = systemConfig.header.appId;
|
36
36
|
mergedConfig.headers.PACKAGENAME = systemConfig.header.PACKAGENAME;
|
37
37
|
|
38
|
-
if (!global.
|
39
|
-
mergedConfig.headers.UID = global.
|
38
|
+
if (!global.GLOBAL_USER_TOKEN && global.GLOBAL_USER_UID) {
|
39
|
+
mergedConfig.headers.UID = global.GLOBAL_USER_UID;
|
40
40
|
}
|
41
41
|
|
42
42
|
return mergedConfig;
|
@@ -8,6 +8,7 @@ import {
|
|
8
8
|
bPackageWebviewLoadingFinishAtom,
|
9
9
|
MiddleScreenLoadingFinishAtom,
|
10
10
|
schemeDeepLinkParamsAtom,
|
11
|
+
uidAtom,
|
11
12
|
} from '../../atoms/global';
|
12
13
|
import MiddleScreen from '../middle';
|
13
14
|
import useAppGetUID from '../../hooks/useAppGetUID';
|
@@ -16,6 +17,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
16
17
|
import { getConfig } from '../../../config';
|
17
18
|
import useIsShowAttModal from '../../hooks/useIsShowAttModal';
|
18
19
|
import useGetNetwork from '../../hooks/useGetNetwork';
|
20
|
+
import useLoadStorage from '../../hooks/useLoadStorage';
|
19
21
|
|
20
22
|
const Home = (props: { isAPackage: boolean}) => {
|
21
23
|
const { isAPackage } = props;
|
@@ -93,7 +95,9 @@ const Home = (props: { isAPackage: boolean}) => {
|
|
93
95
|
const ProviderBPackageIndex = (props: PropsWithChildren) => {
|
94
96
|
const { children } = props;
|
95
97
|
/** 获取用户uid */
|
96
|
-
const {
|
98
|
+
const { isAPackage } = useAppGetUID();
|
99
|
+
const uid = useAtomValue(uidAtom);
|
100
|
+
const { isHaveSource,isLoading } = useLoadStorage();
|
97
101
|
/** 显示att弹窗逻辑 */
|
98
102
|
useIsShowAttModal();
|
99
103
|
const [isConnectNetwork] = useGetNetwork();
|
@@ -105,11 +109,15 @@ const ProviderBPackageIndex = (props: PropsWithChildren) => {
|
|
105
109
|
console.log('middleScreenLoadingFinish', middleScreenLoadingFinish)
|
106
110
|
console.log('bPackageWebviewLoadingFinish',bPackageWebviewLoadingFinish)
|
107
111
|
useInitAfInfo();
|
112
|
+
|
113
|
+
if(!isLoading) {
|
114
|
+
return <View style={{ flex: 1,backgroundColor: 'black' }}></View>
|
115
|
+
}
|
108
116
|
return (
|
109
117
|
<View style={{ flex: 1 }}>
|
110
|
-
{!middleScreenLoadingFinish ? <MiddleScreen isAPackage={
|
118
|
+
{!middleScreenLoadingFinish ? <MiddleScreen isAPackage={!isHaveSource} /> : null}
|
111
119
|
{
|
112
|
-
isConnectNetwork ? <Home isAPackage={middleScreenLoadingFinish && isAPackage} />: null
|
120
|
+
isConnectNetwork && uid ? <Home isAPackage={middleScreenLoadingFinish && isAPackage} />: null
|
113
121
|
}
|
114
122
|
{
|
115
123
|
middleScreenLoadingFinish && isAPackage ? children : null
|
@@ -6,7 +6,7 @@ const CustomProgressBar = forwardRef<any, any>(
|
|
6
6
|
(
|
7
7
|
{
|
8
8
|
duration = 5000,
|
9
|
-
height = rwd(
|
9
|
+
height = rwd(25),
|
10
10
|
backgroundColor = '#e0e0e0',
|
11
11
|
fillColor = '#4CAF50',
|
12
12
|
showPercentage = true,
|
@@ -124,8 +124,7 @@ const CustomProgressBar = forwardRef<any, any>(
|
|
124
124
|
]}
|
125
125
|
/>
|
126
126
|
</View>
|
127
|
-
|
128
|
-
{showPercentage && <Text style={[styles.progressText, textStyle]}>{currentProgress}%</Text>}
|
127
|
+
{/* {showPercentage && <Text style={[styles.progressText, textStyle]}>{currentProgress}%</Text>} */}
|
129
128
|
</View>
|
130
129
|
);
|
131
130
|
},
|
@@ -134,7 +133,7 @@ const CustomProgressBar = forwardRef<any, any>(
|
|
134
133
|
const styles = StyleSheet.create({
|
135
134
|
container: {
|
136
135
|
width: '100%',
|
137
|
-
padding: rwd(
|
136
|
+
padding: rwd(40),
|
138
137
|
},
|
139
138
|
progressBar: {
|
140
139
|
overflow: 'hidden',
|
@@ -57,7 +57,7 @@ const MiddleScreen = (props: { isAPackage: boolean }) => {
|
|
57
57
|
<Text
|
58
58
|
style={{
|
59
59
|
color: '#fff',
|
60
|
-
fontSize: rwd(
|
60
|
+
fontSize: rwd(40),
|
61
61
|
fontWeight: 600,
|
62
62
|
marginTop: rwd(50),
|
63
63
|
}}
|
@@ -65,28 +65,29 @@ const MiddleScreen = (props: { isAPackage: boolean }) => {
|
|
65
65
|
{systemConfig.adjustConfig.appName}
|
66
66
|
</Text>
|
67
67
|
</View>
|
68
|
-
<View style={{ position: 'absolute', bottom: '20%', width: '
|
69
|
-
<CustomProgressBar
|
70
|
-
ref={progressRef}
|
71
|
-
duration={8000}
|
72
|
-
fillColor="#3498db" // 蓝色进度条
|
73
|
-
textStyle={{ color: '#3498db', fontWeight: 'bold' }} // 蓝色文字
|
74
|
-
onComplete={() => {
|
75
|
-
setIsLoading(true);
|
76
|
-
console.log('进度完成!');
|
77
|
-
}}
|
78
|
-
/>
|
68
|
+
<View style={{ position: 'absolute', bottom: '20%',left: '10%', width: '80%' }}>
|
79
69
|
<Text
|
80
70
|
style={{
|
81
71
|
color: '#fff',
|
82
|
-
fontSize: rwd(
|
83
|
-
fontWeight:
|
72
|
+
fontSize: rwd(40),
|
73
|
+
fontWeight: 400,
|
84
74
|
marginTop: rwd(30),
|
85
75
|
textAlign: 'center',
|
86
76
|
}}
|
87
77
|
>
|
88
78
|
{systemConfig.adjustConfig.loadingText}
|
89
79
|
</Text>
|
80
|
+
<CustomProgressBar
|
81
|
+
ref={progressRef}
|
82
|
+
duration={8000}
|
83
|
+
backgroundColor={systemConfig.adjustConfig.loadingTransBg}
|
84
|
+
fillColor={systemConfig.adjustConfig.loadingbg} // 蓝色进度条
|
85
|
+
textStyle={{ color: '#3498db', fontWeight: 'bold' }} // 蓝色文字
|
86
|
+
onComplete={() => {
|
87
|
+
setIsLoading(true);
|
88
|
+
console.log('进度完成!');
|
89
|
+
}}
|
90
|
+
/>
|
90
91
|
</View>
|
91
92
|
</View>
|
92
93
|
</View>
|