Merge remote-tracking branch 'origin/main'

@@ -12,4 +12,5 @@ export interface commentInfo {
   relType: string;
   relType: string;
   newsType?: string,
   newsType?: string,
   objectType?: string,
   objectType?: string,
+  userType?: number
 }
 }

@@ -186,8 +186,11 @@ export struct ZhSingleRow06 {
           this.loadImg
           this.loadImg
             ? item.operDataList[0]?.commentInfo?.userHeaderUrl
             ? item.operDataList[0]?.commentInfo?.userHeaderUrl
               ? item.operDataList[0].commentInfo.userHeaderUrl
               ? item.operDataList[0].commentInfo.userHeaderUrl
-              : $r('app.media.icon_default_head_mater')
+              : commentViewModel.adjustUserType(item.operDataList[0].commentInfo?.userType)
+                ? $r('app.media.WDAccountOwnerHedaerDefaultIcon')
+                : $r('app.media.WDAccountDefaultIcon')
             : $r('app.media.icon_default_head_mater'))
             : $r('app.media.icon_default_head_mater'))
+
           .width(32)
           .width(32)
           .height(32)
           .height(32)
           .borderRadius(16)
           .borderRadius(16)

@@ -26,6 +26,7 @@ export default struct MinePageUserSimpleInfoUI {
     }else{
     }else{
       this.headPhotoUrl = ""
       this.headPhotoUrl = ""
       this.levelHead = ""
       this.levelHead = ""
+      this.userType = "1"
     }
     }
   }
   }
 
 
@@ -33,12 +34,20 @@ export default struct MinePageUserSimpleInfoUI {
     Row(){
     Row(){
       //头像
       //头像
       Stack(){
       Stack(){
+        if (this.headPhotoUrl.length > 0){
           Image(this.headPhotoUrl)
           Image(this.headPhotoUrl)
-          .alt(this.userType === '1'?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))
+            .alt(this.userType === "1"?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))
             .width(`${this.calcHeight(100)}lpx`)
             .width(`${this.calcHeight(100)}lpx`)
             .height(`${this.calcHeight(100)}lpx`)
             .height(`${this.calcHeight(100)}lpx`)
             .objectFit(ImageFit.Cover)
             .objectFit(ImageFit.Cover)
             .borderRadius(50)
             .borderRadius(50)
+        }else {
+          Image(this.userType === "1"?$r('app.media.default_head'):$r('app.media.AccountOwner_DefaultIcon'))
+            .width(`${this.calcHeight(100)}lpx`)
+            .height(`${this.calcHeight(100)}lpx`)
+            .objectFit(ImageFit.Cover)
+            .borderRadius(50)
+        }
 
 
         if(StringUtils.isNotEmpty(this.levelHead)){
         if(StringUtils.isNotEmpty(this.levelHead)){
           Image(this.levelHead)
           Image(this.levelHead)

-import { Action, CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants, ViewType } from 'wdConstant';
-import PageViewModel from '../../viewmodel/PageViewModel';
-import PageModel from '../../viewmodel/PageModel';
+import { Action } from 'wdBean';
 import router from '@ohos.router';
 import router from '@ohos.router';
-import { CardParser } from '../CardParser';
-import { channelSkeleton } from '../skeleton/channelSkeleton';
-import { ErrorComponent } from '../view/ErrorComponent';
-import { EmptyComponent } from '../view/EmptyComponent';
-import { listTouchEvent } from '../../utils/PullDownRefresh';
 import PageAdModel from '../../viewmodel/PageAdvModel';
 import PageAdModel from '../../viewmodel/PageAdvModel';
-import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
-import RefreshLayout from '../refresh/RefreshLayout';
-import PageNoMoreLayout from './PageNoMoreLayout';
-import { NoMoreBean } from './NoMoreBean';
 import CommonPageTitle from './CommonPageTitle';
 import CommonPageTitle from './CommonPageTitle';
 import TemplatePageComponent from './template/TemplatePageComponent';
 import TemplatePageComponent from './template/TemplatePageComponent';
 import { TemplatePageConstant } from './template/TemplatePageConstant';
 import { TemplatePageConstant } from './template/TemplatePageConstant';

@@ -38,10 +38,12 @@ export class TemplatePageHelp extends BasePageHelp {
       this.treatDiffBusinessDataSource()
       this.treatDiffBusinessDataSource()
     } else if (pageModel.compList.size() > 0) {
     } else if (pageModel.compList.size() > 0) {
       // 加载缓存数据了，不用无网络提示
       // 加载缓存数据了，不用无网络提示
+      this.closeAnimation(this.pageModel.resolve)
     } else {
     } else {
         // 无网情况
         // 无网情况
         this.pageModel.pageCompType = TemplatePageStateType.OTHER
         this.pageModel.pageCompType = TemplatePageStateType.OTHER
         this.pageModel.noNormalState = WDViewDefaultType.WDViewDefaultType_NoNetwork
         this.pageModel.noNormalState = WDViewDefaultType.WDViewDefaultType_NoNetwork
+
     }
     }
   }
   }
 
 
@@ -293,6 +295,12 @@ export class TemplatePageHelp extends BasePageHelp {
     }
     }
 
 
   }
   }
+
+  private closeAnimation(resolve?: (value: string | PromiseLike<string>) => void) {
+    if (resolve) {
+        resolve('')
+    }
+  }
 }
 }
 
 
 
 

@@ -44,9 +44,10 @@ export struct CustomPullToRefresh {
               this.onRefresh(resolve)
               this.onRefresh(resolve)
             }).then((text) => {
             }).then((text) => {
               setTimeout(()=>{
               setTimeout(()=>{
+                this.refreshDestroy()
                 // 延时500，展示第二段动画 TODO 是否去掉？
                 // 延时500，展示第二段动画 TODO 是否去掉？
+                if(text){
                   this.refreshState = 3
                   this.refreshState = 3
-                this.refreshDestroy()
                   setTimeout(() => {
                   setTimeout(() => {
                     success(text)
                     success(text)
                   }, 500)
                   }, 500)
@@ -54,6 +55,11 @@ export struct CustomPullToRefresh {
                     this.refreshState = 4
                     this.refreshState = 4
                     // 延时将状态改为空闲，组件closeRefresh做了延时，不能配置，这里配合延时
                     // 延时将状态改为空闲，组件closeRefresh做了延时，不能配置，这里配合延时
                   }, 1200)
                   }, 1200)
+                }else {
+                  success(text)
+                  this.refreshState = 4
+                }
+
               },500)
               },500)
             })
             })
           });
           });

@@ -7,7 +7,7 @@
   "main": "",
   "main": "",
   "version": "1.0.0",
   "version": "1.0.0",
   "dependencies": {
   "dependencies": {
-    "@ohos/lottie": "2.0.10",
+    "@ohos/lottie": "v2.0.11-rc.6",
     "wdComponent": "file:../../features/wdComponent",
     "wdComponent": "file:../../features/wdComponent",
     "wdConstant": "file:../../commons/wdConstant",
     "wdConstant": "file:../../commons/wdConstant",
     "wdKit": "file:../../commons/wdKit",
     "wdKit": "file:../../commons/wdKit",