Merge remote-tracking branch 'origin/main'

-import { Action, ContentDTO, Params } from 'wdBean';
+import { Action, ContentDTO, Params, PhotoListBean } from 'wdBean';
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
 import { Logger } from 'wdKit';
 import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
@@ -92,20 +92,18 @@ export class ProcessUtils {
    * 图集详情页
    * @param content
    * */
-  private static gotoAtlasDetailPage(content: ContentDTO) {
+  public  static gotoMultiPictureListPage(photoList: PhotoListBean[]) {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       params: {
-        detailPageType: 17,
-        contentID: content?.objectId,
+        detailPageType: 18,
         extra: {
-          relType: content?.relType,
-          relId: content?.relId,
+          photoList
         } as ExtraDTO
       } as Params,
     };
     WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoAtlasDetailPage, ${content.objectId}`);
+    Logger.debug(TAG, `gotoMultiPictureListPage`);
   }
 
   private static gotoSpecialTopic(content: ContentDTO) {
@@ -195,4 +193,24 @@ export class ProcessUtils {
     WDRouterRule.jumpWithAction(taskAction)
     Logger.debug(TAG, `gotoAudio, ${content.objectId}`);
   }
+
+  /**
+   * 图片预览页
+   * @param content
+   * */
+  private static gotoAtlasDetailPage(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 17,
+        contentID: content?.objectId,
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoAtlasDetailPage, ${content.objectId}`);
+  }
 }
\ No newline at end of file

@@ -203,7 +203,7 @@ export struct DynamicDetailComponent {
                       }
                     }
                     .onClick((event: ClickEvent) => {
-                      ProcessUtils.processPage(this.mJumpInfo)
+                      ProcessUtils.gotoMultiPictureListPage(this.contentDetailData.photoList)
                     })
                   } else {
                     GridCol({

@@ -251,7 +251,7 @@ export struct MineSettingComponent {
 
         // 右侧文案和右箭头
         Row() {
-          Text((item.title=='清除缓存') ? this.cacheSize.toFixed(2) + 'MB' : '')
+          Text((item.itemType=='clear_cache') ? this.cacheSize.toFixed(2) + 'MB' : '')
             .fontColor('#999999')
             .maxLines(1)
           Image($r('app.media.mine_user_arrow'))
@@ -270,14 +270,14 @@ export struct MineSettingComponent {
     }
     .height('54lpx')
     .onClick(() => {
-      if (item.title == '账户与安全') {
+      if (item.itemType == 'account') {
         let params: Params = {
           pageID: 'AccountAndSecurityLayout'
         }
         WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
-      } else if (item.title == '隐私设罝') {
+      } else if (item.itemType == 'private_setting') {
         WDRouterRule.jumpWithPage(WDRouterPage.privacySettingPage)
-      } else if (item.title == '清除缓存') {
+      } else if (item.itemType == 'clear_cache') {
         this.dialogController.open()
       }
     })

@@ -52,7 +52,7 @@ class MineSettingDatasModel{
      let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch"))
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清除缓存', '32MB', 0, false,""))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清除缓存', '32MB', 0, false,"clear_cache"))
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,""))
 
     return this.mainSettingData