Merge remote-tracking branch 'origin/main'

@@ -2,8 +2,8 @@
   "app": {
   "app": {
     "bundleName": "com.peopledailychina.hosactivity",
     "bundleName": "com.peopledailychina.hosactivity",
     "vendor": "$string:app_vendor",
     "vendor": "$string:app_vendor",
-    "versionCode": 7399,
-    "versionName": "7.3.9.9",
+    "versionCode": 7401,
+    "versionName": "7.4.0.1",
     "icon": "$media:app_icon",
     "icon": "$media:app_icon",
     "label": "$string:app_name"
     "label": "$string:app_name"
   }
   }

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdconstant",
+  "name": "wdConstant",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdjsbridge",
+  "name": "wdJsBridge",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdkit",
+  "name": "wdKit",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdnetwork",
+  "name": "wdNetwork",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdrouter",
+  "name": "wdRouter",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -3,7 +3,7 @@ import { RetryHolderManager } from '@ohos/imageknife/src/main/ets/components/ima
 import App from '@system.app'
 import App from '@system.app'
 import { Action, Params } from 'wdBean/Index'
 import { Action, Params } from 'wdBean/Index'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
-import { Logger } from 'wdKit/Index'
+import { Logger, SPHelper } from 'wdKit/Index'
 import { ContentType } from '../common/ContentType'
 import { ContentType } from '../common/ContentType'
 import { WDRouterRule } from '../router/WDRouterRule'
 import { WDRouterRule } from '../router/WDRouterRule'
 import HomeChannelUtils from './HomeChannelUtils'
 import HomeChannelUtils from './HomeChannelUtils'
@@ -127,6 +127,8 @@ export class AppInnerLink {
     if (params.type == "topic" && params.subType == "audio_news") {
     if (params.type == "topic" && params.subType == "audio_news") {
     }
     }
     if (params.type == "topic" && params.subType == "moring_evening_news") {
     if (params.type == "topic" && params.subType == "moring_evening_news") {
+      ///解决早晚报切换不更新问题，内部更新id
+      SPHelper.default.deleteSync('dailyPaperTopicPageId');
       ProcessUtils.gotoMorningEveningPaper()
       ProcessUtils.gotoMorningEveningPaper()
     }
     }
 
 

 {
 {
-  "name": "wdsharebase",
+  "name": "wdShareBase",
   "version": "1.0.0",
   "version": "1.0.0",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdwebcomponent",
+  "name": "wdWebComponent",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -197,6 +197,8 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
         ProcessUtils.processPage(content)
         ProcessUtils.processPage(content)
       }
       }
       if (urlParams.get('subType') === 'moring_evening_news') {
       if (urlParams.get('subType') === 'moring_evening_news') {
+        ///解决早晚报切换不更新问题，内部更新id
+        SPHelper.default.deleteSync('dailyPaperTopicPageId');
         ProcessUtils.gotoMorningEveningPaper()
         ProcessUtils.gotoMorningEveningPaper()
       }
       }
       if (urlParams.get('subType') === 'electronic_newspapers') {
       if (urlParams.get('subType') === 'electronic_newspapers') {

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdbean",
+  "name": "wdBean",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdcomponent",
+  "name": "wdComponent",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -30,7 +30,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { PageRepository } from '../repository/PageRepository';
 import { PageRepository } from '../repository/PageRepository';
 import { OperRowListView } from './view/OperRowListView';
 import { OperRowListView } from './view/OperRowListView';
 import { CommentDialogView } from './CommentDialogView';
 import { CommentDialogView } from './CommentDialogView';
-import { CustomTitleUI } from 'wdcomponent/ets/components/reusable/CustomTitleUI';
+import { CustomTitleUI } from './reusable/CustomTitleUI';
 
 
 const TAG = 'H5NewsWebPageComponent'
 const TAG = 'H5NewsWebPageComponent'
 
 

@@ -452,7 +452,7 @@ export struct MorningEveningPaperComponent {
           })
           })
       }
       }
       .height('100%')
       .height('100%')
-      .width('20%')
+      .width(63)
       .onClick(() => {
       .onClick(() => {
       })
       })
     }
     }

 import { ContentDTO } from 'wdBean/Index'
 import { ContentDTO } from 'wdBean/Index'
-import { DateTimeUtils, StringUtils, UserDataLocal } from 'wdKit/Index'
+import { DateTimeUtils, SPHelper, StringUtils, UserDataLocal } from 'wdKit/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { CommentLikeOperationRequestItem } from '../../../viewmodel/CommentLikeOperationRequestItem'
 import { CommentLikeOperationRequestItem } from '../../../viewmodel/CommentLikeOperationRequestItem'
 import { CommentListItem } from '../../../viewmodel/CommentListItem'
 import { CommentListItem } from '../../../viewmodel/CommentListItem'
 import measure from '@ohos.measure'
 import measure from '@ohos.measure'
 import { TrackConstants, TrackingContent, TrackParamConvert } from 'wdTracking/Index'
 import { TrackConstants, TrackingContent, TrackParamConvert } from 'wdTracking/Index'
-import { ProcessUtils } from 'wdRouter/Index'
+import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter/Index'
+import { SpConstants } from 'wdConstant'
 
 
 @Component
 @Component
 export struct ChildCommentComponent {
 export struct ChildCommentComponent {
@@ -221,6 +222,11 @@ export struct ChildCommentComponent {
   }
   }
 
 
   commentLikeOperation() {
   commentLikeOperation() {
+    let userid = SPHelper.default.getSync(SpConstants.USER_ID,"") as string
+    if (!userid) {
+      WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+      return
+    }
     let item = new CommentLikeOperationRequestItem(this.data.targetId, this.data.id + "", this.data.targetType + "", UserDataLocal.getUserName(), UserDataLocal.getUserHeaderUrl(), this.data.like_status === 0 ? 1 : 0)
     let item = new CommentLikeOperationRequestItem(this.data.targetId, this.data.id + "", this.data.targetType + "", UserDataLocal.getUserName(), UserDataLocal.getUserHeaderUrl(), this.data.like_status === 0 ? 1 : 0)
     MinePageDatasModel.getCommentLikeOperation(item, getContext(this)).then((value) => {
     MinePageDatasModel.getCommentLikeOperation(item, getContext(this)).then((value) => {
       if (value != null) {
       if (value != null) {

@@ -82,7 +82,7 @@ export struct MessageListItemUI {
       Text().backgroundColor($r('app.color.color_EDEDED'))
       Text().backgroundColor($r('app.color.color_EDEDED'))
         .width('100%')
         .width('100%')
         .height(1)
         .height(1)
-        .visibility(this.index != 3 ?Visibility.Visible:Visibility.None)
+        // .visibility(this.index != 3 ?Visibility.Visible:Visibility.None)
     }
     }
   }
   }
 
 

@@ -202,7 +202,7 @@ export struct MessageListUI {
               break;
               break;
           }
           }
         })
         })
-        .height(80)
+        .height(81)
         .width("100%")
         .width("100%")
       })
       })
     }
     }

-import { CommonConstants, ViewType } from 'wdConstant';
+import { BottomNavi, CommonConstants, ViewType } from 'wdConstant';
 import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
 import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
@@ -43,7 +43,7 @@ export struct PageComponent {
   // 国殇灰度管理
   // 国殇灰度管理
   GrayManage: SubscribedAbstractProperty<GrayManageModel> =  AppStorage.link<GrayManageModel>('GrayManage')
   GrayManage: SubscribedAbstractProperty<GrayManageModel> =  AppStorage.link<GrayManageModel>('GrayManage')
   @State netStatus: number | undefined = undefined // 存储网络状态
   @State netStatus: number | undefined = undefined // 存储网络状态
-  isRMH:boolean = false
+  bottomNavi:BottomNavi = BottomNavi.NEWS
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -286,7 +286,7 @@ export struct PageComponent {
 
 
     //人民号推荐 监听登录事件（刷新页面）
     //人民号推荐 监听登录事件（刷新页面）
     EmitterUtils.receiveEvent(EmitterEventId.LOGIN_SUCCESS, () => {
     EmitterUtils.receiveEvent(EmitterEventId.LOGIN_SUCCESS, () => {
-      if(this.navIndex === this.currentTopNavSelectedIndex && this.isRMH){
+      if(this.navIndex === this.currentTopNavSelectedIndex && this.bottomNavi == BottomNavi.PEOPLE){
         this.listScroller.scrollEdge(Edge.Top)
         this.listScroller.scrollEdge(Edge.Top)
         this.pageModel.viewType = ViewType.LOADING;
         this.pageModel.viewType = ViewType.LOADING;
         this.getData()
         this.getData()
@@ -298,9 +298,21 @@ export struct PageComponent {
   onChange() {
   onChange() {
     // console.log(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
     // console.log(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
     // 注册监听网络连接
     // 注册监听网络连接
-    this.netStatus = undefined
-    let netStatus = NetworkUtil.isNetConnected()
-    if (netStatus) {
+    if(this.bottomNavi == BottomNavi.VIDEO){
+      this.netStatus = undefined
+      let netStatus = NetworkUtil.isNetConnected()
+      if (netStatus) {
+        if (this.navIndex === this.currentTopNavSelectedIndex) {
+          // console.log(TAG, 'page onAutoRefresh111 ' + this.needload)
+          if (this.needload) {
+            this.getData();
+          }
+          this.needload = false;
+        }
+      } else {
+        this.pageModel.viewType = ViewType.NoNetwork;
+      }
+    }else{
       if (this.navIndex === this.currentTopNavSelectedIndex) {
       if (this.navIndex === this.currentTopNavSelectedIndex) {
         // console.log(TAG, 'page onAutoRefresh111 ' + this.needload)
         // console.log(TAG, 'page onAutoRefresh111 ' + this.needload)
         if (this.needload) {
         if (this.needload) {
@@ -308,9 +320,8 @@ export struct PageComponent {
         }
         }
         this.needload = false;
         this.needload = false;
       }
       }
-    } else {
-      this.pageModel.viewType = ViewType.NoNetwork;
     }
     }
+
   }
   }
 
 
   async onAutoRefresh() {
   async onAutoRefresh() {

@@ -7,7 +7,7 @@ import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/I
 import { TitleBackComponent } from '../setting/TitleBackComponent';
 import { TitleBackComponent } from '../setting/TitleBackComponent';
 
 
 const TAG = 'PrivacySettingPage';
 const TAG = 'PrivacySettingPage';
-const DiyString = '开启个性化推荐'
+const DiyString = '开启个性推荐'
 const DiyCloseTipsString = '关闭后，将不会使用你的偏好进行内容推荐'
 const DiyCloseTipsString = '关闭后，将不会使用你的偏好进行内容推荐'
 
 
 @Entry
 @Entry

@@ -15,6 +15,7 @@ import { GrayManageModel } from '../../viewmodel/GrayManageModel';
 import { ColorUtils } from '../../utils/ColorUtils';
 import { ColorUtils } from '../../utils/ColorUtils';
 import { ImageKnifeComponent } from '@ohos/imageknife';
 import { ImageKnifeComponent } from '@ohos/imageknife';
 import { CommonUtils } from '../../utils/CommonUtils';
 import { CommonUtils } from '../../utils/CommonUtils';
+import { BottomNavi } from 'wdConstant';
 
 
 const TAG = 'TopNavigationComponent';
 const TAG = 'TopNavigationComponent';
 
 
@@ -97,10 +98,10 @@ export struct TopNavigationComponentNew {
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                   if (CompUtils.isNews(this.navItem)) {
                   if (CompUtils.isNews(this.navItem)) {
                     this.createPageComponent(navItem, index,
                     this.createPageComponent(navItem, index,
-                      (channelId) => this.GrayManage.get().isNewsMourning(channelId),false);
+                      (channelId) => this.GrayManage.get().isNewsMourning(channelId),BottomNavi.NEWS);
                   } else if (CompUtils.isRMH(this.navItem)) {
                   } else if (CompUtils.isRMH(this.navItem)) {
                     this.createPageComponent(navItem, index,
                     this.createPageComponent(navItem, index,
-                      (channelId) => this.GrayManage.get().isRmhMourning(channelId),true);
+                      (channelId) => this.GrayManage.get().isRmhMourning(channelId),BottomNavi.PEOPLE);
                   }
                   }
 
 
                 } else {
                 } else {
@@ -165,7 +166,7 @@ export struct TopNavigationComponentNew {
 
 
   }
   }
   @Builder
   @Builder
-   createPageComponent(navItem: TopNavDTO, index: number, mourningCheckFn: (channelId: string) => boolean,isRMH:boolean = false) {
+   createPageComponent(navItem: TopNavDTO, index: number, mourningCheckFn: (channelId: string) => boolean,bottomNavi:BottomNavi = BottomNavi.NEWS) {
     PageComponent({
     PageComponent({
       currentTopNavSelectedIndex: this.currentTopNavSelectedIndex,
       currentTopNavSelectedIndex: this.currentTopNavSelectedIndex,
       navIndex: index,
       navIndex: index,
@@ -173,7 +174,7 @@ export struct TopNavigationComponentNew {
       channelId: navItem?.channelId + '',
       channelId: navItem?.channelId + '',
       autoRefresh: this.autoRefresh2Page,
       autoRefresh: this.autoRefresh2Page,
       isMourning: mourningCheckFn(`${navItem.channelId}`),
       isMourning: mourningCheckFn(`${navItem.channelId}`),
-      isRMH:isRMH
+      bottomNavi:bottomNavi
     })
     })
       // .margin({
       // .margin({
       //   left: 6,
       //   left: 6,

@@ -363,14 +363,6 @@ export struct AccountAndSecurityLayout {
             .padding({ top: 32, left: "31lpx", right: "31lpx" })
             .padding({ top: 32, left: "31lpx", right: "31lpx" })
             .width('100%')
             .width('100%')
         }
         }
-        Text('请注意：注销后7天内不能再次注册人民日报客户端，需要等到账号冷静期结束才能再次登录注册')
-          .fontColor('#ED2800')
-          .fontSize(14)
-          .fontWeight(400)
-          .lineHeight(20)
-          .padding({ top: 32, left: 16, right: 16 })
-          .width('100%')
-
       }.alignRules({
       }.alignRules({
         top: { anchor: "__container__", align: VerticalAlign.Top },
         top: { anchor: "__container__", align: VerticalAlign.Top },
         left: { anchor: "__container__", align: HorizontalAlign.Start },
         left: { anchor: "__container__", align: HorizontalAlign.Start },

@@ -96,7 +96,7 @@ export struct MineSettingComponent {
     Column(){
     Column(){
       TitleBackComponent({title:"设置"})
       TitleBackComponent({title:"设置"})
       this.settingList()
       this.settingList()
-    }
+    }.height('100%').backgroundColor(Color.White)
   }
   }
 
 
   // 页面布局
   // 页面布局
@@ -122,7 +122,7 @@ export struct MineSettingComponent {
                 Divider()
                 Divider()
                   .color('#f0f0f0')
                   .color('#f0f0f0')
                   .strokeWidth(5)
                   .strokeWidth(5)
-              } else if(index !== this.listData.length - 1) {
+              } else {
                 Divider()
                 Divider()
                   .color('#f0f0f0')
                   .color('#f0f0f0')
                   .strokeWidth(1)
                   .strokeWidth(1)

+import { GradeSpan } from './span/GradeSpan';
+import { image } from '@kit.ImageKit';
+import { LengthMetrics } from '@kit.ArkUI';
+import { StringUtils } from 'wdKit';
+
+@Component
+export struct UserGradeTextSpan{
+  @Watch('contentChange')  @Prop nameContent:string = ""
+  @Watch('contentChange') @Prop gradeContent:string = ""
+  @Watch('contentChange') @Prop gradeWidth:number = 50
+
+  taskId:number = -1
+
+  customSpan3: GradeSpan | undefined = undefined;
+  style1: MutableStyledString | undefined = undefined;
+
+  imagePixelMap: image.PixelMap | undefined = undefined;
+
+  textController: TextController = new TextController();
+
+  private async getPixmapFromMedia(resource: Resource) {
+    let unit8Array = await getContext(this)?.resourceManager?.getMediaContent({
+      bundleName: resource.bundleName,
+      moduleName: resource.moduleName,
+      id: resource.id
+    });
+    let imageSource = image.createImageSource(unit8Array.buffer.slice(0, unit8Array.buffer.byteLength));
+    let createPixelMap: image.PixelMap = await imageSource.createPixelMap({
+      desiredPixelFormat: image.PixelMapFormat.RGBA_8888,
+      desiredSize: { width: vp2px(this.gradeWidth), height: vp2px(18) }
+    });
+    await imageSource.release();
+    return createPixelMap;
+  }
+
+  contentChange(){
+    if(this.taskId != -1){
+      clearTimeout(this.taskId)
+    }
+    this.taskId = setTimeout(() => {
+      this.createSpan()
+    }, 100);
+
+  }
+
+  async createSpan(){
+    if(StringUtils.isEmpty(this.nameContent)){
+      return
+    }
+    this.imagePixelMap = await this.getPixmapFromMedia($r('app.media.my_grade_bg'))
+    this.customSpan3 = new GradeSpan(this.gradeContent, this.gradeWidth, 18,this.imagePixelMap);
+    this.style1 = new MutableStyledString(this.customSpan3);
+
+    let name:MutableStyledString = new MutableStyledString(this.nameContent, [
+      {
+        start: 0,
+        length: 100,
+        styledKey: StyledStringKey.FONT,
+        styledValue: new TextStyle({ fontColor: Color.White,fontWeight: 500,fontSize: LengthMetrics.px(vp2px(20)) })
+      }])
+
+    name.appendStyledString(new StyledString(this.customSpan3))
+    this.textController.setStyledString(name)
+  }
+
+
+  aboutToAppear() {
+    this.createSpan()
+  }
+
+  build() {
+    Text(undefined, { controller: this.textController })
+      .copyOption(CopyOptions.InApp)
+      .maxLines(2)
+  }
+}

+import { drawing } from '@kit.ArkGraphics2D';
+import { image } from '@kit.ImageKit';
+
+export class GradeSpan extends CustomSpan {
+  width: number = 160;
+  word: string = "";
+  height: number = 10;
+  imagePixelMap: image.PixelMap | undefined = undefined;
+
+
+  constructor(word: string, width: number, height: number,imagePixelMap: image.PixelMap) {
+    super();
+    this.word = word;
+    this.width = width;
+    this.height = height;
+    this.imagePixelMap = imagePixelMap;
+  }
+
+  onMeasure(measureInfo: CustomSpanMeasureInfo): CustomSpanMetrics {
+    return { width: this.width, height: this.height };
+  }
+
+  onDraw(context: DrawContext, options: CustomSpanDrawInfo) {
+    let canvas = context.canvas;
+
+    const brush = new drawing.Brush();
+
+    canvas.attachBrush(brush);
+    let options2 = new drawing.SamplingOptions(drawing.FilterMode.FILTER_MODE_NEAREST);
+    if (this.imagePixelMap) {
+      canvas.drawImage(this.imagePixelMap, options.x , options.lineBottom - vp2px(this.height) - 10, options2);
+    }
+
+    brush.setColor({ alpha: 255, red: 237, green: 40, blue: 0 });
+    canvas.attachBrush(brush);
+
+    const font = new drawing.Font();
+    font.setSize(vp2px(12));
+    const textBlob = drawing.TextBlob.makeFromString(this.word, font, drawing.TextEncoding.TEXT_ENCODING_UTF8);
+    // canvas.drawTextBlob(textBlob, options.x + 20, options.lineBottom - 15);
+    canvas.drawTextBlob(textBlob, options.x + vp2px(9), options.lineBottom - vp2px(7.5));
+
+    canvas.detachBrush();
+  }
+
+  setWord(word: string) {
+    this.word = word;
+  }
+
+}

@@ -8,6 +8,7 @@ import MinePageDatasModel from '../model/MinePageDatasModel';
 import { EmptyComponent } from '../components/view/EmptyComponent';
 import { EmptyComponent } from '../components/view/EmptyComponent';
 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
 import { TrackingPageBrowse, TrackConstants, TrackingButton, ParamType, Tracking } from 'wdTracking/Index';
 import { TrackingPageBrowse, TrackConstants, TrackingButton, ParamType, Tracking } from 'wdTracking/Index';
+import { UserGradeTextSpan } from '../components/view/UserGradeTextSpan';
 
 
 const  TAG = "MineHomePage"
 const  TAG = "MineHomePage"
 
 
@@ -121,37 +122,17 @@ struct MineHomePage {
 
 
                   Column() {
                   Column() {
                     Row() {
                     Row() {
-                      Text(`${this.userName}`)
-                        .fontColor($r('app.color.white'))
-                        .maxLines(2)
-                        .textOverflow({ overflow: TextOverflow.Ellipsis })
-                        .fontSize(20)
-                        .lineHeight(26)
-                        .fontWeight(500)
-                        .constraintSize({maxWidth:180})
-                        .onClick(()=>{
-                          let params: editModelParams = {
-                            editContent: this.userName
-                          }
-                          WDRouterRule.jumpWithPage(WDRouterPage.editUserNikeNamePage,params)
-                        })
-
-                      if(this.levelId>0){
-                        Text(`等级${this.levelId}`)
-                          .fontColor($r('app.color.color_ED2800'))
-                          .fontSize(12)
-                          .lineHeight(18)
-                          .fontWeight(500)
-                          .margin({ left: 6 })
-                          .backgroundImage($r("app.media.my_grade_bg"))
-                          .backgroundImageSize(ImageSize.Cover)
-                          .padding({left: 6,right: 6})
-                          .height(18)
-                          .borderRadius({topRight:2,bottomRight:2})
-                      }
 
 
-                      Blank()
-                    }
+                      UserGradeTextSpan({nameContent:`${this.userName}`,gradeContent:`等级${this.levelId}`,gradeWidth:this.levelId >9 ? 50 : 45})
+
+                    }.constraintSize({maxWidth:`calc(100% - 16vp - 90vp)`})
+                    .padding({top:8})
+                    .onClick(()=>{
+                      let params: editModelParams = {
+                        editContent: this.userName
+                      }
+                      WDRouterRule.jumpWithPage(WDRouterPage.editUserNikeNamePage,params)
+                    })
 
 
                     Row() {
                     Row() {
                       Row() {
                       Row() {

@@ -205,9 +205,10 @@ struct OtherNormalUserHomePage {
                   .justifyContent(FlexAlign.Center)
                   .justifyContent(FlexAlign.Center)
                   .width('100%')
                   .width('100%')
                   .backgroundColor($r('app.color.white'))
                   .backgroundColor($r('app.color.white'))
+
+                  //间隔符
+                  Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
                 }
                 }
-                //间隔符
-                Divider().width('100%').height('12lpx').color($r('app.color.color_F5F5F5')).strokeWidth('12lpx')
 
 
                 //tab 页面
                 //tab 页面
                 Stack({ alignContent: Alignment.Top }){
                 Stack({ alignContent: Alignment.Top }){
@@ -367,12 +368,10 @@ struct OtherNormalUserHomePage {
         .lineHeight('38lpx')
         .lineHeight('38lpx')
 
 
       if(this.currentIndex === index){
       if(this.currentIndex === index){
-        Divider()
-          .width('31lpx')
-          .height('4lpx')
-          .color('#ED2800')
-          .strokeWidth('4lpx')
-          .margin({top:'50lpx'})
+        Image($r('app.media.icon_channel_active'))//.colorFilter(ColorUtils.getDrawingColorFilter(this.getBothColor("")))
+          .width(16)
+          .height(2)
+          .margin({top: 30})
           .id("divTag")
           .id("divTag")
       }
       }
     }.onClick(()=>{
     }.onClick(()=>{

@@ -46,6 +46,7 @@ export class AudioSuspensionModel {
     // BackgroundAudioController.sharedController().startContinuousTask()
     // BackgroundAudioController.sharedController().startContinuousTask()
     BackgroundAudioController.sharedController().listenPlayEvents()
     BackgroundAudioController.sharedController().listenPlayEvents()
     await BackgroundAudioController.sharedController().setSessionMetaData(srcContentId ?? "", srcTitle, $r("app.media.system_audio_icon_bk_center"), srcSource ?? "")
     await BackgroundAudioController.sharedController().setSessionMetaData(srcContentId ?? "", srcTitle, $r("app.media.system_audio_icon_bk_center"), srcSource ?? "")
+    BackgroundAudioController.sharedController().activateSession()
     BackgroundAudioController.sharedController().stopUseFeatures()
     BackgroundAudioController.sharedController().stopUseFeatures()
 
 
     if (this.playerController.get().getUrl() === url) {
     if (this.playerController.get().getUrl() === url) {

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wddetailplayapi",
+  "name": "wdDetailPlayApi",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wddetailplaylive",
+  "name": "wdDetailPlayLive",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wddetailplayshortvideo",
+  "name": "wdDetailPlayShortVideo",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

 {
 {
-  "name": "wdhwability",
+  "name": "wdHwAbility",
   "version": "1.0.0",
   "version": "1.0.0",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
@@ -7,7 +7,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "packageType": "InterfaceHar",
   "packageType": "InterfaceHar",
   "dependencies": {
   "dependencies": {
-    "library": "file:./src/main/ets/getuiPush/GT-HM-1.0.4.har",
+    "GtSDK": "file:./src/main/ets/getuiPush/GT-HM-1.0.4.har",
     "neonui":"file:./src/main/ets/voiceRecognizer/neonui.har",
     "neonui":"file:./src/main/ets/voiceRecognizer/neonui.har",
     "wdConstant": "file:../../commons/wdConstant",
     "wdConstant": "file:../../commons/wdConstant",
     "wdLogin": "file:../../features/wdLogin",
     "wdLogin": "file:../../features/wdLogin",

@@ -4,7 +4,7 @@ import PushManager, {
   GTCmdMessage, GTNotificationMessage, GTTransmitMessage, PushConst,
   GTCmdMessage, GTNotificationMessage, GTTransmitMessage, PushConst,
   SetTagCmdMessage,
   SetTagCmdMessage,
   Tag,
   Tag,
-  UnBindAliasCmdMessage } from 'library';
+  UnBindAliasCmdMessage } from 'GtSDK';
 import { AppUtils, DeviceUtil, EmitterEventId, EmitterUtils, Logger, SPHelper } from 'wdKit/Index';
 import { AppUtils, DeviceUtil, EmitterEventId, EmitterUtils, Logger, SPHelper } from 'wdKit/Index';
 import { HostEnum, HostManager, HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HostEnum, HostManager, HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { notificationManager } from '@kit.NotificationKit';
 import { notificationManager } from '@kit.NotificationKit';

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdlogin",
+  "name": "wdLogin",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

-import ArrayList from '@ohos.util.ArrayList';
-import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index';
-import router from '@ohos.router';
-import { LoginViewModel } from './LoginViewModel';
-import { BreakpointSystem, CustomToast, DateTimeUtils, Logger, SPHelper, ToastUtils } from 'wdKit';
-import {
-  SpConstants
-} from '../../../../../../../commons/wdNetwork/oh_modules/wdConstant/src/main/ets/constants/SpConstants'
-import data_preferences from '@ohos.data.preferences';
-import { WDRouterPage, WDRouterRule } from 'wdRouter';
-import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking/Index';
+import { Params } from 'wdBean'
+import router from '@ohos.router'
+import { LoginViewModel } from './LoginViewModel'
+import { BreakpointSystem, CustomToast, DateTimeUtils, Logger, SPHelper, ToastUtils } from 'wdKit'
+import { SpConstants } from 'wdConstant'
+import { WDRouterPage, WDRouterRule } from 'wdRouter'
+import { TrackingPageBrowse, TrackConstants, TrackingButton } from 'wdTracking'
 
 
 const TAG = "SettingPasswordLayout"
 const TAG = "SettingPasswordLayout"
 
 

@@ -2,7 +2,7 @@
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "devDependencies": {},
   "devDependencies": {},
   "author": "",
   "author": "",
-  "name": "wdplayer",
+  "name": "wdPlayer",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",
   "version": "1.0.0",
   "version": "1.0.0",

@@ -53,13 +53,18 @@ export class BackgroundAudioController {
     }
     }
 
 
     // 激活接口要在元数据、控制命令注册完成之后再执行
     // 激活接口要在元数据、控制命令注册完成之后再执行
-    await this.lastSession?.activate();
+    // await this.lastSession?.activate();
     Logger.debug(TAG, `session create done : sessionId : ${this.lastSession?.sessionId}`);
     Logger.debug(TAG, `session create done : sessionId : ${this.lastSession?.sessionId}`);
 
 
     this.lastProgress = 0
     this.lastProgress = 0
     this.hasSetupProgress = false
     this.hasSetupProgress = false
   }
   }
 
 
+  async activateSession() {
+    await this.lastSession?.activate();
+    Logger.debug(TAG, `session activate done : sessionId : ${this.lastSession?.sessionId}`);
+  }
+
   destorySession() {
   destorySession() {
     if (this.lastSession) {
     if (this.lastSession) {
       this.lastSession.deactivate();
       this.lastSession.deactivate();
@@ -74,6 +79,21 @@ export class BackgroundAudioController {
     this.lastItemTitle = title || ""
     this.lastItemTitle = title || ""
     this.lastItemMediaImage = mediaImage
     this.lastItemMediaImage = mediaImage
     this.lastItemArtist = artist || ""
     this.lastItemArtist = artist || ""
+
+    let metadata: AVSessionManager.AVMetadata = {
+      assetId: assetId.length > 0 ? assetId : "fake-asset-id",
+      title: title.length > 0 ? title : "  ",
+      mediaImage: "https://cdnjdphoto.aikan.pdnews.cn/WapApi/800/launcher_icon.png" ,//pixelMapImage ?? ("file://" + mediaImage.id),
+      artist: artist.length > 0 ? artist : "人日日报"
+      // duration: duration
+    };
+
+    try {
+      await this.lastSession?.setAVMetadata(metadata)
+      Logger.debug(TAG, `SetAVMetadata successfully`);
+    } catch (err) {
+      Logger.error(TAG, `Failed to set AVMetadata. Code: ${err.code}, message: ${err.message}`);
+    } finally {}
   }
   }
 
 
   async setSessionMetaDataWithDuration(assetId: string, title: string, mediaImage: Resource, artist: string, duration: number) {
   async setSessionMetaDataWithDuration(assetId: string, title: string, mediaImage: Resource, artist: string, duration: number) {

 {
 {
-  "name": "wdshare",
+  "name": "wdShare",
   "version": "1.0.0",
   "version": "1.0.0",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",

 {
 {
-  "name": "wdtracking",
+  "name": "wdTracking",
   "version": "1.0.0",
   "version": "1.0.0",
   "description": "Please describe the basic information.",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "main": "Index.ets",

@@ -20,11 +20,11 @@ export default class DailyNewspaperFormAbility extends FormExtensionAbility {
     
     
     if (want.parameters) {
     if (want.parameters) {
       let formId = want.parameters[formInfo.FormParam.IDENTITY_KEY] as string
       let formId = want.parameters[formInfo.FormParam.IDENTITY_KEY] as string
-      let isTempCard = want.parameters[formInfo.FormParam.TEMPORARY_KEY] as boolean
-      if (isTempCard === false) { // 如果为常态卡片，直接进行信息持久化
+      // let isTempCard = want.parameters[formInfo.FormParam.TEMPORARY_KEY] as boolean
+      // if (isTempCard === false) { // 如果为常态卡片，直接进行信息持久化
 
 
         this.fetchAndRefreshData(formId)
         this.fetchAndRefreshData(formId)
-      }
+      // }
     }
     }
 
 
     let obj: FormNewspaperData = {} as FormNewspaperData
     let obj: FormNewspaperData = {} as FormNewspaperData

@@ -5,7 +5,7 @@
 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index';
 import { BottomNavDTO, TopNavDTO } from 'wdBean/Index';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
-import { DisplayDirection } from 'wdConstant/Index';
+import { DisplayDirection ,BottomNavi} from 'wdConstant/Index';
 import { CompUtils, GrayManageModel, PageComponent } from 'wdComponent/Index';
 import { CompUtils, GrayManageModel, PageComponent } from 'wdComponent/Index';
 import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 import { TrackingButton, TrackConstants } from 'wdTracking/Index';
 import { ParamType, Tracking } from 'wdTracking/Index';
 import { ParamType, Tracking } from 'wdTracking/Index';
@@ -335,6 +335,7 @@ export struct VideoChannelPage {
               channelId: item.channelId + '',
               channelId: item.channelId + '',
               autoRefresh: this.autoRefresh,
               autoRefresh: this.autoRefresh,
               isMourning: this.GrayManage.get().isVideoMourning(`${item.channelId}`),
               isMourning: this.GrayManage.get().isVideoMourning(`${item.channelId}`),
+              bottomNavi:BottomNavi.VIDEO
             }).backgroundColor(Color.White)
             }).backgroundColor(Color.White)
           }
           }
 
 

 import router from '@ohos.router';
 import router from '@ohos.router';
-import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/src/main/ets/bean/content/Params';
+import { Params } from 'wdBean/Index';
 import { Logger, ToastUtils } from 'wdKit';
 import { Logger, ToastUtils } from 'wdKit';
 import { CustomTitleUI } from 'wdComponent/src/main/ets/components/reusable/CustomTitleUI';
 import { CustomTitleUI } from 'wdComponent/src/main/ets/components/reusable/CustomTitleUI';
 import {BusinessError, pasteboard} from '@kit.BasicServicesKit';
 import {BusinessError, pasteboard} from '@kit.BasicServicesKit';

@@ -18,6 +18,7 @@
     "abilities": [
     "abilities": [
       {
       {
         "name": "EntryAbility",
         "name": "EntryAbility",
+//        "launchType": "singleton",
         // 这里不能改动，和后台推送有绑定
         // 这里不能改动，和后台推送有绑定
         "srcEntry": "./ets/entryability/EntryAbility.ets",
         "srcEntry": "./ets/entryability/EntryAbility.ets",
         "description": "$string:app_desc",
         "description": "$string:app_desc",
@@ -143,11 +144,11 @@
           },
           },
           { // 默认的
           { // 默认的
             "entities": [
             "entities": [
-              "entity.system.home",
+              "entity.system.home"
             ],
             ],
             "actions": [
             "actions": [
-              "action.system.home",
-            ],
+              "action.system.home"
+            ]
 
 
           },
           },
           { // H5换端
           { // H5换端
@@ -159,7 +160,7 @@
               "scheme": "rmrbapp",
               "scheme": "rmrbapp",
               "host": "rmrb.app",
               "host": "rmrb.app",
               "path": "openwith"
               "path": "openwith"
-            },
+            }
           ]},
           ]},
           { // 推送
           { // 推送
             "actions": [
             "actions": [
@@ -173,7 +174,7 @@
                 "path": 'openwith'
                 "path": 'openwith'
               }
               }
             ]
             ]
-          },
+          }
         ]
         ]
       }
       }
     ],
     ],
@@ -216,7 +217,7 @@
       },
       },
       {
       {
         "name": "ohos.permission.INTERNET"
         "name": "ohos.permission.INTERNET"
-      },
+      }
     ],
     ],
     "extensionAbilities": [
     "extensionAbilities": [
       {
       {
@@ -230,7 +231,7 @@
             "name": "ohos.extension.form",
             "name": "ohos.extension.form",
             "resource": "$profile:form_config"
             "resource": "$profile:form_config"
           }
           }
-        ],
+        ]
 
 
       }
       }
     ]
     ]