@mpxjs/api-proxy 2.10.4-beta.6 → 2.10.5

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 CHANGED
@@ -121,17 +121,12 @@ export const enableAlertBeforeUnload: WechatMiniprogram.Wx['enableAlertBeforeUnl
121
121
  export const disableAlertBeforeUnload: WechatMiniprogram.Wx['disableAlertBeforeUnload']
122
122
  export const getMenuButtonBoundingClientRect: WechatMiniprogram.Wx['getMenuButtonBoundingClientRect']
123
123
  export const getImageInfo: WechatMiniprogram.Wx['getImageInfo']
124
- export const chooseMedia: WechatMiniprogram.Wx['chooseMedia']
125
124
  export const vibrateShort: WechatMiniprogram.Wx['vibrateShort']
126
125
  export const vibrateLong: WechatMiniprogram.Wx['vibrateLong']
127
126
  export const getExtConfig: WechatMiniprogram.Wx['getExtConfig']
128
127
  export const getExtConfigSync: WechatMiniprogram.Wx['getExtConfigSync']
129
128
  export const openLocation: WechatMiniprogram.Wx['openLocation']
130
129
  export const chooseLocation: WechatMiniprogram.Wx['chooseLocation']
131
- export const onLocationChange: WechatMiniprogram.Wx['onLocationChange']
132
- export const offLocationChange: WechatMiniprogram.Wx['offLocationChange']
133
- export const startLocationUpdate: WechatMiniprogram.Wx['startLocationUpdate']
134
- export const stopLocationUpdate: WechatMiniprogram.Wx['stopLocationUpdate']
135
130
 
136
131
  declare const install: (...args: any) => any
137
132
 
package/LICENSE ADDED
@@ -0,0 +1,433 @@
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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mpxjs/api-proxy",
3
- "version": "2.10.4-beta.6",
3
+ "version": "2.10.5",
4
4
  "description": "convert miniprogram API at each end",
5
5
  "module": "src/index.js",
6
6
  "types": "@types/index.d.ts",
@@ -67,5 +67,6 @@
67
67
  "react-native-haptic-feedback": {
68
68
  "optional": true
69
69
  }
70
- }
70
+ },
71
+ "gitHead": "80a4120733a1ee64e394ae58240497ea6721f435"
71
72
  }
@@ -1,4 +1,4 @@
1
- import Animation from './animation.react'
1
+ import Animation from './animation'
2
2
 
3
3
  export const createAnimation = (option) => {
4
4
  return new Animation(option)
@@ -95,25 +95,22 @@ class RNIntersectionObserver {
95
95
  const navigationLayout = navigation.layout || {
96
96
  x: 0,
97
97
  y: 0,
98
- top: 0,
99
- left: 0,
100
98
  width: screen.width,
101
99
  height: screen.height
102
100
  }
103
101
 
104
102
  const windowRect = {
105
- top: navigationLayout.top - this.margins.top,
103
+ top: navigationLayout.y - this.margins.top,
106
104
  left: 0 - this.margins.left,
107
105
  right: navigationLayout.width + this.margins.right,
108
- bottom: navigationLayout.top + navigationLayout.height + this.margins.bottom
106
+ bottom: navigationLayout.y + navigationLayout.height + this.margins.bottom
109
107
  }
108
+
110
109
  this.windowRect = windowRect
111
110
  return this.windowRect
112
111
  }
113
112
 
114
113
  _getReferenceRect (targetRef) {
115
- const navigation = getFocusedNavigation() || {}
116
- const layout = navigation.layout || {}
117
114
  const targetRefs = isArray(targetRef) ? targetRef : [targetRef]
118
115
  const targetPromiseQueue = []
119
116
  targetRefs.forEach((targetRefItem) => {
@@ -131,12 +128,11 @@ class RNIntersectionObserver {
131
128
  targetPromiseQueue.push(new Promise((resolve) => {
132
129
  target.measureInWindow(
133
130
  (x, y, width, height) => {
134
- // 安卓measureInWindow的参考值在android下为statubar的左下角,因此top需要调整一下
135
131
  const boundingClientRect = {
136
132
  left: x,
137
- top: y + layout.statusBarHeight || 0,
133
+ top: y,
138
134
  right: x + width,
139
- bottom: y + height + layout.statusBarHeight || 0,
135
+ bottom: y + height,
140
136
  width: width,
141
137
  height: height
142
138
  }
@@ -157,16 +153,19 @@ class RNIntersectionObserver {
157
153
  return Math.min(Math.max(start, value), end)
158
154
  }
159
155
 
160
- _getRatioIndex (ratio, thresholds = []) {
161
- if (ratio === 0 && thresholds.includes(0)) return -1
162
- if (ratio === 1 && thresholds.includes(1)) return thresholds.length
163
- let returnIndex = -1
156
+ _isInsectedFn (intersectionRatio, previousIntersectionRatio, thresholds) {
157
+ // console.log('nowintersectionRatio, previousIntersectionRatio', [intersectionRatio, previousIntersectionRatio])
158
+ let nowIndex = -1
159
+ let previousIndex = -1
164
160
  thresholds.forEach((item, index) => {
165
- if (ratio >= item) {
166
- returnIndex = index
161
+ if (intersectionRatio >= item) {
162
+ nowIndex = index
163
+ }
164
+ if (previousIntersectionRatio >= item) {
165
+ previousIndex = index
167
166
  }
168
167
  })
169
- return returnIndex
168
+ return !(nowIndex === previousIndex)
170
169
  }
171
170
 
172
171
  // 计算相交区域
@@ -181,8 +180,10 @@ class RNIntersectionObserver {
181
180
  const targetArea = (observeRect.bottom - observeRect.top) * (observeRect.right - observeRect.left)
182
181
  const visibleArea = (visibleRect.bottom - visibleRect.top) * (visibleRect.right - visibleRect.left)
183
182
  const intersectionRatio = targetArea ? visibleArea / targetArea : 0
184
- const isInsected = isInit ? intersectionRatio > this.initialRatio : !(this._getRatioIndex(intersectionRatio, this.thresholds) === this._getRatioIndex(this.previousIntersectionRatio[observeIndex], this.thresholds))
183
+
184
+ const isInsected = isInit ? intersectionRatio > this.initialRatio : this._isInsectedFn(intersectionRatio, this.previousIntersectionRatio[observeIndex], this.thresholds)
185
185
  this.previousIntersectionRatio[observeIndex] = intersectionRatio
186
+
186
187
  return {
187
188
  intersectionRatio,
188
189
  intersectionRect: {
@@ -216,6 +217,7 @@ class RNIntersectionObserver {
216
217
  relativeRect,
217
218
  isInit
218
219
  })
220
+ // 初次调用的
219
221
  if (isInsected) {
220
222
  this.callback({
221
223
  // index: index,
@@ -1,4 +1,4 @@
1
- import { ENV_OBJ, changeOpts, handleSuccess, envError } from '../../../common/js'
1
+ import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
2
2
 
3
3
  function previewImage (options = {}) {
4
4
  const opts = changeOpts(options)
@@ -30,13 +30,10 @@ function compressImage (options = {}) {
30
30
  return ENV_OBJ.compressImage(opts)
31
31
  }
32
32
 
33
- const getImageInfo = ENV_OBJ.getImageInfo || envError('getImageInfo')
34
-
35
- const chooseMedia = envError('chooseMedia')
33
+ const getImageInfo = ENV_OBJ.getImageInfo
36
34
 
37
35
  export {
38
36
  previewImage,
39
37
  compressImage,
40
- getImageInfo,
41
- chooseMedia
38
+ getImageInfo
42
39
  }
@@ -38,11 +38,8 @@ const getImageInfo = function (options = {}) {
38
38
  })
39
39
  }
40
40
 
41
- const chooseMedia = envError('chooseMedia')
42
-
43
41
  export {
44
42
  previewImage,
45
43
  compressImage,
46
- getImageInfo,
47
- chooseMedia
44
+ getImageInfo
48
45
  }
@@ -6,11 +6,8 @@ const compressImage = ENV_OBJ.compressImage || envError('compressImage')
6
6
 
7
7
  const getImageInfo = ENV_OBJ.getImageInfo || envError('getImageInfo')
8
8
 
9
- const chooseMedia = ENV_OBJ.chooseMedia || envError('chooseMedia')
10
-
11
9
  export {
12
10
  previewImage,
13
11
  compressImage,
14
- getImageInfo,
15
- chooseMedia
12
+ getImageInfo
16
13
  }
@@ -60,11 +60,8 @@ const getImageInfo = function (options = {}) {
60
60
  }
61
61
  }
62
62
 
63
- const chooseMedia = envError('chooseMedia')
64
-
65
63
  export {
66
64
  previewImage,
67
65
  compressImage,
68
- getImageInfo,
69
- chooseMedia
66
+ getImageInfo
70
67
  }
@@ -1,4 +1,4 @@
1
- import { ENV_OBJ, changeOpts, handleSuccess, defineUnsupportedProps, envError } from '../../../common/js'
1
+ import { ENV_OBJ, changeOpts, handleSuccess, defineUnsupportedProps } from '../../../common/js'
2
2
 
3
3
  function getLocation (options = {}) {
4
4
  const opts = Object.assign(options, {
@@ -22,22 +22,10 @@ function openLocation (options = {}) {
22
22
  return ENV_OBJ.openLocation(opts)
23
23
  }
24
24
 
25
- const chooseLocation = ENV_OBJ.chooseLocation || envError('chooseLocation')
26
-
27
- const onLocationChange = envError('onLocationChange')
28
-
29
- const offLocationChange = envError('offLocationChange')
30
-
31
- const startLocationUpdate = envError('startLocationUpdate')
32
-
33
- const stopLocationUpdate = envError('stopLocationUpdate')
25
+ const chooseLocation = ENV_OBJ.chooseLocation
34
26
 
35
27
  export {
36
28
  getLocation,
37
29
  openLocation,
38
- chooseLocation,
39
- onLocationChange,
40
- offLocationChange,
41
- startLocationUpdate,
42
- stopLocationUpdate
30
+ chooseLocation
43
31
  }
@@ -24,20 +24,8 @@ const openLocation = envError('openLocation')
24
24
 
25
25
  const chooseLocation = envError('chooseLocation')
26
26
 
27
- const onLocationChange = envError('onLocationChange')
28
-
29
- const offLocationChange = envError('offLocationChange')
30
-
31
- const startLocationUpdate = envError('startLocationUpdate')
32
-
33
- const stopLocationUpdate = envError('stopLocationUpdate')
34
-
35
27
  export {
36
28
  getLocation,
37
29
  openLocation,
38
- chooseLocation,
39
- onLocationChange,
40
- offLocationChange,
41
- startLocationUpdate,
42
- stopLocationUpdate
30
+ chooseLocation
43
31
  }
@@ -6,20 +6,8 @@ const openLocation = ENV_OBJ.openLocation || envError('openLocation')
6
6
 
7
7
  const chooseLocation = ENV_OBJ.chooseLocation || envError('chooseLocation')
8
8
 
9
- const onLocationChange = ENV_OBJ.onLocationChange || envError('onLocationChange')
10
-
11
- const offLocationChange = ENV_OBJ.offLocationChange || envError('offLocationChange')
12
-
13
- const startLocationUpdate = ENV_OBJ.startLocationUpdate || envError('startLocationUpdate')
14
-
15
- const stopLocationUpdate = ENV_OBJ.stopLocationUpdate || envError('stopLocationUpdate')
16
-
17
9
  export {
18
10
  getLocation,
19
11
  openLocation,
20
- chooseLocation,
21
- onLocationChange,
22
- offLocationChange,
23
- startLocationUpdate,
24
- stopLocationUpdate
12
+ chooseLocation
25
13
  }
@@ -29,20 +29,8 @@ const openLocation = envError('openLocation')
29
29
 
30
30
  const chooseLocation = envError('chooseLocation')
31
31
 
32
- const onLocationChange = envError('onLocationChange')
33
-
34
- const offLocationChange = envError('offLocationChange')
35
-
36
- const startLocationUpdate = envError('startLocationUpdate')
37
-
38
- const stopLocationUpdate = envError('stopLocationUpdate')
39
-
40
32
  export {
41
33
  getLocation,
42
34
  openLocation,
43
- chooseLocation,
44
- onLocationChange,
45
- offLocationChange,
46
- startLocationUpdate,
47
- stopLocationUpdate
35
+ chooseLocation
48
36
  }
@@ -7,9 +7,7 @@ function setNavigationBarTitle (options = {}) {
7
7
  failHandle({ errMsg: 'setNavigationBarTitle:fail' }, fail, complete)
8
8
  } else {
9
9
  nextTick(() => {
10
- navigation.setPageConfig({
11
- navigationBarTitleText: title.trim()
12
- })
10
+ navigation.setOptions({ title: title.trim() })
13
11
  successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
14
12
  })
15
13
  }
@@ -22,9 +20,11 @@ function setNavigationBarColor (options = {}) {
22
20
  failHandle({ errMsg: 'setNavigationBarColor:fail' }, fail, complete)
23
21
  } else {
24
22
  nextTick(() => {
25
- navigation.setPageConfig({
26
- navigationBarBackgroundColor: backgroundColor,
27
- navigationBarTextStyle: frontColor
23
+ navigation.setOptions({
24
+ headerStyle: {
25
+ backgroundColor: backgroundColor
26
+ },
27
+ headerTintColor: frontColor
28
28
  })
29
29
  successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
30
30
  })
@@ -33,46 +33,12 @@ function getSystemInfoSync () {
33
33
  }
34
34
 
35
35
  const getDeviceInfo = function () {
36
- let res
37
- if (ENV_OBJ.canIUse('getDeviceBaseInfo')) {
38
- res = ENV_OBJ.getDeviceBaseInfo()
39
- } else {
40
- const systemInfo = getSystemInfoSync()
41
- res = {
42
- abi: systemInfo.abi || null,
43
- benchmarkLevel: systemInfo.benchmarkLevel || null,
44
- brand: systemInfo.brand,
45
- model: systemInfo.model,
46
- system: systemInfo.system,
47
- platform: systemInfo.platform,
48
- memorySize: systemInfo.memorySize || null
49
- }
50
- }
36
+ const res = ENV_OBJ.getDeviceBaseInfo()
51
37
  defineUnsupportedProps(res, ['deviceAbi', 'benchmarkLevel', 'cpuType'])
52
38
  return res
53
39
  }
54
40
 
55
- const getWindowInfo = function () {
56
- let res
57
- if (ENV_OBJ.canIUse('getWindowInfo')) {
58
- res = ENV_OBJ.getWindowInfo()
59
- } else {
60
- const systemInfo = getSystemInfoSync()
61
- res = {
62
- pixelRatio: systemInfo.pixelRatio,
63
- screenWidth: systemInfo.screenWidth,
64
- screenHeight: systemInfo.screenHeight,
65
- windowWidth: systemInfo.windowWidth,
66
- windowHeight: systemInfo.windowHeight,
67
- statusBarHeight: systemInfo.statusBarHeight,
68
- safeArea: systemInfo.safeArea || null,
69
- screenTop: systemInfo.screenTop || null
70
- }
71
- }
72
- return res
73
- }
74
-
75
- // const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
41
+ const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
76
42
 
77
43
  const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
78
44
 
@@ -7,9 +7,10 @@ const getWindowInfo = function () {
7
7
  const navigation = getFocusedNavigation() || {}
8
8
  const initialWindowMetricsInset = initialWindowMetrics?.insets || {}
9
9
  const navigationInsets = navigation.insets || {}
10
- const insets = Object.assign({}, initialWindowMetricsInset, navigationInsets)
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 || {}
@@ -32,7 +32,8 @@ const styles = StyleSheet.create({
32
32
  alignItems: 'center'
33
33
  },
34
34
  toastHasIcon: {
35
- width: 140
35
+ height: 110,
36
+ width: 120
36
37
  },
37
38
  toastImg: {
38
39
  width: 40,
@@ -45,6 +46,8 @@ const styles = StyleSheet.create({
45
46
  color: '#ffffff',
46
47
  fontSize: 12,
47
48
  lineHeight: 18,
49
+ height: 18,
50
+ overflow: 'hidden',
48
51
  marginTop: 10
49
52
  }
50
53
  })
@@ -77,7 +80,7 @@ function showToast (options = {}) {
77
80
  ToastView = <View style={[styles.toastWrap, { pointerEvents }]}>
78
81
  <View style={[styles.toastContent, styles.toastHasIcon]}>
79
82
  <Image style={ styles.toastImg } source={{ uri: image || iconImg[icon] }}></Image>
80
- { title ? <Text numberOfLines={2} style={styles.toastText}>{title}</Text> : null }
83
+ { title ? <Text style={styles.toastText}>{title}</Text> : null }
81
84
  </View>
82
85
  </View>
83
86
  } else if (icon === 'loading') {
@@ -88,7 +91,7 @@ function showToast (options = {}) {
88
91
  size='small'
89
92
  color='#eee'
90
93
  />
91
- { title ? <Text numberOfLines={2} style={styles.toastText}>{title}</Text> : null }
94
+ { title ? <Text style={styles.toastText}>{title}</Text> : null }
92
95
  </View>
93
96
  </View>
94
97
  } else {
@@ -99,6 +102,7 @@ function showToast (options = {}) {
99
102
  ...styles.toastText,
100
103
  ...(icon === 'none'
101
104
  ? {
105
+ height: 'auto',
102
106
  marginTop: 0
103
107
  }
104
108
  : {})
@@ -43,7 +43,7 @@ export * from './api/file'
43
43
  // getUserInfo
44
44
  export * from './api/get-user-info'
45
45
 
46
- // previewImage, compressImage, getImageInfo, chooseMedia
46
+ // previewImage, compressImage, getImageInfo
47
47
  export * from './api/image'
48
48
 
49
49
  // login
@@ -105,7 +105,7 @@ export * from './api/video'
105
105
  // onWindowResize, offWindowResize
106
106
  export * from './api/window'
107
107
 
108
- // getLocation, openLocation, chooseLocation, onLocationChange, offLocationChange, startLocationUpdate, stopLocationUpdate
108
+ // getLocation, openLocation, chooseLocation
109
109
  export * from './api/location'
110
110
 
111
111
  // getExtConfig, getExtConfigSync