diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene2A.ets b/GesturesConfictPractice/entry/src/main/ets/pages/GesturesConflictScene2A.ets index c38b082cefe7c7fd96287e036208eff4383ba93e..ae5b415b90dfc23dfd7d4d2d55437743b202cab2 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 226f4c281ef1e5132543ca1c552742990dc66e53..ebec636104cfa59a6f1d9fcae8fa61d28f64381a 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 780c8286c4bd5445ac4aa19211a3e0ebce7b5924..23e9fa92f94ac8fd190bf96ae6f479209f03292d 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 af7d20b2315490d1cc985de20373298d5960c942..a2af336d1a28177cb3db3bdf9f9bc41bb024dcb9 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 724afc43ff8e1c82e457b616a5263eed8ed809ee..d51d00634ec60744d81cc97d98b9e452d0a8948f 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 bffc149b6e8adb4130f6e18963cd44ac829873f5..a9d8a55777ee7a9628fd76273a4264b9546e2739 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}`); }); } diff --git a/GesturesConfictPractice/entry/src/main/ets/pages/WebScrollDemo.ets b/GesturesConfictPractice/entry/src/main/ets/pages/WebScrollDemo.ets index 664d8d56c906c8fdf2f5977b5b3601d24443cbfa..0ab876abd3dc877613163d48d548cb5a0fd4cc9f 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