From 80a329b9673d57285592419c8183b192381eecc5 Mon Sep 17 00:00:00 2001 From: chenai02 <1766431377@qq.com> Date: Sat, 9 Mar 2024 10:27:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DgetSetting=E5=92=8Cope?= =?UTF-8?q?nSetting=E6=A1=A5=E6=8E=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BF=AE=E5=A4=8DnativeApi=E4=B8=AD=E6=A1=A5?= =?UTF-8?q?=E6=8E=A5=E5=AD=97=E6=AE=B5isAsync=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-mpharmony/src/api/NativeApi.ts | 92 +++++++++---------- .../src/api/open-api/settings/getSetting.ts | 1 - .../src/api/open-api/settings/openSetting.ts | 1 - 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/packages/taro-mpharmony/src/api/NativeApi.ts b/packages/taro-mpharmony/src/api/NativeApi.ts index 93095d33278f..befa7471b6e4 100644 --- a/packages/taro-mpharmony/src/api/NativeApi.ts +++ b/packages/taro-mpharmony/src/api/NativeApi.ts @@ -40,7 +40,7 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) navigateToMiniProgram (options: any) { return options } @@ -58,13 +58,13 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) request (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) saveDataUrlToFile (options: any): any { return options } @@ -76,13 +76,13 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) startAccelerometer (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) stopAccelerometer (options: any): any { return options } @@ -94,19 +94,19 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) offAccelerometerChange (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) startCompass (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) stopCompass (options: any): any { return options } @@ -118,19 +118,19 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) offCompassChange (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) startGyroscope (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) stopGyroscope (options: any): any { return options } @@ -142,79 +142,79 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) saveImageToPhotosAlbum (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) chooseMediaAssets (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getVideoInfo (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getImageInfo (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) compressVideo (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getLocation (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) openDocument (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) login (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) setNavigationStyle (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getUserInfo (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: false }) openSetting (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: false }) getSetting (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) setKeepScreenOn (options: any): any { return options } @@ -226,7 +226,7 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: false }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) offUserCaptureScreen (options: any): any { return options } @@ -238,19 +238,19 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) offLocationChange (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) setScreenBrightness (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getScreenBrightness (options: any): any { return options } @@ -262,7 +262,7 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) offMemoryWarning (options: any): any { return options } @@ -286,72 +286,72 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) makePhoneCall (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getSavedFileList (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) removeSavedFile (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getSavedFileInfo (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) addPhoneContact (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) scanCode (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) vibrateShort (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) vibrateLong (options: any): any { return options } // NativeUpdateManager // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) applyUpdate (): any {} // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) onCheckForUpdate (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) onUpdateFailed (options: any): any { return options } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) onUpdateReady (options: any): any { return options } @@ -538,7 +538,7 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) downloadFile (options: any): any { return options } @@ -550,13 +550,13 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: false }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) offHeadersReceived (option: any, _: number): any { return option } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: false }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) offProgressUpdate (option: any, _: number): any { return option } @@ -575,7 +575,7 @@ class NativeApi { // NativeFileSystemManager // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) getFileManager (): any {} // @ts-ignore @@ -585,7 +585,7 @@ class NativeApi { } // @ts-ignore - @window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) + @window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) saveFile (option: any): any { return option } diff --git a/packages/taro-mpharmony/src/api/open-api/settings/getSetting.ts b/packages/taro-mpharmony/src/api/open-api/settings/getSetting.ts index 00b8eed7863d..004b31ad12f1 100644 --- a/packages/taro-mpharmony/src/api/open-api/settings/getSetting.ts +++ b/packages/taro-mpharmony/src/api/open-api/settings/getSetting.ts @@ -21,7 +21,6 @@ export const getSetting: typeof Taro.getSetting = function (options) { return Promise.reject(res) } - // @ts-ignore return native.getSetting(options) } diff --git a/packages/taro-mpharmony/src/api/open-api/settings/openSetting.ts b/packages/taro-mpharmony/src/api/open-api/settings/openSetting.ts index dcd0336423e3..35fd46a07eed 100644 --- a/packages/taro-mpharmony/src/api/open-api/settings/openSetting.ts +++ b/packages/taro-mpharmony/src/api/open-api/settings/openSetting.ts @@ -20,6 +20,5 @@ export const openSetting: typeof Taro.openSetting = function (options) { return Promise.reject(res) } - // @ts-ignore return native.openSetting(options) }