zhangbo1_wd

代码结构调整,将底导、图集从component提到phone里

  1 +{
  2 + "float": [
  3 + {
  4 + "name": "font_size_10",
  5 + "value": "10fp"
  6 + },
  7 + {
  8 + "name": "font_size_11",
  9 + "value": "11fp"
  10 + },
  11 + {
  12 + "name": "font_size_12",
  13 + "value": "12fp"
  14 + },
  15 + {
  16 + "name": "font_size_13",
  17 + "value": "13fp"
  18 + },
  19 + {
  20 + "name": "font_size_14",
  21 + "value": "14fp"
  22 + },
  23 + {
  24 + "name": "font_size_16",
  25 + "value": "16fp"
  26 + },
  27 + {
  28 + "name": "normal_text_size",
  29 + "value": "16fp"
  30 + },
  31 + {
  32 + "name": "font_size_17",
  33 + "value": "17fp"
  34 + },
  35 + {
  36 + "name": "selected_text_size",
  37 + "value": "17vp"
  38 + },
  39 + {
  40 + "name": "font_size_18",
  41 + "value": "18fp"
  42 + },
  43 + {
  44 + "name": "font_size_24",
  45 + "value": "24fp"
  46 + },
  47 + {
  48 + "name": "font_size_20",
  49 + "value": "20fp"
  50 + },
  51 + {
  52 + "name": "font_size_36",
  53 + "value": "36fp"
  54 + },
  55 + {
  56 + "name": "margin_4_negative",
  57 + "value": "-4vp"
  58 + },
  59 + {
  60 + "name": "margin_6_negative",
  61 + "value": "-6vp"
  62 + },
  63 + {
  64 + "name": "main_margin",
  65 + "value": "14vp"
  66 + },
  67 + {
  68 + "name": "margin_4",
  69 + "value": "4vp"
  70 + },
  71 + {
  72 + "name": "margin_8",
  73 + "value": "8vp"
  74 + },
  75 + {
  76 + "name": "margin_9",
  77 + "value": "9vp"
  78 + },
  79 + {
  80 + "name": "label_margin_top",
  81 + "value": "10vp"
  82 + },
  83 + {
  84 + "name": "margin_12",
  85 + "value": "12vp"
  86 + },
  87 + {
  88 + "name": "margin_bottom_16",
  89 + "value": "16vp"
  90 + },
  91 + {
  92 + "name": "label_margin_bottom",
  93 + "value": "8vp"
  94 + },
  95 + {
  96 + "name": "single_row_03_item_width",
  97 + "value": "158vp"
  98 + },
  99 + {
  100 + "name": "single_row_03_item_height",
  101 + "value": "160vp"
  102 + },
  103 + {
  104 + "name": "margin_80",
  105 + "value": "80vp"
  106 + },
  107 + {
  108 + "name": "margin_2",
  109 + "value": "2vp"
  110 + },
  111 + {
  112 + "name": "margin_5",
  113 + "value": "5vp"
  114 + },
  115 + {
  116 + "name": "margin_7",
  117 + "value": "7vp"
  118 + },
  119 + {
  120 + "name": "margin_20",
  121 + "value": "20vp"
  122 + },
  123 + {
  124 + "name": "margin_24",
  125 + "value": "24vp"
  126 + },
  127 + {
  128 + "name": "margin_25",
  129 + "value": "25vp"
  130 + },
  131 + {
  132 + "name": "margin_28",
  133 + "value": "28vp"
  134 + },
  135 + {
  136 + "name": "margin_40",
  137 + "value": "40vp"
  138 + },
  139 + {
  140 + "name": "margin_48",
  141 + "value": "48vp"
  142 + },
  143 + {
  144 + "name": "margin_54",
  145 + "value": "54vp"
  146 + },
  147 + {
  148 + "name": "margin_60",
  149 + "value": "60vp"
  150 + },
  151 + {
  152 + "name": "margin_154",
  153 + "value": "154vp"
  154 + },
  155 + {
  156 + "name": "single_row_03_img_height",
  157 + "value": "88vp"
  158 + },
  159 + {
  160 + "name": "image_border_radius",
  161 + "value": "5vp"
  162 + },
  163 + {
  164 + "name": "button_border_radius",
  165 + "value": "3vp"
  166 + },
  167 + {
  168 + "name": "border_radius_6",
  169 + "value": "6vp"
  170 + },
  171 + {
  172 + "name": "bottom_navigation_margin_bottom",
  173 + "value": "4vp"
  174 + },
  175 + {
  176 + "name": "bottom_navigation_barHeight",
  177 + "value": "50vp"
  178 + },
  179 + {
  180 + "name": "top_tab_bar_height",
  181 + "value": "40vp"
  182 + },
  183 + {
  184 + "name": "top_tab_item_max_width",
  185 + "value": "300vp"
  186 + },
  187 + {
  188 + "name": "top_tab_item_min_width",
  189 + "value": "20vp"
  190 + },
  191 + {
  192 + "name": "top_tab_item_padding_horizontal",
  193 + "value": "7vp"
  194 + },
  195 + {
  196 + "name": "top_tab_item_padding_bottom",
  197 + "value": "2vp"
  198 + },
  199 + {
  200 + "name": "top_tab_item_padding_top",
  201 + "value": "5vp"
  202 + },
  203 + {
  204 + "name": "top_bar_height",
  205 + "value": "44vp"
  206 + },
  207 + {
  208 + "name": "top_arrow_size",
  209 + "value": "24vp"
  210 + },
  211 + {
  212 + "name": "margin_1",
  213 + "value": "1vp"
  214 + },
  215 + {
  216 + "name": "margin_6",
  217 + "value": "6vp"
  218 + },
  219 + {
  220 + "name": "margin_16",
  221 + "value": "16vp"
  222 + },
  223 + {
  224 + "name": "vp_20",
  225 + "value": "20vp"
  226 + },
  227 + {
  228 + "name": "margin_32",
  229 + "value": "32vp"
  230 + },
  231 + {
  232 + "name": "margin_36",
  233 + "value": "36vp"
  234 + },
  235 + {
  236 + "name": "margin_44",
  237 + "value": "44vp"
  238 + },
  239 + {
  240 + "name": "vp_3",
  241 + "value": "3vp"
  242 + },
  243 + {
  244 + "name": "vp_2",
  245 + "value": "2vp"
  246 + },
  247 + {
  248 + "name": "vp_55",
  249 + "value": "55vp"
  250 + },
  251 + {
  252 + "name": "vp_12",
  253 + "value": "12vp"
  254 + },
  255 + {
  256 + "name": "vp_4",
  257 + "value": "4vp"
  258 + },
  259 + {
  260 + "name": "vp_8",
  261 + "value": "8vp"
  262 + },
  263 + {
  264 + "name": "vp_16",
  265 + "value": "16vp"
  266 + },
  267 + {
  268 + "name": "vp_28",
  269 + "value": "28vp"
  270 + },
  271 + {
  272 + "name": "vp_80",
  273 + "value": "80vp"
  274 + },
  275 + {
  276 + "name": "card_comp_pagePadding_lf",
  277 + "value": "16fp"
  278 + },
  279 + {
  280 + "name": "card_comp_pagePadding_tb",
  281 + "value": "14fp"
  282 + },
  283 + {
  284 + "name": "margin_116",
  285 + "value": "116vp"
  286 + },
  287 + {
  288 + "name": "vp_11",
  289 + "value": "11vp"
  290 + },
  291 + {
  292 + "name": "vp_22",
  293 + "value": "22vp"
  294 + },
  295 + {
  296 + "name": "vp_14",
  297 + "value": "14vp"
  298 + },
  299 + {
  300 + "name": "vp_15",
  301 + "value": "15vp"
  302 + },
  303 + {
  304 + "name": "vp_18",
  305 + "value": "18vp"
  306 + },
  307 + {
  308 + "name": "vp_13",
  309 + "value": "13vp"
  310 + },
  311 + {
  312 + "name": "margin_115",
  313 + "value": "115vp"
  314 + }
  315 + ]
  316 +}
@@ -12,8 +12,6 @@ export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponen @@ -12,8 +12,6 @@ export { LoadingComponent } from "./src/main/ets/components/view/LoadingComponen
12 12
13 export { PageComponent } from "./src/main/ets/components/page/PageComponent" 13 export { PageComponent } from "./src/main/ets/components/page/PageComponent"
14 14
15 -export { BottomNavigationComponent } from "./src/main/ets/components/page/BottomNavigationComponent"  
16 -  
17 export { LikeComponent } from "./src/main/ets/components/view/LikeComponent" 15 export { LikeComponent } from "./src/main/ets/components/view/LikeComponent"
18 16
19 export { TopNavigationComponent } from "./src/main/ets/components/page/TopNavigationComponent" 17 export { TopNavigationComponent } from "./src/main/ets/components/page/TopNavigationComponent"
@@ -51,8 +49,6 @@ export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel" @@ -51,8 +49,6 @@ export { DetailViewModel } from "./src/main/ets/viewmodel/DetailViewModel"
51 49
52 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent" 50 export { BigPicCardComponent } from "./src/main/ets/components/view/BigPicCardComponent"
53 51
54 -export { MultiPictureDetailPageComponent } from "./src/main/ets/components/MultiPictureDetailPageComponent"  
55 -  
56 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent" 52 export { AudioDetailComponent } from "./src/main/ets/components/AudioDetailComponent"
57 53
58 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent" 54 export { DynamicDetailComponent } from "./src/main/ets/components/DynamicDetailComponent"
@@ -89,3 +85,14 @@ export { LiveFollowComponent } from "./src/main/ets/components/cardCommon/LiveFo @@ -89,3 +85,14 @@ export { LiveFollowComponent } from "./src/main/ets/components/cardCommon/LiveFo
89 85
90 export { publishCommentModel } from './src/main/ets/components/comment/model/PublishCommentModel'; 86 export { publishCommentModel } from './src/main/ets/components/comment/model/PublishCommentModel';
91 87
  88 +export { MultiPictureDetailItemComponent } from './src/main/ets/components/MultiPictureDetailItemComponent';
  89 +
  90 +export { OperRowListView } from './src/main/ets/components/view/OperRowListView';
  91 +
  92 +export { ImageDownloadComponent } from './src/main/ets/components/ImageDownloadComponent';
  93 +
  94 +export { PageRepository } from './src/main/ets/repository/PageRepository';
  95 +
  96 +export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictureDetailViewModel';
  97 +
  98 +export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare';
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 "wdKit": "file:../../commons/wdKit", 14 "wdKit": "file:../../commons/wdKit",
15 "wdWebComponent": "file:../../commons/wdWebComponent", 15 "wdWebComponent": "file:../../commons/wdWebComponent",
16 "wdBean": "file:../../features/wdBean", 16 "wdBean": "file:../../features/wdBean",
17 - "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",  
18 "wdRouter": "file:../../commons/wdRouter", 17 "wdRouter": "file:../../commons/wdRouter",
19 "wdNetwork": "file:../../commons/wdNetwork", 18 "wdNetwork": "file:../../commons/wdNetwork",
20 "wdJsBridge": "file:../../commons/wdJsBridge", 19 "wdJsBridge": "file:../../commons/wdJsBridge",
1 1
2 import { BottomNavi, CommonConstants, SpConstants } from 'wdConstant'; 2 import { BottomNavi, CommonConstants, SpConstants } from 'wdConstant';
3 import { Logger, SPHelper, ToastUtils, UserDataLocal, EmitterEventId, EmitterUtils } from 'wdKit'; 3 import { Logger, SPHelper, ToastUtils, UserDataLocal, EmitterEventId, EmitterUtils } from 'wdKit';
4 -import { TopNavigationComponent } from '../page/TopNavigationComponent';  
5 import PageViewModel from '../../viewmodel/PageViewModel'; 4 import PageViewModel from '../../viewmodel/PageViewModel';
6 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem'; 5 import {MineMainSettingFunctionItem} from '../../viewmodel/MineMainSettingFunctionItem';
7 import MineSettingDatasModel from '../../model/MineSettingDatasModel'; 6 import MineSettingDatasModel from '../../model/MineSettingDatasModel';
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 "wdNetwork": "file:../../commons/wdNetwork", 15 "wdNetwork": "file:../../commons/wdNetwork",
16 "wdConstant": "file:../../commons/wdConstant", 16 "wdConstant": "file:../../commons/wdConstant",
17 "wdDetailPlayApi": "file:../../features/wdDetailPlayApi", 17 "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
18 - // "wdComponent": "file:../../features/wdComponent" 18 + "wdComponent": "file:../../features/wdComponent",
19 "wdShare": "file:../../features/wdShare" 19 "wdShare": "file:../../features/wdShare"
20 } 20 }
21 } 21 }
1 -import { BottomNavigationComponent, LogoutViewModel, PermissionDesComponent } from 'wdComponent'; 1 +import { LogoutViewModel, PermissionDesComponent } from 'wdComponent';
2 import { BreakpointConstants } from 'wdConstant'; 2 import { BreakpointConstants } from 'wdConstant';
3 3
4 import { common } from '@kit.AbilityKit'; 4 import { common } from '@kit.AbilityKit';
@@ -8,6 +8,7 @@ import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog" @@ -8,6 +8,7 @@ import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
8 import { ProcessUtils } from 'wdRouter/Index'; 8 import { ProcessUtils } from 'wdRouter/Index';
9 import { StartupManager } from '../startupmanager/StartupManager'; 9 import { StartupManager } from '../startupmanager/StartupManager';
10 import { BusinessError } from '@kit.BasicServicesKit'; 10 import { BusinessError } from '@kit.BasicServicesKit';
  11 +import { BottomNavigationComponent } from './view/BottomNavigationComponent';
11 12
12 const TAG = 'MainPage'; 13 const TAG = 'MainPage';
13 14
1 import { Logger } from 'wdKit'; 1 import { Logger } from 'wdKit';
2 -import { MultiPictureDetailPageComponent } from 'wdComponent';  
3 import router from '@ohos.router'; 2 import router from '@ohos.router';
4 import { Params, Action } from 'wdBean'; 3 import { Params, Action } from 'wdBean';
5 import { WindowModel } from 'wdKit/Index'; 4 import { WindowModel } from 'wdKit/Index';
  5 +import { MultiPictureDetailPageComponent } from '../view/MultiPictureDetailPageComponent';
  6 +
6 const TAG = 'MultiPictureDetailPage'; 7 const TAG = 'MultiPictureDetailPage';
7 8
8 /** 9 /**
1 import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant'; 1 import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant';
2 import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean'; 2 import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean';
3 import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit'; 3 import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
4 -import { TopNavigationComponent } from './TopNavigationComponent';  
5 -import { MinePageComponent } from './MinePageComponent';  
6 -import { CompUtils } from '../../utils/CompUtils';  
7 -import ChannelViewModel from '../../viewmodel/ChannelViewModel';  
8 -import HomeChannelUtils, { AssignChannelParam } from 'wdRouter';  
9 -import { VideoChannelPage } from './VideoChannelPage';  
10 import { HttpUtils } from 'wdNetwork/Index'; 4 import { HttpUtils } from 'wdNetwork/Index';
  5 +import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
  6 +import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
  7 +import { CompUtils, TopNavigationComponent } from 'wdComponent/Index';
  8 +import { VideoChannelPage } from './VideoChannelPage';
  9 +import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
11 10
12 const TAG = 'BottomNavigationComponent'; 11 const TAG = 'BottomNavigationComponent';
13 let storage = LocalStorage.getShared(); 12 let storage = LocalStorage.getShared();
@@ -8,23 +8,21 @@ import { @@ -8,23 +8,21 @@ import {
8 postInteractAccentionOperateParams, 8 postInteractAccentionOperateParams,
9 Params 9 Params
10 } from 'wdBean'; 10 } from 'wdBean';
11 -import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';  
12 import display from '@ohos.display'; 11 import display from '@ohos.display';
13 -import font from '@ohos.font';  
14 -import { OperRowListView } from './view/OperRowListView';  
15 -import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';  
16 -import { ImageDownloadComponent } from '../components/ImageDownloadComponent';  
17 -import { publishCommentModel } from '../components/comment/model/PublishCommentModel';  
18 -import { EmptyComponent } from './view/EmptyComponent';  
19 import { DateTimeUtils } from 'wdKit/Index'; 12 import { DateTimeUtils } from 'wdKit/Index';
20 -import { HttpUrlUtils } from 'wdNetwork/Index';  
21 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; 13 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
22 -import { PageRepository } from '../repository/PageRepository';  
23 import { SpConstants } from 'wdConstant/Index'; 14 import { SpConstants } from 'wdConstant/Index';
24 import { router } from '@kit.ArkUI'; 15 import { router } from '@kit.ArkUI';
25 -import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'  
26 import { common } from '@kit.AbilityKit'; 16 import { common } from '@kit.AbilityKit';
27 import { CommentDialogView } from 'wdDetailPlayShortVideo/Index'; 17 import { CommentDialogView } from 'wdDetailPlayShortVideo/Index';
  18 +import { EmptyComponent,
  19 + ImageDownloadComponent,
  20 + MultiPictureDetailItemComponent,
  21 + MultiPictureDetailViewModel,
  22 + OperRowListView,
  23 + PageRepository,
  24 + publishCommentModel,
  25 + viewBlogItemInsightIntentShare} from 'wdComponent/Index';
28 26
29 const TAG = 'MultiPictureDetailPageComponent'; 27 const TAG = 'MultiPictureDetailPageComponent';
30 28
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 */ 4 */
5 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index' 5 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index'
6 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index'; 6 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
7 -import { PageComponent } from './PageComponent';  
8 import { WDRouterPage, WDRouterRule } from 'wdRouter'; 7 import { WDRouterPage, WDRouterRule } from 'wdRouter';
9 import { DisplayDirection } from 'wdConstant/Index'; 8 import { DisplayDirection } from 'wdConstant/Index';
  9 +import { PageComponent } from 'wdComponent/Index';
10 10
11 const TAG = 'VideoChannelPage' 11 const TAG = 'VideoChannelPage'
12 12