diff --git a/features/home/src/main/ets/pages/ConversationDetail.ets b/features/home/src/main/ets/pages/ConversationDetail.ets index 34f8a304ebd58a2ab35c2115eee019e3e6f8ede3..59bb57a21a4f21a4b7fa35aec9cea29408afc0cf 100755 --- a/features/home/src/main/ets/pages/ConversationDetail.ets +++ b/features/home/src/main/ets/pages/ConversationDetail.ets @@ -19,7 +19,7 @@ import ConversationDetailItem from '../views/Conversation/ConversationDetailItem import { ConversationDetailTopSearch } from '../views/Conversation/ConversationDetailTopSearch'; import { HomeConstants } from '../constants/HomeConstants'; import { deviceInfo } from '@kit.BasicServicesKit'; - +// [Start conversation_detail] @Component export struct ConversationDetail { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; @@ -86,4 +86,5 @@ export struct ConversationDetail { } .hideTitleBar(true) } -} \ No newline at end of file +} +// [End conversation_detail] \ No newline at end of file diff --git a/features/home/src/main/ets/pages/ConversationList.ets b/features/home/src/main/ets/pages/ConversationList.ets index cd766b0795eb96ef265bf0c31ae5300dfc8dec20..753ea05e0896b72a9cd06ede81a5a1b6901c9c9a 100755 --- a/features/home/src/main/ets/pages/ConversationList.ets +++ b/features/home/src/main/ets/pages/ConversationList.ets @@ -19,7 +19,7 @@ import { ConversationItem } from '../views/Conversation/ConversationItem'; import { HomeTopSearch } from '../views/common/HomeTopSearch'; import { HomeConstants } from '../constants/HomeConstants'; import { deviceInfo } from '@kit.BasicServicesKit'; - +// [Start conversation_list_diff_device] @Component export struct ConversationList { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; @@ -32,6 +32,7 @@ export struct ConversationList { Flex({ direction: FlexDirection.Column }) { HomeTopSearch({ title: HomeConstants.CONVERSATION_TITLE }) .height('13%') + // [Start conversation_list] List() { ForEach(ConversationListData, (item: ConversationDataInterface, index: number) => { ListItem() { @@ -51,6 +52,7 @@ export struct ConversationList { }, (item: ConversationDataInterface, index: number) => index + JSON.stringify(item)) } + // [End conversation_list] .padding({ bottom: deviceInfo.deviceType !== BaseConstants.DEVICE_2IN1 && this.currentBreakpoint === BreakpointConstants.BREAKPOINT_LG ? @@ -64,4 +66,5 @@ export struct ConversationList { .height(BaseConstants.FULL_HEIGHT) .width(BaseConstants.FULL_WIDTH) } -} \ No newline at end of file +} +// [End conversation_list_diff_device] \ No newline at end of file diff --git a/features/home/src/main/ets/pages/Index.ets b/features/home/src/main/ets/pages/Index.ets index a4f88e7305baa580406cc02fd3350fd90f1ca3c2..879e98a3a4c3f2b3b5ca74ed81fc6ef88d883580 100755 --- a/features/home/src/main/ets/pages/Index.ets +++ b/features/home/src/main/ets/pages/Index.ets @@ -28,7 +28,9 @@ import { deviceInfo } from '@kit.BasicServicesKit'; @Component export struct Index { @StorageProp('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; + // [Start navigation_diff_device] @Provide('pageInfo') pageInfo: NavPathStack = new NavPathStack(); + // [StartExclude navigation_diff_device] @State currentConversationUserName: string = ''; @State currentContactUserName: string = ''; @State currentContactUserIcon: Resource = HomeConstants.DEFAULT_AVATAR; @@ -43,7 +45,7 @@ export struct Index { this.pageInfo.pop(); } } - + // [EndExclude navigation_diff_device] @Builder PageMap(name: string) { if (name === 'ConversationDetail') { @@ -75,6 +77,7 @@ export struct Index { left: $r('app.float.home_tab_padding_left') }) .visibility(this.currentBreakpoint === BreakpointConstants.BREAKPOINT_LG ? Visibility.Visible : Visibility.None) + // [Start nav_path_stack] Navigation(this.pageInfo) { if (this.currentPageIndex === 0) { Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center }) { @@ -118,6 +121,7 @@ export struct Index { }) } } + // [End nav_path_stack] .hideTitleBar(true) .hideToolBar(true) .navBarWidth(this.currentBreakpoint === BreakpointConstants.BREAKPOINT_LG ? HomeConstants.NAVIGATION_NAV_BAR_WIDTH_LG : @@ -128,7 +132,7 @@ export struct Index { } .visibility(this.currentPageIndex === CurrentPage.HOME || this.currentPageIndex === CurrentPage.CONVERSATION ? Visibility.Visible : Visibility.None) - + // [End navigation_diff_device] /** * SocialCircle page */