From 5aa6de62c74a0ce851603809713436459f4533f8 Mon Sep 17 00:00:00 2001 From: XiuYun CHEN Date: Tue, 20 May 2025 15:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E5=BE=80=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons/basic/oh-package.json5 | 2 +- .../src/main/ets/constants/BasicConstant.ets | 2 + features/Home/Index.ets | 2 + .../src/main/ets/components/ItemCompPastk.ets | 109 +++++++++ .../src/main/ets/components/ListCompPast.ets | 140 +++++++++++ .../Home/src/main/ets/pages/PastVideo.ets | 230 ++++++++++++++++++ .../Home/src/main/ets/pages/VideoPage.ets | 174 +++++++------ .../resources/base/media/past_metting.png | Bin 0 -> 8035 bytes .../src/main/ets/view/EditUserDataComp.ets | 2 +- features/register/oh-package-lock.json5 | 12 +- products/expert/oh-package-lock.json5 | 3 +- .../ets/pages/VideoPage/PastVideoPage.ets | 14 ++ .../resources/base/profile/main_pages.json | 3 +- 13 files changed, 597 insertions(+), 96 deletions(-) create mode 100644 features/Home/src/main/ets/components/ItemCompPastk.ets create mode 100644 features/Home/src/main/ets/components/ListCompPast.ets create mode 100644 features/Home/src/main/ets/pages/PastVideo.ets create mode 100644 features/Home/src/main/resources/base/media/past_metting.png create mode 100644 products/expert/src/main/ets/pages/VideoPage/PastVideoPage.ets diff --git a/commons/basic/oh-package.json5 b/commons/basic/oh-package.json5 index 1353439..65b9b86 100644 --- a/commons/basic/oh-package.json5 +++ b/commons/basic/oh-package.json5 @@ -6,6 +6,6 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "mypage": "file:../../features/mypage" + } } diff --git a/commons/basic/src/main/ets/constants/BasicConstant.ets b/commons/basic/src/main/ets/constants/BasicConstant.ets index cf83ae3..a310f22 100644 --- a/commons/basic/src/main/ets/constants/BasicConstant.ets +++ b/commons/basic/src/main/ets/constants/BasicConstant.ets @@ -29,4 +29,6 @@ export class BasicConstant { static readonly zhibourl = BasicConstant.wxUrl+"hcp/setInfo"; static readonly videoByTypeNew = BasicConstant.urlExpertApp + 'videoByTypeNew' static readonly videoDetail = BasicConstant.urlExpertAPI + "videoDetail"; + static readonly meetingHistoryList = BasicConstant.urlExpertAPI + "meetingHistoryList"; + } \ No newline at end of file diff --git a/features/Home/Index.ets b/features/Home/Index.ets index 0bd5bc0..303f2fd 100644 --- a/features/Home/Index.ets +++ b/features/Home/Index.ets @@ -7,3 +7,5 @@ export { PlayBack } from './src/main/ets/pages/PlayBack'; export { VideoMore } from './src/main/ets/pages/VideoMore' export { VideoDetailModel } from './src/main/ets/model/VideoDetailModel' + +export { PastVideo } from './src/main/ets/pages/PastVideo'; diff --git a/features/Home/src/main/ets/components/ItemCompPastk.ets b/features/Home/src/main/ets/components/ItemCompPastk.ets new file mode 100644 index 0000000..15e14da --- /dev/null +++ b/features/Home/src/main/ets/components/ItemCompPastk.ets @@ -0,0 +1,109 @@ + +import { MeetingItemModel,ItemModel } from '../model/ItemModel' +import { router } from '@kit.ArkUI' + + +@Preview +@Component +export struct ItemCompPast { + item: MeetingItemModel = new MeetingItemModel({} as ItemModel) + @State timeColor:ResourceStr=$r('app.color.ee432f') + @State status:string='' + aboutToAppear(): void { + this.getMeetingStatus() + } + + build() { + Column() { + Text().height(1).width('100%') + + + RelativeContainer(){ + + + Column() + { + Text(this.item.title) .maxLines(2).fontSize(15).fontColor(Color.Black).textAlign(TextAlign.Start) + .textOverflow({ overflow: TextOverflow.Ellipsis }).id('title').width('100%') + Row(){ + Image($r('app.media.meetingtime')).width(13).height(13) + Text(this.getTime(this.item.begin_date,this.item.end_date)).fontSize(14) + .fontColor($r('app.color.999999')).margin({left:10}) + Blank() + Image($r('app.media.meetinglocation')).width(15).height(15) + Text(this.item.location).fontSize(14) + .fontColor($r('app.color.999999')).margin({left:10}) + } + .width('100%') + .margin({top:6}) + }.height(75).justifyContent(FlexAlign.Center).margin({left:15,right:15}) + + + } + .height(75).clip(true) + .backgroundColor(Color.White) + + + }.backgroundColor($r('app.color.e4e4e4')) + .width('100%').clip(true) + .onClick(() => { + router.pushUrl({ + url: 'pages/WebView/WebPage', + params: { url: this.item.path ,title:'会议详情'} + }); + }) + } + + + + getTime(str1:string, str2:string) { + if (str1.substring(0, 10)==(str2.substring(0, 10))) { + return str1.replaceAll("-", ".").substring(0, 10).toString(); + } + return str1.replaceAll("-", ".").substring(0, 10)+"-"+str2.replaceAll("-", ".").substring(0, 10) +} + getMeetingStatus() + { + if(this.item.count%4==0) + { + this.timeColor=$r('app.color.ee432f') + } + else if(this.item.count%4==1) + { + this.timeColor=$r('app.color.f9b928') + } + else if(this.item.count%4==2) + { + this.timeColor=$r('app.color.63ccc7') + } + else + { + this.timeColor=$r('app.color.99d750') + } + + if('1'==this.item.status) + { + this.status='预告' + } + else if('2'==this.item.status) + { + this.status='直播中' + } + else if('3'==this.item.status) + { + this.status='已结束' + } + else if('4'==this.item.status) + { + this.status='回放中' + } + else + { + this.status='' + } + } +} + +interface extraData { + name: string +} \ No newline at end of file diff --git a/features/Home/src/main/ets/components/ListCompPast.ets b/features/Home/src/main/ets/components/ListCompPast.ets new file mode 100644 index 0000000..8718220 --- /dev/null +++ b/features/Home/src/main/ets/components/ListCompPast.ets @@ -0,0 +1,140 @@ +import { ItemCompPast } from './ItemCompPastk' +import { MeetingItemModel,MeetingModel,MeetingModels,ItemModel } from '../model/ItemModel' +import { HdList, HdListController,BasicConstant,hdHttp, HdResponse ,logger} from '@itcast/basic/Index' +import { promptAction, router } from '@kit.ArkUI' +import { BusinessError } from '@kit.BasicServicesKit'; + +import HashMap from '@ohos.util.HashMap'; + + +@Component +export struct ListCompPast { + @Prop + @Watch('onUpdate') + year:string='' + @Prop + @Watch('onUpdate') + month:string='' + @State + list: ItemModel[] = [] + controller = new HdListController() + @State + page: number = 1 + @State + keyword: string = '' + // timer: number = -1 + hashMap: HashMap = new HashMap(); + + onUpdate() { + // console.info('Response onUpdate') + // if (this.timer) clearTimeout(this.timer) + // this.timer = setTimeout(() => { + // this.controller.reload() + this.onRefresh() + // }, 500) + + } + + onRefresh() { + this.page = 1 + this.initData(0) + + } + + initData(type:number) + { + console.info('Response type'+type) + this.hashMap.clear(); + this.hashMap.set('page', this.page+"") + if(this.year=='会议年份') + { + this.hashMap.set('year','') + } + else + { + this.hashMap.set('year',this.year) + } + if(this.month=='会议月份') + { + this.hashMap.set('month','') + } + else + { + this.hashMap.set('month',this.month) + } + this.hashMap.set('title','') + hdHttp.httpReq(BasicConstant.meetingHistoryList,this.hashMap).then(async (res: HdResponse) => { + + let json:MeetingModels = JSON.parse(res+'') as MeetingModels; + + if(type==0) + { + this.controller.refreshed() + } + else + { + this.controller.loaded() + } + // if(this.page==1&&json.data.list!=null&&json.data.list.length>0) + if(this.page==1) + { + this.list=[] + if(json.data!=null&&json.data.list!) + { + this.list = json.data.list + } + + } + else if(this.page>1&&json.data!=null&&json.data.list!=null&&json.data.list.length>0) + { + this.list.push(...json.data.list) + } + this.getPosition() + if (this.page >= json.data.pages) { + this.controller.finished() + } else { + this.page++ + } + + }).catch((err: BusinessError) => { + + + }) + } + getPosition() { + let DatasList:string[] = []; + let count = 0; + for (let i = 0; i { + this.onRefresh() + }, + onLoad: () => { + this.initData(1) + + } + }) { + ForEach(this.list, (item: MeetingItemModel) => { + ListItem() { + ItemCompPast({ item }) + } + }) + } + + } +} \ No newline at end of file diff --git a/features/Home/src/main/ets/pages/PastVideo.ets b/features/Home/src/main/ets/pages/PastVideo.ets new file mode 100644 index 0000000..d04c414 --- /dev/null +++ b/features/Home/src/main/ets/pages/PastVideo.ets @@ -0,0 +1,230 @@ +import { HdNav } from '@itcast/basic' +import { ListCompPast } from '../components/ListCompPast' +import { promptAction } from '@kit.ArkUI' +@Entry +@Component +export struct PastVideo { + + @State notselectImg: ResourceStr = $r('app.media.triangle_normal'); + @State selectImg: ResourceStr = $r('app.media.triangle_green_theme'); + @State yearWords:Array =[] + @State monthWords:Array =[] + @State timePosition:number=-1; + @State typePosition:number=-1; + @State tlistStatus:boolean=false; + @State typelistStatus:boolean=false; + @State timeText:string='会议年份'; + @State monthText:string='会议月份'; + @State type:string=''; + onPageShow(): void { + console.log('VideoPage onPageShow!'); + } + + onPageHide(): void { + console.log('VideoPage onPageHide!'); + } + aboutToAppear(): void { + this.getYears() + + } + + build() { + Column() + { + HdNav({ title: '过往会议', showRightIcon: false, showLeftIcon: true}) + Row() { + Blank() + .onClick(()=>{ + this.tlistStatus=!this.tlistStatus + }) + Row() { + if(this.timePosition!=-1) + { + Text(this.timeText).customStyle().fontColor($r('app.color.top_title')) + Image(this.selectImg).width(13).margin({left:5}) + } + else { + Text(this.timeText).customStyle() + Image(this.notselectImg).width(13).margin({left:5}) + } + + } + .onClick(()=>{ + this.tlistStatus=!this.tlistStatus + }) + Blank() + .onClick(()=>{ + this.tlistStatus=!this.tlistStatus + }) + Text('|').customStyle() + Blank() + .onClick(()=>{ + this.getSelectMonth() + + }) + Row() { + if(this.typePosition!=-1) + { + Text(this.monthText).customStyle().fontColor($r('app.color.top_title')) + Image(this.selectImg).width(13).margin({left:5}) + } + else { + Text(this.monthText).customStyle() + Image(this.notselectImg).width(13).margin({left:5}) + } + } + .onClick(()=>{ + this.getSelectMonth() + }) + Blank() + .onClick(()=>{ + this.getSelectMonth() + }) + }.width('100%').height(45) + Text().Line() + Stack({ }) { + ListCompPast({year:this.timeText,month:this.type}).padding({bottom:20}).backgroundColor($r('app.color.e4e4e4')) + if(this.tlistStatus) + { + List() { + ForEach(this.yearWords, (item: string,index:number) => { + ListItem() { + Column() { + + if(this.timePosition==index) + { + Row() + { + Text(item).customStyle().height(40).fontColor($r('app.color.top_title')) + Blank() + Image($r('app.media.chose_card')).width(22).margin({right:25}) + + } + .width('100%') + .alignSelf(ItemAlign.Start) + Text().Line().backgroundColor($r('app.color.top_title')) + } + else + { + Text(item).customStyle().height(40).alignSelf(ItemAlign.Start) + Text().Line() + } + + }.padding({left:22}) + .width('100%') + .justifyContent(FlexAlign.Start) + .onClick(()=>{ + this.timePosition=index + this.tlistStatus=false + this.timeText=item + }) + } + }, (item: string) => JSON.stringify(item)) + } .width('100%') + .height('100%').backgroundColor(Color.White) + } + if(this.typelistStatus) + { + List() { + ForEach(this.monthWords, (item: string,index:number) => { + ListItem() { + Column() { + + if(this.typePosition==index) + { + Row() + { + Text(item).customStyle().height(40).fontColor($r('app.color.top_title')) + Blank() + Image($r('app.media.chose_card')).width(22).margin({right:25}) + + } + .width('100%') + .alignSelf(ItemAlign.Start) + Text().Line().backgroundColor($r('app.color.top_title')) + } + else + { + Text(item).customStyle().height(40).alignSelf(ItemAlign.Start) + Text().Line() + } + + }.padding({left:22}) + .width('100%') + .justifyContent(FlexAlign.Start) + .onClick(()=>{ + this.typePosition=index + this.typelistStatus=false + this.monthText=item + this.type=index+1+'' + + }) + } + }, (item: string) => JSON.stringify(item)) + } .width('100%') + .height('100%').backgroundColor(Color.White) + } + } + + } + .width('100%') + .height('100%') + .padding({bottom:50}) + } + + getYears() + { + + + let year:number= new Date().getFullYear(); + for(let i =year;i>=2016;i--){ + this.yearWords.push(i+""); + } + + } + + getSelectMonth() + { + if(this.timeText=='会议年份') + { + promptAction.showToast({message:'请先选择年份'}) + } + else + { + this.typelistStatus=!this.typelistStatus + if(this.typelistStatus==true) + { + this.monthWords=[] + if(this.timePosition==0) + { + let nowmonth:number= new Date().getMonth(); + for (let i = 1; i<=nowmonth+1; i++) { + this.monthWords.push(i+"月"); + } + } + else + { + for (let i = 1; i <=12; i++) { + this.monthWords.push(i+"月"); + } + } + } + } + } + + +} +@Extend(Text) +function customStyle() { + + .fontColor($r('app.color.tab_text_nor')) + .fontSize(13) + +} +@Extend(Text) +function Line() { + + .height(0.5).width('100%').backgroundColor($r('app.color.devider_line')) +} + + diff --git a/features/Home/src/main/ets/pages/VideoPage.ets b/features/Home/src/main/ets/pages/VideoPage.ets index 8786090..81e6ccb 100644 --- a/features/Home/src/main/ets/pages/VideoPage.ets +++ b/features/Home/src/main/ets/pages/VideoPage.ets @@ -27,107 +27,121 @@ export struct VideoPage { } build() { - Column() + RelativeContainer() { - HdNav({ title: '肝胆会议', showRightIcon: false, showLeftIcon: true,showRightText:true,rightText:'扫一扫' }) - Row() { - Blank() + Column() + { + HdNav({ title: '肝胆会议', showRightIcon: false, showLeftIcon: true,showRightText:true,rightText:'扫一扫' }) + Row() { + Blank() + .onClick(()=>{ + this.tlistStatus=!this.tlistStatus + }) + Row() { + if(this.timePosition!=-1) + { + Text(this.timeText).customStyle().fontColor($r('app.color.top_title')) + Image(this.selectImg).width(13).margin({left:5}) + } + else { + Text(this.timeText).customStyle() + Image(this.notselectImg).width(13).margin({left:5}) + } + + } .onClick(()=>{ this.tlistStatus=!this.tlistStatus }) - Row() { - if(this.timePosition!=-1) - { - Text(this.timeText).customStyle().fontColor($r('app.color.top_title')) - Image(this.selectImg).width(13).margin({left:5}) - } - else { - Text(this.timeText).customStyle() + Blank() + .onClick(()=>{ + this.tlistStatus=!this.tlistStatus + }) + Text('|').customStyle() + Blank() + Row() { + Text('会议地点').customStyle() Image(this.notselectImg).width(13).margin({left:5}) } + Blank() + Text('|').customStyle() + Blank() + .onClick(() => { + router.pushUrl({url:'pages/VideoPage/PlayBackPage'}) + }) + Row() { + Text('会议回放').customStyle() - } - .onClick(()=>{ - this.tlistStatus=!this.tlistStatus - }) - Blank() - .onClick(()=>{ - this.tlistStatus=!this.tlistStatus - }) - Text('|').customStyle() - Blank() - Row() { - Text('会议地点').customStyle() - Image(this.notselectImg).width(13).margin({left:5}) - } - Blank() - Text('|').customStyle() - Blank() + } .onClick(() => { router.pushUrl({url:'pages/VideoPage/PlayBackPage'}) }) - Row() { - Text('会议回放').customStyle() + Blank() + .onClick(() => { + router.pushUrl({url:'pages/VideoPage/PlayBackPage'}) + }) + }.width('100%').height(45) + Text().Line() + Stack({ }) { + ListComp().padding({bottom:20}).backgroundColor($r('app.color.e4e4e4')) + if(this.tlistStatus) + { + List() { + ForEach(this.monthWords, (item: string,index:number) => { + ListItem() { + Column() { - } - .onClick(() => { - router.pushUrl({url:'pages/VideoPage/PlayBackPage'}) - }) - Blank() - .onClick(() => { - router.pushUrl({url:'pages/VideoPage/PlayBackPage'}) - }) - }.width('100%').height(45) - Text().Line() - Stack({ }) { - ListComp().padding({bottom:20}).backgroundColor($r('app.color.e4e4e4')) - if(this.tlistStatus) - { - List() { - ForEach(this.monthWords, (item: string,index:number) => { - ListItem() { - Column() { - - if(this.timePosition==index) - { - Row() + if(this.timePosition==index) { - Text(item).customStyle().height(40).fontColor($r('app.color.top_title')) - Blank() - Image($r('app.media.chose_card')).width(22).margin({right:25}) + Row() + { + Text(item).customStyle().height(40).fontColor($r('app.color.top_title')) + Blank() + Image($r('app.media.chose_card')).width(22).margin({right:25}) + } + .width('100%') + .alignSelf(ItemAlign.Start) + Text().Line().backgroundColor($r('app.color.top_title')) + } + else + { + Text(item).customStyle().height(40).alignSelf(ItemAlign.Start) + Text().Line() } - .width('100%') - .alignSelf(ItemAlign.Start) - Text().Line().backgroundColor($r('app.color.top_title')) - } - else - { - Text(item).customStyle().height(40).alignSelf(ItemAlign.Start) - Text().Line() - } - }.padding({left:22}) - .width('100%') - .justifyContent(FlexAlign.Start) - .onClick(()=>{ - this.timePosition=index - this.tlistStatus=false - this.timeText=item + }.padding({left:22}) + .width('100%') + .justifyContent(FlexAlign.Start) + .onClick(()=>{ + this.timePosition=index + this.tlistStatus=false + this.timeText=item + + }) + } + }, (item: string) => JSON.stringify(item)) + } .width('100%') + .height('100%').backgroundColor(Color.White) + } - }) - } - }, (item: string) => JSON.stringify(item)) - } .width('100%') - .height('100%').backgroundColor(Color.White) } } + .width('100%') + .height('100%') + .padding({bottom:50}) + Image($r('app.media.past_metting')).width(76).height(40) + .alignRules({ + right: { anchor: "__container__", align: HorizontalAlign.End }, + bottom:{ anchor: "__container__", align:VerticalAlign.Bottom} + }) + .margin({bottom:120}) + .onClick(() => { + router.pushUrl({url:'pages/VideoPage/PastVideoPage'}) + }) } - .width('100%') - .height('100%') - .padding({bottom:50}) + } getNowMonth() diff --git a/features/Home/src/main/resources/base/media/past_metting.png b/features/Home/src/main/resources/base/media/past_metting.png new file mode 100644 index 0000000000000000000000000000000000000000..88eddfc7d55de9fab9c77490288cb5e9d8b5d298 GIT binary patch literal 8035 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 literal 0 HcmV?d00001 diff --git a/features/mypage/src/main/ets/view/EditUserDataComp.ets b/features/mypage/src/main/ets/view/EditUserDataComp.ets index 9bc279f..e7682a9 100644 --- a/features/mypage/src/main/ets/view/EditUserDataComp.ets +++ b/features/mypage/src/main/ets/view/EditUserDataComp.ets @@ -2,7 +2,7 @@ import { hdHttp, HdResponse,BasicConstant,ExpertData, authStore, ChangeUtil } f import HashMap from '@ohos.util.HashMap' import { BusinessError } from '@kit.BasicServicesKit'; import { promptAction, router } from '@kit.ArkUI' -import { EditUserDataItem } from './EditUserDataItem' +import { EditUserDataItem } from '@itcast/basic/src/main/ets/Views/EditUserDataItem' import { PhotoActionSheet } from '@itcast/basic/src/main/ets/Views/PhotoActionSheet' import { DatePickerDialog } from '@itcast/basic/src/main/ets/Views//DatePickerDialog' import { OfficeSelectedSheet } from '@itcast/basic/src/main/ets/Views//OfficeSelectedSheet' diff --git a/features/register/oh-package-lock.json5 b/features/register/oh-package-lock.json5 index e1df1ae..cc3bce5 100644 --- a/features/register/oh-package-lock.json5 +++ b/features/register/oh-package-lock.json5 @@ -5,8 +5,7 @@ "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { - "@itcast/basic@../../commons/basic": "@itcast/basic@../../commons/basic", - "mypage@../mypage": "mypage@../mypage" + "@itcast/basic@../../commons/basic": "@itcast/basic@../../commons/basic" }, "packages": { "@itcast/basic@../../commons/basic": { @@ -14,15 +13,6 @@ "version": "1.0.0", "resolved": "../../commons/basic", "registryType": "local" - }, - "mypage@../mypage": { - "name": "mypage", - "version": "1.0.0", - "resolved": "../mypage", - "registryType": "local", - "dependencies": { - "@itcast/basic": "file:../../commons/basic" - } } } } \ No newline at end of file diff --git a/products/expert/oh-package-lock.json5 b/products/expert/oh-package-lock.json5 index 3bf4886..4ba637f 100644 --- a/products/expert/oh-package-lock.json5 +++ b/products/expert/oh-package-lock.json5 @@ -232,8 +232,7 @@ "resolved": "../../features/register", "registryType": "local", "dependencies": { - "@itcast/basic": "file:../../commons/basic", - "mypage": "file:../../features/mypage" + "@itcast/basic": "file:../../commons/basic" } }, "scene_single_video@../../scene_single_video": { diff --git a/products/expert/src/main/ets/pages/VideoPage/PastVideoPage.ets b/products/expert/src/main/ets/pages/VideoPage/PastVideoPage.ets new file mode 100644 index 0000000..27dc76a --- /dev/null +++ b/products/expert/src/main/ets/pages/VideoPage/PastVideoPage.ets @@ -0,0 +1,14 @@ +import { PastVideo } from 'home' +@Entry +@Component +struct PastVideoPage { + + + build() { + RelativeContainer() { + PastVideo() + } + .height('100%') + .width('100%') + } +} \ No newline at end of file diff --git a/products/expert/src/main/resources/base/profile/main_pages.json b/products/expert/src/main/resources/base/profile/main_pages.json index 8ca7ade..61560dc 100644 --- a/products/expert/src/main/resources/base/profile/main_pages.json +++ b/products/expert/src/main/resources/base/profile/main_pages.json @@ -22,6 +22,7 @@ "pages/VideoPage/PlayBackPage", "pages/VideoPage/VideoMorePage", "pages/VideoPage/PLVMediaPlayerSingleVideoPage", - "pages/WebView/LivebroadcastPages" + "pages/WebView/LivebroadcastPages", + "pages/VideoPage/PastVideoPage" ] } \ No newline at end of file