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

王士厅
Commit eb8782ff2a9e968f9d6cd2a0f92395e8dd7e6605 eb8782ff 2 parents 9ec42bd7 1ccd0712
Showing 4 changed files with 52 additions and 16 deletions
sight_harmony/features/wdDetailPlayLive/src/main/ets/widgets/details/TabChatItemComponent.ets
sight_harmony/features/wdDetailPlayLive/src/main/ets/widgets/details/TabLiveItemComponent.ets
sight_harmony/products/phone/src/main/ets/pages/upgradePage/UpgradeTipDialog.ets
sight_harmony/products/phone/src/main/ets/pages/view/BottomNavigationComponent.ets
--- a/sight_harmony/features/wdDetailPlayLive/src/main/ets/widgets/details/TabChatItemComponent.ets
View file @eb8782f
+++ b/sight_harmony/features/wdDetailPlayLive/src/main/ets/widgets/details/TabChatItemComponent.ets
View file @eb8782f
@@ -34,6 +34,7 @@ export struct TabChatItemComponent {
               top: 10, bottom: 4
             })
             .onClick(() => {
+              if (this.item.customizeExpression == 1) {return}
               this.gotoMultipleListImagePage(this.item.pictureUrls[0])
             })
         }
--- a/sight_harmony/features/wdDetailPlayLive/src/main/ets/widgets/details/TabLiveItemComponent.ets
View file @eb8782f
+++ b/sight_harmony/features/wdDetailPlayLive/src/main/ets/widgets/details/TabLiveItemComponent.ets
View file @eb8782f
@@ -255,14 +255,20 @@ export struct TabLiveItemComponent {
           if (this.item.isWall == 1) {
             Blank().layoutWeight(1)
-
-            Text() {
-              Span(' 上墙 ')
-                .foregroundColor("#CB0000")
+            Text(' 上墙 ')
+              .maxLines(1)
+              .textOverflow({ overflow: TextOverflow.Ellipsis })
               .fontSize(11)
-                .lineHeight(20)
-                .textBackgroundStyle({ color: "#70FFC63F", radius: 2 })
-            }.lineHeight(20).fontSize('14fp').fontWeight(400)
+              .fontWeight(400)
+              .fontColor("#CB0000")
+              .backgroundColor('#F1EFEB')
+              .padding({
+                left: 4,
+                top: 1,
+                right: 4,
+                bottom: 1
+              })
+              .borderRadius(2)
           }
         }
         .alignItems(VerticalAlign.Top)
--- a/sight_harmony/products/phone/src/main/ets/pages/upgradePage/UpgradeTipDialog.ets
View file @eb8782f
+++ b/sight_harmony/products/phone/src/main/ets/pages/upgradePage/UpgradeTipDialog.ets
View file @eb8782f
@@ -13,7 +13,7 @@ export struct UpgradeTipDialog {
   maxWidth: number = 0
   scroller: Scroller = new Scroller();
   aboutToAppear(): void {
-    this.maxHeight = DisplayUtils.getDeviceHeight() * 0.6
+    this.maxHeight = DisplayUtils.getDeviceHeight() * 0.65
     this.maxWidth = DisplayUtils.getDeviceWidth() * 0.76
     // this.tipContent.content = "1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电1、啊啊啊啊啊啊\n2、啊啊啊啊啊\n4、阿斯兰减肥的垃圾发电"
@@ -54,14 +54,16 @@ export struct UpgradeTipDialog {
         .fontColor("#222222")
         .fontSize(18)
         .textAlign(TextAlign.Center)
+        .fontFamily('PingFang SC-Medium')
       Scroll(this.scroller) {
         Column() {
           Row() {
             Text(this.tipContent.content)
-              .fontColor("#000000")
+              .fontColor("#222222")
               .fontSize(14)
               .textAlign(TextAlign.Start)
+              .lineHeight(24)
           }
           .alignItems(VerticalAlign.Top)
           .width("100%")
@@ -70,8 +72,8 @@ export struct UpgradeTipDialog {
         .padding({left: 24, right: 24})
       }
       .width("100%")
-      .margin({top: 16, bottom: 2})
-      // .backgroundColor(Color.Brown)
+      .margin({top: 12, bottom: 2})
+      // .backgroundColor(Color.Pink)
       .layoutWeight(1)
       /// 灰色线
@@ -100,7 +102,7 @@ export struct UpgradeTipDialog {
       if (this.tipContent.forceUpgrade) {
         Text("温馨提示：本次更新为必要更新，若您选择拒绝，将无法再使用app")
-          .fontColor("999999")
+          .fontColor("#999999")
           .fontSize(12)
           .fontWeight(400)
           .lineHeight(17)
--- a/sight_harmony/products/phone/src/main/ets/pages/view/BottomNavigationComponent.ets
View file @eb8782f
+++ b/sight_harmony/products/phone/src/main/ets/pages/view/BottomNavigationComponent.ets
View file @eb8782f
@@ -49,7 +49,7 @@ export struct BottomNavigationComponent {
   /**
    * Component opacity value: 0.6.
    */
-  readonly SIXTY_OPACITY: number = 0.6;
+  readonly SIXTY_OPACITY: number = 0.8;
   // 用于传参到顶导组件，【不用channelParam，主要是时序问题，需要先底导处理完，再延时触发顶导处理】
   @State assignChannel: AssignChannelParam = new AssignChannelParam()
   // 自动刷新触发（双击tab自动刷新）
@@ -140,7 +140,7 @@ export struct BottomNavigationComponent {
         .fontWeight(this.currentNavIndex === index ? FontWeight.Bold : FontWeight.Normal)
         .textAlign(TextAlign.Center)
         .fontSize($r('app.float.font_size_10'))// .fontColor(this.currentNavIndex === index ? Color.Red : Color.Gray)
-        .fontColor(this.currentNavIndex === index ? navItem.nameCColor : navItem.nameColor)
+        .fontColor(this.currentNavIndex === index ? this.setTabbarNameCColor(navItem) : this.setTabbarNameColor(navItem))
         .opacity(this.currentNavIndex === index ? this.FULL_OPACITY : this.SIXTY_OPACITY)
     }
     .zIndex(10)
@@ -167,10 +167,34 @@ export struct BottomNavigationComponent {
   }
+  private setTabbarNameCColor(navItem:BottomNavDTO) {
+
+    if (this.isImmersive) {
+      return navItem.immersiveNameCColor
+    }
+
+    if (this.isNight) {
+      return navItem.nightNameCColor
+    }
+
+    return navItem.nameCColor
+  }
+
+  private setTabbarNameColor(navItem:BottomNavDTO) {
+
+    if (this.isImmersive) {
+      return navItem.immersiveNameColor
+    }
+    if (this.isNight) {
+      return navItem.nightNameColor
+    }
+
+    return navItem.nameColor
+  }
+
   getBottomImageKnifeOption(navItem: BottomNavDTO, isSelect: boolean): ImageKnifeOption {
     let defaultIcon = this.getBottomLocalIcon(navItem, isSelect)
     let url = this.getBottomIcon(navItem, isSelect)
-
     let imageKnifeOption: ImageKnifeOption = {
       loadSrc: url,
       // 占位图使用本地资源
@@ -196,6 +220,9 @@ export struct BottomNavigationComponent {
     if (this.isImmersive) {
       // 获取沉浸式icon
       icon = isSelect ? navItem.immersiveIconCUrl : navItem.immersiveIconUrl
+    } else if (this.isNight) {
+      // 获取暗黑模式 icon
+      icon = isSelect ? navItem.nightIconCUrl : navItem.nightIconUrl
     } else {
       // 获取常规icon
       icon = isSelect ? navItem.iconC : navItem.icon
@@ -259,7 +286,7 @@ export struct BottomNavigationComponent {
   // 底导切换函数
   async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) {
-    Logger.info(TAG, `onBottomNavigationIndexChange this.currentNavIndex: ${this.currentNavIndex}`);
+    Logger.info(TAG, `onBottomNavigationIndexChange to Index:${index},this.currentNavIndex: ${this.currentNavIndex}`);
     if (navItem.name === '我的') {
       this.barBackgroundColor = Color.White