Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  ref |> 适配新版本900 IDE
  feat: 19239 直播跳转频道

@@ -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",

 {
 {
-  "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",

@@ -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'
 
 

@@ -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",

 {
 {
-  "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",

@@ -94,7 +94,8 @@ export struct BottomNavigationComponent {
                 _currentNavIndex: $currentNavIndex,
                 _currentNavIndex: $currentNavIndex,
                 bottomNavIndex: index,
                 bottomNavIndex: index,
                 autoRefresh: this.autoRefresh,
                 autoRefresh: this.autoRefresh,
-                navItem: navItem
+                navItem: navItem,
+                assignChannel: this.assignChannel
               })
               })
             } else {
             } else {
               // 其它带顶导的页面，如 新闻、人民号、服务
               // 其它带顶导的页面，如 新闻、人民号、服务

@@ -25,6 +25,7 @@ export struct VideoChannelPage {
   private groupId: number = 0
   private groupId: number = 0
   private swiperController: SwiperController = new SwiperController()
   private swiperController: SwiperController = new SwiperController()
   // 自动刷新触发（双击tab自动刷新）
   // 自动刷新触发（双击tab自动刷新）
+  @Prop @Watch('setTabbarActive') assignChannel: AssignChannelParam
   @Prop autoRefresh: number = 0
   @Prop autoRefresh: number = 0
   @Prop topNavList: TopNavDTO[]
   @Prop topNavList: TopNavDTO[]
   @Link _currentNavIndex?: number;
   @Link _currentNavIndex?: number;
@@ -59,18 +60,16 @@ export struct VideoChannelPage {
     if (this.currentTopNavSelectedIndex === 0) {
     if (this.currentTopNavSelectedIndex === 0) {
       this.handleAudio(this.topNavList[0])
       this.handleAudio(this.topNavList[0])
     }
     }
+  }
 
 
-    EmitterUtils.receiveEvent(EmitterEventId.JUMP_HOME_CHANNEL, (str?: string) => {
-      // Logger.debug(TAG, 'receiveEvent JUMP_HOME_CHANNEL: ' + str)
-      if (str) {
-        // 跳转指定频道场景，传参底导id、频道id
-        let assignChannel = JSON.parse(str) as AssignChannelParam
-        let index = this.topNavList.findIndex((item: TopNavDTO, index) => {
-          return Number(assignChannel.channelId) == item.channelId && Number(assignChannel.pageId) == item.pageId
-        }) || 0
-        this.clickTopNav(index)
-      }
-    })
+  /**
+   * 切换顶部导航index
+   */
+  setTabbarActive() {
+    let index = this.topNavList.findIndex((item: TopNavDTO, index) => {
+      return Number(this.assignChannel.channelId) == item.channelId && Number(this.assignChannel.pageId) == item.pageId
+    }) || 0
+    this.clickTopNav(index)
   }
   }
 
 
   /**
   /**

 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"
           }
           }
-        ],
+        ]
 
 
       }
       }
     ]
     ]