Merge remote-tracking branch 'origin/main'

@@ -133,10 +133,15 @@ export class NetworkManager {
    * 同步获取网络类型，耗时
    * 同步获取网络类型，耗时
    */
    */
   public getNetTypeSync(): NetworkType {
   public getNetTypeSync(): NetworkType {
-    let netHandle = connection.getDefaultNetSync();
-    let netCapabilities = connection.getNetCapabilitiesSync(netHandle)
-    this.reset(netCapabilities.bearerTypes)
-    return this.networkType;
+    try {
+      let netHandle = connection.getDefaultNetSync();
+      let netCapabilities = connection.getNetCapabilitiesSync(netHandle)
+      this.reset(netCapabilities.bearerTypes)
+      return this.networkType;
+    } catch (e) {
+      Logger.error(TAG, 'getNetTypeSync e: ' + JSON.stringify(e))
+    }
+    return NetworkType.TYPE_UNKNOWN
   }
   }
 
 
   private parseData(data: connection.NetCapabilityInfo) {
   private parseData(data: connection.NetCapabilityInfo) {

@@ -43,7 +43,7 @@ export class NetworkUtil {
    */
    */
   static isNetConnected(): boolean {
   static isNetConnected(): boolean {
     let type = NetworkManager.getInstance().getNetType()
     let type = NetworkManager.getInstance().getNetType()
-    if (type == NetworkType.TYPE_NONE) {
+    if (type == NetworkType.TYPE_UNKNOWN || type == NetworkType.TYPE_NONE) {
       return false
       return false
     }
     }
     return true
     return true

@@ -255,7 +255,7 @@ export struct PageComponent {
       this.pageModel.channelId = this.channelId;
       this.pageModel.channelId = this.channelId;
       this.pageModel.currentPage = 1;
       this.pageModel.currentPage = 1;
       this.pageModel.pageTotalCompSize = 0;
       this.pageModel.pageTotalCompSize = 0;
-      // TODO PageHelper.getInitCacheData(this.pageModel, this.pageAdvModel)
+      PageHelper.getInitCacheData(this.pageModel, this.pageAdvModel)
       PageHelper.getInitData(this.pageModel, this.pageAdvModel)
       PageHelper.getInitData(this.pageModel, this.pageAdvModel)
     }, 100)
     }, 100)
   }
   }

@@ -95,15 +95,17 @@ struct MineHomePage {
                       }
                       }
                       WDRouterRule.jumpWithPage(WDRouterPage.editUserNikeNamePage,params)
                       WDRouterRule.jumpWithPage(WDRouterPage.editUserNikeNamePage,params)
                     })
                     })
+
                   if(this.levelId>0){
                   if(this.levelId>0){
-                    Text(`等级${this.levelId}`)
-                      .textAlign(TextAlign.Center)
-                      .fontColor($r('app.color.color_ED2800'))
-                      .backgroundColor($r('app.color.white'))
-                      .fontSize('19lpx')
-                      .width('96lpx')
-                      .height('35lpx')
-                      .margin({ left: '10lpx' })
+                      Text(`等级${this.levelId}`)
+                        .fontColor($r('app.color.color_ED2800'))
+                        .fontSize('23lpx')
+                        .fontWeight(500)
+                        .margin({ left: '10lpx' })
+                        .backgroundImage($r("app.media.my_grade_bg"))
+                        .backgroundImageSize(ImageSize.Cover)
+                        .padding({left:"17lpx",right:"8lpx"})
+                        .height('35lpx')
                   }
                   }
 
 
                   Blank()
                   Blank()

@@ -86,14 +86,17 @@ struct OtherNormalUserHomePage {
                     .lineHeight('50lpx')
                     .lineHeight('50lpx')
                     .fontWeight('500lpx')
                     .fontWeight('500lpx')
 
 
-                  Text(`等级${this.levelId}`)
-                    .textAlign(TextAlign.Center)
-                    .fontColor($r('app.color.color_ED2800'))
-                    .backgroundColor($r('app.color.white'))
-                    .fontSize('19lpx')
-                    .width('96lpx')
-                    .height('35lpx')
-                    .margin({ left: '10lpx' })
+                  if(this.levelId>0){
+                    Text(`等级${this.levelId}`)
+                      .fontColor($r('app.color.color_ED2800'))
+                      .fontSize('23lpx')
+                      .fontWeight(500)
+                      .margin({ left: '10lpx' })
+                      .backgroundImage($r("app.media.my_grade_bg"))
+                      .backgroundImageSize(ImageSize.Cover)
+                      .padding({left:"17lpx",right:"8lpx"})
+                      .height('35lpx')
+                  }
                   Blank()
                   Blank()
                 }.width('507lpx')
                 }.width('507lpx')
 
 

 import { CompDTO, ContentDTO, InteractDataDTO, LiveReviewDTO, LiveRoomDataBean, PageDTO, PageInfoDTO } from 'wdBean';
 import { CompDTO, ContentDTO, InteractDataDTO, LiveReviewDTO, LiveRoomDataBean, PageDTO, PageInfoDTO } from 'wdBean';
 import { CompStyle, ViewType } from 'wdConstant/Index';
 import { CompStyle, ViewType } from 'wdConstant/Index';
-import { CollectionUtils, DateTimeUtils, LazyDataSource, Logger, NetworkUtil, StringUtils } from 'wdKit';
+import { CollectionUtils, DateTimeUtils, LazyDataSource, Logger, NetworkUtil, StringUtils, ToastUtils } from 'wdKit';
 import { closeRefresh } from '../utils/PullDownRefresh';
 import { closeRefresh } from '../utils/PullDownRefresh';
 import PageModel from './PageModel';
 import PageModel from './PageModel';
 import PageViewModel from './PageViewModel';
 import PageViewModel from './PageViewModel';
@@ -33,9 +33,16 @@ export class PageHelper {
    * 刷新数据
    * 刷新数据
    */
    */
   async refreshUI(pageModel: PageModel, pageAdvModel: PageAdModel) {
   async refreshUI(pageModel: PageModel, pageAdvModel: PageAdModel) {
+    let netStatus = NetworkUtil.isNetConnected()
+    if (!netStatus) {
+      ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+      setTimeout(() => {
+        closeRefresh(pageModel, false)
+      }, 500)
+      return
+    }
     pageModel.loadStrategy = 2
     pageModel.loadStrategy = 2
     pageModel.pageTotalCompSize = 0;
     pageModel.pageTotalCompSize = 0;
-    // TODO 下拉刷新，是否加载缓存
     this.getPageInfo(pageModel, pageAdvModel)
     this.getPageInfo(pageModel, pageAdvModel)
   }
   }
 
 
@@ -43,6 +50,11 @@ export class PageHelper {
    * 分页加载
    * 分页加载
    */
    */
   async loadMore(pageModel: PageModel) {
   async loadMore(pageModel: PageModel) {
+    let netStatus = NetworkUtil.isNetConnected()
+    if (!netStatus) {
+      ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+      return
+    }
     pageModel.loadStrategy = 3
     pageModel.loadStrategy = 3
     // 暂只支持comp分页加载，节目分页加载的得完善框架（如直播回看节目数据分页）
     // 暂只支持comp分页加载，节目分页加载的得完善框架（如直播回看节目数据分页）
     this.compLoadMore(pageModel)
     this.compLoadMore(pageModel)
@@ -52,55 +64,20 @@ export class PageHelper {
    * 进页面请求数据
    * 进页面请求数据
    */
    */
   async getInitCacheData(pageModel: PageModel, pageAdvModel: PageAdModel) {
   async getInitCacheData(pageModel: PageModel, pageAdvModel: PageAdModel) {
-    Logger.error('zzzz', 'getInitCacheData')
+    Logger.debug(TAG, 'getInitCacheData')
     PageViewModel.getPageInfoCache(pageModel.pageId).then(pageInfo => {
     PageViewModel.getPageInfoCache(pageModel.pageId).then(pageInfo => {
+      Logger.debug(TAG, 'getInitCacheData back: ' + pageInfo)
       if (pageInfo == null) {
       if (pageInfo == null) {
         return;
         return;
       }
       }
       pageModel.pageInfo = pageInfo;
       pageModel.pageInfo = pageInfo;
+      pageModel.cachePageInfoMd5 = pageInfo.md5
       //解析页面挂角广告资源
       //解析页面挂角广告资源
       pageAdvModel.analysisAdvSource(pageInfo);
       pageAdvModel.analysisAdvSource(pageInfo);
-      this.parseCacheGroup(pageModel)
+      this.parseGroup(pageModel, true)
     })
     })
   }
   }
 
 
-  async parseCacheGroup(pageModel: PageModel) {
-    Logger.error('zzzz', 'parseCacheGroup')
-    let pageInfo: PageInfoDTO = pageModel.pageInfo
-    pageModel.groupList = []
-    pageInfo.pageAdList = []
-    pageInfo.oneRequestPageGroupCompList = new ArrayList()
-    pageModel.groupList.push(...pageInfo.groups)
-    for (const group of pageInfo.groups) {
-      pageModel.groupId = group.id;
-      pageModel.groupData = group
-      // await，确保groups接口顺序执行
-      let pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
-      let index = pageInfo.groups.indexOf(group)
-      if (index == 0) {
-        // 清空comp列表
-        pageModel.compList.clear()
-      }
-      this.analysisPageGroupCompData(pageDto, pageInfo)
-    }
-
-    // 收集页面所有楼层的组件信息，同步完成广告投放计算，异步完成稿件批查,
-
-    pageModel.pageTotalCompSize = pageInfo.oneRequestPageGroupCompList.length + pageModel.pageTotalCompSize
-    // 处理页面广告数据，投放到页面的位置
-    // TODO 缓存数据不加载广告
-    // this.handlePageCompAdvPostion(pageInfo.oneRequestPageGroupCompList, pageModel, pageInfo.pageAdList);
-
-    //遍历所有组件和稿件数据 push到页面
-    for (let element of pageInfo.oneRequestPageGroupCompList) {
-      pageModel.compList.push(CompDTO.createNewsBean(element))
-    }
-    pageModel.currentPage++
-    pageModel.viewType = ViewType.LOADED
-    closeRefresh(pageModel, true)
-
-  }
-
   /**
   /**
    * 进页面请求数据
    * 进页面请求数据
    */
    */
@@ -134,33 +111,51 @@ export class PageHelper {
         promptAction.showToast({ message: err });
         promptAction.showToast({ message: err });
       })
       })
     } else {
     } else {
+      Logger.debug(TAG, 'getPageInfo')
       PageViewModel.getPageInfo(pageModel.pageId).then(pageInfo => {
       PageViewModel.getPageInfo(pageModel.pageId).then(pageInfo => {
+        Logger.debug(TAG, 'getPageInfo back: ' + JSON.stringify(pageInfo))
         if (pageInfo == null) {
         if (pageInfo == null) {
           pageModel.viewType = ViewType.EMPTY;
           pageModel.viewType = ViewType.EMPTY;
           pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
           pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
           return;
           return;
         }
         }
         pageModel.pageInfo = pageInfo;
         pageModel.pageInfo = pageInfo;
-        //解析页面挂角广告资源
-        pageAdvModel.analysisAdvSource(pageInfo);
-        this.parseGroup(pageModel)
-        // if (pageModel.currentPage == 1) {
-        //   // 保存缓存
-        //   CacheData.saveCacheData(CacheData.comPageInfoCacheKey + pageModel.pageId, pageInfo, pageInfo.md5)
-        // }
+        if (pageInfo.md5 == pageModel.cachePageInfoMd5) {
+          // 缓存一致，不解析
+          Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
+        } else {
+          Logger.debug(TAG, 'getPageInfo 要解析广告')
+          if (pageModel.currentPage == 1) {
+            // 保存缓存
+            CacheData.saveCacheData(CacheData.comPageInfoCacheKey + pageModel.pageId, pageInfo, pageInfo.md5)
+          }
+          //解析页面挂角广告资源
+          pageAdvModel.analysisAdvSource(pageInfo);
+        }
+        Logger.debug(TAG, 'getPageInfo go on')
+        this.parseGroup(pageModel, false)
       }).catch(() => {
       }).catch(() => {
+        if (this.isPageLoaded(pageModel)) {
+          return
+        }
         pageModel.viewType = ViewType.EMPTY;
         pageModel.viewType = ViewType.EMPTY;
         pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_ContentFailed;
         pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_ContentFailed;
       })
       })
     }
     }
   }
   }
 
 
+  private isPageLoaded(pageModel: PageModel) {
+    if (pageModel.compList.size() > 0) {
+      return true
+    }
+    return false
+  }
 
 
   /**
   /**
    * 解析信息流页面楼层数据
    * 解析信息流页面楼层数据
    * @param pageModel
    * @param pageModel
    */
    */
-  async parseGroup(pageModel: PageModel) {
+  async parseGroup(pageModel: PageModel, isCache: boolean) {
     let pageInfo: PageInfoDTO = pageModel.pageInfo
     let pageInfo: PageInfoDTO = pageModel.pageInfo
     pageModel.groupList = []
     pageModel.groupList = []
     pageInfo.pageAdList = []
     pageInfo.pageAdList = []
@@ -177,8 +172,26 @@ export class PageHelper {
       pageModel.groupData = group
       pageModel.groupData = group
 
 
       //Logger.error("ZZZXXXXX", '楼层id-start--》' + pageModel.groupId);
       //Logger.error("ZZZXXXXX", '楼层id-start--》' + pageModel.groupId);
+      let pageDto: PageDTO
+      Logger.debug(TAG, 'parseGroup isCache: ' + isCache)
+      if (isCache) {
+        pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
+        pageModel.cacheGroupInfoMd5 = pageDto.md5
+      } else {
+        pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
+        if (pageDto.md5 == pageModel.cacheGroupInfoMd5) {
+          Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
+          // 缓存数据一致，不再刷新
+          return
+        }
+        Logger.debug(TAG, 'parseGroup cache load, save: ')
+        // 保存缓存
+        CacheData.saveCacheData(CacheData.compGroupInfoDataCacheKey + pageModel.pageId + pageModel.groupId, pageDto,
+          pageDto.md5)
+      }
+      Logger.debug(TAG, 'parseGroup go on')
       // await，确保groups接口顺序执行
       // await，确保groups接口顺序执行
-      let pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
+      // let pageDto = page
       let index = pageInfo.groups.indexOf(group)
       let index = pageInfo.groups.indexOf(group)
 
 
       // 解析楼层组件
       // 解析楼层组件
@@ -197,9 +210,6 @@ export class PageHelper {
         } else {
         } else {
           pageInfo.lastCompSourceType = 0
           pageInfo.lastCompSourceType = 0
         }
         }
-        // // 保存缓存
-        // CacheData.saveCacheData(CacheData.compGroupInfoDataCacheKey + pageModel.pageId + pageModel.groupId, pageDto,
-        //   pageDto.md5)
       }
       }
     }
     }
 
 

@@ -63,6 +63,10 @@ export default class PageModel {
   pageType: number = 0;
   pageType: number = 0;
 
 
   extra: string = ''
   extra: string = ''
+  // 缓存数据相关
+  cachePageInfoMd5: string = ''
+  cacheGroupInfoMd5: string = ''
+
   /**
   /**
    * 简单复制业务数据
    * 简单复制业务数据
    */
    */

@@ -16,6 +16,7 @@ import { HostEnum, HostManager, WDHttp } from 'wdNetwork/Index'
 import { registerRouter } from 'wdRouter/Index'
 import { registerRouter } from 'wdRouter/Index'
 import { TrackingModule } from 'wdTracking/Index'
 import { TrackingModule } from 'wdTracking/Index'
 import { JSON } from '@kit.ArkTS'
 import { JSON } from '@kit.ArkTS'
+import app from '@system.app'
 
 
 const TAG = "[StartupManager]"
 const TAG = "[StartupManager]"
 
 
@@ -36,6 +37,8 @@ export class StartupManager {
   appOnCreate(want: Want, launchParam: AbilityConstant.LaunchParam, context: common.UIAbilityContext) {
   appOnCreate(want: Want, launchParam: AbilityConstant.LaunchParam, context: common.UIAbilityContext) {
     Logger.debug(TAG, "App onCreate: " + `\nwant: ${want}\nlaunchParam: ${launchParam}`)
     Logger.debug(TAG, "App onCreate: " + `\nwant: ${want}\nlaunchParam: ${launchParam}`)
     this.context = context
     this.context = context
+    // 设置图片文件数据缓存上限为200MB (200MB=200*1024*1024B=209715200B)
+    app.setImageFileCacheSize(209715200)
 
 
     // KV存储
     // KV存储
     SPHelper.init(context);
     SPHelper.init(context);