From c0f1a8553649a39d3619d0d5bc426640f6cdf9c4 Mon Sep 17 00:00:00 2001
From: liugang9704 <2745340733@qq.com>
Date: Thu, 19 Jun 2025 11:22:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/entryability/EntryAbility.ets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index 1a66c93..656117c 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -31,7 +31,6 @@ export default class EntryAbility extends UIAbility {
     let shortCutKey = want.parameters?.shortCutKey;
 
     if (this.uiContext && shortCutKey && shortCutKey === 'CompanyPage') {
-      let router: Router = this.uiContext.getRouter();
       this.uiContext.getRouter().pushUrl({
         url: 'pages/GoCompany'
       }).catch((err: BusinessError) => {
@@ -39,7 +38,6 @@ export default class EntryAbility extends UIAbility {
       });
     }
     if (this.uiContext && shortCutKey && shortCutKey === 'HousePage') {
-      let router: Router = this.uiContext.getRouter();
       this.uiContext.getRouter().pushUrl({
         url: 'pages/GoHouse'
       }).catch((err: BusinessError) => {
-- 
Gitee


From 4bca692d8bd54063b5eb50a5020bb06ca1a5b36f Mon Sep 17 00:00:00 2001
From: liugang9704 <2745340733@qq.com>
Date: Fri, 11 Jul 2025 10:26:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E9=A6=96=E9=A1=B5=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/ets/entryability/EntryAbility.ets    | 27 +-----------
 entry/src/main/ets/pages/Index.ets            | 41 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index 656117c..debdcf0 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -19,39 +19,16 @@
 
 import { AbilityConstant, UIAbility, Want } from '@kit.AbilityKit';
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { Router, window } from '@kit.ArkUI';
-import { BusinessError } from '@kit.BasicServicesKit';
+import { window } from '@kit.ArkUI';
 
 export default class EntryAbility extends UIAbility {
   funcAbilityWant: Want | undefined = undefined;
   uiContext: UIContext | undefined = undefined;
 
-  // [Start goToSpecifyPage]
-  goToSpecifyPage(want: Want) {
-    let shortCutKey = want.parameters?.shortCutKey;
-
-    if (this.uiContext && shortCutKey && shortCutKey === 'CompanyPage') {
-      this.uiContext.getRouter().pushUrl({
-        url: 'pages/GoCompany'
-      }).catch((err: BusinessError) => {
-        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
-      });
-    }
-    if (this.uiContext && shortCutKey && shortCutKey === 'HousePage') {
-      this.uiContext.getRouter().pushUrl({
-        url: 'pages/GoHouse'
-      }).catch((err: BusinessError) => {
-        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
-      });
-    }
-  }
-  // [End goToSpecifyPage]
-
   // [Start onNewWant]
   onNewWant(want: Want, launchParam: AbilityConstant.LaunchParam): void {
     // Receive the parameters passed by UIAbility from the caller
-    this.goToSpecifyPage(want);
-
+    AppStorage.setOrCreate('want',want);
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onNewWant');
   }
   // [End onNewWant]
diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets
index e698780..32fb473 100644
--- a/entry/src/main/ets/pages/Index.ets
+++ b/entry/src/main/ets/pages/Index.ets
@@ -13,10 +13,13 @@
  * limitations under the License.
  */
 
-import { display, promptAction } from '@kit.ArkUI';
+import { display } from '@kit.ArkUI';
+import { i18n } from '@kit.LocalizationKit';
+import { Want } from '@kit.AbilityKit';
+import { BusinessError } from '@kit.BasicServicesKit';
+import { hilog } from '@kit.PerformanceAnalysisKit';
 import { GoHouse } from './GoHouse';
 import { GoCompany } from './GoCompany';
-import { i18n } from '@kit.LocalizationKit';
 
 @Entry
 @Component
@@ -61,6 +64,40 @@ struct Index {
     }
   }
 
+  // [Start goToSpecifyPage]
+  goToSpecifyPage(want?: Want) {
+    let shortCutKey = want?.parameters?.shortCutKey;
+
+    if (shortCutKey && shortCutKey === 'CompanyPage') {
+      this.getUIContext().getRouter().pushUrl({
+        url: 'pages/GoCompany'
+      }).catch((err: BusinessError) => {
+        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
+      });
+    }
+    if (shortCutKey && shortCutKey === 'HousePage') {
+      this.getUIContext().getRouter().pushUrl({
+        url: 'pages/GoHouse'
+      }).catch((err: BusinessError) => {
+        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
+      });
+    }
+  }
+
+  // [End goToSpecifyPage]
+
+  // [Start onPageShow]
+  onPageShow(): void {
+    if (AppStorage.has('want')) {
+      let want: Want | undefined = AppStorage.get('want');
+      if (want) {
+        this.goToSpecifyPage(want);
+        AppStorage.delete('want');
+      }
+    }
+  }
+  // [End onPageShow]
+
   showTips() {
     this.getUIContext().getPromptAction().showToast({
       message: $r('app.string.ui_displayed'),
-- 
Gitee