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

@@ -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()

@@ -124,7 +124,7 @@ export struct CardAdvGanMiComponent {
       })
       })
 
 
       // 更多按钮
       // 更多按钮
-      commonButton(this.advExtraData)
+      this.commonButton()
 
 
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
@@ -134,19 +134,19 @@ export struct CardAdvGanMiComponent {
     })
     })
 
 
   }
   }
-}
 
 
-/*
+  /*
    标题样式
    标题样式
  */
  */
-@Builder
-function commonButton(advExtraData: AdvExtraData) {
+  @Builder
+  commonButton() {
 
 
 
 
     Row() {
     Row() {
       Row() {
       Row() {
         Blank()
         Blank()
-      Text(advExtraData.itemMore.title == null ? $r('app.string.look_more') : advExtraData.itemMore.title)
+        Text(this.advExtraData.itemMore == undefined ? $r('app.string.look_more') :
+          this.advExtraData.itemMore.title == undefined ? $r('app.string.look_more') : this.advExtraData.itemMore.title)
           .fontColor('#222222')
           .fontColor('#222222')
           .fontSize('14fp')
           .fontSize('14fp')
         Image($r('app.media.icon_comp_more_right_red')).width(16).height(16)
         Image($r('app.media.icon_comp_more_right_red')).width(16).height(16)
@@ -158,11 +158,14 @@ function commonButton(advExtraData: AdvExtraData) {
       .borderRadius(3)
       .borderRadius(3)
       .padding({ top: 10, bottom: 10, })
       .padding({ top: 10, bottom: 10, })
       .onClick(() => {
       .onClick(() => {
+        if (this.advExtraData.itemMore != undefined) {
           let matInfo: CompAdvMatInfoBean = {
           let matInfo: CompAdvMatInfoBean = {
-        linkUrl: advExtraData.itemMore.linkUrl,
-        linkType: advExtraData.itemMore.linkType
+            linkUrl: this.advExtraData.itemMore.linkUrl,
+            linkType: this.advExtraData.itemMore.linkType
           } as CompAdvMatInfoBean;
           } as CompAdvMatInfoBean;
           ProcessUtils.openAdvDetail(matInfo)
           ProcessUtils.openAdvDetail(matInfo)
+        }
+
       })
       })
     }.width('100%').padding({
     }.width('100%').padding({
       left: $r('app.float.card_comp_pagePadding_lf'),
       left: $r('app.float.card_comp_pagePadding_lf'),
@@ -170,4 +173,6 @@ function commonButton(advExtraData: AdvExtraData) {
 
 
     })
     })
 
 
+  }
 }
 }
+

@@ -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 { 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%')
 
 
   }
   }