zhenghy

修改视频页面引入组件方式,之前循环引用导致只能通过../../方式引用

@@ -2,7 +2,7 @@ export { PageViewModel } from "./src/main/ets/viewmodel/PageViewModel" @@ -2,7 +2,7 @@ export { PageViewModel } from "./src/main/ets/viewmodel/PageViewModel"
2 2
3 export { CompUtils } from "./src/main/ets/utils/CompUtils" 3 export { CompUtils } from "./src/main/ets/utils/CompUtils"
4 4
5 -export { EmptyComponent } from "./src/main/ets/components/view/EmptyComponent" 5 +export { EmptyComponent, WDViewDefaultType } from "./src/main/ets/components/view/EmptyComponent"
6 6
7 export { LiveEmptyComponent } from './src/main/ets/components/view/LiveEmptyComponent' 7 export { LiveEmptyComponent } from './src/main/ets/components/view/LiveEmptyComponent'
8 8
@@ -75,7 +75,6 @@ export { newsSkeleton } from "./src/main/ets/components/skeleton/newsSkeleton" @@ -75,7 +75,6 @@ export { newsSkeleton } from "./src/main/ets/components/skeleton/newsSkeleton"
75 75
76 export { LiveCommentComponent } from "./src/main/ets/components/comment/view/LiveCommentComponent" 76 export { LiveCommentComponent } from "./src/main/ets/components/comment/view/LiveCommentComponent"
77 77
78 -export { WDViewDefaultType } from "./src/main/ets/components/view/EmptyComponent"  
79 78
80 export { PermissionDesComponent } from "./src/main/ets/components/view/PermissionDesComponent" 79 export { PermissionDesComponent } from "./src/main/ets/components/view/PermissionDesComponent"
81 80
@@ -100,3 +99,5 @@ export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictu @@ -100,3 +99,5 @@ export { MultiPictureDetailViewModel } from './src/main/ets/viewmodel/MultiPictu
100 export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare'; 99 export { viewBlogItemInsightIntentShare } from './src/main/ets/utils/InsightIntentShare';
101 100
102 export { CommentListDialogView } from './src/main/ets/components/comment/view/CommentListDialog'; 101 export { CommentListDialogView } from './src/main/ets/components/comment/view/CommentListDialog';
  102 +
  103 +export { CustomPullToRefresh } from './src/main/ets/components/reusable/CustomPullToRefresh';
@@ -7,10 +7,6 @@ import { @@ -7,10 +7,6 @@ import {
7 postBatchAttentionStatusParams, 7 postBatchAttentionStatusParams,
8 postInteractBrowsOperateParams 8 postInteractBrowsOperateParams
9 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest'; 9 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
10 -import { OperRowListView } from '../../../../../wdComponent/src/main/ets/components/view/OperRowListView'  
11 -import {  
12 - publishCommentModel  
13 -} from '../../../../../wdComponent/src/main/ets/components/comment/model/PublishCommentModel'  
14 import { HttpUtils } from 'wdNetwork/Index'; 10 import { HttpUtils } from 'wdNetwork/Index';
15 import { DateTimeUtils, WindowModel } from 'wdKit/Index'; 11 import { DateTimeUtils, WindowModel } from 'wdKit/Index';
16 import { PlayerBottomView } from '../view/PlayerBottomView'; 12 import { PlayerBottomView } from '../view/PlayerBottomView';
@@ -19,6 +15,7 @@ import { DisplayDirection } from 'wdConstant/Index'; @@ -19,6 +15,7 @@ import { DisplayDirection } from 'wdConstant/Index';
19 import { CommentDialogView } from '../view/CommentDialogView'; 15 import { CommentDialogView } from '../view/CommentDialogView';
20 import { window } from '@kit.ArkUI'; 16 import { window } from '@kit.ArkUI';
21 import { PlayerFullScreenView } from '../view/PlayerFullScreenView'; 17 import { PlayerFullScreenView } from '../view/PlayerFullScreenView';
  18 +import { OperRowListView, publishCommentModel } from 'wdComponent/Index';
22 19
23 const TAG = 'DetailPlayShortVideoPage'; 20 const TAG = 'DetailPlayShortVideoPage';
24 21
@@ -7,7 +7,7 @@ import router from '@ohos.router'; @@ -7,7 +7,7 @@ import router from '@ohos.router';
7 import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest'; 7 import { contentListParams } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
8 import { DisplayDirection } from 'wdConstant/Index'; 8 import { DisplayDirection } from 'wdConstant/Index';
9 import { window } from '@kit.ArkUI'; 9 import { window } from '@kit.ArkUI';
10 -import { EmptyComponent } from '../../../../../wdComponent/src/main/ets/components/view/EmptyComponent'; 10 +import { EmptyComponent } from 'wdComponent/Index';
11 11
12 const storage = LocalStorage.getShared(); 12 const storage = LocalStorage.getShared();
13 const TAG = 'DetailVideoListPage' 13 const TAG = 'DetailVideoListPage'
@@ -2,10 +2,7 @@ import { ContentDetailDTO, InteractDataDTO } from 'wdBean/Index'; @@ -2,10 +2,7 @@ import { ContentDetailDTO, InteractDataDTO } from 'wdBean/Index';
2 import Curves from '@ohos.curves' 2 import Curves from '@ohos.curves'
3 import { ContentDetailRequest } from 'wdDetailPlayApi/Index' 3 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
4 import { DetailPlayShortVideoPage } from './DetailPlayShortVideoPage' 4 import { DetailPlayShortVideoPage } from './DetailPlayShortVideoPage'
5 -import {  
6 - WDViewDefaultType,  
7 - EmptyComponent  
8 -} from '../../../../../wdComponent/src/main/ets/components/view/EmptyComponent' 5 +
9 import { 6 import {
10 batchContentDetailParams, 7 batchContentDetailParams,
11 compListItem, 8 compListItem,
@@ -16,6 +13,7 @@ import { Logger, WindowModel } from 'wdKit/Index'; @@ -16,6 +13,7 @@ import { Logger, WindowModel } from 'wdKit/Index';
16 import { PictureLoading } from './PictureLoading'; 13 import { PictureLoading } from './PictureLoading';
17 import { DisplayDirection } from 'wdConstant/Index'; 14 import { DisplayDirection } from 'wdConstant/Index';
18 import { window } from '@kit.ArkUI'; 15 import { window } from '@kit.ArkUI';
  16 +import { EmptyComponent, WDViewDefaultType } from 'wdComponent/Index';
19 17
20 interface loadMoreData { 18 interface loadMoreData {
21 pageNum: number; 19 pageNum: number;
@@ -7,14 +7,13 @@ import { @@ -7,14 +7,13 @@ import {
7 postExecuteLikeParams, 7 postExecuteLikeParams,
8 postInteractAccentionOperateParams 8 postInteractAccentionOperateParams
9 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest'; 9 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
10 -import {  
11 - publishCommentModel  
12 -} from '../../../../../wdComponent/src/main/ets/components/comment/model/PublishCommentModel' 10 +
13 import { SPHelper, ToastUtils, NumberFormatterUtils } from 'wdKit'; 11 import { SPHelper, ToastUtils, NumberFormatterUtils } from 'wdKit';
14 import { WDPlayerController } from 'wdPlayer/Index'; 12 import { WDPlayerController } from 'wdPlayer/Index';
15 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; 13 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
16 import { DisplayDirection, SpConstants } from 'wdConstant/Index' 14 import { DisplayDirection, SpConstants } from 'wdConstant/Index'
17 import { WDShare } from "wdShare" 15 import { WDShare } from "wdShare"
  16 +import { publishCommentModel } from 'wdComponent/Index';
18 17
19 interface ILikeStyleResp { 18 interface ILikeStyleResp {
20 url: Resource; 19 url: Resource;