@mpxjs/api-proxy 2.9.71 → 2.10.0-beta.1
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/@types/index.d.ts +1 -0
- package/package.json +3 -8
- package/src/common/js/promisify.js +21 -8
- package/src/common/js/utils.js +9 -1
- package/src/platform/api/action-sheet/rnActionSheet.jsx +151 -93
- package/src/platform/api/create-intersection-observer/rnIntersectionObserver.js +21 -16
- package/src/platform/api/modal/rnModal.jsx +27 -6
- package/src/platform/api/route/index.ios.js +69 -12
- package/src/platform/api/route/index.js +4 -1
- package/src/platform/api/route/index.web.js +5 -2
- package/src/platform/api/system/rnSystem.js +1 -0
- package/src/platform/api/toast/rnToast.jsx +37 -25
- package/LICENSE +0 -433
package/@types/index.d.ts
CHANGED
|
@@ -98,6 +98,7 @@ export const clearStorage: WechatMiniprogram.Wx['clearStorage']
|
|
|
98
98
|
export const clearStorageSync: WechatMiniprogram.Wx['clearStorageSync']
|
|
99
99
|
export const getSystemInfo: WechatMiniprogram.Wx['getSystemInfo']
|
|
100
100
|
export const getSystemInfoSync: WechatMiniprogram.Wx['getSystemInfoSync']
|
|
101
|
+
export const getWindowInfo: WechatMiniprogram.Wx['getWindowInfo']
|
|
101
102
|
export const setTabBarItem: WechatMiniprogram.Wx['setTabBarItem']
|
|
102
103
|
export const setTabBarStyle: WechatMiniprogram.Wx['setTabBarStyle']
|
|
103
104
|
export const showTabBar: WechatMiniprogram.Wx['showTabBar']
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mpxjs/api-proxy",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.10.0-beta.1",
|
|
4
4
|
"description": "convert miniprogram API at each end",
|
|
5
5
|
"module": "src/index.js",
|
|
6
6
|
"types": "@types/index.d.ts",
|
|
@@ -37,11 +37,10 @@
|
|
|
37
37
|
},
|
|
38
38
|
"homepage": "https://github.com/didi/mpx#readme",
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@mpxjs/utils": "^2.
|
|
40
|
+
"@mpxjs/utils": "^2.10.0",
|
|
41
41
|
"axios": "^1.7.3"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
|
-
"@ant-design/react-native": "^5.1.3",
|
|
45
44
|
"@react-native-async-storage/async-storage": "^1.23.1",
|
|
46
45
|
"@react-native-community/netinfo": "^11.2.1",
|
|
47
46
|
"react-native-device-info": "^10.13.2",
|
|
@@ -65,12 +64,8 @@
|
|
|
65
64
|
"react-native-get-location": {
|
|
66
65
|
"optional": true
|
|
67
66
|
},
|
|
68
|
-
"@ant-design/react-native": {
|
|
69
|
-
"optional": true
|
|
70
|
-
},
|
|
71
67
|
"react-native-haptic-feedback": {
|
|
72
68
|
"optional": true
|
|
73
69
|
}
|
|
74
|
-
}
|
|
75
|
-
"gitHead": "38446f301a17e78dbe3ca7dacd771c79eb7a8ede"
|
|
70
|
+
}
|
|
76
71
|
}
|
|
@@ -14,24 +14,37 @@ const blackList = [
|
|
|
14
14
|
'stopBackgroundAudio',
|
|
15
15
|
'showNavigationBarLoading',
|
|
16
16
|
'hideNavigationBarLoading',
|
|
17
|
-
'createAnimation',
|
|
18
|
-
'createAnimationVideo',
|
|
19
|
-
'createSelectorQuery',
|
|
20
|
-
'createIntersectionObserver',
|
|
21
17
|
'getPerformance',
|
|
22
18
|
'hideKeyboard',
|
|
23
19
|
'stopPullDownRefresh',
|
|
24
|
-
'createWorker',
|
|
25
20
|
'pageScrollTo',
|
|
26
21
|
'reportAnalytics',
|
|
27
22
|
'getMenuButtonBoundingClientRect',
|
|
28
23
|
'reportMonitor',
|
|
29
|
-
'createOffscreenCanvas',
|
|
30
24
|
'reportEvent',
|
|
31
25
|
'connectSocket',
|
|
32
26
|
'base64ToArrayBuffer',
|
|
27
|
+
'arrayBufferToBase64',
|
|
33
28
|
'getDeviceInfo',
|
|
34
|
-
'getWindowInfo'
|
|
29
|
+
'getWindowInfo',
|
|
30
|
+
'getAppBaseInfo',
|
|
31
|
+
'getAppAuthorizeSetting',
|
|
32
|
+
'getApiCategory',
|
|
33
|
+
'postMessageToReferrerPage',
|
|
34
|
+
'postMessageToReferrerMiniProgram',
|
|
35
|
+
'reportPerformance',
|
|
36
|
+
'getPerformance',
|
|
37
|
+
'preDownloadSubpackage',
|
|
38
|
+
'router',
|
|
39
|
+
'nextTick',
|
|
40
|
+
'checkIsPictureInPictureActive',
|
|
41
|
+
'worklet',
|
|
42
|
+
'revokeBufferURL',
|
|
43
|
+
'reportEvent',
|
|
44
|
+
'getExptInfoSync',
|
|
45
|
+
'reserveChannelsLive',
|
|
46
|
+
'getNFCAdapter',
|
|
47
|
+
'isVKSupport'
|
|
35
48
|
]
|
|
36
49
|
|
|
37
50
|
function getMapFromList (list) {
|
|
@@ -55,7 +68,7 @@ function promisify (listObj, whiteList, customBlackList) {
|
|
|
55
68
|
} else {
|
|
56
69
|
return !(blackListMap[key] || // 特别指定的方法
|
|
57
70
|
/^get\w*Manager$/.test(key) || // 获取manager的api
|
|
58
|
-
/^create\w
|
|
71
|
+
/^create(?!BLEConnection|BLEPeripheralServer)\w*$/.test(key) || // 创建上下文相关api
|
|
59
72
|
/^(on|off)/.test(key) || // 以 on* 或 off开头的方法
|
|
60
73
|
/\w+Sync$/.test(key) // 以Sync结尾的方法
|
|
61
74
|
)
|
package/src/common/js/utils.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { hasOwn, noop, getEnvObj, getFocusedNavigation } from '@mpxjs/utils'
|
|
2
|
+
import { getCurrentInstance } from '@mpxjs/core'
|
|
2
3
|
|
|
3
4
|
/**
|
|
4
5
|
*
|
|
@@ -87,6 +88,12 @@ function failHandle (result, fail, complete) {
|
|
|
87
88
|
typeof complete === 'function' && complete(result)
|
|
88
89
|
}
|
|
89
90
|
|
|
91
|
+
function getCurrentPageId () {
|
|
92
|
+
const currentInstance = getCurrentInstance()
|
|
93
|
+
const id = currentInstance?.getPageId() || getFocusedNavigation()?.pageId || null
|
|
94
|
+
return id
|
|
95
|
+
}
|
|
96
|
+
|
|
90
97
|
const ENV_OBJ = getEnvObj()
|
|
91
98
|
|
|
92
99
|
export {
|
|
@@ -101,5 +108,6 @@ export {
|
|
|
101
108
|
defineUnsupportedProps,
|
|
102
109
|
successHandle,
|
|
103
110
|
failHandle,
|
|
104
|
-
getFocusedNavigation
|
|
111
|
+
getFocusedNavigation,
|
|
112
|
+
getCurrentPageId
|
|
105
113
|
}
|
|
@@ -1,111 +1,169 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { useEffect } from 'react'
|
|
2
|
+
import { View, Text, StyleSheet } from 'react-native'
|
|
3
|
+
import { successHandle, failHandle, getCurrentPageId } from '../../../common/js'
|
|
4
|
+
import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index'
|
|
4
5
|
import { getWindowInfo } from '../system/rnSystem'
|
|
5
6
|
import Animated, {
|
|
6
7
|
useSharedValue,
|
|
7
8
|
useAnimatedStyle,
|
|
8
|
-
withTiming
|
|
9
|
+
withTiming,
|
|
10
|
+
Easing,
|
|
11
|
+
runOnJS
|
|
9
12
|
} from 'react-native-reanimated'
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
top: 0,
|
|
19
|
-
bottom: 0,
|
|
20
|
-
right: 0,
|
|
21
|
-
backgroundColor: 'rgba(0,0,0,0.6)',
|
|
22
|
-
position: 'absolute',
|
|
23
|
-
zIndex: 1000
|
|
24
|
-
},
|
|
25
|
-
actionSheetContent: {
|
|
26
|
-
backgroundColor: '#ffffff',
|
|
27
|
-
borderTopLeftRadius: 10,
|
|
28
|
-
borderTopRightRadius: 10,
|
|
29
|
-
position: 'absolute',
|
|
30
|
-
bottom: 0,
|
|
31
|
-
left: 0,
|
|
32
|
-
right: 0,
|
|
33
|
-
paddingBottom: bottom
|
|
34
|
-
},
|
|
35
|
-
itemStyle: {
|
|
36
|
-
paddingTop: 15,
|
|
37
|
-
paddingBottom: 15,
|
|
38
|
-
justifyContent: 'center',
|
|
39
|
-
alignItems: 'center',
|
|
40
|
-
borderBottomWidth: 1,
|
|
41
|
-
borderBottomStyle: 'solid',
|
|
42
|
-
borderBottomColor: 'rgba(0,0,0,0.1)'
|
|
43
|
-
},
|
|
44
|
-
itemTextStyle: {
|
|
45
|
-
fontSize: 18
|
|
46
|
-
},
|
|
47
|
-
buttonStyle: {
|
|
48
|
-
fontSize: 18,
|
|
49
|
-
paddingTop: 10,
|
|
50
|
-
paddingBottom: 10
|
|
51
|
-
}
|
|
52
|
-
})
|
|
53
|
-
function ActionSheet () {
|
|
54
|
-
const offset = useSharedValue(1000);
|
|
13
|
+
const actionSheetMap = new Map()
|
|
14
|
+
|
|
15
|
+
const remove = function (id) {
|
|
16
|
+
if (actionSheetMap.get(id)) { // 页面维度判断是否要清除之前渲染的actionsheet
|
|
17
|
+
Portal.remove(actionSheetMap.get(id))
|
|
18
|
+
actionSheetMap.delete(id)
|
|
19
|
+
}
|
|
20
|
+
}
|
|
55
21
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
}))
|
|
22
|
+
const windowInfo = getWindowInfo()
|
|
23
|
+
const bottom = windowInfo.screenHeight - windowInfo.safeArea.bottom
|
|
59
24
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
25
|
+
const styles = StyleSheet.create({
|
|
26
|
+
actionAction: {
|
|
27
|
+
left: 0,
|
|
28
|
+
top: 0,
|
|
29
|
+
bottom: 0,
|
|
30
|
+
right: 0,
|
|
31
|
+
position: 'absolute',
|
|
32
|
+
zIndex: 1000
|
|
33
|
+
},
|
|
34
|
+
maskWrap: {
|
|
35
|
+
left: 0,
|
|
36
|
+
top: 0,
|
|
37
|
+
bottom: 0,
|
|
38
|
+
right: 0,
|
|
39
|
+
position: 'absolute'
|
|
40
|
+
},
|
|
41
|
+
actionActionMask: {
|
|
42
|
+
left: 0,
|
|
43
|
+
top: 0,
|
|
44
|
+
bottom: 0,
|
|
45
|
+
right: 0,
|
|
46
|
+
backgroundColor: 'rgba(0,0,0,0.6)',
|
|
47
|
+
position: 'absolute'
|
|
48
|
+
},
|
|
49
|
+
actionSheetContent: {
|
|
50
|
+
backgroundColor: '#ffffff',
|
|
51
|
+
borderTopLeftRadius: 10,
|
|
52
|
+
borderTopRightRadius: 10,
|
|
53
|
+
position: 'absolute',
|
|
54
|
+
bottom: 0,
|
|
55
|
+
left: 0,
|
|
56
|
+
right: 0,
|
|
57
|
+
paddingBottom: bottom
|
|
58
|
+
},
|
|
59
|
+
itemStyle: {
|
|
60
|
+
paddingTop: 15,
|
|
61
|
+
paddingBottom: 15,
|
|
62
|
+
justifyContent: 'center',
|
|
63
|
+
alignItems: 'center',
|
|
64
|
+
borderBottomWidth: 1,
|
|
65
|
+
borderBottomStyle: 'solid',
|
|
66
|
+
borderBottomColor: 'rgba(0,0,0,0.1)'
|
|
67
|
+
},
|
|
68
|
+
itemTextStyle: {
|
|
69
|
+
fontSize: 18,
|
|
70
|
+
height: 22,
|
|
71
|
+
lineHeight: 22
|
|
72
|
+
},
|
|
73
|
+
buttonStyle: {
|
|
74
|
+
paddingTop: 10,
|
|
75
|
+
paddingBottom: 10,
|
|
76
|
+
justifyContent: 'center',
|
|
77
|
+
alignItems: 'center'
|
|
78
|
+
}
|
|
79
|
+
})
|
|
64
80
|
|
|
65
|
-
|
|
81
|
+
function ActionSheet ({itemColor, height, success, fail, complete, alertText, itemList}) {
|
|
82
|
+
const slide = useSharedValue(height)
|
|
83
|
+
const fade = useSharedValue(0)
|
|
66
84
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
tapIndex: index
|
|
71
|
-
}
|
|
72
|
-
successHandle(result, success, complete)
|
|
73
|
-
remove()
|
|
85
|
+
const actionAnimatedStyles = useAnimatedStyle(() => {
|
|
86
|
+
return {
|
|
87
|
+
transform: [{ translateY: slide.value }]
|
|
74
88
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
setTimeout(() => {
|
|
80
|
-
Portal.remove(actionSheetKey)
|
|
81
|
-
actionSheetKey = null
|
|
82
|
-
}, 200)
|
|
83
|
-
}
|
|
89
|
+
})
|
|
90
|
+
const maskAnimatedStyles = useAnimatedStyle(() => {
|
|
91
|
+
return {
|
|
92
|
+
opacity: fade.value
|
|
84
93
|
}
|
|
94
|
+
})
|
|
85
95
|
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
96
|
+
useEffect(() => {
|
|
97
|
+
fade.value = withTiming(1, {
|
|
98
|
+
easing: Easing.inOut(Easing.poly(3)),
|
|
99
|
+
duration: 250
|
|
100
|
+
})
|
|
101
|
+
slide.value = withTiming(0, {
|
|
102
|
+
easing: Easing.out(Easing.poly(3)),
|
|
103
|
+
duration: 250
|
|
104
|
+
})
|
|
105
|
+
}, [])
|
|
106
|
+
|
|
107
|
+
const removeActionSheet = function () {
|
|
108
|
+
const id = getCurrentPageId()
|
|
109
|
+
remove(id)
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
const selectAction = function (index) {
|
|
113
|
+
removeActionSheet()
|
|
114
|
+
const result = {
|
|
115
|
+
errMsg: 'showActionSheet:ok',
|
|
116
|
+
tapIndex: index
|
|
117
|
+
}
|
|
118
|
+
successHandle(result, success, complete)
|
|
119
|
+
}
|
|
120
|
+
const cancelAction = function () {
|
|
121
|
+
removeActionSheet()
|
|
122
|
+
const result = {
|
|
123
|
+
errMsg: 'showActionSheet:fail cancel'
|
|
124
|
+
}
|
|
125
|
+
failHandle(result, fail, complete)
|
|
126
|
+
}
|
|
127
|
+
return (
|
|
128
|
+
<View style={styles.actionAction}>
|
|
129
|
+
<Animated.View style={[styles.maskWrap, maskAnimatedStyles]}>
|
|
130
|
+
<View activeOpacity={1} style={styles.actionActionMask} onTouchEnd={cancelAction}></View>
|
|
131
|
+
</Animated.View>
|
|
132
|
+
<Animated.View style={[styles.actionSheetContent, actionAnimatedStyles]}>
|
|
133
|
+
{ alertText ? <View style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{alertText}</Text></View> : null }
|
|
134
|
+
{ itemList.map((item, index) => <View onTouchEnd={() => selectAction(index)} key={index} style={ [styles.itemStyle, itemList.length -1 === index ? {
|
|
135
|
+
borderBottomWidth: 6,
|
|
136
|
+
borderBottomStyle: 'solid',
|
|
137
|
+
borderBottomColor: '#f7f7f7'
|
|
138
|
+
} : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></View>) }
|
|
139
|
+
<View style={styles.buttonStyle} onTouchEnd={cancelAction}><Text style={{ color: "#000000", fontSize: 18, lineHeight: 22, height: 22, width: "100%", textAlign: "center" }}>取消</Text></View>
|
|
140
|
+
</Animated.View>
|
|
141
|
+
</View>
|
|
142
|
+
)
|
|
143
|
+
}
|
|
144
|
+
function showActionSheet (options = {}) {
|
|
145
|
+
const id = getCurrentPageId()
|
|
146
|
+
remove(id)
|
|
147
|
+
const { alertText, itemList = [], itemColor = '#000000', success, fail, complete } = options
|
|
148
|
+
if (id === null) {
|
|
149
|
+
const result = {
|
|
150
|
+
errMsg: 'showActionSheet:fail cannot be invoked outside the mpx life cycle in React Native environments'
|
|
151
|
+
}
|
|
152
|
+
failHandle(result, fail, complete)
|
|
153
|
+
return
|
|
154
|
+
}
|
|
155
|
+
const len = itemList.length
|
|
156
|
+
if (len > 6) {
|
|
157
|
+
const result = {
|
|
158
|
+
errMsg: 'showActionSheet:fail parameter error: itemList should not be large than 6'
|
|
92
159
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
<Animated.View style={[styles.actionSheetContent, animatedStyles]} >
|
|
96
|
-
{ alertText ? <View style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{alertText}</Text></View> : null }
|
|
97
|
-
{ itemList.map((item, index) => <TouchableHighlight key={index} underlayColor="#ececec" onPress={() => selectAction(index)} style={ [styles.itemStyle, itemList.length -1 === index ? {
|
|
98
|
-
borderBottomWidth: 6,
|
|
99
|
-
borderBottomStyle: 'solid',
|
|
100
|
-
borderBottomColor: '#f7f7f7'
|
|
101
|
-
} : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></TouchableHighlight>) }
|
|
102
|
-
<View style={styles.buttonStyle}><TouchableOpacity onPress={cancelAction}><Text style={{ color: "#000000", width: "100%", textAlign: "center" }}>取消</Text></TouchableOpacity></View>
|
|
103
|
-
</Animated.View>
|
|
104
|
-
</TouchableHighlight>
|
|
105
|
-
)
|
|
160
|
+
failHandle(result, fail, complete)
|
|
161
|
+
return
|
|
106
162
|
}
|
|
163
|
+
const height = len * 53 + 46 + bottom + (alertText ? 52 : 0)
|
|
107
164
|
|
|
108
|
-
actionSheetKey = Portal.add(<ActionSheet
|
|
165
|
+
const actionSheetKey = Portal.add(<ActionSheet itemColor={itemColor} height={height} success={success} fail={fail} complete={complete} alertText={alertText} itemList={itemList} />, id)
|
|
166
|
+
actionSheetMap.set(id, actionSheetKey)
|
|
109
167
|
}
|
|
110
168
|
|
|
111
169
|
export {
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { isArray, isObject, isString, noop } from '@mpxjs/utils'
|
|
1
|
+
import { isArray, isObject, isString, noop, warn } from '@mpxjs/utils'
|
|
2
2
|
import throttle from 'lodash/throttle'
|
|
3
3
|
import { Dimensions } from 'react-native'
|
|
4
4
|
import { getFocusedNavigation } from '../../../common/js'
|
|
5
|
-
|
|
6
5
|
const WindowRefStr = 'window'
|
|
7
6
|
const IgnoreTarget = 'ignore'
|
|
8
7
|
const DefaultMargin = { top: 0, bottom: 0, left: 0, right: 0 }
|
|
@@ -12,13 +11,19 @@ class RNIntersectionObserver {
|
|
|
12
11
|
constructor (component, options, intersectionCtx) {
|
|
13
12
|
this.id = idCount++
|
|
14
13
|
this.component = component
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
this.mpxFileResource = component.__mpxProxy?.options?.mpxFileResource || ''
|
|
15
|
+
this.options = Object.assign({
|
|
16
|
+
thresholds: [0],
|
|
17
|
+
initialRatio: 0,
|
|
18
|
+
observeAll: false,
|
|
19
|
+
throttleTime: 100
|
|
20
|
+
}, options || {})
|
|
21
|
+
this.thresholds = this.options.thresholds.sort((a, b) => a - b)
|
|
22
|
+
this.initialRatio = this.options.initialRatio
|
|
23
|
+
this.observeAll = this.options.observeAll
|
|
19
24
|
|
|
20
25
|
// 组件上挂载对应的observers,用于在组件销毁的时候进行批量disconnect
|
|
21
|
-
this.component._intersectionObservers = this.component.
|
|
26
|
+
this.component._intersectionObservers = this.component._intersectionObservers || []
|
|
22
27
|
this.component._intersectionObservers.push(this)
|
|
23
28
|
|
|
24
29
|
this.observerRefs = null
|
|
@@ -26,7 +31,7 @@ class RNIntersectionObserver {
|
|
|
26
31
|
this.margins = DefaultMargin
|
|
27
32
|
this.callback = noop
|
|
28
33
|
|
|
29
|
-
this.throttleMeasure = this.getThrottleMeasure(options.throttleTime
|
|
34
|
+
this.throttleMeasure = this.getThrottleMeasure(this.options.throttleTime)
|
|
30
35
|
|
|
31
36
|
// 记录上一次相交的比例
|
|
32
37
|
this.previousIntersectionRatio = []
|
|
@@ -52,7 +57,7 @@ class RNIntersectionObserver {
|
|
|
52
57
|
this.relativeRef = relativeRef
|
|
53
58
|
this.margins = Object.assign({}, DefaultMargin, margins)
|
|
54
59
|
} else {
|
|
55
|
-
|
|
60
|
+
warn(`node ${selector}is not found. The relative node for intersection observer will be ignored`, this.mpxFileResource)
|
|
56
61
|
}
|
|
57
62
|
return this
|
|
58
63
|
}
|
|
@@ -65,7 +70,7 @@ class RNIntersectionObserver {
|
|
|
65
70
|
|
|
66
71
|
observe (selector, callback) {
|
|
67
72
|
if (this.observerRefs) {
|
|
68
|
-
|
|
73
|
+
warn('"observe" call can be only called once in IntersectionObserver', this.mpxFileResource)
|
|
69
74
|
return
|
|
70
75
|
}
|
|
71
76
|
let targetRef = null
|
|
@@ -75,7 +80,7 @@ class RNIntersectionObserver {
|
|
|
75
80
|
targetRef = this.component.__selectRef(selector, 'node')
|
|
76
81
|
}
|
|
77
82
|
if (!targetRef || targetRef.length === 0) {
|
|
78
|
-
|
|
83
|
+
warn('intersection observer target not found', this.mpxFileResource)
|
|
79
84
|
return
|
|
80
85
|
}
|
|
81
86
|
this.observerRefs = isArray(targetRef) ? targetRef : [targetRef]
|
|
@@ -95,10 +100,10 @@ class RNIntersectionObserver {
|
|
|
95
100
|
}
|
|
96
101
|
|
|
97
102
|
const windowRect = {
|
|
98
|
-
top: navigationLayout.y
|
|
99
|
-
left: this.margins.left,
|
|
100
|
-
right: navigationLayout.width
|
|
101
|
-
bottom: navigationLayout.y + navigationLayout.height
|
|
103
|
+
top: navigationLayout.y - this.margins.top,
|
|
104
|
+
left: 0 - this.margins.left,
|
|
105
|
+
right: navigationLayout.width + this.margins.right,
|
|
106
|
+
bottom: navigationLayout.y + navigationLayout.height + this.margins.bottom
|
|
102
107
|
}
|
|
103
108
|
|
|
104
109
|
this.windowRect = windowRect
|
|
@@ -227,7 +232,7 @@ class RNIntersectionObserver {
|
|
|
227
232
|
}
|
|
228
233
|
})
|
|
229
234
|
}).catch((e) => {
|
|
230
|
-
|
|
235
|
+
warn('_measureTarget fail', this.mpxFileResource, e)
|
|
231
236
|
})
|
|
232
237
|
}
|
|
233
238
|
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { View, Dimensions, Text, StyleSheet, TouchableOpacity, ScrollView, TextInput } from 'react-native'
|
|
2
|
-
import { successHandle, failHandle } from '../../../common/js'
|
|
3
|
-
import
|
|
2
|
+
import { successHandle, failHandle, getCurrentPageId } from '../../../common/js'
|
|
3
|
+
import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index'
|
|
4
4
|
const { width, height } = Dimensions.get('window')
|
|
5
|
+
const modalMap = new Map()
|
|
5
6
|
const showModal = function (options = {}) {
|
|
7
|
+
const id = getCurrentPageId()
|
|
6
8
|
const {
|
|
7
9
|
title,
|
|
8
10
|
content,
|
|
@@ -17,6 +19,23 @@ const showModal = function (options = {}) {
|
|
|
17
19
|
fail,
|
|
18
20
|
complete
|
|
19
21
|
} = options
|
|
22
|
+
if (id === null) {
|
|
23
|
+
const result = {
|
|
24
|
+
errMsg: 'showModal:fail cannot be invoked outside the mpx life cycle in React Native environments'
|
|
25
|
+
}
|
|
26
|
+
failHandle(result, fail, complete)
|
|
27
|
+
return
|
|
28
|
+
}
|
|
29
|
+
const setCurrentModalKey = function (modalKey) {
|
|
30
|
+
const currentArr = modalMap.get(id) || []
|
|
31
|
+
currentArr.push(modalKey)
|
|
32
|
+
modalMap.set(id, currentArr)
|
|
33
|
+
}
|
|
34
|
+
const getCurrentModalKey = function () {
|
|
35
|
+
const currentArr = modalMap.get(id) || []
|
|
36
|
+
return currentArr.pop()
|
|
37
|
+
}
|
|
38
|
+
|
|
20
39
|
const modalWidth = width * 0.8
|
|
21
40
|
const styles = StyleSheet.create({
|
|
22
41
|
modalTask: {
|
|
@@ -82,7 +101,6 @@ const showModal = function (options = {}) {
|
|
|
82
101
|
borderStyle: 'solid',
|
|
83
102
|
}
|
|
84
103
|
})
|
|
85
|
-
let modalKey
|
|
86
104
|
let ModalView
|
|
87
105
|
let modalTitle = []
|
|
88
106
|
let modalContent = []
|
|
@@ -97,8 +115,10 @@ const showModal = function (options = {}) {
|
|
|
97
115
|
contentText = text
|
|
98
116
|
}
|
|
99
117
|
const closeModal = function (buttonInfo) {
|
|
100
|
-
|
|
101
|
-
modalKey
|
|
118
|
+
const modalKey = getCurrentModalKey()
|
|
119
|
+
if(modalKey) {
|
|
120
|
+
Portal.remove(modalKey)
|
|
121
|
+
}
|
|
102
122
|
const result = {
|
|
103
123
|
errMsg: 'showModal:ok'
|
|
104
124
|
}
|
|
@@ -156,7 +176,8 @@ const showModal = function (options = {}) {
|
|
|
156
176
|
</View>
|
|
157
177
|
</View>
|
|
158
178
|
try {
|
|
159
|
-
modalKey = Portal.add(ModalView)
|
|
179
|
+
const modalKey = Portal.add(ModalView, id)
|
|
180
|
+
setCurrentModalKey(modalKey)
|
|
160
181
|
} catch (e) {
|
|
161
182
|
const result = {
|
|
162
183
|
errMsg: `showModal:fail invalid ${e}`
|
|
@@ -33,10 +33,29 @@ function resolvePath (relative, base) {
|
|
|
33
33
|
}
|
|
34
34
|
return stack.join('/')
|
|
35
35
|
}
|
|
36
|
+
let timerId = null
|
|
37
|
+
function isLock (navigationHelper, type, options) {
|
|
38
|
+
if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
|
|
39
|
+
const res = { errMsg: `${type}:fail the previous routing event didn't complete` }
|
|
40
|
+
failHandle(res, options.fail, options.complete)
|
|
41
|
+
return true
|
|
42
|
+
}
|
|
43
|
+
clearTimeout(timerId)
|
|
44
|
+
timerId = setTimeout(() => {
|
|
45
|
+
if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
|
|
46
|
+
navigationHelper.lastFailCallback('timeout')
|
|
47
|
+
navigationHelper.lastFailCallback = null
|
|
48
|
+
}
|
|
49
|
+
}, 350)
|
|
50
|
+
return false
|
|
51
|
+
}
|
|
36
52
|
|
|
37
53
|
function navigateTo (options = {}) {
|
|
38
|
-
const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
|
|
39
54
|
const navigationHelper = global.__navigationHelper
|
|
55
|
+
if (isLock(navigationHelper, 'navigateTo', options)) {
|
|
56
|
+
return
|
|
57
|
+
}
|
|
58
|
+
const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
|
|
40
59
|
if (navigation && navigationHelper) {
|
|
41
60
|
const { path, queryObj } = parseUrl(options.url)
|
|
42
61
|
const basePath = getBasePath(navigation)
|
|
@@ -56,6 +75,9 @@ function navigateTo (options = {}) {
|
|
|
56
75
|
function redirectTo (options = {}) {
|
|
57
76
|
const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
|
|
58
77
|
const navigationHelper = global.__navigationHelper
|
|
78
|
+
if (isLock(navigationHelper, 'redirectTo', options)) {
|
|
79
|
+
return
|
|
80
|
+
}
|
|
59
81
|
if (navigation && navigationHelper) {
|
|
60
82
|
const { path, queryObj } = parseUrl(options.url)
|
|
61
83
|
const basePath = getBasePath(navigation)
|
|
@@ -75,24 +97,27 @@ function redirectTo (options = {}) {
|
|
|
75
97
|
function navigateBack (options = {}) {
|
|
76
98
|
const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
|
|
77
99
|
const navigationHelper = global.__navigationHelper
|
|
100
|
+
if (isLock(navigationHelper, 'navigateBack', options)) {
|
|
101
|
+
return
|
|
102
|
+
}
|
|
78
103
|
if (navigation && navigationHelper) {
|
|
79
104
|
const delta = options.delta || 1
|
|
80
105
|
const routeLength = navigation.getState().routes.length
|
|
106
|
+
navigationHelper.lastSuccessCallback = () => {
|
|
107
|
+
const res = { errMsg: 'navigateBack:ok' }
|
|
108
|
+
successHandle(res, options.success, options.complete)
|
|
109
|
+
}
|
|
110
|
+
navigationHelper.lastFailCallback = (msg) => {
|
|
111
|
+
const res = { errMsg: `navigateBack:fail ${msg}` }
|
|
112
|
+
failHandle(res, options.fail, options.complete)
|
|
113
|
+
}
|
|
81
114
|
if (delta >= routeLength && global.__mpx?.config.rnConfig.onAppBack?.(delta - routeLength + 1)) {
|
|
82
115
|
nextTick(() => {
|
|
83
|
-
|
|
84
|
-
|
|
116
|
+
navigationHelper.lastSuccessCallback()
|
|
117
|
+
navigationHelper.lastSuccessCallback = null
|
|
85
118
|
})
|
|
86
119
|
} else {
|
|
87
120
|
navigation.pop(delta)
|
|
88
|
-
navigationHelper.lastSuccessCallback = () => {
|
|
89
|
-
const res = { errMsg: 'navigateBack:ok' }
|
|
90
|
-
successHandle(res, options.success, options.complete)
|
|
91
|
-
}
|
|
92
|
-
navigationHelper.lastFailCallback = (msg) => {
|
|
93
|
-
const res = { errMsg: `navigateBack:fail ${msg}` }
|
|
94
|
-
failHandle(res, options.fail, options.complete)
|
|
95
|
-
}
|
|
96
121
|
}
|
|
97
122
|
}
|
|
98
123
|
}
|
|
@@ -100,6 +125,9 @@ function navigateBack (options = {}) {
|
|
|
100
125
|
function reLaunch (options = {}) {
|
|
101
126
|
const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
|
|
102
127
|
const navigationHelper = global.__navigationHelper
|
|
128
|
+
if (isLock(navigationHelper, 'reLaunch', options)) {
|
|
129
|
+
return
|
|
130
|
+
}
|
|
103
131
|
if (navigation && navigationHelper) {
|
|
104
132
|
const { path, queryObj } = parseUrl(options.url)
|
|
105
133
|
const basePath = getBasePath(navigation)
|
|
@@ -128,10 +156,39 @@ function switchTab () {
|
|
|
128
156
|
|
|
129
157
|
}
|
|
130
158
|
|
|
159
|
+
function reset (options = {}) {
|
|
160
|
+
const routes = options.routes || []
|
|
161
|
+
if (!routes.length) {
|
|
162
|
+
const res = { errMsg: 'reset:fail routes cannot be an empty array' }
|
|
163
|
+
failHandle(res, options.fail, options.complete)
|
|
164
|
+
return
|
|
165
|
+
}
|
|
166
|
+
const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
|
|
167
|
+
const navigationHelper = global.__navigationHelper
|
|
168
|
+
if (isLock(navigationHelper, 'reset', options)) {
|
|
169
|
+
return
|
|
170
|
+
}
|
|
171
|
+
if (navigation && navigationHelper) {
|
|
172
|
+
navigation.reset({
|
|
173
|
+
index: routes.length - 1,
|
|
174
|
+
routes
|
|
175
|
+
})
|
|
176
|
+
navigationHelper.lastSuccessCallback = () => {
|
|
177
|
+
const res = { errMsg: 'reset:ok' }
|
|
178
|
+
successHandle(res, options.success, options.complete)
|
|
179
|
+
}
|
|
180
|
+
navigationHelper.lastFailCallback = (msg) => {
|
|
181
|
+
const res = { errMsg: `reset:fail ${msg}` }
|
|
182
|
+
failHandle(res, options.fail, options.complete)
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
131
187
|
export {
|
|
132
188
|
redirectTo,
|
|
133
189
|
navigateTo,
|
|
134
190
|
navigateBack,
|
|
135
191
|
reLaunch,
|
|
136
|
-
switchTab
|
|
192
|
+
switchTab,
|
|
193
|
+
reset
|
|
137
194
|
}
|
|
@@ -10,10 +10,13 @@ const reLaunch = ENV_OBJ.reLaunch || envError('reLaunch')
|
|
|
10
10
|
|
|
11
11
|
const switchTab = ENV_OBJ.switchTab || envError('switchTab')
|
|
12
12
|
|
|
13
|
+
const reset = envError('reset')
|
|
14
|
+
|
|
13
15
|
export {
|
|
14
16
|
redirectTo,
|
|
15
17
|
navigateTo,
|
|
16
18
|
navigateBack,
|
|
17
19
|
reLaunch,
|
|
18
|
-
switchTab
|
|
20
|
+
switchTab,
|
|
21
|
+
reset
|
|
19
22
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser } from '../../../common/js'
|
|
1
|
+
import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser, envError } from '../../../common/js'
|
|
2
2
|
import { EventChannel } from '../event-channel'
|
|
3
3
|
|
|
4
4
|
let routeCount = 0
|
|
@@ -183,10 +183,13 @@ function switchTab (options = {}) {
|
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
185
|
|
|
186
|
+
const reset = envError('reset')
|
|
187
|
+
|
|
186
188
|
export {
|
|
187
189
|
redirectTo,
|
|
188
190
|
navigateTo,
|
|
189
191
|
navigateBack,
|
|
190
192
|
reLaunch,
|
|
191
|
-
switchTab
|
|
193
|
+
switchTab,
|
|
194
|
+
reset
|
|
192
195
|
}
|
|
@@ -10,6 +10,7 @@ const getWindowInfo = function () {
|
|
|
10
10
|
const insets = Object.assign(initialWindowMetricsInset, navigationInsets)
|
|
11
11
|
let safeArea = {}
|
|
12
12
|
const { top = 0, bottom = 0, left = 0, right = 0 } = insets
|
|
13
|
+
|
|
13
14
|
const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - bottom // 解决安卓开启屏幕内三建导航安卓把安全区计算进去后产生的影响
|
|
14
15
|
const screenWidth = __mpx_mode__ === 'ios' ? dimensionsScreen.width : dimensionsScreen.width - right
|
|
15
16
|
const layout = navigation.layout || {}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import { View, Text, Image, StyleSheet, ActivityIndicator, Dimensions } from 'react-native'
|
|
2
|
-
import { successHandle, failHandle } from '../../../common/js'
|
|
3
|
-
import
|
|
2
|
+
import { successHandle, failHandle, getCurrentPageId } from '../../../common/js'
|
|
3
|
+
import Portal from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/index'
|
|
4
4
|
|
|
5
|
-
let toastKey
|
|
6
5
|
let isLoadingShow
|
|
7
6
|
const dimensionsScreen = Dimensions.get('screen')
|
|
8
7
|
const screenHeight = dimensionsScreen.height
|
|
9
|
-
const contentTop = parseInt(screenHeight * 0.
|
|
10
|
-
let tId // show duration 计时id
|
|
8
|
+
const contentTop = parseInt(screenHeight * 0.4)
|
|
11
9
|
const styles = StyleSheet.create({
|
|
12
10
|
toastContent: {
|
|
13
11
|
maxWidth: '60%',
|
|
@@ -53,9 +51,22 @@ const styles = StyleSheet.create({
|
|
|
53
51
|
marginTop: 10
|
|
54
52
|
}
|
|
55
53
|
})
|
|
56
|
-
|
|
54
|
+
const toastMap = new Map()
|
|
55
|
+
const timerMap = new Map()
|
|
57
56
|
function showToast (options = {}) {
|
|
57
|
+
const id = getCurrentPageId()
|
|
58
58
|
const { title, icon = 'success', image, duration = 1500, mask = false, success, fail, complete, isLoading } = options
|
|
59
|
+
if (id === null) {
|
|
60
|
+
const result = {
|
|
61
|
+
errMsg: 'showToast:fail cannot be invoked outside the mpx life cycle in React Native environments'
|
|
62
|
+
}
|
|
63
|
+
failHandle(result, fail, complete)
|
|
64
|
+
return
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const timeoutId = timerMap.get(id)
|
|
68
|
+
clearTimeout(timeoutId)
|
|
69
|
+
timerMap.delete(id)
|
|
59
70
|
let ToastView
|
|
60
71
|
const successPng = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFwAAABcAgMAAACegTrLAAAADFBMVEUAAAD////R0dHj4+PcME2AAAAAAXRSTlMAQObYZgAAANNJREFUSMft1FEKwkAMBNBGyBFyH4/gR8f+ehSPLtiyQ+wM2C8Rmp+WQN90N8tOZ/1/4SbbYfpp+sBVMqafgGQKs+FvkjF8GR6aj4M8NB+GT8OX5i+GT8OX4aH5MHwZHpoPw+c3fA0xGl/zYBrP92o8vwVwF3NO8tySjXmINQLAs/WX9S8bP9UGJUZSi8MAuUqsj75payPxuWn1BmrjewCCfAvA4Fmjvx8HQL4HiJEHeRmg5k2+B8gTFeRFwL7NzREB/sCKwsG7KN2VSb7XMp31i3oBatNdEForTOoAAAAASUVORK5CYII='
|
|
61
72
|
const errorPng = 'data:image/png;base64,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'
|
|
@@ -65,19 +76,15 @@ function showToast (options = {}) {
|
|
|
65
76
|
}
|
|
66
77
|
const pointerEvents = mask ? 'auto' : 'none'
|
|
67
78
|
isLoadingShow = isLoading
|
|
68
|
-
if (tId) {
|
|
69
|
-
clearTimeout(tId)
|
|
70
|
-
}
|
|
71
|
-
tId = null
|
|
72
79
|
if (image || icon === 'success' || icon === 'error') {
|
|
73
|
-
ToastView = <View style={styles.toastWrap
|
|
80
|
+
ToastView = <View style={[styles.toastWrap, {pointerEvents}]}>
|
|
74
81
|
<View style={[styles.toastContent, styles.toastHasIcon]}>
|
|
75
82
|
<Image style={ styles.toastImg } source={{uri: image || iconImg[icon]}}></Image>
|
|
76
83
|
{ title ? <Text style={styles.toastText}>{title}</Text> : null }
|
|
77
84
|
</View>
|
|
78
85
|
</View>
|
|
79
86
|
} else if (icon === 'loading') {
|
|
80
|
-
ToastView = <View
|
|
87
|
+
ToastView = <View style={[styles.toastWrap, {pointerEvents}]}>
|
|
81
88
|
<View style={[styles.toastContent, styles.toastHasIcon]}>
|
|
82
89
|
<ActivityIndicator
|
|
83
90
|
animating
|
|
@@ -88,7 +95,7 @@ function showToast (options = {}) {
|
|
|
88
95
|
</View>
|
|
89
96
|
</View>
|
|
90
97
|
} else {
|
|
91
|
-
ToastView = <View style={styles.toastWrap
|
|
98
|
+
ToastView = <View style={[styles.toastWrap, {pointerEvents}]}>
|
|
92
99
|
<View style={styles.toastContent}>
|
|
93
100
|
{ title ? <Text numberOfLines={2} style={{ ...styles.toastText, ...(icon === 'none' ? {
|
|
94
101
|
height: 'auto',
|
|
@@ -98,15 +105,18 @@ function showToast (options = {}) {
|
|
|
98
105
|
</View>
|
|
99
106
|
}
|
|
100
107
|
try {
|
|
101
|
-
if (
|
|
102
|
-
Portal.remove(
|
|
108
|
+
if (toastMap.get(id)) { // 页面维度判断是否要清除toast
|
|
109
|
+
Portal.remove(toastMap.get(id))
|
|
110
|
+
toastMap.delete(id)
|
|
103
111
|
}
|
|
104
|
-
toastKey = Portal.add(ToastView)
|
|
112
|
+
const toastKey = Portal.add(ToastView, id)
|
|
113
|
+
toastMap.set(id, toastKey)
|
|
105
114
|
if (!isLoading) {
|
|
106
|
-
|
|
107
|
-
Portal.remove(
|
|
108
|
-
|
|
115
|
+
const timeoutId = setTimeout(() => {
|
|
116
|
+
Portal.remove(toastMap.get(id))
|
|
117
|
+
toastMap.delete(id)
|
|
109
118
|
}, duration)
|
|
119
|
+
timerMap.set(id, timeoutId)
|
|
110
120
|
}
|
|
111
121
|
const result = {
|
|
112
122
|
errMsg: 'showToast:ok'
|
|
@@ -121,15 +131,16 @@ function showToast (options = {}) {
|
|
|
121
131
|
}
|
|
122
132
|
|
|
123
133
|
function hideToast(options = {}) {
|
|
134
|
+
const id = getCurrentPageId()
|
|
124
135
|
const { noConflict = false, success, fail, complete } = options
|
|
125
136
|
|
|
126
137
|
if (isLoadingShow && noConflict) {
|
|
127
138
|
return
|
|
128
139
|
}
|
|
129
140
|
try {
|
|
130
|
-
if (
|
|
131
|
-
Portal.remove(
|
|
132
|
-
|
|
141
|
+
if (toastMap.get(id)) {
|
|
142
|
+
Portal.remove(toastMap.get(id))
|
|
143
|
+
toastMap.delete(id)
|
|
133
144
|
}
|
|
134
145
|
const result = {
|
|
135
146
|
errMsg: 'hideToast:ok'
|
|
@@ -166,15 +177,16 @@ function showLoading (options = {}) {
|
|
|
166
177
|
}
|
|
167
178
|
|
|
168
179
|
function hideLoading (options = {}) {
|
|
180
|
+
const id = getCurrentPageId()
|
|
169
181
|
const { noConflict = false, success, fail, complete } = options
|
|
170
182
|
if (!isLoadingShow && noConflict) {
|
|
171
183
|
return
|
|
172
184
|
}
|
|
173
185
|
isLoadingShow = false
|
|
174
186
|
try {
|
|
175
|
-
if (
|
|
176
|
-
Portal.remove(
|
|
177
|
-
|
|
187
|
+
if (toastMap.get(id)) {
|
|
188
|
+
Portal.remove(toastMap.get(id))
|
|
189
|
+
toastMap.delete(id)
|
|
178
190
|
}
|
|
179
191
|
const result = {
|
|
180
192
|
errMsg: 'hideLoading:ok'
|
package/LICENSE
DELETED
|
@@ -1,433 +0,0 @@
|
|
|
1
|
-
Apache License
|
|
2
|
-
|
|
3
|
-
Version 2.0, January 2004
|
|
4
|
-
|
|
5
|
-
http://www.apache.org/licenses/
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
1. Definitions.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
"License" shall mean the terms and conditions for use, reproduction,
|
|
21
|
-
|
|
22
|
-
and distribution as defined by Sections 1 through 9 of this document.
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
"Licensor" shall mean the copyright owner or entity authorized by
|
|
28
|
-
|
|
29
|
-
the copyright owner that is granting the License.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
"Legal Entity" shall mean the union of the acting entity and all
|
|
35
|
-
|
|
36
|
-
other entities that control, are controlled by, or are under common
|
|
37
|
-
|
|
38
|
-
control with that entity. For the purposes of this definition,
|
|
39
|
-
|
|
40
|
-
"control" means (i) the power, direct or indirect, to cause the
|
|
41
|
-
|
|
42
|
-
direction or management of such entity, whether by contract or
|
|
43
|
-
|
|
44
|
-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
45
|
-
|
|
46
|
-
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
"You" (or "Your") shall mean an individual or Legal Entity
|
|
52
|
-
|
|
53
|
-
exercising permissions granted by this License.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
"Source" form shall mean the preferred form for making modifications,
|
|
59
|
-
|
|
60
|
-
including but not limited to software source code, documentation
|
|
61
|
-
|
|
62
|
-
source, and configuration files.
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
"Object" form shall mean any form resulting from mechanical
|
|
68
|
-
|
|
69
|
-
transformation or translation of a Source form, including but
|
|
70
|
-
|
|
71
|
-
not limited to compiled object code, generated documentation,
|
|
72
|
-
|
|
73
|
-
and conversions to other media types.
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
"Work" shall mean the work of authorship, whether in Source or
|
|
79
|
-
|
|
80
|
-
Object form, made available under the License, as indicated by a
|
|
81
|
-
|
|
82
|
-
copyright notice that is included in or attached to the work
|
|
83
|
-
|
|
84
|
-
(an example is provided in the Appendix below).
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
"Derivative Works" shall mean any work, whether in Source or Object
|
|
90
|
-
|
|
91
|
-
form, that is based on (or derived from) the Work and for which the
|
|
92
|
-
|
|
93
|
-
editorial revisions, annotations, elaborations, or other modifications
|
|
94
|
-
|
|
95
|
-
represent, as a whole, an original work of authorship. For the purposes
|
|
96
|
-
|
|
97
|
-
of this License, Derivative Works shall not include works that remain
|
|
98
|
-
|
|
99
|
-
separable from, or merely link (or bind by name) to the interfaces of,
|
|
100
|
-
|
|
101
|
-
the Work and Derivative Works thereof.
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
"Contribution" shall mean any work of authorship, including
|
|
107
|
-
|
|
108
|
-
the original version of the Work and any modifications or additions
|
|
109
|
-
|
|
110
|
-
to that Work or Derivative Works thereof, that is intentionally
|
|
111
|
-
|
|
112
|
-
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
113
|
-
|
|
114
|
-
or by an individual or Legal Entity authorized to submit on behalf of
|
|
115
|
-
|
|
116
|
-
the copyright owner. For the purposes of this definition, "submitted"
|
|
117
|
-
|
|
118
|
-
means any form of electronic, verbal, or written communication sent
|
|
119
|
-
|
|
120
|
-
to the Licensor or its representatives, including but not limited to
|
|
121
|
-
|
|
122
|
-
communication on electronic mailing lists, source code control systems,
|
|
123
|
-
|
|
124
|
-
and issue tracking systems that are managed by, or on behalf of, the
|
|
125
|
-
|
|
126
|
-
Licensor for the purpose of discussing and improving the Work, but
|
|
127
|
-
|
|
128
|
-
excluding communication that is conspicuously marked or otherwise
|
|
129
|
-
|
|
130
|
-
designated in writing by the copyright owner as "Not a Contribution."
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
136
|
-
|
|
137
|
-
on behalf of whom a Contribution has been received by Licensor and
|
|
138
|
-
|
|
139
|
-
subsequently incorporated within the Work.
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
145
|
-
|
|
146
|
-
this License, each Contributor hereby grants to You a perpetual,
|
|
147
|
-
|
|
148
|
-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
149
|
-
|
|
150
|
-
copyright license to reproduce, prepare Derivative Works of,
|
|
151
|
-
|
|
152
|
-
publicly display, publicly perform, sublicense, and distribute the
|
|
153
|
-
|
|
154
|
-
Work and such Derivative Works in Source or Object form.
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
3. Grant of Patent License. Subject to the terms and conditions of
|
|
160
|
-
|
|
161
|
-
this License, each Contributor hereby grants to You a perpetual,
|
|
162
|
-
|
|
163
|
-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
164
|
-
|
|
165
|
-
(except as stated in this section) patent license to make, have made,
|
|
166
|
-
|
|
167
|
-
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
168
|
-
|
|
169
|
-
where such license applies only to those patent claims licensable
|
|
170
|
-
|
|
171
|
-
by such Contributor that are necessarily infringed by their
|
|
172
|
-
|
|
173
|
-
Contribution(s) alone or by combination of their Contribution(s)
|
|
174
|
-
|
|
175
|
-
with the Work to which such Contribution(s) was submitted. If You
|
|
176
|
-
|
|
177
|
-
institute patent litigation against any entity (including a
|
|
178
|
-
|
|
179
|
-
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
180
|
-
|
|
181
|
-
or a Contribution incorporated within the Work constitutes direct
|
|
182
|
-
|
|
183
|
-
or contributory patent infringement, then any patent licenses
|
|
184
|
-
|
|
185
|
-
granted to You under this License for that Work shall terminate
|
|
186
|
-
|
|
187
|
-
as of the date such litigation is filed.
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
4. Redistribution. You may reproduce and distribute copies of the
|
|
193
|
-
|
|
194
|
-
Work or Derivative Works thereof in any medium, with or without
|
|
195
|
-
|
|
196
|
-
modifications, and in Source or Object form, provided that You
|
|
197
|
-
|
|
198
|
-
meet the following conditions:
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
(a) You must give any other recipients of the Work or
|
|
204
|
-
|
|
205
|
-
Derivative Works a copy of this License; and
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
(b) You must cause any modified files to carry prominent notices
|
|
211
|
-
|
|
212
|
-
stating that You changed the files; and
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
(c) You must retain, in the Source form of any Derivative Works
|
|
218
|
-
|
|
219
|
-
that You distribute, all copyright, patent, trademark, and
|
|
220
|
-
|
|
221
|
-
attribution notices from the Source form of the Work,
|
|
222
|
-
|
|
223
|
-
excluding those notices that do not pertain to any part of
|
|
224
|
-
|
|
225
|
-
the Derivative Works; and
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
(d) If the Work includes a "NOTICE" text file as part of its
|
|
231
|
-
|
|
232
|
-
distribution, then any Derivative Works that You distribute must
|
|
233
|
-
|
|
234
|
-
include a readable copy of the attribution notices contained
|
|
235
|
-
|
|
236
|
-
within such NOTICE file, excluding those notices that do not
|
|
237
|
-
|
|
238
|
-
pertain to any part of the Derivative Works, in at least one
|
|
239
|
-
|
|
240
|
-
of the following places: within a NOTICE text file distributed
|
|
241
|
-
|
|
242
|
-
as part of the Derivative Works; within the Source form or
|
|
243
|
-
|
|
244
|
-
documentation, if provided along with the Derivative Works; or,
|
|
245
|
-
|
|
246
|
-
within a display generated by the Derivative Works, if and
|
|
247
|
-
|
|
248
|
-
wherever such third-party notices normally appear. The contents
|
|
249
|
-
|
|
250
|
-
of the NOTICE file are for informational purposes only and
|
|
251
|
-
|
|
252
|
-
do not modify the License. You may add Your own attribution
|
|
253
|
-
|
|
254
|
-
notices within Derivative Works that You distribute, alongside
|
|
255
|
-
|
|
256
|
-
or as an addendum to the NOTICE text from the Work, provided
|
|
257
|
-
|
|
258
|
-
that such additional attribution notices cannot be construed
|
|
259
|
-
|
|
260
|
-
as modifying the License.
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
You may add Your own copyright statement to Your modifications and
|
|
266
|
-
|
|
267
|
-
may provide additional or different license terms and conditions
|
|
268
|
-
|
|
269
|
-
for use, reproduction, or distribution of Your modifications, or
|
|
270
|
-
|
|
271
|
-
for any such Derivative Works as a whole, provided Your use,
|
|
272
|
-
|
|
273
|
-
reproduction, and distribution of the Work otherwise complies with
|
|
274
|
-
|
|
275
|
-
the conditions stated in this License.
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
281
|
-
|
|
282
|
-
any Contribution intentionally submitted for inclusion in the Work
|
|
283
|
-
|
|
284
|
-
by You to the Licensor shall be under the terms and conditions of
|
|
285
|
-
|
|
286
|
-
this License, without any additional terms or conditions.
|
|
287
|
-
|
|
288
|
-
Notwithstanding the above, nothing herein shall supersede or modify
|
|
289
|
-
|
|
290
|
-
the terms of any separate license agreement you may have executed
|
|
291
|
-
|
|
292
|
-
with Licensor regarding such Contributions.
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
6. Trademarks. This License does not grant permission to use the trade
|
|
298
|
-
|
|
299
|
-
names, trademarks, service marks, or product names of the Licensor,
|
|
300
|
-
|
|
301
|
-
except as required for reasonable and customary use in describing the
|
|
302
|
-
|
|
303
|
-
origin of the Work and reproducing the content of the NOTICE file.
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
309
|
-
|
|
310
|
-
agreed to in writing, Licensor provides the Work (and each
|
|
311
|
-
|
|
312
|
-
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
313
|
-
|
|
314
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
315
|
-
|
|
316
|
-
implied, including, without limitation, any warranties or conditions
|
|
317
|
-
|
|
318
|
-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
319
|
-
|
|
320
|
-
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
321
|
-
|
|
322
|
-
appropriateness of using or redistributing the Work and assume any
|
|
323
|
-
|
|
324
|
-
risks associated with Your exercise of permissions under this License.
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
8. Limitation of Liability. In no event and under no legal theory,
|
|
330
|
-
|
|
331
|
-
whether in tort (including negligence), contract, or otherwise,
|
|
332
|
-
|
|
333
|
-
unless required by applicable law (such as deliberate and grossly
|
|
334
|
-
|
|
335
|
-
negligent acts) or agreed to in writing, shall any Contributor be
|
|
336
|
-
|
|
337
|
-
liable to You for damages, including any direct, indirect, special,
|
|
338
|
-
|
|
339
|
-
incidental, or consequential damages of any character arising as a
|
|
340
|
-
|
|
341
|
-
result of this License or out of the use or inability to use the
|
|
342
|
-
|
|
343
|
-
Work (including but not limited to damages for loss of goodwill,
|
|
344
|
-
|
|
345
|
-
work stoppage, computer failure or malfunction, or any and all
|
|
346
|
-
|
|
347
|
-
other commercial damages or losses), even if such Contributor
|
|
348
|
-
|
|
349
|
-
has been advised of the possibility of such damages.
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
9. Accepting Warranty or Additional Liability. While redistributing
|
|
355
|
-
|
|
356
|
-
the Work or Derivative Works thereof, You may choose to offer,
|
|
357
|
-
|
|
358
|
-
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
359
|
-
|
|
360
|
-
or other liability obligations and/or rights consistent with this
|
|
361
|
-
|
|
362
|
-
License. However, in accepting such obligations, You may act only
|
|
363
|
-
|
|
364
|
-
on Your own behalf and on Your sole responsibility, not on behalf
|
|
365
|
-
|
|
366
|
-
of any other Contributor, and only if You agree to indemnify,
|
|
367
|
-
|
|
368
|
-
defend, and hold each Contributor harmless for any liability
|
|
369
|
-
|
|
370
|
-
incurred by, or claims asserted against, such Contributor by reason
|
|
371
|
-
|
|
372
|
-
of your accepting any such warranty or additional liability.
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
END OF TERMS AND CONDITIONS
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
APPENDIX: How to apply the Apache License to your work.
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
To apply the Apache License to your work, attach the following
|
|
388
|
-
|
|
389
|
-
boilerplate notice, with the fields enclosed by brackets "{}"
|
|
390
|
-
|
|
391
|
-
replaced with your own identifying information. (Don't include
|
|
392
|
-
|
|
393
|
-
the brackets!) The text should be enclosed in the appropriate
|
|
394
|
-
|
|
395
|
-
comment syntax for the file format. We also recommend that a
|
|
396
|
-
|
|
397
|
-
file or class name and description of purpose be included on the
|
|
398
|
-
|
|
399
|
-
same "printed page" as the copyright notice for easier
|
|
400
|
-
|
|
401
|
-
identification within third-party archives.
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
Licensed under the Apache License, Version 2.0 (the "License");
|
|
412
|
-
|
|
413
|
-
you may not use this file except in compliance with the License.
|
|
414
|
-
|
|
415
|
-
You may obtain a copy of the License at
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
http://www.apache.org/licenses/LICENSE-2.0
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
Unless required by applicable law or agreed to in writing, software
|
|
426
|
-
|
|
427
|
-
distributed under the License is distributed on an "AS IS" BASIS,
|
|
428
|
-
|
|
429
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
430
|
-
|
|
431
|
-
See the License for the specific language governing permissions and
|
|
432
|
-
|
|
433
|
-
limitations under the License.
|