@norcy/react-native-toolkit 0.2.29 → 0.2.30
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/commonjs/ReportUtil.js +13 -2
- package/lib/commonjs/ReportUtil.js.map +1 -1
- package/lib/module/ReportUtil.js +13 -2
- package/lib/module/ReportUtil.js.map +1 -1
- package/lib/typescript/ReportUtil.d.ts +1 -0
- package/lib/typescript/ReportUtil.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/ReportUtil.ts +13 -1
|
@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.ReportUtil = void 0;
|
|
7
7
|
var _reactNative = require("react-native");
|
|
8
8
|
var _reactNativeDeviceInfo = require("react-native-device-info");
|
|
9
|
+
var _ = require(".");
|
|
9
10
|
var _Notification = require("./Notification");
|
|
10
11
|
const CommonInfo = {
|
|
11
12
|
appVer: (0, _reactNativeDeviceInfo.getReadableVersion)(),
|
|
12
13
|
platform: _reactNative.Platform.OS,
|
|
13
14
|
sysVer: _reactNative.Platform.Version,
|
|
14
15
|
model: (0, _reactNativeDeviceInfo.getModel)(),
|
|
15
|
-
brand: (0, _reactNativeDeviceInfo.getBrand)()
|
|
16
|
-
device: (0, _reactNativeDeviceInfo.getDeviceId)()
|
|
16
|
+
brand: (0, _reactNativeDeviceInfo.getBrand)()
|
|
17
17
|
};
|
|
18
18
|
const isValidReport = (eventId, params) => {
|
|
19
19
|
if (typeof eventId !== 'string' || eventId?.length === 0) {
|
|
@@ -45,6 +45,17 @@ const convertToValidParams = params => {
|
|
|
45
45
|
};
|
|
46
46
|
const ReportUtil = exports.ReportUtil = {
|
|
47
47
|
init: () => {
|
|
48
|
+
if (_.Tool.isAgreed()) {
|
|
49
|
+
ReportUtil.doInit();
|
|
50
|
+
} else {
|
|
51
|
+
_Notification.Notification.addListenerOnce('onAgree', () => {
|
|
52
|
+
ReportUtil.doInit();
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
doInit: () => {
|
|
57
|
+
// 避免在用户同意之前获取 did
|
|
58
|
+
ReportUtil.setCommonInfo('device', (0, _reactNativeDeviceInfo.getDeviceId)());
|
|
48
59
|
_Notification.Notification.addListener('onLoginSuccess', ({
|
|
49
60
|
user
|
|
50
61
|
}) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_Notification","CommonInfo","appVer","getReadableVersion","platform","Platform","OS","sysVer","Version","model","getModel","brand","getBrand","
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_","_Notification","CommonInfo","appVer","getReadableVersion","platform","Platform","OS","sysVer","Version","model","getModel","brand","getBrand","isValidReport","eventId","params","length","console","error","Array","isArray","key","convertToValidParams","ret","value","JSON","stringify","ReportUtil","exports","init","Tool","isAgreed","doInit","Notification","addListenerOnce","setCommonInfo","getDeviceId","addListener","user","__DEV__","NativeModules","NCYReport","signIn","AVUser","get","signOut","report","validParams","realParams","getCommonInfo","log","viewAppear","page","enterPage","viewDisappear","leavePage"],"sourceRoot":"../../src","sources":["ReportUtil.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/ReportUtil.js
CHANGED
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
import { NativeModules, Platform } from 'react-native';
|
|
4
4
|
import { getBrand, getDeviceId, getModel, getReadableVersion } from 'react-native-device-info';
|
|
5
|
+
import { Tool } from '.';
|
|
5
6
|
import { Notification } from './Notification';
|
|
6
7
|
const CommonInfo = {
|
|
7
8
|
appVer: getReadableVersion(),
|
|
8
9
|
platform: Platform.OS,
|
|
9
10
|
sysVer: Platform.Version,
|
|
10
11
|
model: getModel(),
|
|
11
|
-
brand: getBrand()
|
|
12
|
-
device: getDeviceId()
|
|
12
|
+
brand: getBrand()
|
|
13
13
|
};
|
|
14
14
|
const isValidReport = (eventId, params) => {
|
|
15
15
|
if (typeof eventId !== 'string' || eventId?.length === 0) {
|
|
@@ -41,6 +41,17 @@ const convertToValidParams = params => {
|
|
|
41
41
|
};
|
|
42
42
|
export const ReportUtil = {
|
|
43
43
|
init: () => {
|
|
44
|
+
if (Tool.isAgreed()) {
|
|
45
|
+
ReportUtil.doInit();
|
|
46
|
+
} else {
|
|
47
|
+
Notification.addListenerOnce('onAgree', () => {
|
|
48
|
+
ReportUtil.doInit();
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
doInit: () => {
|
|
53
|
+
// 避免在用户同意之前获取 did
|
|
54
|
+
ReportUtil.setCommonInfo('device', getDeviceId());
|
|
44
55
|
Notification.addListener('onLoginSuccess', ({
|
|
45
56
|
user
|
|
46
57
|
}) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NativeModules","Platform","getBrand","getDeviceId","getModel","getReadableVersion","Notification","CommonInfo","appVer","platform","OS","sysVer","Version","model","brand","
|
|
1
|
+
{"version":3,"names":["NativeModules","Platform","getBrand","getDeviceId","getModel","getReadableVersion","Tool","Notification","CommonInfo","appVer","platform","OS","sysVer","Version","model","brand","isValidReport","eventId","params","length","console","error","Array","isArray","key","convertToValidParams","ret","value","JSON","stringify","ReportUtil","init","isAgreed","doInit","addListenerOnce","setCommonInfo","addListener","user","__DEV__","NCYReport","signIn","AVUser","get","signOut","report","validParams","realParams","getCommonInfo","log","viewAppear","page","enterPage","viewDisappear","leavePage"],"sourceRoot":"../../src","sources":["ReportUtil.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -3,6 +3,7 @@ export interface ReportItemType {
|
|
|
3
3
|
}
|
|
4
4
|
export declare const ReportUtil: {
|
|
5
5
|
init: () => void;
|
|
6
|
+
doInit: () => void;
|
|
6
7
|
report: (eventId: string, params?: ReportItemType) => void;
|
|
7
8
|
setCommonInfo: (key: string, value: string) => void;
|
|
8
9
|
getCommonInfo: () => ReportItemType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportUtil.d.ts","sourceRoot":"","sources":["../../src/ReportUtil.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ReportUtil.d.ts","sourceRoot":"","sources":["../../src/ReportUtil.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CAChC;AA4CD,eAAO,MAAM,UAAU;;;sBAgCH,MAAM,WAAW,cAAc;yBAa5B,MAAM,SAAS,MAAM;;uBAQvB,MAAM;0BAUH,MAAM;CAS7B,CAAC"}
|
package/package.json
CHANGED
package/src/ReportUtil.ts
CHANGED
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
getModel,
|
|
6
6
|
getReadableVersion,
|
|
7
7
|
} from 'react-native-device-info';
|
|
8
|
+
import { Tool } from '.';
|
|
8
9
|
import { LoginSuccessResultType } from './LoginManager';
|
|
9
10
|
import { Notification } from './Notification';
|
|
10
11
|
|
|
@@ -18,7 +19,6 @@ const CommonInfo: ReportItemType = {
|
|
|
18
19
|
sysVer: Platform.Version,
|
|
19
20
|
model: getModel(),
|
|
20
21
|
brand: getBrand(),
|
|
21
|
-
device: getDeviceId(),
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
const isValidReport = (eventId: string, params?: ReportItemType) => {
|
|
@@ -57,6 +57,18 @@ const convertToValidParams = (params?: ReportItemType) => {
|
|
|
57
57
|
|
|
58
58
|
export const ReportUtil = {
|
|
59
59
|
init: () => {
|
|
60
|
+
if (Tool.isAgreed()) {
|
|
61
|
+
ReportUtil.doInit();
|
|
62
|
+
} else {
|
|
63
|
+
Notification.addListenerOnce('onAgree', () => {
|
|
64
|
+
ReportUtil.doInit();
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
|
|
69
|
+
doInit: () => {
|
|
70
|
+
// 避免在用户同意之前获取 did
|
|
71
|
+
ReportUtil.setCommonInfo('device', getDeviceId());
|
|
60
72
|
Notification.addListener(
|
|
61
73
|
'onLoginSuccess',
|
|
62
74
|
({ user }: LoginSuccessResultType) => {
|