Merge remote-tracking branch 'origin/main'

zhaojunkai
Commit a574fb1417c1267cd6d8f2a7d1bc1319d2608380 a574fb14 2 parents bc4d0dac 6b0ce6e1
Showing 4 changed files with 19 additions and 26 deletions
sight_harmony/commons/wdNetwork/src/main/ets/http/HttpUrlUtils.ets
sight_harmony/commons/wdRouter/src/main/ets/router/Action2Page.ets
sight_harmony/commons/wdRouter/src/main/ets/router/WDRouterPage.ets
sight_harmony/features/wdLogin/src/main/ets/pages/login/LoginPage.ets
--- a/sight_harmony/commons/wdNetwork/src/main/ets/http/HttpUrlUtils.ets
View file @a574fb1
+++ b/sight_harmony/commons/wdNetwork/src/main/ets/http/HttpUrlUtils.ets
View file @a574fb1
@@ -26,7 +26,6 @@ export class HttpUrlUtils {
    * 启动接口（底导接口）
    */
   static readonly BOTTOM_NAV_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup";
-
   /**
    * 展现pageInfo接口
    */
@@ -56,12 +55,10 @@ export class HttpUrlUtils {
    * 浏览历史新增、删除接口
    */
   static readonly INTERACT_BROWS_OPERATE: string = "/api/rmrb-interact/interact/zh/c/brows/operate";
-
   /**
    * 电子报信息
    */
   static readonly E_NEWSPAPER_INFO_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/paperApi/paperTime";
-
   /**
    * 电子报列表
    */
@@ -103,22 +100,18 @@ export class HttpUrlUtils {
    * 我的收藏
    */
   static readonly APPOINTMENT_MyCollectionList_PATH: string = "/api/rmrb-interact/content/zh/c/interact";
-
   /**
    * 个人中心  我的评论列表
    */
   static readonly MINE_COMMENT_LIST_DATA_PATH: string = "/api/rmrb-comment/comment/zh/c/myCommentList";
-
   /**
    * 个人中心  APP获取用户等级
    */
   static readonly MINE_USER_LEVEL_DATA_PATH: string = "/api/rmrb-user-point/auth/level/zh/c/queryUserLevel";
-
   /**
    * 个人中心  APP获取其他用户等级
    */
   static readonly OTHER_USER_LEVEL_DATA_PATH: string = "/api/rmrb-user-point/auth/level/zh/c/batchUser";
-
   /**
    * 个人中心  (号主/普通用户)我的基本信息
    */
@@ -159,13 +152,11 @@ export class HttpUrlUtils {
    * pageSize=20&pageNum=1&topicId=10000009445
    * */
   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 userId=''
-  private static userType=''
-  private static token=''
+  private static userId = ''
+  private static userType = ''
+  private static token = ''
   static getCommonHeaders(): HashMap<string, string> {
     let headers: HashMap<string, string> = new HashMap<string, string>()
@@ -374,7 +365,7 @@ export class HttpUrlUtils {
     return url;
   }
-  static getAppLoginUrl() :string{
+  static getAppLoginUrl(): string {
     let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/auth/zh/c/appLogin";
     return url;
   }
@@ -513,16 +504,15 @@ export class HttpUrlUtils {
   //   return headers;
   // }
-  public static setUserId(userId:string){
-    HttpUrlUtils.userId=userId;
+  public static setUserId(userId: string) {
+    HttpUrlUtils.userId = userId;
   }
-  public static setUserType(userType:string){
-    HttpUrlUtils.userType=userType;
+  public static setUserType(userType: string) {
+    HttpUrlUtils.userType = userType;
   }
-  public static setUserToken(token:string){
-    HttpUrlUtils.token=token;
+  public static setUserToken(token: string) {
+    HttpUrlUtils.token = token;
   }
-
 }
--- a/sight_harmony/commons/wdRouter/src/main/ets/router/Action2Page.ets
View file @a574fb1
+++ b/sight_harmony/commons/wdRouter/src/main/ets/router/Action2Page.ets
View file @a574fb1
@@ -69,9 +69,9 @@ export function registerRouter() {
   Action2Page.register("JUMP_INNER_NEW_PAGE", (action) => {
     if (action.params?.pageID == "E_NEWSPAPER") {
       return WDRouterPage.eNewspaper
-    } else if (action.params?.pageID == "MorningEveningPaper"){
+    } else if (action.params?.pageID == "MorningEveningPaper") {
       return WDRouterPage.morningEveningPaperPage
-    } else if (action.params?.pageID == "IMAGE_TEXT_DETAIL"){
+    } else if (action.params?.pageID == "IMAGE_TEXT_DETAIL") {
       return WDRouterPage.imageTextDetailPage
     }
     return undefined
--- a/sight_harmony/commons/wdRouter/src/main/ets/router/WDRouterPage.ets
View file @a574fb1
+++ b/sight_harmony/commons/wdRouter/src/main/ets/router/WDRouterPage.ets
View file @a574fb1
@@ -9,6 +9,12 @@ export class WDRouterPage {
     this.pagePath = pagePath
   }
+  static getBundleInfo(){
+    let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
+    return `@bundle:${bundleInfo.name}/${"phone"}/${"ets/pages/MainPage"}`
+  }
+
+
   url() {
     let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
     return `@bundle:${bundleInfo.name}/${this.moduleName}/${this.pagePath}`
@@ -38,7 +44,6 @@ export class WDRouterPage {
   // 音乐详情页
   static audioDetail = new WDRouterPage("phone", "ets/pages/detail/AudioDetail");
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
-
   static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");
   //我的  预约
   static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");
@@ -65,10 +70,8 @@ export class WDRouterPage {
   static settingPage = new WDRouterPage("wdComponent", "ets/components/page/SettingPage");
   // 设置密码页、设置手机号页等等 (需要传参)
   static settingPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/SettingPasswordPage");
-
   //其他普通用户 主页
   static otherNormalUserHomePagePage = new WDRouterPage("wdComponent", "ets/pages/OtherNormalUserHomePage");
-
   static guidePage = new WDRouterPage("wdLogin", "ets/pages/guide/GuidePages");
   //隐私政策页面
--- a/sight_harmony/features/wdLogin/src/main/ets/pages/login/LoginPage.ets
View file @a574fb1
+++ b/sight_harmony/features/wdLogin/src/main/ets/pages/login/LoginPage.ets
View file @a574fb1
@@ -305,7 +305,7 @@ struct LoginPage {
         router.back({
           params: { userName: data.userName,
             userId:data.id},
-          url: 'pages/MainPage'
+          url: `${WDRouterPage.getBundleInfo()}`
         }
         )
       })