@norcy/react-native-toolkit 0.2.32 → 0.2.34
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/android/buildscript.gradle +9 -2
- package/android/dependencies.gradle +8 -18
- package/android/root.gradle +3 -12
- package/lib/commonjs/ReportUtil.js +18 -0
- package/lib/commonjs/ReportUtil.js.map +1 -1
- package/lib/module/ReportUtil.js +18 -0
- package/lib/module/ReportUtil.js.map +1 -1
- package/lib/typescript/ReportUtil.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/ReportUtil.ts +22 -0
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
ext.applyBuildscriptExt = {
|
|
2
|
-
ext.buildToolsVersion = "
|
|
2
|
+
ext.buildToolsVersion = "33.0.0"
|
|
3
3
|
ext.minSdkVersion = 21
|
|
4
4
|
ext.compileSdkVersion = 33
|
|
5
5
|
ext.targetSdkVersion = 33
|
|
6
|
-
ext.
|
|
6
|
+
ext.ndkVersion = "23.1.7779620"
|
|
7
|
+
ext.kotlinVersion = "1.8.0"
|
|
7
8
|
}
|
|
8
9
|
|
|
9
10
|
ext.applyBuildscriptRepos = { handler ->
|
|
@@ -13,3 +14,9 @@ ext.applyBuildscriptRepos = { handler ->
|
|
|
13
14
|
handler.google()
|
|
14
15
|
}
|
|
15
16
|
|
|
17
|
+
ext.applyBuildscriptDependencies = { handler ->
|
|
18
|
+
handler.classpath("com.android.tools.build:gradle")
|
|
19
|
+
handler.classpath("com.facebook.react:react-native-gradle-plugin")
|
|
20
|
+
handler.classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
|
21
|
+
}
|
|
22
|
+
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
ext.applyDefaultConfig = { targetProject ->
|
|
2
2
|
targetProject.android {
|
|
3
3
|
compileSdkVersion targetProject.rootProject.ext.compileSdkVersion
|
|
4
|
+
ndkVersion targetProject.rootProject.ext.ndkVersion
|
|
4
5
|
|
|
5
6
|
defaultConfig {
|
|
6
7
|
minSdkVersion targetProject.rootProject.ext.minSdkVersion
|
|
@@ -41,16 +42,15 @@ ext.applyDefaultConfig = { targetProject ->
|
|
|
41
42
|
}
|
|
42
43
|
|
|
43
44
|
ext.applyCommonDependencies = { targetProject ->
|
|
44
|
-
def enableHermes = targetProject.
|
|
45
|
+
def enableHermes = targetProject.findProperty('hermesEnabled')?.toBoolean() ?: true
|
|
45
46
|
def jscFlavor = 'org.webkit:android-jsc:+'
|
|
46
47
|
|
|
47
48
|
targetProject.dependencies {
|
|
48
49
|
implementation fileTree(dir: "libs", include: ["*.jar"])
|
|
49
50
|
|
|
50
|
-
|
|
51
|
-
implementation "com.facebook.react:react-native:0.62.2.9.1"
|
|
51
|
+
implementation "com.facebook.react:react-android"
|
|
52
52
|
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
|
|
53
|
-
implementation '
|
|
53
|
+
implementation 'androidx.multidex:multidex:2.0.1'
|
|
54
54
|
|
|
55
55
|
implementation 'com.umeng.umsdk:common:9.6.3'
|
|
56
56
|
implementation 'com.umeng.umsdk:asms:1.8.0'
|
|
@@ -60,9 +60,7 @@ ext.applyCommonDependencies = { targetProject ->
|
|
|
60
60
|
implementation targetProject.project(':react-native-blob-util')
|
|
61
61
|
|
|
62
62
|
if (enableHermes) {
|
|
63
|
-
|
|
64
|
-
debugImplementation files(hermesPath + "hermes-debug.aar")
|
|
65
|
-
releaseImplementation files(hermesPath + "hermes-release.aar")
|
|
63
|
+
implementation("com.facebook.react:hermes-android")
|
|
66
64
|
} else {
|
|
67
65
|
implementation jscFlavor
|
|
68
66
|
}
|
|
@@ -90,8 +88,8 @@ ext.applyBuildTypes = { targetProject ->
|
|
|
90
88
|
ext.applyCommonAndroidConfig = { targetProject ->
|
|
91
89
|
targetProject.android {
|
|
92
90
|
compileOptions {
|
|
93
|
-
sourceCompatibility JavaVersion.
|
|
94
|
-
targetCompatibility JavaVersion.
|
|
91
|
+
sourceCompatibility JavaVersion.VERSION_11
|
|
92
|
+
targetCompatibility JavaVersion.VERSION_11
|
|
95
93
|
}
|
|
96
94
|
|
|
97
95
|
packagingOptions {
|
|
@@ -101,7 +99,7 @@ ext.applyCommonAndroidConfig = { targetProject ->
|
|
|
101
99
|
pickFirst "lib/x86_64/libc++_shared.so"
|
|
102
100
|
}
|
|
103
101
|
|
|
104
|
-
|
|
102
|
+
lint {
|
|
105
103
|
checkReleaseBuilds false
|
|
106
104
|
}
|
|
107
105
|
|
|
@@ -116,11 +114,6 @@ ext.applyCommonAndroidConfig = { targetProject ->
|
|
|
116
114
|
}
|
|
117
115
|
}
|
|
118
116
|
}
|
|
119
|
-
|
|
120
|
-
targetProject.tasks.create('copyDownloadableDepsToLibs', Copy) {
|
|
121
|
-
from targetProject.configurations.compile
|
|
122
|
-
into 'libs'
|
|
123
|
-
}
|
|
124
117
|
}
|
|
125
118
|
|
|
126
119
|
ext.applyCommonPlugins = { targetProject ->
|
|
@@ -137,9 +130,6 @@ ext.applyCommonPlugins = { targetProject ->
|
|
|
137
130
|
}
|
|
138
131
|
|
|
139
132
|
ext.applyAll = { targetProject ->
|
|
140
|
-
targetProject.ext.react = [enableHermes: true]
|
|
141
|
-
targetProject.apply from: targetProject.file("../../node_modules/react-native/react.gradle")
|
|
142
|
-
|
|
143
133
|
applyDefaultConfig(targetProject)
|
|
144
134
|
applyBuildTypes(targetProject)
|
|
145
135
|
applyCommonAndroidConfig(targetProject)
|
package/android/root.gradle
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
|
|
2
|
-
|
|
3
1
|
allprojects {
|
|
4
2
|
repositories {
|
|
5
3
|
maven { url 'https://raw.githubusercontent.com/Norcy/maven/master/repository/' }
|
|
@@ -15,20 +13,13 @@ allprojects {
|
|
|
15
13
|
mavenCentral()
|
|
16
14
|
google()
|
|
17
15
|
}
|
|
18
|
-
|
|
19
|
-
configurations.all {
|
|
20
|
-
resolutionStrategy {
|
|
21
|
-
force "com.facebook.react:react-native:" + '0.62.2.9.1'
|
|
22
|
-
force 'androidx.core:core-ktx:1.6.0'
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
|
|
16
|
+
|
|
26
17
|
afterEvaluate { project ->
|
|
27
18
|
if (project.hasProperty("android")) {
|
|
28
19
|
android {
|
|
29
20
|
compileOptions {
|
|
30
|
-
sourceCompatibility JavaVersion.
|
|
31
|
-
targetCompatibility JavaVersion.
|
|
21
|
+
sourceCompatibility JavaVersion.VERSION_11
|
|
22
|
+
targetCompatibility JavaVersion.VERSION_11
|
|
32
23
|
}
|
|
33
24
|
}
|
|
34
25
|
}
|
|
@@ -15,6 +15,12 @@ const CommonInfo = {
|
|
|
15
15
|
model: (0, _reactNativeDeviceInfo.getModel)(),
|
|
16
16
|
brand: (0, _reactNativeDeviceInfo.getBrand)()
|
|
17
17
|
};
|
|
18
|
+
const enable = () => {
|
|
19
|
+
if (!_reactNative.NativeModules.NCYReport) {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
return true;
|
|
23
|
+
};
|
|
18
24
|
const isValidReport = (eventId, params) => {
|
|
19
25
|
if (typeof eventId !== 'string' || eventId?.length === 0) {
|
|
20
26
|
console.error('Report 数据非法 1');
|
|
@@ -45,6 +51,9 @@ const convertToValidParams = params => {
|
|
|
45
51
|
};
|
|
46
52
|
const ReportUtil = exports.ReportUtil = {
|
|
47
53
|
init: () => {
|
|
54
|
+
if (!enable()) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
48
57
|
if (_Tool.Tool.isAgreed()) {
|
|
49
58
|
ReportUtil.doInit();
|
|
50
59
|
} else {
|
|
@@ -72,6 +81,9 @@ const ReportUtil = exports.ReportUtil = {
|
|
|
72
81
|
});
|
|
73
82
|
},
|
|
74
83
|
report: (eventId, params) => {
|
|
84
|
+
if (!enable()) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
75
87
|
if (!isValidReport(eventId, params)) {
|
|
76
88
|
return;
|
|
77
89
|
}
|
|
@@ -95,6 +107,9 @@ const ReportUtil = exports.ReportUtil = {
|
|
|
95
107
|
if (!__DEV__) {
|
|
96
108
|
console.log(page, 'viewWillAppear');
|
|
97
109
|
}
|
|
110
|
+
if (!enable()) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
98
113
|
if (!__DEV__) {
|
|
99
114
|
_reactNative.NativeModules.NCYReport.enterPage(page);
|
|
100
115
|
}
|
|
@@ -103,6 +118,9 @@ const ReportUtil = exports.ReportUtil = {
|
|
|
103
118
|
if (!__DEV__) {
|
|
104
119
|
console.log(page, 'viewWillDisappear');
|
|
105
120
|
}
|
|
121
|
+
if (!enable()) {
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
106
124
|
if (!__DEV__) {
|
|
107
125
|
_reactNative.NativeModules.NCYReport.leavePage(page);
|
|
108
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_Notification","_Tool","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__","
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_reactNativeDeviceInfo","_Notification","_Tool","CommonInfo","appVer","getReadableVersion","platform","Platform","OS","sysVer","Version","model","getModel","brand","getBrand","enable","NativeModules","NCYReport","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__","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
|
@@ -11,6 +11,12 @@ const CommonInfo = {
|
|
|
11
11
|
model: getModel(),
|
|
12
12
|
brand: getBrand()
|
|
13
13
|
};
|
|
14
|
+
const enable = () => {
|
|
15
|
+
if (!NativeModules.NCYReport) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
return true;
|
|
19
|
+
};
|
|
14
20
|
const isValidReport = (eventId, params) => {
|
|
15
21
|
if (typeof eventId !== 'string' || eventId?.length === 0) {
|
|
16
22
|
console.error('Report 数据非法 1');
|
|
@@ -41,6 +47,9 @@ const convertToValidParams = params => {
|
|
|
41
47
|
};
|
|
42
48
|
export const ReportUtil = {
|
|
43
49
|
init: () => {
|
|
50
|
+
if (!enable()) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
44
53
|
if (Tool.isAgreed()) {
|
|
45
54
|
ReportUtil.doInit();
|
|
46
55
|
} else {
|
|
@@ -68,6 +77,9 @@ export const ReportUtil = {
|
|
|
68
77
|
});
|
|
69
78
|
},
|
|
70
79
|
report: (eventId, params) => {
|
|
80
|
+
if (!enable()) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
71
83
|
if (!isValidReport(eventId, params)) {
|
|
72
84
|
return;
|
|
73
85
|
}
|
|
@@ -91,6 +103,9 @@ export const ReportUtil = {
|
|
|
91
103
|
if (!__DEV__) {
|
|
92
104
|
console.log(page, 'viewWillAppear');
|
|
93
105
|
}
|
|
106
|
+
if (!enable()) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
94
109
|
if (!__DEV__) {
|
|
95
110
|
NativeModules.NCYReport.enterPage(page);
|
|
96
111
|
}
|
|
@@ -99,6 +114,9 @@ export const ReportUtil = {
|
|
|
99
114
|
if (!__DEV__) {
|
|
100
115
|
console.log(page, 'viewWillDisappear');
|
|
101
116
|
}
|
|
117
|
+
if (!enable()) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
102
120
|
if (!__DEV__) {
|
|
103
121
|
NativeModules.NCYReport.leavePage(page);
|
|
104
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NativeModules","Platform","getBrand","getDeviceId","getModel","getReadableVersion","Notification","Tool","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__","
|
|
1
|
+
{"version":3,"names":["NativeModules","Platform","getBrand","getDeviceId","getModel","getReadableVersion","Notification","Tool","CommonInfo","appVer","platform","OS","sysVer","Version","model","brand","enable","NCYReport","isValidReport","eventId","params","length","console","error","Array","isArray","key","convertToValidParams","ret","value","JSON","stringify","ReportUtil","init","isAgreed","doInit","addListenerOnce","setCommonInfo","addListener","user","__DEV__","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":[]}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAmDD,eAAO,MAAM,UAAU;;;sBAmCH,MAAM,WAAW,cAAc;yBAiB5B,MAAM,SAAS,MAAM;;uBAQvB,MAAM;0BAcH,MAAM;CAa7B,CAAC"}
|
package/package.json
CHANGED
package/src/ReportUtil.ts
CHANGED
|
@@ -21,6 +21,13 @@ const CommonInfo: ReportItemType = {
|
|
|
21
21
|
brand: getBrand(),
|
|
22
22
|
};
|
|
23
23
|
|
|
24
|
+
const enable = () => {
|
|
25
|
+
if (!NativeModules.NCYReport) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
return true;
|
|
29
|
+
};
|
|
30
|
+
|
|
24
31
|
const isValidReport = (eventId: string, params?: ReportItemType) => {
|
|
25
32
|
if (typeof eventId !== 'string' || eventId?.length === 0) {
|
|
26
33
|
console.error('Report 数据非法 1');
|
|
@@ -57,6 +64,9 @@ const convertToValidParams = (params?: ReportItemType) => {
|
|
|
57
64
|
|
|
58
65
|
export const ReportUtil = {
|
|
59
66
|
init: () => {
|
|
67
|
+
if (!enable()) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
60
70
|
if (Tool.isAgreed()) {
|
|
61
71
|
ReportUtil.doInit();
|
|
62
72
|
} else {
|
|
@@ -88,6 +98,10 @@ export const ReportUtil = {
|
|
|
88
98
|
},
|
|
89
99
|
|
|
90
100
|
report: (eventId: string, params?: ReportItemType) => {
|
|
101
|
+
if (!enable()) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
|
|
91
105
|
if (!isValidReport(eventId, params)) {
|
|
92
106
|
return;
|
|
93
107
|
}
|
|
@@ -113,6 +127,10 @@ export const ReportUtil = {
|
|
|
113
127
|
console.log(page, 'viewWillAppear');
|
|
114
128
|
}
|
|
115
129
|
|
|
130
|
+
if (!enable()) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
|
|
116
134
|
if (!__DEV__) {
|
|
117
135
|
NativeModules.NCYReport.enterPage(page);
|
|
118
136
|
}
|
|
@@ -123,6 +141,10 @@ export const ReportUtil = {
|
|
|
123
141
|
console.log(page, 'viewWillDisappear');
|
|
124
142
|
}
|
|
125
143
|
|
|
144
|
+
if (!enable()) {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
|
|
126
148
|
if (!__DEV__) {
|
|
127
149
|
NativeModules.NCYReport.leavePage(page);
|
|
128
150
|
}
|