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

* 'main' of http://192.168.1.42/developOne/harmonyPool: (49 commits)
  feat(金刚卡)：点击跳转到专题页
  禅道:16610 早晚报时间样式,字体大小及背景样式鸿蒙与安卓不一致
  fix: 16851 人民号分享名片与分享按钮icon点击无反应
  fix: 16734 人民号-推荐页面下的关注按钮与标题重叠
  fix:bug[16812]人民号--搜索下的无图片信息的人民号号主头像鸿蒙与安卓不一致
  图集人民号点击头像跳转到号主页，对接评论点赞组合组件
  修复绑定账号异常提示
  fix: 16734 人民号-推荐页面下的关注按钮与标题重叠
  fix:bug[16837]用户评论任意详情页返回我的-评论后未能获取到评论内容
  fix: 16809 人民号下我的关注图标样式鸿蒙与安卓不一致
  fix:16809 人民号下我的关注图标样式鸿蒙与安卓不一致
  jira: desc:16656 人民号主页中的“+关注”的样式鸿蒙与安卓不一致
  jira: desc:16768 【uat】号主页，号主信息和内容标签tab间距过大
  fix: 16578 进入直播列表。直播预约按钮和时间没有显示
  feat(动态)：已关注状态处理
  ref |> Revert "ref |> 新增友盟统计"
  Revert "ref |> 新增埋点封装"
  ref |> 统一 OS、Channel公参字段
  修复验证码bug
  fix:CardMediaInfo取值兼容
  ...

@@ -23,6 +23,10 @@
     {
     {
       "name": "load_net_data_none",
       "name": "load_net_data_none",
       "value": "no data"
       "value": "no data"
+    },
+    {
+      "name": "location_reason",
+      "value": " "
     }
     }
   ]
   ]
 }
 }

@@ -53,5 +53,15 @@ export class AppUtils {
     }
     }
     return '';
     return '';
   }
   }
+
+  static getAppChannel() {
+    // TODO: 待确认，暂时写死一个
+    return "rmrb_china_0000"
+  }
+
+  static getOSName() {
+    // TODO: 待确认，暂时写死Android
+    return "Harmony"
+  }
 }
 }
 
 

@@ -70,10 +70,16 @@ export class DeviceUtil {
   }
   }
 
 
   /**
   /**
+   * 获取设备型号： HUAWEI Mate 60 Pro
+   */
+  static getMarketName() {
+    return deviceInfo.marketName
+  }
+
+  /**
    * 客户端日志链路追踪traceid生成：在每个请求头加上参数Key：EagleEye-TraceID ，value为32位生成随机值
    * 客户端日志链路追踪traceid生成：在每个请求头加上参数Key：EagleEye-TraceID ，value为32位生成随机值
    */
    */
   static getRandomUUIDForTraceID(): string {
   static getRandomUUIDForTraceID(): string {
-    deviceInfo.productModel
-    return util.generateRandomUUID().toUpperCase().replace('-', '')
+    return util.generateRandomUUID().toUpperCase().replace(/-/g, '')
   }
   }
 }
 }

@@ -6,6 +6,9 @@
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
   "specifiers": {
     "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",
     "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",
+    "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",
+    "@umeng/common@^1.0.21": "@umeng/common@1.0.21",
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
     "wdConstant@../wdConstant": "wdConstant@../wdConstant",
     "wdConstant@../wdConstant": "wdConstant@../wdConstant",
     "wdKit@../wdKit": "wdKit@../wdKit"
     "wdKit@../wdKit": "wdKit@../wdKit"
   },
   },
@@ -16,6 +19,26 @@
       "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",
       "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",
       "registryType": "ohpm"
       "registryType": "ohpm"
     },
     },
+    "@umeng/analytics@1.0.19": {
+      "name": "@umeng/analytics",
+      "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",
+      "registryType": "ohpm"
+    },
+    "@umeng/common@1.0.21": {
+      "name": "@umeng/common",
+      "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",
+      "registryType": "ohpm",
+      "dependencies": {
+        "libcommon.so": "./src/main/cpp/types/libcommon"
+      }
+    },
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {
+      "name": "libcommon.so",
+      "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
+      "registryType": "local"
+    },
     "wdConstant@../wdConstant": {
     "wdConstant@../wdConstant": {
       "name": "wdconstant",
       "name": "wdconstant",
       "resolved": "../wdConstant",
       "resolved": "../wdConstant",
@@ -24,7 +47,11 @@
     "wdKit@../wdKit": {
     "wdKit@../wdKit": {
       "name": "wdkit",
       "name": "wdkit",
       "resolved": "../wdKit",
       "resolved": "../wdKit",
-      "registryType": "local"
+      "registryType": "local",
+      "dependencies": {
+        "@umeng/common": "^1.0.21",
+        "@umeng/analytics": "^1.0.19"
+      }
     }
     }
   }
   }
 }
 }

 import { SpConstants } from 'wdConstant';
 import { SpConstants } from 'wdConstant';
-import { DateTimeUtils, DeviceUtil, SPHelper, StringUtils } from 'wdKit';
+import { AppUtils, DateTimeUtils, DeviceUtil, SPHelper, StringUtils } from 'wdKit';
 import { HttpUtils } from '../utils/HttpUtils';
 import { HttpUtils } from '../utils/HttpUtils';
 import { HostEnum, HostManager } from './HttpHostManager';
 import { HostEnum, HostManager } from './HttpHostManager';
 
 
@@ -11,16 +11,16 @@ export class HttpParams {
     let headers: Record<string, string> = {};
     let headers: Record<string, string> = {};
     // 通用请求头
     // 通用请求头
     headers['User-Agent'] = 'Dalvik/2.1.0 (Linux; U; Android 13; 22101317C Build/TKQ1.221013.002)' // TODO
     headers['User-Agent'] = 'Dalvik/2.1.0 (Linux; U; Android 13; 22101317C Build/TKQ1.221013.002)' // TODO
-    headers['channel'] = 'rmrb_china_0000' // 自有渠道
+    headers['channel'] = AppUtils.getAppChannel()
     headers['plat'] = DeviceUtil.getPlat()
     headers['plat'] = DeviceUtil.getPlat()
     headers['Content-Type'] = 'application/json; charset=utf-8'
     headers['Content-Type'] = 'application/json; charset=utf-8'
     headers['device_id'] = DeviceUtil.clientId()
     headers['device_id'] = DeviceUtil.clientId()
     headers['build_version'] = HttpParams.getVersion()
     headers['build_version'] = HttpParams.getVersion()
     headers['adcode'] = HttpUtils.getProvinceCode()
     headers['adcode'] = HttpUtils.getProvinceCode()
     headers['os_version'] = DeviceUtil.getOsVersion()
     headers['os_version'] = DeviceUtil.getOsVersion()
-    headers['system'] = 'Android' // TODO 后续是否新增鸿蒙标识
-    headers['versionCode'] = HttpParams.getVersionCode()
-    headers['version_name'] = HttpParams.getVersionName()
+    headers['system'] = AppUtils.getOSName()
+    headers['versionCode'] = AppUtils.getAppVersionCode()
+    headers['version_name'] = AppUtils.getAppVersionName()
     headers['EagleEye-TraceID'] = DeviceUtil.getRandomUUIDForTraceID()
     headers['EagleEye-TraceID'] = DeviceUtil.getRandomUUIDForTraceID()
     headers['imei'] = DeviceUtil.clientId()
     headers['imei'] = DeviceUtil.clientId()
     headers['Accept-Language'] = 'zh'
     headers['Accept-Language'] = 'zh'

@@ -67,7 +67,7 @@ export class ProcessUtils {
       linkUrl: advert.linkUrl,
       linkUrl: advert.linkUrl,
       pageId: advert.pageId,
       pageId: advert.pageId,
       objectId: advert.objectId,
       objectId: advert.objectId,
-      objectType: advert.objectType,
+      objectType: advert.objectType.toString(),
       relId: advert.relId,
       relId: advert.relId,
       bottomNavId: advert.bottomNavId
       bottomNavId: advert.bottomNavId
     } as ContentDTO;
     } as ContentDTO;
@@ -124,6 +124,7 @@ export class ProcessUtils {
     //动态详情页（动态图文）
     //动态详情页（动态图文）
       case ContentConstants.TYPE_FOURTEEN:
       case ContentConstants.TYPE_FOURTEEN:
         ProcessUtils.gotoDynamicDetailPage(content);
         ProcessUtils.gotoDynamicDetailPage(content);
+        break;
     //动态详情页（动态视频）
     //动态详情页（动态视频）
       case ContentConstants.TYPE_FIFTEEN:
       case ContentConstants.TYPE_FIFTEEN:
         ProcessUtils.gotoDynamicDetailPage(content);
         ProcessUtils.gotoDynamicDetailPage(content);
@@ -322,6 +323,8 @@ export class ProcessUtils {
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,
+          extra: content?.extra,
+          title: content?.newsTitle
         } as ExtraDTO
         } as ExtraDTO
       } as Params,
       } as Params,
     };
     };

@@ -9,13 +9,17 @@ import router from '@ohos.router';
 import Url from '@ohos.url'
 import Url from '@ohos.url'
 import { ContentDTO, PhotoListBean } from 'wdBean';
 import { ContentDTO, PhotoListBean } from 'wdBean';
 import { handleJsCallAppService } from './JsCallAppService'
 import { handleJsCallAppService } from './JsCallAppService'
-
+import { HttpUtils } from 'wdNetwork/Index';
 const TAG = 'JsBridgeBiz'
 const TAG = 'JsBridgeBiz'
 
 
 class AppInfo {
 class AppInfo {
   plat: string = ''
   plat: string = ''
   system: string = ''
   system: string = ''
   networkStatus: number = 1
   networkStatus: number = 1
+  screenStatusBarHeight: number = 40 // TODO 这里需要动态获取
+  screenTabbarSafeHeight: number = 42 // TODO 这里需要动态获取
+  imei: string = HttpUtils.getImei()
+  device_id: string = HttpUtils.getDeviceId()
   // TODO 完善
   // TODO 完善
 }
 }
 
 

@@ -4,6 +4,7 @@ import { Logger } from 'wdKit/Index';
 import { performJSCallNative } from './JsBridgeBiz';
 import { performJSCallNative } from './JsBridgeBiz';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
+import { DateTimeUtils } from 'wdKit'
 
 
 const TAG = 'WdWebLocalComponent';
 const TAG = 'WdWebLocalComponent';
 
 
@@ -22,6 +23,13 @@ export struct WdWebLocalComponent {
   @State positionLeft: number = 0
   @State positionLeft: number = 0
   @State positionTop: number = 0
   @State positionTop: number = 0
   @State videoLandscape: string = '1'
   @State videoLandscape: string = '1'
+  @State curRate: PlaybackSpeed = PlaybackSpeed.Speed_Forward_1_00_X
+  @State sliderStartTime: string = '';
+  @State currentTime: number = 0;
+  @State durationTime: number = 0;
+  @State durationStringTime: string = '';
+  @State isPause: boolean = true;
+  controller: VideoController = new VideoController()
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -77,12 +85,78 @@ export struct WdWebLocalComponent {
             })
             })
 
 
           if (this.videoUrl) {
           if (this.videoUrl) {
-            Video({ src: this.videoUrl })
+            Stack({ alignContent: Alignment.Bottom }) {
+              Video({
+                src: this.videoUrl,
+                currentProgressRate: this.curRate,
+                controller: this.controller
+              })
+                .borderRadius(5)
+                .controls(false)
                 .autoPlay(true)
                 .autoPlay(true)
                 .objectFit(ImageFit.Contain)
                 .objectFit(ImageFit.Contain)
+                .onStart(() => {
+                  this.isPause = false
+                })
+                .onPause(() => {
+                  this.isPause = true
+                })
+                .onPrepared((event) => {
+                  if (event) {
+                    this.durationTime = event.duration
+                  }
+                })
+                .onUpdate((event) => {
+                  if (event) {
+                    this.currentTime = event.time
+                  }
+                })
+              Row() {
+                Image($r(this.isPause ? 'app.media.icon_play' : 'app.media.icon_pause'))
+                  .width(24)
+                  .height(24)
+                  .onClick(()=>{
+                    if(this.isPause){
+                      this.controller.start()
+                    }else{
+                      this.controller.pause()
+                    }
+                  })
+                Row() {
+                  Text(DateTimeUtils.getFormattedDuration(this.currentTime * 1000)).fontSize(12).fontColor(Color.White).fontWeight(600)
+                  Slider({
+                    value: this.currentTime,
+                    min: 0,
+                    max: this.durationTime
+                  })
+                    .width("50%")
+                    .selectedColor('#ED2800')
+                    .margin({ left: 4, right: 4 })
+                    // .blockStyle({
+                    //   type: SliderBlockType.IMAGE,
+                    //   image: $r('app.media.slider_block')
+                    // })
+                    // .blockSize({ width: 18, height: 12 })
+                    .onChange((value: number, mode: SliderChangeMode) => {
+                      this.controller.setCurrentTime(value);
+                    })
+                  Text(DateTimeUtils.getFormattedDuration(this.durationTime * 1000)).fontSize(12).fontColor(Color.White).fontWeight(600)
+                }
+                .justifyContent(FlexAlign.Center)
+
+                Image($r('app.media.icon_full_screen'))
+                  .width(24)
+                  .height(24)
+                  .onClick(()=>{
+                    this.controller.requestFullscreen(true)
+                  })
+              }
+              .opacity(0.8)
+              .width("100%")
+              .justifyContent(FlexAlign.SpaceAround)
+            }
             .width(this.positionWidth)
             .width(this.positionWidth)
             .height(this.positionHeight)
             .height(this.positionHeight)
-              .borderRadius(5)
             .alignRules({
             .alignRules({
               top: { anchor: "__container__", align: VerticalAlign.Top },
               top: { anchor: "__container__", align: VerticalAlign.Top },
             })
             })
@@ -92,7 +166,6 @@ export struct WdWebLocalComponent {
             })
             })
             .id("video")
             .id("video")
           }
           }
-
         }
         }
       }.width('100%')
       }.width('100%')
       .height(this.webHeight)
       .height(this.webHeight)

@@ -130,8 +130,6 @@ export { LiveInfoDTO } from './src/main/ets/bean/detail/LiveInfoDTO';
 
 
 export { postRecommendListParams } from './src/main/ets/bean/detail/postRecommendListParams';
 export { postRecommendListParams } from './src/main/ets/bean/detail/postRecommendListParams';
 
 
-export { postThemeListParams } from './src/main/ets/bean/detail/postThemeListParams';
-
 export { LiveDTO } from './src/main/ets/bean/peoples/LiveDTO';
 export { LiveDTO } from './src/main/ets/bean/peoples/LiveDTO';
 
 
 export { contentVideosDTO } from './src/main/ets/bean/content/contentVideosDTO';
 export { contentVideosDTO } from './src/main/ets/bean/content/contentVideosDTO';
@@ -165,3 +163,7 @@ export {
   AttentionBatchDTO,
   AttentionBatchDTO,
   CreatorDTO
   CreatorDTO
 } from './src/main/ets/bean/peoples/AttentionBatchDTO';
 } from './src/main/ets/bean/peoples/AttentionBatchDTO';
+
+export { GoldenPositionExtraBean } from './src/main/ets/bean/content/GoldenPositionExtraBean';
+export { ClassBean } from './src/main/ets/bean/content/ClassBean';
+export { CreatorsBean } from './src/main/ets/bean/content/CreatorsBean';

@@ -17,4 +17,6 @@ export interface ExtraDTO extends ItemDTO {
   photoList: PhotoListBean[];
   photoList: PhotoListBean[];
   swiperIndex?: number
   swiperIndex?: number
   commentId?: string;
   commentId?: string;
+  extra?:string
+  title: string
 }
 }

+import { FullColumnImgUrlDTO } from '../detail/FullColumnImgUrlDTO';
+import { LiveInfoDTO } from '../detail/LiveInfoDTO';
+import { VideoInfoDTO } from '../detail/VideoInfoDTO';
+import { InteractDataDTO } from './InteractDataDTO';
+import { slideShows } from '../morningevening/slideShows';
+import { VoiceInfoDTO } from '../detail/VoiceInfoDTO';
+import { RmhInfoDTO } from '../detail/RmhInfoDTO';
+import { commentInfo } from './commentInfo';
+import { ArrayList } from '@kit.ArkTS';
+
+export interface ClassBean {
+  secondClassifyName:string
+  classifyName:string
+}

@@ -83,4 +83,5 @@ export interface ContentDTO {
   bottomNavId:string;
   bottomNavId:string;
   // 链接类型： 0：无链接；1：内链（文章）；2：外链
   // 链接类型： 0：无链接；1：内链（文章）；2：外链
   openType:string
   openType:string
+  extra:string
 }
 }

+export interface CreatorsBean {
+  id:number
+  name:string
+}

+import { ArrayList } from '@kit.ArkTS';
+import { ClassBean } from './ClassBean';
+import { CreatorsBean } from './CreatorsBean';
+
+export interface GoldenPositionExtraBean {
+  sort:number
+  pageNum:number
+  pageSize:number
+  channelId:string
+  topicId:string
+  keyWord:string
+  aggregateType:string
+  poolCode:string
+  showPublishStartTime:string
+  showPublishEndTime:string
+  keywordsType:string
+  keywords:ArrayList<string>
+  classifys: ArrayList<ClassBean>
+  creatorTags: ArrayList<CreatorsBean>
+}

@@ -18,4 +18,5 @@ export interface RmhInfoDTO {
   rmhName: string;
   rmhName: string;
   userId: string;
   userId: string;
   userType: string;
   userType: string;
+  honoraryIcon:string;
 }
 }

-export interface postThemeListParams {
-  sort: number;
-  pageNum: number;
-  pageSize: number;
-}

@@ -25,6 +25,7 @@ import { Card2Component } from './cardview/Card2Component';
 import { Card5Component } from './cardview/Card5Component';
 import { Card5Component } from './cardview/Card5Component';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
+import PageModel from '../viewmodel/PageModel';
 
 
 /**
 /**
  * comp适配器.
  * comp适配器.
@@ -34,7 +35,9 @@ import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 @Component
 @Component
 export struct CompParser {
 export struct CompParser {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
-  compIndex: number = 0;
+
+  @State private pageModel: PageModel = new PageModel();
+  @State compIndex: number = 0;
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -44,7 +47,7 @@ export struct CompParser {
 
 
   @Builder
   @Builder
   componentBuilder(compDTO: CompDTO, compIndex: number) {
   componentBuilder(compDTO: CompDTO, compIndex: number) {
-    if (compDTO.operDataList[0]?.objectType !== '3' && compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
+    //if (compDTO.operDataList[0]?.objectType !== '3' && compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
     if (compDTO.compStyle === CompStyle.Label_03) {
     if (compDTO.compStyle === CompStyle.Label_03) {
       LabelComponent({ compDTO: compDTO })
       LabelComponent({ compDTO: compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -100,7 +103,8 @@ export struct CompParser {
       ZhSingleColumn09({ compDTO })
       ZhSingleColumn09({ compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } else if (compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
     } else if (compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
-      AdvCardParser({compDTO})
+      AdvCardParser({pageModel:this.pageModel,compDTO})
+      //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
       CardParser({ contentDTO: compDTO.operDataList[0] });
       CardParser({ contentDTO: compDTO.operDataList[0] });
@@ -119,6 +123,6 @@ export struct CompParser {
     }
     }
   }
   }
 
 
-  }
+ // }
 }
 }
 
 

@@ -97,15 +97,29 @@ export struct DynamicDetailComponent {
                     .height($r('app.float.margin_32'))
                     .height($r('app.float.margin_32'))
                     .objectFit(ImageFit.Cover)
                     .objectFit(ImageFit.Cover)
                     .borderRadius($r('app.float.margin_16'))
                     .borderRadius($r('app.float.margin_16'))
-                  Image($r('app.media.icon_border_test'))
+                  Image(this.contentDetailData.rmhInfo?.honoraryIcon)
                     .width($r('app.float.margin_48'))
                     .width($r('app.float.margin_48'))
                     .height($r('app.float.margin_48'))
                     .height($r('app.float.margin_48'))
                     .objectFit(ImageFit.Cover)
                     .objectFit(ImageFit.Cover)
                     .borderRadius($r('app.float.margin_24'))
                     .borderRadius($r('app.float.margin_24'))
+                  if(!StringUtils.isEmpty(this.contentDetailData.rmhInfo?.authIcon)){
+                    Stack() {
+                      Image(this.contentDetailData.rmhInfo?.authIcon)
+                        .width($r('app.float.vp_12'))
+                        .height($r('app.float.vp_12'))
+                        .objectFit(ImageFit.Cover)
+                    }
+                    .width($r('app.float.margin_48'))
+                    .height($r('app.float.margin_48'))
+                    .alignContent(Alignment.BottomEnd)
+                  }
                 }
                 }
                 .width($r('app.float.margin_48'))
                 .width($r('app.float.margin_48'))
                 .height($r('app.float.margin_48'))
                 .height($r('app.float.margin_48'))
                 .alignContent(Alignment.Center)
                 .alignContent(Alignment.Center)
+                .onClick(() => {
+                  ProcessUtils.gotoPeopleShipHomePage(this.contentDetailData.rmhInfo == null ?"":this.contentDetailData.rmhInfo.rmhId)
+                })
                 Column(){
                 Column(){
                   //昵称
                   //昵称
                   Text(this.contentDetailData.rmhInfo?.rmhName)
                   Text(this.contentDetailData.rmhInfo?.rmhName)
@@ -128,7 +142,7 @@ export struct DynamicDetailComponent {
                 .margin({right: $r('app.float.margin_6')})
                 .margin({right: $r('app.float.margin_6')})
                 if(!StringUtils.isEmpty(this.followStatus)){
                 if(!StringUtils.isEmpty(this.followStatus)){
                   if (this.followStatus == '0') {
                   if (this.followStatus == '0') {
-                    Text('关注')
+                    Text('+关注')
                       .width($r('app.float.margin_54'))
                       .width($r('app.float.margin_54'))
                       .height($r('app.float.margin_24'))
                       .height($r('app.float.margin_24'))
                       .textAlign(TextAlign.Center)
                       .textAlign(TextAlign.Center)
@@ -147,7 +161,8 @@ export struct DynamicDetailComponent {
                       .textAlign(TextAlign.Center)
                       .textAlign(TextAlign.Center)
                       .fontSize($r('app.float.font_size_12'))
                       .fontSize($r('app.float.font_size_12'))
                       .borderRadius($r('app.float.vp_3'))
                       .borderRadius($r('app.float.vp_3'))
-                      .borderColor($r('app.color.color_CCCCCC'))
+                      .borderColor($r('app.color.color_CCCCCC_1A'))
+                      .backgroundColor($r('app.color.color_CCCCCC_1A'))
                       .fontColor($r('app.color.color_CCCCCC'))
                       .fontColor($r('app.color.color_CCCCCC'))
                       .onClick(() => {
                       .onClick(() => {
                         this.handleAccention()
                         this.handleAccention()
@@ -300,7 +315,7 @@ export struct DynamicDetailComponent {
                       }
                       }
                     }
                     }
                   }
                   }
-                  .padding({ left: this.contentDetailData.videoInfo[0].videoLandScape === 1?0: 16,top: $r('app.float.margin_8')})
+                  .padding({ left: this.contentDetailData.videoInfo[0].videoLandScape === 1?0: 25,top: $r('app.float.margin_8')})
                   .onClick((event: ClickEvent) => {
                   .onClick((event: ClickEvent) => {
                     ProcessUtils.processPage(this.mJumpInfo)
                     ProcessUtils.processPage(this.mJumpInfo)
                   })
                   })
@@ -312,8 +327,8 @@ export struct DynamicDetailComponent {
                 .fontSize($r('app.float.font_size_12'))
                 .fontSize($r('app.float.font_size_12'))
                 .lineHeight($r('app.float.margin_16'))
                 .lineHeight($r('app.float.margin_16'))
                 .margin({ top: $r('app.float.margin_16')
                 .margin({ top: $r('app.float.margin_16')
-                ,left: $r('app.float.margin_16')
-                ,right: $r('app.float.margin_16') })
+                ,left: $r('app.float.vp_12')
+                ,right: $r('app.float.vp_12') })
               //微信/朋友圈/微博
               //微信/朋友圈/微博
               Row(){
               Row(){
                 Image($r('app.media.xxhdpi_pic_wechat'))
                 Image($r('app.media.xxhdpi_pic_wechat'))

-import { Logger, NumberFormatterUtils, DateTimeUtils, EmitterUtils, EmitterEventId, NetworkUtil } from 'wdKit';
+import {
+  Logger,
+  NumberFormatterUtils,
+  DateTimeUtils,
+  EmitterUtils,
+  EmitterEventId,
+  NetworkUtil,
+  DisplayUtils
+} from 'wdKit';
 import {
 import {
   Action,
   Action,
   ContentDetailDTO,
   ContentDetailDTO,
@@ -41,6 +49,7 @@ export struct ImageAndTextPageComponent {
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State operationButtonList: string[] = ['comment', 'collect', 'share']
   @State operationButtonList: string[] = ['comment', 'collect', 'share']
   @State isNetConnected: boolean = true
   @State isNetConnected: boolean = true
+  @State info: Area | null = null
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -131,8 +140,11 @@ export struct ImageAndTextPageComponent {
                 Divider().strokeWidth(6).color('#f5f5f5')
                 Divider().strokeWidth(6).color('#f5f5f5')
                 CommentComponent({
                 CommentComponent({
                   publishCommentModel: this.publishCommentModel
                   publishCommentModel: this.publishCommentModel
+                }).onAreaChange((oldValue: Area, newValue: Area) => {
+                  this.info = newValue
                 })
                 })
                 // .onMeasureSize()
                 // .onMeasureSize()
+
               }
               }
             }
             }
           }
           }
@@ -144,29 +156,26 @@ export struct ImageAndTextPageComponent {
         .scrollBar(BarState.Off)
         .scrollBar(BarState.Off)
         .align(Alignment.Top)
         .align(Alignment.Top)
 
 
-        if(!this.isNetConnected) {
+        if (!this.isNetConnected) {
           EmptyComponent({
           EmptyComponent({
             emptyType: 1,
             emptyType: 1,
             emptyButton: true,
             emptyButton: true,
             retry: () => {
             retry: () => {
               this.getDetail()
               this.getDetail()
             }
             }
-          })
-        }else{
+          }).padding({ bottom: 200 })
+        } else {
           if (!this.isPageEnd) {
           if (!this.isPageEnd) {
             detailedSkeleton()
             detailedSkeleton()
           }
           }
         }
         }
-
         //底部交互区
         //底部交互区
-        if (this.contentDetailData?.length) {
         OperRowListView({
         OperRowListView({
           contentDetailData: this.contentDetailData[0],
           contentDetailData: this.contentDetailData[0],
           publishCommentModel: this.publishCommentModel,
           publishCommentModel: this.publishCommentModel,
           operationButtonList: this.operationButtonList,
           operationButtonList: this.operationButtonList,
         })
         })
       }
       }
-      }
 
 
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
@@ -308,7 +317,16 @@ export struct ImageAndTextPageComponent {
       if (targetId) {
       if (targetId) {
         if (targetId == this.publishCommentModel.targetId) {
         if (targetId == this.publishCommentModel.targetId) {
           // 滚动到评论列表
           // 滚动到评论列表
-
+          if (this.info) {
+            // let height = DisplayUtils.getDeviceHeight() / 2
+            let offSetY = this.info?.globalPosition.y as number
+            //头部距离48
+            this.scroller.scrollTo({
+              yOffset: offSetY - 100,
+              xOffset: 0,
+              animation: { duration: 1000, curve: Curve.Ease }
+            })
+          }
         }
         }
       }
       }
     })
     })

 // import { FrontLinkObject, MorningEveningPaperDTO, PageInfoBean } from 'wdBean';
 // import { FrontLinkObject, MorningEveningPaperDTO, PageInfoBean } from 'wdBean';
 import { CompList, PageInfoBean } from 'wdBean';
 import { CompList, PageInfoBean } from 'wdBean';
-import { DateTimeUtils, Logger, SPHelper } from 'wdKit/Index';
+import { DateTimeUtils, Logger, SPHelper, WindowModel } from 'wdKit/Index';
 import { PaperReaderSimpleDialog } from '../../dialog/PaperReaderDialog';
 import { PaperReaderSimpleDialog } from '../../dialog/PaperReaderDialog';
 import { MorningEveningViewModel } from '../../viewmodel/MorningEveningViewModel';
 import { MorningEveningViewModel } from '../../viewmodel/MorningEveningViewModel';
 // import { AudioBarView } from './AudioBarView';
 // import { AudioBarView } from './AudioBarView';
@@ -102,6 +102,7 @@ export struct MorningEveningPaperComponent {
   async aboutToAppear() {
   async aboutToAppear() {
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
     await windowHight.setWindowLayoutFullScreen(true);
     await windowHight.setWindowLayoutFullScreen(true);
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     this.topSafeHeight = px2vp(windowHight.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
     this.topSafeHeight = px2vp(windowHight.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
 
 
     let dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
     let dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
@@ -173,6 +174,7 @@ export struct MorningEveningPaperComponent {
   async aboutToDisappear() {
   async aboutToDisappear() {
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
     let windowHight: window.Window = await window.getLastWindow(getContext(this));
     await windowHight.setWindowLayoutFullScreen(false);
     await windowHight.setWindowLayoutFullScreen(false);
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
   }
   }
 
 
   onPageHide() {
   onPageHide() {

@@ -34,7 +34,7 @@ export struct PaperTitleComponent {
         Text(this.subTitle ?? '')// Text('2024年\n1月16日')
         Text(this.subTitle ?? '')// Text('2024年\n1月16日')
           // .width(50)
           // .width(50)
           .margin({ left: 5 })
           .margin({ left: 5 })
-          .fontSize(12)
+          .fontSize(8)
           .fontColor($r('app.color.white'))
           .fontColor($r('app.color.white'))
           .maxLines(2)
           .maxLines(2)
 
 
@@ -47,7 +47,8 @@ export struct PaperTitleComponent {
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
       .alignRules({
       .alignRules({
         left: { anchor: "img_logo1", align: HorizontalAlign.End },
         left: { anchor: "img_logo1", align: HorizontalAlign.End },
-        center: { anchor: "__container__", align: VerticalAlign.Center } })
+        center: { anchor: "__container__", align: VerticalAlign.Center }
+      })
       .id('row_paper_date')
       .id('row_paper_date')
 
 
       Image($r('app.media.icon_close'))
       Image($r('app.media.icon_close'))
@@ -55,7 +56,8 @@ export struct PaperTitleComponent {
         .width($r('app.float.top_arrow_size'))
         .width($r('app.float.top_arrow_size'))
         .alignRules({
         .alignRules({
           right: { anchor: "__container__", align: HorizontalAlign.End },
           right: { anchor: "__container__", align: HorizontalAlign.End },
-          center: { anchor: "__container__", align: VerticalAlign.Center } })
+          center: { anchor: "__container__", align: VerticalAlign.Center }
+        })
         .id('img_close')
         .id('img_close')
         .onClick((event: ClickEvent) => {
         .onClick((event: ClickEvent) => {
           // console.info(TAG, "img_close")
           // console.info(TAG, "img_close")
@@ -68,11 +70,12 @@ export struct PaperTitleComponent {
         .width($r('app.float.top_arrow_size'))
         .width($r('app.float.top_arrow_size'))
         .alignRules({
         .alignRules({
           right: { anchor: "img_close", align: HorizontalAlign.Start },
           right: { anchor: "img_close", align: HorizontalAlign.Start },
-          center: { anchor: "__container__", align: VerticalAlign.Center } })
+          center: { anchor: "__container__", align: VerticalAlign.Center }
+        })
         .id('img_share')
         .id('img_share')
         .margin({ right: 13 })
         .margin({ right: 13 })
     }
     }
-    // .margin({ left: 14, right: 14 })
+    .margin({ left: 14, right: 14 })
     .height($r('app.float.top_bar_height'))
     .height($r('app.float.top_bar_height'))
 
 
     // .backgroundColor(Color.Black)
     // .backgroundColor(Color.Black)

@@ -5,7 +5,8 @@ import {
   PhotoListBean,
   PhotoListBean,
   postInteractBrowsOperateParams,
   postInteractBrowsOperateParams,
   postBatchAttentionStatusParams,
   postBatchAttentionStatusParams,
-  postInteractAccentionOperateParams
+  postInteractAccentionOperateParams,
+  Params
 } from 'wdBean';
 } from 'wdBean';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import display from '@ohos.display';
 import display from '@ohos.display';
@@ -44,6 +45,7 @@ export struct MultiPictureDetailPageComponent {
   @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State showDownload: Boolean = false // 控制是否显示下载默认隐藏
   @State showDownload: Boolean = false // 控制是否显示下载默认隐藏
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
+  @State operationButtonList: string[] = ['comment', 'like', 'collect', 'share']
 
 
   //watch监听页码回调
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
@@ -98,19 +100,31 @@ export struct MultiPictureDetailPageComponent {
     if (this.contentDetailData.rmhPlatform == 1) {
     if (this.contentDetailData.rmhPlatform == 1) {
       Row() {
       Row() {
         Row({ space: 8 }) {
         Row({ space: 8 }) {
+          if (this.getImgUrl()){
             Row() {
             Row() {
-            Image(this.contentDetailData?.rmhInfo?.rmhHeadUrl)
+              Image(this.getImgUrl())
                 .borderRadius(24)
                 .borderRadius(24)
                 .aspectRatio(1)
                 .aspectRatio(1)
                 .border({ width: 1, color: Color.White, style: BorderStyle.Solid })
                 .border({ width: 1, color: Color.White, style: BorderStyle.Solid })
-              .alt($r('app.media.picture_loading'))
                 .width(36)
                 .width(36)
                 .height(36)
                 .height(36)
                 .objectFit(ImageFit.Fill)
                 .objectFit(ImageFit.Fill)
                 .interpolation(ImageInterpolation.High)
                 .interpolation(ImageInterpolation.High)
+                .onClick(() => {
+                  if (this.contentDetailData.rmhInfo?.cnMainControl === 1) {
+                    // 号主页
+                    const params: Params = {
+                      creatorId: this.contentDetailData.rmhInfo.rmhId,
+                      pageID: ''
+                    }
+                    WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
+                  }
+
+                })
             }
             }
             .width('13%')
             .width('13%')
             .height('100%')
             .height('100%')
+          }
 
 
           Row() {
           Row() {
             Flex({
             Flex({
@@ -190,6 +204,7 @@ export struct MultiPictureDetailPageComponent {
         middle: { anchor: "__container__", align: HorizontalAlign.Center }
         middle: { anchor: "__container__", align: HorizontalAlign.Center }
       })
       })
       .id('e_attention')
       .id('e_attention')
+      .visibility(!this.showDownload ? Visibility.Visible : Visibility.None)
     }
     }
     if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
     if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
       Swiper(this.swiperController) {
       Swiper(this.swiperController) {
@@ -305,10 +320,8 @@ export struct MultiPictureDetailPageComponent {
         OperRowListView({
         OperRowListView({
           contentDetailData: this.contentDetailData,
           contentDetailData: this.contentDetailData,
           publishCommentModel: this.publishCommentModel,
           publishCommentModel: this.publishCommentModel,
+          operationButtonList: this.operationButtonList,
         })
         })
-          .width('100%')
-          .height(56)
-          .border({ width: { top: 0.5 }, color: '#FFFFFF' })
       }
       }
       .visibility(!this.showDownload ? Visibility.Visible : Visibility.None)
       .visibility(!this.showDownload ? Visibility.Visible : Visibility.None)
       Column(){
       Column(){
@@ -385,6 +398,7 @@ export struct MultiPictureDetailPageComponent {
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {
             // 暂无内容
             // 暂无内容
             this.netStatus = 0
             this.netStatus = 0
+            this.operationButtonList = []
             Logger.info(TAG, `this.netStatus：${JSON.stringify(this.netStatus)}`)
             Logger.info(TAG, `this.netStatus：${JSON.stringify(this.netStatus)}`)
           }
           }
           Logger.info(TAG, `contentDetailData：${JSON.stringify(this.contentDetailData)}`)
           Logger.info(TAG, `contentDetailData：${JSON.stringify(this.contentDetailData)}`)
@@ -399,12 +413,17 @@ export struct MultiPictureDetailPageComponent {
           Logger.info(TAG, `fetchDetailData then,err: ${JSON.stringify(err)}`);
           Logger.info(TAG, `fetchDetailData then,err: ${JSON.stringify(err)}`);
           // 内容获取失败
           // 内容获取失败
           this.netStatus = 9
           this.netStatus = 9
+          this.operationButtonList = []
         })
         })
     } catch (exception) {
     } catch (exception) {
 
 
     }
     }
   }
   }
 
 
+  getImgUrl() {
+    return this.contentDetailData?.rmhInfo?.rmhHeadUrl || this.contentDetailData?.userInfo?.userHeadUrl
+  }
+
   //  记录浏览历史
   //  记录浏览历史
   private getInteractBrowsOperate() {
   private getInteractBrowsOperate() {
     try {
     try {

@@ -16,7 +16,7 @@ export struct CardMediaInfo {
 
 
   build() {
   build() {
     Row() {
     Row() {
-      if (this.contentDTO.objectType === '1' || this.contentDTO.objectType === '15') {
+      if (this.contentDTO?.objectType === '1' || this.contentDTO?.objectType === '15') {
         // 点播、动态视频
         // 点播、动态视频
         Row() {
         Row() {
           Image($r('app.media.card_play'))
           Image($r('app.media.card_play'))
@@ -30,23 +30,23 @@ export struct CardMediaInfo {
         // liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
         // liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
         // 显示直播信息
         // 显示直播信息
         Row() {
         Row() {
-          if (this.contentDTO.liveInfo.liveState === 'wait') {
+          if (this.contentDTO?.liveInfo?.liveState === 'wait') {
             Image($r('app.media.card_wait'))
             Image($r('app.media.card_wait'))
               .mediaLogo()
               .mediaLogo()
             Text('预约')
             Text('预约')
               .mediaText()
               .mediaText()
-          } else if (this.contentDTO.liveInfo.liveState === 'running') {
+          } else if (this.contentDTO?.liveInfo?.liveState === 'running') {
             Image($r('app.media.card_live'))
             Image($r('app.media.card_live'))
               .mediaLogo()
               .mediaLogo()
             Text('直播中')
             Text('直播中')
               .mediaText()
               .mediaText()
-          } else if (this.contentDTO.liveInfo.liveState === 'end' && this.contentDTO.liveInfo.replayUri) {
+          } else if (this.contentDTO?.liveInfo?.liveState === 'end' && this.contentDTO?.liveInfo?.replayUri) {
             Image($r('app.media.card_play'))
             Image($r('app.media.card_play'))
               .mediaLogo()
               .mediaLogo()
             Text('回看')
             Text('回看')
               .mediaText()
               .mediaText()
-          } else if (this.contentDTO.liveInfo.liveState === 'end' && this.contentDTO.liveInfo
-            .replayUri) {
+          } else if (this.contentDTO?.liveInfo?.liveState === 'end' && this.contentDTO?.liveInfo
+            ?.replayUri) {
             // Image($r('app.media.card_live'))
             // Image($r('app.media.card_live'))
             //   .mediaLogo()
             //   .mediaLogo()
             Text('直播结束')
             Text('直播结束')

@@ -31,6 +31,7 @@ export struct RmhTitle {
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
           .fontWeight(600)
           .fontWeight(600)
           .alignSelf(ItemAlign.Start)
           .alignSelf(ItemAlign.Start)
+        Flex({alignContent: FlexAlign.Start, wrap: FlexWrap.NoWrap}) {
           Row() {
           Row() {
             if (this.publishTime) {
             if (this.publishTime) {
               Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime)))
               Text(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime)))
@@ -46,6 +47,9 @@ export struct RmhTitle {
               .maxLines(1)
               .maxLines(1)
               .alignSelf(ItemAlign.Start)
               .alignSelf(ItemAlign.Start)
               .textOverflow({ overflow: TextOverflow.Ellipsis })
               .textOverflow({ overflow: TextOverflow.Ellipsis })
+              .textAlign(TextAlign.Start)
+          }
+          .width('75%')
         }
         }
       }
       }
 
 

@@ -7,6 +7,7 @@ import { CardAdvBigImageComponent } from './CardAdvBigImageComponent';
 import { CardAdvVideoComponent } from './CardAdvVideoComponent';
 import { CardAdvVideoComponent } from './CardAdvVideoComponent';
 import { CardAdvGanMiComponent } from './CardAdvGanMiComponent';
 import { CardAdvGanMiComponent } from './CardAdvGanMiComponent';
 import { CardAdvVideoExComponent } from './CardAdvVideoExComponent';
 import { CardAdvVideoExComponent } from './CardAdvVideoExComponent';
+import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
  * @Description: 广告稿件解析类
  * @Description: 广告稿件解析类
@@ -19,28 +20,29 @@ import { CardAdvVideoExComponent } from './CardAdvVideoExComponent';
 @Component
 @Component
 export struct AdvCardParser {
 export struct AdvCardParser {
   @State compDTO: CompDTO = {} as CompDTO;
   @State compDTO: CompDTO = {} as CompDTO;
+  pageModel: PageModel = new PageModel();
 
 
   build() {
   build() {
-    this.contentBuilder(this.compDTO);
+    this.contentBuilder(this.pageModel, this.compDTO);
   }
   }
 
 
   @Builder
   @Builder
-  contentBuilder(compDTO: CompDTO) {
+  contentBuilder(pageModel: PageModel, compDTO: CompDTO) {
     if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_5) { //三图广告
     if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_5) { //三图广告
-      CardAdvThreeImageComponent({ compDTO })
+      CardAdvThreeImageComponent({ pageModel, compDTO })
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告
-      CardAdvSmallImageComponent({ compDTO })
+      CardAdvSmallImageComponent({ pageModel, compDTO })
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_7 ||
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_7 ||
       compDTO.matInfo.advSubType === CompStyle.Card_Adv_12) { // 长通栏广告 和 顶部长通栏广告
       compDTO.matInfo.advSubType === CompStyle.Card_Adv_12) { // 长通栏广告 和 顶部长通栏广告
-      CardAdvLongImageComponent({ compDTO })
+      CardAdvLongImageComponent({  pageModel, compDTO })
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告
-      CardAdvBigImageComponent({ compDTO })
+      CardAdvBigImageComponent({ pageModel, compDTO })
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告
-      CardAdvVideoComponent({ compDTO })
+      CardAdvVideoComponent({ pageModel, compDTO })
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告
-      CardAdvVideoExComponent({ compDTO })
+      CardAdvVideoExComponent({ pageModel, compDTO})
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告
     } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告
-      CardAdvGanMiComponent({ compDTO })
+      CardAdvGanMiComponent({ pageModel, compDTO })
     }
     }
   }
   }
 }
 }

 import { CompDTO } from 'wdBean';
 import { CompDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
 import { CardAdvBottom } from './CardAdvBottom';
 import { CardAdvBottom } from './CardAdvBottom';
 
 
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
@@ -16,12 +17,9 @@ const TAG: string = 'Card2Component';
 @Component
 @Component
 export struct CardAdvBigImageComponent {
 export struct CardAdvBigImageComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
-
-
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-
-
   }
   }
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
@@ -43,7 +41,7 @@ export struct CardAdvBigImageComponent {
         .borderColor($r('app.color.color_0D000000'))
         .borderColor($r('app.color.color_0D000000'))
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
 
 
-      CardAdvBottom().margin({
+      CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({
         top: 8,
         top: 8,
       })
       })
     }
     }

 import { CompDTO } from 'wdBean/Index';
 import { CompDTO } from 'wdBean/Index';
+import { Logger } from 'wdKit/Index';
+import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
  * @Description: 广告稿件 底部标签+删除按钮
  * @Description: 广告稿件 底部标签+删除按钮
@@ -10,7 +12,8 @@ import { CompDTO } from 'wdBean/Index';
  */
  */
 @Component
 @Component
 export struct CardAdvBottom {
 export struct CardAdvBottom {
-  @State compDTO: CompDTO = {} as CompDTO;
+  pageModel: PageModel = new PageModel();
+  @State compDTO: CompDTO = {} as CompDTO
 
 
   build() {
   build() {
 
 
@@ -36,6 +39,30 @@ export struct CardAdvBottom {
       .borderColor($r('app.color.color_EDEDED'))
       .borderColor($r('app.color.color_EDEDED'))
       .borderRadius(4)
       .borderRadius(4)
 
 
-    }.width('100%')
+    }.width('100%').onClick(() => {
+
+      this.delComp()
+    })
+  }
+  /**
+   * 删除稿件
+   */
+  private delComp() {
+    if (this.pageModel) {
+
+      let a = this.compDTO;
+      let currentIndex = -1
+      for (let i = 0; i < this.pageModel.compList.size(); i++) {
+        let b = this.pageModel.compList.getData(i)
+        if (a.compStyle === b.compStyle && a.matInfo === b.matInfo) {
+          currentIndex = i
+          break;
+        }
+      }
+      Logger.error("ZZZXXXXX","currentIndex====>"+currentIndex);
+      if (currentIndex >= 0) {
+        this.pageModel.compList.deleteItem(currentIndex)
+      }
+    }
   }
   }
 }
 }

@@ -4,8 +4,10 @@ import { AdvExtraData, AdvExtraItemData } from 'wdBean/src/main/ets/bean/adv/Adv
 import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardAdvTop } from './CardAdvTop';
 
 
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
 
 
@@ -22,6 +24,7 @@ export struct CardAdvGanMiComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State advExtraData: AdvExtraData = {} as AdvExtraData
   @State advExtraData: AdvExtraData = {} as AdvExtraData
   @State advLength: number = 0;
   @State advLength: number = 0;
+  pageModel: PageModel = new PageModel();
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
@@ -53,41 +56,7 @@ export struct CardAdvGanMiComponent {
             .borderColor($r('app.color.color_0D000000'))
             .borderColor($r('app.color.color_0D000000'))
 
 
           // 广告标签和删除功能
           // 广告标签和删除功能
-          Row() {
-            Text($r('app.string.comp_advertisement'))
-              .fontSize('10fp')
-              .fontColor($r('app.color.white'))
-              .width(28)
-              .height(16)
-              .backgroundColor('#4D000000')
-              .borderRadius(3)
-              .textAlign(TextAlign.Center)
-
-            Blank()
-
-            Stack() {
-              Image($r('app.media.comp_adv_close_white'))
-                .width(9)
-                .height(9)
-                .borderRadius({
-                  topLeft: '4vp',
-                  topRight: '4vp',
-                  bottomLeft: '4vp',
-                  bottomRight: '4vp'
-                })
-            }
-            .width(18)
-            .height(14)
-            .backgroundColor('#4D000000')
-            .borderWidth(0.5)
-            .borderColor($r('app.color.white'))
-            .borderRadius(3)
-
-          }.width('100%').padding({
-            top: 8,
-            left: 8,
-            right: 8
-          })
+          CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO })
         }
         }
         .alignContent(Alignment.Top)
         .alignContent(Alignment.Top)
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
@@ -100,7 +69,7 @@ export struct CardAdvGanMiComponent {
       //
       //
       List({ space: 8 }) {
       List({ space: 8 }) {
 
 
-        ForEach(this.advExtraData.item, (content: AdvExtraItemData) => {
+        ForEach(this.advExtraData.item, (content: AdvExtraItemData, index: number) => {
 
 
           ListItem() {
           ListItem() {
             // 广告列表信息
             // 广告列表信息
@@ -123,7 +92,10 @@ export struct CardAdvGanMiComponent {
                 .width('100%')
                 .width('100%')
                 .margin({ top: 8 })
                 .margin({ top: 8 })
 
 
-            }.width(this.advLength >= 3 ? 150 : this.advLength == 2 ? 210 : '100%').onClick(() => {
+            }
+            .width(this.advLength >= 3 ? 150 : this.advLength == 2 ? 210 : '100%')
+            .margin({ left: index === 0 ? this.advLength == 1 ? 0 : 16 : 0 })
+            .onClick(() => {
 
 
               let matInfo: CompAdvMatInfoBean = {
               let matInfo: CompAdvMatInfoBean = {
                 linkUrl: content.linkUrl,
                 linkUrl: content.linkUrl,
@@ -142,7 +114,7 @@ export struct CardAdvGanMiComponent {
       .listDirection(Axis.Horizontal)
       .listDirection(Axis.Horizontal)
       .edgeEffect(EdgeEffect.None)
       .edgeEffect(EdgeEffect.None)
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
-      .contentStartOffset(this.advLength == 1 ? 0 : 16)
+      // .contentStartOffset(this.advLength == 1 ? 0 : 16)
       .contentEndOffset(this.advLength == 1 ? 0 : 16)
       .contentEndOffset(this.advLength == 1 ? 0 : 16)
       .margin({ top: 10, bottom: 10 })
       .margin({ top: 10, bottom: 10 })
       .padding({
       .padding({
@@ -150,7 +122,6 @@ export struct CardAdvGanMiComponent {
         right: this.advLength == 1 ? 16 : 0,
         right: this.advLength == 1 ? 16 : 0,
       })
       })
 
 
-
       // 更多按钮
       // 更多按钮
       commonButton(this.advExtraData)
       commonButton(this.advExtraData)
 
 

 //全标题 "appStyle":"2",
 //全标题 "appStyle":"2",
-import { CompDTO, ContentDTO } from 'wdBean';
+import { CompDTO } from 'wdBean';
 import { CommonConstants, CompStyle } from 'wdConstant/Index';
 import { CommonConstants, CompStyle } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import PageModel from '../../viewmodel/PageModel';
 import { CardAdvBottom } from './CardAdvBottom';
 import { CardAdvBottom } from './CardAdvBottom';
 
 
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
@@ -18,15 +17,11 @@ const TAG: string = 'Card2Component';
  */
  */
 @Component
 @Component
 export struct CardAdvLongImageComponent {
 export struct CardAdvLongImageComponent {
-
-
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
-
-  @State haveTitle : boolean = true
+  @State haveTitle: boolean = true
+  pageModel: PageModel = new PageModel();
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
-
-
     this.haveTitle = this.compDTO.matInfo.advSubType === CompStyle.Card_Adv_7;
     this.haveTitle = this.compDTO.matInfo.advSubType === CompStyle.Card_Adv_7;
   }
   }
 
 
@@ -37,12 +32,10 @@ export struct CardAdvLongImageComponent {
   build() {
   build() {
 
 
     Column() {
     Column() {
-
       //新闻标题
       //新闻标题
-      if(this.haveTitle ){
+      if (this.haveTitle) {
         Text(this.compDTO.matInfo.advTitle).width('100%').bottomTextStyle().margin({ bottom: 8, })
         Text(this.compDTO.matInfo.advTitle).width('100%').bottomTextStyle().margin({ bottom: 8, })
       }
       }
-
       //长图
       //长图
       Image(this.compDTO.matInfo.matImageUrl[0])
       Image(this.compDTO.matInfo.matImageUrl[0])
         .width(CommonConstants.FULL_WIDTH)
         .width(CommonConstants.FULL_WIDTH)
@@ -51,7 +44,7 @@ export struct CardAdvLongImageComponent {
         .borderWidth(0.5)
         .borderWidth(0.5)
         .borderColor($r('app.color.color_0D000000'))
         .borderColor($r('app.color.color_0D000000'))
 
 
-      CardAdvBottom().margin({
+      CardAdvBottom({ pageModel: this.pageModel, compDTO:this.compDTO }).margin({
         top: 8,
         top: 8,
       })
       })
     }
     }

@@ -5,6 +5,7 @@ import { ProcessUtils } from 'wdRouter';
 import measure from '@ohos.measure';
 import measure from '@ohos.measure';
 import { DisplayUtils } from 'wdKit/Index';
 import { DisplayUtils } from 'wdKit/Index';
 import { CardAdvBottom } from './CardAdvBottom';
 import { CardAdvBottom } from './CardAdvBottom';
+import PageModel from '../../viewmodel/PageModel';
 
 
 const TAG: string = 'CardAdvSmallImageComponent';
 const TAG: string = 'CardAdvSmallImageComponent';
 
 
@@ -20,7 +21,7 @@ const TAG: string = 'CardAdvSmallImageComponent';
 export struct CardAdvSmallImageComponent {
 export struct CardAdvSmallImageComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State isBigThreeLine: boolean = false // 标题的行数大于等于3行 是true
   @State isBigThreeLine: boolean = false // 标题的行数大于等于3行 是true
-
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
     // 计算标题文本行数
     // 计算标题文本行数
@@ -68,7 +69,7 @@ export struct CardAdvSmallImageComponent {
         .margin({ left: 12 })
         .margin({ left: 12 })
 
 
 
 
-      CardAdvBottom().width('62%').id('bottom_adv').alignRules({
+      CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).width('62%').id('bottom_adv').alignRules({
         bottom: { anchor: this.isBigThreeLine ? '' : 'adv_imag', align: VerticalAlign.Bottom },
         bottom: { anchor: this.isBigThreeLine ? '' : 'adv_imag', align: VerticalAlign.Bottom },
         right: { anchor: this.isBigThreeLine ? '' : 'adv_imag', align: HorizontalAlign.Start },
         right: { anchor: this.isBigThreeLine ? '' : 'adv_imag', align: HorizontalAlign.Start },
         top: { anchor: this.isBigThreeLine ? 'title_name' : '', align: VerticalAlign.Bottom },
         top: { anchor: this.isBigThreeLine ? 'title_name' : '', align: VerticalAlign.Bottom },

@@ -2,6 +2,7 @@
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardAdvBottom } from './CardAdvBottom';
 import { CardAdvBottom } from './CardAdvBottom';
@@ -19,7 +20,7 @@ const TAG: string = 'Card2Component';
 @Component
 @Component
 export struct CardAdvThreeImageComponent {
 export struct CardAdvThreeImageComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
-
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
   }
   }
@@ -63,7 +64,7 @@ export struct CardAdvThreeImageComponent {
         .margin({ top: 8 })
         .margin({ top: 8 })
 
 
         //  广告工具组件
         //  广告工具组件
-        CardAdvBottom().width('100%').margin({ top: 8 })
+        CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).width('100%').margin({ top: 8 })
       }
       }
       .width('100%')
       .width('100%')
       .justifyContent(FlexAlign.Start)
       .justifyContent(FlexAlign.Start)

+import { CompDTO } from 'wdBean/Index';
+import { Logger } from 'wdKit/Index';
+import PageModel from '../../viewmodel/PageModel';
+
+/**
+ * @Description: 广告稿件 顶部标签+删除按钮
+ * @Author:
+ * @Email: liyubing@wondertek.com.cn
+ * @CreateDate:
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+@Component
+export struct CardAdvTop {
+  pageModel: PageModel = new PageModel();
+  compDTO: CompDTO = {} as CompDTO
+
+  build() {
+
+    Row() {
+      Text($r('app.string.comp_advertisement'))
+        .fontSize('10fp')
+        .fontColor($r('app.color.white'))
+        .width(28)
+        .height(16)
+        .backgroundColor('#4D000000')
+        .borderRadius(4)
+        .textAlign(TextAlign.Center)
+
+      Blank()
+
+      Stack() {
+        Image($r('app.media.comp_adv_close_white'))
+          .width(9)
+          .height(9)
+          .borderRadius({
+            topLeft: '4vp',
+            topRight: '4vp',
+            bottomLeft: '4vp',
+            bottomRight: '4vp'
+          })
+      }
+      .width(18)
+      .height(14)
+      .backgroundColor('#4D000000')
+      .borderWidth(0.5)
+      .borderColor($r('app.color.white'))
+      .borderRadius(4)
+
+    }.width('100%').padding({
+      top: 8,
+      left: 8,
+      right: 8
+    }).onClick(() => {
+      this.delComp()
+    })
+  }
+
+  /**
+   * 删除稿件
+   */
+  private delComp() {
+    if (this.pageModel) {
+
+      let a = this.compDTO;
+      let currentIndex = -1
+      for (let i = 0; i < this.pageModel.compList.size(); i++) {
+        let b = this.pageModel.compList.getData(i)
+        if (a.compStyle === b.compStyle && a.matInfo === b.matInfo) {
+          currentIndex = i
+          break;
+        }
+      }
+
+      Logger.error("ZZZXXXXX","currentIndex====>"+currentIndex);
+      if (currentIndex >= 0) {
+        this.pageModel.compList.deleteItem(currentIndex)
+      }
+    }
+  }
+}

@@ -2,6 +2,7 @@
 import { CompDTO, ContentDTO, VideoInfoDTO } from 'wdBean';
 import { CompDTO, ContentDTO, VideoInfoDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardAdvBottom } from './CardAdvBottom';
 import { CardAdvBottom } from './CardAdvBottom';
@@ -20,7 +21,7 @@ const TAG: string = 'Card2Component';
 export struct CardAdvVideoComponent {
 export struct CardAdvVideoComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State contentDTO: ContentDTO = {} as ContentDTO
   @State contentDTO: ContentDTO = {} as ContentDTO
-
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
     // this.contentDTO.objectType = '1'
     // this.contentDTO.objectType = '1'
@@ -54,7 +55,7 @@ export struct CardAdvVideoComponent {
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)
       .margin({ top: 8 })
       .margin({ top: 8 })
 
 
-      CardAdvBottom().margin({
+      CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({
         top: 8,
         top: 8,
       })
       })
     }
     }

@@ -3,6 +3,8 @@ import { AdvExtraData, AdvExtraItemData } from 'wdBean/src/main/ets/bean/adv/Adv
 import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
+import { CardAdvTop } from './CardAdvTop';
 
 
 const TAG: string = 'Card2Component';
 const TAG: string = 'Card2Component';
 
 
@@ -18,6 +20,7 @@ const TAG: string = 'Card2Component';
 export struct CardAdvVideoExComponent {
 export struct CardAdvVideoExComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   @State advExtraData: AdvExtraData = {} as AdvExtraData
   @State advExtraData: AdvExtraData = {} as AdvExtraData
+  pageModel: PageModel = new PageModel();
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
@@ -45,42 +48,7 @@ export struct CardAdvVideoExComponent {
           .borderColor($r('app.color.color_0D000000'))
           .borderColor($r('app.color.color_0D000000'))
 
 
 
 
-        Row() {
-
-          Text($r('app.string.comp_advertisement'))
-            .fontSize('10fp')
-            .fontColor($r('app.color.white'))
-            .width(28)
-            .height(16)
-            .backgroundColor('#4D000000')
-            .borderRadius(4)
-            .textAlign(TextAlign.Center)
-
-          Blank()
-
-          Stack() {
-            Image($r('app.media.comp_adv_close_white'))
-              .width(9)
-              .height(9)
-              .borderRadius({
-                topLeft: '4vp',
-                topRight: '4vp',
-                bottomLeft: '4vp',
-                bottomRight: '4vp'
-              })
-          }
-          .width(18)
-          .height(14)
-          .backgroundColor('#4D000000')
-          .borderWidth(0.5)
-          .borderColor($r('app.color.white'))
-          .borderRadius(4)
-
-        }.width('100%').padding({
-          top: 8,
-          left: 8,
-          right: 8
-        })
+        CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO })
       }
       }
       .alignContent(Alignment.Top)
       .alignContent(Alignment.Top)
       .width(CommonConstants.FULL_WIDTH)
       .width(CommonConstants.FULL_WIDTH)

@@ -2,6 +2,7 @@ import { ContentDTO, slideShows } from 'wdBean';
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 
 
 /**
 /**
  * 大专题卡--CompStyle:  10
  * 大专题卡--CompStyle:  10
@@ -23,9 +24,6 @@ export struct Card10Component {
           .maxLines(2)
           .maxLines(2)
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .margin({ bottom: 19 })
           .margin({ bottom: 19 })
-          .onClick((event: ClickEvent) => {
-            ProcessUtils.processPage(this.contentDTO)
-          })
       }
       }
       // 大图
       // 大图
       Stack() {
       Stack() {
@@ -111,12 +109,23 @@ export struct Card10Component {
 
 
       // 右侧图片
       // 右侧图片
       if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
       if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
+        Stack() {
           Image(item.fullColumnImgUrls[0].url)
           Image(item.fullColumnImgUrls[0].url)
             .width(117)
             .width(117)
             .height(78)
             .height(78)
             .objectFit(ImageFit.Cover)
             .objectFit(ImageFit.Cover)
             .borderRadius($r('app.float.image_border_radius'))
             .borderRadius($r('app.float.image_border_radius'))
             .margin({ left: 12 })
             .margin({ left: 12 })
+          CardMediaInfo({
+            contentDTO: {
+              objectType: String(item.objectType),
+              videoInfo: { videoDuration: Number(item.videoDuration) as number },
+              photoNum: Number(item.photoNum),
+              voiceInfo: { voiceDuration: Number(item.voiceDuration) as number }
+            } as ContentDTO
+          })
+        }
+        .alignContent(Alignment.BottomEnd)
       }
       }
     }
     }
     .padding({ top: 10, bottom: 10 })
     .padding({ top: 10, bottom: 10 })

@@ -15,7 +15,7 @@ export class publishCommentModel {
   /*【迭代二新增】关联的频道id/专题id; 页面必传*/
   /*【迭代二新增】关联的频道id/专题id; 页面必传*/
   targetRelObjectId: string = ""
   targetRelObjectId: string = ""
   /*【迭代二新增】是否是重点稿件 1是 0否 页面必传*/
   /*【迭代二新增】是否是重点稿件 1是 0否 页面必传*/
-  keyArticle: string = ''
+  keyArticle: string = '0'
   /*内容类别， 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,14:动态（13和14为中文版新增） 页面必传*/
   /*内容类别， 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,14:动态（13和14为中文版新增） 页面必传*/
   targetType: string = ''
   targetType: string = ''
   /*评论总数*/
   /*评论总数*/

@@ -9,8 +9,9 @@ import measure from '@ohos.measure'
 import { CommentCustomDialog } from './CommentCustomDialog'
 import { CommentCustomDialog } from './CommentCustomDialog'
 import { publishCommentModel } from '../model/PublishCommentModel';
 import { publishCommentModel } from '../model/PublishCommentModel';
 import { ifaa } from '@kit.OnlineAuthenticationKit';
 import { ifaa } from '@kit.OnlineAuthenticationKit';
-import { HttpUrlUtils } from 'wdNetwork/Index';
+import { HttpUrlUtils, HttpUtils } from 'wdNetwork/Index';
 import NoMoreLayout from '../../page/NoMoreLayout';
 import NoMoreLayout from '../../page/NoMoreLayout';
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 
 
 const TAG = 'CommentComponent';
 const TAG = 'CommentComponent';
 
 
@@ -181,9 +182,6 @@ export struct CommentComponent {
           if (this.hasMore === false) NoMoreLayout()
           if (this.hasMore === false) NoMoreLayout()
         }
         }
       }
       }
-// .onScrollFrameBegin((offset: number, state: ScrollState)=>{
-//
-// })
       .onReachEnd(()=>{
       .onReachEnd(()=>{
         if (this.hasMore) {
         if (this.hasMore) {
           this.getData()
           this.getData()
@@ -559,6 +557,12 @@ struct commentFooterView {
 
 
       }
       }
       .onClick(() => {
       .onClick(() => {
+        // 未登录，跳转登录
+        const user_id = HttpUtils.getUserId()
+        if (!user_id) {
+          WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+          return
+        }
         commentLikeChange(this.item)
         commentLikeChange(this.item)
         commentViewModel.commentLike(this.item).then(() => {
         commentViewModel.commentLike(this.item).then(() => {
         }).catch(() => {
         }).catch(() => {

@@ -7,17 +7,17 @@ import commentViewModel from '../viewmodel/CommentViewModel'
 @Preview
 @Preview
 @CustomDialog
 @CustomDialog
 export struct CommentCustomDialog {
 export struct CommentCustomDialog {
-
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   controller?: CustomDialogController
   controller?: CustomDialogController
   confirm: (value: Record<string, string>) => void = () => {
   confirm: (value: Record<string, string>) => void = () => {
   }
   }
   @State private emojiSwitch: boolean = false
   @State private emojiSwitch: boolean = false
   textInputController: TextAreaController = new TextAreaController()
   textInputController: TextAreaController = new TextAreaController()
+  @State positionInfo: CaretOffset = { index: 0, x: 0, y: 0 }
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
-
+    // this.textInputController.caretPosition(0)
   }
   }
 
 
   publishCommentRequest() {
   publishCommentRequest() {
@@ -25,7 +25,7 @@ export struct CommentCustomDialog {
     // this.publishCommentModel.commentContent = this.commentText
     // this.publishCommentModel.commentContent = this.commentText
     //TODO 判断类型
     //TODO 判断类型
     this.publishCommentModel.commentType = '2'
     this.publishCommentModel.commentType = '2'
-    commentViewModel.publishComment(this.publishCommentModel).then((model:commentItemModel) => {
+    commentViewModel.publishComment(this.publishCommentModel).then((model: commentItemModel) => {
       this.publishCommentModel.commentContent = ''
       this.publishCommentModel.commentContent = ''
       //
       //
 
 
@@ -74,12 +74,13 @@ export struct CommentCustomDialog {
               .height(30)
               .height(30)
               .onClick(() => {
               .onClick(() => {
 
 
-                // this.commentText = this.commentText + '神鼎'
+                this.positionInfo = this.textInputController.getCaretOffset()
+
                 this.emojiSwitch = !this.emojiSwitch
                 this.emojiSwitch = !this.emojiSwitch
                 if (this.emojiSwitch) {
                 if (this.emojiSwitch) {
                   this.textInputController.stopEditing()
                   this.textInputController.stopEditing()
                 } else {
                 } else {
-                  this.textInputController.caretPosition(this.textInputController.getTextContentRect().x)
+                  // this.textInputController.caretPosition(this.textInputController.getTextContentRect().x)
                 }
                 }
 
 
               })
               })
@@ -116,7 +117,7 @@ export struct CommentCustomDialog {
 
 
       //表情view
       //表情view
       if (this.emojiSwitch) {
       if (this.emojiSwitch) {
-        emojiView()
+        emojiView({ publishCommentModel: this.publishCommentModel }).height(150)
       }
       }
 
 
     }.backgroundColor(Color.White)
     }.backgroundColor(Color.White)
@@ -129,8 +130,88 @@ export struct CommentCustomDialog {
 
 
 @Component
 @Component
 struct emojiView {
 struct emojiView {
+  @ObjectLink publishCommentModel: publishCommentModel
+  /*没找到获取系统emoji的方案*/
+  private emojiString = '😀,😁,😂,😃,😄,😅,😆,😇,😈,😉,😊,😋,😌,😍,😎,😏,😐,😑,😒,😓,😔,😕,😖,😗,😘,😙,😚,😛,😜,😝,😞,😟,😠,😡,😢,😣,😤,😥,😦,😧,😨,😩,😪,😫,😬,😭,😮,😯,😰,😱,😲,😳,😴,😵,😶,😷,😸,😹,😺,😻,😼,😽,😾,😿,🙀,🙅,🙆,🙇,🙈,🙉,🙊,🙋,🙌,🙍,🙎,🙏'
+  private displayArray: string[][] = []
+  private swiperController: SwiperController = new SwiperController()
+
+  aboutToAppear(): void {
+
+
+
+    this.displayArray = chunk(this.emojiString.split(','), 20)
+
+    //补上删除按钮以及空白占位
+    let lastElement = this.displayArray.slice(-1)[0];
+    if (lastElement.length < 20) {
+      let needLength = (20 - lastElement.length)
+      for (let index = 0; index < needLength; index++) {
+        lastElement.push('')
+      }
+    }
+
+    this.displayArray.forEach(element => {
+      element.push('删除')
+    });
+
+  }
+
   build() {
   build() {
+
+    // String.fromCodePoint()
+    Swiper(this.swiperController) {
+
+      ForEach(this.displayArray, (array: [], index) => {
+        Column() {
+          Grid() {
+            ForEach(array, (emoji: string, subIndex: number) => {
+              GridItem() {
+                Text() {
+                  if (emoji == '删除') {
+                    ImageSpan($r('app.media.wdInput_delete'))
+                  } else {
+                    Span(emoji)
                   }
                   }
+
+                }.textAlign(TextAlign.Center).width(30).height(30)
+
+                // .backgroundColor(Color.Orange)
+              }.onClick(() => {
+                if (emoji == '删除') {
+                  this.publishCommentModel.commentContent = this.publishCommentModel.commentContent.substring(0, this.publishCommentModel.commentContent.length -1)
+                } else if (emoji == '') {
+
+                } else {
+                  this.publishCommentModel.commentContent = this.publishCommentModel.commentContent + emoji
+                }
+
+              })
+            })
+          }
+          .maxCount(6)
+          .columnsTemplate('1fr 1fr 1fr 1fr 1fr 1fr 1fr')
+          .rowsGap(10)
+          .layoutDirection(GridDirection.Row)
+
+          Row().height(40)
+        }
+      })
+    }
+    .indicator(true)
+    .vertical(false)
+    .height(140)
+  }
+}
+
+function chunk<T>(array: T[], size: number): T[][] {
+  const result: T[][] = [];
+
+  for (let i = 0; i < array.length; i += size) {
+    result.push(array.slice(i, i + size));
+  }
+
+  return result;
 }
 }
 
 
 
 

 import { ViewType } from 'wdConstant/Index'
 import { ViewType } from 'wdConstant/Index'
 import { DateTimeUtils, LazyDataSource, WindowModel } from 'wdKit/Index'
 import { DateTimeUtils, LazyDataSource, WindowModel } from 'wdKit/Index'
-import { commentItemModel, commentListModel } from '../model/CommentModel'
+import { commentItemModel } from '../model/CommentModel'
 import commentViewModel from '../viewmodel/CommentViewModel'
 import commentViewModel from '../viewmodel/CommentViewModel'
 import { router, window } from '@kit.ArkUI'
 import { router, window } from '@kit.ArkUI'
-import { CustomTitleUI } from '../../reusable/CustomTitleUI'
-import { MyCommentDataSource } from '../model/MyCommentDataSource'
-import { HttpUrlUtils } from 'wdNetwork/Index'
-import PageModel from '../../../viewmodel/PageModel'
+import { HttpUtils } from 'wdNetwork/Index'
 import { ErrorComponent } from '../../view/ErrorComponent'
 import { ErrorComponent } from '../../view/ErrorComponent'
-import { EmptyComponent , WDViewDefaultType} from '../../view/EmptyComponent'
-import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh'
+import { EmptyComponent, WDViewDefaultType } from '../../view/EmptyComponent'
 import NoMoreLayout from '../../page/NoMoreLayout'
 import NoMoreLayout from '../../page/NoMoreLayout'
+import { CommentCustomDialog } from './CommentCustomDialog'
+import { publishCommentModel } from '../model/PublishCommentModel'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 
 
 const TAG = 'QualityCommentsComponent';
 const TAG = 'QualityCommentsComponent';
 
 
@@ -24,9 +23,6 @@ export struct QualityCommentsComponent {
   @State hasMore: boolean = true;
   @State hasMore: boolean = true;
   @State  currentPage: number = 1;
   @State  currentPage: number = 1;
   private scroller: Scroller = new Scroller();
   private scroller: Scroller = new Scroller();
-
-
-
   @State tileOpacity: number = 0;
   @State tileOpacity: number = 0;
   firstPositionY: number = 0;
   firstPositionY: number = 0;
   bottomSafeHeight: string = AppStorage.get<number>('bottomSafeHeight') + 'px';
   bottomSafeHeight: string = AppStorage.get<number>('bottomSafeHeight') + 'px';
@@ -34,6 +30,11 @@ export struct QualityCommentsComponent {
   lastWindowColor: string = '#ffffff'
   lastWindowColor: string = '#ffffff'
   currentWindowColor: string = '#FF4202'
   currentWindowColor: string = '#FF4202'
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
+  @State dialogController: CustomDialogController | null = null;
+
+  /*必传*/
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
 
 
@@ -43,13 +44,33 @@ export struct QualityCommentsComponent {
     windowClass.setWindowLayoutFullScreen(false)
     windowClass.setWindowLayoutFullScreen(false)
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
 
 
+    this.dialogController = null // 将dialogController置空
+
   }
   }
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
 
 
     this.fullScreen();
     this.fullScreen();
     this.getData();
     this.getData();
-
+    this.showAlert()
+  }
+
+  showAlert(){
+    this.dialogController = new CustomDialogController({
+      builder: CommentCustomDialog({
+        confirm: (value: Record<string, string>) => {
+
+        },
+        publishCommentModel: this.publishCommentModel
+      }),
+      autoCancel: true,
+      alignment: DialogAlignment.Bottom,
+      customStyle: true,
+      offset: {
+        dx: 0,
+        dy: -20
+      },
+    })
   }
   }
 
 
   getData(resolve?: (value: string | PromiseLike<string>) => void){
   getData(resolve?: (value: string | PromiseLike<string>) => void){
@@ -217,7 +238,7 @@ export struct QualityCommentsComponent {
       // ListItemGroup({ header: this.titleHeader() })
       // ListItemGroup({ header: this.titleHeader() })
       LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
       LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
         ListItem() {
         ListItem() {
-          QualityCommentItem({ item: item, index: index }).margin({ left: 12, right: 12 })
+          QualityCommentItem({ item: item, index: index , dialogController:this.dialogController, publishCommentModel:this.publishCommentModel}).margin({ left: 12, right: 12 })
         }
         }
       })
       })
       // 加载更多
       // 加载更多
@@ -243,16 +264,6 @@ export struct QualityCommentsComponent {
   }
   }
 
 
 
 
-  @Builder
-  testLayout(){
-    List({ space: 12, scroller:this.scroller }){
-      LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
-        ListItem() {
-          QualityCommentItem({ item: item, index: index }).margin({ left: 12, right: 12 })
-        }
-      })
-    }
-  }
 
 
 }
 }
 
 
@@ -261,6 +272,8 @@ export struct QualityCommentsComponent {
 
 
 @Component
 @Component
 struct QualityCommentItem {
 struct QualityCommentItem {
+  @ObjectLink publishCommentModel: publishCommentModel
+  dialogController: CustomDialogController | null = null;
   @ObjectLink item: commentItemModel
   @ObjectLink item: commentItemModel
   index: number = 0
   index: number = 0
 
 
@@ -360,7 +373,20 @@ struct QualityCommentItem {
           Row({ space: 16 }) {
           Row({ space: 16 }) {
             Row() {
             Row() {
               Image($r('app.media.comment_icon_pinglun')).width(16).height(16)
               Image($r('app.media.comment_icon_pinglun')).width(16).height(16)
-            }
+            }.onClick(()=>{
+              this.publishCommentModel.targetId = this.item.targetId
+              this.publishCommentModel.targetRelId = this.item.targetRelId
+              this.publishCommentModel.targetTitle = this.item.targetTitle
+              this.publishCommentModel.targetRelType = this.item.targetRelType
+              this.publishCommentModel.targetRelObjectId = this.item.targetRelObjectId
+              this.publishCommentModel.targetType = this.item.targetType
+              // this.publishCommentModel.keyArticle = this.item.keyArticle
+
+              this.publishCommentModel.rootCommentId = this.item.rootCommentId
+              this.publishCommentModel.parentId = this.item.id
+
+              this.dialogController?.open()
+            })
 
 
             Row() {
             Row() {
               Image($r(this.item.api_status ? 'app.media.comment_like_select' : 'app.media.comment_like_normal'))
               Image($r(this.item.api_status ? 'app.media.comment_like_select' : 'app.media.comment_like_normal'))
@@ -373,6 +399,12 @@ struct QualityCommentItem {
                   .margin({ left: 3 })
                   .margin({ left: 3 })
               }
               }
             }.onClick(() => {
             }.onClick(() => {
+              // 未登录，跳转登录
+              const user_id = HttpUtils.getUserId()
+              if (!user_id) {
+                WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+                return
+              }
               commentLikeChange(this.item)
               commentLikeChange(this.item)
               commentViewModel.commentLike(this.item).then(() => {
               commentViewModel.commentLike(this.item).then(() => {
               }).catch(() => {
               }).catch(() => {

@@ -4,6 +4,7 @@ import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
+import { DateTimeUtils } from 'wdKit';
 
 
 /**
 /**
  * 直播预约卡
  * 直播预约卡
@@ -17,6 +18,22 @@ export struct ZhSingleRow03 {
   @State compDTO: CompDTO = {} as CompDTO
   @State compDTO: CompDTO = {} as CompDTO
   scroller: Scroller = new Scroller()
   scroller: Scroller = new Scroller()
 
 
+  format(timeNum: number) {
+    const todayDate = new Date().setHours(0,0,0,0)
+    const parseDate = new Date(timeNum).setHours(0,0,0,0);
+    if (todayDate === parseDate) {
+      return '今天'
+    } else {    const str = DateTimeUtils.formatDate(timeNum, 'MM月dd日')
+      const month: string = str.split('月')[0];
+      if (month[0] === "0") {
+        return str.slice(1)
+      } else {
+        return str.slice(0)
+      }
+    }
+
+  }
+
   build() {
   build() {
     Column() {
     Column() {
       //顶部
       //顶部
@@ -42,7 +59,8 @@ export struct ZhSingleRow03 {
               Row() {
               Row() {
                 Flex({justifyContent: FlexAlign.SpaceBetween}){
                 Flex({justifyContent: FlexAlign.SpaceBetween}){
                   Row() {
                   Row() {
-                    Text(item.liveInfo.liveStartTime.split(' ')[0].slice(5).split('-').join('月')+'日')
+                    Text(this.format(new Date(item.liveInfo.liveStartTime).getTime()))
+                    // Text(item.liveInfo.liveStartTime.split(' ')[0].slice(5).split('-').join('月')+'日')
                       .margin({right: 6})
                       .margin({right: 6})
                       .fontColor(0x000000)
                       .fontColor(0x000000)
                       .fontSize(13)
                       .fontSize(13)
@@ -106,7 +124,7 @@ export struct ZhSingleRow03 {
           .width(3)
           .width(3)
           .height(16)
           .height(16)
           .margin({ right: 4 })
           .margin({ right: 4 })
-        Text('直播预约')
+        Text('直播预告')
           .fontSize($r("app.float.font_size_17"))
           .fontSize($r("app.float.font_size_17"))
           .fontColor($r("app.color.color_222222"))
           .fontColor($r("app.color.color_222222"))
           .fontWeight(600)
           .fontWeight(600)

@@ -9,13 +9,12 @@ export default struct MinePageMoreFunctionUI {
   build() {
   build() {
     Column() {
     Column() {
       Column() {
       Column() {
-        Text(`更多功能`)
-          .width('456lpx')
-          .height('38lpx')
-          .fontColor($r('app.color.color_666666'))
+        Text("更多功能")
+          .fontColor($r('app.color.color_222222'))
           .fontSize('29lpx')
           .fontSize('29lpx')
           .margin({ left: "31lpx" })
           .margin({ left: "31lpx" })
-          .fontWeight('600lpx')
+          .lineHeight('46lpx')
+          .fontWeight(FontWeight.Bold)
       }.height('92lpx')
       }.height('92lpx')
       .width('100%')
       .width('100%')
       .justifyContent(FlexAlign.Center)
       .justifyContent(FlexAlign.Center)

@@ -85,6 +85,7 @@ export struct FollowFirstTabsComponent{
       .vertical(false)
       .vertical(false)
       .barMode(BarMode.Scrollable)
       .barMode(BarMode.Scrollable)
       .barWidth('100%')
       .barWidth('100%')
+      .barBackgroundColor($r('app.color.white'))
       .barHeight('84lpx')
       .barHeight('84lpx')
       .animationDuration(0)
       .animationDuration(0)
       .onChange((index: number) => {
       .onChange((index: number) => {

@@ -70,9 +70,15 @@ export struct FollowListDetailUI {
     Column() {
     Column() {
       if (this.count === 0) {
       if (this.count === 0) {
         if (this.isGetRequest == true) {
         if (this.isGetRequest == true) {
+          if(this.creatorDirectoryId === -1){
             EmptyComponent({ emptyType: 14,emptyHeight:"100%" })
             EmptyComponent({ emptyType: 14,emptyHeight:"100%" })
               .layoutWeight(1)
               .layoutWeight(1)
               .width('100%')
               .width('100%')
+          }else{
+            EmptyComponent({ emptyType: 16,emptyHeight:"100%" })
+              .layoutWeight(1)
+              .width('100%')
+          }
         }
         }
 
 
       } else {
       } else {

 import { FollowListItem, FollowThirdListItem } from '../../../viewmodel/FollowListItem'
 import { FollowListItem, FollowThirdListItem } from '../../../viewmodel/FollowListItem'
 import { FollowListDetailUI } from './FollowListDetailUI'
 import { FollowListDetailUI } from './FollowListDetailUI'
+import measure from '@ohos.measure'
 
 
 @Component
 @Component
 export struct FollowThirdTabsComponent{
 export struct FollowThirdTabsComponent{
@@ -11,8 +12,8 @@ export struct FollowThirdTabsComponent{
 
 
 
 
   private controller: TabsController = new TabsController()
   private controller: TabsController = new TabsController()
-  fontColor: string = '#999999'
-  selectedFontColor: string = '#000000'
+  fontColor: string = '#666666'
+  selectedFontColor: string = '#222222'
 
 
   build(){
   build(){
     if(this.data != null){
     if(this.data != null){
@@ -26,32 +27,44 @@ export struct FollowThirdTabsComponent{
 
 
   @Builder TabBuilder(index: number, item: FollowThirdListItem) {
   @Builder TabBuilder(index: number, item: FollowThirdListItem) {
     Column(){
     Column(){
+      Row(){
+        Image(index === 0?$r("app.media.ic_collect_left_left"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_left'):$r('app.media.ic_collect_mid_left')))
+          .width(index === 0?"19lpx":"35lpx")
+          .height('61lpx')
+          .objectFit(ImageFit.Fill)
+
         Text(item.directoryName)
         Text(item.directoryName)
-        .fontSize('30lpx')
-        .textAlign(TextAlign.Center)
-        .fontWeight(this.currentIndex === index ? 600 : 400)
+          .fontSize('27lpx')
+          .fontWeight(this.currentIndex === index ? "600lpx" : "400lpx")
           .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
           .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
-        .lineHeight('38lpx')
-        .backgroundColor($r('app.color.color_F9F9F9'))
-        .padding('13lpx')
-        .maxLines(1)
+          .lineHeight('35lpx')
+          .backgroundImage($r('app.media.ic_collect_mid'))
+          .backgroundImageSize(ImageSize.Cover)
+          .padding({top:"13lpx",bottom:"13lpx"})
+
+        Image(index === 0?$r("app.media.ic_collect_left_right"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_right'):$r('app.media.ic_collect_mid_right')))
+          .width(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?"19lpx":"35lpx")
+          .height('61lpx')
+          .objectFit(ImageFit.Fill)
+      }
     }
     }
     .onClick(()=>{
     .onClick(()=>{
       this.currentIndex = index
       this.currentIndex = index
       this.controller.changeIndex(this.currentIndex)
       this.controller.changeIndex(this.currentIndex)
     })
     })
-    .height('84lpx')
-    .margin({right:'9lpx'})
-    .padding({left:'20lpx',right:index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?"20lpx":"0lpx"})
-    .justifyContent(FlexAlign.Center)
+    .offset({x:index === 0?"0lpx":"-5lpx"})
+    .height('80lpx')
+    .justifyContent(FlexAlign.End)
   }
   }
 
 
+
+
   @Builder FollowThirdUI(){
   @Builder FollowThirdUI(){
 
 
     Column(){
     Column(){
       Column() {
       Column() {
         // 页签
         // 页签
-        Row({ space: 7 }) {
+        Row() {
           Scroll() {
           Scroll() {
             Row() {
             Row() {
               ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
               ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
@@ -63,8 +76,8 @@ export struct FollowThirdTabsComponent{
           .align(Alignment.Start)
           .align(Alignment.Start)
           .scrollable(ScrollDirection.Horizontal)
           .scrollable(ScrollDirection.Horizontal)
           .scrollBar(BarState.Off)
           .scrollBar(BarState.Off)
-          .width('90%')
-          .padding({left:'11lpx'})
+          .width('100%')
+          .padding({left:'31lpx',right:'48lpx'})
         }
         }
         .alignItems(VerticalAlign.Bottom)
         .alignItems(VerticalAlign.Bottom)
         .width('100%')
         .width('100%')
@@ -77,11 +90,6 @@ export struct FollowThirdTabsComponent{
         ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
         ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
           TabContent(){
           TabContent(){
             Column(){
             Column(){
-              Divider().width('100%')
-                .height('2lpx')
-                .strokeWidth('1lpx')
-                .backgroundColor($r('app.color.color_EDEDED'))
-                .margin({left:'20lpx'})
               FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].children[this.secondIndex].children[index].id})
               FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].children[this.secondIndex].children[index].id})
             }
             }
           }
           }
@@ -99,4 +107,19 @@ export struct FollowThirdTabsComponent{
     }
     }
   }
   }
 
 
+  getMeasureText(text: string,index:number) {
+    let width = measure.measureText({
+      textContent: text,
+      fontSize: px2fp(27),
+      lineHeight: px2fp(35)
+    })
+    if(index === 0){
+      return width + 19+ 35
+    }else if(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1){
+      return width + 35+ 35
+    }else{
+      return width + 35+ 19
+    }
+  }
+
 }
 }

-import { ContentDTO, Params } from 'wdBean';
 import { DateTimeUtils, LazyDataSource, SPHelper,UserDataLocal } from 'wdKit';
 import { DateTimeUtils, LazyDataSource, SPHelper,UserDataLocal } from 'wdKit';
-import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter';
+import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { CommentListItem } from '../../../viewmodel/CommentListItem';
 import { CommentListItem } from '../../../viewmodel/CommentListItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
@@ -106,6 +105,7 @@ export struct HomePageBottomComponent{
               EmptyComponent({emptyType:14})
               EmptyComponent({emptyType:14})
                 .layoutWeight(1)
                 .layoutWeight(1)
                 .width('100%')
                 .width('100%')
+                .offset({y:"-200lpx"})
             }
             }
           }.layoutWeight(1)
           }.layoutWeight(1)
           .justifyContent(FlexAlign.Start)
           .justifyContent(FlexAlign.Start)
@@ -114,6 +114,7 @@ export struct HomePageBottomComponent{
             EmptyComponent({emptyType:11})
             EmptyComponent({emptyType:11})
               .layoutWeight(1)
               .layoutWeight(1)
               .width('100%')
               .width('100%')
+              .offset({y:"-200lpx"})
           }
           }
         }
         }
       }else{
       }else{
@@ -323,6 +324,27 @@ export struct HomePageBottomComponent{
       data.push(new CommentListItem(item.fromUserHeader,item.fromUserName,item.targetTitle,item.createTime,commentContent,item.likeNum,0,item.id,item.targetId,item.targetType,item.targetRelId,item.targetRelObjectId,item.targetRelType,item.targetStatus,item.checkStatus,parentCommentContent,parentCommentUserName))
       data.push(new CommentListItem(item.fromUserHeader,item.fromUserName,item.targetTitle,item.createTime,commentContent,item.likeNum,0,item.id,item.targetId,item.targetType,item.targetRelId,item.targetRelObjectId,item.targetRelType,item.targetStatus,item.checkStatus,parentCommentContent,parentCommentUserName))
     })
     })
 
 
+    if(status.commentIdList.length === 0){
+      data.forEach((item)=>{
+        let publishTime = DateTimeUtils.getCommentTime(DateTimeUtils.parseDate(item.createTime,DateTimeUtils.PATTERN_DATE_TIME_HYPHEN))
+        this.data_comment.push(new CommentListItem(item.fromUserHeader,item.fromUserName,item.targetTitle,publishTime,item.commentContent,item.likeNum,item.like_status,item.id,item.targetId,item.targetType,item.targetRelId,item.targetRelObjectId,item.targetRelType,item.targetStatus,item.checkStatus,item.parentCommentContent,item.parentCommentUserName))
+      })
+
+      this.data_comment.notifyDataReload()
+
+      this.count = this.data_comment.totalCount()
+      this.commentNum = value.totalCount
+      if (this.data_comment.totalCount() < value.totalCount) {
+        this.curPageNum++
+      }else {
+        this.hasMore = false
+      }
+
+      this.isLoading = false
+      this.isGetRequest = true
+      return
+    }
+
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status,getContext(this)).then((newValue)=>{
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status,getContext(this)).then((newValue)=>{
       newValue.forEach((item)=>{
       newValue.forEach((item)=>{
         data.forEach((list)=>{
         data.forEach((list)=>{

@@ -139,6 +139,27 @@ export struct OtherHomePageBottomCommentComponent {
       data.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, item.createTime, commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, parentCommentUserName))
       data.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, item.createTime, commentContent, item.likeNum, 0, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, parentCommentContent, parentCommentUserName))
     })
     })
 
 
+    if(status.commentIdList.length === 0){
+      data.forEach((item) => {
+        this.data_comment.push(new CommentListItem(item.fromUserHeader, item.fromUserName, item.targetTitle, item.createTime, item.commentContent, item.likeNum, item.like_status, item.id, item.targetId, item.targetType, item.targetRelId, item.targetRelObjectId, item.targetRelType, item.targetStatus, item.checkStatus, item.parentCommentContent, item.parentCommentUserName))
+      })
+
+      this.data_comment.notifyDataReload()
+
+      this.count = this.data_comment.totalCount()
+      this.commentNum = value.totalCount
+      if (this.data_comment.totalCount() < value.totalCount) {
+        this.curPageNum++
+      } else {
+        this.hasMore = false
+      }
+
+      this.isLoading = false
+      this.isGetRequest = true
+      return
+    }
+
+
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status, getContext(this)).then((newValue) => {
     MinePageDatasModel.getOtherUserCommentLikeStatusData(status, getContext(this)).then((newValue) => {
       newValue.forEach((item) => {
       newValue.forEach((item) => {
         data.forEach((list) => {
         data.forEach((list) => {

@@ -319,7 +319,7 @@ struct ChannelDialog {
                         }
                         }
                       }
                       }
                     }),
                     }),
-                  PanGesture({ fingers: 1, direction: null, distance: 0 })
+                  PanGesture({ fingers: 1, direction: this.isEditIng ? PanDirection.All:PanDirection.None, distance: 0 })
                     .onActionStart((event: GestureEvent) => {
                     .onActionStart((event: GestureEvent) => {
                       this.dragItem = item.num
                       this.dragItem = item.num
                       this.dragRefOffsetX = 0
                       this.dragRefOffsetX = 0

@@ -3,6 +3,7 @@ import { RefreshLayoutBean } from './RefreshLayoutBean';
 
 
 /**
 /**
  * Custom layout to show refresh or load.
  * Custom layout to show refresh or load.
+ * @deprecated
  */
  */
 @Component
 @Component
 export default struct CustomLayout {
 export default struct CustomLayout {

@@ -3,8 +3,6 @@ import { Logger } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 import { autoRefresh, listTouchEvent } from '../../utils/PullDownRefresh';
 import { autoRefresh, listTouchEvent } from '../../utils/PullDownRefresh';
-import RefreshLayout from './RefreshLayout';
-import { RefreshLayoutBean } from './RefreshLayoutBean';
 import LoadMoreLayout from './LoadMoreLayout';
 import LoadMoreLayout from './LoadMoreLayout';
 import { CompParser } from '../CompParser';
 import { CompParser } from '../CompParser';
 import { CompDTO } from 'wdBean';
 import { CompDTO } from 'wdBean';
@@ -14,6 +12,8 @@ import { ProcessUtils } from 'wdRouter/Index';
 import PageAdModel from '../../viewmodel/PageAdvModel';
 import PageAdModel from '../../viewmodel/PageAdvModel';
 import PageNoMoreLayout from './PageNoMoreLayout';
 import PageNoMoreLayout from './PageNoMoreLayout';
 import { NoMoreBean } from './NoMoreBean';
 import { NoMoreBean } from './NoMoreBean';
+import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
+import RefreshLayout from '../refresh/RefreshLayout';
 
 
 const TAG = 'PageComponent';
 const TAG = 'PageComponent';
 
 
@@ -66,15 +66,15 @@ export struct PageComponent {
         // 下拉刷新
         // 下拉刷新
         ListItem() {
         ListItem() {
           RefreshLayout({
           RefreshLayout({
-            refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullDown, this.pageModel.pullDownRefreshImage,
-              this.pageModel.pullDownRefreshText, this.pageModel.pullDownRefreshHeight)
+            refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullDown, this.pageModel.load,
+              this.pageModel.offsetY)
           })
           })
         }
         }
 
 
         LazyForEach(this.pageModel.compList, (compDTO: CompDTO, compIndex: number) => {
         LazyForEach(this.pageModel.compList, (compDTO: CompDTO, compIndex: number) => {
           ListItem() {
           ListItem() {
             Column() {
             Column() {
-              CompParser({ compDTO: compDTO, compIndex: compIndex });
+              CompParser({ pageModel: this.pageModel, compDTO: compDTO, compIndex: compIndex });
             }
             }
           }
           }
         },
         },

@@ -99,8 +99,12 @@ struct PeopleShipHomePage {
 
 
   }
   }
 
 
-  async aboutToAppear() {
+   aboutToAppear() {
 
 
+    this.getData()
+  }
+
+  private async getData() {
     try {
     try {
       // 获取页面信息
       // 获取页面信息
       this.detailModel = await PeopleShipHomePageDataModel.getPeopleShipHomePageDetailInfo(this.creatorId, '', '')
       this.detailModel = await PeopleShipHomePageDataModel.getPeopleShipHomePageDetailInfo(this.creatorId, '', '')
@@ -117,8 +121,6 @@ struct PeopleShipHomePage {
     } catch (exception) {
     } catch (exception) {
 
 
     }
     }
-
-
   }
   }
 
 
   findFollowStata(followList: QueryListIsFollowedItem[]) {
   findFollowStata(followList: QueryListIsFollowedItem[]) {
@@ -156,8 +158,10 @@ struct PeopleShipHomePage {
     PageRepository.postInteractAccentionOperate(params).then(res => {
     PageRepository.postInteractAccentionOperate(params).then(res => {
       if (this.isAttention == '1') {
       if (this.isAttention == '1') {
         this.isAttention = '0'
         this.isAttention = '0'
+        this.detailModel.fansNum -= 1
       } else {
       } else {
         this.isAttention = '1'
         this.isAttention = '1'
+        this.detailModel.fansNum += 1
       }
       }
       this.isLoadingAttention = false
       this.isLoadingAttention = false
     })
     })

@@ -3,6 +3,7 @@ import { RefreshLayoutBean } from './RefreshLayoutBean';
 
 
 /**
 /**
  * The refresh layout component.
  * The refresh layout component.
+ * @deprecated
  */
  */
 @Component
 @Component
 export default struct RefreshLayout {
 export default struct RefreshLayout {

 /**
 /**
  * Custom refresh load layout data.
  * Custom refresh load layout data.
+ * @deprecated
  */
  */
 @Observed
 @Observed
 export class RefreshLayoutBean {
 export class RefreshLayoutBean {

-import { ContentDTO } from 'wdBean';
+import { ContentDTO , Action,GoldenPositionExtraBean} from 'wdBean';
 import { CommonConstants ,ViewType} from 'wdConstant';
 import { CommonConstants ,ViewType} from 'wdConstant';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import RefreshLayout from '../page/RefreshLayout';
 import RefreshLayout from '../page/RefreshLayout';
@@ -22,9 +22,14 @@ struct ThemeListPage {
   currentPage: number = 1;
   currentPage: number = 1;
   pageSize: number = 20;
   pageSize: number = 20;
   title: string = '金刚位聚合页'
   title: string = '金刚位聚合页'
+  extra: string = ''
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
-    PageViewModel.postThemeList(this.sort, this.currentPage, this.pageSize).then((liveReviewDTO) => {
+    let par:Action =  router.getParams() as Action;
+    let params = par?.params;
+    this.extra = params?.extra?.extra || '';
+    this.title = params?.extra?.title || '';
+    PageViewModel.postThemeList(this.sort, this.currentPage, this.pageSize,this.extra).then((liveReviewDTO) => {
       console.log(`postThemeList${JSON.stringify(liveReviewDTO)}`)
       console.log(`postThemeList${JSON.stringify(liveReviewDTO)}`)
       this.data.push(...liveReviewDTO.list)
       this.data.push(...liveReviewDTO.list)
       if(this.data.getDataArray().length > 0){
       if(this.data.getDataArray().length > 0){

@@ -339,8 +339,8 @@ export struct TopNavigationComponent {
         }else {
         }else {
           Row() {
           Row() {
             Image($r('app.media.icon_search'))
             Image($r('app.media.icon_search'))
-              .width(18)
-              .height(18)
+              .width('24vp')
+              .height('24vp')
           }
           }
           .height('40vp')
           .height('40vp')
           .width('40vp')
           .width('40vp')

@@ -3,31 +3,29 @@ import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem';
 
 
 @Component
 @Component
 export struct PeopleShipAttentionContentListHeadComponent {
 export struct PeopleShipAttentionContentListHeadComponent {
-
-  @State index: number = 0
   @ObjectLink item: FollowListDetailItem
   @ObjectLink item: FollowListDetailItem
+
   build() {
   build() {
-    Column(){
+    Column() {
       // 头像
       // 头像
       PeopleShipHomePageHeadComponent({
       PeopleShipHomePageHeadComponent({
         diameter: 48,
         diameter: 48,
         iconDiameter: 16,
         iconDiameter: 16,
-        headPhotoUrl: this.index == 0 ? $r('app.media.attention_mine') :
-          ((this.item.attentionHeadPhotoUrl && this.item.attentionHeadPhotoUrl.length > 0) ?
-          this.item.attentionHeadPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon')),
-        authIcon: this.index == 0 ? '' : this.item.authIcon
+        headPhotoUrl: (this.item.attentionHeadPhotoUrl && this.item.attentionHeadPhotoUrl.length > 0) ?
+        this.item.attentionHeadPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'),
+        authIcon: this.item.authIcon
       }).margin({
       }).margin({
         bottom: '8vp'
         bottom: '8vp'
       })
       })
 
 
-      Text(this.index == 0 ? '我的关注' : this.item.attentionUserName)
+      Text(this.item.attentionUserName)
         .fontColor($r('app.color.color_666666'))
         .fontColor($r('app.color.color_666666'))
         .fontSize($r('app.float.vp_13'))
         .fontSize($r('app.float.vp_13'))
         .fontWeight(400)
         .fontWeight(400)
         .height('18vp')
         .height('18vp')
         .lineHeight('18vp')
         .lineHeight('18vp')
         .maxLines(1)
         .maxLines(1)
-        .textOverflow({overflow: TextOverflow.Ellipsis})
+        .textOverflow({ overflow: TextOverflow.Ellipsis })
         .padding({
         .padding({
           left: '2vp',
           left: '2vp',
           right: '2vp'
           right: '2vp'
@@ -36,7 +34,7 @@ export struct PeopleShipAttentionContentListHeadComponent {
     .alignItems(HorizontalAlign.Center)
     .alignItems(HorizontalAlign.Center)
     .width('78vp')
     .width('78vp')
     .margin({
     .margin({
-      left: this.index == 0 ? '8vp' : '4vp',
+      left: '4vp',
       top: '14vp',
       top: '14vp',
       bottom: '14vp'
       bottom: '14vp'
     })
     })

@@ -6,37 +6,72 @@ import { PeopleShipAttentionContentListHeadComponent } from './PeopleShipAttenti
 @Component
 @Component
 export struct PeopleShipAttentionContentListTopComponent {
 export struct PeopleShipAttentionContentListTopComponent {
   @Prop followList: FollowListDetailItem[]
   @Prop followList: FollowListDetailItem[]
+
   build() {
   build() {
     Column() {
     Column() {
-      List(){
+      List() {
         ListItem() {
         ListItem() {
-          PeopleShipAttentionContentListHeadComponent({
-            index: 0,
-            item: this.followList[0]
-          })
+          this.PeopleShipFollowTop()
         }.onClick(() => {
         }.onClick(() => {
           // 跳转到关注列表-我的
           // 跳转到关注列表-我的
           WDRouterRule.jumpWithPage(WDRouterPage.followListPage)
           WDRouterRule.jumpWithPage(WDRouterPage.followListPage)
         })
         })
 
 
 
 
-        ForEach(this.followList, (item: FollowListDetailItem, index: number) => {
+        ForEach(this.followList, (item: FollowListDetailItem) => {
           ListItem() {
           ListItem() {
             PeopleShipAttentionContentListHeadComponent({
             PeopleShipAttentionContentListHeadComponent({
-              index: index + 1,
               item: item
               item: item
             })
             })
           }.onClick(() => {
           }.onClick(() => {
             let creatorId = item.attentionCreatorId || ''
             let creatorId = item.attentionCreatorId || ''
             ProcessUtils.gotoPeopleShipHomePage(creatorId)
             ProcessUtils.gotoPeopleShipHomePage(creatorId)
           })
           })
-        }, (item: FollowListDetailItem) => item.attentionCreatorId)
+        }, (item: FollowListDetailItem, index: number) => item.attentionCreatorId + index)
       }
       }
       .listDirection(Axis.Horizontal)
       .listDirection(Axis.Horizontal)
       .scrollBar(BarState.Off)
       .scrollBar(BarState.Off)
       .width('100%')
       .width('100%')
       .height('102vp')
       .height('102vp')
+
       Divider().strokeWidth(1).color($r('app.color.color_F5F5F5'))
       Divider().strokeWidth(1).color($r('app.color.color_F5F5F5'))
     }
     }
   }
   }
+
+  @Builder
+  PeopleShipFollowTop() {
+    Column() {
+      // 头像
+      Image($r('app.media.attention_mine'))
+        .alt($r('app.media.attention_mine'))
+        .width(48)
+        .height(48)
+        .borderRadius(24)
+        .objectFit(ImageFit.ScaleDown)
+        .backgroundColor($r('app.color.color_F5F5F5'))
+        .margin({
+          bottom: '8vp'
+        })
+
+      Text('我的关注')
+        .fontColor($r('app.color.color_666666'))
+        .fontSize($r('app.float.vp_13'))
+        .fontWeight(400)
+        .height('18vp')
+        .lineHeight('18vp')
+        .maxLines(1)
+        .textOverflow({ overflow: TextOverflow.Ellipsis })
+        .padding({
+          left: '2vp',
+          right: '2vp'
+        })
+    }
+    .alignItems(HorizontalAlign.Center)
+    .width('78vp')
+    .margin({
+      left: '8vp',
+      top: '14vp',
+      bottom: '14vp'
+    })
+  }
 }
 }

@@ -280,6 +280,7 @@ export struct PeopleShipMainComponent {
         //批量查询各类型内容动态数据接口
         //批量查询各类型内容动态数据接口
         this.checkContentInteractData(listData.list, resolve)
         this.checkContentInteractData(listData.list, resolve)
       } else  {
       } else  {
+        this.hasMore = false;
         this.resolveEnd(true, resolve)
         this.resolveEnd(true, resolve)
       }
       }
 
 

@@ -25,12 +25,27 @@ export struct PeopleShipRecommendHeadComponent {
           })
           })
       }.margin({ top: 12, bottom: 8 })
       }.margin({ top: 12, bottom: 8 })
 
 
+      Row() {
         Text(this.rmhInfo.userName)
         Text(this.rmhInfo.userName)
           .fontColor($r('app.color.color_222222'))
           .fontColor($r('app.color.color_222222'))
           .fontSize($r('app.float.vp_14'))
           .fontSize($r('app.float.vp_14'))
           .fontWeight(600)
           .fontWeight(600)
           .maxLines(1)
           .maxLines(1)
           .textOverflow({overflow: TextOverflow.Ellipsis})
           .textOverflow({overflow: TextOverflow.Ellipsis})
+        if (this.rmhInfo.authIcon) {
+          Image(this.rmhInfo.authIcon)
+            .width('12vp')
+            .height('12vp')
+            .borderRadius(6)
+            .objectFit(ImageFit.Cover)
+            .margin({
+              left: '2vp'
+            })
+        }
+      }
+      .alignItems(VerticalAlign.Center)
+      .justifyContent(FlexAlign.Center)
+
 
 
       Text(this.rmhInfo.introduction)
       Text(this.rmhInfo.introduction)
         .fontColor($r('app.color.color_B0B0B0'))
         .fontColor($r('app.color.color_B0B0B0'))

+import { ToastUtils } from 'wdKit';
+
 @Component
 @Component
 export struct PeopleShipHomeAttentionComponent {
 export struct PeopleShipHomeAttentionComponent {
   @Consume isAttention: string
   @Consume isAttention: string
@@ -18,7 +20,14 @@ export struct PeopleShipHomeAttentionComponent {
                   .height(20)
                   .height(20)
                   .color($r('app.color.color_fff'))
                   .color($r('app.color.color_fff'))
               }else {
               }else {
-                Text('+ 关注')
+                Image($r('app.media.people_ship_top_add'))
+                  .objectFit(ImageFit.Auto)
+                  .width('16vp')
+                  .height('16pv')
+                  .margin({
+                    right: '4vp'
+                  })
+                Text('关注')
                   .fontColor(Color.White)
                   .fontColor(Color.White)
                   .fontSize($r('app.float.vp_14'))
                   .fontSize($r('app.float.vp_14'))
                   .fontWeight(500)
                   .fontWeight(500)
@@ -104,7 +113,7 @@ export struct PeopleShipHomeAttentionComponent {
         left: '-5vp'
         left: '-5vp'
       })
       })
       .onClick(() => {
       .onClick(() => {
-
+        ToastUtils.showToast('分享为公共方法，待开发', 1000);
       })
       })
 
 
     }
     }

@@ -24,7 +24,7 @@ export struct PeopleShipHomeListComponent {
     // 列表
     // 列表
     else if (this.publishCount == 0) {
     else if (this.publishCount == 0) {
       // 无数据展示
       // 无数据展示
-      EmptyComponent({emptyType: 13}).height(DisplayUtils.getDeviceHeight() - this.topHeight)
+      EmptyComponent({emptyType: 12}).height(DisplayUtils.getDeviceHeight() - this.topHeight)
     } else {
     } else {
       Column() {
       Column() {
         Column() {
         Column() {
@@ -38,14 +38,17 @@ export struct PeopleShipHomeListComponent {
               }
               }
               .justifyContent(FlexAlign.Start)
               .justifyContent(FlexAlign.Start)
             }
             }
+            .backgroundColor(Color.White)
             .align(Alignment.Start)
             .align(Alignment.Start)
             .scrollable(ScrollDirection.Horizontal)
             .scrollable(ScrollDirection.Horizontal)
             .scrollBar(BarState.Off)
             .scrollBar(BarState.Off)
             .width('100%')
             .width('100%')
           }
           }
+          .backgroundColor(Color.White)
           .alignItems(VerticalAlign.Bottom)
           .alignItems(VerticalAlign.Bottom)
           .width('100%')
           .width('100%')
         }
         }
+        .justifyContent(FlexAlign.Start)
         .height('44vp')
         .height('44vp')
         .alignItems(HorizontalAlign.Start)
         .alignItems(HorizontalAlign.Start)
         .width('100%')
         .width('100%')

 import router from '@ohos.router'
 import router from '@ohos.router'
 import { PeopleShipUserDetailData } from 'wdBean'
 import { PeopleShipUserDetailData } from 'wdBean'
 import { PeopleShipHomePageHeadComponent } from './PeopleShipHomePageHeadComponent'
 import { PeopleShipHomePageHeadComponent } from './PeopleShipHomePageHeadComponent'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
+import { ToastUtils } from 'wdKit';
 
 
 @Component
 @Component
 export struct PeopleShipHomePageNavComponent {
 export struct PeopleShipHomePageNavComponent {
@@ -38,8 +40,13 @@ export struct PeopleShipHomePageNavComponent {
               iconDiameter: 10,
               iconDiameter: 10,
               headPhotoUrl: (this.detailModel.headPhotoUrl && this.detailModel.headPhotoUrl.length > 0 ) ? this.detailModel.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'),
               headPhotoUrl: (this.detailModel.headPhotoUrl && this.detailModel.headPhotoUrl.length > 0 ) ? this.detailModel.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'),
               authIcon: this.detailModel.authIcon
               authIcon: this.detailModel.authIcon
-            })
-              .margin({
+            }).onClick(()=>{
+              let params = {
+                'headPhotoUrl': this.detailModel.headPhotoUrl,
+                'headType': '1'
+              } as Record<string, string>;
+              WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage,params)
+            }).margin({
                 left: '10vp',
                 left: '10vp',
               })
               })
               .visibility((this.topOpacity > 0.5 ? Visibility.Visible : Visibility.Hidden))
               .visibility((this.topOpacity > 0.5 ? Visibility.Visible : Visibility.Hidden))
@@ -56,7 +63,25 @@ export struct PeopleShipHomePageNavComponent {
 
 
             if (this.isAttention == '0') {
             if (this.isAttention == '0') {
               // 关注
               // 关注
-              Button('+ 关注', { type: ButtonType.Normal, stateEffect: true })
+              Button({ type: ButtonType.Normal, stateEffect: true }) {
+                Row(){
+                  Image($r('app.media.people_ship_top_add'))
+                    .objectFit(ImageFit.Auto)
+                    .width('12vp')
+                    .height('12pv')
+                    .margin({
+                      right: '2vp'
+                    })
+                  Text('关注')
+                    .fontSize($r('app.float.vp_12'))
+                    .fontColor(Color.White)
+                }
+                .alignSelf(ItemAlign.Center)
+                .justifyContent(FlexAlign.Center)
+                .width('100%')
+                .height('100%')
+              }
+
                 .borderRadius(4)
                 .borderRadius(4)
                 .backgroundColor($r('app.color.color_ED2800'))
                 .backgroundColor($r('app.color.color_ED2800'))
                 .width('54vp')
                 .width('54vp')
@@ -71,8 +96,6 @@ export struct PeopleShipHomePageNavComponent {
                   left: '12vp',
                   left: '12vp',
                 })
                 })
                 .padding(0)
                 .padding(0)
-                .fontSize($r('app.float.vp_12'))
-                .fontColor(Color.White)
                 .visibility((this.attentionOpacity ? Visibility.Visible : Visibility.Hidden))
                 .visibility((this.attentionOpacity ? Visibility.Visible : Visibility.Hidden))
             } else {
             } else {
               Button('已关注', { type: ButtonType.Normal, stateEffect: true })
               Button('已关注', { type: ButtonType.Normal, stateEffect: true })
@@ -104,7 +127,7 @@ export struct PeopleShipHomePageNavComponent {
             .objectFit(ImageFit.Auto)
             .objectFit(ImageFit.Auto)
             .margin({ right: '10vp' })
             .margin({ right: '10vp' })
             .onClick(() => {
             .onClick(() => {
-
+              ToastUtils.showToast('分享为公共方法，待开发', 1000);
             })
             })
         }
         }
         .width('100%')
         .width('100%')

@@ -5,7 +5,7 @@ export struct PeopleShipHomePageAttestationComponent {
   build() {
   build() {
     Row() {
     Row() {
       Text(this.name)
       Text(this.name)
-        .lineHeight('16vp')
+        .lineHeight('18vp')
         .fontColor($r('app.color.color_ED2800'))
         .fontColor($r('app.color.color_ED2800'))
         .fontSize($r('app.float.vp_11'))
         .fontSize($r('app.float.vp_11'))
         .backgroundColor($r('app.color.color_1AED2800'))
         .backgroundColor($r('app.color.color_1AED2800'))
@@ -16,21 +16,27 @@ export struct PeopleShipHomePageAttestationComponent {
           left: '16vp',
           left: '16vp',
         })
         })
         .padding({
         .padding({
-          top: '3vp',
-          bottom: '3vp',
-          right: '6vp',
-          left: '6vp'
+          top: '1vp',
+          bottom: '1vp',
+          right: '4vp',
+          left: '4vp'
         })
         })
 
 
       Text(this.content)
       Text(this.content)
-        .lineHeight('22vp')
+        .lineHeight('18vp')
         .fontSize($r('app.float.vp_12'))
         .fontSize($r('app.float.vp_12'))
         .layoutWeight(1)
         .layoutWeight(1)
         .fontColor($r('app.color.color_222222'))
         .fontColor($r('app.color.color_222222'))
         .textAlign(TextAlign.Start)
         .textAlign(TextAlign.Start)
+        .align(Alignment.Center)
+        .padding(0)
         .margin({
         .margin({
           right: '16vp'
           right: '16vp'
         })
         })
+        .padding({
+          top: '1vp',
+          bottom: '1vp',
+        })
     }
     }
     .width('100%')
     .width('100%')
     .alignItems(VerticalAlign.Top)
     .alignItems(VerticalAlign.Top)

@@ -9,6 +9,7 @@ export struct PeopleShipHomePageHeadComponent {
       Stack({ alignContent: Alignment.BottomEnd }) {
       Stack({ alignContent: Alignment.BottomEnd }) {
         // 头像
         // 头像
         Image( this.headPhotoUrl )
         Image( this.headPhotoUrl )
+          .alt($r('app.media.WDAccountOwnerHedaerDefaultIcon'))
           .width(this.diameter)
           .width(this.diameter)
           .height(this.diameter)
           .height(this.diameter)
           .borderRadius(this.diameter/2)
           .borderRadius(this.diameter/2)

@@ -7,6 +7,7 @@ import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageD
 import { InfluenceData, PeopleShipUserDetailData } from 'wdBean'
 import { InfluenceData, PeopleShipUserDetailData } from 'wdBean'
 import { PeopleShipHomeAttentionComponent } from './PeopleShipHomeAttentionComponent'
 import { PeopleShipHomeAttentionComponent } from './PeopleShipHomeAttentionComponent'
 import { HWLocationUtils } from 'wdHwAbility'
 import { HWLocationUtils } from 'wdHwAbility'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 
 
 
 
 @Component
 @Component
@@ -27,30 +28,37 @@ export struct PeopleShipHomePageTopComponent {
   @State collapseTxt: string = '…展开';
   @State collapseTxt: string = '…展开';
   private subTxt: string = '';
   private subTxt: string = '';
   @State content: string = ''
   @State content: string = ''
-  @State topFixedHeight: number = 320
+  @State topFixedHeight: number = 286
   @State lineInNum: number = 1
   @State lineInNum: number = 1
   @Link topHeight: number
   @Link topHeight: number
   @State provinceName: string = ''
   @State provinceName: string = ''
+
   build() {
   build() {
     Column() {
     Column() {
-        Stack({ alignContent: Alignment.TopStart}) {
+      Stack({ alignContent: Alignment.TopStart }) {
         // 顶部图片
         // 顶部图片
         Image($r('app.media.home_page_bg'))
         Image($r('app.media.home_page_bg'))
           .width('100%')
           .width('100%')
           .height('120vp')
           .height('120vp')
           .objectFit(ImageFit.Fill)
           .objectFit(ImageFit.Fill)
-          .backgroundColor(Color.Black)
+          .backgroundColor(Color.White)
         // 头像和名称
         // 头像和名称
         Row() {
         Row() {
           // 头像
           // 头像
           PeopleShipHomePageHeadComponent({
           PeopleShipHomePageHeadComponent({
             diameter: 80,
             diameter: 80,
             iconDiameter: 20,
             iconDiameter: 20,
-            headPhotoUrl:(this.detailModel.headPhotoUrl && this.detailModel.headPhotoUrl.length > 0) ? this.detailModel.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon') ,
+            headPhotoUrl: (this.detailModel.headPhotoUrl && this.detailModel.headPhotoUrl.length > 0) ? this.detailModel.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'),
             authIcon: this.detailModel.authIcon
             authIcon: this.detailModel.authIcon
           }).margin({
           }).margin({
             left: '10vp',
             left: '10vp',
             bottom: '20vp'
             bottom: '20vp'
+          }).onClick(() => {
+            let params = {
+              'headPhotoUrl': this.detailModel.headPhotoUrl,
+              'headType': '1'
+            } as Record<string, string>;
+            WDRouterRule.jumpWithPage(WDRouterPage.showUserHeaderPage, params)
           })
           })
 
 
 
 
@@ -61,7 +69,7 @@ export struct PeopleShipHomePageTopComponent {
             .fontColor($r('app.color.color_222222'))
             .fontColor($r('app.color.color_222222'))
             .fontWeight(500)
             .fontWeight(500)
             .textAlign(TextAlign.Start)
             .textAlign(TextAlign.Start)
-            .textOverflow({overflow: TextOverflow.Ellipsis})
+            .textOverflow({ overflow: TextOverflow.Ellipsis })
             .maxLines(2)
             .maxLines(2)
             .layoutWeight(1)
             .layoutWeight(1)
             .margin({
             .margin({
@@ -78,49 +86,50 @@ export struct PeopleShipHomePageTopComponent {
       .width('100%')
       .width('100%')
       .height('180vp')
       .height('180vp')
       .backgroundColor(Color.Transparent)
       .backgroundColor(Color.Transparent)
+
       // 认证id:1蓝2黄，蓝v 只有官方认证，黄v有领域和身份认证
       // 认证id:1蓝2黄，蓝v 只有官方认证，黄v有领域和身份认证
       // 官方认证
       // 官方认证
-      if(this.detailModel.authId == 1 && this.detailModel.categoryAuth.length > 0) {
-        PeopleShipHomePageAttestationComponent({name: '官方认证', content: this.detailModel.categoryAuth})
+      if (this.detailModel.authId == 1 && this.detailModel.categoryAuth.length > 0) {
+        PeopleShipHomePageAttestationComponent({ name: '官方认证', content: this.detailModel.categoryAuth})
           .margin({
           .margin({
-            top: '10vp',
+            top: '0vp',
             bottom: '10vp'
             bottom: '10vp'
           })
           })
       }
       }
-      if(this.detailModel.authId == 2) {
-          if (this.detailModel.authTitle && this.detailModel.authTitle.length > 0 ){
-            PeopleShipHomePageAttestationComponent({name: '领域认证', content: this.detailModel.authTitle})
+      if (this.detailModel.authId == 2) {
+        if (this.detailModel.authTitle && this.detailModel.authTitle.length > 0) {
+          PeopleShipHomePageAttestationComponent({ name: '领域认证', content: this.detailModel.authTitle })
             .margin({
             .margin({
-                top: '10vp',
-                bottom: '10vp'
+              top: '0vp',
+              bottom: (this.detailModel.authPersonal && this.detailModel.authPersonal.length > 0) ? '6vp' : '10vp'
             })
             })
         }
         }
-        if (this.detailModel.authPersonal && this.detailModel.authPersonal.length > 0 ){
-          PeopleShipHomePageAttestationComponent({name: '身份认证', content: this.detailModel.authPersonal})
+        if (this.detailModel.authPersonal && this.detailModel.authPersonal.length > 0) {
+          PeopleShipHomePageAttestationComponent({ name: '身份认证', content: this.detailModel.authPersonal })
             .margin({
             .margin({
-              top: '10vp',
+              top: '0vp',
               bottom: '10vp'
               bottom: '10vp'
             })
             })
         }
         }
       }
       }
 
 
       // 简介
       // 简介
-      if(this.lineInNum > 3) {
+      if (this.lineInNum > 3) {
         Row() {
         Row() {
           Text() {
           Text() {
             Span(this.content)
             Span(this.content)
               .fontColor($r('app.color.color_222222'))
               .fontColor($r('app.color.color_222222'))
 
 
             Span(this.collapseTxt)
             Span(this.collapseTxt)
-              .onClick(()=>{
-                if(this.isCollapse){
+              .onClick(() => {
+                if (this.isCollapse) {
                   this.maxLines = Infinity;
                   this.maxLines = Infinity;
                   this.content = `简介：${this.detailModel.introduction}`
                   this.content = `简介：${this.detailModel.introduction}`
                   this.isCollapse = false;
                   this.isCollapse = false;
                   this.collapseTxt = '收起';
                   this.collapseTxt = '收起';
                   this.topHeight = this.topFixedHeight + 21 * this.lineInNum
                   this.topHeight = this.topFixedHeight + 21 * this.lineInNum
 
 
-                }else{
+                } else {
                   this.isCollapse = true;
                   this.isCollapse = true;
                   this.collapseTxt = '…展开';
                   this.collapseTxt = '…展开';
                   this.content = this.subTxt;
                   this.content = this.subTxt;
@@ -130,30 +139,36 @@ export struct PeopleShipHomePageTopComponent {
               .fontColor($r('app.color.color_B0B0B0'))
               .fontColor($r('app.color.color_B0B0B0'))
 
 
           }
           }
+          .backgroundColor(Color.Transparent)
           .lineHeight('21vp')
           .lineHeight('21vp')
+          .width('100%')
           .maxLines(this.maxLines)
           .maxLines(this.maxLines)
-          .textOverflow({overflow: TextOverflow.Ellipsis})
+          .textOverflow({ overflow: TextOverflow.Ellipsis })
           .fontSize($r('app.float.vp_14'))
           .fontSize($r('app.float.vp_14'))
-          .key('home_page_introduction')
-          .margin({
+          .padding({
             left: '16vp',
             left: '16vp',
             right: '16vp',
             right: '16vp',
           })
           })
         }.width('100%')
         }.width('100%')
+        .backgroundColor(Color.Transparent)
         .alignItems(VerticalAlign.Top)
         .alignItems(VerticalAlign.Top)
-      }else  {
+      } else {
         Row() {
         Row() {
           Text(`简介：${this.detailModel.introduction}`)
           Text(`简介：${this.detailModel.introduction}`)
             .fontSize($r('app.float.vp_14'))
             .fontSize($r('app.float.vp_14'))
             .fontColor($r('app.color.color_222222'))
             .fontColor($r('app.color.color_222222'))
             .lineHeight('21vp')
             .lineHeight('21vp')
+            .width('100%')
             .maxLines(3)
             .maxLines(3)
-          .textOverflow({overflow: TextOverflow.Ellipsis})
-          .margin({
+            .textOverflow({ overflow: TextOverflow.Ellipsis })
+            .padding({
               left: '16vp',
               left: '16vp',
               right: '16vp',
               right: '16vp',
             })
             })
+            .backgroundColor(Color.Transparent)
+
         }.width('100%')
         }.width('100%')
+        .backgroundColor(Color.Transparent)
         .alignItems(VerticalAlign.Top)
         .alignItems(VerticalAlign.Top)
       }
       }
 
 
@@ -164,7 +179,6 @@ export struct PeopleShipHomePageTopComponent {
           .fontSize($r('app.float.vp_12'))
           .fontSize($r('app.float.vp_12'))
           .fontColor($r('app.color.color_999999'))
           .fontColor($r('app.color.color_999999'))
           .textAlign(TextAlign.Start)
           .textAlign(TextAlign.Start)
-          .width('100%')
           .alignSelf(ItemAlign.Start)
           .alignSelf(ItemAlign.Start)
           .margin({
           .margin({
             right: '16vp',
             right: '16vp',
@@ -247,7 +261,8 @@ export struct PeopleShipHomePageTopComponent {
         .height('6vp')
         .height('6vp')
     }
     }
     .width('100%')
     .width('100%')
-    .height('100%')
+
+    // .height('100%')
   }
   }
 
 
   async aboutToAppear() {
   async aboutToAppear() {
@@ -265,17 +280,15 @@ export struct PeopleShipHomePageTopComponent {
 
 
   }
   }
 
 
-
-
   //  不听减去2个字-一直到时3行
   //  不听减去2个字-一直到时3行
   private compIntroductionTextHeights() {
   private compIntroductionTextHeights() {
     let introduction = `简介：${this.detailModel.introduction}`
     let introduction = `简介：${this.detailModel.introduction}`
     let lineInNum1 = this.getTextLineNum(introduction, DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
     let lineInNum1 = this.getTextLineNum(introduction, DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
-    while (lineInNum1 > 3 ) {
+    while (lineInNum1 > 3) {
       introduction = introduction.substring(0, introduction.length - 2);
       introduction = introduction.substring(0, introduction.length - 2);
-      lineInNum1 = this.getTextLineNum(introduction,  DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
+      lineInNum1 = this.getTextLineNum(introduction + this.collapseTxt, DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
     }
     }
-    introduction = introduction.substring(0, introduction.length - 3);
+    // introduction = introduction.substring(0, introduction.length - 3);
     Logger.debug('PeopleShipHomePageTopComponent', '3行简介：', `${introduction}`)
     Logger.debug('PeopleShipHomePageTopComponent', '3行简介：', `${introduction}`)
 
 
     this.subTxt = introduction;
     this.subTxt = introduction;
@@ -285,7 +298,7 @@ export struct PeopleShipHomePageTopComponent {
   private getTextLineNum(text: string, constraintWidth: number, lineHeight: number, fontSize: number | string | Resource) {
   private getTextLineNum(text: string, constraintWidth: number, lineHeight: number, fontSize: number | string | Resource) {
     let size = this.topMeasureText(text, constraintWidth, lineHeight, fontSize)
     let size = this.topMeasureText(text, constraintWidth, lineHeight, fontSize)
     let height: number = Number(size.height)
     let height: number = Number(size.height)
-    return Math.ceil(px2vp(height)/lineHeight)
+    return Math.ceil(px2vp(height) / lineHeight)
   }
   }
 
 
   private topMeasureText(text: string, constraintWidth: number, lineHeight: number, fontSize: number | string | Resource) {
   private topMeasureText(text: string, constraintWidth: number, lineHeight: number, fontSize: number | string | Resource) {
@@ -299,7 +312,7 @@ export struct PeopleShipHomePageTopComponent {
 
 
   async onIntroductionUpdated() {
   async onIntroductionUpdated() {
 
 
-     if (this.content.length == 0 && this.detailModel.introduction ) {
+    if (this.content.length == 0 && this.detailModel.introduction) {
       this.lineInNum = this.getTextLineNum(`简介：${this.detailModel.introduction}`, DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
       this.lineInNum = this.getTextLineNum(`简介：${this.detailModel.introduction}`, DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
       if (this.lineInNum > 3) {
       if (this.lineInNum > 3) {
         this.compIntroductionTextHeights()
         this.compIntroductionTextHeights()
@@ -307,43 +320,48 @@ export struct PeopleShipHomePageTopComponent {
       }
       }
     }
     }
     if (this.detailModel) {
     if (this.detailModel) {
-       this.topFixedHeight = 308
+      this.topFixedHeight = 286
       if (this.detailModel.region && this.detailModel.region.length > 0) {
       if (this.detailModel.region && this.detailModel.region.length > 0) {
         this.provinceName = this.detailModel.region
         this.provinceName = this.detailModel.region
-       }else  {
+      } else {
         this.provinceName = await this.computeIPRegion(this.detailModel.province)
         this.provinceName = await this.computeIPRegion(this.detailModel.province)
       }
       }
-       if(this.detailModel.authId == 1 && this.detailModel.categoryAuth.length > 0) {
-         this.topFixedHeight += this.getTextLineNum(this.detailModel.categoryAuth,  DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12'))*22
+      if (this.detailModel.authId == 1 && this.detailModel.categoryAuth.length > 0) {
+        this.topFixedHeight += this.getTextLineNum(this.detailModel.categoryAuth, DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12')) * 18
+        this.topFixedHeight += 12
       }
       }
-       else if(this.detailModel.authId == 2) {
-         if (this.detailModel.authTitle && this.detailModel.authTitle.length > 0 ){
-           this.topFixedHeight += this.getTextLineNum(this.detailModel.authTitle,  DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12'))*22
+      else if (this.detailModel.authId == 2) {
+        if (this.detailModel.authTitle && this.detailModel.authTitle.length > 0) {
+          this.topFixedHeight += this.getTextLineNum(this.detailModel.authTitle, DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12')) * 18
+          if (this.detailModel.authPersonal && this.detailModel.authPersonal.length > 0){
+            this.topFixedHeight += 8
+          }else{
+            this.topFixedHeight += 12
           }
           }
-         if (this.detailModel.authPersonal && this.detailModel.authPersonal.length > 0 ){
-           if (this.detailModel.authTitle && this.detailModel.authTitle.length > 0 ){
-             this.topFixedHeight += 10
         }
         }
-           this.topFixedHeight += this.getTextLineNum(this.detailModel.authPersonal,  DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12'))*22
+        if (this.detailModel.authPersonal && this.detailModel.authPersonal.length > 0) {
+          this.topFixedHeight += this.getTextLineNum(this.detailModel.authPersonal, DisplayUtils.getDeviceWidth() - 90, 22, $r('app.float.vp_12')) * 18
+          this.topFixedHeight += 12
         }
         }
       }
       }
       this.lineInNum = this.getTextLineNum(`简介：${this.detailModel.introduction}`, DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
       this.lineInNum = this.getTextLineNum(`简介：${this.detailModel.introduction}`, DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
       if (this.lineInNum <= 3) {
       if (this.lineInNum <= 3) {
-         this.topFixedHeight += (21 * this.lineInNum)
-         this.topHeight = this.topFixedHeight
-       }else {
-         this.topHeight = this.topFixedHeight + (this.isCollapse ? 21*3 : 21 * this.lineInNum )
+        this.topHeight = this.topFixedHeight + (21 * this.lineInNum)
+      } else {
+        this.lineInNum = this.getTextLineNum(`简介：${this.detailModel.introduction}` + '收起', DisplayUtils.getDeviceWidth() - 32, 21, $r('app.float.vp_14'))
+        this.topHeight = this.topFixedHeight + (this.isCollapse ? 21 * 3 : 21 * this.lineInNum)
       }
       }
       // IP归属地
       // IP归属地
       if (this.provinceName && this.provinceName.length > 0) {
       if (this.provinceName && this.provinceName.length > 0) {
+        this.topFixedHeight += 28
         this.topHeight += 28
         this.topHeight += 28
       }
       }
     }
     }
   }
   }
 
 
   private computeShowNum(count: number) {
   private computeShowNum(count: number) {
-    if(count >= 10000) {
-      return `${(count/10000).toFixed(1)}万`
+    if (count >= 10000) {
+      return `${(count / 10000).toFixed(1)}万`
     }
     }
     return `${count}`
     return `${count}`
   }
   }
@@ -352,7 +370,7 @@ export struct PeopleShipHomePageTopComponent {
   private async computeIPRegion(province: string) {
   private async computeIPRegion(province: string) {
     if (province && province.length) {
     if (province && province.length) {
       try {
       try {
-        let provinceName = await HWLocationUtils.getProvinceName(province) ;
+        let provinceName = await HWLocationUtils.getProvinceName(province);
         return provinceName
         return provinceName
       } catch (e) {
       } catch (e) {
         return ''
         return ''
@@ -360,5 +378,4 @@ export struct PeopleShipHomePageTopComponent {
     }
     }
     return ''
     return ''
   }
   }
-
 }
 }

+import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
+import RefreshLoadLayout from '../refresh/RefreshLoadLayout';
+
+/**
+ * The refresh layout component.
+ */
+@Component
+export default struct RefreshLayout {
+  @ObjectLink refreshBean: RefreshLayoutBean;
+
+  build() {
+    Column() {
+      if (this.refreshBean.isVisible) {
+        RefreshLoadLayout({
+          refreshBean: new RefreshLayoutBean(this.refreshBean.isVisible, this.refreshBean.loadStatus, this.refreshBean.offset)
+        })
+      }
+    }
+  }
+}

+/**
+ * 下拉刷新数据bean.
+ */
+@Observed
+export class RefreshLayoutBean {
+  /**
+   * Custom refresh load layout isVisible.
+   */
+  isVisible: boolean;
+  loadStatus: number; // 1-下拉刷新 2-松开刷新 3-刷新完成
+
+  offset: number;
+
+  constructor(isVisible: boolean, loadStatus: LoadStatus, offset: number) {
+    this.isVisible = isVisible;
+    this.loadStatus = loadStatus;
+    this.offset = offset;
+  }
+}
+
+export const enum LoadStatus {
+  /**
+   * 触发刷新前，有下拉动作了
+   */
+  IDLE,
+  /**
+   * 触发刷新前，有下拉动作了
+   */
+  PRELOAD,
+  /**
+   * 刷新中
+   */
+  LOADING,
+  /**
+   * 触发刷新结束，展示‘已更新最新’
+   */
+  LOADED,
+}

+import lottie, { AnimationItem } from '@ohos/lottie';
+import { LoadStatus, RefreshLayoutBean } from './RefreshLayoutBean';
+
+/**
+ * Custom layout to show refresh or load.
+ * TODO 待优化
+ */
+@Component
+export default struct CustomLayout {
+  // 设置刷新view高度
+  static readonly REFRESH_HEIGHT: number = 90;
+  @ObjectLink @Watch('onOffsetChange') refreshBean: RefreshLayoutBean;
+  private mainRenderingSettings: RenderingContextSettings = new RenderingContextSettings(true)
+  private mainCanvasRenderingContext: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.mainRenderingSettings)
+  private mainRenderingSettings2: RenderingContextSettings = new RenderingContextSettings(true)
+  private mainCanvasRenderingContext2: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.mainRenderingSettings2)
+  private animateItem: AnimationItem | null = null;
+  private animateItem2: AnimationItem | null = null;
+  private animateName: string = "refresh";
+  private animateName2: string = "refreshing";
+  @State private layoutHeight: number = 0;
+
+  build() {
+    Stack({ alignContent: Alignment.Center }) {
+      Canvas(this.mainCanvasRenderingContext)
+        .width(60)
+        .height(60)
+        .backgroundColor(Color.Transparent)
+        .onReady(() => {
+          // 可在此生命回调周期中加载动画，可以保证动画尺寸正确
+          //抗锯齿的设置
+          this.mainCanvasRenderingContext.imageSmoothingEnabled = true;
+          this.mainCanvasRenderingContext.imageSmoothingQuality = 'medium'
+        })
+        .onDisAppear(() => {
+          lottie.destroy(this.animateName);
+        })
+        .visibility(this.refreshBean.loadStatus === LoadStatus.PRELOAD ? Visibility.Visible : Visibility.Hidden)
+
+      Canvas(this.mainCanvasRenderingContext2)
+        .width(60)
+        .height(60)
+        .backgroundColor(Color.Transparent)
+        .onReady(() => {
+          // 可在此生命回调周期中加载动画，可以保证动画尺寸正确
+          //抗锯齿的设置
+          this.mainCanvasRenderingContext2.imageSmoothingEnabled = true;
+          this.mainCanvasRenderingContext2.imageSmoothingQuality = 'medium'
+        })
+        .onDisAppear(() => {
+          lottie.destroy(this.animateName2);
+        })
+        .visibility(this.refreshBean.loadStatus === LoadStatus.LOADING ? Visibility.Visible : Visibility.Hidden)
+
+      Text('已更新至最新')
+        .fontSize(17)
+        .textAlign(TextAlign.Center)
+        .fontColor('#bbbbbb')
+        .visibility(this.refreshBean.loadStatus != LoadStatus.LOADED ? Visibility.Hidden : Visibility.Visible)
+
+    }
+    .clip(true)
+    .width('100%')
+    .height(this.layoutHeight)
+  }
+
+  animate1(offset: number) {
+    if (this.animateItem == null) {
+      this.animateItem = lottie.loadAnimation({
+        container: this.mainCanvasRenderingContext,
+        renderer: 'canvas', // canvas 渲染模式
+        loop: 1,
+        autoplay: true,
+        name: this.animateName,
+        path: "lottie/refresh_step1.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径
+      })
+    }
+    this.animateItem.goToAndStop(1)
+    let total = CustomLayout.REFRESH_HEIGHT
+    let progress = offset * 100 / total
+    this.animateItem?.goToAndStop(this.getFramesByProgress(progress), true);
+  }
+
+  animate2() {
+    if (this.animateItem2 == null) {
+      this.animateItem2 = lottie.loadAnimation({
+        container: this.mainCanvasRenderingContext2,
+        renderer: 'canvas', // canvas 渲染模式
+        loop: 10,
+        autoplay: true,
+        name: this.animateName2,
+        path: "lottie/refresh_step2.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径
+      })
+    }
+    // this.animateItem2.isLoaded
+    // TODO 是否拦截重复触发
+    this.animateItem2.goToAndPlay(1)
+  }
+
+  getFramesByProgress(progress: number): number {
+    if (this.animateItem == null) {
+      return 1;
+    }
+    let progressTmp = progress
+    let total = this.animateItem.totalFrames;
+    let frame = Math.floor(total * progressTmp / 100);
+    if (frame >= total - 1) {
+      frame = total - 1
+    }
+    return frame;
+  }
+
+  onOffsetChange() {
+    if (!this.refreshBean.isVisible) {
+      return
+    }
+    if (this.refreshBean.loadStatus === LoadStatus.PRELOAD) {
+      // 下拉刷新
+      this.animate1(this.refreshBean.offset)
+    } else if (this.refreshBean.loadStatus == LoadStatus.LOADING) {
+      // 正在刷新
+      this.animate2()
+    } else {
+      // 刷新完成
+      lottie.destroy()
+    }
+    let maxH = CustomLayout.REFRESH_HEIGHT
+    let tmpHeight = this.refreshBean.offset > maxH ? maxH : this.refreshBean.offset
+    if (this.refreshBean.loadStatus === LoadStatus.LOADED) {
+      if (tmpHeight <= 0) {
+        setTimeout(() => {
+          // 延时设置0，让“已更新到最新”展示
+          this.layoutHeight = 0
+        }, 1500)
+      }
+    } else {
+      // 直接设置高度
+      this.layoutHeight = tmpHeight
+    }
+  }
+}

@@ -11,7 +11,7 @@ export struct SearchCreatorComponent{
       Stack({alignContent: Alignment.Bottom}){
       Stack({alignContent: Alignment.Bottom}){
         Image(this.item.headerPhotoUrl)
         Image(this.item.headerPhotoUrl)
           .width('92lpx')
           .width('92lpx')
-          .alt($r('app.media.default_head'))
+          .alt($r('app.media.icon_default_head_mater'))
           .height('92lpx')
           .height('92lpx')
           .margin({bottom:'15lpx'})
           .margin({bottom:'15lpx'})
           .borderRadius(50)
           .borderRadius(50)

@@ -194,7 +194,8 @@ export struct SearchResultContentComponent{
           isSearch: true,
           isSearch: true,
           publishTimestamp:"",
           publishTimestamp:"",
           bottomNavId:'',
           bottomNavId:'',
-          openType:''
+          openType:'',
+          extra:''
         }
         }
 
 
         this.data.push(contentDTO)
         this.data.push(contentDTO)

@@ -81,9 +81,9 @@ export struct AccountAndSecurityLayout {
 
 
     // 收到eventId为1的事件后执行该回调
     // 收到eventId为1的事件后执行该回调
     let callback = (eventData: emitter.EventData): void => {
     let callback = (eventData: emitter.EventData): void => {
-      promptAction.showToast({
-        message: JSON.stringify(eventData)
-      });
+      // promptAction.showToast({
+      //   message: JSON.stringify(eventData)
+      // });
       if(eventData&&eventData.data){
       if(eventData&&eventData.data){
         this.listData[0].subTitle = eventData.data['content']
         this.listData[0].subTitle = eventData.data['content']
       }
       }

@@ -3,7 +3,7 @@ import { EmptyComponent } from '../view/EmptyComponent'
 @Entry
 @Entry
 @Component
 @Component
 export struct DefaultPage {
 export struct DefaultPage {
-  @State type: number = 1
+  @State type: number = 15
 
 
   retry() {
   retry() {
     console.log('daj点击了重试')
     console.log('daj点击了重试')
@@ -13,7 +13,6 @@ export struct DefaultPage {
     Row() {
     Row() {
       EmptyComponent({
       EmptyComponent({
         emptyType: this.type,
         emptyType: this.type,
-        emptyButton: true,
         retry: () => {
         retry: () => {
           this.retry()
           this.retry()
         }
         }

@@ -231,11 +231,11 @@ export struct EmptyComponent {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) {
       imageString = $r('app.media.icon_no_result')
       imageString = $r('app.media.icon_no_result')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
-      imageString = $r('app.media.icon_no_net')
+      imageString = $r('app.media.icon_no_net1')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
       imageString = $r('app.media.icon_no_content')
       imageString = $r('app.media.icon_no_content')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCreation) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCreation) {
-      imageString = $r('app.media.icon_no_appointmentMade')
+      imageString = $r('app.media.icon_no_works1')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoBooking) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoBooking) {
       imageString = $r('app.media.icon_no_appointmentMade')
       imageString = $r('app.media.icon_no_appointmentMade')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NetworkFailed) {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NetworkFailed) {

@@ -9,17 +9,18 @@ export struct MergeRecordDialog {
   build() {
   build() {
     Column() {
     Column() {
       Text("合并游客记录到当前账号，可避免信息丢失")
       Text("合并游客记录到当前账号，可避免信息丢失")
-        .fontColor("#222222")
+        .fontColor("#333333")
         .fontSize(18)
         .fontSize(18)
         .width("100%")
         .width("100%")
         .fontWeight(FontWeight.Bold)
         .fontWeight(FontWeight.Bold)
         .textAlign(TextAlign.Center)
         .textAlign(TextAlign.Center)
-        .margin({ top: 20 })
+        .margin({ top: 25 })
+        .padding({left:24,right:24})
 
 
-      Divider().color("#999999").width("100%").margin({ top: 20 }).height('1vp')
+      Divider().color("#08000000").width("100%").margin({ top: 20 }).height('2vp')
       Row() {
       Row() {
         Text('取消')
         Text('取消')
-          .fontSize(16)
+          .fontSize(18)
           .fontColor("#648DF2")
           .fontColor("#648DF2")
           .layoutWeight(1)
           .layoutWeight(1)
           .fontWeight(FontWeight.Medium)
           .fontWeight(FontWeight.Medium)
@@ -31,28 +32,22 @@ export struct MergeRecordDialog {
             }
             }
 
 
           })
           })
-          .height('100%')
-        // Divider().color("#999999").height('100%').width('0.5vp')
+          .height(50)
+        Divider().color("#eeeeee").height(44).width(1).margin({top:3}).strokeWidth(1).vertical(true)
         Text('一键合并')
         Text('一键合并')
-          .fontSize(16)
+          .fontSize(18)
           .fontColor("#648DF2")
           .fontColor("#648DF2")
           .layoutWeight(1)
           .layoutWeight(1)
           .fontWeight(FontWeight.Medium)
           .fontWeight(FontWeight.Medium)
           .textAlign(TextAlign.Center)
           .textAlign(TextAlign.Center)
-          .border({
-            width: { left: 1 },
-            color: "#999999",
-            style: { left: BorderStyle.Solid }
-
-          })
           .onClick(() => {
           .onClick(() => {
             this.controller.close()
             this.controller.close()
             if (this.confirm) {
             if (this.confirm) {
               this.confirm()
               this.confirm()
             }
             }
           })
           })
-          .height('100%')
+          .height(50)
       }.layoutWeight(1).justifyContent(FlexAlign.Center)
       }.layoutWeight(1).justifyContent(FlexAlign.Center)
-    }.height(140).backgroundColor(Color.White).borderRadius(10).width('74%')
+    }.height(140).backgroundColor(Color.White).borderRadius(14).width('75%')
   }
   }
 }
 }

@@ -4,16 +4,18 @@ import { router } from '@kit.ArkUI';
 @Component
 @Component
 struct ShowUserHeaderPage {
 struct ShowUserHeaderPage {
   @State headPhotoUrl: string = '';
   @State headPhotoUrl: string = '';
+  @State headType: string = ''
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
 
 
   onPageShow() {
   onPageShow() {
     this.headPhotoUrl = this.params?.['headPhotoUrl'];
     this.headPhotoUrl = this.params?.['headPhotoUrl'];
+    this.headType = this.params?.['headType'] ?? '';
   }
   }
 
 
   build() {
   build() {
     Row() {
     Row() {
       Image(this.headPhotoUrl)
       Image(this.headPhotoUrl)
-        .alt($r('app.media.default_head'))
+        .alt(this.headType.length > 0 ?  $r('app.media.WDAccountOwnerHedaerDefaultIcon') : $r('app.media.default_head'))
         .width('720lpx')
         .width('720lpx')
         .height('720lpx')
         .height('720lpx')
         .objectFit(ImageFit.Auto)
         .objectFit(ImageFit.Auto)

@@ -22,7 +22,7 @@ import {
   postExecuteLikeParams,
   postExecuteLikeParams,
   postInteractAccentionOperateParams,
   postInteractAccentionOperateParams,
   postRecommendListParams,
   postRecommendListParams,
-  postThemeListParams
+  GoldenPositionExtraBean
 } from 'wdBean';
 } from 'wdBean';
 import { PageUIReqBean } from '../components/page/bean/PageUIReqBean';
 import { PageUIReqBean } from '../components/page/bean/PageUIReqBean';
 
 
@@ -437,7 +437,7 @@ export class PageRepository {
    * @param params
    * @param params
    * @returns
    * @returns
    * */
    * */
-  static postThemeList(params: postThemeListParams) {
+  static postThemeList(params: GoldenPositionExtraBean) {
     let url = HttpUrlUtils.getThemeListUrl()
     let url = HttpUrlUtils.getThemeListUrl()
     Logger.info(TAG, "postThemeList url = " + url + JSON.stringify(params))
     Logger.info(TAG, "postThemeList url = " + url + JSON.stringify(params))
     return WDHttp.post<ResponseDTO<LiveReviewDTO>>(url, params)
     return WDHttp.post<ResponseDTO<LiveReviewDTO>>(url, params)

@@ -3,6 +3,7 @@ import { touchMoveLoadMore, touchUpLoadMore } from './PullUpLoadMore';
 import PageModel from '../viewmodel/PageModel';
 import PageModel from '../viewmodel/PageModel';
 import PageHelper from '../viewmodel/PageHelper';
 import PageHelper from '../viewmodel/PageHelper';
 import PageAdModel from '../viewmodel/PageAdvModel';
 import PageAdModel from '../viewmodel/PageAdvModel';
+import { LoadStatus } from '../components/refresh/RefreshLayoutBean';
 
 
 export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, event: TouchEvent) {
 export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, event: TouchEvent) {
   switch (event.type) {
   switch (event.type) {
@@ -46,7 +47,7 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel,
 export function touchMovePullRefresh(pageModel: PageModel, event: TouchEvent) {
 export function touchMovePullRefresh(pageModel: PageModel, event: TouchEvent) {
   if (pageModel.startIndex === 0) {
   if (pageModel.startIndex === 0) {
     pageModel.isPullRefreshOperation = true;
     pageModel.isPullRefreshOperation = true;
-    let height = vp2px(pageModel.pullDownRefreshHeight);
+    let height = vp2px(Const.CUSTOM_REFRESH_DECIDE_HEIGHT);
     pageModel.offsetY = event.touches[0].y - pageModel.downY;
     pageModel.offsetY = event.touches[0].y - pageModel.downY;
     // The sliding offset is greater than the pull-down refresh layout height, and the refresh condition is met.
     // The sliding offset is greater than the pull-down refresh layout height, and the refresh condition is met.
     if (pageModel.offsetY >= height) {
     if (pageModel.offsetY >= height) {
@@ -98,12 +99,14 @@ export function pullRefreshState(pageModel: PageModel, state: number) {
       pageModel.isCanRefresh = false;
       pageModel.isCanRefresh = false;
       pageModel.isRefreshing = false;
       pageModel.isRefreshing = false;
       pageModel.isVisiblePullDown = true;
       pageModel.isVisiblePullDown = true;
+      pageModel.load = LoadStatus.PRELOAD
       break;
       break;
     case RefreshState.Release:
     case RefreshState.Release:
       pageModel.pullDownRefreshText = $r('app.string.release_refresh_text');
       pageModel.pullDownRefreshText = $r('app.string.release_refresh_text');
       pageModel.pullDownRefreshImage = $r('app.media.ic_pull_up_refresh');
       pageModel.pullDownRefreshImage = $r('app.media.ic_pull_up_refresh');
       pageModel.isCanRefresh = true;
       pageModel.isCanRefresh = true;
       pageModel.isRefreshing = false;
       pageModel.isRefreshing = false;
+      pageModel.load = LoadStatus.PRELOAD
       break;
       break;
     case RefreshState.Refreshing:
     case RefreshState.Refreshing:
       pageModel.offsetY = vp2px(pageModel.pullDownRefreshHeight);
       pageModel.offsetY = vp2px(pageModel.pullDownRefreshHeight);
@@ -111,18 +114,21 @@ export function pullRefreshState(pageModel: PageModel, state: number) {
       pageModel.pullDownRefreshImage = $r('app.media.ic_pull_up_load');
       pageModel.pullDownRefreshImage = $r('app.media.ic_pull_up_load');
       pageModel.isCanRefresh = true;
       pageModel.isCanRefresh = true;
       pageModel.isRefreshing = true;
       pageModel.isRefreshing = true;
+      pageModel.load = LoadStatus.LOADING
       break;
       break;
     case RefreshState.Success:
     case RefreshState.Success:
       pageModel.pullDownRefreshText = $r('app.string.refresh_success_text');
       pageModel.pullDownRefreshText = $r('app.string.refresh_success_text');
       pageModel.pullDownRefreshImage = $r('app.media.ic_succeed_refresh');
       pageModel.pullDownRefreshImage = $r('app.media.ic_succeed_refresh');
       pageModel.isCanRefresh = true;
       pageModel.isCanRefresh = true;
       pageModel.isRefreshing = true;
       pageModel.isRefreshing = true;
+      pageModel.load = LoadStatus.LOADED
       break;
       break;
     case RefreshState.Fail:
     case RefreshState.Fail:
       pageModel.pullDownRefreshText = $r('app.string.refresh_fail_text');
       pageModel.pullDownRefreshText = $r('app.string.refresh_fail_text');
       pageModel.pullDownRefreshImage = $r('app.media.ic_fail_refresh');
       pageModel.pullDownRefreshImage = $r('app.media.ic_fail_refresh');
       pageModel.isCanRefresh = true;
       pageModel.isCanRefresh = true;
       pageModel.isRefreshing = true;
       pageModel.isRefreshing = true;
+      pageModel.load = LoadStatus.LOADED
       break;
       break;
     default:
     default:
       break;
       break;

@@ -36,6 +36,10 @@ export class RefreshConstants {
    */
    */
   static readonly CUSTOM_LAYOUT_HEIGHT: number = 80;
   static readonly CUSTOM_LAYOUT_HEIGHT: number = 80;
   /**
   /**
+   * 下拉刷新，判定距离
+   */
+  static readonly CUSTOM_REFRESH_DECIDE_HEIGHT: number = 20;
+  /**
    * Full the width.
    * Full the width.
    */
    */
   static readonly FULL_WIDTH: string = '100%';
   static readonly FULL_WIDTH: string = '100%';

@@ -116,7 +116,6 @@ export class PageHelper {
       //移除音频 和 活动
       //移除音频 和 活动
       this.collectPageComp(pageModel, pageDto)
       this.collectPageComp(pageModel, pageDto)
 
 
-
       // pageModel.compList.push(...pageDto.compList)
       // pageModel.compList.push(...pageDto.compList)
 
 
       // TODO 暂时去掉互动数据，待优化。（主要是互动数据返回，如何渲染到ui上）
       // TODO 暂时去掉互动数据，待优化。（主要是互动数据返回，如何渲染到ui上）
@@ -161,10 +160,8 @@ export class PageHelper {
       flag = false
       flag = false
     }
     }
 
 
-
     let pageCompSize = pageCompList.length // 信息流组件业务数量
     let pageCompSize = pageCompList.length // 信息流组件业务数量
-    console.error("ZZZXXXXX", " start--->" + pageCompSize);
-
+    //  console.error("ZZZXXXXX", " start--->" + pageCompSize);
     if (pageCompSize == 0) {
     if (pageCompSize == 0) {
       flag = false
       flag = false
     }
     }
@@ -227,7 +224,7 @@ export class PageHelper {
                       let changeContentDTO = (matInfo: CompAdvMatInfoBean) => {
                       let changeContentDTO = (matInfo: CompAdvMatInfoBean) => {
                         let advContentBean: ContentDTO = {} as ContentDTO;
                         let advContentBean: ContentDTO = {} as ContentDTO;
                         advContentBean.newsTitle = matInfo.advTitle
                         advContentBean.newsTitle = matInfo.advTitle
-                        advContentBean.objectType = matInfo.advType == "0" ? matInfo.advType : "4"
+                        advContentBean.objectType = matInfo.advType == "0" ? matInfo.advType.toString() : "4"
                         advContentBean.coverUrl = matInfo.matImageUrl[0]
                         advContentBean.coverUrl = matInfo.matImageUrl[0]
                         advContentBean.linkUrl = matInfo.linkUrl
                         advContentBean.linkUrl = matInfo.linkUrl
                         advContentBean.openType = matInfo.linkType
                         advContentBean.openType = matInfo.linkType
@@ -263,7 +260,7 @@ export class PageHelper {
               if (advPosition <= pageModel.pageTotalCompSize && advPosition >= a) {
               if (advPosition <= pageModel.pageTotalCompSize && advPosition >= a) {
 
 
                 let b = advPosition - a;
                 let b = advPosition - a;
-                console.error('ZZZXXXXX', matInfo.advSubType + '-------------' + matInfo.advTitle + "  "+ advPosition + "  "+a+"  "+b)
+                //  console.error('ZZZXXXXX', matInfo.advSubType + '-------------' + matInfo.advTitle + "  " + advPosition + "  " + a + "  " + b)
                 if (b <= pageCompSize && b >= 0) {
                 if (b <= pageCompSize && b >= 0) {
 
 
                   let advComp: CompDTO = {
                   let advComp: CompDTO = {
@@ -281,15 +278,13 @@ export class PageHelper {
 
 
                 }
                 }
               }
               }
-
             }
             }
           }
           }
         }
         }
-
       }
       }
 
 
     }
     }
-    console.error("ZZZXXXXX", " end--->" + pageCompList.length);
+    // console.error("ZZZXXXXX", " end--->" + pageCompList.length);
   }
   }
 
 
 
 
@@ -310,13 +305,14 @@ export class PageHelper {
 
 
           //移除音频 和 活动
           //移除音频 和 活动
           this.collectPageComp(pageModel, data)
           this.collectPageComp(pageModel, data)
-          //
+
           // pageModel.compList.push(...data.compList)
           // pageModel.compList.push(...data.compList)
-          PageViewModel.getInteractData(data.compList).then((data: CompDTO[]) => {
-            // 刷新，替换所有数据
-            pageModel.compList.updateItems(sizeBefore, data)
-            pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
-          })
+          // TODO   暂时屏蔽，此处代码会造成  广告逻辑错乱，只有第一页有广告数据，随着加载更多，第二页也会出现广告数据
+          // PageViewModel.getInteractData(data.compList).then((data: CompDTO[]) => {
+          //   // 刷新，替换所有数据
+          //   pageModel.compList.updateItems(sizeBefore, data)
+          //   pageModel.timestamp = DateTimeUtils.getTimeStamp().toString()
+          // })
         }
         }
       }).catch((err: string | Resource) => {
       }).catch((err: string | Resource) => {
       promptAction.showToast({ message: err });
       promptAction.showToast({ message: err });
@@ -339,15 +335,21 @@ export class PageHelper {
       if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
       if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
         Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
         Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
       } else {
       } else {
+        // 暂时屏蔽活动和音频详情入口
+        if (element.operDataList[0]?.objectType === '3' || element.operDataList[0]?.objectType === '13') {
+        } else {
           pageCompList.add(element)
           pageCompList.add(element)
         }
         }
+
+      }
     }
     }
 
 
+    // 记录
     pageModel.pageTotalCompSize = pageCompList.length + pageModel.pageTotalCompSize
     pageModel.pageTotalCompSize = pageCompList.length + pageModel.pageTotalCompSize
-    console.error("ZZZXXXXX", " collectPageComp--->" + pageModel.pageTotalCompSize);
+    // console.error("ZZZXXXXX", " collectPageComp--->" + pageModel.pageTotalCompSize);
 
 
     // 处理页面广告数据，投放到页面的位置
     // 处理页面广告数据，投放到页面的位置
-   // this.handlePageCompAdvPostion(pageCompList, pageModel, pageDto);
+    this.handlePageCompAdvPostion(pageCompList, pageModel, pageDto);
 
 
 
 
     //遍历所有组件和稿件数据 push到页面
     //遍历所有组件和稿件数据 push到页面

@@ -6,6 +6,7 @@ import { PageUIReqBean } from '../components/page/bean/PageUIReqBean';
 import { GroupInfoDTO, PageInfoDTO } from 'wdBean/src/main/ets/bean/navigation/PageInfoDTO';
 import { GroupInfoDTO, PageInfoDTO } from 'wdBean/src/main/ets/bean/navigation/PageInfoDTO';
 import { AdvRuleBean, CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean';
 import { AdvRuleBean, CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean';
 import { WDViewDefaultType } from '../components/view/EmptyComponent';
 import { WDViewDefaultType } from '../components/view/EmptyComponent';
+import { LoadStatus } from '../components/refresh/RefreshLayoutBean';
 
 
 /**
 /**
  * 页面下拉刷新、上拉加载数据bean。
  * 页面下拉刷新、上拉加载数据bean。
@@ -33,6 +34,7 @@ export default class PageModel {
   pullDownRefreshImage: Resource = $r('app.media.ic_pull_down_refresh');
   pullDownRefreshImage: Resource = $r('app.media.ic_pull_down_refresh');
   pullDownRefreshHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   pullDownRefreshHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   isVisiblePullDown: boolean = false;
   isVisiblePullDown: boolean = false;
+  load: LoadStatus = LoadStatus.IDLE;
   pullUpLoadText: Resource = $r('app.string.pull_up_load_text');
   pullUpLoadText: Resource = $r('app.string.pull_up_load_text');
   pullUpLoadImage: Resource = $r('app.media.ic_pull_up_load');
   pullUpLoadImage: Resource = $r('app.media.ic_pull_up_load');
   pullUpLoadHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   pullUpLoadHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;

@@ -8,7 +8,8 @@ import {
   NavigationBodyDTO,
   NavigationBodyDTO,
   PageDTO,
   PageDTO,
   PageInfoBean,
   PageInfoBean,
-  PageInfoDTO
+  PageInfoDTO,
+  GoldenPositionExtraBean
 } from 'wdBean';
 } from 'wdBean';
 
 
 import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
 import { CollectionUtils, Logger, ResourcesUtils, StringUtils } from 'wdKit';
@@ -379,10 +380,13 @@ export class PageViewModel extends BaseViewModel {
     })
     })
   }
   }
 
 
-  async postThemeList(sort: number, pageNum: number, pageSize: number) : Promise<LiveReviewDTO> {
+  async postThemeList(sort: number, pageNum: number, pageSize: number,extra: string) : Promise<LiveReviewDTO> {
+    let bean: GoldenPositionExtraBean = JSON.parse(extra)
+    bean.pageNum = pageNum
+    bean.pageSize = pageSize
     return new Promise<LiveReviewDTO>((success, error) => {
     return new Promise<LiveReviewDTO>((success, error) => {
       Logger.info(TAG, `postThemeList pageInfo start`);
       Logger.info(TAG, `postThemeList pageInfo start`);
-      PageRepository.postThemeList({ sort, pageNum, pageSize }).then((resDTO) => {
+      PageRepository.postThemeList(bean).then((resDTO) => {
         if (!resDTO || !resDTO.data) {
         if (!resDTO || !resDTO.data) {
           Logger.error(TAG, 'postThemeList then navResDTO is empty');
           Logger.error(TAG, 'postThemeList then navResDTO is empty');
           error('resDTO is empty');
           error('resDTO is empty');

@@ -97,6 +97,10 @@
       "value": "#CCCCCC"
       "value": "#CCCCCC"
     },
     },
     {
     {
+      "name": "color_CCCCCC_1A",
+      "value": "#1ACCCCCC"
+    },
+    {
       "name": "color_EDEDED",
       "name": "color_EDEDED",
       "value": "#EDEDED"
       "value": "#EDEDED"
     },
     },

 export { add } from "./src/main/ets/utils/Calc"
 export { add } from "./src/main/ets/utils/Calc"
 
 
 export { HWLocationUtils } from './src/main/ets/location/HWLocationUtils'
 export { HWLocationUtils } from './src/main/ets/location/HWLocationUtils'
+
+export { WDPushNotificationManager } from "./src/main/ets/notification/WDPushNotificationManager"

+
+import { pushCommon, pushService } from '@kit.PushKit';
+import { AAID } from '@kit.PushKit';
+import { AccountManagerUtils, Logger, SPHelper, UserDataLocal } from 'wdKit/Index';
+import { BusinessError } from '@kit.BasicServicesKit';
+import notificationManager from '@ohos.notificationManager';
+import { common, Want } from '@kit.AbilityKit';
+
+const TAG = "NotificationManager"
+
+/*
+ * 远程推送通知管理类
+ * Push Kit: https://developer.huawei.com/consumer/cn/doc/harmonyos-guides/push-introduction-0000001726287974
+ * Notification Kit: https://developer.huawei.com/consumer/cn/doc/harmonyos-guides/notification-overview-0000001822162741
+ * */
+export class WDPushNotificationManager {
+
+  private static instance: WDPushNotificationManager
+  static getInstance() : WDPushNotificationManager {
+    if (!WDPushNotificationManager.instance) {
+      WDPushNotificationManager.instance = new WDPushNotificationManager()
+    }
+    return WDPushNotificationManager.instance
+  }
+
+  async requestEnableNotifications(context: common.UIAbilityContext) : Promise<boolean> {
+    let enabled = await notificationManager.isNotificationEnabled()
+    if (!enabled) {
+      try {
+        await notificationManager.requestEnableNotification(context)
+        enabled = true
+      } catch (err) {
+        Logger.error(TAG, "请求通知权限报错: " + JSON.stringify(err))
+        let error = err as BusinessError
+        if (error.code == 1600004) {
+          Logger.error(TAG, "请求通知权限 - 用户已拒绝")
+        }
+      }
+    }
+    Logger.info(TAG, "推送 enabled " + enabled)
+    return enabled
+  }
+
+  async fetchTokenAndBindProfileId() {
+    try {
+      const pushToken: string = await pushService.getToken();
+      Logger.info(TAG, "获取推送token: " + pushToken)
+
+      //TODO: pushToken 上传至服务器
+      SPHelper.default.save("devicePushToken", pushToken)
+
+      if (AccountManagerUtils.isLoginSync()) {
+        this.bindUserProfileId(UserDataLocal.getUserId())
+      }
+
+    } catch (err) {
+      Logger.error(TAG, "获取推送token失败: " + JSON.stringify(err))
+    }
+  }
+
+  // 禁止推送
+  stopPush() {
+    pushService.deleteToken()
+  }
+
+  /// 应用匿名标识符
+  async getAAID() {
+    let aaid: string = ""
+    try {
+      aaid = await AAID.getAAID();
+      Logger.info(TAG, "获取应用匿名标识符AAID: " + aaid)
+    } catch (err) {
+      Logger.error(TAG, "获取应用匿名标识符AAID失败: " + JSON.stringify(err))
+    }
+    return aaid
+  }
+
+  // TODO: 登录时调用
+  bindUserProfileId(profileId: string) {
+    pushService.bindAppProfileId(pushCommon.AppProfileType.PROFILE_TYPE_APPLICATION_ACCOUNT, profileId).then(() => {
+      Logger.info(TAG, "推送绑定profileId 成功: " + profileId)
+    }).catch((err: BusinessError) => {
+      Logger.error(TAG, "推送绑定profileId失败: " + profileId + " " + JSON.stringify(err))
+    });
+  }
+  unbindUserProfileId(profileId: string) {
+    pushService.unbindAppProfileId(profileId).then(() => {
+      Logger.info(TAG, "推送解绑profileId 成功: " + profileId)
+    }).catch((err: BusinessError) => {
+      Logger.error(TAG, "推送解绑profileId失败: " + profileId + " " + JSON.stringify(err))
+    });
+  }
+
+  sendLocalNotification() {
+    let notificationRequest: notificationManager.NotificationRequest = {
+      id: 1,
+      content: {
+        notificationContentType: notificationManager.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT,
+        normal: {
+          title: "test_title",
+          text: "test_text",
+          additionalText: "test_additionalText"
+        }
+      }
+    };
+    notificationManager.publish(notificationRequest).then(() => {
+      console.info("publish success");
+    }).catch((err: BusinessError) => {
+      console.error(`publish fail: ${JSON.stringify(err)}`);
+    });
+  }
+
+  setBadgeNumber(number: number) : Promise<void> {
+    return notificationManager.setBadgeNumber(number)
+  }
+
+  // 接收推送数据，包括启动和二次点击拉起
+  // 参考：https://developer.huawei.com/consumer/cn/doc/harmonyos-guides/push-dev-0000001727885258
+  onWant(want: Want) {
+    Logger.info(TAG, "接收到推送？: " + JSON.stringify(want.parameters))
+  }
+
+}

@@ -3,10 +3,6 @@
     {
     {
       "name": "shared_desc",
       "name": "shared_desc",
       "value": "description"
       "value": "description"
-    },
-    {
-      "name": "location_reason",
-      "value": " "
     }
     }
   ]
   ]
 }
 }

@@ -3,7 +3,6 @@ import { LoginInputComponent } from './LoginInputComponent'
 import { LoginViewModel } from './LoginViewModel'
 import { LoginViewModel } from './LoginViewModel'
 import router from '@ohos.router'
 import router from '@ohos.router'
 import promptAction from '@ohos.promptAction'
 import promptAction from '@ohos.promptAction'
-import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index'
 import { WDRouterRule, WDRouterPage } from 'wdRouter';
 import { WDRouterRule, WDRouterPage } from 'wdRouter';
 import { SettingPasswordParams } from './SettingPasswordLayout'
 import { SettingPasswordParams } from './SettingPasswordLayout'
 import { Router } from '@ohos.arkui.UIContext'
 import { Router } from '@ohos.arkui.UIContext'
@@ -26,6 +25,7 @@ struct ForgetPasswordPage {
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
   pageType:number = (router.getParams() as Record<string, number>)['pageType']; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
   pageType:number = (router.getParams() as Record<string, number>)['pageType']; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
   @State pageTitle:string = '找回密码';
   @State pageTitle:string = '找回密码';
+  @State codeStateSuccess:boolean=false
   onCodeSend() {
   onCodeSend() {
     if (this.isCodeSend) {
     if (this.isCodeSend) {
       this.sendVerifyCode()
       this.sendVerifyCode()
@@ -47,7 +47,8 @@ struct ForgetPasswordPage {
         codeContent: $codeContent,
         codeContent: $codeContent,
         isSubmit: $isSubmit,
         isSubmit: $isSubmit,
         isCodeSend: $isCodeSend,
         isCodeSend: $isCodeSend,
-        pageType:this.pageType
+        pageType:this.pageType,
+        codeStateSuccess:$codeStateSuccess
       })
       })
       Row() {
       Row() {
         Text("确认")
         Text("确认")
@@ -99,16 +100,26 @@ struct ForgetPasswordPage {
 
 
     if(this.pageType == 1){
     if(this.pageType == 1){
       this.loginViewModel.sendVerifyCodeByToken().then(()=>{
       this.loginViewModel.sendVerifyCodeByToken().then(()=>{
-        promptAction.showToast({ message: "验证码已发送成功" })
+        promptAction.showToast({ message: "已发送" })
+        this.codeStateSuccess=true
+        this.isCodeSend=false
       }).catch((message: string)=>{
       }).catch((message: string)=>{
         promptAction.showToast({ message: message })
         promptAction.showToast({ message: message })
+        this.codeStateSuccess=false
+        this.isCodeSend=false
       })
       })
       return
       return
     }
     }
 
 
     this.loginViewModel.sendVerifyCode(this.phoneContent).then((verifyCode) => {
     this.loginViewModel.sendVerifyCode(this.phoneContent).then((verifyCode) => {
-      promptAction.showToast({ message: "验证码已发送成功" })
+      promptAction.showToast({ message: "已发送" })
+      this.codeStateSuccess=true
+      this.isCodeSend=false
       Logger.debug(TAG, "sendVerifyCode: " + verifyCode)
       Logger.debug(TAG, "sendVerifyCode: " + verifyCode)
+    }).catch((message: string)=>{
+      promptAction.showToast({ message: message })
+      this.codeStateSuccess=false
+      this.isCodeSend=false
     })
     })
 
 
   }
   }
@@ -146,7 +157,7 @@ struct ForgetPasswordPage {
         codeContent:this.codeContent,
         codeContent:this.codeContent,
         pageType:this.pageType
         pageType:this.pageType
       }
       }
-      WDRouterRule.jumpWithPage(WDRouterPage.settingPasswordPage, params)
+      WDRouterRule.jumpWithReplacePage(WDRouterPage.settingPasswordPage, params)
 
 
       promptAction.showToast({message:"校验成功，准备跳转设置页面"})
       promptAction.showToast({message:"校验成功，准备跳转设置页面"})
       Logger.debug(TAG,"校验成功")
       Logger.debug(TAG,"校验成功")
@@ -173,6 +184,10 @@ struct ForgetPasswordPage {
     this.loginViewModel.changeBindPhone(this.phoneContent,this.codeContent).then(()=>{
     this.loginViewModel.changeBindPhone(this.phoneContent,this.codeContent).then(()=>{
       ToastUtils.shortToast('绑定成功')
       ToastUtils.shortToast('绑定成功')
       this.querySecurity()
       this.querySecurity()
+    }).catch((message: string) => {
+      if (message != '') {
+        ToastUtils.shortToast(message)
+      }
     })
     })
   }
   }
 
 

 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
-import { Logger, SPHelper } from 'wdKit'
+import { DateTimeUtils, Logger, SPHelper } from 'wdKit'
 
 
 @Component
 @Component
 export struct LoginInputComponent {
 export struct LoginInputComponent {
@@ -11,6 +11,8 @@ export struct LoginInputComponent {
   @Link isSubmit: boolean //是否可以提交
   @Link isSubmit: boolean //是否可以提交
   isFirst:boolean=true//是否第一次获取验证码
   isFirst:boolean=true//是否第一次获取验证码
   pageType?:number; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
   pageType?:number; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
+  lastTime: number = 0
+  @Link @Watch('startCount') codeStateSuccess: boolean  //验证码获取成功与否回调 成功显示倒计时
   build() {
   build() {
     Column() {
     Column() {
       this.addCodeLayout()
       this.addCodeLayout()
@@ -81,28 +83,24 @@ export struct LoginInputComponent {
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
         })
         })
 
 
-      Text(this.isCodeSend ? this.timeCount + "s" : this.isFirst?"发送验证码":'重新发送')
+      Text(this.codeStateSuccess ? this.timeCount + "s" : this.isFirst?"发送验证码":'重新获取')
         .fontColor(this.codeBtnState?'#ED2800':'#80ED2800')
         .fontColor(this.codeBtnState?'#ED2800':'#80ED2800')
         .width(110)
         .width(110)
         .fontSize(14)
         .fontSize(14)
         .fontWeight( FontWeight.Bold)
         .fontWeight( FontWeight.Bold)
         .height(48)
         .height(48)
         .textAlign(TextAlign.Center)
         .textAlign(TextAlign.Center)
+        .enabled(this.codeStateSuccess?false:true)
         .onClick(() => {
         .onClick(() => {
           if (this.phoneContent.length < 11) {
           if (this.phoneContent.length < 11) {
             return
             return
           }
           }
-          this.isCodeSend = true
-          this.isFirst=false
-          let time = setInterval(() => {
-            Logger.debug("倒计时：" + this.timeCount)
-            this.timeCount--
-            if (this.timeCount < 1) {
-              this.isCodeSend = false
-              this.timeCount = 60
-              clearInterval(time)
+          let currentTime = DateTimeUtils.getTimeStamp()
+          if (currentTime - this.lastTime < 500) {
+            return
           }
           }
-          }, 1000)
+          this.lastTime = currentTime;
+          this.isCodeSend = true
 
 
         })
         })
 
 
@@ -122,4 +120,17 @@ export struct LoginInputComponent {
     securityNum = phoneNum.replace(needSecurityString,'****')
     securityNum = phoneNum.replace(needSecurityString,'****')
     return securityNum;
     return securityNum;
   }
   }
+
+  startCount() {
+    this.isFirst = false
+    let time = setInterval(() => {
+      Logger.debug("倒计时：" + this.timeCount)
+      this.timeCount--
+      if (this.timeCount < 1) {
+        this.codeStateSuccess = false
+        this.timeCount = 60
+        clearInterval(time)
+      }
+    }, 1000)
+  }
 }
 }

-import { Logger, EmitterEventId, EmitterUtils  } from 'wdKit'
+import { Logger, EmitterEventId, EmitterUtils, DateTimeUtils  } from 'wdKit'
 import { CustomProtocolDialog } from './CustomProtocolDialog'
 import { CustomProtocolDialog } from './CustomProtocolDialog'
 import router from '@ohos.router'
 import router from '@ohos.router'
 import { LoginViewModel } from './LoginViewModel'
 import { LoginViewModel } from './LoginViewModel'
@@ -45,6 +45,8 @@ struct LoginPage {
   @State checkCodePage: boolean = true //判断是否是验证码页面 默认验证码登录
   @State checkCodePage: boolean = true //判断是否是验证码页面 默认验证码登录
   @State passwordSwitch: boolean = true //密码显示
   @State passwordSwitch: boolean = true //密码显示
   // @State isPasswordSubmit: boolean = false //账户密码状态 是否出发登录
   // @State isPasswordSubmit: boolean = false //账户密码状态 是否出发登录
+  lastTime: number = 0
+  @State codeStateSuccess:boolean=false
 
 
   dialogController: CustomDialogController = new CustomDialogController({
   dialogController: CustomDialogController = new CustomDialogController({
     builder: CustomProtocolDialog({
     builder: CustomProtocolDialog({
@@ -92,7 +94,8 @@ struct LoginPage {
               phoneContent: $phoneContent,
               phoneContent: $phoneContent,
               codeContent: $codeContent,
               codeContent: $codeContent,
               isSubmit: $isSubmit,
               isSubmit: $isSubmit,
-              isCodeSend: $isCodeSend
+              isCodeSend: $isCodeSend,
+              codeStateSuccess:$codeStateSuccess
             })
             })
           } else {
           } else {
             this.addPassword()
             this.addPassword()
@@ -136,7 +139,12 @@ struct LoginPage {
                 if (!this.isSubmit) {
                 if (!this.isSubmit) {
                   return
                   return
                 }
                 }
+                let currentTime = DateTimeUtils.getTimeStamp()
+                if (currentTime - this.lastTime > 500) {
+                  this.lastTime = currentTime
                   this.loginSubmit()
                   this.loginSubmit()
+                }
+
 
 
               })
               })
           }.padding({ left: 25, right: 25 }).width('100%')
           }.padding({ left: 25, right: 25 }).width('100%')
@@ -308,9 +316,14 @@ struct LoginPage {
   //发送验证码
   //发送验证码
   sendVerifyCode() {
   sendVerifyCode() {
     this.loginViewModel.sendVerifyCode(this.phoneContent).then((verifyCode) => {
     this.loginViewModel.sendVerifyCode(this.phoneContent).then((verifyCode) => {
-      promptAction.showToast({ message: "验证码已发送成功" })
+      promptAction.showToast({ message: "已发送" })
       Logger.debug(TAG, "sendVerifyCode: " + verifyCode)
       Logger.debug(TAG, "sendVerifyCode: " + verifyCode)
+      this.codeStateSuccess=true
+      this.isCodeSend=false
     }).catch((message:string)=>{
     }).catch((message:string)=>{
+      promptAction.showToast({ message: message })
+      this.codeStateSuccess=false
+      this.isCodeSend=false
       Logger.debug(TAG, "sendVerifyCode: " + message)
       Logger.debug(TAG, "sendVerifyCode: " + message)
     })
     })
   }
   }

@@ -171,8 +171,8 @@ export class LoginViewModel {
     return new Promise<object>((success, fail) => {
     return new Promise<object>((success, fail) => {
       this.loginModel.changeBindPhone(phone, verificationCode).then((data: object) => {
       this.loginModel.changeBindPhone(phone, verificationCode).then((data: object) => {
         success(data)
         success(data)
-      }).catch(() => {
-        fail()
+      }).catch((message: string) => {
+        fail(message)
       })
       })
     })
     })
   }
   }

@@ -3,6 +3,7 @@ import { Params } from 'wdBean/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import HuaweiAuth from '../../utils/HuaweiAuth'
 import HuaweiAuth from '../../utils/HuaweiAuth'
 import { BusinessError } from '@kit.BasicServicesKit'
 import { BusinessError } from '@kit.BasicServicesKit'
+import { ToastUtils } from 'wdKit/Index'
 
 
 @Entry
 @Entry
 @Component
 @Component
@@ -44,8 +45,13 @@ struct OneKeyLoginPage {
               return
               return
             }
             }
             HuaweiAuth.sharedInstance().oneKeyLogin().then((authorizeCode) => {
             HuaweiAuth.sharedInstance().oneKeyLogin().then((authorizeCode) => {
-
               //TODO: 调用服务端接口登录
               //TODO: 调用服务端接口登录
+
+              ToastUtils.shortToast("获取到授权code: " + authorizeCode + "，由于需要后台接口支持，暂时先跳转其他登录方式")
+              setTimeout(() => {
+                router.replaceUrl({url: WDRouterPage.loginPage.url()})
+              }, 3000)
+
             }).catch((error: BusinessError) => {
             }).catch((error: BusinessError) => {
 
 
             })
             })

@@ -9,7 +9,7 @@ const TAG = "HuaweiOneKeyAuth"
 export default class HuaweiAuth {
 export default class HuaweiAuth {
 
 
   // 是否开启
   // 是否开启
-  static enable = false
+  static enable = true
   // 匿名手机号
   // 匿名手机号
   private _anonymousPhone?: string
   private _anonymousPhone?: string
   get anonymousPhone() {
   get anonymousPhone() {

@@ -5,13 +5,40 @@
   "lockfileVersion": 3,
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
   "specifiers": {
+    "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",
+    "@umeng/common@^1.0.21": "@umeng/common@1.0.21",
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
     "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit"
     "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit"
   },
   },
   "packages": {
   "packages": {
+    "@umeng/analytics@1.0.19": {
+      "name": "@umeng/analytics",
+      "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",
+      "registryType": "ohpm"
+    },
+    "@umeng/common@1.0.21": {
+      "name": "@umeng/common",
+      "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",
+      "registryType": "ohpm",
+      "dependencies": {
+        "libcommon.so": "./src/main/cpp/types/libcommon"
+      }
+    },
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {
+      "name": "libcommon.so",
+      "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
+      "registryType": "local"
+    },
     "wdKit@../../commons/wdKit": {
     "wdKit@../../commons/wdKit": {
       "name": "wdkit",
       "name": "wdkit",
       "resolved": "../../commons/wdKit",
       "resolved": "../../commons/wdKit",
-      "registryType": "local"
+      "registryType": "local",
+      "dependencies": {
+        "@umeng/common": "^1.0.21",
+        "@umeng/analytics": "^1.0.19"
+      }
     }
     }
   }
   }
 }
 }

@@ -15,12 +15,12 @@ enum LogLevel {
 
 
 /**
 /**
  * Common log for all features.
  * Common log for all features.
- *
+ * @deprecated 弃用
  * @param {string} prefix Identifies the log tag.
  * @param {string} prefix Identifies the log tag.
  */
  */
 export class Logger {
 export class Logger {
   private static domain: number = 0xFF00;
   private static domain: number = 0xFF00;
-  private static prefix: string = 'MiguVideoApp';
+  private static prefix: string = 'SightApp';
   private static format: string = `%{public}s, %{public}s`;
   private static format: string = `%{public}s, %{public}s`;
 
 
   /**
   /**
@@ -29,7 +29,7 @@ export class Logger {
    * @param Prefix Identifies the log tag.
    * @param Prefix Identifies the log tag.
    * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
    * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
    */
    */
-  constructor(prefix: string = 'MiguVideoApp', domain: number = 0xFF00) {
+  constructor(prefix: string = 'SightApp', domain: number = 0xFF00) {
     Logger.prefix = prefix;
     Logger.prefix = prefix;
     Logger.domain = domain;
     Logger.domain = domain;
   }
   }
@@ -59,4 +59,4 @@ export class Logger {
   }
   }
 }
 }
 
 
-export default new Logger('MiguVideoApp', 0xFF00)
+export default new Logger('SightApp', 0xFF00)

@@ -6,6 +6,9 @@
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
   "specifiers": {
     "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",
     "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",
+    "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",
+    "@umeng/common@^1.0.21": "@umeng/common@1.0.21",
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
     "wdBean@../wdBean": "wdBean@../wdBean",
     "wdBean@../wdBean": "wdBean@../wdBean",
     "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",
     "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",
     "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",
     "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",
@@ -20,6 +23,26 @@
       "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",
       "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",
       "registryType": "ohpm"
       "registryType": "ohpm"
     },
     },
+    "@umeng/analytics@1.0.19": {
+      "name": "@umeng/analytics",
+      "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",
+      "registryType": "ohpm"
+    },
+    "@umeng/common@1.0.21": {
+      "name": "@umeng/common",
+      "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",
+      "registryType": "ohpm",
+      "dependencies": {
+        "libcommon.so": "./src/main/cpp/types/libcommon"
+      }
+    },
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {
+      "name": "libcommon.so",
+      "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
+      "registryType": "local"
+    },
     "wdBean@../wdBean": {
     "wdBean@../wdBean": {
       "name": "wdbean",
       "name": "wdbean",
       "resolved": "../wdBean",
       "resolved": "../wdBean",
@@ -33,7 +56,11 @@
     "wdKit@../../commons/wdKit": {
     "wdKit@../../commons/wdKit": {
       "name": "wdkit",
       "name": "wdkit",
       "resolved": "../../commons/wdKit",
       "resolved": "../../commons/wdKit",
-      "registryType": "local"
+      "registryType": "local",
+      "dependencies": {
+        "@umeng/common": "^1.0.21",
+        "@umeng/analytics": "^1.0.19"
+      }
     },
     },
     "wdNetwork@../../commons/wdNetwork": {
     "wdNetwork@../../commons/wdNetwork": {
       "name": "wdnetwork",
       "name": "wdnetwork",

+{
+  "meta": {
+    "stableOrder": true
+  },
+  "lockfileVersion": 3,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",
+    "@sensorsdata/analytics@^0.0.2": "@sensorsdata/analytics@0.0.2",
+    "@umeng/analytics@^1.0.19": "@umeng/analytics@1.0.19",
+    "@umeng/common@^1.0.21": "@umeng/common@1.0.21",
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
+    "wdBean@../wdBean": "wdBean@../wdBean",
+    "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",
+    "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",
+    "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork"
+  },
+  "packages": {
+    "@ohos/axios@2.2.0": {
+      "name": "@ohos/axios",
+      "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",
+      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",
+      "registryType": "ohpm"
+    },
+    "@sensorsdata/analytics@0.0.2": {
+      "name": "@sensorsdata/analytics",
+      "integrity": "sha512-SQCEmOw8ftGJmKtPl/1qUczZqu/yoQ4F2QHpK2Mayk+XctvNDSHn4QWengHj/pg36AopvuVfa0i6KR9c4KiIuQ==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@sensorsdata/analytics/-/analytics-0.0.2.har",
+      "registryType": "ohpm"
+    },
+    "@umeng/analytics@1.0.19": {
+      "name": "@umeng/analytics",
+      "integrity": "sha512-0m9z5l8to+POjDl9UkCQC8s4P+e2E1OILwUglC7ME4QwqfH44e59GLJtQdwF0h6kwpsy3YBft4SoWK8MYbuP7g==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/analytics/-/analytics-1.0.19.har",
+      "registryType": "ohpm"
+    },
+    "@umeng/common@1.0.21": {
+      "name": "@umeng/common",
+      "integrity": "sha512-EbXsd4OoRisTQf5egNY/+z1D2bvrYw9VwC2xu3EJA9TiDPSbnaJZ5+yltA/Se6yZ4oCcFvq6e5/AAfPuumunbw==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@umeng/common/-/common-1.0.21.har",
+      "registryType": "ohpm",
+      "dependencies": {
+        "libcommon.so": "./src/main/cpp/types/libcommon"
+      }
+    },
+    "libcommon.so@../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon": {
+      "name": "libcommon.so",
+      "resolved": "../../oh_modules/.ohpm/@umeng+common@1.0.21/oh_modules/@umeng/common/src/main/cpp/types/libcommon",
+      "registryType": "local"
+    },
+    "wdBean@../wdBean": {
+      "name": "wdbean",
+      "resolved": "../wdBean",
+      "registryType": "local"
+    },
+    "wdConstant@../../commons/wdConstant": {
+      "name": "wdconstant",
+      "resolved": "../../commons/wdConstant",
+      "registryType": "local"
+    },
+    "wdKit@../../commons/wdKit": {
+      "name": "wdkit",
+      "resolved": "../../commons/wdKit",
+      "registryType": "local",
+      "dependencies": {
+        "@umeng/common": "^1.0.21",
+        "@umeng/analytics": "^1.0.19"
+      }
+    },
+    "wdNetwork@../../commons/wdNetwork": {
+      "name": "wdnetwork",
+      "resolved": "../../commons/wdNetwork",
+      "registryType": "local",
+      "dependencies": {
+        "wdConstant": "file:../wdConstant",
+        "wdKit": "file:../wdKit",
+        "@ohos/axios": "^2.1.1"
+      }
+    }
+  }
+}

+{
+  "name": "wdtracking",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "Index.ets",
+  "author": "",
+  "license": "Apache-2.0",
+  "packageType": "InterfaceHar",
+  "dependencies": {
+    "@sensorsdata/analytics": "^0.0.2",
+    "wdKit": "file:../../commons/wdKit",
+    "wdBean": "file:../../features/wdBean",
+    "wdNetwork": "file:../../commons/wdNetwork",
+//    "wdHwAbility": "file:../../features/wdHwAbility",
+    "wdConstant": "file:../../commons/wdConstant"
+  }
+}

+../../../../oh_modules/.ohpm/@sensorsdata+analytics@0.0.2/oh_modules/@sensorsdata/analytics

+../../wdBean

+../../../commons/wdConstant

+../../../commons/wdKit

+../../../commons/wdNetwork

@@ -17,6 +17,7 @@ import {
 import { HostEnum, HostManager, WDHttp } from 'wdNetwork';
 import { HostEnum, HostManager, WDHttp } from 'wdNetwork';
 import { LoginModule } from 'wdLogin/src/main/ets/LoginModule';
 import { LoginModule } from 'wdLogin/src/main/ets/LoginModule';
 import { ConfigurationConstant } from '@kit.AbilityKit';
 import { ConfigurationConstant } from '@kit.AbilityKit';
+import { WDPushNotificationManager } from 'wdHwAbility/Index';
 
 
 export default class EntryAbility extends UIAbility {
 export default class EntryAbility extends UIAbility {
   onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
   onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
@@ -44,6 +45,13 @@ export default class EntryAbility extends UIAbility {
     EmitterUtils.receiveEvent(EmitterEventId.NETWORK_DISCONNECTED, (() => {
     EmitterUtils.receiveEvent(EmitterEventId.NETWORK_DISCONNECTED, (() => {
       Logger.info('network disconnected')
       Logger.info('network disconnected')
     }))
     }))
+
+    WDPushNotificationManager.getInstance().onWant(want)
+  }
+
+  // App活着情况下，点击推送通知进入
+  onNewWant(want: Want, launchParam: AbilityConstant.LaunchParam): void {
+    WDPushNotificationManager.getInstance().onWant(want)
   }
   }
 
 
   onDestroy(): void {
   onDestroy(): void {

+lottie三方库，路径加载动画只支持entry/src/main/ets 文件夹下的相对路径
+故，json动画文件统一放在这里。

+{"v":"5.6.10","fr":60,"ip":0,"op":61,"w":216,"h":216,"nm":"阶段1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":22,"s":[0]},{"t":30,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[108,105.128,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[80,80,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":26,"s":[2,2]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":30,"s":[32,32]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":40,"s":[32,32]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":50,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":60,"s":[72,72]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":70,"s":[80,80]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":80,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":90,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":170,"s":[0,0]},{"t":180,"s":[80,80]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":70,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[0,0],"to":[0,0],"ti":[0,0]},{"t":180,"s":[0,0]}],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":40,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":50,"s":[30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":60,"s":[12]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":70,"s":[12]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":170,"s":[40]},{"t":180,"s":[12]}],"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false}],"ip":0,"op":61,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"形状图层 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":22,"s":[0]},{"t":30,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[108,105.128,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[80,80,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":50,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":55,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":60,"s":[32,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":65,"s":[32,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":70,"s":[32,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":80,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":85,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":160,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":170,"s":[8,8]},{"t":180,"s":[32,8]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[0,0],"to":[-0.675,0],"ti":[1.667,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":55,"s":[0,0],"to":[-1.625,0],"ti":[0.74,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[-8,0],"to":[-0.47,0],"ti":[0.293,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":65,"s":[-8,0],"to":[-0.643,0],"ti":[-0.916,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":70,"s":[-9,0],"to":[1.333,0],"ti":[-1.5,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":160,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":170,"s":[0,0],"to":[-1.333,0],"ti":[1.333,0]},{"t":180,"s":[-8,0]}],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"矩形路径 4","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":40,"s":[0,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":50,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":60,"s":[50,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":65,"s":[16,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":70,"s":[50,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":80,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":90,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":100,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":110,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":115,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":135,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":140,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":150,"s":[16,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":160,"s":[16,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":170,"s":[24,8]},{"t":180,"s":[50,8]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":40,"s":[0,0],"to":[13.333,0],"ti":[0,3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[80,0],"to":[0,-3],"ti":[13.333,3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[0,-18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":65,"s":[-16,-18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":70,"s":[0,-18],"to":[-13.333,3],"ti":[-13.333,-3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[-80,0],"to":[6.982,1.571],"ti":[-36.763,0.427]},{"t":90,"s":[-4.023,11],"h":1},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":100,"s":[-0.023,11],"to":[33.441,-0.389],"ti":[-12.702,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[80,0],"to":[26.667,0],"ti":[-36.763,0.427]},{"t":120,"s":[-5,1],"h":1},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":130,"s":[-0.023,1],"to":[33.441,-0.389],"ti":[-12.702,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":140,"s":[80,0],"to":[26.667,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":150,"s":[-4,-20],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":160,"s":[-4,-20],"to":[0,0],"ti":[-12.702,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":170,"s":[80,0],"to":[26.667,0],"ti":[13.333,3]},{"t":180,"s":[0,-18]}],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"矩形路径 3","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":40,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":50,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":60,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":65,"s":[50,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":70,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":80,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":90,"s":[0,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":100,"s":[0,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":110,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":115,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":135,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":140,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":150,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":160,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":170,"s":[24,8]},{"t":180,"s":[24,8]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":40,"s":[0,0],"to":[-13.333,0],"ti":[2,-3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[-80,0],"to":[-2,3],"ti":[-11.333,-3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[-12,18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":65,"s":[0,18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":70,"s":[-12,18],"to":[15.333,-3],"ti":[11.333,3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[80,0],"to":[-5.54,-1.466],"ti":[34.366,0.891]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":89,"s":[-9,-10.939],"to":[-2.687,-0.07],"ti":[2.705,-0.032]},{"t":90,"s":[0,-11],"h":1},{"i":{"x":0.833,"y":0.813},"o":{"x":0.167,"y":0.167},"t":100,"s":[-0.023,-11],"to":[-33.471,0.39],"ti":[12.613,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.151},"t":110,"s":[-80,0],"to":[-26.667,0],"ti":[37.293,-0.434]},{"t":120,"s":[-1,-18],"h":1},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":130,"s":[-1,-18],"to":[-33.471,0.39],"ti":[12.613,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":140,"s":[-80,0],"to":[-26.667,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":150,"s":[12,-20],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":160,"s":[12,-20],"to":[0,0],"ti":[12.613,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":170,"s":[-80,0],"to":[-26.667,0],"ti":[-11.333,-3]},{"t":180,"s":[-12,18]}],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"矩形路径 5","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"rc","d":1,"s":{"a":0,"k":[80,80],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 6","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":0,"op":61,"st":0,"bm":0}],"markers":[]}

+{"v":"5.6.10","fr":30,"ip":0,"op":61,"w":216,"h":216,"nm":"循环","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"空 17","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[108,108,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[80,80,100],"ix":6}},"ao":0,"ip":0,"op":61,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"形状图层 9","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[],"ip":0,"op":62,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"形状图层 10","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[],"ip":0,"op":62,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"形状图层 8","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[],"ip":0,"op":62,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"形状图层 4","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[-128.719,-846.25,0],"ix":1},"s":{"a":0,"k":[75,75,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0]],"o":[[0,0]],"v":[[-116.052,-812.547]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"形状 2","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-156.667,-856.417],[-157,-887.5],[-72.188,-887.5],[-72.25,-805],[-157,-805],[-157,-857.25],[-185.062,-876.875],[-185.25,-808.375],[-158,-828.688]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"rd","nm":"圆角 1","r":{"a":0,"k":6,"ix":1},"ix":2,"mn":"ADBE Vector Filter - RC","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"形状 1","np":4,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":40,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":45,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":50,"s":[0]},{"t":55,"s":[100]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":3,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":5,"nm":"修剪路径 2","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":40,"op":62,"st":-30,"bm":0},{"ddd":0,"ind":7,"ty":3,"nm":"空 10","parent":1,"sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,8,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":62,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"形状图层 6","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[],"ip":0,"op":62,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"形状图层 3","parent":7,"sr":0.55,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[-29.233,-8.102,0],"to":[5.206,0,0],"ti":[-5.206,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27.5,"s":[2,-8.102,0],"to":[0,0,0],"ti":[0,0,0]},{"t":30.000244140625,"s":[2,-8.102,0]}],"ix":2},"a":{"a":0,"k":[-161.25,-836.25,0],"ix":1},"s":{"a":0,"k":[75,75,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25.05,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-122.168,-825.454],[-122.187,-825.562],[-121.982,-825.563],[-122.169,-825.459],[-122.458,-825.25],[-122.125,-825.833],[-122.302,-825.428],[-122.263,-825.404],[-122.177,-825.24],[-122.129,-825.547],[-122.557,-825.307],[-122.006,-825.241],[-122.323,-825.531],[-122.287,-825.286],[-122.111,-825.556],[-122.067,-825.434],[-122.399,-825.651],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25.325,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-122.168,-825.454],[-122.187,-825.562],[-121.982,-825.563],[-122.169,-825.459],[-122.458,-825.25],[-122.125,-825.833],[-122.302,-825.428],[-122.263,-825.404],[-122.177,-825.24],[-122.129,-825.547],[-122.557,-825.307],[-122.006,-825.241],[-122.323,-825.531],[-122.287,-825.286],[-122.111,-825.556],[-122.067,-825.434],[-122.399,-825.651],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25.6,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.002,-0.002],[0.004,-0.004],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0.008,0.008],[-0.012,0.012],[0,0]],"v":[[-104.503,-842.815],[-104.523,-842.923],[-104.317,-842.923],[-104.504,-842.819],[-104.794,-842.61],[-104.46,-843.194],[-104.637,-842.788],[-104.598,-842.765],[-104.512,-842.6],[-104.464,-842.908],[-104.892,-842.667],[-104.341,-842.602],[-104.658,-842.892],[-104.622,-842.647],[-104.446,-842.917],[-104.403,-842.794],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25.875,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.788,-0.816],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[4.118,4.266],[-5.943,5.974],[0,0]],"v":[[-105.501,-856.621],[-105.521,-856.729],[-105.315,-856.73],[-105.502,-856.625],[-105.792,-856.417],[-105.458,-857],[-105.635,-856.594],[-105.596,-856.571],[-105.51,-856.406],[-105.462,-856.714],[-105.89,-856.473],[-105.339,-856.408],[-105.656,-856.698],[-105.621,-856.453],[-105.444,-856.723],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26.15,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-128.668,-879.788],[-128.687,-879.896],[-128.482,-879.896],[-128.669,-879.792],[-128.958,-879.583],[-128.625,-880.167],[-128.802,-879.761],[-128.763,-879.738],[-128.677,-879.573],[-128.629,-879.881],[-129.057,-879.64],[-128.506,-879.574],[-128.823,-879.865],[-128.787,-879.62],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26.425,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.899,0.868],[-3.133,-3.104],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.047,-2.941],[6.288,6.23],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-141.642,-879.455],[-141.662,-879.563],[-141.456,-879.564],[-141.643,-879.459],[-141.933,-879.251],[-141.6,-879.834],[-141.776,-879.428],[-141.738,-879.405],[-141.652,-879.24],[-141.603,-879.548],[-142.032,-879.307],[-141.481,-879.242],[-141.797,-879.532],[-141.762,-879.287],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26.7,"s":[{"i":[[0,0],[-0.032,0.018],[-0.012,-0.068],[0.06,-0.039],[-0.014,0.118],[-0.148,0.168],[0.045,-0.14],[-0.008,-0.013],[-0.042,0.045],[0.102,0.018],[-0.118,0.114],[0,0],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,-0.036],[0.059,-0.035],[0.013,0.07],[-0.099,0.065],[0.026,-0.222],[0.097,-0.111],[-0.005,0.014],[0.034,0.052],[0.071,-0.076],[-0.161,-0.028],[2.702,-2.61],[0,0],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-161.668,-860.288],[-161.687,-860.396],[-161.482,-860.396],[-161.669,-860.292],[-161.958,-860.083],[-161.625,-860.667],[-161.802,-860.261],[-161.763,-860.238],[-161.677,-860.073],[-161.629,-860.381],[-162.057,-860.14],[-161.506,-860.074],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26.975,"s":[{"i":[[0,0],[-0.032,0.018],[-0.012,-0.067],[0.06,-0.039],[-0.014,0.118],[-0.148,0.168],[0.045,-0.14],[-0.008,-0.013],[-0.042,0.045],[0.102,0.018],[-0.131,-0.098],[-0.007,-0.007],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,-0.036],[0.059,-0.035],[0.013,0.07],[-0.099,0.065],[0.026,-0.222],[0.097,-0.11],[-0.005,0.014],[0.034,0.052],[0.071,-0.076],[-0.161,-0.028],[2.205,1.713],[0.015,0.015],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-182.524,-880.121],[-182.544,-880.229],[-182.338,-880.23],[-182.525,-880.125],[-182.815,-879.917],[-182.481,-880.5],[-182.658,-880.094],[-182.62,-880.071],[-182.533,-879.906],[-182.485,-880.214],[-182.913,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27.25,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.131,1.223],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-194.334,-880.121],[-194.354,-880.229],[-194.148,-880.23],[-194.335,-880.125],[-194.625,-879.917],[-194.292,-880.5],[-194.468,-880.094],[-194.43,-880.071],[-194.344,-879.906],[-194.296,-880.214],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27.525,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-217.668,-856.788],[-217.687,-856.896],[-217.482,-856.896],[-217.669,-856.792],[-217.958,-856.583],[-217.625,-857.167],[-217.802,-856.761],[-217.763,-856.738],[-217.677,-856.573],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27.8,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[1.319,1.32],[-4.389,4.46],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-2.515,-2.517],[6.73,-6.839],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-217.501,-841.983],[-217.521,-842.091],[-217.315,-842.092],[-217.502,-841.988],[-217.792,-841.779],[-217.459,-842.362],[-217.635,-841.957],[-217.597,-841.933],[-217.511,-841.769],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28.075,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-169.334,-794.121],[-169.354,-794.229],[-169.148,-794.23],[-169.335,-794.125],[-169.625,-793.917],[-169.292,-794.5],[-169.468,-794.094],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28.35,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[2.003,-2.004],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.875,4.877],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-153.487,-794.01],[-153.507,-794.118],[-153.301,-794.119],[-153.488,-794.015],[-153.778,-793.806],[-153.444,-794.389],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28.625,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-125.043,-822.621],[-125.062,-822.729],[-124.857,-822.73],[-125.044,-822.625],[-125.333,-822.417],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28.9,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-148.209,-846.954],[-148.229,-847.062],[-148.023,-847.063],[-148.21,-846.959],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29.175,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-159.022,-836.308],[-159.041,-836.417],[-158.835,-836.417],[-159.023,-836.313],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29.45,"s":[{"i":[[0,0],[0,0],[-2.624,-2.5],[-1.61,1.597],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[1.772,1.688],[3.515,-3.486],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-169.043,-836.788],[-169.062,-836.396],[-169.19,-836.563],[-159.044,-836.292],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29.725,"s":[{"i":[[0,0],[0,0],[-2.624,-2.5],[-1.61,1.597],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[1.772,1.688],[3.515,-3.486],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-177.018,-844.48],[-177.062,-844.062],[-169.19,-836.563],[-159.044,-836.292],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":30,"s":[{"i":[[0,0],[0,0],[-2.624,-2.5],[-1.61,1.597],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[1.772,1.688],[3.515,-3.486],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-164.376,-857.788],[-177.062,-844.062],[-169.19,-836.563],[-159.044,-836.292],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":34.825,"s":[{"i":[[0,0],[0,0],[-2.624,-2.5],[-1.61,1.597],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[1.772,1.688],[3.515,-3.486],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-164.376,-857.788],[-177.062,-844.062],[-169.19,-836.563],[-159.044,-836.292],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35.325,"s":[{"i":[[0,0],[0,0],[-2.624,-2.5],[-1.61,1.597],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[1.772,1.688],[3.515,-3.486],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-164.376,-857.788],[-177.062,-844.062],[-169.19,-836.563],[-159.044,-836.292],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35.6,"s":[{"i":[[0,0],[0,0],[-2.619,-2.495],[-1.607,1.594],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[1.768,1.684],[3.508,-3.479],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-169.023,-836.787],[-169.043,-836.396],[-169.17,-836.563],[-159.044,-836.292],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35.875,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-159.043,-836.288],[-159.062,-836.396],[-158.857,-836.396],[-159.044,-836.292],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36.15,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-148.209,-846.954],[-148.229,-847.062],[-148.023,-847.063],[-148.21,-846.959],[-148.5,-846.75],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36.425,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[9.521,-9.728],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.823,4.928],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-125.088,-822.669],[-125.108,-822.777],[-124.902,-822.777],[-125.089,-822.673],[-125.379,-822.464],[-125,-823],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36.7,"s":[{"i":[[0,0],[0.072,-0.109],[0,0],[0,0],[0,0],[0,0],[1.988,-1.989],[4.844,4.778],[13.374,13.191],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,0.131],[-0.038,0.059],[0,0],[0,0],[0,0],[0,0],[-4.875,4.877],[-12.044,-11.879],[-2.538,-2.503],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-153.543,-793.954],[-153.562,-794.062],[-153.357,-794.063],[-153.544,-793.959],[-153.833,-793.75],[-153.5,-794.333],[-153.677,-793.928],[-169.43,-794.071],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36.975,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[13.351,13.168],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-2.538,-2.504],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-169.429,-794.215],[-169.448,-794.323],[-169.242,-794.323],[-169.429,-794.219],[-169.719,-794.01],[-169.386,-794.593],[-169.562,-794.188],[-169.524,-794.165],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":37.25,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[1.322,1.323],[-4.398,4.469],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-2.52,-2.522],[6.743,-6.853],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-217.501,-841.954],[-217.521,-842.062],[-217.315,-842.063],[-217.502,-841.959],[-217.792,-841.75],[-217.458,-842.333],[-217.635,-841.928],[-217.596,-841.904],[-217.51,-841.74],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":37.525,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-6.365,6.314],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-217.668,-856.788],[-217.687,-856.896],[-217.482,-856.896],[-217.669,-856.792],[-217.958,-856.583],[-217.625,-857.167],[-217.802,-856.761],[-217.763,-856.738],[-217.677,-856.573],[-217.629,-856.881],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":37.8,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.142,1.233],[-3.502,-3.39],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.78,-3.749],[7.835,7.585],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-194.38,-880.076],[-194.4,-880.184],[-194.194,-880.184],[-194.381,-880.08],[-194.671,-879.871],[-194.337,-880.454],[-194.514,-880.049],[-194.475,-880.026],[-194.389,-879.861],[-194.341,-880.169],[-194.724,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":38.075,"s":[{"i":[[0,0],[-0.032,0.018],[-0.012,-0.068],[0.06,-0.039],[-0.014,0.118],[-0.148,0.168],[0.045,-0.14],[-0.008,-0.013],[-0.042,0.045],[0.102,0.018],[-0.129,-0.101],[0,0],[0,0],[-6.474,6.677],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,-0.036],[0.059,-0.035],[0.013,0.07],[-0.099,0.065],[0.026,-0.222],[0.097,-0.111],[-0.005,0.014],[0.034,0.052],[0.071,-0.076],[-0.161,-0.028],[2.202,1.723],[0,0],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-182.501,-880.121],[-182.521,-880.229],[-182.315,-880.23],[-182.502,-880.125],[-182.792,-879.917],[-182.458,-880.5],[-182.635,-880.094],[-182.596,-880.071],[-182.51,-879.906],[-182.462,-880.214],[-182.89,-879.973],[-182.339,-879.908],[-161.823,-860.365],[-141.954,-879.953],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":38.35,"s":[{"i":[[0,0],[-0.032,0.018],[-0.012,-0.067],[0.06,-0.039],[-0.014,0.118],[-0.148,0.168],[0.045,-0.14],[-0.008,-0.013],[-0.042,0.045],[0.102,0.018],[-0.117,0.113],[0,0],[0,0],[-6.463,6.666],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[-0.007,-0.036],[0.059,-0.035],[0.013,0.07],[-0.099,0.065],[0.026,-0.222],[0.097,-0.11],[-0.005,0.014],[0.034,0.052],[0.071,-0.076],[-0.161,-0.028],[2.697,-2.605],[0,0],[0,0],[2.954,-3.047],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-161.629,-860.325],[-161.648,-860.433],[-161.443,-860.434],[-161.63,-860.329],[-161.919,-860.121],[-161.586,-860.704],[-161.763,-860.299],[-161.724,-860.275],[-161.638,-860.11],[-161.59,-860.418],[-162.018,-860.177],[-161.467,-860.112],[-161.784,-860.402],[-141.954,-879.952],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":38.625,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.901,0.87],[-3.139,-3.11],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[3.053,-2.947],[6.3,6.242],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-141.668,-879.454],[-141.687,-879.563],[-141.482,-879.563],[-141.669,-879.459],[-141.958,-879.25],[-141.625,-879.833],[-141.802,-879.428],[-141.763,-879.404],[-141.677,-879.24],[-141.629,-879.548],[-142.057,-879.307],[-141.506,-879.241],[-141.823,-879.532],[-141.787,-879.287],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":38.9,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-6.79,-6.854],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[4.173,4.212],[-5.943,5.974],[0,0]],"v":[[-128.668,-879.788],[-128.687,-879.896],[-128.482,-879.896],[-128.669,-879.792],[-128.958,-879.583],[-128.625,-880.167],[-128.802,-879.761],[-128.763,-879.738],[-128.677,-879.573],[-128.629,-879.881],[-129.057,-879.64],[-128.506,-879.574],[-128.823,-879.865],[-128.787,-879.62],[-128.611,-879.89],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":39.175,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-0.799,-0.828],[2.14,-2.151],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[4.118,4.266],[-5.943,5.974],[0,0]],"v":[[-105.546,-856.666],[-105.566,-856.774],[-105.36,-856.775],[-105.547,-856.671],[-105.837,-856.462],[-105.504,-857.045],[-105.68,-856.64],[-105.642,-856.616],[-105.556,-856.451],[-105.507,-856.759],[-105.935,-856.519],[-105.385,-856.453],[-105.701,-856.743],[-105.666,-856.498],[-105.489,-856.768],[-105.401,-856.601],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":39.45,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-104.501,-842.788],[-104.521,-842.896],[-104.315,-842.896],[-104.502,-842.792],[-104.792,-842.583],[-104.458,-843.167],[-104.635,-842.761],[-104.596,-842.738],[-104.51,-842.573],[-104.462,-842.881],[-104.89,-842.64],[-104.339,-842.574],[-104.656,-842.865],[-104.621,-842.62],[-104.444,-842.89],[-104.401,-842.767],[-104.733,-842.984],[-122.562,-825.062]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":39.725,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-122.168,-825.454],[-122.187,-825.562],[-121.982,-825.563],[-122.169,-825.459],[-122.458,-825.25],[-122.125,-825.833],[-122.302,-825.428],[-122.263,-825.404],[-122.177,-825.24],[-122.129,-825.547],[-122.557,-825.307],[-122.006,-825.241],[-122.323,-825.531],[-122.287,-825.286],[-122.111,-825.556],[-122.067,-825.434],[-122.399,-825.651],[-122.562,-825.062]],"c":false}]},{"t":40.000146484375,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-122.168,-825.454],[-122.187,-825.562],[-121.982,-825.563],[-122.169,-825.459],[-122.458,-825.25],[-122.125,-825.833],[-122.302,-825.428],[-122.263,-825.404],[-122.177,-825.24],[-122.129,-825.547],[-122.557,-825.307],[-122.006,-825.241],[-122.323,-825.531],[-122.287,-825.286],[-122.111,-825.556],[-122.067,-825.434],[-122.399,-825.651],[-122.562,-825.062]],"c":false}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"rd","nm":"圆角 1","r":{"a":0,"k":0,"ix":1},"ix":2,"mn":"ADBE Vector Filter - RC","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"形状 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":25,"op":40,"st":-5.5,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"形状图层 2","parent":1,"sr":0.5,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-4,1,0],"ix":2},"a":{"a":0,"k":[-100,-843.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-92.444,-835.25],[-92.525,-835.206],[-92.45,-835.2],[-92.35,-835.3],[-92.4,-835.25],[-92.36,-835.214],[-92.339,-835.211],[-92.389,-835.226]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-120.364,-835.25],[-120.38,-835.233],[-120.305,-835.227],[-120.205,-835.326],[-120.255,-835.277],[-120.215,-835.24],[-120.194,-835.238],[-120.244,-835.253]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10.25,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-130.55,-836.9],[-130.45,-837],[-130.5,-836.95],[-130.46,-836.914],[-130.439,-836.911],[-130.489,-836.927]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10.5,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-129.15,-840.1],[-129.2,-840.05],[-129.16,-840.014],[-129.139,-840.011],[-129.189,-840.027]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11.25,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-70.5,-877.25],[-70.06,-877.614],[-69.939,-877.611],[-69.889,-877.726]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11.5,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.048,-1.1],[0.15,0.2],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.015,0.338],[-0.223,-0.297],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-67.008,-872.753],[-66.525,-872.625],[-66.75,-872.013]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11.75,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-66.983,-873.003],[-67,-873],[-67.083,-872.938]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12.75,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.386,-8.798],[0,0],[0.139,0.19]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.119,2.705],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-69.183,-825.003],[-69.45,-818.25],[-69.267,-818.188]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":13,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.483,-10.997],[0,0],[0.173,0.238]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.148,3.381],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-69.733,-813.003],[-74.75,-811.75],[-74.5,-811.688]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":14,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.483,-10.997],[1.5,2],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.148,3.381],[-2.23,-2.973],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-69.733,-813.003],[-74.75,-811.75],[-106.25,-853.688]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.483,-10.997],[1.5,2],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.148,3.381],[-2.23,-2.973],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-69.733,-813.003],[-74.75,-811.75],[-106.25,-853.688]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.483,-10.997],[0,0],[0.173,0.238]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.148,3.381],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-69.733,-813.003],[-74.75,-811.75],[-74.5,-811.688]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20.25,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.386,-8.798],[0,0],[0.139,0.19]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.119,2.705],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-69.183,-825.003],[-69.45,-818.25],[-69.267,-818.188]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":21.25,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-66.983,-873.003],[-67,-873],[-67.083,-872.938]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":21.5,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0.257,-4.242],[0.048,-1.1],[0.15,0.2],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[-0.25,4.125],[-0.015,0.338],[-0.223,-0.297],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-67,-873.5],[-67.008,-872.753],[-66.525,-872.625],[-66.75,-872.013]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":21.75,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-70.75,-877],[-70.5,-877.25],[-70.06,-877.614],[-69.939,-877.611],[-69.889,-877.726]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":22.5,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-129.25,-840],[-129.15,-840.1],[-129.2,-840.05],[-129.16,-840.014],[-129.139,-840.011],[-129.189,-840.027]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":22.75,"s":[{"i":[[0,0],[0,0],[0.75,1.906],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.782,-1.988],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-127.344,-835.25],[-130.625,-836.906],[-130.55,-836.9],[-130.45,-837],[-130.5,-836.95],[-130.46,-836.914],[-130.439,-836.911],[-130.489,-836.927]],"c":false}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":23,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-120.364,-835.25],[-120.38,-835.233],[-120.305,-835.227],[-120.205,-835.326],[-120.255,-835.277],[-120.215,-835.24],[-120.194,-835.238],[-120.244,-835.253]],"c":false}]},{"t":24,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-92.5,-835.156],[-92.444,-835.25],[-92.525,-835.206],[-92.45,-835.2],[-92.35,-835.3],[-92.4,-835.25],[-92.36,-835.214],[-92.339,-835.211],[-92.389,-835.226]],"c":false}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8.5,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":9,"s":[8]},{"t":9.5,"s":[8]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"形状 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4,"op":24.5,"st":-7.5,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"外框","parent":1,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-19.5,"s":[0]},{"t":-15.5,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":-10.5,"s":[32,32]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":-5.5,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":-0.5,"s":[72,72]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":4.5,"s":[72,72]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":9.5,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":14.5,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":54.5,"s":[0,0]},{"t":59.5,"s":[72,72]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":-0.5,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4.5,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9.5,"s":[0,0],"to":[0,0],"ti":[0,0]},{"t":59.5,"s":[0,0]}],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-10.5,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-5.5,"s":[30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-0.5,"s":[12]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":4.5,"s":[12]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":9.5,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54.5,"s":[40]},{"t":59.5,"s":[12]}],"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false}],"ip":-0.5,"op":62,"st":-30.5,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"形状图层 5","parent":1,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-19,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-15,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14.5,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":15,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":17,"s":[0]},{"t":17.5,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":-5,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":0,"s":[32,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":2.5,"s":[32,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":5,"s":[32,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":9.5,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":12.5,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":50,"s":[0,0]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":55,"s":[8,8]},{"t":60,"s":[32,8]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":-5,"s":[0,0],"to":[-1.333,0],"ti":[1.5,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-8,0],"to":[-0.47,0],"ti":[0.293,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2.5,"s":[-8,0],"to":[-0.643,0],"ti":[-0.916,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[-9,0],"to":[1.333,0],"ti":[-1.5,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9.5,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[0,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":55,"s":[0,0],"to":[-1.333,0],"ti":[1.333,0]},{"t":60,"s":[-8,0]}],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"矩形路径 4","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":-5,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":0,"s":[50,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":2.5,"s":[16,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":5,"s":[50,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":10,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":14.5,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":17.5,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":20,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":25,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":27.5,"s":[6,6]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":30,"s":[6,6]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":35,"s":[6,6]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":40,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":45,"s":[16,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":50,"s":[16,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":55,"s":[24,8]},{"t":60,"s":[50,8]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":-5,"s":[80,0],"to":[-13.333,-3],"ti":[13.333,3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[0,-18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2.5,"s":[-16,-18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[0,-18],"to":[-13.333,3],"ti":[-13.333,-3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-80,0],"to":[2.36,0.531],"ti":[-8.775,0.054]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":14.5,"s":[-25.6,0.037],"to":[1.115,-0.007],"ti":[-1.57,0.018]},{"t":17.5,"s":[28,0],"h":1},{"t":19,"s":[33,0],"h":1},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[38,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[80,0],"to":[21.757,-0.253],"ti":[31.158,-0.084]},{"t":27.5,"s":[40,0],"h":1},{"t":30,"s":[39,0],"h":1},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35,"s":[39,0],"to":[-9.983,0.027],"ti":[-5.123,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":40,"s":[80,0],"to":[26.667,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":45,"s":[-4,-16],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[-4,-16],"to":[0,0],"ti":[-12.702,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":55,"s":[80,0],"to":[26.667,0],"ti":[13.333,3]},{"t":60,"s":[0,-18]}],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"矩形路径 3","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":0,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":2.5,"s":[50,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":5,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":10,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":14.5,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":17.5,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":20,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":25,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":27.5,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":30,"s":[6,6]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":35,"s":[6,6]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":40,"s":[24,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":45,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":50,"s":[8,8]},{"i":{"x":[0.833,0.833],"y":[0.833,0.833]},"o":{"x":[0.167,0.167],"y":[0.167,0.167]},"t":55,"s":[24,8]},{"t":60,"s":[24,8]}],"ix":2},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":-5,"s":[-80,0],"to":[11.333,3],"ti":[-11.333,-3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-12,18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2.5,"s":[0,18],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[-12,18],"to":[15.333,-3],"ti":[11.333,3]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[80,0],"to":[-5.54,-1.466],"ti":[34.366,0.891]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":14.5,"s":[28,0],"to":[-2.687,-0.07],"ti":[37.293,-0.434]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":17.5,"s":[-25,0],"to":[-21.127,0.246],"ti":[-5.31,0.1]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":19,"s":[-31,-0.091],"to":[3.103,-0.058],"ti":[13.753,-0.16]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[-38,0],"to":[-33.471,0.39],"ti":[12.613,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[-80,0],"to":[-8.727,0],"ti":[-18.481,-0.021]},{"t":27.5,"s":[-40,0],"h":1},{"t":30,"s":[-36,0],"h":1},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35,"s":[-36,0],"to":[5.828,-0.956],"ti":[-3.003,1.787]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":40,"s":[-80,0],"to":[9.053,-5.387],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":45,"s":[12,-16],"to":[0,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[12,-16],"to":[0,0],"ti":[12.613,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":55,"s":[-80,0],"to":[-26.667,0],"ti":[-11.333,-3]},{"t":60,"s":[-12,18]}],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"矩形路径 5","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.854901960784,0.854901960784,0.854901960784,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"rc","d":1,"s":{"a":0,"k":[80,80],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 6","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":0,"op":62,"st":-30,"bm":0}],"markers":[]}

@@ -4,7 +4,8 @@ import { BreakpointConstants } from 'wdConstant';
 import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger } from 'wdKit';
 import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger } from 'wdKit';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { promptAction } from '@kit.ArkUI';
 import { promptAction } from '@kit.ArkUI';
-import { HWLocationUtils } from 'wdHwAbility/Index';
+import { HWLocationUtils, WDPushNotificationManager } from 'wdHwAbility/Index';
+import { common } from '@kit.AbilityKit';
 
 
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';
@@ -24,6 +25,16 @@ struct MainPage {
   aboutToAppear() {
   aboutToAppear() {
     HWLocationUtils.startLocationService()
     HWLocationUtils.startLocationService()
     this.breakpointSystem.register()
     this.breakpointSystem.register()
+
+    let context = getContext(this) as common.UIAbilityContext
+    WDPushNotificationManager.getInstance().requestEnableNotifications(context).then((enabled) => {
+      if (enabled) {
+        WDPushNotificationManager.getInstance().fetchTokenAndBindProfileId()
+
+        // WDPushNotificationManager.getInstance().sendLocalNotification()
+      }
+    })
+
     Logger.info(TAG, `aboutToAppear `);
     Logger.info(TAG, `aboutToAppear `);
     EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
     EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
       LogoutViewModel.clearLoginInfo()
       LogoutViewModel.clearLoginInfo()

 import { Action } from 'wdBean';
 import { Action } from 'wdBean';
 import { SpacialTopicPageComponent } from 'wdComponent'
 import { SpacialTopicPageComponent } from 'wdComponent'
 import { CommonConstants } from 'wdConstant'
 import { CommonConstants } from 'wdConstant'
-import { Logger } from 'wdKit'
+import { Logger, WindowModel } from 'wdKit'
 import router from '@ohos.router';
 import router from '@ohos.router';
 
 
 const TAG = 'SpacialTopicPage';
 const TAG = 'SpacialTopicPage';
@@ -27,6 +27,7 @@ struct SpacialTopicPage {
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
+    WindowModel.shared.setWindowLayoutFullScreen(true)
     Logger.info(TAG, 'aboutToAppear');
     Logger.info(TAG, 'aboutToAppear');
     let action: Action = router.getParams() as Action
     let action: Action = router.getParams() as Action
     this.action = action
     this.action = action
@@ -34,14 +35,17 @@ struct SpacialTopicPage {
 
 
   aboutToDisappear() {
   aboutToDisappear() {
     Logger.info(TAG, 'aboutToDisappear');
     Logger.info(TAG, 'aboutToDisappear');
+    WindowModel.shared.setWindowLayoutFullScreen(false)
   }
   }
 
 
   onPageShow() {
   onPageShow() {
+    WindowModel.shared.setWindowLayoutFullScreen(true)
     Logger.info(TAG, 'onPageShow');
     Logger.info(TAG, 'onPageShow');
   }
   }
 
 
   onPageHide() {
   onPageHide() {
     Logger.info(TAG, 'onPageHide');
     Logger.info(TAG, 'onPageHide');
+    WindowModel.shared.setWindowLayoutFullScreen(false)
   }
   }
 
 
   onBackPress() {
   onBackPress() {

@@ -181,12 +181,12 @@ struct LaunchAdvertisingPage {
         //端外打开
         //端外打开
 
 
         ProcessUtils.jumpExternalWebPage(this.model.launchAdInfo[0].matInfo.linkUrl)
         ProcessUtils.jumpExternalWebPage(this.model.launchAdInfo[0].matInfo.linkUrl)
-        clearInterval(this.timer)
+        //clearInterval(this.timer)
 
 
       }else {
       }else {
         //端内打开
         //端内打开
         ProcessUtils.gotoDefaultWebPage(this.model.launchAdInfo[0].matInfo.linkUrl)
         ProcessUtils.gotoDefaultWebPage(this.model.launchAdInfo[0].matInfo.linkUrl)
-        clearInterval(this.timer)
+        //clearInterval(this.timer)
 
 
       }
       }
     }
     }

@@ -35,7 +35,7 @@ struct LaunchPage {
     alignment: DialogAlignment.Center,
     alignment: DialogAlignment.Center,
     offset: { dx: 0, dy: '-24' },
     offset: { dx: 0, dy: '-24' },
     customStyle: true,
     customStyle: true,
-    autoCancel: false
+    autoCancel: false,
   });
   });
 
 
   onCancel() {
   onCancel() {
@@ -110,6 +110,9 @@ struct LaunchPage {
           if (dataModel.launchAdInfo.length) {
           if (dataModel.launchAdInfo.length) {
             //跳转广告页
             //跳转广告页
             this.jumpToAdvertisingPage();
             this.jumpToAdvertisingPage();
+
+            //WDRouterRule.jumpWithReplacePage(WDRouterPage.privacyPage)
+
           }else {
           }else {
             //直接跳转首页
             //直接跳转首页
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
@@ -156,7 +159,7 @@ struct LaunchPage {
   build(){
   build(){
 
 
     Stack({alignContent:Alignment.Bottom}){
     Stack({alignContent:Alignment.Bottom}){
-      Image($r('app.media.app_icon'))
+      Image($r('app.media.LaunchPage_logo'))
         .width('278lpx')
         .width('278lpx')
         .height('154lpx')
         .height('154lpx')
         .margin({
         .margin({

@@ -3,59 +3,35 @@ import webview from '@ohos.web.webview';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { GlobalContext } from '../../utils/GlobalContext'
 import { GlobalContext } from '../../utils/GlobalContext'
 import { WDRouterRule } from 'wdRouter';
 import { WDRouterRule } from 'wdRouter';
+import { LikeComponent } from 'wdComponent'
 
 
 @Entry
 @Entry
 @Component
 @Component
 struct PrivacyPage {
 struct PrivacyPage {
   @State message: string = 'Hello World'
   @State message: string = 'Hello World'
-  webController: webview.WebviewController = new webview.WebviewController();
-  //@State params: object = router.getParams();
+  model: Record<string, string> = {}
+
+  aboutToAppear(): void {
+
+    this.model['contentId'] = '30044572938' //必须
+    this.model['userName'] = '人民日报网友5MbdHk'
+    this.model['contentType'] = '8'  //必须
+    this.model['title'] = '“神器”还是“安慰剂”？中学生“体考神器”调查'
+    this.model['userHeaderUrl'] = ""
+    this.model['channelId'] = "2002"  //必须
+    //this.model['status'] = "1"  //必须
+
+
+
+  }
+
 
 
   build() {
   build() {
     Row() {
     Row() {
       Column() {
       Column() {
-        // Web component loading H5.
-        Web({ src: 'https://www.baidu.com', controller: this.webController })
-          .zoomAccess(false)
-          .width('100%')
-          .height('100%')
-          .aspectRatio(1)
-          // .onConfirm((event) => {
-          //   AlertDialog.show({
-          //     message: Const.WEB_ALERT_DIALOG_TEXT_VALUE + event?.message,
-          //     confirm: {
-          //       value: $r('app.string.web_alert_dialog_button_value'),
-          //       action: () => {
-          //         event?.result.handleConfirm();
-          //       }
-          //     },
-          //     cancel: () => {
-          //       event?.result.handleCancel();
-          //     }
-          //   });
-          //   return true;
-          // })
-          // .onErrorReceive((event) => {
-          //   if (event?.error.getErrorInfo() === 'ERR_INTERNET_DISCONNECTED') {
-          //     prompt.showToast({
-          //       message: $r('app.string.internet_err'),
-          //       duration: Const.WebConstant_DURATION
-          //     })
-          //   }
-          //   if (event?.error.getErrorInfo() === 'ERR_CONNECTION_TIMED_OUT') {
-          //     prompt.showToast({
-          //       message: $r('app.string.internet_err'),
-          //       duration: Const.WebConstant_DURATION
-          //     })
-          //   }
-          // })
-          // .onProgressChange((event) => {
-          //   if (event?.newProgress === Const.WebConstant_PROGRESS_MAX) {
-          //     this.isLoading = false;
-          //     clearInterval(this.intervalLoading);
-          //     this.intervalLoading = -1;
-          //   }
-          // })
+
+        LikeComponent({data: this.model,componentType:1})
+
       }
       }
       .width('100%')
       .width('100%')
     }
     }

@@ -134,7 +134,7 @@ export default struct CustomDialogComponent {
       Text($r('app.string.dialog_text_privacy_statement'))
       Text($r('app.string.dialog_text_privacy_statement'))
         .width('90%')
         .width('90%')
         .fontColor($r('app.color.dialog_text_color'))
         .fontColor($r('app.color.dialog_text_color'))
-        .fontSize(13).margin({top:20})
+        .fontSize(14).margin({top:20})
       Row() {
       Row() {
         Text($r('app.string.dialog_button_disagree'))
         Text($r('app.string.dialog_button_disagree'))
           .fancy()
           .fancy()

@@ -36,7 +36,7 @@
     ],
     ],
     "metadata": [{
     "metadata": [{
       "name": "client_id",
       "name": "client_id",
-      "value": "220837707901830144"
+      "value": "110737325"
     }],
     }],
     "requestPermissions": [
     "requestPermissions": [
       {
       {