diff --git a/commons/basic/src/main/ets/Views/PositionSelectedSheet.ets b/commons/basic/src/main/ets/Views/PositionSelectedSheet.ets index de50d18..713fb64 100644 --- a/commons/basic/src/main/ets/Views/PositionSelectedSheet.ets +++ b/commons/basic/src/main/ets/Views/PositionSelectedSheet.ets @@ -102,6 +102,7 @@ export struct PositionSelectedSheet { range:this.officeNameArr, selected:this.selectedIndex }) + .width('100%') .canLoop(false) .selectedTextStyle({ color: '#007AFF', diff --git a/commons/basic/src/main/ets/constants/BasicConstant.ets b/commons/basic/src/main/ets/constants/BasicConstant.ets index 089d3fc..3a14a90 100644 --- a/commons/basic/src/main/ets/constants/BasicConstant.ets +++ b/commons/basic/src/main/ets/constants/BasicConstant.ets @@ -18,7 +18,7 @@ export class BasicConstant { static readonly urlExpertAPI = "https://app.igandan.com/app/expertAPI/"; static readonly urlExpertApp = "http://app.igandan.com/app/expertApp/" static readonly urlHtml = "http://doc.igandan.com/app/" - static readonly urlImage = "http://app.igandan.com/app/" + static readonly urlImage = "http://doc.igandan.com/app/" static readonly urlExpert = "http://app.igandan.com/app/expert/" static readonly wxUrl = "https://wx.igandan.com/";// 微信服务器地址 static readonly polvId = "21";//保利威视学员id @@ -55,5 +55,7 @@ export class BasicConstant { //通知事件ID static readonly notification_back_refreshData = 250529;//返回上页通知刷新数据 + //首页tabContent切换事件通知 + static readonly notification_home_tab_change = 25060413; } diff --git a/features/Home/src/main/ets/components/SwiperComp.ets b/features/Home/src/main/ets/components/SwiperComp.ets index 3ea2e11..78344cc 100644 --- a/features/Home/src/main/ets/components/SwiperComp.ets +++ b/features/Home/src/main/ets/components/SwiperComp.ets @@ -12,6 +12,7 @@ import { import { runCatching, seconds } from '@polyvharmony/media-player-sdk'; import { it } from '@ohos/hypium'; import { videoTools } from '../polyv/VideoUtil' +import { getDisplayWindowWidth } from 'media-player-common' @Component export struct SwiperComp { @State @@ -49,7 +50,7 @@ export struct SwiperComp { Image(BasicConstant.urlHtml + item.imgpath) .objectFit(ImageFit.Fill)// 图片填充模式 .width('100%') - .height(150) + .height(getDisplayWindowWidth().vp / 16 * 9) Text(item.name) .maxLines(1) .height(30) diff --git a/features/Home/src/main/ets/pages/VideoGandan.ets b/features/Home/src/main/ets/pages/VideoGandan.ets index 691cfba..cfecf40 100644 --- a/features/Home/src/main/ets/pages/VideoGandan.ets +++ b/features/Home/src/main/ets/pages/VideoGandan.ets @@ -3,6 +3,7 @@ import router from '@ohos.router'; import { BasicConstant, HdNav } from '@itcast/basic' import { SwiperComp } from '../components/SwiperComp' import { emitter } from '@kit.BasicServicesKit'; +import { getDisplayWindowWidth } from 'media-player-common' @Component export struct VideoGandan { @@ -15,7 +16,7 @@ export struct VideoGandan { params:{'pageName':'视频'} }) }}) - SwiperComp().height(150) + SwiperComp().height(getDisplayWindowWidth().vp / 16 * 9) SecondaryLink().layoutWeight(1) }.width('100%') diff --git a/features/mypage/src/main/ets/view/HeaderView.ets b/features/mypage/src/main/ets/view/HeaderView.ets index f987323..39a3a99 100644 --- a/features/mypage/src/main/ets/view/HeaderView.ets +++ b/features/mypage/src/main/ets/view/HeaderView.ets @@ -1,5 +1,5 @@ import { hdHttp, HdResponse,BasicConstant,ExpertData, authStore,RequestDefaultModel } from '@itcast/basic' -import { BusinessError } from '@kit.BasicServicesKit'; +import { BusinessError, emitter } from '@kit.BasicServicesKit'; import { HeroPopWindow } from '@itcast/basic/src/main/ets/Views/HeroPopWindow' import HashMap from '@ohos.util.HashMap' import { router } from '@kit.ArkUI' @@ -49,6 +49,16 @@ export struct HeaderView { aboutToAppear(): void { this.uploadUserDataAction(); this.uploadBackImgAction(); + emitter.on({ eventId: BasicConstant.notification_home_tab_change }, (eventData: emitter.EventData) => { + if (eventData.data?.changeIndex === 2) { + this.uploadUserDataAction(); + this.uploadBackImgAction(); + } + }); + } + + aboutToDisappear(): void { + emitter.off(BasicConstant.notification_home_tab_change) } uploadUserDataAction() { @@ -61,6 +71,7 @@ export struct HeaderView { let json:callBackData = JSON.parse(res+'') as callBackData; if(json.code == 1 && json.expert && typeof json.expert === 'object') { authStore.updateUser(json.expert) + this.photoPath = BasicConstant.urlImage+json.expert.photo; console.log('用户信息成功:', authStore.getUser().intro); } else { console.error('用户信息失败:'+json.message) diff --git a/products/expert/src/main/ets/pages/Home.ets b/products/expert/src/main/ets/pages/Home.ets index db2eee0..d48ecdf 100644 --- a/products/expert/src/main/ets/pages/Home.ets +++ b/products/expert/src/main/ets/pages/Home.ets @@ -1,5 +1,5 @@ import { TabBarComp } from '../pages/Tabbar/TabBarComp'; -import { themeManager } from '@itcast/basic'; +import { BasicConstant, themeManager } from '@itcast/basic'; import { emitter } from '@kit.BasicServicesKit'; import { common } from '@kit.AbilityKit'; import { promptAction } from '@kit.ArkUI'; @@ -28,6 +28,7 @@ struct Home { console.log('--onPageShow--'); emitter.emit('notification_status_changed') this.onChangeIndex() + // emitter.emit({eventId:BasicConstant.notification_home_tab_change},{data:{'changeIndex':this.activeIndex}}) } onPageHide(): void {