Merge branch 'fix-drn-2.10.17' into feat-style-compile-251012

Author: Blackgan3

docs-vitepress/guide/rn/style.md

@@ -1429,3 +1429,110 @@ object-fit: contain;    /* 完整显示，保持比例 */
 object-fit: cover;      /* 覆盖填充，保持比例，可能裁剪 */
 object-fit: scale-down; /* 缩小显示 */
 ```
+
+
+## 跨端动画
+基础组件 view 支持两种动画形式 createAnimation API 和 transition，
+可以通过设置 animation 属于来使用 createAnimation API 动画，通过 class 或者 style 设置 css transition 来使用 transition 动画，
+可以用过 prop enableAnimation = api/transition 来指定使用 createAnimation API/transition 的动画形式，，enableAnimation 设置 true 默认为 createAnimation API 形式，需要注意的是指定动画类型后，对应的动画参数也需要匹配设置，详细使用文档如下：
+
+### createAnimation 动画API
+创建一个动画实例 animation，调用实例的方法来描述动画，最后通过动画实例的 export 方法导出动画数据传递给组件的 animation 属性。
+详情参考以下动画部分微信小程序文档，以下仅描述支持能力有差异部分：
+#### [wx.createAnimation](https://developers.weixin.qq.com/miniprogram/dev/api/ui/animation/wx.createAnimation.html)
+- 参数 timingFunction 不支持 step-start 和 step-end
+#### [动画实例 animation](https://developers.weixin.qq.com/miniprogram/dev/api/ui/animation/Animation.html)
+- translateZ() 不支持
+- translate3d() 不支持
+- rotate3d() 不支持
+- rotateZ() 不支持
+- scaleZ() 不支持
+- scale3d() 不支持
+- animation.matrix() 不支持
+- animation.matrix3d() 不支持
+
+### CSS transition
+CSS transition 动画至少需要设置动画时长和动画属性，可通过单独属性 transition-property 和 transition-property 设置，也可以通过 transition 缩写设置
+>重要提示：transition 支持设置百分比，如 ```marginTop: 1%;marginTop: 100%;```；要注意的是起始值和结束值需设置为同一类型，同为px或者同为百分比， 支持 ```marginTop: 10px;marginTop: 100px; ```，**不支持 ```marginTop: 10px; marginTop: 100%;```**
+
+#### [transition](https://developer.mozilla.org/en-US/docs/Web/CSS/transition)
+```css
+/**** 支持 */
+/* property name | duration */
+transition: margin-right 4s;
+/* property name | duration | delay */
+transition: margin-right 4s 1s;
+/* property name | duration | easing function */
+transition: margin-right 4s ease-in-out;
+/* property name | duration | easing function | delay */
+transition: margin-right 4s ease-in-out 1s;
+
+/* Apply to 2 properties */
+transition: margin-right 4s, color 1s;
+```
+```css
+/**** 需配合 transition-property 使用*/
+/* transition 未定义 property 时需配合 transition-property 使用，否则仅设置duration、timingFunciton等参数实际动画不生效 */
+transition: 200ms linear 50ms;
+transition: 2s, 1s;
+```
+```css
+/**** 不支持：property 不支持设置为 all  */
+transition: all 0.5s ease-out
+```
+#### [transition-property](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-property)
+不支持设置为 all，不支持自定义
+> 支持的 property 合集有：
+> rotateX rotateY rotateZ scaleX scaleY skewX skewY translateX translateY opacity backgroundColor width height top right bottom left color borderColor borderBottomColor borderLeftColor borderRightColor borderTopColor borderTopLeftRadius borderTopRightRadius borderBottomLeftRadius borderBottomRightRadius borderRadius borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderWidth margin marginBottom marginLeft marginRight marginTop maxHeight maxWidth minHeight minWidth padding paddingBottom paddingLeft paddingRight paddingTop
+```css
+/**** 支持 */
+transition-property: height;
+transition-property: height, color;
+```
+```css
+/**** 不支持 */
+transition-property: all;
+/* <custom-ident> values */
+transition-property: test_05;
+transition-property: -specific;
+transition-property: sliding-vertically;
+transition-property: test1, animation4;
+transition-property: all, -moz-specific, sliding;
+transition-property: inherit;
+transition-property: initial;
+transition-property: revert;
+transition-property: revert-layer;
+transition-property: unset;
+```
+#### [transition-duration](https://developer.mozilla.org/zh-CN/docs/Web/CSS/transition-duration)
+```css
+/**** 支持 */
+transition-duration: 6s;
+transition-duration: 120ms;
+transition-duration: 1s, 15s;
+transition-duration: 10s, 30s, 230ms;
+```
+#### [transition-delay](https://developer.mozilla.org/zh-CN/docs/Web/CSS/transition-delay)
+```css
+/**** 支持 */
+transition-delay: 3s;
+transition-delay: 2s, 4ms;
+```
+#### [transition-behavior](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-behavior)
+不支持
+#### [transition-timing-function](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-timing-function)
+仅支持 ease、ease-in、ease-out、ease-in-out、linear、cubic-bezier()，不支持 step-start、step-end、steps()
+
+### CSS animation
+暂不支持
+
+### 动画监听事件
+#### transitionend
+- CSS transition 结束或 wx.createAnimation 结束一个阶段时触发
+- 不属于冒泡事件，需要绑定在真正发生了动画的节点上才会生效
+#### animationstart
+暂不支持
+#### animationiteration
+暂不支持
+#### animationend
+暂不支持

packages/api-proxy/@types/index.d.ts

@@ -45,9 +45,36 @@ export const offError: WechatMiniprogram.Wx['offError']
 export const createInnerAudioContext: WechatMiniprogram.Wx['createInnerAudioContext']
 export const base64ToArrayBuffer: WechatMiniprogram.Wx['base64ToArrayBuffer']
 export const arrayBufferToBase64: WechatMiniprogram.Wx['arrayBufferToBase64']
+export const openBluetoothAdapter: WechatMiniprogram.Wx['openBluetoothAdapter']
+export const closeBluetoothAdapter: WechatMiniprogram.Wx['closeBluetoothAdapter']
+export const startBluetoothDevicesDiscovery: WechatMiniprogram.Wx['startBluetoothDevicesDiscovery']
+export const stopBluetoothDevicesDiscovery: WechatMiniprogram.Wx['stopBluetoothDevicesDiscovery']
+export const onBluetoothDeviceFound: WechatMiniprogram.Wx['onBluetoothDeviceFound']
+export const offBluetoothDeviceFound: WechatMiniprogram.Wx['offBluetoothDeviceFound']
+export const getConnectedBluetoothDevices: WechatMiniprogram.Wx['getConnectedBluetoothDevices']
+export const getBluetoothAdapterState: WechatMiniprogram.Wx['getBluetoothAdapterState']
+export const onBluetoothAdapterStateChange: WechatMiniprogram.Wx['onBluetoothAdapterStateChange']
+export const offBluetoothAdapterStateChange: WechatMiniprogram.Wx['offBluetoothAdapterStateChange']
+export const getBluetoothDevices: WechatMiniprogram.Wx['getBluetoothDevices']
+export const writeBLECharacteristicValue: WechatMiniprogram.Wx['writeBLECharacteristicValue']
+export const readBLECharacteristicValue: WechatMiniprogram.Wx['readBLECharacteristicValue']
+export const notifyBLECharacteristicValueChange: WechatMiniprogram.Wx['notifyBLECharacteristicValueChange']
+export const onBLECharacteristicValueChange: WechatMiniprogram.Wx['onBLECharacteristicValueChange']
+export const offBLECharacteristicValueChange: WechatMiniprogram.Wx['offBLECharacteristicValueChange']
+export const setBLEMTU: WechatMiniprogram.Wx['setBLEMTU']
+export const getBLEDeviceRSSI: WechatMiniprogram.Wx['getBLEDeviceRSSI']
+export const getBLEDeviceServices: WechatMiniprogram.Wx['getBLEDeviceServices']
+export const getBLEDeviceCharacteristics: WechatMiniprogram.Wx['getBLEDeviceCharacteristics']
 export const closeBLEConnection: WechatMiniprogram.Wx['closeBLEConnection']
 export const createBLEConnection: WechatMiniprogram.Wx['createBLEConnection']
 export const onBLEConnectionStateChange: WechatMiniprogram.Wx['onBLEConnectionStateChange']
+export const offBLEConnectionStateChange: WechatMiniprogram.Wx['offBLEConnectionStateChange']
+export const startWifi: WechatMiniprogram.Wx['startWifi']
+export const stopWifi: WechatMiniprogram.Wx['stopWifi']
+export const getWifiList: WechatMiniprogram.Wx['getWifiList']
+export const onGetWifiList: WechatMiniprogram.Wx['onGetWifiList']
+export const offGetWifiList: WechatMiniprogram.Wx['offGetWifiList']
+export const getConnectedWifi: WechatMiniprogram.Wx['getConnectedWifi']
 export const createCanvasContext: WechatMiniprogram.Wx['createCanvasContext']
 export const canvasToTempFilePath: WechatMiniprogram.Wx['canvasToTempFilePath']
 export const canvasGetImageData: WechatMiniprogram.Wx['canvasGetImageData']

packages/api-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.17",
+  "version": "2.10.17-beta.1",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -46,7 +46,9 @@
     "react-native-device-info": "*",
     "react-native-get-location": "*",
     "react-native-haptic-feedback": "*",
-    "react-native-safe-area-context": "*"
+    "react-native-safe-area-context": "*",
+    "react-native-ble-manager": "*",
+    "react-native-wifi-reborn": "*"
   },
   "peerDependenciesMeta": {
     "@react-native-async-storage/async-storage": {
@@ -66,6 +68,12 @@
     },
     "react-native-haptic-feedback": {
       "optional": true
+    },
+    "react-native-ble-manager": {
+      "optional": true
+    },
+    "react-native-wifi-reborn": {
+      "optional": true
     }
   }
 }

packages/api-proxy/src/platform/api/ble-connection/index.ali.js

@@ -1,4 +1,4 @@
-import { ENV_OBJ } from '../../../common/js'
+import { ENV_OBJ, envError } from '../../../common/js'
 
 function closeBLEConnection (options = {}) {
   return ENV_OBJ.disconnectBLEDevice(options)
@@ -12,8 +12,73 @@ function onBLEConnectionStateChange (callback) {
   return ENV_OBJ.onBLEConnectionStateChanged(callback)
 }
 
+function offBLEConnectionStateChange (callback) {
+  return ENV_OBJ.offBLEConnectionStateChanged(callback)
+}
+
+const openBluetoothAdapter = ENV_OBJ.openBluetoothAdapter || envError('openBluetoothAdapter')
+
+const closeBluetoothAdapter = ENV_OBJ.closeBluetoothAdapter || envError('closeBluetoothAdapter')
+
+const startBluetoothDevicesDiscovery = ENV_OBJ.startBluetoothDevicesDiscovery || envError('startBluetoothDevicesDiscovery')
+
+const stopBluetoothDevicesDiscovery = ENV_OBJ.stopBluetoothDevicesDiscovery || envError('stopBluetoothDevicesDiscovery')
+
+const onBluetoothDeviceFound = ENV_OBJ.onBluetoothDeviceFound || envError('onBluetoothDeviceFound')
+
+const offBluetoothDeviceFound = ENV_OBJ.offBluetoothDeviceFound || envError('offBluetoothDeviceFound')
+
+const getConnectedBluetoothDevices = ENV_OBJ.getConnectedBluetoothDevices || envError('getConnectedBluetoothDevices')
+
+const getBluetoothAdapterState = ENV_OBJ.getBluetoothAdapterState || envError('getBluetoothAdapterState')
+
+const onBluetoothAdapterStateChange = ENV_OBJ.onBluetoothAdapterStateChange || envError('onBluetoothAdapterStateChange')
+
+const offBluetoothAdapterStateChange = ENV_OBJ.offBluetoothAdapterStateChange || envError('offBluetoothAdapterStateChange')
+
+const getBluetoothDevices = ENV_OBJ.getBluetoothDevices || envError('getBluetoothDevices')
+
+const writeBLECharacteristicValue = ENV_OBJ.writeBLECharacteristicValue || envError('writeBLECharacteristicValue')
+
+const readBLECharacteristicValue = ENV_OBJ.readBLECharacteristicValue || envError('readBLECharacteristicValue')
+
+const notifyBLECharacteristicValueChange = ENV_OBJ.notifyBLECharacteristicValueChange || envError('notifyBLECharacteristicValueChange')
+
+const onBLECharacteristicValueChange = ENV_OBJ.onBLECharacteristicValueChange || envError('onBLECharacteristicValueChange')
+
+const offBLECharacteristicValueChange = ENV_OBJ.offBLECharacteristicValueChange || envError('offBLECharacteristicValueChange')
+
+const setBLEMTU = ENV_OBJ.setBLEMTU || envError('setBLEMTU')
+
+const getBLEDeviceRSSI = ENV_OBJ.getBLEDeviceRSSI || envError('getBLEDeviceRSSI')
+
+const getBLEDeviceServices = ENV_OBJ.getBLEDeviceServices || envError('getBLEDeviceServices')
+
+const getBLEDeviceCharacteristics = ENV_OBJ.getBLEDeviceCharacteristics || envError('getBLEDeviceCharacteristics')
+
 export {
   closeBLEConnection,
   createBLEConnection,
-  onBLEConnectionStateChange
+  onBLEConnectionStateChange,
+  offBLEConnectionStateChange,
+  openBluetoothAdapter,
+  closeBluetoothAdapter,
+  startBluetoothDevicesDiscovery,
+  stopBluetoothDevicesDiscovery,
+  onBluetoothDeviceFound,
+  offBluetoothDeviceFound,
+  getConnectedBluetoothDevices,
+  getBluetoothAdapterState,
+  onBluetoothAdapterStateChange,
+  offBluetoothAdapterStateChange,
+  getBluetoothDevices,
+  writeBLECharacteristicValue,
+  readBLECharacteristicValue,
+  notifyBLECharacteristicValueChange,
+  onBLECharacteristicValueChange,
+  offBLECharacteristicValueChange,
+  setBLEMTU,
+  getBLEDeviceRSSI,
+  getBLEDeviceServices,
+  getBLEDeviceCharacteristics
 }