Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhangbo1_wd
2024-05-22 16:33:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c9e7d2bafad712b690589b331e0ea14dbf2598bc
c9e7d2ba
1 parent
0d0014fe
代码结构调整,将底导、图集从component提到phone里
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
346 additions
and
26 deletions
sight_harmony/AppScope/resources/base/element/float.json
sight_harmony/AppScope/resources/base/media/icon_channel_active.png
sight_harmony/AppScope/resources/base/media/icon_search.png
sight_harmony/features/wdComponent/Index.ets
sight_harmony/features/wdComponent/oh-package.json5
sight_harmony/features/wdComponent/src/main/ets/components/setting/AccountAndSecurityLayout.ets
sight_harmony/features/wdDetailPlayShortVideo/oh-package.json5
sight_harmony/products/phone/src/main/ets/pages/MainPage.ets
sight_harmony/products/phone/src/main/ets/pages/detail/MultiPictureDetailPage.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/BottomNavigationComponent.ets → sight_harmony/products/phone/src/main/ets/pages/view/BottomNavigationComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/MultiPictureDetailPageComponent.ets → sight_harmony/products/phone/src/main/ets/pages/view/MultiPictureDetailPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/VideoChannelPage.ets → sight_harmony/products/phone/src/main/ets/pages/view/VideoChannelPage.ets
sight_harmony/AppScope/resources/base/element/float.json
0 → 100644
View file @
c9e7d2b
{
"float"
:
[
{
"name"
:
"font_size_10"
,
"value"
:
"10fp"
},
{
"name"
:
"font_size_11"
,
"value"
:
"11fp"
},
{
"name"
:
"font_size_12"
,
"value"
:
"12fp"
},
{
"name"
:
"font_size_13"
,
"value"
:
"13fp"
},
{
"name"
:
"font_size_14"
,
"value"
:
"14fp"
},
{
"name"
:
"font_size_16"
,
"value"
:
"16fp"
},
{
"name"
:
"normal_text_size"
,
"value"
:
"16fp"
},
{
"name"
:
"font_size_17"
,
"value"
:
"17fp"
},
{
"name"
:
"selected_text_size"
,
"value"
:
"17vp"
},
{
"name"
:
"font_size_18"
,
"value"
:
"18fp"
},
{
"name"
:
"font_size_24"
,
"value"
:
"24fp"
},
{
"name"
:
"font_size_20"
,
"value"
:
"20fp"
},
{
"name"
:
"font_size_36"
,
"value"
:
"36fp"
},
{
"name"
:
"margin_4_negative"
,
"value"
:
"-4vp"
},
{
"name"
:
"margin_6_negative"
,
"value"
:
"-6vp"
},
{
"name"
:
"main_margin"
,
"value"
:
"14vp"
},
{
"name"
:
"margin_4"
,
"value"
:
"4vp"
},
{
"name"
:
"margin_8"
,
"value"
:
"8vp"
},
{
"name"
:
"margin_9"
,
"value"
:
"9vp"
},
{
"name"
:
"label_margin_top"
,
"value"
:
"10vp"
},
{
"name"
:
"margin_12"
,
"value"
:
"12vp"
},
{
"name"
:
"margin_bottom_16"
,
"value"
:
"16vp"
},
{
"name"
:
"label_margin_bottom"
,
"value"
:
"8vp"
},
{
"name"
:
"single_row_03_item_width"
,
"value"
:
"158vp"
},
{
"name"
:
"single_row_03_item_height"
,
"value"
:
"160vp"
},
{
"name"
:
"margin_80"
,
"value"
:
"80vp"
},
{
"name"
:
"margin_2"
,
"value"
:
"2vp"
},
{
"name"
:
"margin_5"
,
"value"
:
"5vp"
},
{
"name"
:
"margin_7"
,
"value"
:
"7vp"
},
{
"name"
:
"margin_20"
,
"value"
:
"20vp"
},
{
"name"
:
"margin_24"
,
"value"
:
"24vp"
},
{
"name"
:
"margin_25"
,
"value"
:
"25vp"
},
{
"name"
:
"margin_28"
,
"value"
:
"28vp"
},
{
"name"
:
"margin_40"
,
"value"
:
"40vp"
},
{
"name"
:
"margin_48"
,
"value"
:
"48vp"
},
{
"name"
:
"margin_54"
,
"value"
:
"54vp"
},
{
"name"
:
"margin_60"
,
"value"
:
"60vp"
},
{
"name"
:
"margin_154"
,
"value"
:
"154vp"
},
{
"name"
:
"single_row_03_img_height"
,
"value"
:
"88vp"
},
{
"name"
:
"image_border_radius"
,
"value"
:
"5vp"
},
{
"name"
:
"button_border_radius"
,
"value"
:
"3vp"
},
{
"name"
:
"border_radius_6"
,
"value"
:
"6vp"
},
{
"name"
:
"bottom_navigation_margin_bottom"
,
"value"
:
"4vp"
},
{
"name"
:
"bottom_navigation_barHeight"
,
"value"
:
"50vp"
},
{
"name"
:
"top_tab_bar_height"
,
"value"
:
"40vp"
},
{
"name"
:
"top_tab_item_max_width"
,
"value"
:
"300vp"
},
{
"name"
:
"top_tab_item_min_width"
,
"value"
:
"20vp"
},
{
"name"
:
"top_tab_item_padding_horizontal"
,
"value"
:
"7vp"
},
{
"name"
:
"top_tab_item_padding_bottom"
,
"value"
:
"2vp"
},
{
"name"
:
"top_tab_item_padding_top"
,
"value"
:
"5vp"
},
{
"name"
:
"top_bar_height"
,
"value"
:
"44vp"
},
{
"name"
:
"top_arrow_size"
,
"value"
:
"24vp"
},
{
"name"
:
"margin_1"
,
"value"
:
"1vp"
},
{
"name"
:
"margin_6"
,
"value"
:
"6vp"
},
{
"name"
:
"margin_16"
,
"value"
:
"16vp"
},
{
"name"
:
"vp_20"
,
"value"
:
"20vp"
},
{
"name"
:
"margin_32"
,
"value"
:
"32vp"
},
{
"name"
:
"margin_36"
,
"value"
:
"36vp"
},
{
"name"
:
"margin_44"
,
"value"
:
"44vp"
},
{
"name"
:
"vp_3"
,
"value"
:
"3vp"
},
{
"name"
:
"vp_2"
,
"value"
:
"2vp"
},
{
"name"
:
"vp_55"
,
"value"
:
"55vp"
},
{
"name"
:
"vp_12"
,
"value"
:
"12vp"
},
{
"name"
:
"vp_4"
,
"value"
:
"4vp"
},
{
"name"
:
"vp_8"
,
"value"
:
"8vp"
},
{
"name"
:
"vp_16"
,
"value"
:
"16vp"
},
{
"name"
:
"vp_28"
,
"value"
:
"28vp"
},
{
"name"
:
"vp_80"
,
"value"
:
"80vp"
},
{
"name"
:
"card_comp_pagePadding_lf"
,
"value"
:
"16fp"
},
{
"name"
:
"card_comp_pagePadding_tb"
,
"value"
:
"14fp"
},
{
"name"
:
"margin_116"
,
"value"
:
"116vp"
},
{
"name"
:
"vp_11"
,
"value"
:
"11vp"
},
{
"name"
:
"vp_22"
,
"value"
:
"22vp"
},
{
"name"
:
"vp_14"
,
"value"
:
"14vp"
},
{
"name"
:
"vp_15"
,
"value"
:
"15vp"
},
{
"name"
:
"vp_18"
,
"value"
:
"18vp"
},
{
"name"
:
"vp_13"
,
"value"
:
"13vp"
},
{
"name"
:
"margin_115"
,
"value"
:
"115vp"
}
]
}
...
...
sight_harmony/AppScope/resources/base/media/icon_channel_active.png
0 → 100644
View file @
c9e7d2b
259 Bytes
sight_harmony/AppScope/resources/base/media/icon_search.png
0 → 100644
View file @
c9e7d2b
1.1 KB
sight_harmony/features/wdComponent/Index.ets
View file @
c9e7d2b
...
...
@@ -12,8 +12,6 @@ export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponen
export { PageComponent } from "./src/main/ets/components/page/PageComponent"
export { BottomNavigationComponent } from "./src/main/ets/components/page/BottomNavigationComponent"
export { LikeComponent } from "./src/main/ets/components/view/LikeComponent"
export { TopNavigationComponent } from "./src/main/ets/components/page/TopNavigationComponent"
...
...
@@ -51,8 +49,6 @@ export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel"
export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent"
export { MultiPictureDetailPageComponent } from "./src/main/ets/components/MultiPictureDetailPageComponent"
export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent"
export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent"
...
...
@@ -89,3 +85,14 @@ export { LiveFollowComponent } from "./src/main/ets/components/cardCommon/LiveFo
export { publishCommentModel } from './src/main/ets/components/comment/model/PublishCommentModel';
export { MultiPictureDetailItemComponent } from './src/main/ets/components/MultiPictureDetailItemComponent';
export { OperRowListView } from './src/main/ets/components/view/OperRowListView';
export { ImageDownloadComponent } from './src/main/ets/components/ImageDownloadComponent';
export { PageRepository } from './src/main/ets/repository/PageRepository';
export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictureDetailViewModel';
export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare';
\ No newline at end of file
...
...
sight_harmony/features/wdComponent/oh-package.json5
View file @
c9e7d2b
...
...
@@ -14,7 +14,6 @@
"wdKit"
:
"file:../../commons/wdKit"
,
"wdWebComponent"
:
"file:../../commons/wdWebComponent"
,
"wdBean"
:
"file:../../features/wdBean"
,
"wdDetailPlayShortVideo"
:
"file:../../features/wdDetailPlayShortVideo"
,
"wdRouter"
:
"file:../../commons/wdRouter"
,
"wdNetwork"
:
"file:../../commons/wdNetwork"
,
"wdJsBridge"
:
"file:../../commons/wdJsBridge"
,
...
...
sight_harmony/features/wdComponent/src/main/ets/components/setting/AccountAndSecurityLayout.ets
View file @
c9e7d2b
import { BottomNavi, CommonConstants, SpConstants } from 'wdConstant';
import { Logger, SPHelper, ToastUtils, UserDataLocal, EmitterEventId, EmitterUtils } from 'wdKit';
import { TopNavigationComponent } from '../page/TopNavigationComponent';
import PageViewModel from '../../viewmodel/PageViewModel';
import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
import MineSettingDatasModel from '../../model/MineSettingDatasModel';
...
...
sight_harmony/features/wdDetailPlayShortVideo/oh-package.json5
View file @
c9e7d2b
...
...
@@ -15,7 +15,7 @@
"wdNetwork"
:
"file:../../commons/wdNetwork"
,
"wdConstant"
:
"file:../../commons/wdConstant"
,
"wdDetailPlayApi"
:
"file:../../features/wdDetailPlayApi"
,
//
"wdComponent"
:
"file:../../features/wdComponent"
"wdComponent"
:
"file:../../features/wdComponent"
,
"wdShare"
:
"file:../../features/wdShare"
}
}
...
...
sight_harmony/products/phone/src/main/ets/pages/MainPage.ets
View file @
c9e7d2b
import {
BottomNavigationComponent,
LogoutViewModel, PermissionDesComponent } from 'wdComponent';
import { LogoutViewModel, PermissionDesComponent } from 'wdComponent';
import { BreakpointConstants } from 'wdConstant';
import { common } from '@kit.AbilityKit';
...
...
@@ -8,6 +8,7 @@ import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
import { ProcessUtils } from 'wdRouter/Index';
import { StartupManager } from '../startupmanager/StartupManager';
import { BusinessError } from '@kit.BasicServicesKit';
import { BottomNavigationComponent } from './view/BottomNavigationComponent';
const TAG = 'MainPage';
...
...
sight_harmony/products/phone/src/main/ets/pages/detail/MultiPictureDetailPage.ets
View file @
c9e7d2b
import { Logger } from 'wdKit';
import { MultiPictureDetailPageComponent } from 'wdComponent';
import router from '@ohos.router';
import { Params, Action } from 'wdBean';
import { WindowModel } from 'wdKit/Index';
import { MultiPictureDetailPageComponent } from '../view/MultiPictureDetailPageComponent';
const TAG = 'MultiPictureDetailPage';
/**
...
...
sight_harmony/
features/wdComponent/src/main/ets/components/page
/BottomNavigationComponent.ets → sight_harmony/
products/phone/src/main/ets/pages/view
/BottomNavigationComponent.ets
View file @
c9e7d2b
import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant';
import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean';
import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
import { TopNavigationComponent } from './TopNavigationComponent';
import { MinePageComponent } from './MinePageComponent';
import { CompUtils } from '../../utils/CompUtils';
import ChannelViewModel from '../../viewmodel/ChannelViewModel';
import HomeChannelUtils, { AssignChannelParam } from 'wdRouter';
import { VideoChannelPage } from './VideoChannelPage';
import { HttpUtils } from 'wdNetwork/Index';
import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
import { CompUtils, TopNavigationComponent } from 'wdComponent/Index';
import { VideoChannelPage } from './VideoChannelPage';
import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
const TAG = 'BottomNavigationComponent';
let storage = LocalStorage.getShared();
...
...
sight_harmony/
features/wdComponent/src/main/ets/components
/MultiPictureDetailPageComponent.ets → sight_harmony/
products/phone/src/main/ets/pages/view
/MultiPictureDetailPageComponent.ets
View file @
c9e7d2b
...
...
@@ -8,23 +8,21 @@ import {
postInteractAccentionOperateParams,
Params
} from 'wdBean';
import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
import display from '@ohos.display';
import font from '@ohos.font';
import { OperRowListView } from './view/OperRowListView';
import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
import { ImageDownloadComponent } from '../components/ImageDownloadComponent';
import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
import { EmptyComponent } from './view/EmptyComponent';
import { DateTimeUtils } from 'wdKit/Index';
import { HttpUrlUtils } from 'wdNetwork/Index';
import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
import { PageRepository } from '../repository/PageRepository';
import { SpConstants } from 'wdConstant/Index';
import { router } from '@kit.ArkUI';
import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'
import { common } from '@kit.AbilityKit';
import { CommentDialogView } from 'wdDetailPlayShortVideo/Index';
import { EmptyComponent,
ImageDownloadComponent,
MultiPictureDetailItemComponent,
MultiPictureDetailViewModel,
OperRowListView,
PageRepository,
publishCommentModel,
viewBlogItemInsightIntentShare} from 'wdComponent/Index';
const TAG = 'MultiPictureDetailPageComponent';
...
...
sight_harmony/
features/wdComponent/src/main/ets/components/page
/VideoChannelPage.ets → sight_harmony/
products/phone/src/main/ets/pages/view
/VideoChannelPage.ets
View file @
c9e7d2b
...
...
@@ -4,9 +4,9 @@
*/
import { BottomNavDTO, TopNavDTO } from 'wdBean/Index'
import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
import { PageComponent } from './PageComponent';
import { WDRouterPage, WDRouterRule } from 'wdRouter';
import { DisplayDirection } from 'wdConstant/Index';
import { PageComponent } from 'wdComponent/Index';
const TAG = 'VideoChannelPage'
...
...
Please
register
or
login
to post a comment