包结构调整

 
 
 export { PageViewModel } from "./viewmodel/PageViewModel"
 export { PageViewModel } from "./viewmodel/PageViewModel"
 
 
-export { EmptyComponent } from "./components/EmptyComponent"
+export { EmptyComponent } from "./components/view/EmptyComponent"
 
 
-export { ErrorComponent } from "./components/ErrorComponent"
+export { ErrorComponent } from "./components/view/ErrorComponent"
 
 
-export { LoadingComponent } from "./components/LoadingComponent"
+export { LoadingComponent } from "./components/view/LoadingComponent"
 
 
-export { PageComponent } from "./components/PageComponent"
+export { PageComponent } from "./components/page/PageComponent"
 
 
-export { BottomNavigationComponent } from "./components/BottomNavigationComponent"
+export { BottomNavigationComponent } from "./components/view/BottomNavigationComponent"
 
 
-export { TopNavigationComponent } from "./components/TopNavigationComponent"
+export { TopNavigationComponent } from "./components/view/TopNavigationComponent"
 
 
-export { LabelComponent } from "./components/LabelComponent"
+export { LabelComponent } from "./components/view/LabelComponent"
 
 
-export { SmallVideoCardComponent } from "./components/SmallVideoCardComponent"
+export { SmallVideoCardComponent } from "./components/view/SmallVideoCardComponent"
 
 
-export { BannerComponent } from "./components/BannerComponent"
+export { BannerComponent } from "./components/view/BannerComponent"
 
 

 import { CommonConstants, CompStyle } from 'wdConstant';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { CompDTO } from '../repository/bean/CompDTO';
 import { CompDTO } from '../repository/bean/CompDTO';
-import { BannerComponent } from './BannerComponent';
-import { LabelComponent } from './LabelComponent';
-import { TitleAbbrComponent } from './TitleAbbrComponent';
-import { TitleAllComponent } from './TitleAllComponent';
+import { BannerComponent } from './view/BannerComponent';
+import { LabelComponent } from './view/LabelComponent';
+import { TitleAbbrComponent } from './view/TitleAbbrComponent';
+import { TitleAllComponent } from './view/TitleAllComponent';
 
 
 /**
 /**
  * comp适配器.
  * comp适配器.

 import { CommonConstants, ViewType } from 'wdConstant';
 import { CommonConstants, ViewType } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
-import { CompDTO } from '../repository/bean/CompDTO';
-import PageViewModel from '../viewmodel/PageViewModel';
-import { EmptyComponent } from './EmptyComponent';
-import { ErrorComponent } from './ErrorComponent';
-import PageModel from '../viewmodel/PageModel';
-import { listTouchEvent } from '../utils/PullDownRefresh';
-import RefreshLayout from './page/RefreshLayout';
-import { RefreshLayoutBean } from './page/RefreshLayoutBean';
-import NoMoreLayout from './page/NoMoreLayout';
-import LoadMoreLayout from './page/LoadMoreLayout';
-import CustomRefreshLoadLayout from './page/CustomRefreshLoadLayout';
-import { CompParser } from './CompParser';
+import { CompDTO } from '../../repository/bean/CompDTO';
+import PageViewModel from '../../viewmodel/PageViewModel';
+import { EmptyComponent } from '../view/EmptyComponent';
+import { ErrorComponent } from '../view/ErrorComponent';
+import PageModel from '../../viewmodel/PageModel';
+import { listTouchEvent } from '../../utils/PullDownRefresh';
+import RefreshLayout from './RefreshLayout';
+import { RefreshLayoutBean } from './RefreshLayoutBean';
+import NoMoreLayout from './NoMoreLayout';
+import LoadMoreLayout from './LoadMoreLayout';
+import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
+import { CompParser } from '../CompParser';
 
 
 const TAG = 'PageComponent';
 const TAG = 'PageComponent';
 
 
 @Component
 @Component
 export struct PageComponent {
 export struct PageComponent {
-  // @State viewType: number = ViewType.LOADING;
-  // Group数据及子组件数据
-  // @State compList: LazyDataSource<CompDTO> = new LazyDataSource();
   @State private pageModel: PageModel = new PageModel();
   @State private pageModel: PageModel = new PageModel();
   navIndex: number = 0;
   navIndex: number = 0;
   pageId: string = "";
   pageId: string = "";

@@ -6,9 +6,9 @@
 
 
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import colorSpaceManager from '@ohos.graphics.colorSpaceManager';
 import colorSpaceManager from '@ohos.graphics.colorSpaceManager';
-import { CompDTO } from '../repository/bean/CompDTO';
-import { CompUtils } from '../utils/CompUtils';
-import { ContentDTO } from '../repository/bean/ContentDTO';
+import { CompDTO } from '../../repository/bean/CompDTO';
+import { CompUtils } from '../../utils/CompUtils';
+import { ContentDTO } from '../../repository/bean/ContentDTO';
 
 
 
 
 const TAG = 'BannerComponent';
 const TAG = 'BannerComponent';

 import { BottomNavi, CommonConstants } from 'wdConstant';
 import { BottomNavi, CommonConstants } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { TopNavigationComponent } from './TopNavigationComponent';
 import { TopNavigationComponent } from './TopNavigationComponent';
-import { BottomNavDTO } from '../repository/bean/BottomNavDTO';
-import { UIUtils } from '../repository/UIUtils';
-import { MinePageComponent } from './MinePageComponent';
-import PageViewModel from '../viewmodel/PageViewModel';
+import { BottomNavDTO } from '../../repository/bean/BottomNavDTO';
+import { UIUtils } from '../../repository/UIUtils';
+import { MinePageComponent } from '../page/MinePageComponent';
+import PageViewModel from '../../viewmodel/PageViewModel';
 
 
 const TAG = 'BottomNavigationComponent';
 const TAG = 'BottomNavigationComponent';
 
 

 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
-import { CompDTO } from '../repository/bean/CompDTO';
-import { CompUtils } from '../utils/CompUtils';
+import { CompDTO } from '../../repository/bean/CompDTO';
+import { CompUtils } from '../../utils/CompUtils';
 
 
 const TAG = 'LabelComponent';
 const TAG = 'LabelComponent';
 
 

 //缩略标题
 //缩略标题
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
-import { CompDTO } from '../repository/bean/CompDTO'
+import { CompDTO } from '../../repository/bean/CompDTO'
 
 
 @Component
 @Component
 export struct TitleAbbrComponent {
 export struct TitleAbbrComponent {

 //全标题 "compStyle":"3",
 //全标题 "compStyle":"3",
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
-import { CompDTO } from '../repository/bean/CompDTO'
+import { CompDTO } from '../../repository/bean/CompDTO'
 
 
 @Component
 @Component
 export struct TitleAllComponent {
 export struct TitleAllComponent {

 import { LazyDataSource, Logger } from 'wdKit';
 import { LazyDataSource, Logger } from 'wdKit';
-import { CompDTO } from '../repository/bean/CompDTO';
-import { TopNavDTO } from '../repository/bean/TopNavDTO';
-import { PageComponent } from './PageComponent';
+import { CompDTO } from '../../repository/bean/CompDTO';
+import { TopNavDTO } from '../../repository/bean/TopNavDTO';
+import { PageComponent } from '../page/PageComponent';
 
 
 const TAG = 'TopNavigationComponent';
 const TAG = 'TopNavigationComponent';
 
 

@@ -4,10 +4,12 @@ import { CompDTO } from '../repository/bean/CompDTO';
 import { RefreshConstants as Const } from '../utils/RefreshConstants';
 import { RefreshConstants as Const } from '../utils/RefreshConstants';
 
 
 export default class PageModel {
 export default class PageModel {
+  // 页面数据
   pageId: string = "";
   pageId: string = "";
   groupId: string = "";
   groupId: string = "";
   channelId: string = "";
   channelId: string = "";
   compList: LazyDataSource<CompDTO> = new LazyDataSource();
   compList: LazyDataSource<CompDTO> = new LazyDataSource();
+  // 页面状态，刷新、加载更多等
   currentPage: number = 1;
   currentPage: number = 1;
   pageSize: number = Const.PAGE_SIZE;
   pageSize: number = Const.PAGE_SIZE;
   pullDownRefreshText: Resource = $r('app.string.pull_down_refresh_text');
   pullDownRefreshText: Resource = $r('app.string.pull_down_refresh_text');