|
|
@@ -3,6 +3,7 @@ import TitleBar from '../view/TitleBar';
|
|
|
import { router } from '@kit.ArkUI';
|
|
|
import mainViewModel, { MainViewModel } from '../viewmodel/MainViewModel';
|
|
|
import ItemData from '../viewmodel/ItemData';
|
|
|
+import type { sysResource } from '../viewmodel/ItemData';
|
|
|
import { CommonConstants } from '../common/constants/CommonConstants';
|
|
|
import { VideoItem } from '../viewmodel/VideoItem';
|
|
|
import ScreenUtil from '../common/util/ScreenUtil';
|
|
|
@@ -27,6 +28,8 @@ import { deviceInfo } from '@kit.BasicServicesKit';
|
|
|
import { resourceManager } from '@kit.LocalizationKit';
|
|
|
import { systemShare } from '@kit.ShareKit';
|
|
|
import { uniformTypeDescriptor } from '@kit.ArkData';
|
|
|
+import { IBestIcon } from "@ibestservices/ibest-ui";
|
|
|
+
|
|
|
|
|
|
const TAG = 'NewIndex'; // 日志标签
|
|
|
|
|
|
@@ -289,10 +292,27 @@ async aboutToAppear() {
|
|
|
ListItem(){
|
|
|
Row() {
|
|
|
// 菜单图标
|
|
|
- Image(item.img)
|
|
|
- .height(22)
|
|
|
- .alignSelf(ItemAlign.Center)
|
|
|
- .margin({ left: 2 })
|
|
|
+ if (typeof item.img === 'object' && item.img !== null && (item.img as sysResource).type === 'symbol') {
|
|
|
+ SymbolGlyph((item.img as sysResource).value as Resource)
|
|
|
+ .size({ width: 22, height: 22 })
|
|
|
+ .fontColor([$r("app.color.img_color")])
|
|
|
+ .alignSelf(ItemAlign.Center)
|
|
|
+ .margin({ left: 2 })
|
|
|
+ }else if (typeof item.img === 'object' && item.img !== null && (item.img as sysResource).type === 'ibest') {
|
|
|
+ IBestIcon({
|
|
|
+ name: (item.img as sysResource).value as string,
|
|
|
+ iconSize:22,
|
|
|
+ color: $r("app.color.img_color"),
|
|
|
+ }).margin({ left: 2 })
|
|
|
+ .alignSelf(ItemAlign.Center)
|
|
|
+ }else {
|
|
|
+ Image(item.img as Resource)
|
|
|
+ .height(22)
|
|
|
+ .alignSelf(ItemAlign.Center)
|
|
|
+ .fillColor($r('app.color.img_color'))
|
|
|
+ .margin({ left: 2 })
|
|
|
+ }
|
|
|
+
|
|
|
// 菜单标题
|
|
|
Text(item.title)
|
|
|
.margin({ left: 10, right: 20 })
|