Merge pull request #15917 from guoenxuan/jd-main

fix: [harmony-hybrid]修复导航栏配置无效以及getLaunchOptionsSync无返回值的问题
NervJS · Jun 18, 2024 · eeacd2c · eeacd2c
2 parents 5fea6f9 + 98e8a50
commit eeacd2c
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 251 deletions.
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts
@@ -212,11 +212,23 @@ export class NativeApi {
     return options
   }
 
+  // @ts-ignore
+  @(asyncAndRelease)
+  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  setNavigationStyle (options: any): void {}
+
+  // @ts-ignore
+  @(asyncAndRelease)
+  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  setCapsuleState (options: any): void {}
+
   // @ts-ignore
   @(syncAndRelease)
-  setNavigationStyle (options: any): any {
-    return options
-  }
+  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  getCapsuleState (options: any): any {}
 
   // @ts-ignore
   @(syncAndRelease)

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/index.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/index.ts
@@ -1,7 +1,3 @@
-import Taro from '@tarojs/api'
-
-import native from './NativeApi'
-
 export * from './ad'
 export * from './ai'
 export * from './alipay'
@@ -28,47 +24,3 @@ export * from './swan'
 export * from './ui'
 export * from './worker'
 export * from './wxml'
-
-if (typeof window !== 'undefined') {
-  // @ts-ignore
-  window.currentNavigation = {}
-}
-
-Taro.eventCenter.on('__taroSetNavigationStyle', (style, textStyle, backgroundColor) => {
-  if (typeof window !== 'undefined') {
-    native.setNavigationStyle({ style: style, textStyle: textStyle, backgroundColor: backgroundColor })
-    // @ts-ignore
-    Object.assign(window.currentNavigation, {
-      style,
-      textStyle,
-      backgroundColor,
-    })
-    // @ts-ignore
-    if (typeof window.originCapsuleState !== 'undefined') {
-      // @ts-ignore
-      window.native?.setCapsuleState?.(window.originCapsuleState)
-    }
-  }
-})
-
-Taro.eventCenter.on('__taroEnterFullScreen', () => {
-  native.setNavigationStyle({ style: 'custom', textStyle: 'black', backgroundColor: '#000000' })
-  // @ts-ignore
-  if (typeof window.originCapsuleState === 'undefined') {
-    // @ts-ignore
-    window.originCapsuleState = window.native?.getCapsuleState().visible
-  }
-  // @ts-ignore
-  window.native?.setCapsuleState?.(false)
-})
-
-Taro.eventCenter.on('__taroExitFullScreen', () => {
-  // @ts-ignore
-  const { style, textStyle, backgroundColor } = window.currentNavigation
-  native.setNavigationStyle({ style: style, textStyle: textStyle, backgroundColor: backgroundColor })
-  // @ts-ignore
-  if (typeof window.originCapsuleState !== 'undefined') {
-    // @ts-ignore
-    window.native?.setCapsuleState?.(window.originCapsuleState)
-  }
-})
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/taro.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/taro.ts
@@ -5,10 +5,13 @@ import {
   getApp,
   getCurrentInstance,
   getCurrentPages,
+  initLaunchOptions,
+  loadNavigationStyle,
   navigateBack,
   navigateTo,
   nextTick,
   redirectTo,
+  registerNavigationStyleHandler,
   reLaunch,
   switchTab,
 } from './index'
@@ -22,6 +25,12 @@ const requirePlugin = () => {
   }
 }
 
+loadNavigationStyle()
+registerNavigationStyleHandler()
+
+// 同步小程序启动时的参数
+Taro.eventCenter.once('__taroRouterLaunch', initLaunchOptions)
+
 const {
   Behavior,
   getEnv,

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/ui/navigation-bar/index.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/ui/navigation-bar/index.ts
@@ -1,37 +1,10 @@
 import Taro from '@tarojs/api'
-import { addStyle } from '@tarojs/router/dist/style'
 import { setTitle } from '@tarojs/router/dist/utils/navigate'
 
 import native from '../../NativeApi'
 import { getParameterError, shouldBeObject } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
 
-/**
- * 导航条与Web层叠布局，导航条可见情况下Web页面顶部空出一定高度的留白
- */
-function loadNavigationSytle () {
-  if (typeof window === 'undefined') {
-    return
-  }
-  // @ts-ignore
-  const naviHeight = window.navigationHeight ? window.navigationHeight : 0
-  const css = `
-.taro_router .taro_page.taro_navigation_page {
-  padding-top: ${naviHeight}px;
-}
-
-.taro-tabbar__container .taro_page.taro_navigation_page {
-  max-height: calc(100vh - ${naviHeight}px);
-}
-
-.taro-tabbar__container .taro_page.taro_tabbar_page.taro_navigation_page {
-  max-height: calc(100vh - 50px - ${naviHeight}px);
-}`
-  addStyle(css)
-}
-
-loadNavigationSytle()
-
 /**
  * 显示页面导航条加载图标
  *
@@ -149,3 +122,4 @@ export const setNavigationBarColor: typeof Taro.setNavigationBarColor = (options
  * @null_implementation
  */
 export const hideHomeButton = () => Promise.resolve()
+export { loadNavigationStyle, registerNavigationStyleHandler } from './style-event'
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/ui/navigation-bar/style-event.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/ui/navigation-bar/style-event.ts
@@ -0,0 +1,77 @@
+import Taro from '@tarojs/api'
+
+import native from '../../NativeApi'
+
+/**
+ * 导航条与Web层叠布局，导航条可见情况下Web页面顶部空出一定高度的留白
+ */
+export function loadNavigationStyle () {
+  if (window === undefined) {
+    return
+  }
+  // @ts-ignore
+  const naviHeight = window.navigationHeight ? window.navigationHeight : 0
+  const css = `
+.taro_router .taro_page.taro_navigation_page {
+  padding-top: ${naviHeight}px;
+}
+
+.taro-tabbar__container .taro_page.taro_navigation_page {
+  max-height: calc(100vh - ${naviHeight}px);
+}
+
+.taro-tabbar__container .taro_page.taro_tabbar_page.taro_navigation_page {
+  max-height: calc(100vh - 50px - ${naviHeight}px);
+}`
+  const style = document.createElement('style')
+  style.innerHTML = css
+  document.getElementsByTagName('head')[0].appendChild(style)
+}
+
+/**
+ * 监听导航栏设置、进入/退出全屏事件，更改导航栏样式以及显示/隐藏胶囊按钮
+ */
+export function registerNavigationStyleHandler () {
+  if (window !== undefined) {
+    // @ts-ignore
+    window.currentNavigation = {}
+  }
+
+  Taro.eventCenter.on('__taroSetNavigationStyle', (style, textStyle, backgroundColor) => {
+    if (window !== undefined) {
+      native.setNavigationStyle({ style: style, textStyle: textStyle, backgroundColor: backgroundColor })
+      // @ts-ignore
+      Object.assign(window.currentNavigation, {
+        style,
+        textStyle,
+        backgroundColor,
+      })
+      // @ts-ignore
+      const { originCapsuleVisible } = window
+      if (originCapsuleVisible !== undefined) {
+        native.setCapsuleState({ visible: originCapsuleVisible })
+      }
+    }
+  })
+
+  Taro.eventCenter.on('__taroEnterFullScreen', () => {
+    native.setNavigationStyle({ style: 'custom', textStyle: 'black', backgroundColor: '#000000' })
+    // @ts-ignore
+    if (window.originCapsuleVisible === undefined) {
+      // @ts-ignore
+      window.originCapsuleVisible = native.getCapsuleState().visible
+    }
+    native.setCapsuleState({ visible: false })
+  })
+
+  Taro.eventCenter.on('__taroExitFullScreen', () => {
+    // @ts-ignore
+    const { style, textStyle, backgroundColor } = window.currentNavigation
+    native.setNavigationStyle({ style: style, textStyle: textStyle, backgroundColor: backgroundColor })
+    // @ts-ignore
+    const { originCapsuleVisible } = window
+    if (originCapsuleVisible !== undefined) {
+      native.setCapsuleState({ visible: originCapsuleVisible })
+    }
+  })
+}