From bbc3fc8b0292cdbd37ad81bc239a88297a83ddb9 Mon Sep 17 00:00:00 2001
From: kangliang <2352009235@qq.com>
Date: Wed, 15 Oct 2025 14:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GesturesConfictPractice/README.md             |  5 +-
 .../entry/src/main/ets/pages/Index.ets        | 73 +++++++++++++++++--
 .../entry/src/main/ets/pages/TestCode.ets     | 47 ------------
 3 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/GesturesConfictPractice/README.md b/GesturesConfictPractice/README.md
index 97f36df4..b9a583fb 100644
--- a/GesturesConfictPractice/README.md
+++ b/GesturesConfictPractice/README.md
@@ -6,8 +6,7 @@
 
 #### 使用说明
 
-1. 修改EntryAbility.ets文件中windowStage.loadContent('pages/Index')方法的参数，为pages目录下的页面。
-2. 安装应用体验pages目录下不同页面的功能。
+安装运行应用，进入应用首页，点击不同的按钮跳转到不同的手势场景示例。
 
 ## 工程目录
 
@@ -28,7 +27,7 @@
 │     ├──GesturesConflictScene6.ets     // 动态控制自定义手势是否响应
 │     ├──GesturesConflictScene7.ets     // 父组件如何管理子组件手势
 │     ├──Index.ets                      // 应用首页
-│     └──TestCode.ets                   // 二级页面“图文列表”UI
+│     └──TestCode.ets                   // Web组件示例
 └──entry/src/main/resources             // 应用资源目录
 ```
 
diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets b/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets
index 7be5d8ee..79c29176 100644
--- a/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets
+++ b/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets
@@ -13,23 +13,80 @@
 * limitations under the License.
 */
 
+import { BusinessError } from '@kit.BasicServicesKit';
+import { Router } from '@ohos.arkui.UIContext';
+
 @Entry
 @Component
 struct Index {
   @State message: string = 'Hello World';
+  private router: Router = this.getUIContext().getRouter();
+
+  jumperPage(url: string) {
+    this.router.pushUrl({ url: `pages/${url}` }).catch((error: BusinessError) => {
+      console.error(`reset err, code: ${error.code}, mesage: ${error.message}`);
+    });
+  }
 
   build() {
-    RelativeContainer() {
-      Text(this.message)
-        .id('HelloWorld')
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-        .alignRules({
-          center: { anchor: '__container__', align: VerticalAlign.Center },
-          middle: { anchor: '__container__', align: HorizontalAlign.Center }
+    Column({ space: 12 }) {
+      Button('GesturesConflictScene1')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene1');
+        })
+
+      Button('GesturesConflictScene2')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene2');
+        })
+
+      Button('GesturesConflictScene2A')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene2A');
+        })
+
+      Button('GesturesConflictScene3')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene3');
+        })
+
+      Button('GesturesConflictScene3A')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene3A');
+        })
+
+      Button('GesturesConflictScene4')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene4');
+        })
+
+      Button('GesturesConflictScene5')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene5');
+        })
+
+      Button('GesturesConflictScene6')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene6');
+        })
+
+      Button('GesturesConflictScene7')
+        .width('100%')
+        .onClick(() => {
+          this.jumperPage('GesturesConflictScene7');
         })
     }
     .height('100%')
     .width('100%')
+    .padding(16)
+    .justifyContent(FlexAlign.End)
   }
 }
\ No newline at end of file
diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/TestCode.ets b/GesturesConfictPractice/entry/src/main/ets/pages/TestCode.ets
index 89078ff5..0660c014 100644
--- a/GesturesConfictPractice/entry/src/main/ets/pages/TestCode.ets
+++ b/GesturesConfictPractice/entry/src/main/ets/pages/TestCode.ets
@@ -15,25 +15,6 @@
 
 import { webview } from '@kit.ArkWeb';
 
-@Component
-struct Index {
-  @State message: string = 'Hello World';
-
-  // [Start test_code_build]
-  build() {
-    StackA() {
-      ComponentB() {
-        ComponentC()
-      }
-
-      ComponentD() {
-        ComponentE()
-      }
-    }
-  }
-  // [End test_code_build]
-}
-
 @Component
 struct StackA {
   controller: webview.WebviewController = new webview.WebviewController();
@@ -51,32 +32,4 @@ struct StackA {
       })
     // [End web_nested_scroll]
   }
-}
-
-@Component
-struct ComponentB {
-  build() {
-
-  }
-}
-
-@Component
-struct ComponentC {
-  build() {
-
-  }
-}
-
-@Component
-struct ComponentD {
-  build() {
-
-  }
-}
-
-@Component
-struct ComponentE {
-  build() {
-
-  }
 }
\ No newline at end of file
-- 
Gitee