developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
chenjun3_wd
f475c9a8 1 parent 4f047650

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

Inline Side-by-side
Showing 4 changed files with 46 additions and 34 deletions
@@ -153,7 +153,11 @@ export class HttpUrlUtils { @@ -153,7 +153,11 @@ export class HttpUrlUtils {
153 * */ 153 * */
154 static readonly MORNING_EVENING_PAGE_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/pageInfo"; 154 static readonly MORNING_EVENING_PAGE_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/pageInfo";
155 static readonly MORNING_EVENING_COMP_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/compInfo"; 155 static readonly MORNING_EVENING_COMP_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/compInfo";
156 - private static hostUrl: string = HttpUrlUtils.HOST_PRODUCT; 156 + private static _hostUrl: string = HttpUrlUtils.HOST_PRODUCT;
  157 +
  158 + public static set hostUrl(value: string) {
  159 + HttpUrlUtils._hostUrl = value;
  160 + }
157 private static userId = '' 161 private static userId = ''
158 private static userType = '' 162 private static userType = ''
159 private static token = '' 163 private static token = ''
@@ -199,7 +203,7 @@ export class HttpUrlUtils { @@ -199,7 +203,7 @@ export class HttpUrlUtils {
199 } 203 }
200 204
201 static addSpecialHeaders(headers: HashMap<string, string>) { 205 static addSpecialHeaders(headers: HashMap<string, string>) {
202 - switch (HttpUrlUtils.hostUrl) { 206 + switch (HttpUrlUtils._hostUrl) {
203 case HttpUrlUtils.HOST_UAT: 207 case HttpUrlUtils.HOST_UAT:
204 // TODO 待优化到常量类里 208 // TODO 待优化到常量类里
205 headers.set('X-Ca-Stage', 'PRE'); 209 headers.set('X-Ca-Stage', 'PRE');
@@ -227,7 +231,7 @@ export class HttpUrlUtils { @@ -227,7 +231,7 @@ export class HttpUrlUtils {
227 } 231 }
228 232
229 static getHost() { 233 static getHost() {
230 - return HttpUrlUtils.hostUrl; 234 + return HttpUrlUtils._hostUrl;
231 } 235 }
232 236
233 private static getCity() { 237 private static getCity() {
@@ -343,39 +347,39 @@ export class HttpUrlUtils { @@ -343,39 +347,39 @@ export class HttpUrlUtils {
343 } 347 }
344 348
345 static getVerifyCodeUrl() { 349 static getVerifyCodeUrl() {
346 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode"; 350 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode";
347 return url; 351 return url;
348 } 352 }
349 353
350 static getVerifyCodeByTokenUrl() { 354 static getVerifyCodeByTokenUrl() {
351 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCodeByToken"; 355 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCodeByToken";
352 return url; 356 return url;
353 } 357 }
354 358
355 359
356 static getForgetPasswordUrl() { 360 static getForgetPasswordUrl() {
357 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/forgotPassword"; 361 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/forgotPassword";
358 return url; 362 return url;
359 } 363 }
360 364
361 static getLogoutUrl() { 365 static getLogoutUrl() {
362 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/logout"; 366 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/logout";
363 return url; 367 return url;
364 } 368 }
365 369
366 370
367 static getResetPassworddUrl() { 371 static getResetPassworddUrl() {
368 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/resetPassword"; 372 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/resetPassword";
369 return url; 373 return url;
370 } 374 }
371 375
372 static queryUserDetail() { 376 static queryUserDetail() {
373 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/queryUserDetail"; 377 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/queryUserDetail";
374 return url; 378 return url;
375 } 379 }
376 380
377 static editUserDetail() { 381 static editUserDetail() {
378 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/user/zh/c/editUserDetail"; 382 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/editUserDetail";
379 return url; 383 return url;
380 } 384 }
381 385
@@ -385,17 +389,17 @@ export class HttpUrlUtils { @@ -385,17 +389,17 @@ export class HttpUrlUtils {
385 } 389 }
386 390
387 static getCheckVerifyCodeUrl() { 391 static getCheckVerifyCodeUrl() {
388 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCode"; 392 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCode";
389 return url; 393 return url;
390 } 394 }
391 395
392 static getCheckVerifyByTokenCodeUrl() { 396 static getCheckVerifyByTokenCodeUrl() {
393 - let url = HttpUrlUtils.hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCodeByToken"; 397 + let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCodeByToken";
394 return url; 398 return url;
395 } 399 }
396 400
397 static getAppointmentListDataUrl() { 401 static getAppointmentListDataUrl() {
398 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH 402 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
399 return url 403 return url
400 } 404 }
401 405
@@ -405,77 +409,77 @@ export class HttpUrlUtils { @@ -405,77 +409,77 @@ export class HttpUrlUtils {
405 } 409 }
406 410
407 static getFollowListDetailDataUrl() { 411 static getFollowListDetailDataUrl() {
408 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH 412 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH
409 return url 413 return url
410 } 414 }
411 415
412 static getFollowListDataUrl() { 416 static getFollowListDataUrl() {
413 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_DATA_PATH 417 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_DATA_PATH
414 return url 418 return url
415 } 419 }
416 420
417 static getMineFollowListDataUrl() { 421 static getMineFollowListDataUrl() {
418 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH 422 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH
419 return url 423 return url
420 } 424 }
421 425
422 static getFollowListStatusDataUrl() { 426 static getFollowListStatusDataUrl() {
423 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH 427 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
424 return url 428 return url
425 } 429 }
426 430
427 static getCommentListStatusDataUrl() { 431 static getCommentListStatusDataUrl() {
428 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.COMMENT_LIST_STATUS_DATA_PATH 432 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.COMMENT_LIST_STATUS_DATA_PATH
429 return url 433 return url
430 } 434 }
431 435
432 static getMineCommentListDataUrl() { 436 static getMineCommentListDataUrl() {
433 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH 437 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH
434 return url 438 return url
435 } 439 }
436 440
437 static getMineUserLevelDataUrl() { 441 static getMineUserLevelDataUrl() {
438 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH 442 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH
439 return url 443 return url
440 } 444 }
441 445
442 static getOtherUserLevelDataUrl() { 446 static getOtherUserLevelDataUrl() {
443 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH 447 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH
444 return url 448 return url
445 } 449 }
446 450
447 static getMineUserDetailDataUrl() { 451 static getMineUserDetailDataUrl() {
448 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH 452 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH
449 return url 453 return url
450 } 454 }
451 455
452 static getOtherUserDetailDataUrl() { 456 static getOtherUserDetailDataUrl() {
453 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH 457 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH
454 return url 458 return url
455 } 459 }
456 460
457 static getOtherCommentListDataUrl() { 461 static getOtherCommentListDataUrl() {
458 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH 462 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH
459 return url 463 return url
460 } 464 }
461 465
462 static getOtherUserFollowListDataUrl() { 466 static getOtherUserFollowListDataUrl() {
463 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH 467 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH
464 return url 468 return url
465 } 469 }
466 470
467 static getAppointmentOperationUrl() { 471 static getAppointmentOperationUrl() {
468 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH 472 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH
469 return url 473 return url
470 } 474 }
471 475
472 static getCommentLikeOperationUrl() { 476 static getCommentLikeOperationUrl() {
473 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH 477 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH
474 return url 478 return url
475 } 479 }
476 480
477 static getFollowOperationUrl() { 481 static getFollowOperationUrl() {
478 - let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_OPERATION_PATH 482 + let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_OPERATION_PATH
479 return url 483 return url
480 } 484 }
481 485
@@ -229,6 +229,7 @@ export struct MorningEveningPaperComponent { @@ -229,6 +229,7 @@ export struct MorningEveningPaperComponent {
229 // console.info(TAG, `onClick listen_right_bg`); 229 // console.info(TAG, `onClick listen_right_bg`);
230 }) 230 })
231 } 231 }
  232 + .margin({ left: 12, right: 12 })
232 // .width('100%') 233 // .width('100%')
233 .height(56) 234 .height(56)
234 .alignItems(VerticalAlign.Center) 235 .alignItems(VerticalAlign.Center)
@@ -33,17 +33,20 @@ export struct topicInfoView { @@ -33,17 +33,20 @@ export struct topicInfoView {
33 33
34 Row() { 34 Row() {
35 Text("查看详情") 35 Text("查看详情")
36 - .fontSize(16) 36 + .fontSize(14)
37 .fontColor($r('app.color.white')) 37 .fontColor($r('app.color.white'))
38 .maxLines(1) 38 .maxLines(1)
39 - .backgroundColor($r('app.color.color_99636363'))  
40 .borderRadius(2) 39 .borderRadius(2)
  40 + .padding({ left: 6, top: 4, bottom: 4 })
41 41
42 - Image($r('app.media.more'))  
43 - .height($r('app.float.top_arrow_size'))  
44 - .width(20) 42 + Image($r('app.media.more'))// .height($r('app.float.top_arrow_size'))
  43 + .width(12)
  44 + .height(12)
  45 + .margin({ left: 4, right: 7 })
45 } 46 }
46 - .margin({ top: 10, left: 16, right: 16 }) 47 + .backgroundColor($r('app.color.color_99636363'))
  48 + .margin({ top: 8, left: 16, right: 16, bottom: 16 })
  49 + .borderRadius(2)
47 // .backgroundColor(Color.Red) 50 // .backgroundColor(Color.Red)
48 .alignRules({ 51 .alignRules({
49 left: { anchor: "__container__", align: HorizontalAlign.Start }, 52 left: { anchor: "__container__", align: HorizontalAlign.Start },
@@ -61,6 +64,7 @@ export struct topicInfoView { @@ -61,6 +64,7 @@ export struct topicInfoView {
61 left: { anchor: "__container__", align: HorizontalAlign.Start }, 64 left: { anchor: "__container__", align: HorizontalAlign.Start },
62 bottom: { anchor: "row_detail", align: VerticalAlign.Top } 65 bottom: { anchor: "row_detail", align: VerticalAlign.Top }
63 }) 66 })
  67 + .margin({ left: 16, right: 16 })
64 .id('txt_summary') 68 .id('txt_summary')
65 69
66 Text(this.frontLinkObject?.title ?? "") 70 Text(this.frontLinkObject?.title ?? "")
@@ -71,6 +75,7 @@ export struct topicInfoView { @@ -71,6 +75,7 @@ export struct topicInfoView {
71 left: { anchor: "__container__", align: HorizontalAlign.Start }, 75 left: { anchor: "__container__", align: HorizontalAlign.Start },
72 bottom: { anchor: "txt_summary", align: VerticalAlign.Top } 76 bottom: { anchor: "txt_summary", align: VerticalAlign.Top }
73 }) 77 })
  78 + .margin({ left: 16, right: 16, bottom: 8 })
74 .id('txt_title') 79 .id('txt_title')
75 } 80 }
76 .width("100%") 81 .width("100%")
@@ -102,6 +102,7 @@ export class PageRepository { @@ -102,6 +102,7 @@ export class PageRepository {
102 * 早晚报pageInfo请求 TODO 现网无数据写死测试环境 102 * 早晚报pageInfo请求 TODO 现网无数据写死测试环境
103 * */ 103 * */
104 static getMorningEveningPageInfoUrl(pageId: string) { 104 static getMorningEveningPageInfoUrl(pageId: string) {
  105 + HttpUrlUtils.hostUrl = HttpUrlUtils.HOST_DEV
105 let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_PAGE_INFO_PATH; 106 let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_PAGE_INFO_PATH;
106 url = url + "?pageId=" + pageId; 107 url = url + "?pageId=" + pageId;
107 Logger.info(TAG, "getMorningEveningPageInfoUrl url = " + url) 108 Logger.info(TAG, "getMorningEveningPageInfoUrl url = " + url)
@@ -122,6 +123,7 @@ export class PageRepository { @@ -122,6 +123,7 @@ export class PageRepository {
122 * topicId:专题id 123 * topicId:专题id
123 * */ 124 * */
124 static getMorningEveningCompInfoUrl(pageId: number, groupId: number, refreshTime: string, topicId: string, pageNum: number, pageSize: number) { 125 static getMorningEveningCompInfoUrl(pageId: number, groupId: number, refreshTime: string, topicId: string, pageNum: number, pageSize: number) {
  126 + HttpUrlUtils.hostUrl = HttpUrlUtils.HOST_DEV
125 let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_COMP_INFO_PATH; 127 let url = HttpUrlUtils.getHost() + HttpUrlUtils.MORNING_EVENING_COMP_INFO_PATH;
126 url = url + "?loadStrategy=first_load&pageNum=" + pageNum + "&refreshTime=" + refreshTime + "&pageId=" 128 url = url + "?loadStrategy=first_load&pageNum=" + pageNum + "&refreshTime=" + refreshTime + "&pageId="
127 + pageId + "&channelStrategy=2&groupId=" + groupId + "&topicId=" + topicId + "&pageSize=" + pageSize; 129 + pageId + "&channelStrategy=2&groupId=" + groupId + "&topicId=" + topicId + "&pageSize=" + pageSize;