developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
zhaojunkai
2e259a7f 2 parents 35d62cda 78e14d1b

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 7 changed files with 209 additions and 82 deletions
@@ -31,3 +31,5 @@ export { DisplayUtils } from './src/main/ets/utils/DisplayUtils' @@ -31,3 +31,5 @@ export { DisplayUtils } from './src/main/ets/utils/DisplayUtils'
31 export { SystemUtils } from './src/main/ets/utils/SystemUtils' 31 export { SystemUtils } from './src/main/ets/utils/SystemUtils'
32 32
33 export { PermissionUtil } from './src/main/ets/utils/PermissionUtil' 33 export { PermissionUtil } from './src/main/ets/utils/PermissionUtil'
  34 +
  35 +export { UserDataLocal } from './src/main/ets/utils/UserDataLocal'
  1 +/**
  2 + * 用户信息 暂存管理类
  3 + * 主要用于 不需要调用 用户详情接口 获取 当前用户信息的 数据
  4 + */
  5 +import { SPHelper } from './SPHelper'
  6 +import { StringUtils } from './StringUtils'
  7 +
  8 +export class UserDataLocal {
  9 + public static userId=''
  10 + public static userType=''
  11 + public static token=''
  12 + public static userName=''
  13 +
  14 + public static userHeaderUrl=''
  15 + public static userLevel = -1
  16 + public static userLevelHeaderUrl=''
  17 +
  18 + //先写死
  19 + static USER_ID="userId"
  20 + static USER_Type="userType"
  21 + static USER_JWT_TOKEN="jwtToken"
  22 + static USER_NAME="userName"
  23 +
  24 + static USER_HEADER_URL="userHeaderUrl"
  25 + static USER_LEVEL="userLevel"
  26 + static USER_LEVEL_HEADER_URL="userLevelHeaderUrl"
  27 +
  28 +
  29 + //刷新token 用到
  30 + static USER_REFRESH_TOKEN="refreshToken"
  31 + //暂未用到
  32 + static USER_FIRST_MARK="firstMark"
  33 + static USER_LONG_TIME_NO_LOGIN_MARK="longTimeNoLoginMark"
  34 + static USER_STATUS="user_status"
  35 + static USER_TEMP_TOKEN="tempToken"
  36 +
  37 +
  38 + public static getUserId() {
  39 + if(StringUtils.isNotEmpty(UserDataLocal.userId)){
  40 + return UserDataLocal.userId
  41 + }
  42 + UserDataLocal.userId = SPHelper.default.getSync(UserDataLocal.USER_ID,"") as string
  43 + return UserDataLocal.userId;
  44 + }
  45 +
  46 + public static getUserType() {
  47 + if(StringUtils.isNotEmpty(UserDataLocal.userType)){
  48 + return UserDataLocal.userType
  49 + }
  50 + UserDataLocal.userType = SPHelper.default.getSync(UserDataLocal.USER_Type,"") as string
  51 + return UserDataLocal.userType;
  52 + }
  53 +
  54 + private static getXToken() {
  55 + if(StringUtils.isNotEmpty(UserDataLocal.token)){
  56 + return UserDataLocal.token
  57 + }
  58 + UserDataLocal.token = SPHelper.default.getSync(UserDataLocal.USER_JWT_TOKEN,"") as string
  59 + if(StringUtils.isNotEmpty(UserDataLocal.token)) {
  60 + return UserDataLocal.token
  61 + }
  62 + return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
  63 + }
  64 +
  65 + public static getUserName() {
  66 + if(StringUtils.isNotEmpty(UserDataLocal.userName)){
  67 + return UserDataLocal.userName
  68 + }
  69 + UserDataLocal.userId = SPHelper.default.getSync(UserDataLocal.USER_NAME,"") as string
  70 + return UserDataLocal.userName;
  71 + }
  72 +
  73 + public static getUserHeaderUrl() {
  74 + if(StringUtils.isNotEmpty(UserDataLocal.userHeaderUrl)){
  75 + return UserDataLocal.userHeaderUrl
  76 + }
  77 + UserDataLocal.userHeaderUrl = SPHelper.default.getSync(UserDataLocal.USER_HEADER_URL,"") as string
  78 + return UserDataLocal.userHeaderUrl;
  79 + }
  80 +
  81 + public static setUserHeaderUrl(url:string) {
  82 + SPHelper.default.save(UserDataLocal.USER_HEADER_URL, url)
  83 + }
  84 +
  85 +
  86 + public static getUserLevel() {
  87 + if(UserDataLocal.userLevel != -1){
  88 + return UserDataLocal.userLevel
  89 + }
  90 + UserDataLocal.userLevel = SPHelper.default.getSync(UserDataLocal.USER_LEVEL,-1) as number
  91 + return UserDataLocal.userLevel;
  92 + }
  93 +
  94 + public static setUserLevel(level:number) {
  95 + SPHelper.default.save(UserDataLocal.USER_LEVEL, level)
  96 + }
  97 +
  98 + public static getUserLevelHeaderUrl() {
  99 + if(StringUtils.isNotEmpty(UserDataLocal.userLevelHeaderUrl)){
  100 + return UserDataLocal.userLevelHeaderUrl
  101 + }
  102 + UserDataLocal.userLevelHeaderUrl = SPHelper.default.getSync(UserDataLocal.USER_LEVEL_HEADER_URL,"") as string
  103 + return UserDataLocal.userLevelHeaderUrl;
  104 + }
  105 +
  106 + public static setUserLevelHeaderUrl(url:string) {
  107 + SPHelper.default.save(UserDataLocal.USER_LEVEL_HEADER_URL, url)
  108 + }
  109 +}
@@ -254,9 +254,12 @@ export class HttpUrlUtils { @@ -254,9 +254,12 @@ export class HttpUrlUtils {
254 } 254 }
255 255
256 private static getXToken() { 256 private static getXToken() {
257 - let jwttoken = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN,"")  
258 - if(StringUtils.isNotEmpty(jwttoken)) {  
259 - return jwttoken as string; 257 + if(StringUtils.isNotEmpty(HttpUrlUtils.token)){
  258 + return HttpUrlUtils.token
  259 + }
  260 + HttpUrlUtils.token = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN,"") as string
  261 + if(StringUtils.isNotEmpty(HttpUrlUtils.token)) {
  262 + return HttpUrlUtils.token
260 } 263 }
261 return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc'; 264 return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
262 } 265 }
@@ -319,19 +322,18 @@ export class HttpUrlUtils { @@ -319,19 +322,18 @@ export class HttpUrlUtils {
319 322
320 public static getUserId() { 323 public static getUserId() {
321 // TODO 对接登录 324 // TODO 对接登录
322 - let userid = SPHelper.default.getSync(SpConstants.USER_ID,"")  
323 - if(StringUtils.isNotEmpty(userid)) {  
324 - return userid as string; 325 + if(StringUtils.isNotEmpty(HttpUrlUtils.userId)){
  326 + return HttpUrlUtils.userId
325 } 327 }
  328 + HttpUrlUtils.userId = SPHelper.default.getSync(SpConstants.USER_ID,"") as string
326 return HttpUrlUtils.userId; 329 return HttpUrlUtils.userId;
327 } 330 }
328 331
329 public static getUserType() { 332 public static getUserType() {
330 - let userType = SPHelper.default.getSync(SpConstants.USER_Type,"")  
331 - if(StringUtils.isNotEmpty(userType)) {  
332 - return userType as string; 333 + if(StringUtils.isNotEmpty(HttpUrlUtils.userType)){
  334 + return HttpUrlUtils.userType
333 } 335 }
334 - 336 + HttpUrlUtils.userType = SPHelper.default.getSync(SpConstants.USER_Type,"") as string
335 return HttpUrlUtils.userType; 337 return HttpUrlUtils.userType;
336 } 338 }
337 339
@@ -382,7 +384,7 @@ export class HttpUrlUtils { @@ -382,7 +384,7 @@ export class HttpUrlUtils {
382 } 384 }
383 385
384 static getAppointmentListDataUrl() { 386 static getAppointmentListDataUrl() {
385 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH 387 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
386 return url 388 return url
387 } 389 }
388 390
@@ -392,113 +394,113 @@ export class HttpUrlUtils { @@ -392,113 +394,113 @@ export class HttpUrlUtils {
392 } 394 }
393 395
394 static getFollowListDetailDataUrl() { 396 static getFollowListDetailDataUrl() {
395 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH 397 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_DETAIL_DATA_PATH
396 return url 398 return url
397 } 399 }
398 400
399 static getFollowListDataUrl() { 401 static getFollowListDataUrl() {
400 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.FOLLOW_LIST_DATA_PATH 402 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_DATA_PATH
401 return url 403 return url
402 } 404 }
403 405
404 static getMineFollowListDataUrl() { 406 static getMineFollowListDataUrl() {
405 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH 407 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_FOLLOW_LIST_DATA_PATH
406 return url 408 return url
407 } 409 }
408 410
409 static getFollowListStatusDataUrl() { 411 static getFollowListStatusDataUrl() {
410 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH 412 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_LIST_STATUS_DATA_PATH
411 return url 413 return url
412 } 414 }
413 415
414 static getMineCommentListDataUrl() { 416 static getMineCommentListDataUrl() {
415 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH 417 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_COMMENT_LIST_DATA_PATH
416 return url 418 return url
417 } 419 }
418 420
419 static getMineUserLevelDataUrl() { 421 static getMineUserLevelDataUrl() {
420 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH 422 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_USER_LEVEL_DATA_PATH
421 return url 423 return url
422 } 424 }
423 425
424 static getOtherUserLevelDataUrl() { 426 static getOtherUserLevelDataUrl() {
425 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH 427 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_LEVEL_DATA_PATH
426 return url 428 return url
427 } 429 }
428 430
429 static getMineUserDetailDataUrl() { 431 static getMineUserDetailDataUrl() {
430 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH 432 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.MINE_USER_DETAIL_DATA_PATH
431 return url 433 return url
432 } 434 }
433 435
434 static getOtherUserDetailDataUrl() { 436 static getOtherUserDetailDataUrl() {
435 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH 437 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_DETAIL_DATA_PATH
436 return url 438 return url
437 } 439 }
438 440
439 static getOtherCommentListDataUrl() { 441 static getOtherCommentListDataUrl() {
440 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH 442 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_COMMENT_LIST_DATA_PATH
441 return url 443 return url
442 } 444 }
443 445
444 static getOtherUserFollowListDataUrl() { 446 static getOtherUserFollowListDataUrl() {
445 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH 447 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.OTHER_USER_FOLLOW_LIST_DATA_PATH
446 return url 448 return url
447 } 449 }
448 450
449 static getAppointmentOperationUrl() { 451 static getAppointmentOperationUrl() {
450 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH 452 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.APPOINTMENT_OPERATION_STATUS_PATH
451 return url 453 return url
452 } 454 }
453 455
454 static getCommentLikeOperationUrl() { 456 static getCommentLikeOperationUrl() {
455 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH 457 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.COMMENT_LIKE_OPERATION_PATH
456 return url 458 return url
457 } 459 }
458 460
459 static getFollowOperationUrl() { 461 static getFollowOperationUrl() {
460 - let url = HttpUrlUtils.HOST_SIT + HttpUrlUtils.FOLLOW_OPERATION_PATH 462 + let url = HttpUrlUtils.hostUrl + HttpUrlUtils.FOLLOW_OPERATION_PATH
461 return url 463 return url
462 } 464 }
463 465
464 466
465 - static getYcgCommonHeaders(): HashMap<string, string> {  
466 - let headers: HashMap<string, string> = new HashMap<string, string>()  
467 -  
468 - headers.set('mpassid', 'XGt6jfGUx8ADAKruTyAMdhHj')  
469 - headers.set('city', "%E5%90%88%E8%82%A5%E5%B8%82")  
470 - headers.set('User-Agent', 'Dalvik/2.1.0 (Linux; U; Android 10; PCT-AL10 Build/HUAWEIPCT-AL10)')  
471 - headers.set('channel', "rmrb_china_0000")  
472 - headers.set('appCode', "0af1f9085e484c97b2a44704bae72c07")  
473 - headers.set('Authorization', "APPCODE 0af1f9085e484c97b2a44704bae72c07")  
474 - headers.set('X-Ca-Stage', "TEST")  
475 - headers.set('plat', "Phone")  
476 - headers.set('Content-Type', 'application/json; charset=utf-8')  
477 - headers.set('timestamp', "740977741")  
478 - headers.set('RMRB-X-TOKEN', "eyJhbGciOiJIUzI1NiIsImtpZCI6IklFazBGclhfV2RYMEx1ZktDU01iYTVYd0VmUHZ6a043T0F5UTRFLWIwWU0ifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcxMDc1NjM3NywidXNlcklkIjo1NjczODc0NzcwNjM2MjEsInVzZXJWZXJzaW9uIjoiNTY3Mzg3NDc3MDYzNjIxXzAiLCJ1c2VyTmFtZSI6IiVFNCVCQSVCQSVFNiVCMCU5MSVFNiU5NyVBNSVFNiU4QSVBNSVFNyVCRCU5MSVFNSU4RiU4QmFQcnRxNSIsInVzZXJUeXBlIjoxLCJjcmVhdG9ySWQiOm51bGwsInVzZXJJZFpoIjpudWxsfQ.KBkF0Yki-JWlq0ZIOCzgKwQc1ycBnFHa6CF-rMPRgHU")  
479 - headers.set('device_id', "5156098c-6c44-3514-af70-04a0139a9327")  
480 - // headers.set('cookie', 'RMRB-X-TOKEN=eyJhbGciOiJIUzI1NiIsImtpZCI6IklFazBGclhfV2RYMEx1ZktDU01iYTVYd0VmUHZ6a043T0F5UTRFLWIwWU0ifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcxMDU4Mzk0MywidXNlcklkIjo1NjczODc0NzcwNjM2MjEsInVzZXJWZXJzaW9uIjoiNTY3Mzg3NDc3MDYzNjIxXzAiLCJ1c2VyTmFtZSI6IiVFNCVCQSVCQSVFNiVCMCU5MSVFNiU5NyVBNSVFNiU4QSVBNSVFNyVCRCU5MSVFNSU4RiU4QmFQcnRxNSIsInVzZXJUeXBlIjoxLCJjcmVhdG9ySWQiOm51bGwsInVzZXJJZFpoIjpudWxsfQ._LTKrUxQozpCj1XMhx1TWOIxn5gjDveoPuMFGpI0g_8')  
481 - headers.set('build_version', "202403112023")  
482 - headers.set('adcode', "340000")  
483 - headers.set('os_version', "10")  
484 - headers.set('city_dode', "340100")  
485 - headers.set('userId', "567387477063621")  
486 - headers.set('versionCode', "7302")  
487 - headers.set('system', "Android")  
488 - headers.set('version_name', "7.3.0.2")  
489 - headers.set('EagleEye-TraceID', '101118E4D006453DA549A82AA8CAFBFE')  
490 - headers.set('imei', "5156098c-6c44-3514-af70-04a0139a9327")  
491 - headers.set('userType', "1")  
492 - headers.set('Accept-Language', 'zh')  
493 -  
494 - // HttpUrlUtils.addSpecialHeaders(headers);  
495 - // Logger.debug("TAG", '******************* commonHeaders headers start ******************************** ');  
496 - // headers.forEach((v,k)=>{  
497 - // Logger.debug("TAG", 'getCommonHeaders header: ' + k + ': ' + v);  
498 - // })  
499 - // Logger.debug("TAG", '******************* commonHeaders headers end ******************************** ');  
500 - return headers;  
501 - } 467 + // static getYcgCommonHeaders(): HashMap<string, string> {
  468 + // let headers: HashMap<string, string> = new HashMap<string, string>()
  469 + //
  470 + // headers.set('mpassid', 'XGt6jfGUx8ADAKruTyAMdhHj')
  471 + // headers.set('city', "%E5%90%88%E8%82%A5%E5%B8%82")
  472 + // headers.set('User-Agent', 'Dalvik/2.1.0 (Linux; U; Android 10; PCT-AL10 Build/HUAWEIPCT-AL10)')
  473 + // headers.set('channel', "rmrb_china_0000")
  474 + // headers.set('appCode', "0af1f9085e484c97b2a44704bae72c07")
  475 + // headers.set('Authorization', "APPCODE 0af1f9085e484c97b2a44704bae72c07")
  476 + // headers.set('X-Ca-Stage', "TEST")
  477 + // headers.set('plat', "Phone")
  478 + // headers.set('Content-Type', 'application/json; charset=utf-8')
  479 + // headers.set('timestamp', "740977741")
  480 + // headers.set('RMRB-X-TOKEN', "eyJhbGciOiJIUzI1NiIsImtpZCI6IklFazBGclhfV2RYMEx1ZktDU01iYTVYd0VmUHZ6a043T0F5UTRFLWIwWU0ifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcxMDc1NjM3NywidXNlcklkIjo1NjczODc0NzcwNjM2MjEsInVzZXJWZXJzaW9uIjoiNTY3Mzg3NDc3MDYzNjIxXzAiLCJ1c2VyTmFtZSI6IiVFNCVCQSVCQSVFNiVCMCU5MSVFNiU5NyVBNSVFNiU4QSVBNSVFNyVCRCU5MSVFNSU4RiU4QmFQcnRxNSIsInVzZXJUeXBlIjoxLCJjcmVhdG9ySWQiOm51bGwsInVzZXJJZFpoIjpudWxsfQ.KBkF0Yki-JWlq0ZIOCzgKwQc1ycBnFHa6CF-rMPRgHU")
  481 + // headers.set('device_id', "5156098c-6c44-3514-af70-04a0139a9327")
  482 + // // headers.set('cookie', 'RMRB-X-TOKEN=eyJhbGciOiJIUzI1NiIsImtpZCI6IklFazBGclhfV2RYMEx1ZktDU01iYTVYd0VmUHZ6a043T0F5UTRFLWIwWU0ifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcxMDU4Mzk0MywidXNlcklkIjo1NjczODc0NzcwNjM2MjEsInVzZXJWZXJzaW9uIjoiNTY3Mzg3NDc3MDYzNjIxXzAiLCJ1c2VyTmFtZSI6IiVFNCVCQSVCQSVFNiVCMCU5MSVFNiU5NyVBNSVFNiU4QSVBNSVFNyVCRCU5MSVFNSU4RiU4QmFQcnRxNSIsInVzZXJUeXBlIjoxLCJjcmVhdG9ySWQiOm51bGwsInVzZXJJZFpoIjpudWxsfQ._LTKrUxQozpCj1XMhx1TWOIxn5gjDveoPuMFGpI0g_8')
  483 + // headers.set('build_version', "202403112023")
  484 + // headers.set('adcode', "340000")
  485 + // headers.set('os_version', "10")
  486 + // headers.set('city_dode', "340100")
  487 + // headers.set('userId', "567387477063621")
  488 + // headers.set('versionCode', "7302")
  489 + // headers.set('system', "Android")
  490 + // headers.set('version_name', "7.3.0.2")
  491 + // headers.set('EagleEye-TraceID', '101118E4D006453DA549A82AA8CAFBFE')
  492 + // headers.set('imei', "5156098c-6c44-3514-af70-04a0139a9327")
  493 + // headers.set('userType', "1")
  494 + // headers.set('Accept-Language', 'zh')
  495 + //
  496 + // // HttpUrlUtils.addSpecialHeaders(headers);
  497 + // // Logger.debug("TAG", '******************* commonHeaders headers start ******************************** ');
  498 + // // headers.forEach((v,k)=>{
  499 + // // Logger.debug("TAG", 'getCommonHeaders header: ' + k + ': ' + v);
  500 + // // })
  501 + // // Logger.debug("TAG", '******************* commonHeaders headers end ******************************** ');
  502 + // return headers;
  503 + // }
502 504
503 public static setUserId(userId:string){ 505 public static setUserId(userId:string){
504 HttpUrlUtils.userId=userId; 506 HttpUrlUtils.userId=userId;
1 -import { Logger } from 'wdKit' 1 +import { Logger, UserDataLocal } from 'wdKit'
2 import { WDRouterPage, WDRouterRule } from 'wdRouter' 2 import { WDRouterPage, WDRouterRule } from 'wdRouter'
3 import MinePageDatasModel from '../../model/MinePageDatasModel' 3 import MinePageDatasModel from '../../model/MinePageDatasModel'
4 const TAG = "MinePageUserSimpleInfoUI" 4 const TAG = "MinePageUserSimpleInfoUI"
@@ -156,6 +156,7 @@ export default struct MinePageUserSimpleInfoUI { @@ -156,6 +156,7 @@ export default struct MinePageUserSimpleInfoUI {
156 if(value!=null){ 156 if(value!=null){
157 this.userName = value.userName 157 this.userName = value.userName
158 this.headPhotoUrl = value.headPhotoUrl 158 this.headPhotoUrl = value.headPhotoUrl
  159 + UserDataLocal.setUserHeaderUrl(value.headPhotoUrl)
159 } 160 }
160 }).catch((err:Error)=>{ 161 }).catch((err:Error)=>{
161 console.log(TAG,JSON.stringify(err)) 162 console.log(TAG,JSON.stringify(err))
@@ -166,6 +167,8 @@ export default struct MinePageUserSimpleInfoUI { @@ -166,6 +167,8 @@ export default struct MinePageUserSimpleInfoUI {
166 if(value!=null){ 167 if(value!=null){
167 this.levelHead = value.levelHead 168 this.levelHead = value.levelHead
168 this.levelId = value.levelId 169 this.levelId = value.levelId
  170 + UserDataLocal.setUserLevel(value.levelId)
  171 + UserDataLocal.setUserLevelHeaderUrl(value.levelHead + "")
169 } 172 }
170 }).catch((err:Error)=>{ 173 }).catch((err:Error)=>{
171 console.log(TAG,JSON.stringify(err)) 174 console.log(TAG,JSON.stringify(err))
@@ -79,6 +79,7 @@ export struct MinePageComponent { @@ -79,6 +79,7 @@ export struct MinePageComponent {
79 } 79 }
80 80
81 async getUserLogin() { 81 async getUserLogin() {
  82 + // let userid = SPHelper.default.getSync(SpConstants.USER_ID,"") as string
82 let userid = await SPHelper.default.get(SpConstants.USER_ID,"") 83 let userid = await SPHelper.default.get(SpConstants.USER_ID,"")
83 if(StringUtils.isNotEmpty(userid)){ 84 if(StringUtils.isNotEmpty(userid)){
84 this.isLogin = true 85 this.isLogin = true
@@ -109,7 +109,7 @@ class MinePageDatasModel{ @@ -109,7 +109,7 @@ class MinePageDatasModel{
109 */ 109 */
110 fetchAppointmentListData(pageSize:string,pageNum:string) { 110 fetchAppointmentListData(pageSize:string,pageNum:string) {
111 let url = HttpUrlUtils.getAppointmentListDataUrl()+ `?pageSize=${pageSize}&pageNum=${pageNum}` 111 let url = HttpUrlUtils.getAppointmentListDataUrl()+ `?pageSize=${pageSize}&pageNum=${pageNum}`
112 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 112 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
113 return WDHttp.get<ResponseDTO<MineAppointmentListItem>>(url, headers) 113 return WDHttp.get<ResponseDTO<MineAppointmentListItem>>(url, headers)
114 }; 114 };
115 115
@@ -180,7 +180,7 @@ class MinePageDatasModel{ @@ -180,7 +180,7 @@ class MinePageDatasModel{
180 180
181 fetchFollowListDetailData(object:FollowListDetailRequestItem) { 181 fetchFollowListDetailData(object:FollowListDetailRequestItem) {
182 let url = HttpUrlUtils.getFollowListDetailDataUrl() 182 let url = HttpUrlUtils.getFollowListDetailDataUrl()
183 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 183 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
184 return WDHttp.post<ResponseDTO<MineFollowListDetailItem>>(url, object,headers) 184 return WDHttp.post<ResponseDTO<MineFollowListDetailItem>>(url, object,headers)
185 }; 185 };
186 186
@@ -190,7 +190,7 @@ class MinePageDatasModel{ @@ -190,7 +190,7 @@ class MinePageDatasModel{
190 */ 190 */
191 fetchFollowListData() { 191 fetchFollowListData() {
192 let url = HttpUrlUtils.getFollowListDataUrl() 192 let url = HttpUrlUtils.getFollowListDataUrl()
193 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 193 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
194 return WDHttp.get<ResponseDTO<FollowListItem[]>>(url, headers) 194 return WDHttp.get<ResponseDTO<FollowListItem[]>>(url, headers)
195 }; 195 };
196 196
@@ -249,7 +249,7 @@ class MinePageDatasModel{ @@ -249,7 +249,7 @@ class MinePageDatasModel{
249 249
250 fetchMineDetailFollowListData(object:FollowListDetailRequestItem) { 250 fetchMineDetailFollowListData(object:FollowListDetailRequestItem) {
251 let url = HttpUrlUtils.getMineFollowListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}` 251 let url = HttpUrlUtils.getMineFollowListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}`
252 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 252 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
253 return WDHttp.get<ResponseDTO<MineFollowListItem>>(url, headers) 253 return WDHttp.get<ResponseDTO<MineFollowListItem>>(url, headers)
254 }; 254 };
255 255
@@ -290,7 +290,7 @@ class MinePageDatasModel{ @@ -290,7 +290,7 @@ class MinePageDatasModel{
290 290
291 fetchFollowListStatusData(object:FollowListStatusRequestItem) { 291 fetchFollowListStatusData(object:FollowListStatusRequestItem) {
292 let url = HttpUrlUtils.getFollowListStatusDataUrl() 292 let url = HttpUrlUtils.getFollowListStatusDataUrl()
293 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 293 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
294 return WDHttp.post<ResponseDTO<QueryListIsFollowedItem[]>>(url,object, headers) 294 return WDHttp.post<ResponseDTO<QueryListIsFollowedItem[]>>(url,object, headers)
295 }; 295 };
296 296
@@ -332,7 +332,7 @@ class MinePageDatasModel{ @@ -332,7 +332,7 @@ class MinePageDatasModel{
332 332
333 fetchMineCommentListData(object:FollowListDetailRequestItem) { 333 fetchMineCommentListData(object:FollowListDetailRequestItem) {
334 let url = HttpUrlUtils.getMineCommentListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}` 334 let url = HttpUrlUtils.getMineCommentListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}`
335 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 335 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
336 return WDHttp.get<ResponseDTO<MineCommentListDetailItem>>(url, headers) 336 return WDHttp.get<ResponseDTO<MineCommentListDetailItem>>(url, headers)
337 }; 337 };
338 338
@@ -370,13 +370,13 @@ class MinePageDatasModel{ @@ -370,13 +370,13 @@ class MinePageDatasModel{
370 370
371 fetchMineUserLevelData() { 371 fetchMineUserLevelData() {
372 let url = HttpUrlUtils.getMineUserLevelDataUrl() 372 let url = HttpUrlUtils.getMineUserLevelDataUrl()
373 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 373 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
374 return WDHttp.get<ResponseDTO<MineUserLevelItem>>(url, headers) 374 return WDHttp.get<ResponseDTO<MineUserLevelItem>>(url, headers)
375 }; 375 };
376 376
377 async getMineUserLevelDataLocal(context: Context): Promise<MineUserLevelItem> { 377 async getMineUserLevelDataLocal(context: Context): Promise<MineUserLevelItem> {
378 Logger.info(TAG, `getMineUserLevelDataLocal start`); 378 Logger.info(TAG, `getMineUserLevelDataLocal start`);
379 - let compRes: ResponseDTO<MineUserLevelItem> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<MineUserLevelItem>>(context,'mine_user_level.json' ); 379 + let compRes: ResponseDTO<MineUserLevelItem> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<MineUserLevelItem>>(context,'mine_user_level1.json' );
380 if (!compRes || !compRes.data) { 380 if (!compRes || !compRes.data) {
381 Logger.info(TAG, `getMineUserLevelDataLocal compRes is empty`); 381 Logger.info(TAG, `getMineUserLevelDataLocal compRes is empty`);
382 return new MineUserLevelItem() 382 return new MineUserLevelItem()
@@ -408,13 +408,13 @@ class MinePageDatasModel{ @@ -408,13 +408,13 @@ class MinePageDatasModel{
408 408
409 fetchMineUserDetailData() { 409 fetchMineUserDetailData() {
410 let url = HttpUrlUtils.getMineUserDetailDataUrl() 410 let url = HttpUrlUtils.getMineUserDetailDataUrl()
411 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 411 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
412 return WDHttp.get<ResponseDTO<MineUserDetailItem>>(url, headers) 412 return WDHttp.get<ResponseDTO<MineUserDetailItem>>(url, headers)
413 }; 413 };
414 414
415 async getMineUserDetailDataLocal(context: Context): Promise<MineUserDetailItem> { 415 async getMineUserDetailDataLocal(context: Context): Promise<MineUserDetailItem> {
416 Logger.info(TAG, `getMineUserLevelDataLocal start`); 416 Logger.info(TAG, `getMineUserLevelDataLocal start`);
417 - let compRes: ResponseDTO<MineUserDetailItem> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<MineUserDetailItem>>(context,'mine_user_detail.json' ); 417 + let compRes: ResponseDTO<MineUserDetailItem> | null = await ResourcesUtils.getResourcesJson<ResponseDTO<MineUserDetailItem>>(context,'mine_user_detail1.json' );
418 if (!compRes || !compRes.data) { 418 if (!compRes || !compRes.data) {
419 Logger.info(TAG, `getMineUserDetailDataLocal compRes is empty`); 419 Logger.info(TAG, `getMineUserDetailDataLocal compRes is empty`);
420 return new MineUserDetailItem() 420 return new MineUserDetailItem()
@@ -445,7 +445,7 @@ class MinePageDatasModel{ @@ -445,7 +445,7 @@ class MinePageDatasModel{
445 445
446 fetchOtherUserDetailData(item:OtherUserDetailRequestItem) { 446 fetchOtherUserDetailData(item:OtherUserDetailRequestItem) {
447 let url = HttpUrlUtils.getOtherUserDetailDataUrl() 447 let url = HttpUrlUtils.getOtherUserDetailDataUrl()
448 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 448 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
449 return WDHttp.post<ResponseDTO<MineUserDetailItem>>(url, item,headers) 449 return WDHttp.post<ResponseDTO<MineUserDetailItem>>(url, item,headers)
450 }; 450 };
451 451
@@ -487,7 +487,7 @@ class MinePageDatasModel{ @@ -487,7 +487,7 @@ class MinePageDatasModel{
487 487
488 fetchOtherUserLevelData(item:string[]) { 488 fetchOtherUserLevelData(item:string[]) {
489 let url = HttpUrlUtils.getOtherUserLevelDataUrl() 489 let url = HttpUrlUtils.getOtherUserLevelDataUrl()
490 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 490 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
491 return WDHttp.post<ResponseDTO<MineUserLevelItem[]>>(url,item, headers) 491 return WDHttp.post<ResponseDTO<MineUserLevelItem[]>>(url,item, headers)
492 }; 492 };
493 493
@@ -528,7 +528,7 @@ class MinePageDatasModel{ @@ -528,7 +528,7 @@ class MinePageDatasModel{
528 528
529 fetchOtherCommentListData(object:OtherUserCommentListRequestItem) { 529 fetchOtherCommentListData(object:OtherUserCommentListRequestItem) {
530 let url = HttpUrlUtils.getOtherCommentListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}&creatorId=${object.creatorId}&time=${object.time}&userType=${object.userType}&userId=${object.userId}` 530 let url = HttpUrlUtils.getOtherCommentListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}&creatorId=${object.creatorId}&time=${object.time}&userType=${object.userType}&userId=${object.userId}`
531 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 531 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
532 return WDHttp.get<ResponseDTO<MineCommentListDetailItem>>(url, headers) 532 return WDHttp.get<ResponseDTO<MineCommentListDetailItem>>(url, headers)
533 }; 533 };
534 534
@@ -569,7 +569,7 @@ class MinePageDatasModel{ @@ -569,7 +569,7 @@ class MinePageDatasModel{
569 569
570 fetchOtherUserCommentLikeStatusData(object:OtherUserCommentLikeStatusRequestItem) { 570 fetchOtherUserCommentLikeStatusData(object:OtherUserCommentLikeStatusRequestItem) {
571 let url = HttpUrlUtils.getFollowListStatusDataUrl() 571 let url = HttpUrlUtils.getFollowListStatusDataUrl()
572 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 572 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
573 return WDHttp.post<ResponseDTO<QueryCommentListIsLikedItem[]>>(url,object, headers) 573 return WDHttp.post<ResponseDTO<QueryCommentListIsLikedItem[]>>(url,object, headers)
574 }; 574 };
575 575
@@ -610,7 +610,7 @@ class MinePageDatasModel{ @@ -610,7 +610,7 @@ class MinePageDatasModel{
610 610
611 fetchOtherUserFollowListData(object:UserFollowListRequestItem) { 611 fetchOtherUserFollowListData(object:UserFollowListRequestItem) {
612 let url = HttpUrlUtils.getOtherUserFollowListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}&queryUserId=${object.queryUserId}&userType=${object.userType}&userId=${HttpUrlUtils.getUserId()}` 612 let url = HttpUrlUtils.getOtherUserFollowListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}&queryUserId=${object.queryUserId}&userType=${object.userType}&userId=${HttpUrlUtils.getUserId()}`
613 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 613 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
614 return WDHttp.get<ResponseDTO<MineFollowListItem>>(url, headers) 614 return WDHttp.get<ResponseDTO<MineFollowListItem>>(url, headers)
615 }; 615 };
616 616
@@ -650,7 +650,7 @@ class MinePageDatasModel{ @@ -650,7 +650,7 @@ class MinePageDatasModel{
650 650
651 fetchAppointmentOperation(object:AppointmentOperationRequestItem) { 651 fetchAppointmentOperation(object:AppointmentOperationRequestItem) {
652 let url = HttpUrlUtils.getAppointmentOperationUrl() 652 let url = HttpUrlUtils.getAppointmentOperationUrl()
653 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 653 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
654 return WDHttp.post<ResponseDTO>(url,object, headers) 654 return WDHttp.post<ResponseDTO>(url,object, headers)
655 }; 655 };
656 656
@@ -691,7 +691,7 @@ class MinePageDatasModel{ @@ -691,7 +691,7 @@ class MinePageDatasModel{
691 691
692 fetchCommentLikeOperation(object:CommentLikeOperationRequestItem) { 692 fetchCommentLikeOperation(object:CommentLikeOperationRequestItem) {
693 let url = HttpUrlUtils.getCommentLikeOperationUrl() 693 let url = HttpUrlUtils.getCommentLikeOperationUrl()
694 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 694 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
695 return WDHttp.post<ResponseDTO>(url,object, headers) 695 return WDHttp.post<ResponseDTO>(url,object, headers)
696 }; 696 };
697 697
@@ -731,7 +731,7 @@ class MinePageDatasModel{ @@ -731,7 +731,7 @@ class MinePageDatasModel{
731 731
732 fetchFollowOperation(object:FollowOperationRequestItem) { 732 fetchFollowOperation(object:FollowOperationRequestItem) {
733 let url = HttpUrlUtils.getFollowOperationUrl() 733 let url = HttpUrlUtils.getFollowOperationUrl()
734 - let headers: HashMap<string, string> = HttpUrlUtils.getYcgCommonHeaders(); 734 + let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
735 return WDHttp.post<ResponseDTO>(url,object, headers) 735 return WDHttp.post<ResponseDTO>(url,object, headers)
736 }; 736 };
737 737
1 export interface LoginBean { 1 export interface LoginBean {
2 - // {"code":"0","data":{"firstMark":1,"id":569350079889669,"jwtToken":"eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcxMDY0NzE0MiwidXNlcklkIjo1NjkzNTAwNzk4ODk2NjksInVzZXJWZXJzaW9uIjoiNTY5MzUwMDc5ODg5NjY5XzAiLCJ1c2VyTmFtZSI6IiVFNCVCQSVCQSVFNiVCMCU5MSVFNiU5NyVBNSVFNiU4QSVBNSVFNyVCRCU5MSVFNSU4RiU4QjJrRDJ4VyIsInVzZXJUeXBlIjoxLCJjcmVhdG9ySWQiOm51bGx9.1M0E_6V60opL7AxamGzINpieTHP11fRbiXKDPc-ywWg","longTimeNoLoginMark":0,"refreshToken":"83fe2f1a-77af-4f73-8490-1cebed037f73","status":1,"userName":"人民日报网友2kD2xW","userType":1},"message":"Success","success":true,"timestamp":1710467142214} 2 + // {"code":"0",
  3 + // "data":{
  4 + // "firstMark":1,
  5 + // "id":569350079889669,
  6 + // "jwtToken":"eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcxMDY0NzE0MiwidXNlcklkIjo1NjkzNTAwNzk4ODk2NjksInVzZXJWZXJzaW9uIjoiNTY5MzUwMDc5ODg5NjY5XzAiLCJ1c2VyTmFtZSI6IiVFNCVCQSVCQSVFNiVCMCU5MSVFNiU5NyVBNSVFNiU4QSVBNSVFNyVCRCU5MSVFNSU4RiU4QjJrRDJ4VyIsInVzZXJUeXBlIjoxLCJjcmVhdG9ySWQiOm51bGx9.1M0E_6V60opL7AxamGzINpieTHP11fRbiXKDPc-ywWg",
  7 + // "longTimeNoLoginMark":0,
  8 + // "refreshToken":"83fe2f1a-77af-4f73-8490-1cebed037f73",
  9 + // "status":1,
  10 + // "userName":"人民日报网友2kD2xW",
  11 + // "userType":1
  12 + // },"message":"Success","success":true,"timestamp":1710467142214}
3 firstMark: number 13 firstMark: number
4 id: number 14 id: number
5 jwtToken: string 15 jwtToken: string