feat:

1)新闻tab的顶导数据存储处理

feat:
1)新闻tab的顶导数据存储处理
liyubing
Commit ab23eb8e7add795b63ced1d76d7c7d4e10888da3 ab23eb8e 1 parent 2042482c
Showing 4 changed files with 60 additions and 49 deletions
sight_harmony/features/wdComponent/src/main/ets/components/page/ChannelSubscriptionLayout.ets
sight_harmony/features/wdComponent/src/main/ets/repository/PageRepository.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/ChannelViewModel.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/page/ChannelSubscriptionLayout.ets
View file @ab23eb8
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/page/ChannelSubscriptionLayout.ets
View file @ab23eb8
 import { TopNavDTO } from 'wdBean';
 import curves from '@ohos.curves';
-import { Logger } from 'wdKit/Index';
+import { Logger, SPHelper } from 'wdKit/Index';
+import { SpConstants } from 'wdConstant/Index';
 const INDEX_SETTING_TITLE: string = '首页设置'
 const INDEX_SETTING_SUBTITLE: string = '将指定频道设置为首页'
@@ -43,7 +44,6 @@ struct ChannelSubscriptionLayout {
   @State isEditIng: boolean = false
   // 顶部导航栏是否有临时跳转频道数据不
   @Prop haveTempTabData: boolean
-
   changeTab: (index: number) => void = () => {
   }
@@ -67,9 +67,14 @@ struct ChannelSubscriptionLayout {
   delChannelItem(index: number) {
     let item = this.myChannelList.splice(index, 1)[0]
-    this.channelIds.splice(index, 1)
+    // this.channelIds.splice(index, 1)
     AppStorage.setOrCreate('channelIds', this.channelIds.join(','))
+    // 本地频道特殊处理
+    let provinceName = SPHelper.default.getSync(SpConstants.LOCATION_PROVINCE_NAME, '') as string
+    if (provinceName && provinceName.includes(item.name) && item.localChannel == '0') {
+      item.localChannel = '1'
+    }
     /*
        删除的频道信息回到原栏目中去
      */
@@ -130,8 +135,8 @@ struct ChannelSubscriptionLayout {
     this.myChannelList.push(item)
     AppStorage.setOrCreate('channelIds', this.channelIds.join(','))
-    let storageChannelIds: string = AppStorage.get<string>('channelIds') || ''
-    console.debug('TopNavigationComponent', 'addChannelItem==>' + storageChannelIds)
+    // let storageChannelIds: string = AppStorage.get<string>('channelIds') || ''
+    // console.debug('TopNavigationComponent', 'addChannelItem==>' + storageChannelIds)
   }
   itemMove(index: number, newIndex: number): void {
@@ -570,7 +575,7 @@ struct ChannelSubscriptionLayout {
     .backgroundColor(Color.White)
     .onClick(() => {
       this.isShow = true
-      if(this.haveTempTabData){
+      if (this.haveTempTabData) {
         // 存储数据
         AppStorage.setOrCreate('channelIds', this.channelIds.join(','))
         this.haveTempTabData = false
@@ -578,18 +583,23 @@ struct ChannelSubscriptionLayout {
     })
     .bindContentCover(this.isShow, this.sheetBuilder(), {
       modalTransition: ModalTransition.DEFAULT,
-      onWillAppear: () => {console.log("BindContentCover onWillAppear.")},
-      onAppear: () => {console.log("BindContentCover onAppear.")},
-      onWillDisappear: () => {console.log("BindContentCover onWillDisappear.")
+      onWillAppear: () => {
+        console.log("BindContentCover onWillAppear.")
+      },
+      onAppear: () => {
+        console.log("BindContentCover onAppear.")
+      },
+      onWillDisappear: () => {
+        console.log("BindContentCover onWillDisappear.")
         this.isShow = false
-        this.isEditIng = false},
-      onDisappear: () => {console.log("BindContentCover onDisappear.")
+        this.isEditIng = false
+      },
+      onDisappear: () => {
+        console.log("BindContentCover onDisappear.")
       }
     })
   }
-
-
   /**
    * 改变我的频道栏目中频道id数据
    */
--- a/sight_harmony/features/wdComponent/src/main/ets/repository/PageRepository.ets
View file @ab23eb8
+++ b/sight_harmony/features/wdComponent/src/main/ets/repository/PageRepository.ets
View file @ab23eb8
@@ -192,11 +192,11 @@ export class PageRepository {
   /**
    * 早晚报pageInfo请求
    * */
-  static getMorningEveningPageInfoUrl(pageId: string,topicId:string) {
+  static getMorningEveningPageInfoUrl(pageId: string, topicId: string) {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.PAGE_INFO_PATH;
     url = url + "?pageId=" + pageId;
-    if(!StringUtils.isEmpty(topicId)){
-      url = url+ "&topicId=" + topicId;
+    if (!StringUtils.isEmpty(topicId)) {
+      url = url + "&topicId=" + topicId;
     }
     Logger.info(TAG, "getMorningEveningPageInfoUrl url = " + url)
     return url;
@@ -237,10 +237,11 @@ export class PageRepository {
   static fetchNavigationDetailDataApi(id: number = 210, myChannelIds?: string) {
     let url = PageRepository.getBottomNavGroupDetailUrl() + `?id=${id}`;
+    // 310000 310100 310115120
     let provinceCode = HttpUtils.getProvinceCode()
     if (provinceCode) {
       url = url + "&districtCode=" + HttpUtils.getDistrictCode()
-        + "&provinceCode=" + HttpUtils.getProvinceCode()
+        + "&provinceCode=" + provinceCode
         + "&cityCode=" + HttpUtils.getCityCode()
     }
     if (myChannelIds) {
@@ -395,8 +396,8 @@ export class PageRepository {
   /**
    * 获取早晚报pageInfo
    * */
-  static fetchMorningEveningPageInfo(pageId: string,topicId:string) {
-    let url = PageRepository.getMorningEveningPageInfoUrl(pageId,topicId)
+  static fetchMorningEveningPageInfo(pageId: string, topicId: string) {
+    let url = PageRepository.getMorningEveningPageInfoUrl(pageId, topicId)
     return WDHttp.get<ResponseDTO<PageInfoBean>>(url)
   };
@@ -421,7 +422,7 @@ export class PageRepository {
    * 获取播报pageInfo
    * */
   static fetchBroadcastPageInfo(pageId: string) {
-    let url = PageRepository.getMorningEveningPageInfoUrl(pageId,'')
+    let url = PageRepository.getMorningEveningPageInfoUrl(pageId, '')
     return WDHttp.get<ResponseDTO<PageInfoBean>>(url)
   };
--- a/sight_harmony/features/wdComponent/src/main/ets/viewmodel/ChannelViewModel.ets
View file @ab23eb8
+++ b/sight_harmony/features/wdComponent/src/main/ets/viewmodel/ChannelViewModel.ets
View file @ab23eb8
@@ -58,7 +58,7 @@ export class ChannelViewModel {
   }
   /**
-   * 保存底导详情数据到缓存
+   * 保存顶部导详情数据到缓存
    */
   saveBottomDetailData(data: NavigationDetailDTO) {
     CacheData.saveCacheData(CacheData.channelCacheDataKey + data?.id, data, data.md5)
@@ -75,7 +75,7 @@ export class ChannelViewModel {
   /**
    * 获取底导详情（顶导）接口数据
    */
-  async getBottomNavDetailData(id: number, myChannelIds?: string): Promise<NavigationDetailDTO> {
+  async getBottomNavDetailData(id: number, myChannelIds?: string): Promise<NavigationDetailDTO|null> {
     Logger.info(TAG, `getBottomNavDetailData start`);
     return this.getNavDetailData(id,myChannelIds);
   }
@@ -111,18 +111,18 @@ export class ChannelViewModel {
    * @param myChannelIds
    * @returns
    */
-  private getNavDetailData(id: number, myChannelIds?: string): Promise<NavigationDetailDTO> {
-    return new Promise<NavigationDetailDTO>((success, error) => {
+  private getNavDetailData(id: number, myChannelIds?: string): Promise<NavigationDetailDTO|null> {
+    return new Promise<NavigationDetailDTO|null>((success, error) => {
       Logger.info(TAG, `getNavData start`);
       PageRepository.fetchNavigationDetailDataApi(id,myChannelIds).then((navResDTO: ResponseDTO<NavigationDetailDTO>) => {
         if (!navResDTO || !navResDTO.data) {
           Logger.error(TAG, 'getNavData then navResDTO is empty');
-          error('navResDTO is empty');
+          success(null);
           return
         }
         if (navResDTO.code != 0) {
           Logger.error(TAG, `getNavData then code:${navResDTO.code}, message:${navResDTO.message}`);
-          error('navResDTO Response Code is failure');
+          success(null);
           return
         }
         // let navResStr = JSON.stringify(navResDTO);
@@ -131,7 +131,7 @@ export class ChannelViewModel {
         success(navResDTO.data);
       }).catch((err: Error) => {
         Logger.error(TAG, `fetchNavigationDataApi catch, error.name : ${err.name},  error.message:${err.message}`);
-        error(err);
+        success(null);
       })
     })
   }
--- a/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
View file @ab23eb8
+++ b/sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageHelper.ets
View file @ab23eb8
@@ -77,9 +77,9 @@ export class PageHelper {
    * 进页面请求数据
    */
   async getInitCacheData(pageModel: PageModel, pageAdvModel: PageAdModel) {
-    Logger.debug(TAG, 'getInitCacheData')
+   // Logger.debug(TAG, 'getInitCacheData')
     PageViewModel.getPageInfoCache(pageModel.pageId).then(pageInfo => {
-      Logger.debug(TAG, 'getInitCacheData back: ' + pageInfo)
+     // Logger.debug(TAG, 'getInitCacheData back: ' + pageInfo)
       if (pageInfo == null) {
         return;
       }
@@ -125,9 +125,9 @@ export class PageHelper {
         this.refreshUIEnd(pageModel, false)
       })
     } else {
-      Logger.debug(TAG, 'getPageInfo')
+     // Logger.debug(TAG, 'getPageInfo')
       PageViewModel.getPageInfo(pageModel.pageId).then(pageInfo => {
-        Logger.debug(TAG, 'getPageInfo back: ' + JSON.stringify(pageInfo))
+      //  Logger.debug(TAG, 'getPageInfo back: ' + JSON.stringify(pageInfo))
         if (pageInfo == null) {
           pageModel.viewType = ViewType.EMPTY;
           pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
@@ -137,9 +137,9 @@ export class PageHelper {
         pageModel.pageInfo = pageInfo;
         if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
           // 缓存一致，不解析
-          Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
+        //  Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
         } else {
-          Logger.debug(TAG, 'getPageInfo 要解析广告')
+        //  Logger.debug(TAG, 'getPageInfo 要解析广告')
           if (pageModel.currentPage == 1) {
             // 保存缓存
             CacheData.saveCacheData(CacheData.comPageInfoCacheKey + pageModel.pageId, pageInfo, pageInfo.md5)
@@ -148,7 +148,7 @@ export class PageHelper {
           //解析页面挂角广告资源
           pageAdvModel.analysisAdvSource(pageInfo);
         }
-        Logger.debug(TAG, 'getPageInfo go on')
+       // Logger.debug(TAG, 'getPageInfo go on')
         this.parseGroup(pageModel, false)
       }).catch(() => {
         this.refreshUIEnd(pageModel, false)
@@ -190,14 +190,14 @@ export class PageHelper {
       //Logger.error("ZZZXXXXX", '楼层id-start--》' + pageModel.groupId);
       let pageDto: PageDTO
-      Logger.debug(TAG, 'parseGroup isCache: ' + isCache)
+      //Logger.debug(TAG, 'parseGroup isCache: ' + isCache)
       if (isCache) {
         pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
         pageModel.displayGroupInfoMd5 = pageDto.md5
       } else {
         pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
         if (pageDto.md5 == pageModel.displayGroupInfoMd5) {
-          Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
+         // Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
           // 下拉刷新场景，数据没变，拦截刷新UI，重置相关参数
           if (pageModel.loadStrategy === 2) {
             // 缓存数据一致，不再刷新
@@ -211,17 +211,17 @@ export class PageHelper {
           return
         }
         pageModel.displayGroupInfoMd5 = pageDto.md5
-        Logger.debug(TAG, 'parseGroup cache load, save: ' + pageDto.md5)
+       // Logger.debug(TAG, 'parseGroup cache load, save: ' + pageDto.md5)
         // 保存缓存
         CacheData.saveCacheData(CacheData.compGroupInfoDataCacheKey + pageModel.pageId + pageModel.groupId, pageDto,
           pageDto.md5)
       }
-      Logger.debug(TAG, 'parseGroup go on')
+     // Logger.debug(TAG, 'parseGroup go on')
       // await，确保groups接口顺序执行
       // let pageDto = page
       let index = pageInfo.groups.indexOf(group)
-      Logger.debug(TAG, 'yyyy parseGroup print')
+     // Logger.debug(TAG, 'yyyy parseGroup print')
       this.printComp(pageDto)
       // 解析楼层组件
       this.analysisPageGroupCompData(pageDto, pageInfo)
@@ -268,7 +268,7 @@ export class PageHelper {
     if (pageModel.compList.isEmpty()) {
       // 没数据，展示空页面
-      Logger.debug(TAG, 'aboutToAppear, data response page ' + pageModel.pageId + ', comp list is empty.');
+      //Logger.debug(TAG, 'aboutToAppear, data response page ' + pageModel.pageId + ', comp list is empty.');
       pageModel.viewType = ViewType.EMPTY;
       pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
@@ -296,7 +296,7 @@ export class PageHelper {
         pageInfo.pageAdList.push(...pageDto.compAdList)
       }
       // TODO 待删除
-      Logger.debug(TAG, 'yyyy analysisPageGroupCompData size, '+pageInfo?.oneRequestPageGroupCompList?.length)
+    //  Logger.debug(TAG, 'yyyy analysisPageGroupCompData size, '+pageInfo?.oneRequestPageGroupCompList?.length)
     }
   }
@@ -343,7 +343,7 @@ export class PageHelper {
               pageModel.currentPage++;
               pageModel.hasMore = true;
-              Logger.debug(TAG, 'yyyy compLoadMore print')
+             // Logger.debug(TAG, 'yyyy compLoadMore print')
               this.printComp(data)
               //移除音频 和 活动
               this.loadMorePageComp(pageModel, data)
@@ -372,7 +372,7 @@ export class PageHelper {
       pageModel.pageInfo.oneRequestPageGroupCompList.add(comp)
     })
     // TODO 待删除
-    Logger.debug(TAG, 'yyyy loadMorePageComp size, ' + pageModel.pageInfo.oneRequestPageGroupCompList?.length)
+   // Logger.debug(TAG, 'yyyy loadMorePageComp size, ' + pageModel.pageInfo.oneRequestPageGroupCompList?.length)
     // 记录
     pageModel.pageTotalCompSize = pageCompList.length + pageModel.pageTotalCompSize
@@ -398,7 +398,7 @@ export class PageHelper {
       let contentInfo: ContentDTO = CollectionUtils.getElement(element.operDataList, 0);
       //移除音频 和 活动
       if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
-        Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
+        //Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
       } else {
         // 暂时屏蔽活动和音频详情入口
         if (element.operDataList[0]?.objectType === '3' || element.operDataList[0]?.objectType === '13') {
@@ -843,7 +843,7 @@ export class PageHelper {
    * 删除分页数据，保留第一页的数据。（下拉刷新场景用到）
    */
   deleteMorePage(pageModel: PageModel) {
-    Logger.debug(TAG, 'deleteMorePage endindex: ' + pageModel.firstPageEndIndex)
+    //Logger.debug(TAG, 'deleteMorePage endindex: ' + pageModel.firstPageEndIndex)
     if (pageModel.firstPageEndIndex < 0) {
       return
     }
@@ -855,7 +855,7 @@ export class PageHelper {
    * 临时打印comp相关信息，用于问题定位。TODO 待删除
    */
   private printComp(pageDto: PageDTO) {
-    Logger.debug(TAG, 'yyyy printComp pageDto.compList.size: ' + pageDto?.compList?.length)
+    //Logger.debug(TAG, 'yyyy printComp pageDto.compList.size: ' + pageDto?.compList?.length)
     new Promise<void>(() => {
       let tmpCompList: CompDTO[] = Array.from(pageDto.compList)
       tmpCompList.forEach((v, k) => {
@@ -863,10 +863,10 @@ export class PageHelper {
           Logger.warn(TAG, 'yyyy printComp comp forEach, ' + v.compStyle)
           v.operDataList.forEach((cv, ci) => {
             if (cv) {
-              Logger.debug(TAG, 'yyyy printComp ContentDTO print, ' + v.compStyle)
-              Logger.debug(TAG, 'yyyy printComp ContentDTO xxxx newsTitle, ' + cv.newsTitle)
+            //  Logger.debug(TAG, 'yyyy printComp ContentDTO print, ' + v.compStyle)
+             // Logger.debug(TAG, 'yyyy printComp ContentDTO xxxx newsTitle, ' + cv.newsTitle)
             } else {
-              Logger.warn(TAG, 'yyyy printComp ContentDTO is null, ' + v.compStyle)
+             // Logger.warn(TAG, 'yyyy printComp ContentDTO is null, ' + v.compStyle)
             }
           })
         } else {