developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
ebddcd66 2 parents 8fb5cddb 7fb5c311

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

Inline Side-by-side
Showing 15 changed files with 87 additions and 48 deletions
@@ -323,6 +323,7 @@ export struct WdWebLocalComponent { @@ -323,6 +323,7 @@ export struct WdWebLocalComponent {
323 }else { 323 }else {
324 Row() { 324 Row() {
325 Image(this.isPause ? $r('app.media.icon_play') : $r('app.media.icon_pause')) 325 Image(this.isPause ? $r('app.media.icon_play') : $r('app.media.icon_pause'))
  326 + .interpolation(ImageInterpolation.Medium)
326 .width(24) 327 .width(24)
327 .height(24) 328 .height(24)
328 .onClick(() => { 329 .onClick(() => {
@@ -121,7 +121,11 @@ export struct RmhTitle { @@ -121,7 +121,11 @@ export struct RmhTitle {
121 const time1 = new Date().getTime(); // 今天日期的时间戳 121 const time1 = new Date().getTime(); // 今天日期的时间戳
122 const time2 = new Date(date).getTime(); // 要比较日期的时间戳 122 const time2 = new Date(date).getTime(); // 要比较日期的时间戳
123 const diffDays = Math.round(Math.abs((time1 - time2) / oneDay)); // 两个日期时间戳差值除以一天的毫秒数得到天数，取绝对值并四舍五入 123 const diffDays = Math.round(Math.abs((time1 - time2) / oneDay)); // 两个日期时间戳差值除以一天的毫秒数得到天数，取绝对值并四舍五入
124 - return Math.ceil(diffDays); 124 + return diffDays;
  125 + }
  126 +
  127 + showTime() {
  128 + return !(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)
125 } 129 }
126 130
127 build() { 131 build() {
@@ -158,7 +162,7 @@ export struct RmhTitle { @@ -158,7 +162,7 @@ export struct RmhTitle {
158 162
159 // Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) { 163 // Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) {
160 Row() { 164 Row() {
161 - if (!(this.hideTime && this.getDaysBetweenDates(Number(this.publishTime)) > 2)) { 165 + if (this.showTime()) {
162 if (this.publishTime) { 166 if (this.publishTime) {
163 Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime))) 167 Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime)))
164 .fontSize($r("app.float.font_size_12")) 168 .fontSize($r("app.float.font_size_12"))
@@ -182,16 +186,19 @@ export struct RmhTitle { @@ -182,16 +186,19 @@ export struct RmhTitle {
182 .textAlign(TextAlign.Start) 186 .textAlign(TextAlign.Start)
183 .height(14) 187 .height(14)
184 .lineHeight(14) 188 .lineHeight(14)
185 - .constraintSize({maxWidth:(DisplayUtils.getDeviceWidth() - 32 - 36 - 18 - this.getTextWidth(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime))))}) 189 + .width('calc(100% - 54vp)')
  190 + // .constraintSize({maxWidth:(DisplayUtils.getDeviceWidth() - 32 - 36 - 18 - this.getTextWidth(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime))))})
186 } 191 }
187 192
188 } 193 }
189 .height(14) 194 .height(14)
190 .align(Alignment.Start) 195 .align(Alignment.Start)
  196 + .width('100%')
191 // } 197 // }
192 // .width('calc(100% - 36vp - 8vp)') 198 // .width('calc(100% - 36vp - 8vp)')
193 } 199 }
194 .justifyContent(FlexAlign.SpaceBetween) 200 .justifyContent(FlexAlign.SpaceBetween)
  201 + .width('100%')
195 202
196 Blank() 203 Blank()
197 if (this.rmhInfo?.cnIsAttention) { 204 if (this.rmhInfo?.cnIsAttention) {
@@ -207,14 +214,17 @@ export struct RmhTitle { @@ -207,14 +214,17 @@ export struct RmhTitle {
207 .fontSize($r('app.float.font_size_13')) 214 .fontSize($r('app.float.font_size_13'))
208 .fontColor(Number(this.followStatus) === 0 ? $r('app.color.color_ED2800') : 0xc6c6c6) 215 .fontColor(Number(this.followStatus) === 0 ? $r('app.color.color_ED2800') : 0xc6c6c6)
209 }.margin({top:4}) 216 }.margin({top:4})
  217 + .height(36)
210 } 218 }
211 .flexShrink(0) 219 .flexShrink(0)
212 .onClick(() => { 220 .onClick(() => {
213 this.handleAccention(); 221 this.handleAccention();
214 }) 222 })
  223 + .height(36)
215 } 224 }
216 } 225 }
217 .width(CommonConstants.FULL_WIDTH) 226 .width(CommonConstants.FULL_WIDTH)
  227 + .height(36)
218 .margin({ bottom: 10 }) 228 .margin({ bottom: 10 })
219 .onClick(()=>{ 229 .onClick(()=>{
220 ///个人主页 动态头像不能跳转 230 ///个人主页 动态头像不能跳转
@@ -58,7 +58,7 @@ export default struct MinePageUserSimpleInfoUI { @@ -58,7 +58,7 @@ export default struct MinePageUserSimpleInfoUI {
58 .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')) 58 .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))
59 .width(63.21) 59 .width(63.21)
60 .height(63.21) 60 .height(63.21)
61 - .objectFit(ImageFit.Cover) 61 + .objectFit(ImageFit.Fill)
62 .borderRadius(50) 62 .borderRadius(50)
63 63
64 if(StringUtils.isNotEmpty(this.levelHead)){ 64 if(StringUtils.isNotEmpty(this.levelHead)){
@@ -9,9 +9,8 @@ export struct SubscribeListChildComponent{ @@ -9,9 +9,8 @@ export struct SubscribeListChildComponent{
9 Row(){ 9 Row(){
10 Text(`${this.item.dealTime}`) 10 Text(`${this.item.dealTime}`)
11 .margin({top:16,bottom:12}) 11 .margin({top:16,bottom:12})
12 - .fontWeight(400)  
13 .fontSize(12) 12 .fontSize(12)
14 - .lineHeight(17) 13 + .lineHeight(16)
15 .fontColor($r('app.color.color_999999')) 14 .fontColor($r('app.color.color_999999'))
16 }.width('100%') 15 }.width('100%')
17 .backgroundColor($r('app.color.color_F5F5F5')) 16 .backgroundColor($r('app.color.color_F5F5F5'))
@@ -45,7 +44,6 @@ export struct SubscribeListChildComponent{ @@ -45,7 +44,6 @@ export struct SubscribeListChildComponent{
45 Text(`${this.item.desc}`) 44 Text(`${this.item.desc}`)
46 .fontSize(14) 45 .fontSize(14)
47 .lineHeight(20) 46 .lineHeight(20)
48 - .fontWeight(400)  
49 .fontColor($r('app.color.color_222222')) 47 .fontColor($r('app.color.color_222222'))
50 .layoutWeight(1) 48 .layoutWeight(1)
51 }.alignItems(VerticalAlign.Center) 49 }.alignItems(VerticalAlign.Center)
@@ -8,6 +8,7 @@ import { TrackConstants, @@ -8,6 +8,7 @@ import { TrackConstants,
8 TrackingContent, TrackingPageBrowse, TrackParamConvert } from 'wdTracking/Index'; 8 TrackingContent, TrackingPageBrowse, TrackParamConvert } from 'wdTracking/Index';
9 import { WDShare } from 'wdShare/Index'; 9 import { WDShare } from 'wdShare/Index';
10 import { hasClicked, persistentStorage } from '../../utils/persistentStorage'; 10 import { hasClicked, persistentStorage } from '../../utils/persistentStorage';
  11 +import { LottieView } from '../lottie/LottieView';
11 12
12 const TAG: string = 'CardView'; 13 const TAG: string = 'CardView';
13 14
@@ -443,7 +444,7 @@ export struct PaperSingleColumn999CardView { @@ -443,7 +444,7 @@ export struct PaperSingleColumn999CardView {
443 Image(this.item?.coverUrl) 444 Image(this.item?.coverUrl)
444 .borderRadius(5) 445 .borderRadius(5)
445 .objectFit(ImageFit.Cover) 446 .objectFit(ImageFit.Cover)
446 - .aspectRatio(319 / 179) ///图片设计比例 447 + .aspectRatio(319 / 200) ///图片设计比例
447 .padding({ top: 10 }) 448 .padding({ top: 10 })
448 //视频 449 //视频
449 if (this.item?.videoInfo) { 450 if (this.item?.videoInfo) {
@@ -481,6 +482,15 @@ export struct PaperSingleColumn999CardView { @@ -481,6 +482,15 @@ export struct PaperSingleColumn999CardView {
481 .width(14) 482 .width(14)
482 .height(14) 483 .height(14)
483 .objectFit(ImageFit.Contain) 484 .objectFit(ImageFit.Contain)
  485 + // LottieView({
  486 + // name: 'MorningPaper_live_status',
  487 + // path: "lottie/live_detail_living.json",
  488 + // lottieWidth: 14,
  489 + // lottieHeight: 14,
  490 + // autoplay: true,
  491 + // loop: true,
  492 + // })
  493 +
484 Text(this.buildLiveStateString()) 494 Text(this.buildLiveStateString())
485 .fontColor(Color.White) 495 .fontColor(Color.White)
486 .fontSize($r('app.float.vp_12')) 496 .fontSize($r('app.float.vp_12'))
@@ -5,44 +5,53 @@ export struct CustomTitleUI { @@ -5,44 +5,53 @@ export struct CustomTitleUI {
5 imgBack:boolean = true 5 imgBack:boolean = true
6 titleName:ResourceStr = "默认标题" 6 titleName:ResourceStr = "默认标题"
7 @Prop percent:number = 1 7 @Prop percent:number = 1
  8 + isShowBottomLine:boolean = false
8 9
9 build() { 10 build() {
10 - RelativeContainer() {  
11 - //标题栏目  
12 - if(this.imgBack){  
13 - Image($r('app.media.back_icon'))  
14 - .width(24)  
15 - .height(24)  
16 - .objectFit(ImageFit.Auto)  
17 - .interpolation(ImageInterpolation.High)  
18 - .id("back_icon") 11 + Column(){
  12 + RelativeContainer() {
  13 + //标题栏目
  14 + if(this.imgBack){
  15 + Image($r('app.media.back_icon'))
  16 + .width(24)
  17 + .height(24)
  18 + .objectFit(ImageFit.Auto)
  19 + .interpolation(ImageInterpolation.High)
  20 + .id("back_icon")
  21 + .alignRules({
  22 + center: {anchor: "__container__", align: VerticalAlign.Center},
  23 + left: {anchor: "__container__", align: HorizontalAlign.Start}
  24 + })
  25 + .margin({left: 16})
  26 + .onClick(()=>{
  27 + router.back()
  28 + })
  29 + }
  30 +
  31 + Text(this.titleName)
  32 + .maxLines(1)
  33 + .id("title")
  34 + .fontFamily('PingFang SC-Regular')
  35 + .fontSize(18)
  36 + .fontWeight(400)
  37 + .fontColor($r('app.color.color_222222'))
  38 + .lineHeight(26)
19 .alignRules({ 39 .alignRules({
20 center: {anchor: "__container__", align: VerticalAlign.Center}, 40 center: {anchor: "__container__", align: VerticalAlign.Center},
21 - left: {anchor: "__container__", align: HorizontalAlign.Start}  
22 - })  
23 - .margin({left: 16})  
24 - .onClick(()=>{  
25 - router.back() 41 + middle: {anchor: "__container__", align: HorizontalAlign.Center}
26 }) 42 })
27 - }  
28 43
29 - Text(this.titleName)  
30 - .maxLines(1)  
31 - .id("title")  
32 - .fontFamily('PingFang SC-Regular')  
33 - .fontSize(18)  
34 - .fontWeight(400)  
35 - .fontColor($r('app.color.color_222222'))  
36 - .lineHeight(26)  
37 - .alignRules({  
38 - center: {anchor: "__container__", align: VerticalAlign.Center},  
39 - middle: {anchor: "__container__", align: HorizontalAlign.Center}  
40 - }) 44 + }
  45 + .height(44)
  46 + .width('100%')
  47 + .backgroundColor($r('app.color.white'))
41 48
  49 + if(this.isShowBottomLine){
  50 + Text().backgroundColor($r('app.color.color_EDEDED'))
  51 + .width('100%')
  52 + .height(1)
  53 + }
42 } 54 }
43 - .height(44)  
44 - .width('100%')  
45 - .backgroundColor($r('app.color.white'))  
46 } 55 }
47 56
48 calcHeight(value:number): number{ 57 calcHeight(value:number): number{
@@ -12,14 +12,14 @@ export struct detailedSkeleton { @@ -12,14 +12,14 @@ export struct detailedSkeleton {
12 Column() { 12 Column() {
13 Column() { 13 Column() {
14 textArea('100%', 20) 14 textArea('100%', 20)
15 - textArea('50%', 20) 15 + textArea('52.5%', 20)
16 } 16 }
17 .SkeletonStyle() 17 .SkeletonStyle()
18 .alignItems(HorizontalAlign.Start) 18 .alignItems(HorizontalAlign.Start)
19 19
20 Column() { 20 Column() {
21 - textArea('30%', 12)  
22 - textArea('30%', 12) 21 + textArea('23%', 12)
  22 + textArea('23%', 12)
23 } 23 }
24 .SkeletonStyle() 24 .SkeletonStyle()
25 .alignItems(HorizontalAlign.Start) 25 .alignItems(HorizontalAlign.Start)
@@ -26,7 +26,7 @@ export class MineSettingDatasModel { @@ -26,7 +26,7 @@ export class MineSettingDatasModel {
26 mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false,"private_setting")) 26 mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false,"private_setting"))
27 let wifiState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_IMAGE_SWITCH,false) as boolean 27 let wifiState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_IMAGE_SWITCH,false) as boolean
28 mainSettingData.push(new MineMainSettingFunctionItem(null, '仅wifi网络加载图片', null, 1, wifiState,"wifi_switch")) 28 mainSettingData.push(new MineMainSettingFunctionItem(null, '仅wifi网络加载图片', null, 1, wifiState,"wifi_switch"))
29 - let videoState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_VIDEO_SWITCH,false) as boolean 29 + let videoState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_VIDEO_SWITCH,true) as boolean
30 mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch")) 30 mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch"))
31 let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean 31 let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean
32 // mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch")) 32 // mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch"))
@@ -14,10 +14,9 @@ struct ShowUserHeaderPage { @@ -14,10 +14,9 @@ struct ShowUserHeaderPage {
14 Row() { 14 Row() {
15 Image(this.headPhotoUrl) 15 Image(this.headPhotoUrl)
16 .alt($r('app.media.default_head')) 16 .alt($r('app.media.default_head'))
17 - .width('720lpx')  
18 - .height('720lpx') 17 + .width('100%')
19 .objectFit(ImageFit.Auto) 18 .objectFit(ImageFit.Auto)
20 - .clip(new Circle({ width: '720lpx', height: '720lpx' })) 19 + // .clip(new Circle({ width: '720lpx', height: '720lpx' }))
21 } 20 }
22 .width('100%') 21 .width('100%')
23 .height('100%') 22 .height('100%')
@@ -16,7 +16,7 @@ async function onlyWifiLoadImg(): Promise<boolean> { @@ -16,7 +16,7 @@ async function onlyWifiLoadImg(): Promise<boolean> {
16 } 16 }
17 17
18 async function onlyWifiLoadVideo(): Promise<boolean> { 18 async function onlyWifiLoadVideo(): Promise<boolean> {
19 - let loadImageOnlyWifiSwitch = await SPHelper.default.get(SpConstants.SETTING_WIFI_VIDEO_SWITCH, '') || false; 19 + let loadImageOnlyWifiSwitch = await SPHelper.default.get(SpConstants.SETTING_WIFI_VIDEO_SWITCH, true) || false;
20 if (!loadImageOnlyWifiSwitch) { 20 if (!loadImageOnlyWifiSwitch) {
21 // 开关没开，直接让加载视频 21 // 开关没开，直接让加载视频
22 return true 22 return true
@@ -143,7 +143,7 @@ export struct DetailPlayVLivePage { @@ -143,7 +143,7 @@ export struct DetailPlayVLivePage {
143 143
144 Stack({ alignContent: Alignment.Top }) { 144 Stack({ alignContent: Alignment.Top }) {
145 // 直播背景图，模糊处理 145 // 直播背景图，模糊处理
146 - Image(this.liveDetailPageLogic.imgUrl) 146 + Image(this.liveDetailPageLogic.getLiveCoverUrl())
147 .height('100%') 147 .height('100%')
148 .width('100%') 148 .width('100%')
149 .blur(100) 149 .blur(100)
@@ -84,4 +84,11 @@ export class LiveDetailPageLogic { @@ -84,4 +84,11 @@ export class LiveDetailPageLogic {
84 } 84 }
85 85
86 } 86 }
  87 +
  88 + getLiveCoverUrl() {
  89 + if (this.contentDetailData.fullColumnImgUrls.length > 0) {
  90 + return this.contentDetailData.fullColumnImgUrls[0].url
  91 + }
  92 + return ''
  93 + }
87 } 94 }
@@ -70,7 +70,12 @@ struct LoginProtocolWebview { @@ -70,7 +70,12 @@ struct LoginProtocolWebview {
70 } 70 }
71 .alignItems(VerticalAlign.Center) 71 .alignItems(VerticalAlign.Center)
72 .width('100%') 72 .width('100%')
73 - .height(44) 73 + .height(43)
  74 +
  75 + Text().backgroundColor("#EDEDED")
  76 + .width('100%')
  77 + .height(1)
  78 +
74 if(this.isConnectNetwork){ 79 if(this.isConnectNetwork){
75 Web({ src: this.webUrl, controller: this.webviewController }) 80 Web({ src: this.webUrl, controller: this.webviewController })
76 .backgroundColor(Color.White) 81 .backgroundColor(Color.White)