From 0739072db4ae8d666c5a17f104900c0b7983af19 Mon Sep 17 00:00:00 2001 From: kangliangup <2352009235@qq.com> Date: Fri, 5 Dec 2025 17:21:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=BA=90=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/ets/pages/WebScrollDemo.ets | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/WebScrollDemo.ets b/GesturesConfictPractice/entry/src/main/ets/pages/WebScrollDemo.ets index 664d8d56..0ab876ab 100644 --- a/GesturesConfictPractice/entry/src/main/ets/pages/WebScrollDemo.ets +++ b/GesturesConfictPractice/entry/src/main/ets/pages/WebScrollDemo.ets @@ -21,7 +21,6 @@ struct WebScrollDemo { controller: webview.WebviewController = new webview.WebviewController(); build() { - // [Start web_nested_scroll] Scroll() { Column() { Text('Text') @@ -29,6 +28,7 @@ struct WebScrollDemo { .backgroundColor(Color.Red) .width('100%') .height('40%') + // [Start web_nested_scroll] Web( // [StartExclude web_nested_scroll] { src: 'https://developer.huawei.com/consumer/cn/', controller: this.controller } @@ -38,9 +38,8 @@ struct WebScrollDemo { scrollForward: NestedScrollMode.PARENT_FIRST, scrollBackward: NestedScrollMode.SELF_FIRST }) - + // [End web_nested_scroll] } } - // [End web_nested_scroll] } } \ No newline at end of file -- Gitee From 2f56e5ee15491562cd11140b065c3bedfef1db7a Mon Sep 17 00:00:00 2001 From: kangliangup <2352009235@qq.com> Date: Fri, 5 Dec 2025 17:45:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=BA=90=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/ets/pages/GesturesConflictScene2A.ets | 6 +++--- .../entry/src/main/ets/pages/GesturesConflictScene3.ets | 2 +- .../entry/src/main/ets/pages/GesturesConflictScene3A.ets | 2 +- .../entry/src/main/ets/pages/GesturesConflictScene4.ets | 2 +- .../entry/src/main/ets/pages/GesturesConflictScene5.ets | 2 +- GesturesConfictPractice/entry/src/main/ets/pages/Index.ets | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene2A.ets b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene2A.ets index c38b082c..ae5b415b 100644 --- a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene2A.ets +++ b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene2A.ets @@ -15,7 +15,7 @@ @Entry @Component -struct GesturesConflictScene21 { +struct GesturesConflictScene2A { @State count1: number = 0; @State count2: number = 0; @@ -26,7 +26,7 @@ struct GesturesConflictScene21 { } .height(200) .width('100%') - // DocsCode 1 + // [Start Conflict_Scene2A] .gesture( GestureGroup(GestureMode.Parallel, TapGesture({ count: 2 }) @@ -39,6 +39,6 @@ struct GesturesConflictScene21 { }) ) ) - // DocsCode 1 + // [End Conflict_Scene2A] } } \ No newline at end of file diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3.ets b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3.ets index 226f4c28..ebec6361 100644 --- a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3.ets +++ b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3.ets @@ -42,7 +42,7 @@ struct GesturesConflictScene3 { this.getUIContext().getPromptAction().showToast({ message: 'Long Press' }); } catch (err) { let error = err as BusinessError; - hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, mesage: ${error.message}`); + hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, message: ${error.message}`); } }) ) diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3A.ets b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3A.ets index 780c8286..23e9fa92 100644 --- a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3A.ets +++ b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene3A.ets @@ -41,7 +41,7 @@ struct GesturesConflictScene3A { this.getUIContext().getPromptAction().showToast({ message: 'Long Press' }); } catch (err) { let error = err as BusinessError; - hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, mesage: ${error.message}`); + hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, message: ${error.message}`); } }) ) diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene4.ets b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene4.ets index af7d20b2..a2af336d 100644 --- a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene4.ets +++ b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene4.ets @@ -34,7 +34,7 @@ struct GesturesConflictScene4 { this.getUIContext().getPromptAction().showToast({ message: 'SwipeGesture' }); } catch (err) { let error = err as BusinessError; - hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, mesage: ${error.message}`); + hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, message: ${error.message}`); } } }) diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene5.ets b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene5.ets index 724afc43..d51d0063 100644 --- a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene5.ets +++ b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene5.ets @@ -37,7 +37,7 @@ struct GesturesConflictScene5 { this.getUIContext().getPromptAction().showToast({ message: 'GesturesConflictScene5 Button2 click' }); } catch (err) { let error = err as BusinessError; - hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, mesage: ${error.message}`); + hilog.error(0x0000, 'testTag', `showToast err, code: ${error.code}, message: ${error.message}`); } }) } diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets b/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets index bffc149b..a9d8a557 100644 --- a/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets +++ b/GesturesConfictPractice/entry/src/main/ets/pages/Index.ets @@ -24,7 +24,7 @@ struct Index { jumperPage(url: string) { this.router.pushUrl({ url: `pages/${url}` }).catch((error: BusinessError) => { - console.error(`reset err, code: ${error.code}, mesage: ${error.message}`); + console.error(`reset err, code: ${error.code}, message: ${error.message}`); }); } -- Gitee