From 7e6d42e58dfd35f9f7826a6e43536a066c9c5538 Mon Sep 17 00:00:00 2001
From: kongxiaojun <kongxiaojun@58.com>
Date: Wed, 10 Jul 2024 19:37:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20[harmony-hybrid]=20exitMiniProgram?=
 =?UTF-8?q?=20api=E8=B0=83=E7=94=A8=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/api/redirection/index.tsx               |  5 ++++-
 .../build/config/harmony-definition.json              |  7 ++++++-
 .../src/api/apis/NativeApi.ts                         |  5 +++++
 .../src/api/apis/comments.ts                          |  6 ------
 .../src/api/apis/navigate/index.ts                    | 11 +++++++++++
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/examples/mini-program-example/src/pages/api/redirection/index.tsx b/examples/mini-program-example/src/pages/api/redirection/index.tsx
index d9b32456a96a..0fae968e580a 100644
--- a/examples/mini-program-example/src/pages/api/redirection/index.tsx
+++ b/examples/mini-program-example/src/pages/api/redirection/index.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 import { View } from '@tarojs/components'
 import ButtonList from '@/components/buttonList'
 import './index.scss'
+import Taro from '@tarojs/taro'
 
 /**
  * 跳转
@@ -29,7 +30,9 @@ export default class Index extends React.Component {
       },
       {
         id: 'exitMiniProgram',
-        func: null,
+        func: () => {
+          Taro.exitMiniProgram()
+        },
       },
     ],
   }
diff --git a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json
index 3fa70fbab7a6..1b71e15f47fd 100644
--- a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json
+++ b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json
@@ -763,7 +763,12 @@
       "TARO_ENV": true,
       "USER_DATA_PATH": true
     },
-    "exitMiniProgram": false,
+    "exitMiniProgram": {
+      "object": {
+        "url": true,
+        "events": true
+      }
+    },
     "exitVoIPChat": false,
     "faceDetect": false,
     "faceVerifyForPay": false,
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts
index 9ab12d5b3906..4357dbafb26c 100644
--- a/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts
+++ b/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts
@@ -607,6 +607,11 @@ export class NativeApi {
   callInstanceAsync (option: any): any {
     return option
   }
+
+  @(asyncAndRelease)
+  exitMiniProgram (option?: any): any {
+    return option
+  }
 }
 
 export interface Status {
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/comments.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/comments.ts
index e86e430d641b..3e68b6b0db70 100644
--- a/packages/taro-platform-harmony-hybrid/src/api/apis/comments.ts
+++ b/packages/taro-platform-harmony-hybrid/src/api/apis/comments.ts
@@ -607,12 +607,6 @@
  * @canNotUse editImage
  */
 
-/**
- * 退出当前小程序
- *
- * @canNotUse exitMiniProgram
- */
-
 /**
  * 退出（销毁）实时语音通话
  *
diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts
index e1855051d5a1..df83798bac14 100644
--- a/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts
+++ b/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts
@@ -1,5 +1,6 @@
 import Taro from '@tarojs/api'
 import { navigateTo as navigateToH5 } from '@tarojs/taro-h5'
+import native from '../NativeApi'
 
 const delay = 300
 let lastExecuteTime = 0
@@ -22,3 +23,13 @@ export function navigateTo (option: Taro.navigateTo.Option) {
   lastUrl = targetUrl
   return navigateToH5(option)
 }
+
+/**
+ * 退出当前小程序。必须有点击行为才能调用成功。
+ *
+ * @canUse exitMiniProgram
+ * @__object [url, events]
+ */
+export function exitMiniProgram (option?: any) {
+  native.exitMiniProgram(option)
+}

From 00b646c7098d8ecebe9ea9b0790566985f467433 Mon Sep 17 00:00:00 2001
From: kongxiaojun <kongxiaojun@58.com>
Date: Wed, 10 Jul 2024 20:07:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20[harmony-hybrid]=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/apis/navigate/index.ts                         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts
index fd5b159a58c9..2fd39e301247 100644
--- a/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts
+++ b/packages/taro-platform-harmony-hybrid/src/api/apis/navigate/index.ts
@@ -1,8 +1,8 @@
 import Taro from '@tarojs/api'
-import { navigateTo as navigateToH5 } from '@tarojs/taro-h5'
-import native from '../NativeApi'
 import { navigateBack as navigateBackH5, navigateTo as navigateToH5 } from '@tarojs/taro-h5'
 
+import native from '../NativeApi'
+
 function getFromParameter (from: string|undefined): number {
   let number: number = -1
   if (from) {
@@ -45,7 +45,8 @@ export function exitMiniProgram (option?: any) {
   native.exitMiniProgram(option)
 }
 
-* 关闭当前页面，返回上一页面或多级页面。
+/**
+ * 关闭当前页面，返回上一页面或多级页面。
  *
  * @canUse navigateBack
  * @__object [delta]