早晚报 UI微调;早晚报走测试环境

@@ -153,7 +153,11 @@ export class HttpUrlUtils {
    * */
   static readonly MORNING_EVENING_PAGE_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/pageInfo";
   static readonly MORNING_EVENING_COMP_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/compInfo";
-  private static hostUrl: string = HttpUrlUtils.HOST_PRODUCT;
+  private static _hostUrl: string = HttpUrlUtils.HOST_PRODUCT;
+
+  public static set hostUrl(value: string) {
+    HttpUrlUtils._hostUrl = value;
+  }
   private static userId = ''
   private static userType = ''
   private static token = ''
@@ -199,7 +203,7 @@ export class HttpUrlUtils {
   }
 
   static addSpecialHeaders(headers: HashMap<string, string>) {
-    switch (HttpUrlUtils.hostUrl) {
+    switch (HttpUrlUtils._hostUrl) {
       case HttpUrlUtils.HOST_UAT:
       // TODO 待优化到常量类里
         headers.set('X-Ca-Stage', 'PRE');
@@ -227,7 +231,7 @@ export class HttpUrlUtils {
   }
 
   static getHost() {
-    return HttpUrlUtils.hostUrl;
+    return HttpUrlUtils._hostUrl;
   }
 
   private static getCity() {
@@ -343,39 +347,39 @@ export class HttpUrlUtils {
   }
 
   static getVerifyCodeUrl() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode";
     return url;
   }
 
   static getVerifyCodeByTokenUrl() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCodeByToken";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCodeByToken";
     return url;
   }
 
 
   static getForgetPasswordUrl() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/forgotPassword";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/forgotPassword";
     return url;
   }
 
   static getLogoutUrl() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/logout";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/logout";
     return url;
   }
 
 
   static getResetPassworddUrl() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/resetPassword";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/resetPassword";
     return url;
   }
 
   static queryUserDetail() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/queryUserDetail";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/queryUserDetail";
     return url;
   }
 
   static editUserDetail() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/editUserDetail";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/editUserDetail";
     return url;
   }
 
@@ -385,17 +389,17 @@ export class HttpUrlUtils {
   }
 
   static getCheckVerifyCodeUrl() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCode";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCode";
     return url;
   }
 
   static getCheckVerifyByTokenCodeUrl() {
-    let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCodeByToken";
+    let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCodeByToken";
     return url;
   }
 
   static getAppointmentListDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
     return url
   }
 
@@ -405,77 +409,77 @@ export class HttpUrlUtils {
   }
 
   static getFollowListDetailDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH
     return url
   }
 
   static getFollowListDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_DATA_PATH
     return url
   }
 
   static getMineFollowListDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH
     return url
   }
 
   static getFollowListStatusDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
     return url
   }
 
   static getCommentListStatusDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.COMMENT_LIST_STATUS_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.COMMENT_LIST_STATUS_DATA_PATH
     return url
   }
 
   static getMineCommentListDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH
     return url
   }
 
   static getMineUserLevelDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH
     return url
   }
 
   static getOtherUserLevelDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH
     return url
   }
 
   static getMineUserDetailDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH
     return url
   }
 
   static getOtherUserDetailDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH
     return url
   }
 
   static getOtherCommentListDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH
     return url
   }
 
   static getOtherUserFollowListDataUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH
     return url
   }
 
   static getAppointmentOperationUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH
     return url
   }
 
   static getCommentLikeOperationUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH
     return url
   }
 
   static getFollowOperationUrl() {
-    let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_OPERATION_PATH
+    let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_OPERATION_PATH
     return url
   }
 

@@ -229,6 +229,7 @@ export struct MorningEveningPaperComponent {
         // console.info(TAG, `onClick listen_right_bg`);
       })
     }
+    .margin({ left: 12, right: 12 })
     // .width('100%')
     .height(56)
     .alignItems(VerticalAlign.Center)

@@ -33,17 +33,20 @@ export struct topicInfoView {
 
       Row() {
         Text("查看详情")
-          .fontSize(16)
+          .fontSize(14)
           .fontColor($r('app.color.white'))
           .maxLines(1)
-          .backgroundColor($r('app.color.color_99636363'))
           .borderRadius(2)
+          .padding({ left: 6, top: 4, bottom: 4 })
 
-        Image($r('app.media.more'))
-          .height($r('app.float.top_arrow_size'))
-          .width(20)
+        Image($r('app.media.more'))// .height($r('app.float.top_arrow_size'))
+          .width(12)
+          .height(12)
+          .margin({ left: 4, right: 7 })
       }
-      .margin({ top: 10, left: 16, right: 16 })
+      .backgroundColor($r('app.color.color_99636363'))
+      .margin({ top: 8, left: 16, right: 16, bottom: 16 })
+      .borderRadius(2)
       // .backgroundColor(Color.Red)
       .alignRules({
         left: { anchor: "__container__", align: HorizontalAlign.Start },
@@ -61,6 +64,7 @@ export struct topicInfoView {
           left: { anchor: "__container__", align: HorizontalAlign.Start },
           bottom: { anchor: "row_detail", align: VerticalAlign.Top }
         })
+        .margin({ left: 16, right: 16 })
         .id('txt_summary')
 
       Text(this.frontLinkObject?.title ?? "")
@@ -71,6 +75,7 @@ export struct topicInfoView {
           left: { anchor: "__container__", align: HorizontalAlign.Start },
           bottom: { anchor: "txt_summary", align: VerticalAlign.Top }
         })
+        .margin({ left: 16, right: 16, bottom: 8 })
         .id('txt_title')
     }
     .width("100%")

@@ -102,6 +102,7 @@ export class PageRepository {
    * 早晚报pageInfo请求 TODO 现网无数据写死测试环境
    * */
   static getMorningEveningPageInfoUrl(pageId: string) {
+    HttpUrlUtils.hostUrl = HttpUrlUtils.HOST_DEV
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_PAGE_INFO_PATH;
     url = url + "?pageId=" + pageId;
     Logger.info(TAG, "getMorningEveningPageInfoUrl url = " + url)
@@ -122,6 +123,7 @@ export class PageRepository {
    * topicId:专题id
    * */
   static getMorningEveningCompInfoUrl(pageId: number, groupId: number, refreshTime: string, topicId: string, pageNum: number, pageSize: number) {
+    HttpUrlUtils.hostUrl = HttpUrlUtils.HOST_DEV
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_COMP_INFO_PATH;
     url = url + "?loadStrategy=first_load&pageNum=" + pageNum + "&refreshTime=" + refreshTime + "&pageId="
       + pageId + "&channelStrategy=2&groupId=" + groupId + "&topicId=" + topicId + "&pageSize=" + pageSize;