developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
zhangbo1_wd
e88b2322 1 parent 41bcd54e

接口host管理独立出来

Inline Side-by-side
Showing 7 changed files with 341 additions and 113 deletions
@@ -8,3 +8,5 @@ export { HttpUrlUtils } from "./src/main/ets/http/HttpUrlUtils" @@ -8,3 +8,5 @@ export { HttpUrlUtils } from "./src/main/ets/http/HttpUrlUtils"
8 8
9 export { HttpBizUtil } from "./src/main/ets/http/HttpBizUtil" 9 export { HttpBizUtil } from "./src/main/ets/http/HttpBizUtil"
10 10
  11 +export { HostEnum, HostManager } from "./src/main/ets/http/HttpHostManager"
  12 +
  1 +import HashMap from '@ohos.util.HashMap';
  2 +import { SpConstants } from 'wdConstant';
  3 +import { SPHelper, StringUtils } from 'wdKit';
  4 +import { HostEnum, HostManager } from './HttpHostManager';
  5 +
  6 +/**
  7 + * 网络请求参数工具类
  8 + */
  9 +export class HttpParams {
  10 + private static userId = ''
  11 + private static userType = ''
  12 + private static token = ''
  13 +
  14 + static getCommonHeaders(): HashMap<string, string> {
  15 + let headers: HashMap<string, string> = new HashMap<string, string>()
  16 + headers.set('User-Agent', 'Dalvik/2.1.0 (Linux; U; Android 13; 22101317C Build/TKQ1.221013.002)')
  17 + headers.set('channel', HttpParams.getChannel())
  18 + //headers.set('appCode', ConfigConstants.appCode)
  19 + headers.set('plat', HttpParams.getPlat())
  20 + //headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a')
  21 + headers.set('Content-Type', 'application/json; charset=utf-8')
  22 + headers.set('timestamp', HttpParams.getTimestamp())
  23 + headers.set('RMRB-X-TOKEN', HttpParams.getXToken())
  24 + headers.set('device_id', HttpParams.getDeviceId())
  25 + if (HttpParams.getXToken() != '') {
  26 + headers.set('cookie', 'RMRB-X-TOKEN=' + HttpParams.getXToken())
  27 + }
  28 + headers.set('build_version', HttpParams.getVersion())
  29 + headers.set('adcode', HttpParams.getAdCode())
  30 + headers.set('os_version', HttpParams.getOsVersion())
  31 + //headers.set('X-Ca-Stage', 'PRE')
  32 + headers.set('versionCode', HttpParams.getVersionCode())
  33 + headers.set('system', HttpParams.getTerminalId())
  34 + headers.set('version_name', HttpParams.getVersionName())
  35 + headers.set('EagleEye-TraceID', 'D539562E48554A60977AF4BECB6D6C7A')
  36 + headers.set('imei', HttpParams.getImei())
  37 + headers.set('Accept-Language', 'zh')
  38 + HttpParams.setLocationHeader(headers)
  39 + // TODO 判断是否登录
  40 + headers.set('userId', HttpParams.getUserId())
  41 + headers.set('userType', HttpParams.getUserType())
  42 +
  43 + headers.set('mpassid', 'ZbHTMeTsfaYDAHqt8ZHIzcPs')
  44 + HttpParams.addSpecialHeaders(headers);
  45 + // Logger.debug("TAG", '******************* commonHeaders headers start ******************************** ');
  46 + // headers.forEach((v,k)=>{
  47 + // Logger.debug("TAG", 'getCommonHeaders header: ' + k + ': ' + v);
  48 + // })
  49 + // Logger.debug("TAG", '******************* commonHeaders headers end ******************************** ');
  50 + return headers;
  51 + }
  52 +
  53 + static addSpecialHeaders(headers: HashMap<string, string>) {
  54 + switch (HostManager.getHost()) {
  55 + case HostEnum.HOST_UAT:
  56 + // TODO 待优化到常量类里
  57 + headers.set('X-Ca-Stage', 'PRE');
  58 + headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a');
  59 + headers.set('appCode', '83092caa603a421aa0222308b3f6b27a');
  60 + break
  61 + case HostEnum.HOST_SIT:
  62 + headers.set('X-Ca-Stage', 'TEST');
  63 + headers.set('Authorization', 'APPCODE 0af1f9085e484c97b2a44704bae72c07');
  64 + headers.set('appCode', '0af1f9085e484c97b2a44704bae72c07');
  65 + break
  66 + case HostEnum.HOST_PRODUCT:
  67 + headers.set('X-Ca-Stage', 'RELEASE');
  68 + headers.set('Authorization', 'APPCODE 3d4181bceeb94d9780e10dbb6c67bbf6');
  69 + headers.set('appCode', '3d4181bceeb94d9780e10dbb6c67bbf6');
  70 + break
  71 + case HostEnum.HOST_DEV:
  72 + headers.set('X-Ca-Stage', 'TEST');
  73 + headers.set('Authorization', 'APPCODE ff33172859e14f9a8299e3bd769e79f9');
  74 + headers.set('appCode', 'ff33172859e14f9a8299e3bd769e79f9');
  75 + break
  76 + default:
  77 + break
  78 + }
  79 + }
  80 +
  81 + static setLocationHeader(headers: HashMap<string, string>) {
  82 + let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
  83 + if (StringUtils.isNotEmpty(cityName)) {
  84 + headers.set('city', encodeURI(cityName))
  85 + }
  86 + let cityCode = SPHelper.default.getSync(SpConstants.LOCATION_CITY_CODE, '') as string
  87 + if (StringUtils.isNotEmpty(cityCode)) {
  88 + headers.set('city_dode', encodeURI(cityCode))
  89 + }
  90 + }
  91 +
  92 + private static getCity() {
  93 + // TODO 对接定位
  94 + return '%E5%90%88%E8%82%A5%E5%B8%82';
  95 + }
  96 +
  97 + private static getChannel() {
  98 + // TODO 对接配置
  99 + return 'rmrb_china_0000';
  100 + }
  101 +
  102 + private static getPlat() {
  103 + return 'Phone';
  104 + }
  105 +
  106 + private static getTimestamp() {
  107 + // return DateTimeUtils.getCurrentTime() + '';
  108 + // TODO 暂时写死，有些page 真实时间戳 返回数据为空
  109 + return '155203523';
  110 + }
  111 +
  112 + private static getXToken() {
  113 + if (StringUtils.isNotEmpty(HttpParams.token)) {
  114 + return HttpParams.token
  115 + }
  116 + HttpParams.token = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN, "") as string
  117 + if (StringUtils.isNotEmpty(HttpParams.token)) {
  118 + return HttpParams.token
  119 + }
  120 + // return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
  121 + return ''
  122 + }
  123 +
  124 + static getRefreshToken(): string {
  125 + let refreshToken = SPHelper.default.getSync(SpConstants.USER_REFRESH_TOKEN, "")
  126 + if (StringUtils.isNotEmpty(refreshToken)) {
  127 + return refreshToken as string;
  128 + }
  129 + return '';
  130 + }
  131 +
  132 + public static getDeviceId() {
  133 + // TODO
  134 + return '8a81226a-cabd-3e1b-b630-b51db4a720ed';
  135 + }
  136 +
  137 + private static getVersion() {
  138 + // TODO
  139 + return '202401242103';
  140 + }
  141 +
  142 + private static getVersionCode() {
  143 + // TODO
  144 + return '7301';
  145 + }
  146 +
  147 + private static getVersionName() {
  148 + // TODO
  149 + return '7.3.0.1';
  150 + }
  151 +
  152 + private static getAdCode() {
  153 + return '340000';
  154 + }
  155 +
  156 + private static getOsVersion() {
  157 + // TODO
  158 + return '12';
  159 + }
  160 +
  161 + public static getCityCode() {
  162 + // TODO
  163 + return '340100';
  164 + }
  165 +
  166 + public static getProvinceCode() {
  167 + // TODO
  168 + return '340000';
  169 + }
  170 +
  171 + /**
  172 + * 地区code
  173 + */
  174 + public static getDistrictCode() {
  175 + // TODO
  176 + return '340103';
  177 + }
  178 +
  179 + private static getTerminalId() {
  180 + return 'Android';
  181 + }
  182 +
  183 + public static getImei() {
  184 + // TODO
  185 + return '8a81226a-cabd-3e1b-b630-b51db4a720ed';
  186 + }
  187 +
  188 + public static getUserId(): string {
  189 + // TODO 对接登录
  190 + if (StringUtils.isNotEmpty(HttpParams.userId)) {
  191 + return HttpParams.userId
  192 + }
  193 + HttpParams.userId = SPHelper.default.getSync(SpConstants.USER_ID, "") as string
  194 + return HttpParams.userId;
  195 + }
  196 +
  197 + public static getUserType() {
  198 + if (StringUtils.isNotEmpty(HttpParams.userType)) {
  199 + return HttpParams.userType
  200 + }
  201 + HttpParams.userType = SPHelper.default.getSync(SpConstants.USER_Type, "") as string
  202 + return HttpParams.userType;
  203 + }
  204 +
  205 + public static setUserId(userId: string) {
  206 + HttpParams.userId = userId;
  207 + }
  208 +
  209 + public static setUserType(userType: string) {
  210 + HttpParams.userType = userType;
  211 + }
  212 +
  213 + public static setUserToken(token: string) {
  214 + HttpParams.token = token;
  215 + }
  216 +}
  1 +export enum HostEnum {
  2 + /**
  3 + * uat环境url
  4 + */
  5 + HOST_UAT = 'https://pd-apis-uat.pdnews.cn',
  6 + /**
  7 + * 中文端sit环境
  8 + */
  9 + HOST_SIT = 'https://pd-apis-sit.pdnews.cn',
  10 + /**
  11 + * dev环境url
  12 + */
  13 + HOST_DEV = 'https://pd-apis-dev.pdnews.cn',
  14 + /**
  15 + * 正式环境url
  16 + */
  17 + HOST_PRODUCT = 'https://pdapis.pdnews.cn',
  18 +}
  19 +
  20 +/**
  21 + * 环境host管理工具类
  22 + */
  23 +export class HostManager {
  24 + private static _hostUrl: HostEnum = HostEnum.HOST_PRODUCT;
  25 +
  26 + static changeHost(host: HostEnum) {
  27 + HostManager._hostUrl = host;
  28 + }
  29 +
  30 + static getHost(): string {
  31 + return HostManager._hostUrl;
  32 + }
  33 +}
1 import HashMap from '@ohos.util.HashMap'; 1 import HashMap from '@ohos.util.HashMap';
2 import { SpConstants } from 'wdConstant'; 2 import { SpConstants } from 'wdConstant';
3 import { SPHelper, StringUtils } from 'wdKit'; 3 import { SPHelper, StringUtils } from 'wdKit';
  4 +import { HostEnum, HostManager } from './HttpHostManager';
4 5
5 /** 6 /**
6 * 网络请求业务侧工具类 7 * 网络请求业务侧工具类
7 */ 8 */
8 export class HttpUrlUtils { 9 export class HttpUrlUtils {
9 /** 10 /**
10 - * uat环境url  
11 - */  
12 - static readonly HOST_UAT: string = "https://pd-apis-uat.pdnews.cn";  
13 - /**  
14 - * 中文端sit环境  
15 - */  
16 - static readonly HOST_SIT: string = "https://pd-apis-sit.pdnews.cn";  
17 - /**  
18 - * 正式环境url  
19 - */  
20 - static readonly HOST_PRODUCT: string = "https://pdapis.pdnews.cn";  
21 - /**  
22 - * dev环境url  
23 - */  
24 - static readonly HOST_DEV: string = "https://pd-apis-dev.pdnews.cn";  
25 - /**  
26 * 启动接口（底导接口） 11 * 启动接口（底导接口）
27 */ 12 */
28 static readonly BOTTOM_NAV_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup"; 13 static readonly BOTTOM_NAV_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup";
@@ -293,21 +278,14 @@ export class HttpUrlUtils { @@ -293,21 +278,14 @@ export class HttpUrlUtils {
293 * 获取启动页相关数据 278 * 获取启动页相关数据
294 */ 279 */
295 static readonly LAUNCH_PAGE_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/launchPage"; 280 static readonly LAUNCH_PAGE_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/launchPage";
296 - private static _hostUrl: string = HttpUrlUtils.HOST_PRODUCT;  
297 /** 281 /**
298 * 推荐列表 282 * 推荐列表
299 */ 283 */
300 static readonly RECOMMEND_LIST: string = "/api/rmrb-bff-display-zh/recommend/zh/c/list"; 284 static readonly RECOMMEND_LIST: string = "/api/rmrb-bff-display-zh/recommend/zh/c/list";
301 -  
302 /** 285 /**
303 * 搜索推荐 286 * 搜索推荐
304 */ 287 */
305 static readonly SEARCH_SUGGEST_DATA_PATH: string = "/api/rmrb-bff-display-zh/recommend/zh/c/list"; 288 static readonly SEARCH_SUGGEST_DATA_PATH: string = "/api/rmrb-bff-display-zh/recommend/zh/c/list";
306 -  
307 - public static set hostUrl(value: string) {  
308 - HttpUrlUtils._hostUrl = value;  
309 - }  
310 -  
311 private static userId = '' 289 private static userId = ''
312 private static userType = '' 290 private static userType = ''
313 private static token = '' 291 private static token = ''
@@ -354,24 +332,24 @@ export class HttpUrlUtils { @@ -354,24 +332,24 @@ export class HttpUrlUtils {
354 } 332 }
355 333
356 static addSpecialHeaders(headers: HashMap<string, string>) { 334 static addSpecialHeaders(headers: HashMap<string, string>) {
357 - switch (HttpUrlUtils._hostUrl) {  
358 - case HttpUrlUtils.HOST_UAT: 335 + switch (HostManager.getHost()) {
  336 + case HostEnum.HOST_UAT:
359 // TODO 待优化到常量类里 337 // TODO 待优化到常量类里
360 headers.set('X-Ca-Stage', 'PRE'); 338 headers.set('X-Ca-Stage', 'PRE');
361 headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a'); 339 headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a');
362 headers.set('appCode', '83092caa603a421aa0222308b3f6b27a'); 340 headers.set('appCode', '83092caa603a421aa0222308b3f6b27a');
363 break 341 break
364 - case HttpUrlUtils.HOST_SIT: 342 + case HostEnum.HOST_SIT:
365 headers.set('X-Ca-Stage', 'TEST'); 343 headers.set('X-Ca-Stage', 'TEST');
366 headers.set('Authorization', 'APPCODE 0af1f9085e484c97b2a44704bae72c07'); 344 headers.set('Authorization', 'APPCODE 0af1f9085e484c97b2a44704bae72c07');
367 headers.set('appCode', '0af1f9085e484c97b2a44704bae72c07'); 345 headers.set('appCode', '0af1f9085e484c97b2a44704bae72c07');
368 break 346 break
369 - case HttpUrlUtils.HOST_PRODUCT: 347 + case HostEnum.HOST_PRODUCT:
370 headers.set('X-Ca-Stage', 'RELEASE'); 348 headers.set('X-Ca-Stage', 'RELEASE');
371 headers.set('Authorization', 'APPCODE 3d4181bceeb94d9780e10dbb6c67bbf6'); 349 headers.set('Authorization', 'APPCODE 3d4181bceeb94d9780e10dbb6c67bbf6');
372 headers.set('appCode', '3d4181bceeb94d9780e10dbb6c67bbf6'); 350 headers.set('appCode', '3d4181bceeb94d9780e10dbb6c67bbf6');
373 break 351 break
374 - case HttpUrlUtils.HOST_DEV: 352 + case HostEnum.HOST_DEV:
375 headers.set('X-Ca-Stage', 'TEST'); 353 headers.set('X-Ca-Stage', 'TEST');
376 headers.set('Authorization', 'APPCODE ff33172859e14f9a8299e3bd769e79f9'); 354 headers.set('Authorization', 'APPCODE ff33172859e14f9a8299e3bd769e79f9');
377 headers.set('appCode', 'ff33172859e14f9a8299e3bd769e79f9'); 355 headers.set('appCode', 'ff33172859e14f9a8299e3bd769e79f9');
@@ -392,8 +370,8 @@ export class HttpUrlUtils { @@ -392,8 +370,8 @@ export class HttpUrlUtils {
392 } 370 }
393 } 371 }
394 372
395 - static getHost() {  
396 - return HttpUrlUtils._hostUrl; 373 + static getHost(): string {
  374 + return HostManager.getHost();
397 } 375 }
398 376
399 private static getCity() { 377 private static getCity() {
@@ -510,48 +488,48 @@ export class HttpUrlUtils { @@ -510,48 +488,48 @@ export class HttpUrlUtils {
510 } 488 }
511 489
512 static getVerifyCodeUrl() { 490 static getVerifyCodeUrl() {
513 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode"; 491 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode";
514 return url; 492 return url;
515 } 493 }
516 494
517 static getVerifyCodeByTokenUrl() { 495 static getVerifyCodeByTokenUrl() {
518 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/sendVerifyCodeByToken"; 496 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/sendVerifyCodeByToken";
519 return url; 497 return url;
520 } 498 }
521 499
522 static getCheckVerifyCodeByToken() { 500 static getCheckVerifyCodeByToken() {
523 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/checkVerifyCodeByToken"; 501 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/checkVerifyCodeByToken";
524 return url; 502 return url;
525 } 503 }
526 504
527 505
528 static getForgetPasswordUrl() { 506 static getForgetPasswordUrl() {
529 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/forgotPassword"; 507 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/forgotPassword";
530 return url; 508 return url;
531 } 509 }
532 510
533 static getLogoutUrl() { 511 static getLogoutUrl() {
534 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/appLogout"; 512 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/appLogout";
535 return url; 513 return url;
536 } 514 }
537 515
538 static getRefreshTokenUrl() { 516 static getRefreshTokenUrl() {
539 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.REFRESH_TOKEN_PATH; 517 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.REFRESH_TOKEN_PATH;
540 return url; 518 return url;
541 } 519 }
542 520
543 static getResetPassworddUrl() { 521 static getResetPassworddUrl() {
544 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/resetPassword"; 522 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/resetPassword";
545 return url; 523 return url;
546 } 524 }
547 525
548 static queryUserDetail() { 526 static queryUserDetail() {
549 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/queryUserDetail"; 527 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/queryUserDetail";
550 return url; 528 return url;
551 } 529 }
552 530
553 static editUserDetail() { 531 static editUserDetail() {
554 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/editUserDetail"; 532 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/editUserDetail";
555 return url; 533 return url;
556 } 534 }
557 535
@@ -561,296 +539,296 @@ export class HttpUrlUtils { @@ -561,296 +539,296 @@ export class HttpUrlUtils {
561 } 539 }
562 540
563 static getCheckVerifyCodeUrl() { 541 static getCheckVerifyCodeUrl() {
564 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCode"; 542 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/auth/zh/c/checkVerifyCode";
565 return url; 543 return url;
566 } 544 }
567 545
568 static getAgreement() { 546 static getAgreement() {
569 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-bff-display-zh/display/zh/c/agreement"; 547 + let url = HttpUrlUtils.getHost() + "/api/rmrb-bff-display-zh/display/zh/c/agreement";
570 return url; 548 return url;
571 } 549 }
572 550
573 static getCheckVerifyByTokenCodeUrl() { 551 static getCheckVerifyByTokenCodeUrl() {
574 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/auth/zh/c/checkVerifyCodeByToken"; 552 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/auth/zh/c/checkVerifyCodeByToken";
575 return url; 553 return url;
576 } 554 }
577 555
578 556
579 /*优质评论页*/ 557 /*优质评论页*/
580 static getQualityCommentUrl() { 558 static getQualityCommentUrl() {
581 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/highQuality"; 559 + let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/highQuality";
582 560
583 return url 561 return url
584 } 562 }
585 563
586 /*获取详情页评论列表*/ 564 /*获取详情页评论列表*/
587 static getContentCommentListDataUrl() { 565 static getContentCommentListDataUrl() {
588 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/contentCommentList" 566 + let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/contentCommentList"
589 return url 567 return url
590 } 568 }
591 569
592 /*获取子评论列表*/ 570 /*获取子评论列表*/
593 static getChildContentCommentListDataUrl() { 571 static getChildContentCommentListDataUrl() {
594 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/childCommentList" 572 + let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/childCommentList"
595 return url 573 return url
596 } 574 }
597 575
598 /*评论状态*/ 576 /*评论状态*/
599 static getBatchCommentStatusUrl() { 577 static getBatchCommentStatusUrl() {
600 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/batchCommentStatus" 578 + let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/batchCommentStatus"
601 return url 579 return url
602 } 580 }
603 581
604 /*评论点赞*/ 582 /*评论点赞*/
605 static getCommentLikeUrl() { 583 static getCommentLikeUrl() {
606 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/commentLike" 584 + let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/commentLike"
607 return url 585 return url
608 } 586 }
609 587
610 /*发布评论*/ 588 /*发布评论*/
611 static getPublishCommentUrl() { 589 static getPublishCommentUrl() {
612 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/publish" 590 + let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/publish"
613 return url 591 return url
614 } 592 }
615 593
616 /*游客发布评论*/ 594 /*游客发布评论*/
617 static getNoUserPublishCommentUrl() { 595 static getNoUserPublishCommentUrl() {
618 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-comment/comment/zh/c/commentLike" 596 + let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/commentLike"
619 return url 597 return url
620 } 598 }
621 599
622 /*levleIcon*/ 600 /*levleIcon*/
623 static getBatchUserUrl() { 601 static getBatchUserUrl() {
624 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-point/auth/level/zh/c/batchUser" 602 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-point/auth/level/zh/c/batchUser"
625 return url 603 return url
626 } 604 }
627 605
628 /*authIcon 20个一次上限*/ 606 /*authIcon 20个一次上限*/
629 static getDetailListUrl() { 607 static getDetailListUrl() {
630 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-contact/contact/zh/c/master/detailList" 608 + let url = HttpUrlUtils.getHost() + "/api/rmrb-contact/contact/zh/c/master/detailList"
631 return url 609 return url
632 } 610 }
633 611
634 612
635 //账户注销 613 //账户注销
636 static accountLogoutUrl() { 614 static accountLogoutUrl() {
637 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/logoff"; 615 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/logoff";
638 return url; 616 return url;
639 } 617 }
640 618
641 //更换手机号绑定 619 //更换手机号绑定
642 static changeBindPhone() { 620 static changeBindPhone() {
643 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/userPhoneChange"; 621 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/userPhoneChange";
644 return url; 622 return url;
645 } 623 }
646 624
647 //获取用户安全页信息 625 //获取用户安全页信息
648 static querySecurity() { 626 static querySecurity() {
649 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-user-center/user/zh/c/security/query"; 627 + let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/user/zh/c/security/query";
650 return url; 628 return url;
651 } 629 }
652 630
653 static getAppointmentListDataUrl() { 631 static getAppointmentListDataUrl() {
654 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH 632 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
655 return url 633 return url
656 } 634 }
657 635
658 static getMyCollectionListDataUrl() { 636 static getMyCollectionListDataUrl() {
659 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_MyCollectionList_PATH 637 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.APPOINTMENT_MyCollectionList_PATH
660 return url 638 return url
661 } 639 }
662 640
663 static getExecuteCollcetUrl() { 641 static getExecuteCollcetUrl() {
664 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_ExecuteCollcet_PATH 642 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.APPOINTMENT_ExecuteCollcet_PATH
665 return url 643 return url
666 } 644 }
667 645
668 static getFollowListDetailDataUrl() { 646 static getFollowListDetailDataUrl() {
669 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH 647 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH
670 return url 648 return url
671 } 649 }
672 650
673 static getFollowListDataUrl() { 651 static getFollowListDataUrl() {
674 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_DATA_PATH 652 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_DATA_PATH
675 return url 653 return url
676 } 654 }
677 655
678 static getMineFollowListDataUrl() { 656 static getMineFollowListDataUrl() {
679 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH 657 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH
680 return url 658 return url
681 } 659 }
682 660
683 static getFollowListStatusDataUrl() { 661 static getFollowListStatusDataUrl() {
684 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH 662 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
685 return url 663 return url
686 } 664 }
687 665
688 static getCommentListStatusDataUrl() { 666 static getCommentListStatusDataUrl() {
689 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.COMMENT_LIST_STATUS_DATA_PATH 667 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.COMMENT_LIST_STATUS_DATA_PATH
690 return url 668 return url
691 } 669 }
692 670
693 static getMineCommentListDataUrl() { 671 static getMineCommentListDataUrl() {
694 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH 672 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH
695 return url 673 return url
696 } 674 }
697 675
698 static getMineUserLevelDataUrl() { 676 static getMineUserLevelDataUrl() {
699 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH 677 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH
700 return url 678 return url
701 } 679 }
702 680
703 static getOtherUserLevelDataUrl() { 681 static getOtherUserLevelDataUrl() {
704 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH 682 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH
705 return url 683 return url
706 } 684 }
707 685
708 static getMineUserDetailDataUrl() { 686 static getMineUserDetailDataUrl() {
709 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH 687 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH
710 return url 688 return url
711 } 689 }
712 690
713 static getOtherUserDetailDataUrl() { 691 static getOtherUserDetailDataUrl() {
714 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH 692 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH
715 return url 693 return url
716 } 694 }
717 695
718 static getOtherCommentListDataUrl() { 696 static getOtherCommentListDataUrl() {
719 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH 697 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH
720 return url 698 return url
721 } 699 }
722 700
723 static getOtherUserFollowListDataUrl() { 701 static getOtherUserFollowListDataUrl() {
724 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH 702 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH
725 return url 703 return url
726 } 704 }
727 705
728 static getAppointmentOperationUrl() { 706 static getAppointmentOperationUrl() {
729 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH 707 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH
730 return url 708 return url
731 } 709 }
732 710
733 static getCommentLikeOperationUrl() { 711 static getCommentLikeOperationUrl() {
734 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH 712 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH
735 return url 713 return url
736 } 714 }
737 715
738 static getFollowOperationUrl() { 716 static getFollowOperationUrl() {
739 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.FOLLOW_OPERATION_PATH 717 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.FOLLOW_OPERATION_PATH
740 return url 718 return url
741 } 719 }
742 720
743 static getSearchHintDataUrl() { 721 static getSearchHintDataUrl() {
744 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_HINT_DATA_PATH 722 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.SEARCH_HINT_DATA_PATH
745 return url 723 return url
746 } 724 }
747 725
748 static getSearchHotsDataUrl() { 726 static getSearchHotsDataUrl() {
749 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_HOTS_DATA_PATH 727 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.SEARCH_HOTS_DATA_PATH
750 return url 728 return url
751 } 729 }
752 730
753 static getRelatedSearchContentDataUrl() { 731 static getRelatedSearchContentDataUrl() {
754 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.RELATED_SEARCH_CONTENT_DATA_PATH 732 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.RELATED_SEARCH_CONTENT_DATA_PATH
755 return url 733 return url
756 } 734 }
757 735
758 static getInterestsUrl() { 736 static getInterestsUrl() {
759 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.INTERESTS_HOTS_DATA_PATH; 737 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERESTS_HOTS_DATA_PATH;
760 return url; 738 return url;
761 739
762 } 740 }
763 741
764 static getUpdateInterestsUrl() { 742 static getUpdateInterestsUrl() {
765 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.INTERESTS_UPDATETAG_PATH; 743 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERESTS_UPDATETAG_PATH;
766 return url; 744 return url;
767 } 745 }
768 746
769 static getLaunchPageDataUrl() { 747 static getLaunchPageDataUrl() {
770 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LAUNCH_PAGE_PATH; 748 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LAUNCH_PAGE_PATH;
771 return url; 749 return url;
772 750
773 } 751 }
774 752
775 static getLiveDetailsUrl() { 753 static getLiveDetailsUrl() {
776 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_DETAILS_PATH 754 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LIVE_DETAILS_PATH
777 return url 755 return url
778 } 756 }
779 757
780 static getLiveListUrl() { 758 static getLiveListUrl() {
781 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_LIST_PATH 759 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LIVE_LIST_PATH
782 return url 760 return url
783 } 761 }
784 762
785 static getLiveChatListUrl() { 763 static getLiveChatListUrl() {
786 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_CHAT_LIST_PATH 764 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LIVE_CHAT_LIST_PATH
787 return url 765 return url
788 } 766 }
789 767
790 static getLiveRoomDataUrl() { 768 static getLiveRoomDataUrl() {
791 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_ROOM_DATA_PATH 769 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LIVE_ROOM_DATA_PATH
792 return url 770 return url
793 } 771 }
794 772
795 static getLiveAppointmentStatusUrl() { 773 static getLiveAppointmentStatusUrl() {
796 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_APPOINTMENT_STATUS_PATH 774 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LIVE_APPOINTMENT_STATUS_PATH
797 return url 775 return url
798 } 776 }
799 777
800 static getLiveAppointmentUrl() { 778 static getLiveAppointmentUrl() {
801 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_APPOINTMENT_PATH 779 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LIVE_APPOINTMENT_PATH
802 return url 780 return url
803 } 781 }
804 782
805 static getAppointmentStatusUrl() { 783 static getAppointmentStatusUrl() {
806 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.LIVE_APPOINTMENT_BATCH_PATH 784 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.LIVE_APPOINTMENT_BATCH_PATH
807 return url 785 return url
808 } 786 }
809 787
810 static getSearchResultCountDataUrl() { 788 static getSearchResultCountDataUrl() {
811 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_RESULT_COUNT_DATA_PATH 789 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.SEARCH_RESULT_COUNT_DATA_PATH
812 return url 790 return url
813 } 791 }
814 792
815 static getSearchResultListDataUrl() { 793 static getSearchResultListDataUrl() {
816 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_RESULT_LIST_DATA_PATH 794 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.SEARCH_RESULT_LIST_DATA_PATH
817 return url 795 return url
818 } 796 }
819 797
820 static getInteractListDataUrl() { 798 static getInteractListDataUrl() {
821 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.INTERACT_DATA_PATH 799 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.INTERACT_DATA_PATH
822 return url 800 return url
823 } 801 }
824 802
825 static getCreatorDetailListDataUrl() { 803 static getCreatorDetailListDataUrl() {
826 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.CREATOR_DETAIL_LIST_DATA_PATH 804 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.CREATOR_DETAIL_LIST_DATA_PATH
827 return url 805 return url
828 } 806 }
829 807
830 static getArticleCountHotsDataUrl() { 808 static getArticleCountHotsDataUrl() {
831 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.ARTICLE_COUNT_HOTS_DATA_PATH 809 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.ARTICLE_COUNT_HOTS_DATA_PATH
832 return url 810 return url
833 } 811 }
834 812
835 static getArticleListHotsDataUrl() { 813 static getArticleListHotsDataUrl() {
836 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.ARTICLE_LIST_HOTS_DATA_PATH 814 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.ARTICLE_LIST_HOTS_DATA_PATH
837 return url 815 return url
838 } 816 }
839 817
840 static getCreatorInfluenceInfoHotsDataUrl() { 818 static getCreatorInfluenceInfoHotsDataUrl() {
841 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.CREATOR_INFLUENCE_HOTS_DATA_PATH 819 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.CREATOR_INFLUENCE_HOTS_DATA_PATH
842 return url 820 return url
843 } 821 }
844 822
845 //点赞 823 //点赞
846 static executeLike() { 824 static executeLike() {
847 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-interact/interact/zh/c/like/executeLike"; 825 + let url = HttpUrlUtils.getHost() + "/api/rmrb-interact/interact/zh/c/like/executeLike";
848 return url; 826 return url;
849 } 827 }
850 828
851 //获取点赞状态 829 //获取点赞状态
852 static getLikeStatus() { 830 static getLikeStatus() {
853 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-interact/interact/zh/c/batchLikeAndCollect/status"; 831 + let url = HttpUrlUtils.getHost() + "/api/rmrb-interact/interact/zh/c/batchLikeAndCollect/status";
854 return url; 832 return url;
855 } 833 }
856 834
@@ -863,13 +841,13 @@ export class HttpUrlUtils { @@ -863,13 +841,13 @@ export class HttpUrlUtils {
863 841
864 //搜索推荐 842 //搜索推荐
865 static getSearchSuggestDataUrl() { 843 static getSearchSuggestDataUrl() {
866 - let url = HttpUrlUtils._hostUrl + HttpUrlUtils.SEARCH_SUGGEST_DATA_PATH 844 + let url = HttpUrlUtils.getHost() + HttpUrlUtils.SEARCH_SUGGEST_DATA_PATH
867 return url 845 return url
868 } 846 }
869 847
870 //金刚位聚合页 848 //金刚位聚合页
871 static getThemeListUrl() { 849 static getThemeListUrl() {
872 - let url = HttpUrlUtils._hostUrl + "/api/rmrb-bff-display-zh/display/zh/c/themeList"; 850 + let url = HttpUrlUtils.getHost() + "/api/rmrb-bff-display-zh/display/zh/c/themeList";
873 return url; 851 return url;
874 } 852 }
875 853
@@ -9,7 +9,6 @@ export struct AboutPageUI { @@ -9,7 +9,6 @@ export struct AboutPageUI {
9 @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议']; 9 @State listData: Array<string | Array<string>> = ['隐私授权协议', '软件许可及用户协议'];
10 @State message: string = '京ICP备16066560号-6A Copyright © 人民日报客户端\nall rights reserved.' 10 @State message: string = '京ICP备16066560号-6A Copyright © 人民日报客户端\nall rights reserved.'
11 @State version: string = '版本号：v' 11 @State version: string = '版本号：v'
12 - clickTimes: number = 0  
13 dialogController: CustomDialogController = new CustomDialogController({ 12 dialogController: CustomDialogController = new CustomDialogController({
14 builder: EnvironmentCustomDialog({ 13 builder: EnvironmentCustomDialog({
15 cancel: () => { 14 cancel: () => {
@@ -42,12 +41,12 @@ export struct AboutPageUI { @@ -42,12 +41,12 @@ export struct AboutPageUI {
42 .width('278lpx') 41 .width('278lpx')
43 .height('154lpx') 42 .height('154lpx')
44 .margin({ top: '173lpx', bottom: '154lpx' }) 43 .margin({ top: '173lpx', bottom: '154lpx' })
45 - .onClick(() => {  
46 - this.clickTimes++  
47 - if (this.clickTimes > 2) { 44 + .gesture(
  45 + TapGesture({ count: 2 })
  46 + .onAction((event: GestureEvent) => {
48 this.dialogController.open() 47 this.dialogController.open()
49 - }  
50 }) 48 })
  49 + )
51 // Row(){ 50 // Row(){
52 // 51 //
53 // }.backgroundColor(Color.Yellow) 52 // }.backgroundColor(Color.Yellow)
1 import { SPHelper } from 'wdKit/Index'; 1 import { SPHelper } from 'wdKit/Index';
2 -import { HttpUrlUtils } from 'wdNetwork/Index'; 2 +import { HostEnum, HostManager, HttpUrlUtils } from 'wdNetwork/Index';
3 3
4 @CustomDialog 4 @CustomDialog
5 export struct EnvironmentCustomDialog { 5 export struct EnvironmentCustomDialog {
6 - currentEnvironment: string = HttpUrlUtils.HOST_PRODUCT; 6 + @State currentEnvironment: string = HostManager.getHost();
7 controller: CustomDialogController 7 controller: CustomDialogController
8 cancel: () => void = () => { 8 cancel: () => void = () => {
9 } 9 }
@@ -21,12 +21,12 @@ export struct EnvironmentCustomDialog { @@ -21,12 +21,12 @@ export struct EnvironmentCustomDialog {
21 .margin({ top: 20 }) 21 .margin({ top: 20 })
22 Row() { 22 Row() {
23 Radio({ value: 'Radio1', group: 'radioGroup' }) 23 Radio({ value: 'Radio1', group: 'radioGroup' })
24 - .checked(true) 24 + .checked(this.currentEnvironment == HostEnum.HOST_SIT)
25 .height(20) 25 .height(20)
26 .width(20) 26 .width(20)
27 .onChange((isChecked: boolean) => { 27 .onChange((isChecked: boolean) => {
28 if (isChecked) { 28 if (isChecked) {
29 - this.currentEnvironment = HttpUrlUtils.HOST_SIT; 29 + this.currentEnvironment = HostEnum.HOST_SIT;
30 } 30 }
31 }) 31 })
32 Text('切换到SIT(测试)环境,重启应用生效') 32 Text('切换到SIT(测试)环境,重启应用生效')
@@ -37,12 +37,12 @@ export struct EnvironmentCustomDialog { @@ -37,12 +37,12 @@ export struct EnvironmentCustomDialog {
37 37
38 Row() { 38 Row() {
39 Radio({ value: 'Radio1', group: 'radioGroup' }) 39 Radio({ value: 'Radio1', group: 'radioGroup' })
40 - .checked(true) 40 + .checked(this.currentEnvironment == HostEnum.HOST_UAT)
41 .height(20) 41 .height(20)
42 .width(20) 42 .width(20)
43 .onChange((isChecked: boolean) => { 43 .onChange((isChecked: boolean) => {
44 if (isChecked) { 44 if (isChecked) {
45 - this.currentEnvironment = HttpUrlUtils.HOST_UAT; 45 + this.currentEnvironment = HostEnum.HOST_UAT;
46 } 46 }
47 }) 47 })
48 Text('切换到UAT(预发布)环境,重启应用生效') 48 Text('切换到UAT(预发布)环境,重启应用生效')
@@ -53,12 +53,12 @@ export struct EnvironmentCustomDialog { @@ -53,12 +53,12 @@ export struct EnvironmentCustomDialog {
53 53
54 Row() { 54 Row() {
55 Radio({ value: 'Radio1', group: 'radioGroup' }) 55 Radio({ value: 'Radio1', group: 'radioGroup' })
56 - .checked(true) 56 + .checked(this.currentEnvironment == HostEnum.HOST_PRODUCT)
57 .height(20) 57 .height(20)
58 .width(20) 58 .width(20)
59 .onChange((isChecked: boolean) => { 59 .onChange((isChecked: boolean) => {
60 if (isChecked) { 60 if (isChecked) {
61 - this.currentEnvironment = HttpUrlUtils.HOST_PRODUCT; 61 + this.currentEnvironment = HostEnum.HOST_PRODUCT;
62 } 62 }
63 }) 63 })
64 Text('切换到PROD(现网)环境,重启应用生效') 64 Text('切换到PROD(现网)环境,重启应用生效')
@@ -69,12 +69,12 @@ export struct EnvironmentCustomDialog { @@ -69,12 +69,12 @@ export struct EnvironmentCustomDialog {
69 69
70 Row() { 70 Row() {
71 Radio({ value: 'Radio1', group: 'radioGroup' }) 71 Radio({ value: 'Radio1', group: 'radioGroup' })
72 - .checked(true) 72 + .checked(this.currentEnvironment == HostEnum.HOST_DEV)
73 .height(20) 73 .height(20)
74 .width(20) 74 .width(20)
75 .onChange((isChecked: boolean) => { 75 .onChange((isChecked: boolean) => {
76 if (isChecked) { 76 if (isChecked) {
77 - this.currentEnvironment = HttpUrlUtils.HOST_DEV; 77 + this.currentEnvironment = HostEnum.HOST_DEV;
78 } 78 }
79 }) 79 })
80 Text('切换到DEV(开发)环境,重启应用生效') 80 Text('切换到DEV(开发)环境,重启应用生效')
@@ -14,7 +14,7 @@ import { @@ -14,7 +14,7 @@ import {
14 StringUtils, 14 StringUtils,
15 WindowModel 15 WindowModel
16 } from 'wdKit'; 16 } from 'wdKit';
17 -import { HttpUrlUtils, WDHttp } from 'wdNetwork'; 17 +import { HostEnum, HostManager, WDHttp } from 'wdNetwork';
18 18
19 export default class EntryAbility extends UIAbility { 19 export default class EntryAbility extends UIAbility {
20 onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { 20 onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
@@ -25,7 +25,7 @@ export default class EntryAbility extends UIAbility { @@ -25,7 +25,7 @@ export default class EntryAbility extends UIAbility {
25 WDHttp.initHttpHeader() 25 WDHttp.initHttpHeader()
26 const spHostUrl = SPHelper.default.getSync('hostUrl', '') as string 26 const spHostUrl = SPHelper.default.getSync('hostUrl', '') as string
27 if (StringUtils.isNotEmpty(spHostUrl)) { 27 if (StringUtils.isNotEmpty(spHostUrl)) {
28 - HttpUrlUtils.hostUrl = spHostUrl 28 + HostManager.changeHost(spHostUrl as HostEnum)
29 } 29 }
30 30
31 // 注册监听网络连接 31 // 注册监听网络连接