fix: 不允许 Gyroscope 及 Accelerometer 重复 start

wssx6688 · Mar 23, 2021 · 9c78a97 · 9c78a97
1 parent 3a4226e
commit 9c78a97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/taro-rn/src/lib/accelerometer.ts b/packages/taro-rn/src/lib/accelerometer.ts
@@ -9,7 +9,7 @@ const intervalMap: any = {
   normal: 200
 }
 
-function offAccelerometerChange(fnc?: () => any): void {
+function offAccelerometerChange(fnc?: Taro.onAccelerometerChange.Callback): void {
   if (fnc && typeof fnc === 'function') {
     accCase.callbacks = accCase.callbacks.filter((cb: (...args: any[]) => any) => cb !== fnc)
   } else if (fnc === undefined) {
@@ -33,6 +33,10 @@ function startAccelerometer(opts: Taro.startAccelerometer.Option = {}): Promise<
   accCase.interval = interval
   const res = { errMsg: 'startAccelerometer:ok' }
   try {
+    // 适配微信小程序行为：重复 start 失败
+    if (accCase.listener) {
+      throw new Error('startAccelerometer:fail')
+    }
     accCase.listener = Accelerometer.addListener((e: Taro.onAccelerometerChange.Result) => {
       accCase.callbacks.forEach((cb: (...args: any[]) => any) => {
         cb?.(e)

diff --git a/packages/taro-rn/src/lib/gyroscope.ts b/packages/taro-rn/src/lib/gyroscope.ts
@@ -19,6 +19,10 @@ function startGyroscope(opts: Taro.startGyroscope.Option = {}): Promise<Taro.Gen
     gyroCase.interval = interval
     const res = { errMsg: 'startGyroscope:ok' }
     try {
+        // 适配微信小程序行为：重复 start 失败
+        if (gyroCase.listener) {
+            throw new Error('startGyroscope:fail')
+        }
         gyroCase.listener = Gyroscope.addListener(e => {
             gyroCase.callbacks.forEach((cb: Taro.onGyroscopeChange.Callback) => {
                 cb?.(e)
@@ -69,7 +73,7 @@ function onGyroscopeChange(fnc: Taro.onGyroscopeChange.Callback): void {
  * 取消监听陀螺仪数据变化事件
  * @param opts 
  */
-function offGyroscopeChange(fnc?: () => any) {
+function offGyroscopeChange(fnc?: Taro.onGyroscopeChange.Callback) {
     if (fnc && typeof fnc === 'function') {
         gyroCase.callbacks = gyroCase.callbacks.filter((cb: Taro.onGyroscopeChange.Callback) => {
             return cb !== fnc