zhangwenqiang

Merge branch 'bugfix-branch'

1 import { BottomNavi, DisplayDirection } from 'wdConstant'; 1 import { BottomNavi, DisplayDirection } from 'wdConstant';
2 import { BottomNavDTO, NavigationBodyDTO, TopNavDTO } from 'wdBean'; 2 import { BottomNavDTO, NavigationBodyDTO, TopNavDTO } from 'wdBean';
3 -import { EmitterEventId, EmitterUtils, Logger } from 'wdKit'; 3 +import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
4 import { HttpUtils } from 'wdNetwork/Index'; 4 import { HttpUtils } from 'wdNetwork/Index';
5 import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index'; 5 import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
6 import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent'; 6 import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
@@ -170,7 +170,7 @@ export struct BottomNavigationComponent { @@ -170,7 +170,7 @@ export struct BottomNavigationComponent {
170 private setTabbarNameCColor(navItem:BottomNavDTO) { 170 private setTabbarNameCColor(navItem:BottomNavDTO) {
171 171
172 if (this.isImmersive) { 172 if (this.isImmersive) {
173 - return navItem.immersiveNameCColor 173 + return StringUtils.isEmpty(navItem.immersiveNameCColor) ? "#ED2800" : navItem.immersiveNameCColor
174 } 174 }
175 175
176 if (this.isNight) { 176 if (this.isNight) {
@@ -183,7 +183,7 @@ export struct BottomNavigationComponent { @@ -183,7 +183,7 @@ export struct BottomNavigationComponent {
183 private setTabbarNameColor(navItem:BottomNavDTO) { 183 private setTabbarNameColor(navItem:BottomNavDTO) {
184 184
185 if (this.isImmersive) { 185 if (this.isImmersive) {
186 - return navItem.immersiveNameColor 186 + return StringUtils.isEmpty(navItem.immersiveNameColor) ? "#737B87" : navItem.immersiveNameColor
187 } 187 }
188 if (this.isNight) { 188 if (this.isNight) {
189 return navItem.nightNameColor 189 return navItem.nightNameColor