liyubing

Merge remote-tracking branch 'origin/main'

... ... @@ -63,8 +63,8 @@ export struct MessageListUI {
item.unReadCount = value.activeCount
}
if (value.activeInfo != null) {
if (value.activeInfo.message) {
item.desc = value.activeInfo.message
if (value.activeInfo.title) {
item.desc = value.activeInfo.title.replace("null","")
}
if (value.activeInfo.time) {
item.time = this.getPublishTime(value.subscribeInfo.time,DateTimeUtils.getDateTimestamp(value.activeInfo.time) + "")
... ...
... ... @@ -117,6 +117,12 @@ export default class EntryAbility extends UIAbility {
return;
}
console.info('floatWindowClass Succeeded in loading the content.');
let color: string = 'rgba(0,0,0,0)';
try {
(floatWindowClass as window.Window).setWindowBackgroundColor(color);
} catch (exception) {
console.error('Failed to set the background color. Cause: ' + JSON.stringify(exception));
};
});
floatWindowClass.on('windowEvent', (data) => {
... ...
... ... @@ -88,7 +88,6 @@ struct Index {
.height(20)
.fontColor('#222222')
.fontSize(14)
.margin({ top: 10, left: 10 })
.alignSelf(ItemAlign.Start)
.onStart(() => {
console.info('Marquee animation complete onStart')
... ... @@ -115,7 +114,7 @@ struct Index {
}
.width("100%")
.height(16)
.margin({ top: 4, left: 10 })
.margin({ top: 4})
Progress({ value: this.progressVal, total: 100, type: ProgressType.Capsule })
.color("#ED2800")
... ... @@ -194,7 +193,13 @@ struct Index {
)
.width('100%')
.height('100%')
.borderRadius(4)
.padding({
top: 10,
bottom: 10,
left: 10,
right: 0
})
.backgroundColor(Color.White)
.borderRadius(2)
}
}
\ No newline at end of file
... ...