Merge remote-tracking branch 'origin/main'

@@ -368,7 +368,6 @@ export struct TopNavigationComponent {
           .alignItems(VerticalAlign.Center)
           .alignItems(VerticalAlign.Center)
           .justifyContent(FlexAlign.Center)
           .justifyContent(FlexAlign.Center)
           .onClick(() => {
           .onClick(() => {
-            TrackingButton.click("", TrackConstants.PageName.Search, "PEOPLE")
             WDRouterRule.jumpWithPage(WDRouterPage.searchPage)
             WDRouterRule.jumpWithPage(WDRouterPage.searchPage)
           })
           })
         }
         }

@@ -251,7 +251,9 @@ export struct TopNavigationComponentNew {
         'right': { 'anchor': '__container__', 'align': HorizontalAlign.End }
         'right': { 'anchor': '__container__', 'align': HorizontalAlign.End }
       })
       })
       .onClick(() => {
       .onClick(() => {
-        WDRouterRule.jumpWithPage(WDRouterPage.searchPage)
+        TrackingButton.searchClick( TrackConstants.PageName.Search, "PEOPLE")
+        let params = { 'tabName': "PEOPLE" } as Record<string, string>
+        WDRouterRule.jumpWithPage(WDRouterPage.searchPage,params)
       })
       })
 
 
       List({ scroller: this.listScroller }) {
       List({ scroller: this.listScroller }) {

@@ -78,8 +78,9 @@ export struct FirstTabTopSearchComponent {
     .backgroundImage($r('app.media.background_search'))
     .backgroundImage($r('app.media.background_search'))
     .backgroundImageSize(ImageSize.Cover)
     .backgroundImageSize(ImageSize.Cover)
     .onClick(() => {
     .onClick(() => {
-      TrackingButton.click("", TrackConstants.PageName.Search, "NEWS")
-      WDRouterRule.jumpWithPage(WDRouterPage.searchPage)
+      TrackingButton.searchClick( TrackConstants.PageName.Search, "NEWS")
+      let params = { 'tabName': "NEWS" } as Record<string, string>
+      WDRouterRule.jumpWithPage(WDRouterPage.searchPage,params)
     })
     })
   }
   }
 }
 }

 import router from '@ohos.router'
 import router from '@ohos.router'
 import { NetworkUtil, StringUtils, ToastUtils } from 'wdKit'
 import { NetworkUtil, StringUtils, ToastUtils } from 'wdKit'
+import { ParamType, TrackConstants, Tracking } from 'wdTracking/Index'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { SearchHistoryItem } from '../../viewmodel/SearchHistoryItem'
 import { SearchHistoryItem } from '../../viewmodel/SearchHistoryItem'
 import { SearchRelatedItem } from '../../viewmodel/SearchRelatedItem'
 import { SearchRelatedItem } from '../../viewmodel/SearchRelatedItem'
@@ -30,7 +31,8 @@ export struct SearchComponent {
   @State relatedSearchContentsData: SearchRelatedItem[] = []
   @State relatedSearchContentsData: SearchRelatedItem[] = []
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
   @State count:string[] = []
   @State count:string[] = []
-  @State isGetRequest:boolean = false;
+  @State isGetRequest:boolean = false
+  @Link fromTabName: string
 
 
   aboutToAppear() {
   aboutToAppear() {
     //获取提示滚动
     //获取提示滚动
@@ -175,6 +177,7 @@ export struct SearchComponent {
   }
   }
 
 
   searchResData(content:string){
   searchResData(content:string){
+    trackSearchClick(this.fromTabName,content)
     //赋值
     //赋值
     this.searchText = content
     this.searchText = content
     //保存搜索记录
     //保存搜索记录
@@ -387,3 +390,15 @@ export struct SearchComponent {
     this.isClickedHintSearch = false
     this.isClickedHintSearch = false
   }
   }
 }
 }
+
+function trackSearchClick(upOneLevelPageName: string,keyword:string){
+  let params: ParamType = {}
+
+  params["keyword"] = keyword
+  params["searchType"] = "0"
+  params["pageName"] = TrackConstants.PageName.Search
+  params["pageId"] = TrackConstants.PageName.Search
+  params["upOneLevelPageName"] = upOneLevelPageName
+
+  Tracking.event("search_confirm_click", params)
+}

 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
 import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 import { SearchComponent } from '../components/search/SearchComponent'
 import { SearchComponent } from '../components/search/SearchComponent'
+import { router } from '@kit.ArkUI';
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct SearchPage {
 struct SearchPage {
+  @State params:Record<string, string> =  router.getParams() as Record<string, string>;
+  @State fromTabName: string = 'NEWS';
   pageShowTime:number = 0;
   pageShowTime:number = 0;
   pageHideTime:number = 0;
   pageHideTime:number = 0;
 
 
   onPageShow() {
   onPageShow() {
+    this.fromTabName = this.params?.['tabName'];
     this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.pageShowTime = DateTimeUtils.getTimeStamp()
   }
   }
 
 
@@ -21,7 +25,7 @@ struct SearchPage {
 
 
   build() {
   build() {
     Column(){
     Column(){
-      SearchComponent()
+      SearchComponent({fromTabName:$fromTabName})
     }.height('100%')
     }.height('100%')
     .width('100%')
     .width('100%')
     .backgroundColor($r('app.color.white'))
     .backgroundColor($r('app.color.white'))

@@ -16,6 +16,13 @@ export class TrackingButton {
     Tracking.event("name_click", params)
     Tracking.event("name_click", params)
   }
   }
 
 
+  static searchClick( pageId: string, pageName: string, extParams?: ParamType) {
+    let params = TrackingUtils.generateParams(extParams)
 
 
+    params["pageId"] = pageId
+    params["pageName"] = pageName
+
+    Tracking.event("search_button_click ", params)
+  }
 
 
 }
 }

@@ -128,8 +128,9 @@ export struct VideoChannelPage {
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
       .justifyContent(FlexAlign.Center)
       .justifyContent(FlexAlign.Center)
       .onClick(() => {
       .onClick(() => {
-        TrackingButton.click("", TrackConstants.PageName.Search, "VIDEOS")
-        WDRouterRule.jumpWithPage(WDRouterPage.searchPage)
+        TrackingButton.searchClick(TrackConstants.PageName.Search, "VIDEOS")
+        let params = { 'tabName': "VIDEOS" } as Record<string, string>
+        WDRouterRule.jumpWithPage(WDRouterPage.searchPage,params)
       })
       })
       .backgroundColor(Color.Transparent)
       .backgroundColor(Color.Transparent)