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

@@ -15,7 +15,7 @@ export struct CardSourceInfo {
           .margin({ right: 2 })
           .margin({ right: 2 })
       }
       }
       if (this.contentDTO.rmhPlatform === 1) {
       if (this.contentDTO.rmhPlatform === 1) {
-        Text(this.contentDTO.rmhInfo.rmhName)
+        Text(this.contentDTO.rmhInfo?.rmhName)
           .fontSize($r("app.float.font_size_12"))
           .fontSize($r("app.float.font_size_12"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .maxLines(1)
           .maxLines(1)

@@ -16,6 +16,12 @@ export class ContentConstants {
    * 5:专题详情
    * 5:专题详情
    */
    */
   static readonly TYPE_SPECIAL_TOPIC: string = "5";
   static readonly TYPE_SPECIAL_TOPIC: string = "5";
+
+  /**
+   * 6:链接
+   */
+  static readonly TYPE_LINK: string = "6";
+
   /**
   /**
    * 8:图文详情，这里是h5页面
    * 8:图文详情，这里是h5页面
    */
    */

@@ -43,6 +43,9 @@ export class ProcessUtils {
       // 图文详情，跳转h5
       // 图文详情，跳转h5
         ProcessUtils.gotoWeb(content);
         ProcessUtils.gotoWeb(content);
         break;
         break;
+      case ContentConstants.TYPE_LINK:
+        ProcessUtils.gotoDefaultWeb(content);
+        break;
     //图集详情页
     //图集详情页
       case ContentConstants.TYPE_NINE:
       case ContentConstants.TYPE_NINE:
         ProcessUtils.gotoAtlasDetailPage(content);
         ProcessUtils.gotoAtlasDetailPage(content);
@@ -53,6 +56,7 @@ export class ProcessUtils {
         break;
         break;
     //动态详情页（动态图文）
     //动态详情页（动态图文）
       case ContentConstants.TYPE_FOURTEEN:
       case ContentConstants.TYPE_FOURTEEN:
+        break;
     //动态详情页（动态视频）
     //动态详情页（动态视频）
       case ContentConstants.TYPE_FIFTEEN:
       case ContentConstants.TYPE_FIFTEEN:
         ProcessUtils.gotoDynamicDetailPage(content);
         ProcessUtils.gotoDynamicDetailPage(content);
@@ -113,6 +117,17 @@ export class ProcessUtils {
     WDRouterRule.jumpWithAction(taskAction)
     WDRouterRule.jumpWithAction(taskAction)
   }
   }
 
 
+  private static gotoDefaultWeb(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_H5_BY_WEB_VIEW',
+      params: {
+        url: content.linkUrl,
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoWeb, ${content.objectId}`);
+  }
+
   private static gotoWeb(content: ContentDTO) {
   private static gotoWeb(content: ContentDTO) {
     //  // topicId
     //  // topicId
     // content.channelId;
     // content.channelId;

@@ -31,6 +31,14 @@
     {
     {
       "name": "refresh_fail_text",
       "name": "refresh_fail_text",
       "value": "刷新失败"
       "value": "刷新失败"
+    },
+    {
+      "name": "image_request_success",
+      "value": "图片下载到图库成功"
+    },
+    {
+      "name": "image_request_fail",
+      "value": "图片加载失败，请检查网络"
     }
     }
   ]
   ]
 }
 }