Merge remote-tracking branch 'origin/main'

@@ -89,6 +89,15 @@ export class KVStoreHelper {
     }
     }
   }
   }
 
 
+  deleteAll() {
+    this.kvManager?.deleteKVStore(AppUtils.getPackageName(getContext()), KVStoreHelper._default_store_id)
+      .then(() => {
+        Logger.error(TAG, 'deleteAll success')
+      }).catch((e: object) => {
+      Logger.error(TAG, 'deleteAll error: ' + JSON.stringify(e))
+    })
+  }
+
   private checkStoreCreated() {
   private checkStoreCreated() {
     if (!this.kvManager) {
     if (!this.kvManager) {
       this.createKVManager()
       this.createKVManager()

@@ -53,7 +53,7 @@ export struct CardSourceInfo {
       //     .flexShrink(0);
       //     .flexShrink(0);
       // }
       // }
       if (this.contentDTO.source) {
       if (this.contentDTO.source) {
-        Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.contentDTO.publishTime)))
+        Text(DateTimeUtils.getCommentTime(Number.parseFloat(new Date(this.contentDTO.publishTime).getTime().toString())))
           .fontSize($r("app.float.font_size_11"))
           .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .flexShrink(0);
           .flexShrink(0);

@@ -143,7 +143,7 @@ export struct Card9Component {
             // 标题
             // 标题
             Image($r("app.media.timeAxis"))
             Image($r("app.media.timeAxis"))
               .width(9)
               .width(9)
-              .height(9)
+              .height(6)
               .margin({ right: 5 })
               .margin({ right: 5 })
               .fillColor(item.newsTitleColor)
               .fillColor(item.newsTitleColor)
 
 

-import { LazyDataSource, StringUtils } from 'wdKit/Index';
+import { LazyDataSource, NetworkUtil, StringUtils } from 'wdKit/Index';
 import { Remark, SubscribeMessageModel,
 import { Remark, SubscribeMessageModel,
   WDMessageCenterMessageType } from '../../../../model/InteractMessageModel';
   WDMessageCenterMessageType } from '../../../../model/InteractMessageModel';
 import MinePageDatasModel from '../../../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../../../model/MinePageDatasModel';
@@ -22,6 +22,7 @@ export struct SubscribeMessageComponent{
   @State isGetRequest: boolean = false
   @State isGetRequest: boolean = false
   private scroller: Scroller = new Scroller();
   private scroller: Scroller = new Scroller();
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
+  @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
 
 
   aboutToAppear() {
   aboutToAppear() {
     this.getNewPageData()
     this.getNewPageData()
@@ -33,9 +34,27 @@ export struct SubscribeMessageComponent{
       CustomTitleUI({ titleName: "预约消息" })
       CustomTitleUI({ titleName: "预约消息" })
       if (this.count == 0) {
       if (this.count == 0) {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {
+          if(this.isConnectNetwork){
             EmptyComponent({ emptyType: 5 })
             EmptyComponent({ emptyType: 5 })
               .height('100%')
               .height('100%')
               .width('100%')
               .width('100%')
+          }else{
+            EmptyComponent({ emptyType: 1,emptyHeight:"100%" ,retry: () => {
+              this.isConnectNetwork = NetworkUtil.isNetConnected()
+              if(this.isConnectNetwork){
+                this.curPageNum = 1;
+                this.hasMore = true
+                this.isGetRequest = false
+                this.data.clear()
+
+                if (!this.isLoading) {
+                  this.getNewPageData()
+                }
+              }
+            },})
+              .layoutWeight(1)
+              .width('100%')
+          }
         }
         }
       } else {
       } else {
         CustomPullToRefresh({
         CustomPullToRefresh({

-import { SPHelper } from 'wdKit/Index';
+import { KVStoreHelper, SPHelper } from 'wdKit/Index';
 import { HostEnum, HostManager, HttpUrlUtils } from 'wdNetwork/Index';
 import { HostEnum, HostManager, HttpUrlUtils } from 'wdNetwork/Index';
 
 
 @CustomDialog
 @CustomDialog
@@ -86,11 +86,16 @@ export struct EnvironmentCustomDialog {
       Button('确认')
       Button('确认')
         .margin({ top: 20 })
         .margin({ top: 20 })
         .onClick(() => {
         .onClick(() => {
+          new Promise<void>(() => {
             // HttpUrlUtils.hostUrl = this.currentEnvironment
             // HttpUrlUtils.hostUrl = this.currentEnvironment
             SPHelper.default.saveSync('hostUrl', this.currentEnvironment);
             SPHelper.default.saveSync('hostUrl', this.currentEnvironment);
+            // 清首页缓存
+            KVStoreHelper.default.deleteAll()
+            // TODO 清sp相关
             this.controller.close()
             this.controller.close()
             this.confirm()
             this.confirm()
           })
           })
+        })
     }.height(261).backgroundColor(Color.White).borderRadius(6).width('74%')
     }.height(261).backgroundColor(Color.White).borderRadius(6).width('74%')
 
 
   }
   }