更新视频跳转逻辑和精选

features/Home/Index.ets

@@ -25,3 +25,5 @@ export { VideoList,DataModel,VideoData } from './src/main/ets/model/SearchDataMo
 export { ItemCompPast } from './src/main/ets/components/ItemCompPastk'
 
 export { MeetingItemModel,MeetingModel,MeetingModels,ItemModel } from './src/main/ets/model/ItemModel'
+
+export { VideoSelected } from './src/main/ets/pages/VideoSelected'

features/Home/src/main/ets/components/ItemCompVideo.ets

@@ -1,15 +1,8 @@
-import { runCatching, seconds } from '@polyvharmony/media-player-sdk';
+
 import { VideoMore } from '../model/VideoMoreModel'
 import { BasicConstant } from '@itcast/basic'
-import { promptAction, router } from '@kit.ArkUI';
-import { PLVMockMediaResourceData } from '../polyv/PLVMockMediaResourceData'
-import {
-  PLVMediaPlayerSingleVideoPageParam
-} from 'media-player-common';
 import HashMap from '@ohos.util.HashMap';
-import { hdHttp, HdResponse ,logger} from '@itcast/basic/Index'
+import { videoTools } from '../polyv/VideoUtil'
-import { BusinessError } from '@kit.BasicServicesKit';
-import { VideoDetailModel } from '../model/VideoDetailModel'
 @Preview
 @Component
 export struct ItemCompVideo {
@@ -47,7 +40,7 @@ export struct ItemCompVideo {
     }.backgroundColor(Color.White)
     .borderRadius(5)
     .onClick(()=>{
-      this.getVideoDetail(this.item.uuid)
+      videoTools.getVideoDetail(this.item.uuid)
 
     })
     .width('100%').clip(true)
@@ -56,39 +49,7 @@ export struct ItemCompVideo {
 
   }
 
-  getVideoDetail(video_uuid:string)
-  {
-    this.hashMap.clear();
-    this.hashMap.set('video_uuid', video_uuid)
-    hdHttp.httpReq<string>(BasicConstant.videoDetail,this.hashMap).then(async (res: HdResponse<string>) => {
-      logger.info('Response videoDetail'+res);
-      let json:VideoDetailModel = JSON.parse(res+'') as VideoDetailModel;
-      this.goPLVMediaPlayerSingleVideoPage(json.video.polyv_uuid,video_uuid)
 
-    }).catch((err: BusinessError) => {
-      this.goPLVMediaPlayerSingleVideoPage('','')
-    })
-  }
-
-  async goPLVMediaPlayerSingleVideoPage(vid:string,video_uuid:string)
-  {
-    const mediaResourcesResult = await runCatching(PLVMockMediaResourceData.getInstance().setupMediaResourcesFromLocal(vid))
-    if (mediaResourcesResult.success === false) {
-      promptAction.showToast({
-        message: `'视频数据初始化失败': ${mediaResourcesResult.error}`,
-        duration: seconds(3).toMillis()
-      })
-      return
-    }
-    const mediaResource = mediaResourcesResult.data[0]
-    router.pushUrl({
-      url:'pages/VideoPage/PLVMediaPlayerSingleVideoPage',
-      params: {
-        video_uuid:video_uuid,
-        param:new PLVMediaPlayerSingleVideoPageParam(mediaResource)
-      }
-    })
-  }
 
 
 

features/Home/src/main/ets/components/ListCompVideoSelect.ets

@@ -0,0 +1,135 @@
+import { VideoMoreModel,VideoMore } from '../model/VideoMoreModel'
+import { HdList, HdListController,BasicConstant,hdHttp, HdResponse ,logger} from '@itcast/basic/Index'
+import { promptAction, router } from '@kit.ArkUI'
+import { BusinessError } from '@kit.BasicServicesKit';
+import { HdLoadingDialog,EmptyViewComp } from '@itcast/basic'
+import HashMap from '@ohos.util.HashMap';
+import { videoTools } from '../polyv/VideoUtil'
+
+
+@Component
+export struct ListCompVideoSelect {
+  @State isEmptyViewVisible: boolean = false; // 控制显隐的状态变量
+
+  @Prop
+  type_uuid:string=''
+  @State
+  list: VideoMore[] = []
+  controller = new HdListController()
+  @State
+  page: number = 1
+  @State
+  keyword: string = ''
+  hashMap: HashMap<string, string> = new HashMap();
+
+  dialog: CustomDialogController = new CustomDialogController({
+    builder: HdLoadingDialog({ message: '加载中...' }),
+    customStyle: true,
+    alignment: DialogAlignment.Center
+  })
+
+
+
+  onRefresh() {
+    this.page = 1
+    this.initData(0)
+  }
+
+  initData(type:number)
+  {
+    this.dialog.open()
+    this.hashMap.clear();
+    this.hashMap.set('page', this.page+"")
+    this.hashMap.set('typeUuid', this.type_uuid)
+    hdHttp.httpReq<string>(BasicConstant.videoByTypeNew,this.hashMap).then(async (res: HdResponse<string>) => {
+      logger.info('Response videoByTypeNew'+res);
+      let json:VideoMoreModel = JSON.parse(res+'') as VideoMoreModel;
+      this.dialog.close()
+      if(type==0)
+      {
+        this.controller.refreshed()
+      }
+      else
+      {
+        this.controller.loaded()
+      }
+      if(this.page==1)
+      {
+        this.list=[]
+        if(json.data!=null&&json.data.list!)
+        {
+          this.list = json.data.list
+        }
+
+      }
+      else if(this.page>1)
+      {
+        this.list.push(...json.data.list)
+      }
+
+        if (this.page >= json.data.totalPage) {
+          this.controller.finished()
+        } else {
+          this.page++
+        }
+      if (this.list.length>0) {
+        this.isEmptyViewVisible = false;
+      } else  {
+        this.isEmptyViewVisible = true;
+      }
+    }).catch((err: BusinessError) => {
+      this.dialog.close()
+      if (this.list.length>0) {
+        this.isEmptyViewVisible = false;
+      } else  {
+        this.isEmptyViewVisible = true;
+      }
+    })
+  }
+
+  build() {
+    if (this.isEmptyViewVisible){
+      EmptyViewComp({promptText:'暂无数据',isVisibility:this.isEmptyViewVisible})
+        .width('100%')
+        .height('100%')
+    } else {
+      HdList({
+        lw: 1,
+        controller: this.controller,
+        onRefresh: () => {
+          this.onRefresh()
+        },
+        onLoad: () => {
+          this.initData(1)
+        }
+      }) {
+        ForEach(this.list, (items: VideoMore) => {
+          ListItem() {
+           Column()
+           {
+             Row()
+             {
+               Text(items.name) .textOverflow({ overflow: TextOverflow.Ellipsis })
+                 .maxLines(1)
+                 .textAlign(TextAlign.Start)
+                 .layoutWeight(1)
+                 .fontSize(16)
+                 .padding(10)
+               Image($r('sys.media.ohos_ic_public_arrow_right'))
+                 .width(15)
+                 .height(15)
+                 .margin({ right: 10})
+             }
+             .width('100%')
+             Text('').height(1).width('100%')
+               .backgroundColor($r('app.color.1a000000'))
+           }
+           .onClick(()=>{
+             videoTools.getVideoDetail(items.uuid)
+           })
+          }
+        })
+      }
+    }
+  }
+}

features/Home/src/main/ets/components/SwiperComp.ets

@@ -11,7 +11,7 @@ import {
 } from 'media-player-common';
 import { runCatching, seconds } from '@polyvharmony/media-player-sdk';
 import { it } from '@ohos/hypium';
-
+import { videoTools } from '../polyv/VideoUtil'
 @Component
 export struct SwiperComp {
   @State
@@ -61,7 +61,7 @@ export struct SwiperComp {
               .padding({right:100,left:5})
               .margin({ bottom: 0 })
           }.onClick(()=>{
-            this.getVideoDetail(item.uuid);
+            videoTools.getVideoDetail(item.uuid)
           })
         }, (item: VideoRoll) => JSON.stringify(item))
       }
@@ -85,35 +85,5 @@ export struct SwiperComp {
     .width('100%')
   }
 
-  getVideoDetail(video_uuid:string) {
-    const hashMap: HashMap<string, string> = new HashMap();
-    hashMap.clear();
-    hashMap.set('video_uuid', video_uuid)
-    hdHttp.httpReq<string>(BasicConstant.videoDetail,hashMap).then(async (res: HdResponse<string>) => {
-      logger.info('Response videoDetail'+res);
-      let json:VideoDetailModel = JSON.parse(res+'') as VideoDetailModel;
-      this.goPLVMediaPlayerSingleVideoPage(json.video.polyv_uuid,video_uuid)
-    }).catch((err: BusinessError) => {
-      this.goPLVMediaPlayerSingleVideoPage('','')
-    })
-  }
 
-  async goPLVMediaPlayerSingleVideoPage(vid:string,video_uuid:string) {
-    const mediaResourcesResult = await runCatching(PLVMockMediaResourceData.getInstance().setupMediaResourcesFromLocal(vid))
-    if (mediaResourcesResult.success === false) {
-      promptAction.showToast({
-        message: `'视频数据初始化失败': ${mediaResourcesResult.error}`,
-        duration: seconds(3).toMillis()
-      })
-      return
-    }
-    const mediaResource = mediaResourcesResult.data[0]
-    router.pushUrl({
-      url:'pages/VideoPage/PLVMediaPlayerSingleVideoPage',
-      params: {
-        video_uuid:video_uuid,
-        param:new PLVMediaPlayerSingleVideoPageParam(mediaResource)
-      }
-    })
-  }
 }

features/Home/src/main/ets/pages/PlayBack.ets

@@ -167,7 +167,7 @@ export struct PlayBack {
     }
     .width('100%')
     .height('100%')
-    .padding({bottom:50})
+
   }
 
   getSelect()

features/Home/src/main/ets/pages/VideoMore.ets

@@ -8,7 +8,10 @@ export struct VideoMore {
   build() {
 
       Column() {
-        HdNav({ title: this.params.title, showRightIcon: false, showLeftIcon: true,showRightText:true,rightText:'精选' })
+        HdNav({ title: this.params.title, showRightIcon: false, showLeftIcon: true,showRightText:true,rightText:'精选',rightItemAction:()=>{
+          router.pushUrl({url:'pages/VideoPage/VideoSelectedPage',
+            params: this.params})
+        } })
         Text('').height(1).width('100%')
           .backgroundColor($r('app.color.1a000000'))
           .margin({bottom:10})

features/Home/src/main/ets/pages/VideoSelected.ets

@@ -0,0 +1,16 @@
+import router from '@ohos.router';
+import { HdNav } from '@itcast/basic'
+import { ListCompVideoSelect } from '../components/ListCompVideoSelect'
+@Component
+export struct VideoSelected{
+
+  @State params:Record<string, string> = router.getParams() as Record<string, string>;
+  build() {
+
+    Column() {
+      HdNav({ title: this.params.title, showRightIcon: false, showLeftIcon: true })
+      ListCompVideoSelect({type_uuid:this.params.uuid}).backgroundColor(Color.White).height('100%')
+    }.width('100%')
+    .height('100%').backgroundColor($r('app.color.top_bg'))
+  }
+}

features/Home/src/main/ets/polyv/VideoUtil.ets

@@ -0,0 +1,50 @@
+import { runCatching, seconds } from '@polyvharmony/media-player-sdk';
+import { BasicConstant } from '@itcast/basic'
+import { promptAction, router } from '@kit.ArkUI';
+import { PLVMockMediaResourceData } from '../polyv/PLVMockMediaResourceData'
+import {
+  PLVMediaPlayerSingleVideoPageParam
+} from 'media-player-common';
+import HashMap from '@ohos.util.HashMap';
+import { hdHttp, HdResponse ,logger} from '@itcast/basic/Index'
+import { BusinessError } from '@kit.BasicServicesKit';
+import { VideoDetailModel } from '../model/VideoDetailModel'
+class VideoTools {
+  hashMap: HashMap<string, string> = new HashMap();
+  getVideoDetail(video_uuid:string)
+  {
+    this.hashMap.clear();
+    this.hashMap.set('video_uuid', video_uuid)
+    hdHttp.httpReq<string>(BasicConstant.videoDetail,this.hashMap).then(async (res: HdResponse<string>) => {
+      logger.info('Response videoDetail'+res);
+      let json:VideoDetailModel = JSON.parse(res+'') as VideoDetailModel;
+      this.goPLVMediaPlayerSingleVideoPage(json.video.polyv_uuid,video_uuid)
+
+    }).catch((err: BusinessError) => {
+      this.goPLVMediaPlayerSingleVideoPage('','')
+    })
+  }
+
+  async goPLVMediaPlayerSingleVideoPage(vid:string,video_uuid:string)
+  {
+    const mediaResourcesResult = await runCatching(PLVMockMediaResourceData.getInstance().setupMediaResourcesFromLocal(vid))
+    if (mediaResourcesResult.success === false) {
+      promptAction.showToast({
+        message: `'视频数据初始化失败': ${mediaResourcesResult.error}`,
+        duration: seconds(3).toMillis()
+      })
+      return
+    }
+    const mediaResource = mediaResourcesResult.data[0]
+    router.pushUrl({
+      url:'pages/VideoPage/PLVMediaPlayerSingleVideoPage',
+      params: {
+        video_uuid:video_uuid,
+        param:new PLVMediaPlayerSingleVideoPageParam(mediaResource)
+      }
+    })
+  }
+
+}
+
+export const videoTools = new VideoTools()

features/mypage/src/main/ets/view/EditUserDataComp.ets

@@ -305,9 +305,31 @@ export struct EditUserDataComp {
     this.certificatePhotoSheetDialog = new CustomDialogController({
       builder: PhotoActionSheet({
         controller: this.certificatePhotoSheetDialog,
-        onPhotoSelected: (url: string) => {
+        onPhotoSelected: async (url: string) => {
           this.certificatePhoto = url;
           console.log('Selected image URI:', url);
+          const base64String = await ChangeUtil.convertUriToBase64(url);
+          const updateDataUrl:string = BasicConstant.urlExpert + 'modify';
+          // 定义content，请根据实际情况选择
+          const postContent = new rcp.MultipartForm({
+            'uuid': authStore.getUser().uuid,
+            'userName': authStore.getUser().userName,
+            'certificateImg': base64String,
+            'type':'2'
+          })
+          // 创建session
+          const session = rcp.createSession();
+          // 使用post发起请求，使用Promise进行异步回调；其中content以及destination为可选参数，可根据实际情况选择
+          session.post(updateDataUrl, postContent)
+            .then((response) => {
+              console.info(`Response succeeded66: ${JSON.stringify(response.headers)}`);
+              console.info(`Response succeeded: ${JSON.stringify(response.statusCode)}`);
+              console.info(`Response succeeded22: ${JSON.stringify(response)}`);
+              // console.info(`Response succeeded: ${JSON.stringify(postContent)}`);
+            })
+            .catch((err: BusinessError) => {
+              console.error(`Response err: Code is ${JSON.stringify(err.code)}, message is ${JSON.stringify(err)}`);
+            })
         }
       }),
       alignment: DialogAlignment.Bottom,
@@ -434,12 +456,11 @@ export struct EditUserDataComp {
         .height('auto')
       }
       .width('100%')
-      .height('100%')
       .layoutWeight(1)// 占据剩余空间
     }
-    .height('auto')
     .scrollBar(BarState.Off)
     .scrollable(ScrollDirection.Vertical)
     .backgroundColor('#ffffff')
+    .height('calc(100% - 100vp)')
   }
 }

features/register/src/main/ets/view/PerfectUserDataComp.ets

@@ -11,7 +11,7 @@ import { SpecialitySelectedSheet } from '@itcast/basic/src/main/ets/Views/Specia
 import { emitter } from '@kit.BasicServicesKit'
 import { BusinessError } from '@kit.BasicServicesKit';
 import { rcp } from '@kit.RemoteCommunicationKit';
-
+import { HdNav } from '@itcast/basic'
 interface extraData {
   uuid: string
 }
@@ -97,9 +97,6 @@ export struct PerfectUserDataComp {
     this.handleState()
     // logger.info("Response this.photoPath "+this.photoPath)
 
-    emitter.on({ eventId: 12 }, () => {
-      this.handleSave()
-    })
     // 收到eventId为1的事件后执行回调函数
     emitter.on({ eventId: BasicConstant.notification_back_refreshData },  (eventData: emitter.EventData) => {
       console.info(`eventData: ${JSON.stringify(eventData)}`);
@@ -114,7 +111,7 @@ export struct PerfectUserDataComp {
   }
 
   aboutToDisappear() {
-    emitter.off(12)
+
     emitter.off(BasicConstant.notification_back_refreshData)
   }
 
@@ -481,6 +478,11 @@ export struct PerfectUserDataComp {
 
 
   build() {
+    Column()
+    {
+      HdNav({ title: '完善个人资料', showRightIcon: false, showLeftIcon: true,showRightText:true,rightText:'保存',rightItemAction:()=>{
+        this.handleSave()
+      } })
       Scroll(this.scroller) {
         Column() {
           // 基本信息字段
@@ -629,15 +631,16 @@ export struct PerfectUserDataComp {
           .padding({top:50,bottom:20})
         }
         .width('100%')
-      .height('100%')
         .padding(8)
         .backgroundImage($r('app.media.bg_reg'))
         .backgroundImageSize(ImageSize.FILL)
       }
-    .height('auto')
+      .layoutWeight(1)
       .scrollable(ScrollDirection.Vertical)
-    // .scrollBar(BarState.Off)
+      .scrollBar(BarState.Off)
       .backgroundColor('#ffffff')
     }
+    .height('100%')
+  }
 }
 

products/expert/src/main/ets/pages/LoginPage/LoginSetInfoPage.ets

@@ -1,5 +1,5 @@
 import { LoginSetInfo,PerfectUserDataComp } from 'register'
-import { HdNav } from '@itcast/basic'
+
 import { router } from '@kit.ArkUI';
 
 @Entry
@@ -10,7 +10,7 @@ struct LoginSetInfoPage {
   build() {
     Column() {
       // LoginSetInfo()
-      HdNav({ title: '完善个人资料', showRightIcon: false, showLeftIcon: true,showRightText:true,rightText:'保存' })
+
       PerfectUserDataComp({loginPhone:String(this.loginInputPhone.loginInputPhone),
         state:Number(this.loginInputPhone.state),checkInfo:String(this.loginInputPhone.checkInfo)});
     }

products/expert/src/main/ets/pages/VideoPage/VideoSelectedPage.ets

@@ -0,0 +1,14 @@
+import { VideoSelected } from 'home'
+@Entry
+@Component
+struct VideoSelectedPage {
+
+
+  build() {
+    RelativeContainer() {
+      VideoSelected()
+    }
+    .height('100%')
+    .width('100%')
+  }
+}

products/expert/src/main/resources/base/profile/main_pages.json

@@ -26,6 +26,7 @@
     "pages/VideoPage/PastVideoPage",
     "pages/VideoPage/VideoGandanPage",
     "pages/VideoPage/CommentReplyPage",
-    "pages/SearchPage/VideoSearchPage"
+    "pages/SearchPage/VideoSearchPage",
+    "pages/VideoPage/VideoSelectedPage"
   ]
 }