Merge remote-tracking branch 'origin/main'

@@ -173,7 +173,6 @@ export class ProcessUtils {
         detailPageType: 2,
         detailPageType: 2,
         contentID: content?.objectId,
         contentID: content?.objectId,
         // liveStyle: liveState === 'wait' ? 0 : liveStyle,
         // liveStyle: liveState === 'wait' ? 0 : liveStyle,
-        liveStyle: 0 ,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,

@@ -3,8 +3,7 @@ import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
-//TODO 这里引用了 features模块，是否考虑将跳转抽到公共模块
-import { ProcessUtils } from '../../../../../../features/wdComponent/src/main/ets/utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter/src/main/ets/utils/ProcessUtils';
 
 
 const TAG = 'JsBridgeBiz'
 const TAG = 'JsBridgeBiz'
 
 

@@ -85,9 +85,10 @@ export struct WdWebComponent {
   onPageBegin: (url?: string) => void = () => {
   onPageBegin: (url?: string) => void = () => {
     Logger.debug(TAG, 'onPageBegin');
     Logger.debug(TAG, 'onPageBegin');
     this.registerHandlers();
     this.registerHandlers();
-    // setTimeout(() => {
+    //有时序问题 必须延时执行
+    setTimeout(() => {
       BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
       BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
-    // }, 100)
+    }, 200)
   }
   }
   onPageEnd: (url?: string) => void = () => {
   onPageEnd: (url?: string) => void = () => {
     Logger.debug(TAG, 'onPageEnd');
     Logger.debug(TAG, 'onPageEnd');

@@ -102,9 +102,10 @@ export struct WdWebLocalComponent {
   onPageBegin: (url?: string) => void = () => {
   onPageBegin: (url?: string) => void = () => {
     Logger.debug(TAG, 'onPageBegin');
     Logger.debug(TAG, 'onPageBegin');
     this.registerHandlers();
     this.registerHandlers();
-    // setTimeout(() => {
+    //有时序问题 必须延时执行
+    setTimeout(() => {
       BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
       BridgeUtil.webViewLoadLocalJs(getContext(this), this.webviewControl)
-    // }, 100)
+    }, 200)
   }
   }
   onPageEnd: (url?: string) => void = () => {
   onPageEnd: (url?: string) => void = () => {
     Logger.debug(TAG, 'onPageEnd');
     Logger.debug(TAG, 'onPageEnd');

@@ -8,7 +8,7 @@ import media from '@ohos.multimedia.media';
 import { OperRowListView } from './view/OperRowListView';
 import { OperRowListView } from './view/OperRowListView';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { ContentConstants } from '../constants/ContentConstants';
 import { ContentConstants } from '../constants/ContentConstants';
-import { ProcessUtils } from '../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
 import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
 
 
 const TAG = 'DynamicDetailComponent'
 const TAG = 'DynamicDetailComponent'

 import { CompInfoBean, CompDTO, CompList } from  'wdBean'
 import { CompInfoBean, CompDTO, CompList } from  'wdBean'
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 /**
 /**
  * 播报--今日推荐列表
  * 播报--今日推荐列表
  */
  */

 import { CompInfoBean, CompDTO } from  'wdBean'
 import { CompInfoBean, CompDTO } from  'wdBean'
 import { DateTimeUtils } from 'wdKit/Index'
 import { DateTimeUtils } from 'wdKit/Index'
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 /**
 /**
  * 精选栏目
  * 精选栏目
  */
  */

 import { ContentDTO, slideShows } from 'wdBean';
 import { ContentDTO, slideShows } from 'wdBean';
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 
 

@@ -2,7 +2,7 @@
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { ContentDTO } from 'wdBean'
 import { ContentDTO } from 'wdBean'
 import { DateTimeUtils } from 'wdKit'
 import { DateTimeUtils } from 'wdKit'
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG = 'Card11Component';
 const TAG = 'Card11Component';
 
 

@@ -2,7 +2,7 @@ import { ContentDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 const TAG = 'Card12Component';
 const TAG = 'Card12Component';
 
 

@@ -2,7 +2,7 @@ import { ContentDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 const TAG = 'Card14Component';
 const TAG = 'Card14Component';
 
 

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';

@@ -2,7 +2,7 @@ import { ContentDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 const TAG = 'Card16Component';
 const TAG = 'Card16Component';
 
 

@@ -29,7 +29,8 @@ export struct Card17Component {
         // 三个图，
         // 三个图，
         GridRow({ gutter: 2 }) {
         GridRow({ gutter: 2 }) {
           GridCol({ span: { xs: 8 } }) {
           GridCol({ span: { xs: 8 } }) {
-            Image(this.contentDTO.fullColumnImgUrls[0].url)
+            Image(this.contentDTO.fullColumnImgUrls.length > 0 ?this.contentDTO.fullColumnImgUrls[0].url:'')
+              .backgroundColor('#f5f5f5')
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .aspectRatio(16 / 9)
               .borderRadius({
               .borderRadius({
@@ -39,7 +40,8 @@ export struct Card17Component {
           }
           }
 
 
           GridCol({ span: { xs: 4 } }) {
           GridCol({ span: { xs: 4 } }) {
-            Image(this.contentDTO.fullColumnImgUrls[1].url)
+            Image(this.contentDTO.fullColumnImgUrls.length > 1? this.contentDTO.fullColumnImgUrls[1].url:'')
+              .backgroundColor('#f5f5f5')
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .aspectRatio(16 / 9)
               .margin({ bottom: 1 })
               .margin({ bottom: 1 })
@@ -54,7 +56,8 @@ export struct Card17Component {
           }
           }
 
 
           GridCol({ span: { xs: 4 } }) {
           GridCol({ span: { xs: 4 } }) {
-            Image(this.contentDTO.fullColumnImgUrls[2].url)
+            Image(this.contentDTO.fullColumnImgUrls.length > 2? this.contentDTO.fullColumnImgUrls[2].url:'')
+              .backgroundColor('#f5f5f5')
               .width(CommonConstants.FULL_WIDTH)
               .width(CommonConstants.FULL_WIDTH)
               .aspectRatio(16 / 9)
               .aspectRatio(16 / 9)
               .margin({ top: 1 })
               .margin({ top: 1 })

 import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
 import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 
 
 const TAG = 'Card19Component';
 const TAG = 'Card19Component';

@@ -2,7 +2,7 @@ import { ContentDTO } from 'wdBean';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 const TAG = 'Card20Component';
 const TAG = 'Card20Component';
 
 
 /**
 /**

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { CommonConstants, CompStyle } from 'wdConstant';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { RmhTitle } from '../cardCommon/RmhTitle'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 
 

 //全标题 "appStyle":"2",
 //全标题 "appStyle":"2",
 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 
 
 /**
 /**

 import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
 import { ContentDTO, FullColumnImgUrlDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 const TAG: string = 'Card4Component';
 const TAG: string = 'Card4Component';
 
 

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 const TAG: string = 'Card5Component';
 const TAG: string = 'Card5Component';
 
 

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
 import { CommonConstants, CompStyle } from 'wdConstant';
 import { CommonConstants, CompStyle } from 'wdConstant';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 const TAG: string = 'Card6Component-Card13Component';
 const TAG: string = 'Card6Component-Card13Component';

 import { ContentDTO, slideShows } from 'wdBean';
 import { ContentDTO, slideShows } from 'wdBean';
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 /**
 /**
  * 时间链卡--CompStyle:  09
  * 时间链卡--CompStyle:  09

@@ -2,7 +2,7 @@ import { CompDTO, ContentDTO, } from 'wdBean';
 import { BreakpointConstants, CommonConstants, DurationEnum } from 'wdConstant';
 import { BreakpointConstants, CommonConstants, DurationEnum } from 'wdConstant';
 import { BreakPointType, Logger } from 'wdKit';
 import { BreakPointType, Logger } from 'wdKit';
 import { CompUtils } from '../../utils/CompUtils';
 import { CompUtils } from '../../utils/CompUtils';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } from '../view/EmptyComponent';
 
 
 const TAG = 'Zh_Carousel_Layout-01';
 const TAG = 'Zh_Carousel_Layout-01';

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { Logger } from 'wdKit/Index';
 import { Logger } from 'wdKit/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 
 
 const TAG = 'Zh_Grid_Layout-02';
 const TAG = 'Zh_Grid_Layout-02';

@@ -2,7 +2,7 @@ import { Action, CompDTO, ContentDTO, Params } from 'wdBean';
 import { CompStyle } from 'wdConstant';
 import { CompStyle } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterRule } from 'wdRouter';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 const TAG = 'Zh_Grid_Layout-03';
 const TAG = 'Zh_Grid_Layout-03';
 const FULL_PARENT: string = '100%';
 const FULL_PARENT: string = '100%';

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 const TAG = 'Zh_Single_Column-04';
 const TAG = 'Zh_Single_Column-04';
 
 

@@ -4,7 +4,7 @@ import { HttpUrlUtils } from 'wdNetwork/Index';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 /**
 /**
  * 小视频横划卡
  * 小视频横划卡

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { DateTimeUtils } from 'wdKit';
 import { DateTimeUtils } from 'wdKit';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 /**
 /**
  * 本地精选卡
  * 本地精选卡

@@ -5,7 +5,7 @@ import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 /**
 /**
  * 精选评论卡
  * 精选评论卡

 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import MinePageMoreFunctionModel from '../../viewmodel/MinePageMoreFunctionModel'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
 import { WDRouterRule, WDRouterPage } from 'wdRouter'
-import { Action, Params } from 'wdBean';
-import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
+import { Params } from 'wdBean';
 
 
 @Component
 @Component
 export default struct MinePageMoreFunctionUI {
 export default struct MinePageMoreFunctionUI {
@@ -70,18 +69,12 @@ export default struct MinePageMoreFunctionUI {
           }
           }
           .onClick(() => {
           .onClick(() => {
             console.log(index + "")
             console.log(index + "")
-            if (index == 0) {
-              // WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
-            } else if (index == 1) {
-              // WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
-            } else if (index == 2) {
-
-            } else if (index == 3) { //设置
+            if (item.msg == "设置") { //设置
               let params: Params = {
               let params: Params = {
                 pageID: 'mainSetting'
                 pageID: 'mainSetting'
               }
               }
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
               WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
-            }else if (index == 4) { // 关于
+            }else if (item.msg == "关于") { // 关于
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
               WDRouterRule.jumpWithPage(WDRouterPage.aboutPage)
             }
             }
           })
           })

@@ -3,7 +3,7 @@ import { CommonConstants, ConfigConstants, ScreenType } from 'wdConstant';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { CompUtils } from '../../utils/CompUtils';
 import { CompUtils } from '../../utils/CompUtils';
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterRule } from 'wdRouter';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 const TAG: string = 'CardView';
 const TAG: string = 'CardView';
 
 

@@ -51,11 +51,7 @@ struct EditUserIntroductionPage {
         .borderRadius(5)
         .borderRadius(5)
         .margin(30)
         .margin(30)
         .onClick(()=>{
         .onClick(()=>{
-          let currentUserInfo:editModel = new editModel()
-          currentUserInfo.userExtend.introduction = this.introduction
-          currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
-          this.updateEditModel(currentUserInfo)
-
+          this.updateEditModel()
           let params: editModelParams = {
           let params: editModelParams = {
             introduction: this.introduction
             introduction: this.introduction
           }
           }
@@ -68,7 +64,10 @@ struct EditUserIntroductionPage {
   }
   }
 
 
 
 
-  updateEditModel(Info:editModel){
-    EditInfoViewModel.updateUserInfo(Info)
+  updateEditModel(){
+    let currentUserInfo:editModel = new editModel()
+    currentUserInfo.userExtend.introduction = this.introduction
+    currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_intro
+    EditInfoViewModel.updateUserInfo(currentUserInfo)
   }
   }
 }
 }

@@ -2,6 +2,8 @@ import { CustomTitleUI } from '../reusable/CustomTitleUI'
 import router from '@ohos.router'
 import router from '@ohos.router'
 import { editModel, editModelParams, WDEditDataModelType } from '../../model/EditInfoModel'
 import { editModel, editModelParams, WDEditDataModelType } from '../../model/EditInfoModel'
 import EditInfoViewModel from '../../viewmodel/EditInfoViewModel';
 import EditInfoViewModel from '../../viewmodel/EditInfoViewModel';
+// import { encryptMessage } from '../../../utils/cryptoUtil'
+import { encryptMessage } from 'wdLogin/src/main/ets/utils/cryptoUtil'
 @Entry
 @Entry
 @Component
 @Component
 struct EditUserNikeNamePage {
 struct EditUserNikeNamePage {
@@ -51,13 +53,17 @@ struct EditUserNikeNamePage {
         .borderRadius(5)
         .borderRadius(5)
         .margin(30)
         .margin(30)
         .onClick(()=>{
         .onClick(()=>{
-
           ///内部更新
           ///内部更新
+          this.updateEditModel()
+        })
+    }
+  }
+
+   async  updateEditModel(){
      let currentUserInfo:editModel = new editModel()
      let currentUserInfo:editModel = new editModel()
-          currentUserInfo.userExtend.introduction = this.nikeName
+     currentUserInfo.userName = await encryptMessage(this.nikeName);
      currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
      currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_nickname
-          this.updateEditModel(currentUserInfo)
-
+     EditInfoViewModel.updateUserInfo(currentUserInfo).then(()=>{
        let params: editModelParams = {
        let params: editModelParams = {
          userName: this.nikeName
          userName: this.nikeName
        }
        }
@@ -67,9 +73,4 @@ struct EditUserNikeNamePage {
        })
        })
      })
      })
   }
   }
-  }
-
-  updateEditModel(Info:editModel){
-    EditInfoViewModel.updateUserInfo(Info)
-  }
 }
 }

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import RefreshLayout from '../page/RefreshLayout';
 import RefreshLayout from '../page/RefreshLayout';

 import { ContentDTO } from 'wdBean';
 import { ContentDTO } from 'wdBean';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import RefreshLayout from '../page/RefreshLayout';
 import RefreshLayout from '../page/RefreshLayout';

 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 import { CardParser } from '../CardParser';
 import { CardParser } from '../CardParser';
 
 
 const TAG: string = 'BigPicCardComponent';
 const TAG: string = 'BigPicCardComponent';

 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
 import { ContentDTO, CompDTO } from 'wdBean'
 import { ContentDTO, CompDTO } from 'wdBean'
-import { ProcessUtils } from '../../utils/ProcessUtils';
+import { ProcessUtils } from 'wdRouter';
 
 
 @Component
 @Component
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {

@@ -7,7 +7,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { LiveModel } from '../../viewmodel/LiveModel'
 import { LiveModel } from '../../viewmodel/LiveModel'
 import { ContentConstants } from '../../constants/ContentConstants'
 import { ContentConstants } from '../../constants/ContentConstants'
-import { ProcessUtils } from '../../utils/ProcessUtils'
+import { ProcessUtils } from 'wdRouter';
 
 
 @Component
 @Component
 export struct LiveHorizontalCardComponent {
 export struct LiveHorizontalCardComponent {

-import { Action, ContentDTO, Params } from 'wdBean';
-import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
-import { Logger } from 'wdKit';
-import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
-import { WDRouterRule } from 'wdRouter';
-import { ContentConstants } from '../constants/ContentConstants';
-import { LiveModel } from '../viewmodel/LiveModel';
-
-const TAG = 'ProcessUtils';
-
-/**
- * 页面跳转业务封装
- */
-export class ProcessUtils {
-  /**
-   * 页面跳转
-   */
-  static processPage(content: ContentDTO) {
-    if (content == null) {
-      Logger.error(TAG, "processPage, content is null");
-      return;
-    }
-    if (StringUtils.isEmpty(content.objectType)) {
-      Logger.error(TAG, "processPage, objectType is empty");
-      return;
-    }
-    let type = content.objectType;
-    console.log(TAG,'objectType',`${JSON.stringify(content)}`);
-    switch (type) {
-      case ContentConstants.TYPE_NONE:
-        Logger.debug(TAG, "processPage, do nothing");
-        break;
-      case ContentConstants.TYPE_VOD:
-        Logger.debug(TAG, "processPage, nonsupport!!!");
-        ProcessUtils.gotoVod(content)
-        break;
-      case ContentConstants.TYPE_LIVE:
-        ProcessUtils.gotoLive(content)
-        break
-      case ContentConstants.TYPE_AUDIO:
-        ProcessUtils.gotoAudio(content)
-        break;
-      case ContentConstants.TYPE_TELETEXT:
-      // 图文详情，跳转h5
-        ProcessUtils.gotoWeb(content);
-        break;
-      case ContentConstants.TYPE_LINK:
-        ProcessUtils.gotoDefaultWeb(content);
-        break;
-    //图集详情页
-      case ContentConstants.TYPE_NINE:
-        ProcessUtils.gotoAtlasDetailPage(content);
-        break;
-      case ContentConstants.TYPE_SPECIAL_TOPIC:
-      // 专题详情，跳转h5
-        ProcessUtils.gotoSpecialTopic(content);
-        break;
-    //动态详情页（动态图文）
-      case ContentConstants.TYPE_FOURTEEN:
-    //动态详情页（动态视频）
-      case ContentConstants.TYPE_FIFTEEN:
-        ProcessUtils.gotoDynamicDetailPage(content);
-        break;
-      default:
-        break;
-    }
-  }
-
-  /**
-   * 动态详情页（动态视频/动态图片）
-   * @param content
-   * */
-  private static gotoDynamicDetailPage(content: ContentDTO) {
-    let taskAction: Action = {
-      type: 'JUMP_DETAIL_PAGE',
-      params: {
-        detailPageType: Number.parseInt(content.objectType),
-        contentID: content?.objectId,
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-        } as ExtraDTO
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoDynamicDetailPage, ${content.objectId}`);
-  }
-
-  /**
-   * 图集详情页
-   * @param content
-   * */
-  private static gotoAtlasDetailPage(content: ContentDTO) {
-    let taskAction: Action = {
-      type: 'JUMP_DETAIL_PAGE',
-      params: {
-        detailPageType: 17,
-        contentID: content?.objectId,
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-        } as ExtraDTO
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoAtlasDetailPage, ${content.objectId}`);
-  }
-
-  private static gotoSpecialTopic(content: ContentDTO) {
-    let taskAction: Action = {
-      type: 'JUMP_INNER_NEW_PAGE',
-      params: {
-        url: content.linkUrl,
-        pageID: 'SPACIAL_TOPIC_PAGE',
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-  }
-
-  private static gotoDefaultWeb(content: ContentDTO) {
-    let taskAction: Action = {
-      type: 'JUMP_H5_BY_WEB_VIEW',
-      params: {
-        url: content.linkUrl,
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoWeb, ${content.objectId}`);
-  }
-
-  private static gotoWeb(content: ContentDTO) {
-    //  // topicId
-    // content.channelId;
-    // content.linkUrl;
-    // content.objectId;
-    // // CompId
-    // content.relId;
-    // content.relType;
-    // // ScrollToBottom
-    // // FromPage
-    let taskAction: Action = {
-      type: 'JUMP_INNER_NEW_PAGE',
-      params: {
-        contentID: content?.objectId,
-        pageID: 'IMAGE_TEXT_DETAIL',
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-          channelId: content?.channelId,
-          sourcePage: '5'
-        } as ExtraDTO
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoWeb, ${content.objectId}`);
-  }
-
-  private static gotoVod(content: ContentDTO) {
-    let taskAction: Action = {
-      type: 'JUMP_DETAIL_PAGE',
-      params: {
-        detailPageType: 7,
-        contentID: content?.objectId,
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-        } as ExtraDTO
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoVod, ${content.objectId}`);
-  }
-
-  private static async gotoLive(content: ContentDTO) {
-    const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
-    const liveStyle = liveDetail[0].liveInfo.liveStyle
-    const liveState = liveDetail[0].liveInfo.liveState
-
-
-    console.error('liveDetail===', liveDetail)
-
-
-    let taskAction: Action = {
-      type: 'JUMP_DETAIL_PAGE',
-      params: {
-        detailPageType: 2,
-        contentID: content?.objectId,
-        liveStyle: liveState === 'wait' ? 0 : liveStyle,
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-        } as ExtraDTO
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoLive, ${content.objectId}`);
-  }
-
-  private static gotoAudio(content: ContentDTO) {
-    let taskAction: Action = {
-      type: 'JUMP_DETAIL_PAGE',
-      params: {
-        detailPageType: 13,
-        contentID: content?.objectId,
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-        } as ExtraDTO
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    Logger.debug(TAG, `gotoAudio, ${content.objectId}`);
-  }
-}

@@ -53,8 +53,12 @@ class MyCollectionViewModel {
       let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
       let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders()
       WDHttp.post<ResponseDTO>(HttpUrlUtils.getExecuteCollcetUrl(),params,headers).then((navResDTO: ResponseDTO) => {
       WDHttp.post<ResponseDTO>(HttpUrlUtils.getExecuteCollcetUrl(),params,headers).then((navResDTO: ResponseDTO) => {
         if (navResDTO.code == 0) {
         if (navResDTO.code == 0) {
+          if(params.status === 1){
+            promptAction.showToast({ message: '收藏成功' })
+          } else {
             promptAction.showToast({ message: '删除成功' })
             promptAction.showToast({ message: '删除成功' })
           }
           }
+        }
       })
       })
         .catch((error: Error) => {
         .catch((error: Error) => {
           Logger.info(TAG,'executeCollcet','ResponseDTO')
           Logger.info(TAG,'executeCollcet','ResponseDTO')