Merge remote-tracking branch 'origin/main'

# Conflicts:
#	sight_harmony/features/wdComponent/src/main/ets/components/page/TopNavigationComponent.ets

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

@@ -244,6 +244,30 @@
           ]
         }
       ]
+    },
+    {
+      "name": "wdShareBase",
+      "srcPath": "./commons/wdShareBase",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "wdShare",
+      "srcPath": "./features/wdShare",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
     }
   ]
 }
\ No newline at end of file

@@ -12,6 +12,8 @@ export class ContentConstants {
    * 2:直播
    */
   static readonly TYPE_LIVE: string = "2";
+
+  static readonly TYPE_FOUR: string = "4";
   /**
    * 5:专题详情
    */

@@ -44,4 +44,7 @@ export class SpConstants{
    //频道信息流页面左右挂角
    static APP_PAGE_CORNER_ADV =  'app_page_corner_adv_'
 
+
+   //游客状态下首次评论时间
+   static FIRSTCOMMENTTIME =  'firstCommentTime'
 }
\ No newline at end of file

@@ -53,5 +53,15 @@ export class AppUtils {
     }
     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位生成随机值
    */
   static getRandomUUIDForTraceID(): string {
-    deviceInfo.productModel
-    return util.generateRandomUUID().toUpperCase().replace('-', '')
+    return util.generateRandomUUID().toUpperCase().replace(/-/g, '')
   }
 }

@@ -17,6 +17,14 @@ export enum EmitterEventId {
 
   // 关注，取消关注
   PEOPLE_SHIP_ATTENTION = 7,
+  // 我的关注 为null
+  MY_FOLLOW_EMPTY = 8,
+
+  // 登录成功
+  LOGIN_SUCCESS = 8,
+
+  // 换绑成功
+  PHONE_CHANGE_SUCCESS = 9,
 
   // App回到前台
   APP_ENTER_FOREGROUD = 100,

@@ -72,6 +72,10 @@ export class UserDataLocal {
     SPHelper.default.save(UserDataLocal.USER_HEADER_URL, url)
   }
 
+  public static setUserType(type:string) {
+    SPHelper.default.save(UserDataLocal.USER_Type, type)
+  }
+
   public static setUserFollowOperation(timestamp:string) {
     SPHelper.default.saveSync(UserDataLocal.USER_FOLLOW_OPERATION, timestamp)
   }

@@ -6,6 +6,9 @@
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
     "@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",
     "wdKit@../wdKit": "wdKit@../wdKit"
   },
@@ -16,6 +19,26 @@
       "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.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"
+    },
     "wdConstant@../wdConstant": {
       "name": "wdconstant",
       "resolved": "../wdConstant",
@@ -24,7 +47,11 @@
     "wdKit@../wdKit": {
       "name": "wdkit",
       "resolved": "../wdKit",
-      "registryType": "local"
+      "registryType": "local",
+      "dependencies": {
+        "@umeng/common": "^1.0.21",
+        "@umeng/analytics": "^1.0.19"
+      }
     }
   }
 }
\ No newline at end of file

 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 { HostEnum, HostManager } from './HttpHostManager';
 
@@ -11,16 +11,16 @@ export class HttpParams {
     let headers: Record<string, string> = {};
     // 通用请求头
     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['Content-Type'] = 'application/json; charset=utf-8'
     headers['device_id'] = DeviceUtil.clientId()
     headers['build_version'] = HttpParams.getVersion()
     headers['adcode'] = HttpUtils.getProvinceCode()
     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['imei'] = DeviceUtil.clientId()
     headers['Accept-Language'] = 'zh'

@@ -441,6 +441,12 @@ export class HttpUrlUtils {
     return url;
   }
 
+  //游客评论合并
+  static visitorMergeComment() {
+    let url = HttpUrlUtils.getHost() + "/api/rmrb-comment/comment/zh/c/visitorMerge";
+    return url;
+  }
+
   static getAppointmentListDataUrl() {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.APPOINTMENT_LIST_DATA_PATH
     return url

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

+/node_modules
+/oh_modules
+/.preview
+/build
+/.cxx
+/.test
\ No newline at end of file

+export { WDShareObject, WDShareBase } from "./src/main/ets/WDShareBase"
+
+export { ShareContent, ShareScene, ShareType } from "./src/main/ets/Constant"
\ No newline at end of file

+{
+  "apiType": "stageMode",
+  "buildOption": {
+  },
+  "buildOptionSet": [
+    {
+      "name": "release",
+      "arkOptions": {
+        "obfuscation": {
+          "ruleOptions": {
+            "enable": true,
+            "files": [
+              "./obfuscation-rules.txt"
+            ]
+          }
+        }
+      },
+    },
+  ],
+  "targets": [
+    {
+      "name": "default"
+    }
+  ]
+}
\ No newline at end of file

+import { hspTasks } from '@ohos/hvigor-ohos-plugin';
+
+export default {
+    system: hspTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
+    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
+}

+# Define project specific obfuscation rules here.
+# You can include the obfuscation configuration files in the current module's build-profile.json5.
+#
+# For more details, see
+#   https://gitee.com/openharmony/arkcompiler_ets_frontend/blob/master/arkguard/README.md
+
+# Obfuscation options:
+# -disable-obfuscation: disable all obfuscations
+# -enable-property-obfuscation: obfuscate the property names
+# -enable-toplevel-obfuscation: obfuscate the names in the global scope
+# -compact: remove unnecessary blank spaces and all line feeds
+# -remove-log: remove all console.* statements
+# -print-namecache: print the name cache that contains the mapping from the old names to new names
+# -apply-namecache: reuse the given cache file
+
+# Keep options:
+# -keep-property-name: specifies property names that you want to keep
+# -keep-global-name: specifies names that you want to keep in the global scope
\ No newline at end of file

+{
+  "name": "wdsharebase",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "Index.ets",
+  "author": "",
+  "license": "Apache-2.0",
+  "packageType": "InterfaceHar",
+  "dependencies": {
+  }
+}
\ No newline at end of file

+
+export const enum ShareType {
+  System = 0,
+  WeChat,
+  QQ,
+  Weibo,
+
+}
+
+export const enum ShareScene {
+  System = 0,
+
+  WeChatSession,
+  WeChatTimeline,
+
+  QQFriend,
+  QQZone,
+
+  Weibo,
+}
+
+export const enum ShareContentType {
+  PrueText = 1,
+  ImageAndText,
+  Link,
+}
+
+export interface ShareContentText {
+  text: string
+}
+export interface ShareContentImageAndText {
+  title: string
+  desc?: string
+  imgURI: string
+
+}
+export interface ShareContentLink {
+  title: string
+  desc?: string
+  link: string
+  icon?: string
+}
+
+export type ShareContent = ShareContentText | ShareContentImageAndText | ShareContentLink

+import { ShareContent, ShareContentImageAndText, ShareContentLink, ShareContentText,
+  ShareContentType,
+  ShareScene } from '../Constant';
+import { WDShareInterface } from '../WDShareInterface';
+import { AsyncCallback } from '@kit.BasicServicesKit';
+import { common } from '@kit.AbilityKit';
+import { systemShare } from '@kit.ShareKit';
+import { uniformTypeDescriptor as utd } from '@kit.ArkData';
+
+export class WDSystemShare implements WDShareInterface {
+
+  shareContent(scene: ShareScene, content: ShareContent, contentType: ShareContentType): Promise<string> {
+
+    return new Promise((resolve, fail) => {
+      try {
+
+        let controller: systemShare.ShareController = new systemShare.ShareController(this.getShareData(content, contentType));
+        let context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
+
+        controller.on('dismiss', () => {
+
+          resolve("dismiss")
+        });
+
+        controller.show(context, {
+          previewMode: systemShare.SharePreviewMode.DEFAULT,
+          selectionMode: systemShare.SelectionMode.SINGLE
+        });
+
+        console.log("分享控制器调用完成")
+      } catch (e) {
+        fail(e)
+      }
+    })
+  }
+
+  getShareData(content: ShareContent, contentType: ShareContentType) : systemShare.SharedData {
+    if (contentType === ShareContentType.PrueText) {
+      let prueText = content as ShareContentText
+      console.log("分享纯文本")
+      return new systemShare.SharedData({
+        utd: utd.UniformDataType.PLAIN_TEXT,
+        content: prueText.text
+      });
+    }
+
+    if (contentType === ShareContentType.ImageAndText) {
+      let imageAndText = content as ShareContentImageAndText
+      console.log("分享图片和文本")
+      let data: systemShare.SharedData = new systemShare.SharedData({
+        utd: utd.UniformDataType.PLAIN_TEXT,
+        content: imageAndText.title
+      });
+      data.addRecord({
+        utd: utd.UniformDataType.PNG,
+        uri: imageAndText.imgURI
+      });
+      return data
+    }
+
+    console.log("分享链接和文本")
+    let link = content as ShareContentLink
+    let data: systemShare.SharedData = new systemShare.SharedData({
+      utd: utd.UniformDataType.PLAIN_TEXT,
+      content: link.title
+    });
+    data.addRecord({
+      utd: utd.UniformDataType.HYPERLINK,
+      uri: link.link
+    });
+    return data
+  }
+
+
+}
\ No newline at end of file

+import { ShareContent, ShareContentType, ShareScene, ShareType } from './Constant'
+import { HashMap } from '@kit.ArkTS'
+import { WDShareInterface } from './WDShareInterface'
+import { WDSystemShare } from './System/WDSystemShare'
+
+export interface WDShareObject {
+  to: ShareType,
+  scene: ShareScene,
+  type: ShareContentType,
+  obj: ShareContent
+}
+
+export class WDShareBase {
+
+  private static instance?: WDShareBase
+  static getInstance() : WDShareBase {
+    if (!WDShareBase.instance) {
+      WDShareBase.instance = new WDShareBase()
+      WDShareBase.instance.register()
+    }
+    return WDShareBase.instance
+  }
+
+  private handles: HashMap<ShareType, WDShareInterface> = new HashMap()
+
+  register() {
+    this.handles.set(ShareType.System, new WDSystemShare())
+  }
+
+  share(obj: WDShareObject) : null | Promise<string> {
+    let shareHandler: WDShareInterface = this.handles.get(obj.to)
+    if (shareHandler) {
+      return shareHandler.shareContent(obj.scene, obj.obj, obj.type)
+    }
+    return null
+  }
+
+
+
+
+}
\ No newline at end of file

+import { ShareContent, ShareContentType, ShareScene } from './Constant'
+import { AsyncCallback } from '@kit.BasicServicesKit'
+
+export interface WDShareInterface {
+  // shareContent(scene:ShareScene, content: ShareContent, callback: AsyncCallback<void>): void
+  shareContent(scene:ShareScene, content: ShareContent, contentType: ShareContentType): Promise<string>
+
+
+
+}
\ No newline at end of file

+@Entry
+@Component
+struct IndexPage {
+  @State message: string = 'Hello World';
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
\ No newline at end of file

+{
+  "module": {
+    "name": "wdShareBase",
+    "type": "shared",
+    "description": "$string:shared_desc",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "pages": "$profile:main_pages"
+  }
+}
\ No newline at end of file

+{
+  "color": [
+    {
+      "name": "white",
+      "value": "#FFFFFF"
+    }
+  ]
+}
\ No newline at end of file

+{
+  "string": [
+    {
+      "name": "shared_desc",
+      "value": "description"
+    }
+  ]
+}
\ No newline at end of file

+{
+  "src": [
+    "pages/IndexPage"
+  ]
+}
\ No newline at end of file

+import localUnitTest from './LocalUnit.test';
+
+export default function testsuite() {
+  localUnitTest();
+}
\ No newline at end of file

+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+
+export default function localUnitTest() {
+  describe('localUnitTest',() => {
+    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
+    beforeAll(() => {
+      // Presets an action, which is performed only once before all test cases of the test suite start.
+      // This API supports only one parameter: preset action function.
+    });
+    beforeEach(() => {
+      // Presets an action, which is performed before each unit test case starts.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: preset action function.
+    });
+    afterEach(() => {
+      // Presets a clear action, which is performed after each unit test case ends.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: clear action function.
+    });
+    afterAll(() => {
+      // Presets a clear action, which is performed after all test cases of the test suite end.
+      // This API supports only one parameter: clear action function.
+    });
+    it('assertContain', 0, () => {
+      // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
+      let a = 'abc';
+      let b = 'b';
+      // Defines a variety of assertion methods, which are used to declare expected boolean conditions.
+      expect(a).assertContain(b);
+      expect(a).assertEqual(a);
+    });
+  });
+}
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import { Logger } from 'wdKit/Index';
 import { performJSCallNative } from './JsBridgeBiz';
 import { H5CallNativeType } from './H5CallNativeType';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
+import { DateTimeUtils } from 'wdKit'
 
 const TAG = 'WdWebLocalComponent';
 
@@ -22,6 +23,13 @@ export struct WdWebLocalComponent {
   @State positionLeft: number = 0
   @State positionTop: number = 0
   @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() {
     Column() {
@@ -77,12 +85,78 @@ export struct WdWebLocalComponent {
             })
 
           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)
                 .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)
             .height(this.positionHeight)
-              .borderRadius(5)
             .alignRules({
               top: { anchor: "__container__", align: VerticalAlign.Top },
             })
@@ -92,7 +166,6 @@ export struct WdWebLocalComponent {
             })
             .id("video")
           }
-
         }
       }.width('100%')
       .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 { postThemeListParams } from './src/main/ets/bean/detail/postThemeListParams';
-
 export { LiveDTO } from './src/main/ets/bean/peoples/LiveDTO';
 
 export { contentVideosDTO } from './src/main/ets/bean/content/contentVideosDTO';
@@ -165,3 +163,7 @@ export {
   AttentionBatchDTO,
   CreatorDTO
 } 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';

+/**
+ * @Description: 广告扩展信息的解析模型
+ * @Author:
+ * @Email: liyubing@wondertek.com.cn
+ * @CreateDate:
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+export interface AdvExtraData {
+
+
+  itemTopImage: string;
+  itemMore: AdvExtraItemData;
+  item: AdvExtraItemData[]
+
+}
+
+export interface AdvExtraItemData {
+/**
+ * 图片地址
+ */
+  image: string;
+  /**
+   * 标题
+   */
+  title: string ;
+  /**
+   * 跳转地址
+   */
+  linkUrl: string;
+  /**
+   * 跳转类型
+   */
+  linkType: string;
+
+}
\ No newline at end of file

@@ -17,4 +17,6 @@ export interface ExtraDTO extends ItemDTO {
   photoList: PhotoListBean[];
   swiperIndex?: number
   commentId?: string;
+  extra?:string
+  title: string
 }
\ No newline at end of file

+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
+}
\ No newline at end of file

@@ -77,7 +77,11 @@ export interface ContentDTO {
   newTags: string;
   titleShow?: number;
   isSearch?: boolean; // 是否是搜索的结果，区分搜索和主页的数据
+  isCollection?: boolean; // 是否是收藏的结果，区分搜索和主页的数据
   commentInfo?: commentInfo
   //底部导航栏 id（用于频道跳转）
   bottomNavId:string;
+  // 链接类型： 0：无链接；1：内链（文章）；2：外链
+  openType:string
+  extra:string
 }
\ No newline at end of file

+export interface CreatorsBean {
+  id:number
+  name:string
+}
\ No newline at end of file

+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>
+}
\ No newline at end of file

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

-export interface postThemeListParams {
-  sort: number;
-  pageNum: number;
-  pageSize: number;
-}
\ No newline at end of file

@@ -159,7 +159,7 @@ export interface LiveDetailsBean {
    }
    */
   liveInfo: LiveInfo
-  fullColumnImgUrls: Array<FullColumnImgUrls>
+  fullColumnImgUrls: Array<FullColumnImgUrlBean>
   newsTitle: string
   newsId: string
   newIntroduction: string
@@ -186,8 +186,12 @@ export interface MLive {
   mliveId: string
 }
 
-export interface FullColumnImgUrls {
+export interface FullColumnImgUrlBean {
   url: string
+  height: string
+  landscape: number
+  size: string
+  weight: string
 }
 
 export interface Vlive {

+import { FullColumnImgUrlBean } from './LiveDetailsBean'
+
 export interface LiveRoomBean {
   pageNum: number
   pageSize: number
@@ -15,6 +17,7 @@ export interface LiveRoomItemBean {
   isWall: number
   //是否置顶 1置顶0不置顶
   isTop: number
+  //guest :嘉宾，host:主持人
   role: string
   //ZH_TEXT_AND_IMAGE_MSG ：图文，ZH_TEXT_MSG：文本，ZH_VIDEO_MSG：视频，ZH_AUDIO_MSG：音频
   dataType: string
@@ -28,5 +31,7 @@ export interface LiveRoomItemBean {
   duration: number
   //音频地址
   audioUrl: string
+  //详情页面插入数据bean
+  fullColumnImgUrlDto: FullColumnImgUrlBean
 
 }
\ No newline at end of file

@@ -167,7 +167,7 @@ export struct AudioDetailComponent {
         }
         .layoutWeight(1)
 
-        OperRowListView()
+        // OperRowListView()
       }
     }
 

@@ -25,6 +25,7 @@ import { Card2Component } from './cardview/Card2Component';
 import { Card5Component } from './cardview/Card5Component';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
+import PageModel from '../viewmodel/PageModel';
 
 /**
  * comp适配器.
@@ -34,7 +35,9 @@ import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 @Component
 export struct CompParser {
   @State compDTO: CompDTO = {} as CompDTO
-  compIndex: number = 0;
+
+  @State private pageModel: PageModel = new PageModel();
+  @State compIndex: number = 0;
 
   build() {
     Column() {
@@ -44,7 +47,7 @@ export struct CompParser {
 
   @Builder
   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) {
       LabelComponent({ compDTO: compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -77,8 +80,8 @@ export struct CompParser {
       ZhSingleRow04({ compDTO: compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
-      ZhSingleRow05({ compDTO })
-      Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+      // ZhSingleRow05({ compDTO })
+      // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
       ZhSingleRow06({ compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -100,7 +103,8 @@ export struct CompParser {
       ZhSingleColumn09({ compDTO })
       Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
     } 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 })
     } else if (!Number.isNaN(Number(compDTO.compStyle))) {
       CardParser({ contentDTO: compDTO.operDataList[0] });

-import { AccountManagerUtils, Logger, DateTimeUtils, SPHelper, NumberFormatterUtils  } from 'wdKit';
+import { AccountManagerUtils, Logger, DateTimeUtils, SPHelper, NumberFormatterUtils, DisplayUtils  } from 'wdKit';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { ContentDetailDTO,postBatchAttentionStatusParams,
   PhotoListBean,
@@ -53,7 +53,7 @@ export struct DynamicDetailComponent {
   //跳转
   private  mJumpInfo: ContentDTO = {} as ContentDTO;
 
-  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+
 
   async aboutToAppear() {
     await this.getContentDetailData()
@@ -83,7 +83,7 @@ export struct DynamicDetailComponent {
         Image($r('app.media.ic_news_detail_division'))
             .width('100%')
             .height($r('app.float.margin_7'))
-            .margin({left: $r('app.float.margin_16'), right: $r('app.float.margin_16')} )
+            .padding({left: $r('app.float.margin_16'), right: $r('app.float.margin_16')} )
         Stack({ alignContent: Alignment.Bottom }) {
           Scroll(this.scroller) {
             Column() {
@@ -97,15 +97,29 @@ export struct DynamicDetailComponent {
                     .height($r('app.float.margin_32'))
                     .objectFit(ImageFit.Cover)
                     .borderRadius($r('app.float.margin_16'))
-                  Image($r('app.media.icon_border_test'))
+                  Image(this.contentDetailData.rmhInfo?.honoraryIcon)
                     .width($r('app.float.margin_48'))
                     .height($r('app.float.margin_48'))
                     .objectFit(ImageFit.Cover)
                     .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'))
                 .height($r('app.float.margin_48'))
                 .alignContent(Alignment.Center)
+                .onClick(() => {
+                  ProcessUtils.gotoPeopleShipHomePage(this.contentDetailData.rmhInfo == null ?"":this.contentDetailData.rmhInfo.rmhId)
+                })
                 Column(){
                   //昵称
                   Text(this.contentDetailData.rmhInfo?.rmhName)
@@ -128,7 +142,7 @@ export struct DynamicDetailComponent {
                 .margin({right: $r('app.float.margin_6')})
                 if(!StringUtils.isEmpty(this.followStatus)){
                   if (this.followStatus == '0') {
-                    Text('关注')
+                    Text('+关注')
                       .width($r('app.float.margin_54'))
                       .height($r('app.float.margin_24'))
                       .textAlign(TextAlign.Center)
@@ -147,7 +161,8 @@ export struct DynamicDetailComponent {
                       .textAlign(TextAlign.Center)
                       .fontSize($r('app.float.font_size_12'))
                       .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'))
                       .onClick(() => {
                         this.handleAccention()
@@ -275,8 +290,8 @@ export struct DynamicDetailComponent {
                           Image(this.contentDetailData.fullColumnImgUrls!= null && this.contentDetailData.fullColumnImgUrls.length>0&&!StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url)?
                           this.contentDetailData.fullColumnImgUrls[0].url:
                           this.contentDetailData.videoInfo[0].firstFrameImageUri)
-                            .width(CommonConstants.FULL_WIDTH)
-                            .aspectRatio(16 / 9)
+                            .width(DisplayUtils.getDeviceWidth()- 32)
+                            .height((DisplayUtils.getDeviceWidth()-32)* 9 / 16)
                             .borderRadius($r('app.float.image_border_radius'))
                           CardMediaInfo({ contentDTO: this.mJumpInfo })
                         }
@@ -291,7 +306,8 @@ export struct DynamicDetailComponent {
                           Image(this.contentDetailData.fullColumnImgUrls!= null && this.contentDetailData.fullColumnImgUrls.length>0&&!StringUtils.isEmpty(this.contentDetailData.fullColumnImgUrls[0].url)?
                           this.contentDetailData.fullColumnImgUrls[0].url:
                           this.contentDetailData.videoInfo[0].firstFrameImageUri)
-                            .width(CommonConstants.FULL_WIDTH)
+                            .width(DisplayUtils.getDeviceWidth()/2)
+                            .height(DisplayUtils.getDeviceWidth()/2* 4 / 3)
                             .borderRadius($r('app.float.image_border_radius'))
                           CardMediaInfo({ contentDTO: this.mJumpInfo })
                         }
@@ -299,7 +315,7 @@ export struct DynamicDetailComponent {
                       }
                     }
                   }
-                  .margin({ left: $r('app.float.margin_16'),right: $r('app.float.margin_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) => {
                     ProcessUtils.processPage(this.mJumpInfo)
                   })
@@ -311,8 +327,8 @@ export struct DynamicDetailComponent {
                 .fontSize($r('app.float.font_size_12'))
                 .lineHeight($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(){
                 Image($r('app.media.xxhdpi_pic_wechat'))
@@ -362,9 +378,17 @@ export struct DynamicDetailComponent {
               })
               // 评论
               if (this.contentDetailData?.openComment) {
-                Divider().strokeWidth(6).color('#f5f5f5')
+                Divider().strokeWidth(6).color('#f5f5f5').margin({top:$r('app.float.margin_24')})
                 CommentComponent({
-                  publishCommentModel: this.publishCommentModel
+                  publishCommentModel: {
+                    targetId: String(this.contentDetailData?.newsId || ''),
+                    targetRelId: this.contentDetailData?.reLInfo?.relId,
+                    targetTitle: this.contentDetailData?.newsTitle,
+                    targetRelType: this.contentDetailData?.reLInfo?.relType,
+                    targetRelObjectId: String(this.contentDetailData?.reLInfo?.relObjectId),
+                    keyArticle: String(this.contentDetailData?.keyArticle),
+                    targetType: String(this.contentDetailData?.newsType),
+                  } as publishCommentModel
                 })
               }
               Blank().layoutWeight(1)
@@ -379,7 +403,15 @@ export struct DynamicDetailComponent {
           OperRowListView({ contentDetailData: this.contentDetailData
           ,interactData:this.interactDataDTO
           ,newsStatusOfUser:this.newsStatusOfUser
-          ,publishCommentModel: this.publishCommentModel
+          ,publishCommentModel: {
+              targetId: String(this.contentDetailData?.newsId || ''),
+              targetRelId: this.contentDetailData?.reLInfo?.relId,
+              targetTitle: this.contentDetailData?.newsTitle,
+              targetRelType: this.contentDetailData?.reLInfo?.relType,
+              targetRelObjectId: String(this.contentDetailData?.reLInfo?.relObjectId),
+              keyArticle: String(this.contentDetailData?.keyArticle),
+              targetType: String(this.contentDetailData?.newsType),
+            } as publishCommentModel
           ,needLike:false})
         }
       }
@@ -399,17 +431,6 @@ export struct DynamicDetailComponent {
     } catch (exception) {
     console.log('请求失败',JSON.stringify(exception))
     }
-    if (this.contentDetailData.openComment) {
-      this.publishCommentModel = {
-        targetId: String(this.contentDetailData?.newsId || ''),
-        targetRelId: this.contentDetailData?.reLInfo?.relId,
-        targetTitle: this.contentDetailData?.newsTitle,
-        targetRelType: this.contentDetailData?.reLInfo?.relType,
-        targetRelObjectId: String(this.contentDetailData?.reLInfo?.relObjectId),
-        keyArticle: String(this.contentDetailData?.keyArticle),
-        targetType: String(this.contentDetailData?.newsType),
-      } as publishCommentModel
-    }
     this.getBatchAttentionStatus()
     this.getInteractDataStatus()
     this.makeJumpInfo()

@@ -42,10 +42,12 @@ export struct ENewspaperPageComponent {
         console.log("onDateChange-日历选择弹框", "date：", JSON.stringify(date))
         if (date.fullYear && date.month && date.date) {
           let month: number = date.month + 1
-          this.calendarDate = `${date.fullYear}-${month > 9 ? month : '0' + month}-${date.date > 9 ? date.date : '0' + date.date}`
+          this.calendarDate =
+            `${date.fullYear}-${month > 9 ? month : '0' + month}-${date.date > 9 ? date.date : '0' + date.date}`
           this.getNewspaperTime()
           this.getNewspaperList()
-          this.selectDate = new Date(date.fullYear ? date.fullYear : 0, date.month ? date.month : 0, date.date ? date.date : 0)
+          this.selectDate =
+            new Date(date.fullYear ? date.fullYear : 0, date.month ? date.month : 0, date.date ? date.date : 0)
         }
       }
     }),
@@ -81,8 +83,8 @@ export struct ENewspaperPageComponent {
     this.picHeight = this.picWidth * 566 / 378
     //注册字体
     font.registerFont({
-      familyName: 'BebasNeue_Regular',
-      familySrc: $rawfile('font/BebasNeue_Regular.otf')
+      familyName: 'BebasNeueBold',
+      familySrc: $rawfile('font/BebasNeueBold.otf')
     })
     this.getNewspaperTime()
     this.getNewspaperList()
@@ -117,7 +119,7 @@ export struct ENewspaperPageComponent {
             Text(this.calendarDate?.replace('-', '.')?.replace('-', '.'))
               .fontSize($r('app.float.font_size_20'))
               .fontColor($r('app.color.white'))
-              .fontFamily('BebasNeue_Regular')
+              .fontFamily('BebasNeueBold')
               .fontWeight(FontWeight.Regular)
 
             Image($r('app.media.icon_triangle'))
@@ -148,6 +150,7 @@ export struct ENewspaperPageComponent {
               center: { anchor: "__container__", align: VerticalAlign.Center }
             })
             .id('e_newspaper_share')
+            .visibility(Visibility.Hidden)
         }
         .margin({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
         .height($r('app.float.top_bar_height'))
@@ -208,13 +211,15 @@ export struct ENewspaperPageComponent {
             .id('e_newspaper_shadow')
 
           Row() {
-            Text(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? '已到底部，可以选择其他日期' : '滑动查看下一版')
+            Text(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? '已到底部，可以选择其他日期' :
+              '滑动查看下一版')
               .fontColor(Color.White)
               .fontSize($r('app.float.font_size_14'))
             Image($r('app.media.icon_next_page'))
               .width($r('app.float.vp_16'))
               .height($r('app.float.vp_16'))
-              .visibility(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? Visibility.None : Visibility.Visible)
+              .visibility(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? Visibility.None :
+              Visibility.Visible)
           }
           .justifyContent(FlexAlign.Center)
           .margin({ top: $r('app.float.margin_16') })
@@ -232,7 +237,7 @@ export struct ENewspaperPageComponent {
           Text(this.currentPageNum)
             .fontSize($r('app.float.font_size_36'))
             .fontColor($r('app.color.white'))
-            .fontFamily('BebasNeue_Regular')
+            .fontFamily('BebasNeueBold')
           Text('版')
             .fontSize($r('app.float.font_size_16'))
             .fontColor($r('app.color.white'))

-import { Logger, NumberFormatterUtils, DateTimeUtils } from 'wdKit';
+import {
+  Logger,
+  NumberFormatterUtils,
+  DateTimeUtils,
+  EmitterUtils,
+  EmitterEventId,
+  NetworkUtil,
+  DisplayUtils
+} from 'wdKit';
 import {
   Action,
   ContentDetailDTO,
@@ -20,7 +28,7 @@ import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailView
 import { PageRepository } from '../repository/PageRepository';
 import { detailedSkeleton } from './skeleton/detailSkeleton';
 import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
-
+import { EmptyComponent } from '../components/view/EmptyComponent';
 import { CommentComponent } from '../components/comment/view/CommentComponent'
 import { HttpUtils } from 'wdNetwork/Index';
 
@@ -39,6 +47,9 @@ export struct ImageAndTextPageComponent {
   @State isPageEnd: boolean = false
   @State publishTime: string = ''
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
+  @State operationButtonList: string[] = ['comment', 'collect', 'share']
+  @State isNetConnected: boolean = true
+  @State info: Area | null = null
 
   build() {
     Column() {
@@ -83,17 +94,21 @@ export struct ImageAndTextPageComponent {
                 Row() {
                   Row() {
                     if (this.newsStatusOfUser?.likeStatus === '1') {
-                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.ic_like_check') : (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer_active') : $r('app.media.icon_candle_active')))
+                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.ic_like_check') :
+                        (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer_active') :
+                        $r('app.media.icon_candle_active')))
                         .width(24)
                         .height(24)
                         .margin({ right: 5 })
                     } else {
-                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.icon_like') : (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer') : $r('app.media.icon_candle')))
+                      Image(this.contentDetailData[0]?.likesStyle === 1 ? $r('app.media.icon_like') :
+                        (this.contentDetailData[0]?.likesStyle === 2 ? $r('app.media.icon_prayer') :
+                        $r('app.media.icon_candle')))
                         .width(24)
                         .height(24)
                         .margin({ right: 5 })
                     }
-                    if (this.interactData?.likeNum !== '0') {
+                    if (this.interactData?.likeNum != '0') {
                       Text(`${this.interactData?.likeNum}`)
                         .fontSize(16)
                         .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999')
@@ -125,7 +140,11 @@ export struct ImageAndTextPageComponent {
                 Divider().strokeWidth(6).color('#f5f5f5')
                 CommentComponent({
                   publishCommentModel: this.publishCommentModel
+                }).onAreaChange((oldValue: Area, newValue: Area) => {
+                  this.info = newValue
                 })
+                // .onMeasureSize()
+
               }
             }
           }
@@ -135,19 +154,28 @@ export struct ImageAndTextPageComponent {
         .height(CommonConstants.FULL_HEIGHT)
         .padding({ bottom: 76 })
         .scrollBar(BarState.Off)
+        .align(Alignment.Top)
 
+        if (!this.isNetConnected) {
+          EmptyComponent({
+            emptyType: 1,
+            emptyButton: true,
+            retry: () => {
+              this.getDetail()
+            }
+          }).padding({ bottom: 200 })
+        } else {
           if (!this.isPageEnd) {
             detailedSkeleton()
           }
-
+        }
         //底部交互区
-        if (this.contentDetailData?.length) {
         OperRowListView({
           contentDetailData: this.contentDetailData[0],
-            publishCommentModel: this.publishCommentModel
+          publishCommentModel: this.publishCommentModel,
+          operationButtonList: this.operationButtonList,
         })
       }
-      }
 
     }
     .width(CommonConstants.FULL_WIDTH)
@@ -155,6 +183,7 @@ export struct ImageAndTextPageComponent {
   }
 
   private async getDetail() {
+    this.isNetConnected = NetworkUtil.isNetConnected()
     let contentId: string = ''
     let relId: string = ''
     let relType: string = ''
@@ -174,7 +203,8 @@ export struct ImageAndTextPageComponent {
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       if (detailBeans && detailBeans.length > 0) {
         this.contentDetailData = detailBeans;
-        let dateTime = DateTimeUtils.parseDate(this.contentDetailData[0]?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
+        let dateTime =
+          DateTimeUtils.parseDate(this.contentDetailData[0]?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
         this.publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
         if (this.contentDetailData[0]?.recommendShow === 1) {
           this.getRecommend()
@@ -192,17 +222,19 @@ export struct ImageAndTextPageComponent {
           this.publishCommentModel.keyArticle = String(this.contentDetailData[0]?.keyArticle)
           this.publishCommentModel.targetType = String(this.contentDetailData[0]?.newsType)
         }
+        if (this.contentDetailData[0]?.audioList?.length && this.contentDetailData[0]?.audioList[0].audioUrl) {
+          this.operationButtonList = ['comment', 'collect', 'listen', 'share']
+        }
       }
     }
   }
 
   private async getRecommend() {
     let params: postRecommendListParams = {
-      // TODO ?  imei: HttpUtils.getImei()
-      imei: "8272c108-4fa2-34ce-80b9-bc425a7c2a7e",
+      imei: HttpUtils.getImei(),
       userId: HttpUtils.getUserId(),
       contentId: String(this.contentDetailData[0]?.newsId),
-      recType: 1,
+      recType: Number(this.contentDetailData[0]?.reLInfo?.relType),
       contentType: this.contentDetailData[0]?.newsType,
       relId: this.contentDetailData[0]?.reLInfo?.relId,
       channelId: String(this.contentDetailData[0]?.reLInfo?.channelId)
@@ -280,6 +312,24 @@ export struct ImageAndTextPageComponent {
 
   aboutToAppear() {
     this.getDetail()
+    //注册通知，来自别的组件的评论成功通知
+    EmitterUtils.receiveEvent(EmitterEventId.COMMENT_PUBLISH, (targetId?: string) => {
+      if (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 }
+            })
+          }
+        }
+      }
+    })
   }
 
   aboutToDisappear() {

@@ -117,7 +117,7 @@ export struct ImageAndTextWebComponent {
   }
 
   private sendContentData2H5(h5ReceiveAppData: H5ReceiveDetailBean) {
-    Logger.debug('ImageAndTextWebComponent', 'jsCall_receiveAppData');
+    Logger.debug('ImageAndTextWebComponent', 'jsCall_receiveAppData',JSON.stringify(h5ReceiveAppData));
     this.webviewControl.callHandle(NativeCallH5Type.jsCall_receiveAppData,
       JSON.stringify(h5ReceiveAppData), (data: string) => {
         Logger.debug('ImageAndTextWebComponent', "from js data = " + data);

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

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

@@ -150,8 +150,11 @@ export struct SingleColumn999Component {
         scrollBackward: NestedScrollMode.SELF_FIRST
       })
     } else {
+      if (this.compListItem && this.compListItem?.operDataList) {
         EmptyComponent({ emptyHeight: 200 })
       }
+
+    }
   }
 
   // public buildLanes(): number {

@@ -5,7 +5,8 @@ import {
   PhotoListBean,
   postInteractBrowsOperateParams,
   postBatchAttentionStatusParams,
-  postInteractAccentionOperateParams
+  postInteractAccentionOperateParams,
+  Params
 } from 'wdBean';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import display from '@ohos.display';
@@ -13,6 +14,7 @@ import font from '@ohos.font';
 import { OperRowListView } from './view/OperRowListView';
 import { MultiPictureDetailItemComponent } from './MultiPictureDetailItemComponent';
 import { ImageDownloadComponent } from '../components/ImageDownloadComponent';
+import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
 import { EmptyComponent } from './view/EmptyComponent';
 import { DateTimeUtils } from 'wdKit/Index';
 import { HttpUrlUtils } from 'wdNetwork/Index';
@@ -42,6 +44,8 @@ export struct MultiPictureDetailPageComponent {
   private scroller: Scroller = new Scroller()
   @State netStatus: number | undefined = undefined // 存储网络状态用来展示缺省图
   @State showDownload: Boolean = false // 控制是否显示下载默认隐藏
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+  @State operationButtonList: string[] = ['comment', 'like', 'collect', 'share']
 
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
@@ -59,10 +63,10 @@ export struct MultiPictureDetailPageComponent {
     this.picHeight = this.picWidth * 578 / 375
     this.titleHeight = this.screenWidth * 178 / 375
     //注册字体
-    font.registerFont({
-      familyName: 'BebasNeue_Regular',
-      familySrc: $rawfile('font/BebasNeue_Regular.otf')
-    })
+    // font.registerFont({
+    //   familyName: 'BebasNeueBold',
+    //   familySrc: $rawfile('font/BebasNeueBold.otf')
+    // })
     // 注册监听网络连接
     let netStatus = NetworkUtil.isNetConnected()
     if (netStatus) {
@@ -96,19 +100,31 @@ export struct MultiPictureDetailPageComponent {
     if (this.contentDetailData.rmhPlatform == 1) {
       Row() {
         Row({ space: 8 }) {
+          if (this.getImgUrl()){
             Row() {
-            Image(this.contentDetailData?.rmhInfo?.rmhHeadUrl)
+              Image(this.getImgUrl())
                 .borderRadius(24)
                 .aspectRatio(1)
                 .border({ width: 1, color: Color.White, style: BorderStyle.Solid })
-              .alt($r('app.media.picture_loading'))
                 .width(36)
                 .height(36)
                 .objectFit(ImageFit.Fill)
                 .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%')
             .height('100%')
+          }
 
           Row() {
             Flex({
@@ -188,6 +204,7 @@ export struct MultiPictureDetailPageComponent {
         middle: { anchor: "__container__", align: HorizontalAlign.Center }
       })
       .id('e_attention')
+      .visibility(!this.showDownload ? Visibility.Visible : Visibility.None)
     }
     if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length > 0) {
       Swiper(this.swiperController) {
@@ -302,10 +319,9 @@ export struct MultiPictureDetailPageComponent {
         }
         OperRowListView({
           contentDetailData: this.contentDetailData,
+          publishCommentModel: this.publishCommentModel,
+          operationButtonList: this.operationButtonList,
         })
-          .width('100%')
-          .height(56)
-          .border({ width: { top: 0.5 }, color: '#FFFFFF' })
       }
       .visibility(!this.showDownload ? Visibility.Visible : Visibility.None)
       Column(){
@@ -369,10 +385,20 @@ export struct MultiPictureDetailPageComponent {
               statusBarContentColor: '#ffffff',
             })
           }
+          if (this.contentDetailData?.openComment) {
+            this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
+            this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+            this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
+            this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType)
+            this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId)
+            this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle)
+            this.publishCommentModel.targetType = String(this.contentDetailData?.newsType)
+          }
           // this.contentDetailData.photoList = []
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {
             // 暂无内容
             this.netStatus = 0
+            this.operationButtonList = []
             Logger.info(TAG, `this.netStatus：${JSON.stringify(this.netStatus)}`)
           }
           Logger.info(TAG, `contentDetailData：${JSON.stringify(this.contentDetailData)}`)
@@ -387,12 +413,17 @@ export struct MultiPictureDetailPageComponent {
           Logger.info(TAG, `fetchDetailData then,err: ${JSON.stringify(err)}`);
           // 内容获取失败
           this.netStatus = 9
+          this.operationButtonList = []
         })
     } catch (exception) {
 
     }
   }
 
+  getImgUrl() {
+    return this.contentDetailData?.rmhInfo?.rmhHeadUrl || this.contentDetailData?.userInfo?.userHeadUrl
+  }
+
   //  记录浏览历史
   private getInteractBrowsOperate() {
     try {

@@ -7,6 +7,7 @@ import { detailedSkeleton } from './skeleton/detailSkeleton'
 import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5Type';
 import { OperRowListView } from './view/OperRowListView';
 import DetailViewModel from '../viewmodel/DetailViewModel';
+import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
 
 const TAG: string = 'SpacialTopicPageComponent'
 
@@ -21,6 +22,7 @@ export struct SpacialTopicPageComponent {
   private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
   private webPrepared = false;
   private dataPrepared = false;
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
 
   private trySendData2H5() {
     if (!this.webPrepared || !this.dataPrepared) {
@@ -61,6 +63,15 @@ export struct SpacialTopicPageComponent {
       let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)
       if (detailBeans && detailBeans.length > 0) {
         this.contentDetailData = detailBeans;
+        if (this.contentDetailData[0]?.openComment) {
+          this.publishCommentModel.targetId = String(this.contentDetailData[0]?.newsId || '')
+          this.publishCommentModel.targetRelId = String(this.contentDetailData[0]?.reLInfo?.relId)
+          this.publishCommentModel.targetTitle = this.contentDetailData[0]?.newsTitle
+          this.publishCommentModel.targetRelType = String(this.contentDetailData[0]?.reLInfo?.relType)
+          this.publishCommentModel.targetRelObjectId = String(this.contentDetailData[0]?.reLInfo?.relObjectId)
+          this.publishCommentModel.keyArticle = String(this.contentDetailData[0]?.keyArticle)
+          this.publishCommentModel.targetType = String(this.contentDetailData[0]?.newsType)
+        }
         this.trySendData2H5()
       }
     }
@@ -80,13 +91,15 @@ export struct SpacialTopicPageComponent {
         }
         .width(CommonConstants.FULL_WIDTH)
         .height(CommonConstants.FULL_HEIGHT)
-        .padding({ bottom: 126 })
 
         if (!this.isPageEnd) {
           detailedSkeleton()
         }
         //底部交互区
-        OperRowListView({ contentDetailData: this.contentDetailData[0] })
+          OperRowListView({
+            contentDetailData: this.contentDetailData[0],
+            publishCommentModel: this.publishCommentModel
+          })
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
   }

@@ -110,7 +110,7 @@ export struct RMCalendar {
           if (this.onDateChange) {
             this.onDateChange(item)
             if (item.fullYear && item.month) {
-              this.title = `${item.fullYear}年${item.month + 1}月`
+              this.title = `${item.fullYear}年${this.getMonthStr(item.month + 1)}月`
             }
           }
         }
@@ -191,18 +191,20 @@ export struct RMCalendar {
    */
   private calcData() {
 
-    this.title = `${this.selectDay.getFullYear()}年${this.selectDay.getMonth() + 1}月`
+    this.title = `${this.selectDay.getFullYear()}年${this.getMonthStr(this.selectDay.getMonth() + 1)}月`
     this.selectDay.setDate(1)
 
     if (this.selectDay.getFullYear() < this.startDate.getFullYear()
-      || (this.selectDay.getFullYear() == this.startDate.getFullYear() && this.selectDay.getMonth() <= this.startDate.getMonth())) {
+      || (this.selectDay.getFullYear() == this.startDate.getFullYear() &&
+        this.selectDay.getMonth() <= this.startDate.getMonth())) {
       this.hasPre = false
     } else {
       this.hasPre = true
     }
 
     if (this.selectDay.getFullYear() > this.endDate.getFullYear()
-      || (this.selectDay.getFullYear() == this.endDate.getFullYear() && this.selectDay.getMonth() >= this.endDate.getMonth())) {
+      || (this.selectDay.getFullYear() == this.endDate.getFullYear() &&
+        this.selectDay.getMonth() >= this.endDate.getMonth())) {
       this.hasNext = false
     } else {
       this.hasNext = true
@@ -274,7 +276,8 @@ export struct RMCalendar {
             Text(this.title)
               .fontSize(this.titleFontSize)
               .fontColor(this.titleFontColor)
-              .fontWeight(this.titleFontWeight)
+              .fontWeight(600)
+              .fontFamily('PingFang SC-Semibold')
           }
 
           Blank()
@@ -318,7 +321,22 @@ export struct RMCalendar {
         left: 35,
         right: 35
       })
+      .padding(
+        { bottom: 20 })
       .border({ radius: 4 })
     }
   }
+
+  getMonthStr(month?: number): string {
+    if (!month) {
+      return ''
+    }
+    if (month <= 0) {
+      return ''
+    }
+    if (month <= 9) {
+      return '0' + month
+    }
+    return month + ''
+  }
 }
\ No newline at end of file

@@ -100,7 +100,7 @@ export struct RMCalenderCell {
             .fontSize(this.itemFontSize)
             .fontColor(this.getItemColor())
             .fontWeight(this.itemFontWeight)
-            .fontFamily('BebasNeue_Regular')
+            .fontFamily('BebasNeueBold')
         }
       }
       // .justifyContent(FlexAlign.Center)

@@ -16,12 +16,12 @@ export struct CardMediaInfo {
 
   build() {
     Row() {
-      if (this.contentDTO.objectType === '1' || this.contentDTO.objectType === '15') {
+      if (this.contentDTO?.objectType === '1' || this.contentDTO?.objectType === '15') {
         // 点播、动态视频
         Row() {
           Image($r('app.media.card_play'))
             .mediaLogo()
-          if(this.contentDTO.videoInfo!=null){
+          if (this.contentDTO.videoInfo != null) {
             Text(DateTimeUtils.getFormattedDuration(this.contentDTO.videoInfo.videoDuration * 1000))
               .mediaText()
           }
@@ -30,23 +30,23 @@ export struct CardMediaInfo {
         // liveInfo.liveState 直播新闻-直播状态 wait待开播running直播中end已结束cancel已取消paused暂停
         // 显示直播信息
         Row() {
-          if(this.contentDTO.liveInfo.liveState === 'wait') {
+          if (this.contentDTO?.liveInfo?.liveState === 'wait') {
             Image($r('app.media.card_wait'))
               .mediaLogo()
             Text('预约')
               .mediaText()
-          } else if (this.contentDTO.liveInfo.liveState === 'running') {
+          } else if (this.contentDTO?.liveInfo?.liveState === 'running') {
             Image($r('app.media.card_live'))
               .mediaLogo()
             Text('直播中')
               .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'))
               .mediaLogo()
             Text('回看')
               .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'))
             //   .mediaLogo()
             Text('直播结束')
@@ -69,6 +69,15 @@ export struct CardMediaInfo {
           Text(DateTimeUtils.getFormattedDuration(this.contentDTO.voiceInfo.voiceDuration * 1000))
             .mediaText()
         }
+      } else if (this.contentDTO.objectType === '4') {//广告标签
+        Text($r('app.string.comp_advertisement'))
+          .fontSize('10fp')
+          .fontColor($r('app.color.white'))
+          .width(28)
+          .height(16)
+          .backgroundColor('#4D000000')
+          .borderRadius(3)
+          .textAlign(TextAlign.Center)
       }
     }
     .margin(6)

@@ -28,7 +28,7 @@ export struct CardSourceInfo {
           .textOverflow({ overflow: TextOverflow.Ellipsis })
       }
       // 新闻tab下的卡片，2天之前的不显示时间。但是如果是搜索情况下展示的卡片，显示时间
-      if (this.contentDTO.isSearch || !this.contentDTO.isSearch && DateTimeUtils.getCommentTime
+      if (this.contentDTO.isSearch || this.contentDTO.isCollection || !this.contentDTO.isSearch && DateTimeUtils.getCommentTime
       (Number
         .parseFloat(this
           .contentDTO.publishTime))

@@ -30,7 +30,7 @@ export struct LiveFollowComponent {
     Stack() {
       Stack()
         .height(22)
-        .width(130)
+        .width(150)
         .backgroundColor('#000000')
         .opacity(0.3)
         .borderRadius({
@@ -71,7 +71,7 @@ export struct LiveFollowComponent {
           })
       }
       .height(22)
-      .width(130)
+      .width(150)
     }
   }
 

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

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

-//全标题 "appStyle":"2",
-import { CompDTO, ContentDTO } from 'wdBean';
+import { CompDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import PageModel from '../../viewmodel/PageModel';
+import { CardAdvBottom } from './CardAdvBottom';
 
 const TAG: string = 'Card2Component';
 
@@ -17,28 +16,34 @@ const TAG: string = 'Card2Component';
  */
 @Component
 export struct CardAdvBigImageComponent {
-
   @State compDTO: CompDTO = {} as CompDTO
-
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
 
-    console.error('ZZZXXXXX', '----大图卡----aboutToAppear-----')
   }
 
   aboutToDisappear(): void {
 
-    console.error('ZZZXXXXX', '---大图卡-----aboutToDisappear-----')
   }
 
   build() {
 
     Column() {
-      Text(this.compDTO.matInfo.advTitle)
-        .fontSize($r('app.float.font_size_17'))
-        .fontColor($r('app.color.color_222222'))
-        .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .align(Alignment.Start)
+
+      //新闻标题
+      Text(this.compDTO.matInfo.advTitle).bottomTextStyle().margin({ bottom: 8, })
+      //大图
+      Image(this.compDTO.matInfo.matImageUrl[0])
+        .width(CommonConstants.FULL_WIDTH)
+        .aspectRatio(16 / 9)
+        .borderRadius(4)
+        .borderWidth(0.5)
+        .borderColor($r('app.color.color_0D000000'))
+        .width(CommonConstants.FULL_WIDTH)
+
+      CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({
+        top: 8,
+      })
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({
@@ -48,13 +53,21 @@ export struct CardAdvBigImageComponent {
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     .onClick((event: ClickEvent) => {
-      //ProcessUtils.processPage(this.contentDTO)
+      ProcessUtils.openAdvDetail(this.compDTO.matInfo)
     })
   }
 }
 
+/*
+   标题样式
+ */
 @Extend(Text)
 function bottomTextStyle() {
-  .fontSize(12)
-  .fontColor('#B0B0B0')
+  .fontSize('18fp')
+  .fontColor($r('app.color.color_222222'))
+  .maxLines(3)
+  .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
+  .align(Alignment.Start)
+  .width('100%')
+  .lineHeight(25)
 }
\ No newline at end of file

 import { CompDTO } from 'wdBean/Index';
+import { Logger } from 'wdKit/Index';
+import PageModel from '../../viewmodel/PageModel';
 
 /**
  * @Description: 广告稿件 底部标签+删除按钮
@@ -10,7 +12,8 @@ import { CompDTO } from 'wdBean/Index';
  */
 @Component
 export struct CardAdvBottom {
-  @State compDTO: CompDTO = {} as CompDTO;
+  pageModel: PageModel = new PageModel();
+  @State compDTO: CompDTO = {} as CompDTO
 
   build() {
 
@@ -36,6 +39,30 @@ export struct CardAdvBottom {
       .borderColor($r('app.color.color_EDEDED'))
       .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)
+      }
+    }
   }
 }
\ No newline at end of file

 //全标题 "appStyle":"2",
 import { CompDTO, ContentDTO } from 'wdBean';
+import { AdvExtraData, AdvExtraItemData } from 'wdBean/src/main/ets/bean/adv/AdvExtraData';
+import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardAdvTop } from './CardAdvTop';
 
 const TAG: string = 'Card2Component';
 
@@ -17,44 +21,150 @@ const TAG: string = 'Card2Component';
  */
 @Component
 export struct CardAdvGanMiComponent {
-
   @State compDTO: CompDTO = {} as CompDTO
+  @State advExtraData: AdvExtraData = {} as AdvExtraData
+  @State advLength: number = 0;
+  pageModel: PageModel = new PageModel();
 
   aboutToAppear(): void {
 
-    console.error('ZZZXXXXX', '--冠名广告------aboutToAppear-----')
+    let extraData = this.compDTO.matInfo.extraData
+    let labelDTO = JSON.parse(extraData) as AdvExtraData
+    this.advExtraData = labelDTO
+    //this.advExtraData.item = [this.advExtraData.item[0]]
+    // this.advExtraData.item[2].title ="我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国我爱你中国"
+    this.advLength = this.advExtraData.item.length
   }
 
   aboutToDisappear(): void {
 
-    console.error('ZZZXXXXX', '--冠名广告------aboutToDisappear-----')
   }
 
   build() {
 
     Column() {
-      Text(this.compDTO.matInfo.advTitle)
-        .fontSize($r('app.float.font_size_17'))
+
+
+      Row() {
+        Stack() {
+          //长图
+          Image(this.advExtraData.itemTopImage)
+            .width(CommonConstants.FULL_WIDTH)
+            .aspectRatio(343 / 40)
+            .borderRadius(4)
+            .borderWidth(0.5)
+            .borderColor($r('app.color.color_0D000000'))
+
+          // 广告标签和删除功能
+          CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO })
+        }
+        .alignContent(Alignment.Top)
+        .width(CommonConstants.FULL_WIDTH)
+      }.width('100%').padding({
+        left: $r('app.float.card_comp_pagePadding_lf'),
+        right: $r('app.float.card_comp_pagePadding_lf'),
+      })
+
+
+      //
+      List({ space: 8 }) {
+
+        ForEach(this.advExtraData.item, (content: AdvExtraItemData, index: number) => {
+
+          ListItem() {
+            // 广告列表信息
+            Column() {
+
+              Image(content.image)
+                .width('100%')
+                .aspectRatio(150 / 84)
+                .borderWidth(0.5)
+                .borderColor($r('app.color.color_0D000000'))
+                .borderRadius(4)
+
+              Text(content.title)
+                .fontSize('16fp')
                 .fontColor($r('app.color.color_222222'))
+                .fontSize('15fp')
                 .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .align(Alignment.Start)
+                .lineHeight(20)
+                .textOverflow({ overflow: TextOverflow.Ellipsis })
+                .width('100%')
+                .margin({ top: 8 })
+
+            }
+            .width(this.advLength >= 3 ? 150 : this.advLength == 2 ? 210 : '100%')
+            .margin({ left: index === 0 ? this.advLength == 1 ? 0 : 16 : 0 })
+            .onClick(() => {
+
+              let matInfo: CompAdvMatInfoBean = {
+                linkUrl: content.linkUrl,
+                linkType: content.linkType
+              } as CompAdvMatInfoBean;
+              ProcessUtils.openAdvDetail(matInfo)
+
+            })
+
+          }
+
+        })
+
+      }
+      .width('100%')
+      .listDirection(Axis.Horizontal)
+      .edgeEffect(EdgeEffect.None)
+      .scrollBar(BarState.Off)
+      // .contentStartOffset(this.advLength == 1 ? 0 : 16)
+      .contentEndOffset(this.advLength == 1 ? 0 : 16)
+      .margin({ top: 10, bottom: 10 })
+      .padding({
+        left: this.advLength == 1 ? 16 : 0,
+        right: this.advLength == 1 ? 16 : 0,
+      })
+
+      // 更多按钮
+      commonButton(this.advExtraData)
+
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({
-      left: $r('app.float.card_comp_pagePadding_lf'),
-      right: $r('app.float.card_comp_pagePadding_lf'),
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
-    .onClick((event: ClickEvent) => {
-      //ProcessUtils.processPage(this.contentDTO)
-    })
+
   }
 }
 
-@Extend(Text)
-function bottomTextStyle() {
-  .fontSize(12)
-  .fontColor('#B0B0B0')
+/*
+   标题样式
+ */
+@Builder
+function commonButton(advExtraData: AdvExtraData) {
+
+
+  Row() {
+    Row() {
+      Blank()
+      Text('查看更多').fontColor('#222222').fontSize('14fp')
+      Image($r('app.media.icon_comp_more_right_red')).width(16).height(16)
+      Blank()
+
+    }
+    .width('100%')
+    .backgroundColor('#F5F5F5')
+    .borderRadius(3)
+    .padding({ top: 10, bottom: 10, })
+    .onClick(() => {
+      let matInfo: CompAdvMatInfoBean = {
+        linkUrl: advExtraData.itemMore.linkUrl,
+        linkType: advExtraData.itemMore.linkType
+      } as CompAdvMatInfoBean;
+      ProcessUtils.openAdvDetail(matInfo)
+    })
+  }.width('100%').padding({
+    left: $r('app.float.card_comp_pagePadding_lf'),
+    right: $r('app.float.card_comp_pagePadding_lf'),
+
+  })
+
 }
\ No newline at end of file

 //全标题 "appStyle":"2",
-import { CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants } from 'wdConstant/Index';
+import { CompDTO } from 'wdBean';
+import { CommonConstants, CompStyle } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import PageModel from '../../viewmodel/PageModel';
+import { CardAdvBottom } from './CardAdvBottom';
 
 const TAG: string = 'Card2Component';
 
@@ -17,28 +17,36 @@ const TAG: string = 'Card2Component';
  */
 @Component
 export struct CardAdvLongImageComponent {
-
   @State compDTO: CompDTO = {} as CompDTO
+  @State haveTitle: boolean = true
+  pageModel: PageModel = new PageModel();
 
   aboutToAppear(): void {
-
-    console.error('ZZZXXXXX', '--长通栏广告 和 顶部长通栏广告------aboutToAppear-----')
+    this.haveTitle = this.compDTO.matInfo.advSubType === CompStyle.Card_Adv_7;
   }
 
   aboutToDisappear(): void {
 
-    console.error('ZZZXXXXX', '--长通栏广告 和 顶部长通栏广告------aboutToDisappear-----')
   }
 
   build() {
 
     Column() {
-      Text(this.compDTO.matInfo.advTitle)
-        .fontSize($r('app.float.font_size_17'))
-        .fontColor($r('app.color.color_222222'))
-        .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .align(Alignment.Start)
+      //新闻标题
+      if (this.haveTitle) {
+        Text(this.compDTO.matInfo.advTitle).width('100%').bottomTextStyle().margin({ bottom: 8, })
+      }
+      //长图
+      Image(this.compDTO.matInfo.matImageUrl[0])
+        .width(CommonConstants.FULL_WIDTH)
+        .aspectRatio(343 / 96)
+        .borderRadius(4)
+        .borderWidth(0.5)
+        .borderColor($r('app.color.color_0D000000'))
+
+      CardAdvBottom({ pageModel: this.pageModel, compDTO:this.compDTO }).margin({
+        top: 8,
+      })
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({
@@ -48,13 +56,20 @@ export struct CardAdvLongImageComponent {
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     .onClick((event: ClickEvent) => {
-      //ProcessUtils.processPage(this.contentDTO)
+      ProcessUtils.openAdvDetail(this.compDTO.matInfo)
     })
   }
 }
 
+/*
+   标题样式
+ */
 @Extend(Text)
 function bottomTextStyle() {
-  .fontSize(12)
-  .fontColor('#B0B0B0')
+  .fontSize('18fp')
+  .fontColor($r('app.color.color_222222'))
+  .maxLines(3)
+  .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
+  .align(Alignment.Start)
+  .lineHeight(25)
 }
\ No newline at end of file

@@ -5,6 +5,7 @@ import { ProcessUtils } from 'wdRouter';
 import measure from '@ohos.measure';
 import { DisplayUtils } from 'wdKit/Index';
 import { CardAdvBottom } from './CardAdvBottom';
+import PageModel from '../../viewmodel/PageModel';
 
 const TAG: string = 'CardAdvSmallImageComponent';
 
@@ -20,10 +21,9 @@ const TAG: string = 'CardAdvSmallImageComponent';
 export struct CardAdvSmallImageComponent {
   @State compDTO: CompDTO = {} as CompDTO
   @State isBigThreeLine: boolean = false // 标题的行数大于等于3行 是true
-
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
 
-    console.error('ZZZXXXXX', '----小图卡----aboutToAppear-----')
     // 计算标题文本行数
     let screenWith = DisplayUtils.getDeviceWidth();
     screenWith = screenWith * 0.62
@@ -33,7 +33,6 @@ export struct CardAdvSmallImageComponent {
 
   aboutToDisappear(): void {
 
-    console.error('ZZZXXXXX', '---小图卡-----aboutToDisappear-----')
   }
 
   build() {
@@ -62,6 +61,7 @@ export struct CardAdvSmallImageComponent {
         .borderWidth(0.5)
         .borderColor($r('app.color.color_0D000000'))
         .borderRadius(4)
+        //.alt('wwww.baidu.com')
         .alignRules({
           top: { anchor: 'title_name', align: VerticalAlign.Top },
           left: { anchor: 'title_name', align: HorizontalAlign.End },
@@ -69,7 +69,7 @@ export struct CardAdvSmallImageComponent {
         .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 },
         right: { anchor: this.isBigThreeLine ? '' : 'adv_imag', align: HorizontalAlign.Start },
         top: { anchor: this.isBigThreeLine ? 'title_name' : '', align: VerticalAlign.Bottom },

@@ -2,6 +2,7 @@
 import { CompDTO, ContentDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
 import { CardAdvBottom } from './CardAdvBottom';
@@ -19,15 +20,13 @@ const TAG: string = 'Card2Component';
 @Component
 export struct CardAdvThreeImageComponent {
   @State compDTO: CompDTO = {} as CompDTO
-
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
 
-    console.error('ZZZXXXXX', '---三图卡-----aboutToAppear-----')
   }
 
   aboutToDisappear(): void {
 
-    console.error('ZZZXXXXX', '----三图卡----aboutToDisappear-----')
   }
 
   build() {
@@ -65,7 +64,7 @@ export struct CardAdvThreeImageComponent {
         .margin({ top: 8 })
 
         //  广告工具组件
-        CardAdvBottom().width('100%').margin({ top: 8 })
+        CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).width('100%').margin({ top: 8 })
       }
       .width('100%')
       .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)
+      }
+    }
+  }
+}
\ No newline at end of file

 //全标题 "appStyle":"2",
-import { CompDTO, ContentDTO } from 'wdBean';
+import { CompDTO, ContentDTO, VideoInfoDTO } from 'wdBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
+import PageModel from '../../viewmodel/PageModel';
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import { CardAdvBottom } from './CardAdvBottom';
 
 const TAG: string = 'Card2Component';
 
@@ -17,28 +19,45 @@ const TAG: string = 'Card2Component';
  */
 @Component
 export struct CardAdvVideoComponent {
-
   @State compDTO: CompDTO = {} as CompDTO
-
+  @State contentDTO: ContentDTO = {} as ContentDTO
+  pageModel: PageModel = new PageModel();
   aboutToAppear(): void {
 
-    console.error('ZZZXXXXX', '--视频广告------aboutToAppear-----')
+    // this.contentDTO.objectType = '1'
+    // this.contentDTO.videoInfo = { videoDuration: 1000 } as VideoInfoDTO
   }
 
   aboutToDisappear(): void {
 
-    console.error('ZZZXXXXX', '---视频广告-----aboutToDisappear-----')
   }
 
   build() {
 
     Column() {
-      Text(this.compDTO.matInfo.advTitle)
-        .fontSize($r('app.float.font_size_17'))
-        .fontColor($r('app.color.color_222222'))
-        .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .align(Alignment.Start)
+
+      //新闻标题
+      Text(this.compDTO.matInfo.advTitle).bottomTextStyle()
+      //大图
+      Stack() {
+        Image(this.compDTO.matInfo.matImageUrl[0])
+          .width(CommonConstants.FULL_WIDTH)
+          .aspectRatio(16 / 9)
+          .borderRadius(4)
+          .borderWidth(0.5)
+          .borderColor($r('app.color.color_0D000000'))
+        //播放状态+时长
+        CardMediaInfo({
+          contentDTO: this.contentDTO
+        })
+      }
+      .alignContent(Alignment.BottomEnd)
+      .width(CommonConstants.FULL_WIDTH)
+      .margin({ top: 8 })
+
+      CardAdvBottom({pageModel:this.pageModel,compDTO:this.compDTO}).margin({
+        top: 8,
+      })
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({
@@ -48,13 +67,21 @@ export struct CardAdvVideoComponent {
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
     .onClick((event: ClickEvent) => {
-      //ProcessUtils.processPage(this.contentDTO)
+      ProcessUtils.openAdvDetail(this.compDTO.matInfo)
     })
   }
 }
 
+/*
+   标题样式
+ */
 @Extend(Text)
 function bottomTextStyle() {
-  .fontSize(12)
-  .fontColor('#B0B0B0')
+  .fontSize('18fp')
+  .fontColor($r('app.color.color_222222'))
+  .maxLines(3)
+  .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
+  .align(Alignment.Start)
+  .width('100%')
+  .lineHeight(25)
 }
\ No newline at end of file

-//全标题 "appStyle":"2",
-import { CompDTO, ContentDTO } from 'wdBean';
+import { CompDTO } from 'wdBean';
+import { AdvExtraData, AdvExtraItemData } from 'wdBean/src/main/ets/bean/adv/AdvExtraData';
+import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
+import PageModel from '../../viewmodel/PageModel';
+import { CardAdvTop } from './CardAdvTop';
 
 const TAG: string = 'Card2Component';
 
 /**
- * @Description:    广告---冠名广告
+ * @Description: 广告---展会广告
  * @Author:
  * @Email: liyubing@wondertek.com.cn
  * @CreateDate:
@@ -17,28 +18,64 @@ const TAG: string = 'Card2Component';
  */
 @Component
 export struct CardAdvVideoExComponent {
-
   @State compDTO: CompDTO = {} as CompDTO
+  @State advExtraData: AdvExtraData = {} as AdvExtraData
+  pageModel: PageModel = new PageModel();
 
   aboutToAppear(): void {
 
-    console.error('ZZZXXXXX', '--冠名广告------aboutToAppear-----')
+
+    let extraData = this.compDTO.matInfo.extraData
+    let labelDTO = JSON.parse(extraData) as AdvExtraData
+    this.advExtraData = labelDTO
   }
 
   aboutToDisappear(): void {
 
-    console.error('ZZZXXXXX', '----冠名广告----aboutToDisappear-----')
   }
 
   build() {
 
     Column() {
-      Text(this.compDTO.matInfo.advTitle)
-        .fontSize($r('app.float.font_size_17'))
-        .fontColor($r('app.color.color_222222'))
-        .maxLines(3)
-        .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
-        .align(Alignment.Start)
+
+      Stack() {
+        //长图
+        Image(this.advExtraData.itemTopImage)
+          .width(CommonConstants.FULL_WIDTH)
+          .aspectRatio(343 / 80)
+          .borderRadius(4)
+          .borderWidth(0.5)
+          .borderColor($r('app.color.color_0D000000'))
+
+
+        CardAdvTop({ pageModel: this.pageModel, compDTO: this.compDTO })
+      }
+      .alignContent(Alignment.Top)
+      .width(CommonConstants.FULL_WIDTH)
+
+      //
+      List({ space: 10 }) {
+
+        ForEach(this.advExtraData.item, (content: AdvExtraItemData) => {
+
+          ListItem() {
+
+            Text(content.title).fontSize('16fp').fontColor($r('app.color.color_222222')).width('100%').onClick(() => {
+              let matInfo: CompAdvMatInfoBean = {
+                linkUrl: content.linkUrl,
+                linkType: content.linkType
+              } as CompAdvMatInfoBean;
+              ProcessUtils.openAdvDetail(matInfo)
+            })
+          }
+
+        })
+
+      }.width('100%').listDirection(Axis.Vertical).margin({ top: 10, bottom: 10 })
+
+      // 更多按钮
+      commonButton(this.advExtraData)
+
     }
     .width(CommonConstants.FULL_WIDTH)
     .padding({
@@ -47,14 +84,33 @@ export struct CardAdvVideoExComponent {
       top: $r('app.float.card_comp_pagePadding_tb'),
       bottom: $r('app.float.card_comp_pagePadding_tb')
     })
-    .onClick((event: ClickEvent) => {
-      //ProcessUtils.processPage(this.contentDTO)
-    })
+
   }
 }
 
-@Extend(Text)
-function bottomTextStyle() {
-  .fontSize(12)
-  .fontColor('#B0B0B0')
+/*
+   标题样式
+ */
+@Builder
+function commonButton(advExtraData: AdvExtraData) {
+
+
+  Row() {
+    Blank()
+    Text('查看更多').fontColor('#222222').fontSize('14fp')
+    Image($r('app.media.icon_comp_more_right_red')).width(16).height(16)
+    Blank()
+
+  }
+  .width('100%')
+  .backgroundColor('#F5F5F5')
+  .borderRadius(3)
+  .padding({ top: 10, bottom: 10, })
+  .onClick(() => {
+    let matInfo: CompAdvMatInfoBean = {
+      linkUrl: advExtraData.itemMore.linkUrl,
+      linkType: advExtraData.itemMore.linkType
+    } as CompAdvMatInfoBean;
+    ProcessUtils.openAdvDetail(matInfo)
+  })
 }
\ No newline at end of file

 import { ContentDTO, slideShows } from 'wdBean';
-import { CommonConstants } from 'wdConstant'
-import { DateTimeUtils } from 'wdKit';
+import { CommonConstants } from 'wdConstant';
 import { ProcessUtils } from 'wdRouter';
-import { CardSourceInfo } from '../cardCommon/CardSourceInfo'
-import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
+import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
+import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
 
 /**
  * 大专题卡--CompStyle:  10
@@ -110,12 +109,23 @@ export struct Card10Component {
 
       // 右侧图片
       if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
+        Stack() {
           Image(item.fullColumnImgUrls[0].url)
             .width(117)
             .height(78)
             .objectFit(ImageFit.Cover)
             .borderRadius($r('app.float.image_border_radius'))
             .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 })

 import { ContentDTO, slideShows } from 'wdBean';
-import { CommonConstants } from 'wdConstant'
+import { CommonConstants } from 'wdConstant';
 import { DateTimeUtils } from 'wdKit';
 import { ProcessUtils } from 'wdRouter';
 
@@ -104,10 +104,12 @@ export struct Card9Component {
         Column() {
           Row() {
             // 标题
-            Image($r("app.media.timeline_rect"))
+            Image($r("app.media.timeAxis"))
               .width(9)
               .height(9)
               .margin({ right: 5 })
+              .fillColor(item.newsTitleColor)
+
             Text(DateTimeUtils.formatDate(item.publishTime, "MM月dd日 HH:mm"))
               .fontSize($r('app.float.font_size_12'))
               .fontColor($r('app.color.color_222222'))

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

@@ -9,8 +9,9 @@ import measure from '@ohos.measure'
 import { CommentCustomDialog } from './CommentCustomDialog'
 import { publishCommentModel } from '../model/PublishCommentModel';
 import { ifaa } from '@kit.OnlineAuthenticationKit';
-import { HttpUrlUtils } from 'wdNetwork/Index';
+import { HttpUrlUtils, HttpUtils } from 'wdNetwork/Index';
 import NoMoreLayout from '../../page/NoMoreLayout';
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 
 const TAG = 'CommentComponent';
 
@@ -25,6 +26,10 @@ export struct CommentComponent {
   // @State private browSingModel: commentListModel = new commentListModel()
   /*必传*/
   @ObjectLink publishCommentModel: publishCommentModel
+
+  listScroller: ListScroller = new ListScroller(); // scroller控制器
+  historyOffset: number = 0; // 上次浏览到列表距离顶端的偏移量offset
+
   isloading: boolean = false
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
   @State dialogController: CustomDialogController | null = null;
@@ -69,11 +74,12 @@ export struct CommentComponent {
 
   //
   addCommentLocal() {
-    let model = commentViewModel.deepCopyCommentItemModel(this.publishCommentModel.lastCommentModel)
+    // let model = commentViewModel.deepCopyCommentItemModel(this.publishCommentModel.lastCommentModel)
+    let model = this.publishCommentModel.lastCommentModel
     /*一级评论*/
+    // if (this.publishCommentModel.lastCommentModel)
     if (this.publishCommentModel.lastCommentModel.parentId == '-1') {
       this.allDatas.addFirstItem(model)
-      //TODO 跳转顶部
     } else {
       //二级评论
       this.allDatas.getDataArray().forEach(element => {
@@ -134,7 +140,7 @@ export struct CommentComponent {
 
   build() {
     Column() {
-      List() {
+      List({scroller:this.listScroller}) {
         ListItemGroup({ header: this.titleHeader() })
 
         LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
@@ -176,7 +182,6 @@ export struct CommentComponent {
           if (this.hasMore === false) NoMoreLayout()
         }
       }
-
       .onReachEnd(()=>{
         if (this.hasMore) {
           this.getData()
@@ -552,6 +557,12 @@ struct commentFooterView {
 
       }
       .onClick(() => {
+        // 未登录，跳转登录
+        const user_id = HttpUtils.getUserId()
+        if (!user_id) {
+          WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+          return
+        }
         commentLikeChange(this.item)
         commentViewModel.commentLike(this.item).then(() => {
         }).catch(() => {

@@ -7,17 +7,17 @@ import commentViewModel from '../viewmodel/CommentViewModel'
 @Preview
 @CustomDialog
 export struct CommentCustomDialog {
-
   @ObjectLink publishCommentModel: publishCommentModel
   controller?: CustomDialogController
   confirm: (value: Record<string, string>) => void = () => {
   }
   @State private emojiSwitch: boolean = false
   textInputController: TextAreaController = new TextAreaController()
+  @State positionInfo: CaretOffset = { index: 0, x: 0, y: 0 }
 
   aboutToAppear(): void {
 
-
+    // this.textInputController.caretPosition(0)
   }
 
   publishCommentRequest() {
@@ -25,9 +25,11 @@ export struct CommentCustomDialog {
     // this.publishCommentModel.commentContent = this.commentText
     //TODO 判断类型
     this.publishCommentModel.commentType = '2'
-    commentViewModel.publishComment(this.publishCommentModel).then((model:commentItemModel) => {
+    commentViewModel.publishComment(this.publishCommentModel).then((model: commentItemModel) => {
       this.publishCommentModel.commentContent = ''
-      this.publishCommentModel.lastCommentModel = model
+      //
+
+      this.publishCommentModel.lastCommentModel = commentViewModel.deepCopyCommentItemModel(model)
       // this.commentText = ''
       if (this.controller != null) {
         this.controller.close()
@@ -72,12 +74,13 @@ export struct CommentCustomDialog {
               .height(30)
               .onClick(() => {
 
-                // this.commentText = this.commentText + '神鼎'
+                this.positionInfo = this.textInputController.getCaretOffset()
+
                 this.emojiSwitch = !this.emojiSwitch
                 if (this.emojiSwitch) {
                   this.textInputController.stopEditing()
                 } else {
-                  this.textInputController.caretPosition(this.textInputController.getTextContentRect().x)
+                  // this.textInputController.caretPosition(this.textInputController.getTextContentRect().x)
                 }
 
               })
@@ -114,7 +117,7 @@ export struct CommentCustomDialog {
 
       //表情view
       if (this.emojiSwitch) {
-        emojiView()
+        emojiView({ publishCommentModel: this.publishCommentModel }).height(150)
       }
 
     }.backgroundColor(Color.White)
@@ -127,8 +130,88 @@ export struct CommentCustomDialog {
 
 @Component
 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() {
+
+    // 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;
 }
 
 

@@ -44,7 +44,10 @@ export struct CommentTabComponent {
       }
     }.width(151).height(30)
     .onClick(() => {
+
+      this.publishCommentModel.rootCommentId = '-1';
       this.publishCommentModel.parentId = '-1';
+      this.publishCommentModel.placeHolderText = "优质评论会获得最佳评论人的称号"
       this.dialogController?.open();
     })
   }

@@ -71,6 +71,7 @@ export struct LiveCommentComponent {
             left: 6,
             right: 2
           })
+          .visibility(this.heartNum > 0 ? Visibility.Visible : Visibility.Hidden)
         Image(this.isLike ? $r('app.media.icon_like_selected_redheart') : $r('app.media.iv_live_heart_normal'))
           .width(24)
           .height(24)

 import { ViewType } from 'wdConstant/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 { 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 { EmptyComponent , WDViewDefaultType} from '../../view/EmptyComponent'
-import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh'
+import { EmptyComponent, WDViewDefaultType } from '../../view/EmptyComponent'
 import NoMoreLayout from '../../page/NoMoreLayout'
+import { CommentCustomDialog } from './CommentCustomDialog'
+import { publishCommentModel } from '../model/PublishCommentModel'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 
 const TAG = 'QualityCommentsComponent';
 
@@ -24,9 +23,6 @@ export struct QualityCommentsComponent {
   @State hasMore: boolean = true;
   @State  currentPage: number = 1;
   private scroller: Scroller = new Scroller();
-
-
-
   @State tileOpacity: number = 0;
   firstPositionY: number = 0;
   bottomSafeHeight: string = AppStorage.get<number>('bottomSafeHeight') + 'px';
@@ -34,6 +30,11 @@ export struct QualityCommentsComponent {
   lastWindowColor: string = '#ffffff'
   currentWindowColor: string = '#FF4202'
   @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource();
+  @State dialogController: CustomDialogController | null = null;
+
+  /*必传*/
+  @State publishCommentModel: publishCommentModel = new publishCommentModel()
+
 
   aboutToDisappear(): void {
 
@@ -43,13 +44,33 @@ export struct QualityCommentsComponent {
     windowClass.setWindowLayoutFullScreen(false)
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
 
+    this.dialogController = null // 将dialogController置空
+
   }
 
   aboutToAppear(): void {
 
     this.fullScreen();
     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){
@@ -217,7 +238,7 @@ export struct QualityCommentsComponent {
       // ListItemGroup({ header: this.titleHeader() })
       LazyForEach(this.allDatas, (item: commentItemModel, index: number) => {
         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
 struct QualityCommentItem {
+  @ObjectLink publishCommentModel: publishCommentModel
+  dialogController: CustomDialogController | null = null;
   @ObjectLink item: commentItemModel
   index: number = 0
 
@@ -360,7 +373,20 @@ struct QualityCommentItem {
           Row({ space: 16 }) {
             Row() {
               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() {
               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 })
               }
             }.onClick(() => {
+              // 未登录，跳转登录
+              const user_id = HttpUtils.getUserId()
+              if (!user_id) {
+                WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
+                return
+              }
               commentLikeChange(this.item)
               commentViewModel.commentLike(this.item).then(() => {
               }).catch(() => {

-import { DateTimeUtils, Logger, ToastUtils, UserDataLocal } from 'wdKit/Index';
+import { SpConstants } from 'wdConstant/Index';
+import { DateTimeUtils, Logger, SPHelper, ToastUtils, UserDataLocal } from 'wdKit/Index';
 import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import {
@@ -183,6 +184,14 @@ class CommentViewModel {
         }
         ToastUtils.showToast(data.message, 1000);
         let model = data.data as commentItemModel
+
+        let userId = HttpUtils.getUserId()
+        let FIRSTCOMMENTTIME = SPHelper.default.getSync(SpConstants.FIRSTCOMMENTTIME, '')
+
+        if (!userId && !FIRSTCOMMENTTIME) {
+          //保存首次评论时间
+          SPHelper.default.saveSync(SpConstants.FIRSTCOMMENTTIME, DateTimeUtils.formatDate(data.timestamp, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN))
+        }
         success(model)
       }, (error: Error) => {
         ToastUtils.showToast('评论失败', 1000);

@@ -180,7 +180,7 @@ struct CarouselLayout01CardView {
         })
       Column() {
         // 这里用于展示轮播图右上角信息，这里只对直播类型的展示
-        if (this.item.objectType === '2') {
+        if (this.item.objectType === '2' || this.item.objectType ==='4') {
           CardMediaInfo({ contentDTO: this.item })
             .width(CommonConstants.FULL_PARENT)
         }

@@ -4,6 +4,7 @@ import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { ProcessUtils } from 'wdRouter';
 import { HttpUtils } from 'wdNetwork/Index';
+import { DateTimeUtils } from 'wdKit';
 
 /**
  * 直播预约卡
@@ -17,6 +18,22 @@ export struct ZhSingleRow03 {
   @State compDTO: CompDTO = {} as CompDTO
   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() {
     Column() {
       //顶部
@@ -42,7 +59,8 @@ export struct ZhSingleRow03 {
               Row() {
                 Flex({justifyContent: FlexAlign.SpaceBetween}){
                   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})
                       .fontColor(0x000000)
                       .fontSize(13)
@@ -106,7 +124,7 @@ export struct ZhSingleRow03 {
           .width(3)
           .height(16)
           .margin({ right: 4 })
-        Text('直播预约')
+        Text('直播预告')
           .fontSize($r("app.float.font_size_17"))
           .fontColor($r("app.color.color_222222"))
           .fontWeight(600)

@@ -30,6 +30,7 @@ const TAG = 'Zh_Single_Row-06'
 @Component
 export struct ZhSingleRow06 {
   @State compDTO: CompDTO = {} as CompDTO
+  @State likeBl: boolean = false;
 
   build() {
     Column() {
@@ -81,7 +82,7 @@ export struct ZhSingleRow06 {
           .fontColor(0x999999)
 
         Row(){
-          Image($r('app.media.icon_like_no'))
+          Image(this.likeBl ? $r('app.media.icon_like_select') : $r('app.media.icon_like'))
             .width(16)
             .height(16)
             .margin({right: 3})
@@ -90,6 +91,13 @@ export struct ZhSingleRow06 {
             .fontSize(14)
             .fontColor(0x999999)
         }
+        .onClick(() => {
+          if (this.likeBl) {
+            this.likeBl = false;
+          } else {
+            this.likeBl = true;
+          }
+        })
       }
       .justifyContent(FlexAlign.SpaceBetween)
       .width('100%')

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

@@ -9,13 +9,13 @@ export default struct MinePageUserSimpleInfoUI {
   @Watch('loginStateChange') @Prop isLogin :boolean
   @State userName:string = "登陆注册"
   @State headPhotoUrl:string = ""
+  userType:string = "1"
   @State levelHead:string = ""
   @State levelId:number = 0
 
   loginStateChange(){
     if(this.isLogin){
       this.getUserInfo()
-      this.getUserLevel()
     }else{
       this.headPhotoUrl = ""
       this.levelHead = ""
@@ -54,8 +54,10 @@ export default struct MinePageUserSimpleInfoUI {
             Text(this.userName)
               .fontColor($r('app.color.color_222222'))
               .maxLines(1)
+              .fontWeight(FontWeight.Bold)
               .textOverflow({ overflow: TextOverflow.Ellipsis })
               .fontSize('33lpx')
+              .lineHeight("46lpx")
 
             Image($r('app.media.mine_user_edit'))
               .width('27lpx')
@@ -144,7 +146,21 @@ export default struct MinePageUserSimpleInfoUI {
         this.userName = value.userName
         this.headPhotoUrl = value.headPhotoUrl
         UserDataLocal.setUserHeaderUrl(value.headPhotoUrl)
+
+        this.userType = value.userType
+        UserDataLocal.setUserType(value.userType)
+
+        if(this.userType === "1"){
+          if(StringUtils.isNotEmpty(value.honoraryIcon)){
+            this.levelHead = value.honoraryIcon
+            return
+          }
+          if(StringUtils.isNotEmpty(value.avatarFrame)){
+            this.levelHead = value.avatarFrame
+          }
         }
+      }
+      this.getUserLevel()
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))
     })
@@ -152,10 +168,14 @@ export default struct MinePageUserSimpleInfoUI {
   getUserLevel(){
     MinePageDatasModel.getUserLevelData(getContext(this)).then((value)=>{
       if(value!=null){
+        if(StringUtils.isEmpty(this.levelHead)){
+          if(this.userType === "1"){
             this.levelHead = value.levelHead
+          }
+        }
         this.levelId = value.levelId
-        UserDataLocal.setUserLevel(value.levelId)
-        UserDataLocal.setUserLevelHeaderUrl(value.levelHead + "")
+        UserDataLocal.setUserLevel(this.levelId)
+        UserDataLocal.setUserLevelHeaderUrl(this.levelHead + "")
       }
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))

@@ -19,7 +19,7 @@ export struct FollowChildComponent{
           Row() {
             Row(){
               Stack({alignContent: Alignment.Bottom}){
-                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
+                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl)
                   .objectFit(ImageFit.Auto)
                   .width('92lpx')
                   .height('92lpx')
@@ -128,7 +128,7 @@ export struct FollowChildComponent{
           Row() {
             Row(){
               Stack({alignContent: Alignment.Bottom}){
-                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
+                Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.icon_default_head_mater'):this.data.headPhotoUrl)
                   .objectFit(ImageFit.Auto)
                   .width('92lpx')
                   .height('92lpx')

+import { EmitterUtils, EmitterEventId, Logger } from 'wdKit/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { FollowListItem } from '../../../viewmodel/FollowListItem'
 import { CustomTitleUI } from '../../reusable/CustomTitleUI'
@@ -20,17 +21,27 @@ export struct FollowFirstTabsComponent{
         })
 
       if(this.controller != null && this.data.length>1 && this.changeIndex === 1){
+        this.jumpFollowNextPage()
+      }
+    }).catch((err:Error)=>{
+      console.log(TAG,JSON.stringify(err))
+    })
+
+    EmitterUtils.receiveEvent(EmitterEventId.MY_FOLLOW_EMPTY, (() => {
+      if(this.controller != null && this.data.length>1 ){
+        this.jumpFollowNextPage()
+      }
+    }))
+  }
+
+  jumpFollowNextPage(){
     //个人主页 跳转 关注页 tab 2
     let intervalID = setInterval(() => {
-          this.currentIndex = this.changeIndex
+      this.currentIndex = 1
       this.controller.changeIndex(this.currentIndex)
       clearInterval(intervalID);
     }, 500);
   }
-    }).catch((err:Error)=>{
-      console.log(TAG,JSON.stringify(err))
-    })
-  }
 
   @Builder TabBuilder(index: number, item: FollowListItem) {
     Stack(){
@@ -74,6 +85,7 @@ export struct FollowFirstTabsComponent{
       .vertical(false)
       .barMode(BarMode.Scrollable)
       .barWidth('100%')
+      .barBackgroundColor($r('app.color.white'))
       .barHeight('84lpx')
       .animationDuration(0)
       .onChange((index: number) => {

-import { LazyDataSource, SPHelper, UserDataLocal } from 'wdKit';
+import { EmitterEventId, EmitterUtils, LazyDataSource, SPHelper, UserDataLocal } from 'wdKit';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import SearcherAboutDataModel from '../../../model/SearcherAboutDataModel';
 import { CreatorDetailRequestItem } from '../../../viewmodel/CreatorDetailRequestItem';
@@ -70,10 +70,16 @@ export struct FollowListDetailUI {
     Column() {
       if (this.count === 0) {
         if (this.isGetRequest == true) {
-          EmptyComponent({ emptyType: 14 })
+          if(this.creatorDirectoryId === -1){
+            EmptyComponent({ emptyType: 14,emptyHeight:"100%" })
+              .layoutWeight(1)
+              .width('100%')
+          }else{
+            EmptyComponent({ emptyType: 16,emptyHeight:"100%" })
               .layoutWeight(1)
               .width('100%')
           }
+        }
 
       } else {
         List({ space: 3 }) {
@@ -156,10 +162,12 @@ export struct FollowListDetailUI {
         }
         this.isLoading = false
         this.isGetRequest = true
+        this.sendFollowMessage()
       }).catch((err: Error) => {
         console.log(TAG, "请求失败")
         this.isGetRequest = true
         this.isLoading = false
+        this.sendFollowMessage()
       })
     } else {
       this.isLoading = false
@@ -167,6 +175,12 @@ export struct FollowListDetailUI {
     }
   }
 
+  sendFollowMessage(){
+    if(this.count === 0){
+      EmitterUtils.sendEvent(EmitterEventId.MY_FOLLOW_EMPTY)
+    }
+  }
+
   getNewPageData() {
     //我的关注列表
     if (this.creatorDirectoryId === -1) {
@@ -179,6 +193,7 @@ export struct FollowListDetailUI {
           if (!this.data || value.list.length == 0) {
             this.hasMore = false
             this.isLoading = false
+            this.isGetRequest = true
           } else {
             this.getFollowListStatus(value)
           }
@@ -226,6 +241,8 @@ export struct FollowListDetailUI {
           })
         })
         this.getFollowStatus(data_temp, result.totalCount)
+      }else{
+        this.isGetRequest = true
       }
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))

 import { FollowListItem, FollowThirdListItem } from '../../../viewmodel/FollowListItem'
 import { FollowListDetailUI } from './FollowListDetailUI'
+import measure from '@ohos.measure'
 
 @Component
 export struct FollowThirdTabsComponent{
@@ -11,8 +12,8 @@ export struct FollowThirdTabsComponent{
 
 
   private controller: TabsController = new TabsController()
-  fontColor: string = '#999999'
-  selectedFontColor: string = '#000000'
+  fontColor: string = '#666666'
+  selectedFontColor: string = '#222222'
 
   build(){
     if(this.data != null){
@@ -26,32 +27,44 @@ export struct FollowThirdTabsComponent{
 
   @Builder TabBuilder(index: number, item: FollowThirdListItem) {
     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)
-        .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)
-        .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(()=>{
       this.currentIndex = index
       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(){
 
     Column(){
       Column() {
         // 页签
-        Row({ space: 7 }) {
+        Row() {
           Scroll() {
             Row() {
               ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
@@ -63,8 +76,8 @@ export struct FollowThirdTabsComponent{
           .align(Alignment.Start)
           .scrollable(ScrollDirection.Horizontal)
           .scrollBar(BarState.Off)
-          .width('90%')
-          .padding({left:'11lpx'})
+          .width('100%')
+          .padding({left:'31lpx',right:'48lpx'})
         }
         .alignItems(VerticalAlign.Bottom)
         .width('100%')
@@ -77,11 +90,6 @@ export struct FollowThirdTabsComponent{
         ForEach(this.data[this.firstIndex].children[this.secondIndex].children, (item: FollowThirdListItem, index: number ) => {
           TabContent(){
             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})
             }
           }
@@ -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
+    }
+  }
+
 }
\ No newline at end of file

-import { ContentDTO, Params } from 'wdBean';
 import { DateTimeUtils, LazyDataSource, SPHelper,UserDataLocal } from 'wdKit';
-import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter';
+import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { CommentListItem } from '../../../viewmodel/CommentListItem';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
@@ -106,6 +105,7 @@ export struct HomePageBottomComponent{
               EmptyComponent({emptyType:14})
                 .layoutWeight(1)
                 .width('100%')
+                .offset({y:"-200lpx"})
             }
           }.layoutWeight(1)
           .justifyContent(FlexAlign.Start)
@@ -114,6 +114,7 @@ export struct HomePageBottomComponent{
             EmptyComponent({emptyType:11})
               .layoutWeight(1)
               .width('100%')
+              .offset({y:"-200lpx"})
           }
         }
       }else{
@@ -146,7 +147,7 @@ export struct HomePageBottomComponent{
 
             LazyForEach(this.data_follow, (item: FollowListDetailItem, index: number = 0) => {
               ListItem() {
-                FollowChildComponent({data: item,type:1})
+                FollowChildComponent({data: item,type:2})
               }
               .onClick(() => {
               })
@@ -284,6 +285,7 @@ export struct HomePageBottomComponent{
           if (!this.data_comment || value.list.length == 0){
             this.hasMore = false
             this.isLoading = false
+            this.isGetRequest = true
           }else{
             this.getCommentListStatus(value)
           }
@@ -322,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))
     })
 
+    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)=>{
       newValue.forEach((item)=>{
         data.forEach((list)=>{

@@ -101,6 +101,7 @@ export struct OtherHomePageBottomCommentComponent {
         if (!this.data_comment || value.list.length == 0) {
           this.hasMore = false
           this.isLoading = false
+          this.isGetRequest = true
         } else {
           this.getCommentListStatus(value)
         }
@@ -138,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))
     })
 
+    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) => {
       newValue.forEach((item) => {
         data.forEach((list) => {

@@ -250,10 +250,10 @@ struct ChannelDialog {
                 .fontSize(16)
                 .fontWeight(600)
                 .margin({ right: 4 })
-              Text(!this.isEditIng ? MY_CHANNEL_TIP1 : MY_CHANNEL_TIP2)
-                .fontSize(12)
-                .fontWeight(400)
-                .fontColor('#222222')
+              // Text(!this.isEditIng ? MY_CHANNEL_TIP1 : MY_CHANNEL_TIP2)
+              //   .fontSize(12)
+              //   .fontWeight(400)
+              //   .fontColor('#222222')
             }
 
             Text(this.isEditIng ? EDIT_DOWN : EDIT_TEXT)
@@ -276,9 +276,9 @@ struct ChannelDialog {
                 Row() {
                   Text(item.name)
                     .fontSize(14)
-                    .fontColor(this.currentTopNavSelectedItem.channelId === item.channelId ? '#ED2800' : (item.homeChannel === '1' || item.movePermitted === 0 ? '#999999' : '#222222'))
+                    .fontColor(this.currentTopNavSelectedItem.channelId === item.channelId ? '#ED2800' : (item.headlinesOn === 1 || item.movePermitted === 0 ? '#999999' : '#222222'))
 
-                  if (this.isEditIng && item.delPermitted === 1) {
+                  if (this.isEditIng && item.delPermitted === 1 && item.movePermitted === 1) {
                     Image($r('app.media.icon_audio_close'))
                       .width(12)
                       .margin({ left: 1 })
@@ -287,12 +287,12 @@ struct ChannelDialog {
                 .width('100%')
                 .height('100%')
                 .justifyContent(FlexAlign.Center)
-                .backgroundColor(item.homeChannel === '1' || item.movePermitted === 0 ? '#F5F5F5' : '#ffffff')
+                .backgroundColor(item.headlinesOn === 1 || item.movePermitted === 0 ? '#F5F5F5' : '#ffffff')
               }
               .width('23%')
               .height(40)
               .border({
-                width: item.homeChannel === '1' ? 0 : 1,
+                width: item.headlinesOn === 1 || item.movePermitted === 0  ? 0 : 1,
                 color: '#EDEDED',
                 radius: 3
               })
@@ -303,7 +303,7 @@ struct ChannelDialog {
                   TapGesture()
                     .onAction((event?: GestureEvent) => {
                       if (this.isEditIng) {
-                        if (item.delPermitted === 1) {
+                        if (item.delPermitted === 1 && item.movePermitted === 1) {
                           this.delChannelItem(index)
                         }
                       } else {
@@ -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) => {
                       this.dragItem = item.num
                       this.dragRefOffsetX = 0
@@ -449,7 +449,7 @@ struct ChannelDialog {
       }.width('100%').height('100%')
       .scrollBar(BarState.Off)
     }
-    .padding({ top: 40, right: 15, bottom: 20, left: 15 })
+    .padding({ top: 40, right: 15, bottom: 40, left: 15 })
     .backgroundColor('#ffffff')
   }
 }
@@ -526,10 +526,9 @@ struct ChannelSubscriptionLayout {
         .width(18)
     }
     .width(36)
-    .height(36)
+    .height(40)
     .justifyContent(FlexAlign.Center)
-    .padding({ bottom: 6 })
-    .backgroundColor('#ffffff')
+    .backgroundColor(Color.White)
     .onClick(() => {
       if (this.dialogController != null) {
         this.dialogController.open()

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

@@ -128,7 +128,8 @@ struct EditUserInfoPage {
           onAccept:(value:DatePickerResult) => {
             let mon = value.month as number + 1
             let monStr = mon < 10? '0'+mon.toString():mon.toString();
-            this.currentUserInfo.userExtend.birthday = value.year+'-'+monStr+'-'+value.day;
+            let dayStr = value.day as number < 10? '0'+value.day:value.day;
+            this.currentUserInfo.userExtend.birthday = value.year+'-'+monStr+'-'+dayStr;
             this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_birthday
             this.updateEditModel()
           }

@@ -8,6 +8,7 @@ import MinePageMoreFunctionUI from '../mine/MinePageMoreFunctionUI'
 import { SPHelper, StringUtils } from 'wdKit'
 import { SpConstants } from 'wdConstant'
 import dataPreferences from '@ohos.data.preferences';
+import { MergeRecordDialog } from '../../dialog/MergeRecordDialog'
 
 const TAG = 'MinePageComponent';
 
@@ -30,9 +31,23 @@ export struct MinePageComponent {
         this.isLogin = false
       }else {
         this.isLogin = true
+       this.addRecordDialog()
       }
     }
   }
+  mergeDialogController: CustomDialogController = new CustomDialogController({
+    builder: MergeRecordDialog({
+      cancel: () => {
+        this.clearMergeRecord()
+      },
+      confirm: () => {
+        this.dealMergeRecordData()
+      }
+    }),
+    customStyle: true,
+    alignment: DialogAlignment.Center,
+    autoCancel: false
+  })
 
   aboutToAppear(){
     this.getUserLogin()
@@ -112,5 +127,29 @@ export struct MinePageComponent {
     }
   }
 
+  addRecordDialog() {
+    setTimeout(() => {
+      this.dealMergeRecordDialog()
+    }, 300)
+  }
+
+  dealMergeRecordDialog() {
+    let commentTime = SPHelper.default.getSync(SpConstants.FIRSTCOMMENTTIME, "")
+    if (StringUtils.isNotEmpty(commentTime)) {
+      this.mergeDialogController.open()
+    }
+  }
+
+  dealMergeRecordData() {
+    MinePageDatasModel.visitorMergeComment().then(() => {
+      this.mergeDialogController.close()
+    }).catch(() => {
+      this.mergeDialogController.close()
+    })
+  }
+
+  clearMergeRecord(){
+    SPHelper.default.saveSync(SpConstants.FIRSTCOMMENTTIME, "")
+  }
 }
 

@@ -47,6 +47,7 @@ struct MyCollectionListPage {
         CustomPullToRefresh({
           alldata:this.allDatas,
           scroller:this.scroller,
+          hasMore:this.browSingModel.hasMore,
           customList:()=>{
             this.ListLayout()
           },
@@ -122,10 +123,14 @@ struct MyCollectionListPage {
       if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
         if (this.currentPage === 1) {
           this.allDatas = []
-          this.allDatas.push(...collectionItem.list)
-        }else {
-          this.allDatas = this.allDatas.concat(...collectionItem.list)
         }
+
+        for (let index = 0; index < collectionItem.list.length; index++) {
+          const compDTO = collectionItem.list[index];
+          compDTO.isCollection = true ///用于时间展示
+          this.allDatas.push(compDTO)
+        }
+
         if (collectionItem.hasNext === 0) {
           this.browSingModel.hasMore = false;
         } else {
@@ -188,8 +193,17 @@ struct MyCollectionListPage {
     })
 
     //重置删除状态
+    this.updataUIState()
+  }
+
+  updataUIState(){
     this.isEditState = false
     this.isAllSelect = false
+
+    if (this.allDatas.length === 0) {
+      this.browSingModel.viewType = ViewType.EMPTY;
+      this.browSingModel.hasMore === true
+    }
   }
 
 }
\ No newline at end of file

@@ -5,12 +5,15 @@ import { RefreshConstants } from '../../utils/RefreshConstants'
  */
 @Component
 export default struct NoMoreLayout {
+
+
   build() {
-    Row() {
+    Column() {
       Text($r('app.string.footer_text'))
-        .margin({ left: RefreshConstants.NoMoreLayoutConstant_NORMAL_PADDING })
         .fontSize(RefreshConstants.NoMoreLayoutConstant_TITLE_FONT)
         .textAlign(TextAlign.Center)
+        .fontColor('#CCCCCC')
+        .margin({bottom:40})
     }
     .width(RefreshConstants.FULL_WIDTH)
     .justifyContent(FlexAlign.Center)

@@ -3,8 +3,6 @@ import { Logger } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
 import { autoRefresh, listTouchEvent } from '../../utils/PullDownRefresh';
-import RefreshLayout from './RefreshLayout';
-import { RefreshLayoutBean } from './RefreshLayoutBean';
 import LoadMoreLayout from './LoadMoreLayout';
 import { CompParser } from '../CompParser';
 import { CompDTO } from 'wdBean';
@@ -14,6 +12,8 @@ import { ProcessUtils } from 'wdRouter/Index';
 import PageAdModel from '../../viewmodel/PageAdvModel';
 import PageNoMoreLayout from './PageNoMoreLayout';
 import { NoMoreBean } from './NoMoreBean';
+import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
+import RefreshLayout from '../refresh/RefreshLayout';
 
 const TAG = 'PageComponent';
 
@@ -66,15 +66,15 @@ export struct PageComponent {
         // 下拉刷新
         ListItem() {
           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) => {
           ListItem() {
             Column() {
-              CompParser({ compDTO: compDTO, compIndex: compIndex });
+              CompParser({ pageModel: this.pageModel, compDTO: compDTO, compIndex: compIndex });
             }
           }
         },
@@ -246,6 +246,7 @@ export struct PageComponent {
     this.pageModel.groupId = this.pageId;
     this.pageModel.channelId = this.channelId;
     this.pageModel.currentPage = 1;
+    this.pageModel.pageTotalCompSize = 0;
     PageHelper.getInitData(this.pageModel, this.pageAdvModel)
   }
 }

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

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

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

-import { ContentDTO } from 'wdBean';
+import { ContentDTO , Action,GoldenPositionExtraBean} from 'wdBean';
 import { CommonConstants ,ViewType} from 'wdConstant';
 import PageViewModel from '../../viewmodel/PageViewModel';
 import RefreshLayout from '../page/RefreshLayout';
@@ -22,9 +22,14 @@ struct ThemeListPage {
   currentPage: number = 1;
   pageSize: number = 20;
   title: string = '金刚位聚合页'
+  extra: string = ''
 
   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)}`)
       this.data.push(...liveReviewDTO.list)
       if(this.data.getDataArray().length > 0){

@@ -7,6 +7,7 @@ import { FirstTabTopSearchComponent } from '../search/FirstTabTopSearchComponent
 import { VideoChannelDetail } from 'wdDetailPlayShortVideo/Index';
 import { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
 import { PeopleShipMainComponent } from '../peopleShip/PeopleShipMainComponent';
+import { WDRouterPage, WDRouterRule } from 'wdRouter'
 
 
 const TAG = 'TopNavigationComponent';
@@ -63,6 +64,8 @@ export struct TopNavigationComponent {
   @State indicatorLeftMargin: number = 0
   @State indicatorWidth: number = 0
   private tabsWidth: number = 0
+  //定时器延时处理切换至版面、播报tab时 返回上一个tab
+  @State tabTimmer: number = 0
 
   topOrBottomNavChange() {
     if (this.currentBottomNavName === this.currentBottomNavInfo?.name) {
@@ -136,7 +139,8 @@ export struct TopNavigationComponent {
       }
 
       //频道分类
-      if (item.myChannel === '1' && item.name !== '播报') {
+      if (item.name !== '播报') { //暂时隐藏播报
+        if (item.myChannel === '1') {
           _myChannelList.push(item)
           _channelIds.push(item.channelId)
         } else if (item.moreChannel === '1') {
@@ -144,6 +148,7 @@ export struct TopNavigationComponent {
         } else if (item.localChannel === '1') {
           this.localChannelList.push(item)
         }
+      }
 
     })
 
@@ -252,14 +257,15 @@ export struct TopNavigationComponent {
         .barMode(BarMode.Scrollable)
         .vertical(false)
         .barBackgroundColor(this.barBackgroundColor)
-        .backgroundColor(this.barBackgroundColor)
-        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
         .onAreaChange((oldValue: Area, newValue: Area) => {
           let width = Number.parseFloat(newValue.width.toString())
           this.tabsWidth = Number.isNaN(width) ? 0 : width
         })
         .animationDuration(this.animationDuration)
         .onChange((index: number) => {
+          if(this.tabTimmer){
+            clearTimeout(this.tabTimmer)
+          }
           this.currentTopNavName =
             this._currentNavIndex === 0 ? this.myChannelList[index].name : this.topNavList[index].name
           Logger.info(TAG, `onChange index : ${index}`);
@@ -271,11 +277,15 @@ export struct TopNavigationComponent {
           if (this.isBroadcast(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])) {
             // 跳转到播报页面
             ProcessUtils.gotoBroadcastPage(this.myChannelList[index].pageId)
+            this.tabTimmer = setTimeout(() => {
               this.tabsController.changeIndex(this.currentTopNavSelectedIndex)
+            }, 500)
           }
           if (this.isLayout(this._currentNavIndex === 0 ? this.myChannelList[index] : this.topNavList[index])) {
             ProcessUtils.gotoENewsPaper()
+            this.tabTimmer = setTimeout(() => {
               this.tabsController.changeIndex(this.currentTopNavSelectedIndex)
+            }, 500)
           }
         })
         .onAnimationStart((index: number, targetIndex: number, event: TabsAnimationEvent) => {
@@ -326,6 +336,20 @@ export struct TopNavigationComponent {
               this.tabsController.changeIndex(index)
             }
           })
+        }else {
+          Row() {
+            Image($r('app.media.icon_search'))
+              .width('24vp')
+              .height('24vp')
+          }
+          .height('40vp')
+          .width('40vp')
+          .margin({ right: 10 })
+          .alignItems(VerticalAlign.Center)
+          .justifyContent(FlexAlign.Center)
+          .onClick(() => {
+            WDRouterRule.jumpWithPage(WDRouterPage.searchPage)
+          })
         }
       }
     }

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

@@ -6,37 +6,72 @@ import { PeopleShipAttentionContentListHeadComponent } from './PeopleShipAttenti
 @Component
 export struct PeopleShipAttentionContentListTopComponent {
   @Prop followList: FollowListDetailItem[]
+
   build() {
     Column() {
-      List(){
+      List() {
         ListItem() {
-          PeopleShipAttentionContentListHeadComponent({
-            index: 0,
-            item: this.followList[0]
-          })
+          this.PeopleShipFollowTop()
         }.onClick(() => {
           // 跳转到关注列表-我的
           WDRouterRule.jumpWithPage(WDRouterPage.followListPage)
         })
 
 
-        ForEach(this.followList, (item: FollowListDetailItem, index: number) => {
+        ForEach(this.followList, (item: FollowListDetailItem) => {
           ListItem() {
             PeopleShipAttentionContentListHeadComponent({
-              index: index + 1,
               item: item
             })
           }.onClick(() => {
             let creatorId = item.attentionCreatorId || ''
             ProcessUtils.gotoPeopleShipHomePage(creatorId)
           })
-        }, (item: FollowListDetailItem) => item.attentionCreatorId)
+        }, (item: FollowListDetailItem, index: number) => item.attentionCreatorId + index)
       }
       .listDirection(Axis.Horizontal)
       .scrollBar(BarState.Off)
       .width('100%')
       .height('102vp')
+
       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'
+    })
+  }
 }

@@ -24,7 +24,7 @@ import PageAdModel from '../../viewmodel/PageAdvModel';
 import PageHelper from '../../viewmodel/PageHelper';
 import { PeopleShipAttentionContentListTopComponent } from './PeopleShipAttentionContentListTopComponent'
 import { CardParser } from '../CardParser'
-import NoMoreLayout from '../page/NoMoreLayout';
+import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData';
 
 @Preview
 @Component
@@ -161,7 +161,7 @@ export struct PeopleShipMainComponent {
       // 加载更多
       ListItem() {
         if (!this.hasMore && !this.isLoading) {
-          NoMoreLayout()
+          PeopleShipNoMoreData()
         }
       }
     }
@@ -280,6 +280,7 @@ export struct PeopleShipMainComponent {
         //批量查询各类型内容动态数据接口
         this.checkContentInteractData(listData.list, resolve)
       } else  {
+        this.hasMore = false;
         this.resolveEnd(true, resolve)
       }
 

 import { PeopleShipRecommendHeadComponent } from './PeopleShipRecommendHeadComponent'
 import { RmhRecommendDTO } from 'wdBean';
-import { Logger } from 'wdKit/Index';
-import NoMoreLayout from '../page/NoMoreLayout';
+import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData';
 
 @Component
 export struct PeopleShipRecommendComponent {
@@ -87,7 +86,8 @@ export struct PeopleShipRecommendComponent {
       // 为你推荐
       Button(this.rmhSelectedList.length == 0 ? '一键关注' : `一键关注 (${this.rmhSelectedList.length})`, { type: ButtonType.Normal, stateEffect: this.rmhSelectedList.length != 0 })
         .margin({
-          top: '24vp'
+          top: '24vp',
+          bottom: '10vp'
         })
         .width('120vp')
         .height('36vp')
@@ -104,7 +104,7 @@ export struct PeopleShipRecommendComponent {
           }
         })
       // 没有更多
-      NoMoreLayout()
+      PeopleShipNoMoreData()
     }
     .width('100%')
   }

@@ -25,12 +25,27 @@ export struct PeopleShipRecommendHeadComponent {
           })
       }.margin({ top: 12, bottom: 8 })
 
+      Row() {
         Text(this.rmhInfo.userName)
           .fontColor($r('app.color.color_222222'))
           .fontSize($r('app.float.vp_14'))
           .fontWeight(600)
           .maxLines(1)
           .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)
         .fontColor($r('app.color.color_B0B0B0'))

@@ -18,9 +18,9 @@ import { CardParser } from '../CardParser'
 import { PageRepository } from '../../repository/PageRepository'
 import { RefreshLayoutBean } from '../page/RefreshLayoutBean'
 import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
-import { ErrorComponent } from '../view/ErrorComponent';
-import NoMoreLayout from '../page/NoMoreLayout';
+import { ErrorComponent } from '../view/ErrorComponent'
 import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh'
+import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData'
 
 const TAG = 'PeopleShipHomeArticleListComponent';
 
@@ -104,7 +104,7 @@ export struct PeopleShipHomeArticleListComponent {
         // 加载更多
         ListItem() {
           if (!this.hasMore && !this.isLoading) {
-            NoMoreLayout()
+            PeopleShipNoMoreData()
           }
         }
     }

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

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

 import router from '@ohos.router'
 import { PeopleShipUserDetailData } from 'wdBean'
 import { PeopleShipHomePageHeadComponent } from './PeopleShipHomePageHeadComponent'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
+import { ToastUtils } from 'wdKit';
 
 @Component
 export struct PeopleShipHomePageNavComponent {
@@ -38,8 +40,13 @@ export struct PeopleShipHomePageNavComponent {
               iconDiameter: 10,
               headPhotoUrl: (this.detailModel.headPhotoUrl && this.detailModel.headPhotoUrl.length > 0 ) ? this.detailModel.headPhotoUrl : $r('app.media.WDAccountOwnerHedaerDefaultIcon'),
               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',
               })
               .visibility((this.topOpacity > 0.5 ? Visibility.Visible : Visibility.Hidden))
@@ -56,7 +63,25 @@ export struct PeopleShipHomePageNavComponent {
 
             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)
                 .backgroundColor($r('app.color.color_ED2800'))
                 .width('54vp')
@@ -71,8 +96,6 @@ export struct PeopleShipHomePageNavComponent {
                   left: '12vp',
                 })
                 .padding(0)
-                .fontSize($r('app.float.vp_12'))
-                .fontColor(Color.White)
                 .visibility((this.attentionOpacity ? Visibility.Visible : Visibility.Hidden))
             } else {
               Button('已关注', { type: ButtonType.Normal, stateEffect: true })
@@ -104,7 +127,7 @@ export struct PeopleShipHomePageNavComponent {
             .objectFit(ImageFit.Auto)
             .margin({ right: '10vp' })
             .onClick(() => {
-
+              ToastUtils.showToast('分享为公共方法，待开发', 1000);
             })
         }
         .width('100%')

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

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

@@ -7,6 +7,7 @@ import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageD
 import { InfluenceData, PeopleShipUserDetailData } from 'wdBean'
 import { PeopleShipHomeAttentionComponent } from './PeopleShipHomeAttentionComponent'
 import { HWLocationUtils } from 'wdHwAbility'
+import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 
 
 @Component
@@ -27,30 +28,37 @@ export struct PeopleShipHomePageTopComponent {
   @State collapseTxt: string = '…展开';
   private subTxt: string = '';
   @State content: string = ''
-  @State topFixedHeight: number = 320
+  @State topFixedHeight: number = 286
   @State lineInNum: number = 1
   @Link topHeight: number
   @State provinceName: string = ''
+
   build() {
     Column() {
-        Stack({ alignContent: Alignment.TopStart}) {
+      Stack({ alignContent: Alignment.TopStart }) {
         // 顶部图片
         Image($r('app.media.home_page_bg'))
           .width('100%')
           .height('120vp')
           .objectFit(ImageFit.Fill)
-          .backgroundColor(Color.Black)
+          .backgroundColor(Color.White)
         // 头像和名称
         Row() {
           // 头像
           PeopleShipHomePageHeadComponent({
             diameter: 80,
             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
           }).margin({
             left: '10vp',
             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'))
             .fontWeight(500)
             .textAlign(TextAlign.Start)
-            .textOverflow({overflow: TextOverflow.Ellipsis})
+            .textOverflow({ overflow: TextOverflow.Ellipsis })
             .maxLines(2)
             .layoutWeight(1)
             .margin({
@@ -78,49 +86,50 @@ export struct PeopleShipHomePageTopComponent {
       .width('100%')
       .height('180vp')
       .backgroundColor(Color.Transparent)
+
       // 认证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({
-            top: '10vp',
+            top: '0vp',
             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({
-                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({
-              top: '10vp',
+              top: '0vp',
               bottom: '10vp'
             })
         }
       }
 
       // 简介
-      if(this.lineInNum > 3) {
+      if (this.lineInNum > 3) {
         Row() {
           Text() {
             Span(this.content)
               .fontColor($r('app.color.color_222222'))
 
             Span(this.collapseTxt)
-              .onClick(()=>{
-                if(this.isCollapse){
+              .onClick(() => {
+                if (this.isCollapse) {
                   this.maxLines = Infinity;
                   this.content = `简介：${this.detailModel.introduction}`
                   this.isCollapse = false;
                   this.collapseTxt = '收起';
                   this.topHeight = this.topFixedHeight + 21 * this.lineInNum
 
-                }else{
+                } else {
                   this.isCollapse = true;
                   this.collapseTxt = '…展开';
                   this.content = this.subTxt;
@@ -130,30 +139,36 @@ export struct PeopleShipHomePageTopComponent {
               .fontColor($r('app.color.color_B0B0B0'))
 
           }
+          .backgroundColor(Color.Transparent)
           .lineHeight('21vp')
+          .width('100%')
           .maxLines(this.maxLines)
-          .textOverflow({overflow: TextOverflow.Ellipsis})
+          .textOverflow({ overflow: TextOverflow.Ellipsis })
           .fontSize($r('app.float.vp_14'))
-          .key('home_page_introduction')
-          .margin({
+          .padding({
             left: '16vp',
             right: '16vp',
           })
         }.width('100%')
+        .backgroundColor(Color.Transparent)
         .alignItems(VerticalAlign.Top)
-      }else  {
+      } else {
         Row() {
           Text(`简介：${this.detailModel.introduction}`)
             .fontSize($r('app.float.vp_14'))
             .fontColor($r('app.color.color_222222'))
             .lineHeight('21vp')
+            .width('100%')
             .maxLines(3)
-          .textOverflow({overflow: TextOverflow.Ellipsis})
-          .margin({
+            .textOverflow({ overflow: TextOverflow.Ellipsis })
+            .padding({
               left: '16vp',
               right: '16vp',
             })
+            .backgroundColor(Color.Transparent)
+
         }.width('100%')
+        .backgroundColor(Color.Transparent)
         .alignItems(VerticalAlign.Top)
       }
 
@@ -164,7 +179,6 @@ export struct PeopleShipHomePageTopComponent {
           .fontSize($r('app.float.vp_12'))
           .fontColor($r('app.color.color_999999'))
           .textAlign(TextAlign.Start)
-          .width('100%')
           .alignSelf(ItemAlign.Start)
           .margin({
             right: '16vp',
@@ -247,7 +261,8 @@ export struct PeopleShipHomePageTopComponent {
         .height('6vp')
     }
     .width('100%')
-    .height('100%')
+
+    // .height('100%')
   }
 
   async aboutToAppear() {
@@ -265,17 +280,15 @@ export struct PeopleShipHomePageTopComponent {
 
   }
 
-
-
   //  不听减去2个字-一直到时3行
   private compIntroductionTextHeights() {
     let introduction = `简介：${this.detailModel.introduction}`
     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);
-      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}`)
 
     this.subTxt = introduction;
@@ -285,7 +298,7 @@ export struct PeopleShipHomePageTopComponent {
   private getTextLineNum(text: string, constraintWidth: number, lineHeight: number, fontSize: number | string | Resource) {
     let size = this.topMeasureText(text, constraintWidth, lineHeight, fontSize)
     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) {
@@ -299,7 +312,7 @@ export struct PeopleShipHomePageTopComponent {
 
   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'))
       if (this.lineInNum > 3) {
         this.compIntroductionTextHeights()
@@ -307,43 +320,48 @@ export struct PeopleShipHomePageTopComponent {
       }
     }
     if (this.detailModel) {
-       this.topFixedHeight = 308
+      this.topFixedHeight = 286
       if (this.detailModel.region && this.detailModel.region.length > 0) {
         this.provinceName = this.detailModel.region
-       }else  {
+      } else {
         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'))
       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归属地
       if (this.provinceName && this.provinceName.length > 0) {
+        this.topFixedHeight += 28
         this.topHeight += 28
       }
     }
   }
 
   private computeShowNum(count: number) {
-    if(count >= 10000) {
-      return `${(count/10000).toFixed(1)}万`
+    if (count >= 10000) {
+      return `${(count / 10000).toFixed(1)}万`
     }
     return `${count}`
   }
@@ -352,7 +370,7 @@ export struct PeopleShipHomePageTopComponent {
   private async computeIPRegion(province: string) {
     if (province && province.length) {
       try {
-        let provinceName = await HWLocationUtils.getProvinceName(province) ;
+        let provinceName = await HWLocationUtils.getProvinceName(province);
         return provinceName
       } catch (e) {
         return ''
@@ -360,5 +378,4 @@ export struct PeopleShipHomePageTopComponent {
     }
     return ''
   }
-
 }
\ No newline at end of file

+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)
+        })
+      }
+    }
+  }
+}
\ No newline at end of file

+/**
+ * 下拉刷新数据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,
+}
\ No newline at end of file

+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(14)
+        .textAlign(TextAlign.Center)
+        .fontColor('#676767')
+        .backgroundColor('#f6f6f6')
+        .borderRadius(20)
+        .padding({ left: 19, right: 19, top: 10, bottom: 10 })
+        .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
+    }
+  }
+}
\ No newline at end of file

+@Component
+export struct PeopleShipNoMoreData{
+
+  @State title: string = '已显示全部内容'
+  build(){
+    Row(){
+      Text("已显示全部内容")
+        .fontColor($r('app.color.color_999999'))
+        .fontWeight(400)
+        .fontSize('14vp')
+    }
+    .justifyContent(FlexAlign.Center)
+    .alignItems(VerticalAlign.Center)
+    .width('100%')
+    .margin({top:'24vp',bottom:'24vp'})
+  }
+}
\ No newline at end of file

@@ -29,11 +29,19 @@ export struct FirstTabTopSearchComponent {
       if (value != null) {
         this.searchTextData = value
       }
+      this.setDefaultHitData()
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
+      this.setDefaultHitData()
     })
   }
 
+  setDefaultHitData(){
+    if(this.searchTextData.length === 0){
+      this.searchTextData.push("搜索")
+    }
+  }
+
   build() {
     Row() {
       Image($r('app.media.icon_search'))

@@ -13,14 +13,18 @@ const TAG = "SearchComponent"
 @Component
 export struct SearchComponent {
   @State searchTextData: string[] = []
+  @State hasNoSearchTextData: boolean = false
+  @State curHintSearchData: string = ""
   @State hasInputContent: boolean = false
   @State hasChooseSearch: boolean = false
-  @State isClickedHistory: boolean = false
-  @State isClickedHot: boolean = false
-  @State isClickedRelated: boolean = false
+  @State isClickedHistorySearch: boolean = false
+  @State isClickedHotSearch: boolean = false
+  @State isClickedRelatedSearch: boolean = false
+  @State isClickedInputSearch: boolean = false
+  @State isClickedHintSearch: boolean = false
   private swiperController: SwiperController = new SwiperController()
   @State searchText: string = ''
-  controller: TextInputController = new TextInputController()
+  controller: SearchController = new SearchController()
   @State searchHistoryData: SearchHistoryItem[] = []
   @State relatedSearchContentsData: SearchRelatedItem[] = []
   scroller: Scroller = new Scroller()
@@ -30,6 +34,8 @@ export struct SearchComponent {
   aboutToAppear() {
     //获取提示滚动
     this.getSearchHint()
+    //清除缓存
+    SearcherAboutDataModel.searchHistoryData = []
     //获取搜索历史
     this.getSearchHistoryData()
   }
@@ -75,10 +81,18 @@ export struct SearchComponent {
       if (value != null) {
         this.searchTextData = value
       }
+      this.setDefaultHitData()
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
+      this.setDefaultHitData()
     })
   }
+  setDefaultHitData(){
+    if(this.searchTextData.length === 0){
+      this.hasNoSearchTextData = true
+      this.searchTextData.push("搜索感兴趣的内容")
+    }
+  }
 
   getSearchHistoryData() {
     this.searchHistoryData = SearcherAboutDataModel.getSearchHistoryData()
@@ -94,12 +108,14 @@ export struct SearchComponent {
               SearchHistoryComponent({ searchHistoryData: $searchHistoryData, onDelHistory: (): void => this.getSearchHistoryData(),onGetSearchRes: (item,index): void => this.getSearchHistoryResData(item,index) })
             }
 
+            if(this.searchHistoryData.length>0){
               //分隔符
               Divider()
                 .width('100%')
                 .height('1lpx')
                 .color($r('app.color.color_EDEDED'))
                 .strokeWidth('1lpx')
+            }
 
             SearchHotsComponent({onGetSearchRes: (item): void => this.getSearchHotResData(item)})
           }
@@ -109,7 +125,6 @@ export struct SearchComponent {
         .width('100%')
         .height('100%')
         .padding({ left: '31lpx', right: '31lpx' })
-        .margin({ top: '36lpx' })
       } else {
         if (this.hasChooseSearch) {
           //搜索结果
@@ -131,7 +146,7 @@ export struct SearchComponent {
   getSearchHistoryResData(content:string,index:number){
     //删除单条记录
     SearcherAboutDataModel.delSearchSingleHistoryData(index)
-    this.isClickedHistory = true
+    this.isClickedHistorySearch = true
     this.searchResData(content)
   }
 
@@ -148,6 +163,16 @@ export struct SearchComponent {
     //查询 操作 TODO
     this.hasChooseSearch = true
     this.getSearchResultCountData()
+    this.controller.stopEditing()
+  }
+
+  /**
+   * 点击hint搜索列表回调
+   * @param content
+   */
+  getSearchHintResData(content:string){
+    this.isClickedHintSearch = true
+    this.searchResData(content)
   }
 
   /**
@@ -155,7 +180,7 @@ export struct SearchComponent {
    * @param content
    */
   getSearchRelatedResData(content:string){
-    this.isClickedRelated = true
+    this.isClickedRelatedSearch = true
     this.searchResData(content)
   }
 
@@ -164,10 +189,18 @@ export struct SearchComponent {
    * @param content
    */
   getSearchHotResData(content:string){
-    this.isClickedHot = true
+    this.isClickedHotSearch = true
     this.searchResData(content)
   }
 
+  /**
+   * 点击输入法搜索搜索列表回调
+   * @param content
+   */
+  getSearchInputResData(content:string){
+    this.isClickedInputSearch = true
+    this.searchResData(content)
+  }
 
   //搜索框
   @Builder searchInputComponent() {
@@ -185,7 +218,7 @@ export struct SearchComponent {
                 .textAlign(TextAlign.Start)
                 .maxLines(1)
                 .textOverflow({ overflow: TextOverflow.Clip })
-                .margin({ left: '40lpx' })
+                .margin({ left: '70lpx' })
             })
           }
           .loop(true)
@@ -195,42 +228,57 @@ export struct SearchComponent {
           .vertical(true)
           .enabled(false)
           .focusable(false)
+          .onChange((index: number) => {
+            this.curHintSearchData = this.searchTextData[index]
+          })
         }
         Row(){
-          TextInput({ text: this.searchText, placeholder: '', controller: this.controller })
-          .caretColor(Color.Pink)
-          .fontSize('27lpx')
+          Search({ value: this.searchText, placeholder: '', controller: this.controller})
             .layoutWeight(1)
-          .fontColor(Color.Black)
+            .height('69lpx')
+            .backgroundColor($r('app.color.color_transparent'))
+            .textFont({ size: "27lpx", weight: "400lpx" })
+            .defaultFocus(true)
+            .caretStyle({color:Color.Pink})
+            .onSubmit((value: string) => {
+              if(StringUtils.isNotEmpty(this.searchText)){
+                SearcherAboutDataModel.putSearchHistoryData(this.searchText)
+                this.getSearchHistoryData()
+                this.getSearchInputResData(this.searchText)
+              }else{
+                if(!this.hasNoSearchTextData){
+                  if(StringUtils.isEmpty(this.curHintSearchData)){
+                    this.curHintSearchData =  this.searchTextData[0]
+                  }
+                  this.getSearchHintResData(this.curHintSearchData)
+                }else{
+                  ToastUtils.shortToast("请输入搜索关键词")
+                }
+              }
+            })
             .onChange((value: string) => {
               this.searchText = value
+              if(this.isClickedHistorySearch || this.isClickedHotSearch || this.isClickedRelatedSearch || this.isClickedInputSearch|| this.isClickedHintSearch){
+                this.hasChooseSearch = true
+              }else{
+                this.hasChooseSearch = false
+              }
+
               if (this.searchText.length > 0) {
                 this.hasInputContent = true
               } else {
                 this.hasInputContent = false
               }
-            if(this.isClickedHistory || this.isClickedHot || this.isClickedRelated){
-              this.isClickedHistory = false
-              this.isClickedHot = false
-              this.isClickedRelated = false
+
+              if(this.isClickedHistorySearch || this.isClickedHotSearch || this.isClickedRelatedSearch || this.isClickedInputSearch|| this.isClickedHintSearch){
+                this.resetSearch()
               }else{
+                if(this.hasInputContent){
                   this.getRelatedSearchContent()
                 }
-          })
-          .backgroundColor($r('app.color.color_transparent'))
-          .defaultFocus(true)
-          if(this.hasInputContent){
-            Image($r('app.media.search_input_del_icon'))
-              .width('31lpx')
-              .height('31lpx')
-              .objectFit(ImageFit.Cover)
-              .interpolation(ImageInterpolation.High)
-              .onClick(()=>{
-                this.searchText = ""
-                this.hasInputContent = false
-                this.hasChooseSearch = false
-              })
               }
+            })
+
         }.padding({right:'30lpx'})
         .layoutWeight(1)
       }
@@ -241,7 +289,7 @@ export struct SearchComponent {
 
       //TODO 需要修改输入法  换行
       //右
-      Text(this.hasInputContent?"搜索":"取消")
+      Text("取消")
         .textAlign(TextAlign.Center)
         .fontWeight('400lpx')
         .fontSize('31lpx')
@@ -250,16 +298,7 @@ export struct SearchComponent {
         .width('125lpx')
         .height('58lpx')
         .onClick(() => {
-          if(this.hasInputContent){
-            if(StringUtils.isNotEmpty(this.searchText)){
-              SearcherAboutDataModel.putSearchHistoryData(this.searchText)
-              this.getSearchHistoryData()
-
-              this.getSearchHotResData(this.searchText)
-            }
-          }else{
           router.back()
-          }
         })
     }
     .height('85lpx')
@@ -289,9 +328,19 @@ export struct SearchComponent {
         }
       }
       this.isGetRequest = true
+     this.resetSearch()
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       this.isGetRequest = true
+      this.resetSearch()
     })
   }
+
+  resetSearch(){
+    this.isClickedHistorySearch = false
+    this.isClickedHotSearch = false
+    this.isClickedRelatedSearch = false
+    this.isClickedInputSearch = false
+    this.isClickedHintSearch = false
+  }
 }
\ No newline at end of file

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

@@ -120,7 +120,7 @@ export struct SearchHistoryComponent{
       .columnsTemplate('1fr 1fr')
       .rowsGap('23lpx')
     }
-    .margin({bottom:'46lpx'})
+    .margin({top:"36lpx",bottom:'46lpx'})
   }
 
   getCategoryRowCount() {
@@ -135,6 +135,6 @@ export struct SearchHistoryComponent{
   }
 
   getCategoryViewHeight() {
-    return `${46 * this.getCategoryRowCount()}lpx`;
+    return `${50 * this.getCategoryRowCount()}lpx`;
   }
 }
\ No newline at end of file

@@ -41,19 +41,19 @@ export struct SearchHotsComponent{
 
         Text("热门搜索")
           .textAlign(TextAlign.Center)
-          .fontWeight('600lpx')
+          .fontWeight(FontWeight.Bold)
           .fontSize('33lpx')
           .lineHeight('46lpx')
           .fontColor($r('app.color.color_222222'))
-          .height('38lpx')
+          .height('46lpx')
       }
       .width('100%')
+      .margin({bottom:"15lpx"})
 
       List(){
         ForEach(this.searchHotsData,(item:SearchHotContentItem,index:number)=>{
           ListItem(){
               Column(){
-              Column(){
                 Row(){
                   Row(){
                     if(item.sequence <=3){
@@ -80,7 +80,8 @@ export struct SearchHotsComponent{
                       .fontWeight('400lpx')
                       .lineHeight('42lpx')
                   }.layoutWeight(1)
-                  if(item.mark!=0){
+
+                  if(item.mark===1 || item.mark===2){
                     Image(item.mark===1?$r('app.media.search_hots_mark1'):$r('app.media.search_hots_mark2'))
                       .width('42lpx')
                       .height('31lpx')
@@ -89,6 +90,7 @@ export struct SearchHotsComponent{
                   }
                 }.alignItems(VerticalAlign.Center)
                 .height('84lpx')
+                .width('100%')
                 .justifyContent(FlexAlign.SpaceBetween)
 
                 if(index != this.searchHotsData.length-1 ){
@@ -98,18 +100,15 @@ export struct SearchHotsComponent{
                     .color($r('app.color.color_F5F5F5'))
                     .strokeWidth('1lpx')
                 }
-              }.height('108lpx')
-              .justifyContent(FlexAlign.Center)
+              }.height('85lpx')
+              .width('100%')
               .alignItems(HorizontalAlign.Start)
-              .padding({left:'27lpx'})
-            }
           }
           .onClick(()=>{
             if (this.onGetSearchRes !== undefined) {
               this.onGetSearchRes(item.hotEntry)
             }
           })
-          .height('117lpx')
         })
       }.onScrollFrameBegin((offset, state) => {
         return { offsetRemain: 0 }

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

 import { Params } from 'wdBean';
 import { AppUtils, StringUtils } from 'wdKit/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
+import { CustomTitleUI } from '../reusable/CustomTitleUI';
 import { EnvironmentCustomDialog } from './EnvironmentCustomDialog';
 
 const TAG = 'AboutPageUI';
@@ -23,11 +24,11 @@ export struct AboutPageUI {
   })
 
   build() {
-    Navigation() {
+    // Navigation() {
       //滑动区域
       this.aboutUi()
-    }.titleMode(NavigationTitleMode.Mini)
-    .title('关于')
+    // }.titleMode(NavigationTitleMode.Mini)
+    // .title('关于')
   }
 
   aboutToAppear() {
@@ -42,6 +43,8 @@ export struct AboutPageUI {
   @Builder
   aboutUi() {
     Column() {
+      CustomTitleUI({titleName:'关于'})
+
       Image($r('app.media.setting_about_logo'))
         .width('278lpx')
         .height('154lpx')

@@ -76,14 +76,14 @@ export struct AccountAndSecurityLayout {
   addEmitEvent(){
     // 定义一个eventId为1的事件
     let event: emitter.InnerEvent = {
-      eventId: 10010
+      eventId: EmitterEventId.PHONE_CHANGE_SUCCESS
     };
 
     // 收到eventId为1的事件后执行该回调
     let callback = (eventData: emitter.EventData): void => {
-      promptAction.showToast({
-        message: JSON.stringify(eventData)
-      });
+      // promptAction.showToast({
+      //   message: JSON.stringify(eventData)
+      // });
       if(eventData&&eventData.data){
         this.listData[0].subTitle = eventData.data['content']
       }

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

@@ -197,7 +197,7 @@ export struct EmptyComponent {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) {
       contentString = '网络出小差了，请检查网络后重试'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) {
-      contentString = '获取内容失败请重试'
+      contentString = '获取内容失败，请重试'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoCreation) {
       contentString = '暂无作品'
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoBooking) {
@@ -231,11 +231,11 @@ export struct EmptyComponent {
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) {
       imageString = $r('app.media.icon_no_result')
     } 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) {
       imageString = $r('app.media.icon_no_content')
     } 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) {
       imageString = $r('app.media.icon_no_appointmentMade')
     } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NetworkFailed) {

@@ -158,6 +158,22 @@ export struct ImageItemView {
 
   build() {
     Stack() {
+      if(this.imageUri != null && (this.imageUri.includes('.gif') || this.imageUri.includes('.GIF'))){
+        Image(this.imageUri)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
+          .width(this.fitWH === "width" ? "100%" : undefined)
+          .height(this.fitWH === "height" ? "100%" : undefined)
+          .aspectRatio(this.imageWHRatio)
+          .objectFit(ImageFit.Cover)// TODO：知识点：保持宽高比进行缩放，可以超出父组件，以便实现多图切换的增强功能
+          .autoResize(false)
+          .transform(this.matrix)// TODO：知识点：通过matrix控制图片的缩放
+          .defaultFocus(true)
+          .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+          .offset({
+            // TODO：知识点：通过offset控制图片的偏移
+            x: this.imageOffsetInfo.currentX,
+            y: this.imageOffsetInfo.currentY
+          })
+      }else{
         Image(this.imagePixelMap)// TODO：知识点：宽高只根据其尺寸设置一个，通过保持宽高比来设置另一个属性
           .width(this.fitWH === "width" ? "100%" : undefined)
           .height(this.fitWH === "height" ? "100%" : undefined)
@@ -173,6 +189,8 @@ export struct ImageItemView {
             y: this.imageOffsetInfo.currentY
           })
       }
+
+    }
     .onBlur(() => {
       this.resetCurrentImageInfo();
     })

@@ -15,6 +15,8 @@ import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailV
 import { LikeComponent } from './LikeComponent';
 import { CommentTabComponent, CommentIconComponent, } from '../comment/view/CommentTabComponent';
 import { publishCommentModel } from '../comment/model/PublishCommentModel'
+// import { AudioBarView } from '../MorningEveningPaper/AudioBarView'
+// import { AudioDialog } from '../../dialog/AudioDialog'
 import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { PageRepository } from '../../repository/PageRepository';
@@ -26,25 +28,27 @@ const TAG = 'OperRowListView';
  * 稿件详情底部通栏组件：包含返回、评论、点赞、收藏、分享
  * 上层传值：
  * 1、（必传）    contentDetailData---稿件详情
- * 2、（非必传）  operationButtonList---组件展示条件，['comment', 'like', 'collect', 'share']，需要展示什么传什么
- * comment--评论；like--点赞；collect--收藏；share--分享；
+ * 2、（非必传）  operationButtonList---组件展示条件，
+ * ['comment', 'like', 'collect', 'share']，需要展示什么传什么
+ * comment--评论；like--点赞；collect--收藏；listen--音频；share--分享；
  *
  * 传值示例：
  OperRowListView({
  contentDetailData: this.contentDetailData[0],
- operationButtonList: ['comment', 'like', 'collect', 'share']
+ operationButtonList: ['comment', 'like', 'collect', 'listen', 'share']
  })
  */
 @Preview
 @Component
 export struct OperRowListView {
   @Prop contentDetailData: ContentDetailDTO // 稿件详情
-  @State operationButtonList: string[] = ['comment', 'like', 'collect', 'share'] // 组件展示条件
+  @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @ObjectLink publishCommentModel: publishCommentModel
   // @State contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
   @State interactData: InteractDataDTO = {} as InteractDataDTO
   @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
   @State likeBean: Record<string, string> = {}
+  @State audioUrl: string= ''
   needLike: boolean = true
 
   async aboutToAppear() {
@@ -70,10 +74,16 @@ export struct OperRowListView {
       this.publishCommentModel.targetRelObjectId = this.contentDetailData.reLInfo?.relObjectId + ''
       this.publishCommentModel.keyArticle = this.contentDetailData.keyArticle + ''
       this.publishCommentModel.targetType = this.contentDetailData.newsType + ''*/
+    // 音频需要数据
+    if (this.operationButtonList?.includes('listen')) {
+      this.audioUrl = this.contentDetailData.audioList[0]?.audioUrl || ''
+      console.log(TAG, 'this.audioUrl+++', this.audioUrl)
+    }
   }
 
   build() {
     Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+      // AudioDialog()
       Row() {
         Column() {
           Image($r('app.media.icon_arrow_left'))
@@ -95,6 +105,8 @@ export struct OperRowListView {
             this.builderLike()
           } else if (item == 'collect') {
             this.builderCollect()
+          } else if (item == 'listen') {
+            this.builderListen()
           } else if (item == 'share') {
             this.builderShare()
           } else {
@@ -176,6 +188,25 @@ export struct OperRowListView {
   }
 
   /**
+   * 音频组件
+   */
+  // this.audioUrl
+  @Builder
+  builderListen() {
+    Column() {
+      Image($r('app.media.icon_listen'))
+        .width(24)
+        .height(24)
+        .aspectRatio(1)
+        .interpolation(ImageInterpolation.High)
+        .onClick((event: ClickEvent) => {
+          ToastUtils.showToast('音频为公共方法，待开发', 1000);
+        })
+    }
+    .width(42)
+  }
+
+  /**
    * 分享组件
    */
   @Builder

@@ -12,8 +12,9 @@ export struct ENewspaperListDialog {
   @Consume @Watch('onCurrentPageNumUpdated') currentPageNum: string
   @State pageDialogShow: boolean = false
   @State scrollIndex: number = 0
-  @Prop newspaperListBean: NewspaperListBean = {} as NewspaperListBean
-  private listScroller: Scroller = new Scroller();
+  @Prop @Watch('updateRecordsData') newspaperListBean: NewspaperListBean = {} as NewspaperListBean
+  private listScroller: Scroller = new Scroller()
+  @State scrollOffset: number = 0
   //文字版选择弹框
   pageListDialogController: CustomDialogController = new CustomDialogController({
     builder: ENewspaperPageDialog({
@@ -73,7 +74,7 @@ export struct ENewspaperListDialog {
           Text(this.currentPageNum)
             .fontSize($r('app.float.font_size_36'))
             .fontColor($r('app.color.color_222222'))
-            .fontFamily('BebasNeue_Regular')
+            .fontFamily('BebasNeueBold')
           Text('版')
             .fontSize($r('app.float.font_size_16'))
             .fontColor($r('app.color.color_222222'))
@@ -114,16 +115,24 @@ export struct ENewspaperListDialog {
                           .fontSize($r('app.float.font_size_14'))
                           .fontColor($r('app.color.color_ED2800'))
                           .fontWeight(600)
-                          .margin({ top: 16, bottom: 16 })
+                          .width('100%')
+                          .textAlign(TextAlign.Start)
+                          .margin({
+                            // top: 16,
+                            bottom: 16
+                          })
                           .maxLines(1)
                       }
-
+                      Column() {
                         if (positionItem.shortTitle) {
                           Text(positionItem.shortTitle)
                             .fontSize($r('app.float.font_size_14'))
                             .fontColor($r('app.color.color_222222'))
                             .fontWeight(600)
                             .maxLines(2)
+                            .margin({
+                              bottom: 8
+                            })
                         }
 
                         if (positionItem.title) {
@@ -131,7 +140,9 @@ export struct ENewspaperListDialog {
                             .fontSize($r('app.float.font_size_17'))
                             .fontColor($r('app.color.color_222222'))
                             .fontWeight(600)
-                          .margin({ top: 8 })
+                            .margin({
+                              bottom: 8
+                            })
                             .maxLines(2)
                         }
 
@@ -140,19 +151,24 @@ export struct ENewspaperListDialog {
                             .fontSize($r('app.float.font_size_14'))
                             .fontColor($r('app.color.color_222222'))
                             .fontWeight(600)
-                          .margin({ top: 8 })
+                            .margin({
+                              bottom: 8
+                            })
                             .maxLines(2)
                         }
-
                         if (positionItem.newsTxt) {
                           Text(positionItem.newsTxt)
                             .fontSize($r('app.float.font_size_14'))
                             .fontColor($r('app.color.color_999999'))
-                          .margin({ top: 15, bottom: 15 })
+                            .lineHeight(25)
+                            .margin({
+                              // bottom: 15
+                            })
                             .maxLines(5)
                             .textOverflow({ overflow: TextOverflow.Ellipsis })
                         }
                       }
+                      .width('100%')
                       .alignItems(HorizontalAlign.Start)
                       .onClick(() => {
                         let taskAction: Action = {
@@ -172,38 +188,66 @@ export struct ENewspaperListDialog {
                         //   this.listDialogController.close()
                         // }
                       })
+
+                      if (item.items.length != itemIndex + 1) {
+                        Divider()
+                          .strokeWidth(0.5)
+                          .color('#EDEDED')
+                          .padding({
+                            top: 15,
+                            bottom: 15
+                          })
+                      }
+                    }
                   }
                 })
               }
-              .divider({
-                strokeWidth: 0.5,
-                color: '#EDEDED'
+              // .divider({
+              //   color: '#EDEDED',
+              //   strokeWidth: 0.5
+              // })
+              .padding({
+                top: 16,
+                bottom: 16
               })
             }
           })
         }
+        .divider({
+          color: '#EDEDED',
+          strokeWidth: 0.5
+        })
         .width('100%')
-        .padding({ left: 15, right: 15 })
+        .padding({
+          left: 15,
+          right: 15,
+          top: 16,
+          bottom: 16
+        })
         .margin({
           bottom: 85
         })
         .scrollBar(BarState.Off)
-        .divider({
-          strokeWidth: 0.5,
-          color: '#EDEDED'
-        })
-        .onScrollIndex((firstIndex: number) => {
-          console.log('firstIndex', firstIndex)
-        })
+
         .onScrollIndex((firstIndex: number, lastIndex: number, centerIndex: number) => {
-          console.info('first' + firstIndex)
-          console.info('last' + lastIndex)
-          console.info('center' + centerIndex)
+          // console.info('ENewspaperListDialog::first' + firstIndex)
+          // console.info('ENewspaperListDialog::last' + lastIndex)
+          // console.info('ENewspaperListDialog::center' + centerIndex)
           // this.updateCurrentPageNum(firstIndex)
+          // const tempIndex = this.findClassIndex(firstIndex)
+          if (firstIndex !== centerIndex) {
+            return
+          }
+          // console.info(`this.scrollOffset:` + this.scrollOffset)
+          // if (this.scrollOffset == 0) {
             this.currentPageNum = `${centerIndex < 9 ? '0' + (centerIndex + 1) : centerIndex + 1}`
+          // }
         })
         .onScroll((scrollOffset: number, scrollState: ScrollState) => {
-          console.info(`onScroll scrollState = ScrollState` + scrollState + `, scrollOffset = ` + scrollOffset)
+          // console.info(`onScroll scrollState = ScrollState` + scrollState + `, scrollOffset = ` + scrollOffset)
+          // if (this.scrollOffset == 0) {
+          //   this.scrollOffset = 0
+          // }
         })
       }
       .margin({ top: 124 })
@@ -222,23 +266,25 @@ export struct ENewspaperListDialog {
     })
   }
 
-  updateCurrentPageNum(firstIndex: number): void {
-    if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
-      let index = 0;
-      for (let itemBean of this.newspaperListBean.list) {
-        if (itemBean.items && itemBean.items.length > 0) {
-          for (let item of itemBean.items) {
-            index++
-            if (index == firstIndex) {
-              this.currentPageNum = itemBean.pageNum
-              return
-            }
-          }
-        }
-      }
+  updateRecordsData() {
+    // if (this.newspaperListBean.list && this.newspaperListBean.list.length > 0) {
+    //   for (let itemBean of this.newspaperListBean.list) {
+    //     index += itemBean.items.length
+    //     this.records.push(index)
+    //   }
+    // }
   }
 
-  }
+  // findClassIndex(index: number): number {
+  //   let ans = 0;
+  //   for (let i = 0; i < this.records.length; i++) {
+  //     if (index >= this.records[i] && index < this.records[i + 1]) {
+  //       ans = i;
+  //       break;
+  //     }
+  //   }
+  //   return ans;
+  // }
 }
 
 

@@ -29,7 +29,7 @@ export struct ENewspaperPageDialog {
                 Text(item.pageNum)
                   .fontSize($r('app.float.normal_text_size'))
                   .fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222'))
-                  .fontFamily('BebasNeue_Regular')
+                  .fontFamily('BebasNeueBold')
               }
               .alignItems(VerticalAlign.Center)
               .justifyContent(FlexAlign.Center)

+@CustomDialog
+export struct MergeRecordDialog {
+  controller: CustomDialogController
+  cancel: () => void = () => {
+  }
+  confirm: () => void = () => {
+  }
+
+  build() {
+    Column() {
+      Text("合并游客记录到当前账号，可避免信息丢失")
+        .fontColor("#333333")
+        .fontSize(18)
+        .width("100%")
+        .fontWeight(FontWeight.Bold)
+        .textAlign(TextAlign.Center)
+        .margin({ top: 25 })
+        .padding({left:24,right:24})
+
+      Divider().color("#08000000").width("100%").margin({ top: 20 }).height('2vp')
+      Row() {
+        Text('取消')
+          .fontSize(18)
+          .fontColor("#648DF2")
+          .layoutWeight(1)
+          .fontWeight(FontWeight.Medium)
+          .textAlign(TextAlign.Center)
+          .onClick(() => {
+            this.controller.close()
+            if (this.cancel) {
+              this.cancel()
+            }
+
+          })
+          .height(50)
+        Divider().color("#eeeeee").height(44).width(1).margin({top:3}).strokeWidth(1).vertical(true)
+        Text('一键合并')
+          .fontSize(18)
+          .fontColor("#648DF2")
+          .layoutWeight(1)
+          .fontWeight(FontWeight.Medium)
+          .textAlign(TextAlign.Center)
+          .onClick(() => {
+            this.controller.close()
+            if (this.confirm) {
+              this.confirm()
+            }
+          })
+          .height(50)
+      }.layoutWeight(1).justifyContent(FlexAlign.Center)
+    }.height(140).backgroundColor(Color.White).borderRadius(14).width('75%')
+  }
+}
\ No newline at end of file

@@ -4,7 +4,7 @@ import MinePageCreatorFunctionsItem from '../viewmodel/MinePageCreatorFunctionsI
 import MinePageMoreFunctionModel from '../viewmodel/MinePageMoreFunctionModel';
 import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { MineAppointmentListItem } from '../viewmodel/MineAppointmentListItem';
-import { Logger, StringUtils, EmitterUtils, EmitterEventId } from 'wdKit';
+import { Logger, StringUtils, EmitterUtils, EmitterEventId, SPHelper } from 'wdKit';
 import { MineFollowListDetailItem } from '../viewmodel/MineFollowListDetailItem';
 import { FollowListDetailRequestItem } from '../viewmodel/FollowListDetailRequestItem';
 import { FollowListItem } from '../viewmodel/FollowListItem';
@@ -22,6 +22,7 @@ import { UserFollowListRequestItem } from '../viewmodel/UserFollowListRequestIte
 import { AppointmentOperationRequestItem } from '../viewmodel/AppointmentOperationRequestItem';
 import { CommentLikeOperationRequestItem } from '../viewmodel/CommentLikeOperationRequestItem';
 import { FollowOperationRequestItem } from '../viewmodel/FollowOperationRequestItem';
+import { SpConstants } from 'wdConstant/Index';
 
 const TAG = "MinePageDatasModel"
 
@@ -559,7 +560,26 @@ class MinePageDatasModel{
     return WDHttp.post<ResponseDTO>(url,object)
   };
 
-
+  visitorMergeComment() {
+    let bean: Record<string, string> = {};
+    bean['time'] = SPHelper.default.getSync(SpConstants.FIRSTCOMMENTTIME, "") as string
+    bean['deviceId'] = HttpUtils.getDeviceId();
+    return new Promise<object>((success, error) => {
+      // Logger.info(TAG, `visitorMergeComment`);
+      HttpBizUtil.post<ResponseDTO<object>>(HttpUrlUtils.visitorMergeComment(), bean).then((data: ResponseDTO<object>) => {
+        if (!data) {
+          error()
+        }
+        if (data.code != 0) {
+          error()
+        }
+        SPHelper.default.save(SpConstants.FIRSTCOMMENTTIME, "")
+        success(data)
+      }).catch(() => {
+        error()
+      })
+    })
+  }
 }
 
 const minePageDatasModel = MinePageDatasModel.getInstance()

 
-import { Logger, SPHelper, UserDataLocal } from 'wdKit';
+import { Logger, SPHelper, StringUtils, UserDataLocal } from 'wdKit';
 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { SearchHistoryItem } from '../viewmodel/SearchHistoryItem';
 import { SearchHotContentItem } from '../viewmodel/SearchHotContentItem';
@@ -18,7 +18,7 @@ const TAG = "SearcherAboutDataModel"
 class SearcherAboutDataModel{
   private static instance: SearcherAboutDataModel;
   public searchHistoryData:SearchHistoryItem[] = []
-  public SEARCH_HISTORY_KEY:string = "SEARCH_HISTORY_KEY" + UserDataLocal.getUserId()
+  public SEARCH_HISTORY_KEY:string = "SEARCH_HISTORY_KEY"
 
   private constructor() { }
 
@@ -37,7 +37,7 @@ class SearcherAboutDataModel{
    * 插入搜索记录（单个）
    */
   public async putSearchHistoryData(content:string){
-    let history = SPHelper.default.getSync(this.SEARCH_HISTORY_KEY,"[]") as string
+    let history = SPHelper.default.getSync(this.generationSearchKey(),"[]") as string
     this.searchHistoryData = JSON.parse(history)
     this.searchHistoryData.forEach((element,index) => {
       if (element.searchContent == content) {
@@ -45,14 +45,14 @@ class SearcherAboutDataModel{
       }
     });
     this.searchHistoryData.splice(0,0,new SearchHistoryItem(content))
-    await SPHelper.default.saveSync(this.SEARCH_HISTORY_KEY, JSON.stringify(this.searchHistoryData));
+    await SPHelper.default.saveSync(this.generationSearchKey(), JSON.stringify(this.searchHistoryData));
   }
 
   /**
    * 删除搜索记录（所有）
    */
   public async delSearchHistoryData(){
-    SPHelper.default.deleteSync(this.SEARCH_HISTORY_KEY)
+    SPHelper.default.deleteSync(this.generationSearchKey())
     this.searchHistoryData = []
   }
   /**
@@ -62,11 +62,11 @@ class SearcherAboutDataModel{
     if(this.searchHistoryData!=null && this.searchHistoryData.length>0){
       this.searchHistoryData.splice(index,1)
     }else{
-      let history = SPHelper.default.getSync(this.SEARCH_HISTORY_KEY,"[]") as string
+      let history = SPHelper.default.getSync(this.generationSearchKey(),"[]") as string
       this.searchHistoryData = JSON.parse(history)
       this.searchHistoryData.splice(index,1)
     }
-    SPHelper.default.saveSync(this.SEARCH_HISTORY_KEY, JSON.stringify(this.searchHistoryData))
+    SPHelper.default.saveSync(this.generationSearchKey(), JSON.stringify(this.searchHistoryData))
   }
 
   /**
@@ -79,7 +79,7 @@ class SearcherAboutDataModel{
       }
       return this.searchHistoryData
     }
-    let history = SPHelper.default.getSync(this.SEARCH_HISTORY_KEY,"[]") as string
+    let history = SPHelper.default.getSync(this.generationSearchKey(),"[]") as string
 
     this.searchHistoryData = JSON.parse(history)
     if(this.searchHistoryData.length>10){
@@ -91,6 +91,15 @@ class SearcherAboutDataModel{
     return  this.searchHistoryData
   }
 
+  public generationSearchKey():string{
+    let userId = UserDataLocal.getUserId()
+    if(StringUtils.isEmpty(userId)){
+      return this.SEARCH_HISTORY_KEY + "_" + "0000111122223333"
+    }else{
+      return this.SEARCH_HISTORY_KEY + "_" + userId
+    }
+  }
+
   /**
    * 首页 搜索提示滚动内容
    */

@@ -20,6 +20,7 @@ struct MineHomePage {
   @State userName:string = ""
   @State headPhotoUrl:string = ""
   @State levelHead:string = ""
+  userType:string = "1"
   @State levelId:number = 0
   @State desc:string = "点击添加简介，让大家认识你" //text 搞两个样式，如果三行，就显示 另外一个text  没有显示高度的
   @State isHasIntroduction: boolean = false
@@ -31,7 +32,6 @@ struct MineHomePage {
 
   onPageShow(): void {
     this.getUserInfo()
-    this.getUserLevel()
   }
 
   build() {
@@ -403,7 +403,20 @@ struct MineHomePage {
         this.attentionNum = value.attentionNum
         this.registTime = value.registTime
         this.getRegisterDays()
+
+        this.userType = value.userType
+
+        if(this.userType === "1"){
+          if(StringUtils.isNotEmpty(value.honoraryIcon)){
+            this.levelHead = value.honoraryIcon
+            return
+          }
+          if(StringUtils.isNotEmpty(value.avatarFrame)){
+            this.levelHead = value.avatarFrame
+          }
         }
+      }
+      this.getUserLevel()
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))
     })
@@ -411,7 +424,11 @@ struct MineHomePage {
   getUserLevel(){
     MinePageDatasModel.getUserLevelData(getContext(this)).then((value)=>{
       if(value!=null){
+        if(StringUtils.isEmpty(this.levelHead)){
+          if(this.userType === "1"){
             this.levelHead = value.levelHead
+          }
+        }
         this.levelId = value.levelId
       }
     }).catch((err:Error)=>{

@@ -3,6 +3,7 @@ import { display, router } from '@kit.ArkUI';
 import { ImageItemView } from '../components/view/ImageItemView';
 import { ImageDownloadComponent } from '../components/ImageDownloadComponent';
 import { Action } from 'wdBean';
+import { WindowModel } from 'wdKit/Index';
 
 const TAG = 'MultiPictureListPage';
 
@@ -23,6 +24,7 @@ export struct MultiPictureListPage {
   // @Provide bgc: Color = Color.White;
 
   aboutToAppear(): void {
+    this.openFullScreen()
     //获取宽高尺寸
     this.screenWidth = this.displayTool.width
     // this.picWidth = this.screenWidth - vp2px(52)
@@ -130,10 +132,36 @@ export struct MultiPictureListPage {
     }
     .width('100%')
     .height('100%')
+    .padding({top:$r('app.float.margin_44')})
     .backgroundColor(Color.Black)
     .id('e_picture_container')
     // 设置顶部绘制延伸到状态栏
     // 设置底部绘制延伸到导航条
     .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
   }
+
+  /**
+   * 开启沉浸式
+   * TODO:颜色待根据业务接口修改
+   */
+  openFullScreen() {
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
+    WindowModel.shared.setWindowLayoutFullScreen(true)
+    // WindowModel.shared.setWindowSystemBarEnable([])
+  }
+
+  aboutToDisappear(): void {
+    console.log(TAG, 'aboutToDisappear')
+    this.closeFullScreen()
+  }
+
+  /**
+   * 关闭沉浸式
+   * TODO:颜色待根据业务接口修改
+   */
+  closeFullScreen() {
+    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
+    WindowModel.shared.setWindowLayoutFullScreen(false)
+    // WindowModel.shared.setWindowSystemBarEnable(['status', 'navigation'])
+  }
 }
\ No newline at end of file

@@ -38,10 +38,10 @@ struct OtherNormalUserHomePage {
   @State commentNum:number = 0//评论数
   @State attentionNum:number = 0//关注数
   @State desc:string = ""
+  userType:string = "1"
 
   aboutToAppear(){
     this.getUserInfo()
-    this.getUserLevel()
   }
 
 
@@ -348,7 +348,20 @@ struct OtherNormalUserHomePage {
         this.browseNum = StringUtils.isEmpty(value.browseNum)?0:value.browseNum
         this.commentNum = StringUtils.isEmpty(value.commentNum)?0:value.commentNum
         this.attentionNum = StringUtils.isEmpty(value.attentionNum)?0:value.attentionNum
+
+        this.userType = value.userType
+
+        if(this.userType === "1"){
+          if(StringUtils.isNotEmpty(value.honoraryIcon)){
+            this.levelHead = value.honoraryIcon
+            return
+          }
+          if(StringUtils.isNotEmpty(value.avatarFrame)){
+            this.levelHead = value.avatarFrame
           }
+        }
+      }
+      this.getUserLevel()
     }).catch((err:Error)=>{
       console.log(TAG,JSON.stringify(err))
     })
@@ -359,7 +372,11 @@ struct OtherNormalUserHomePage {
     }
     MinePageDatasModel.getOtherUserLevelData([this.curUserId],getContext(this)).then((value)=>{
       if(value!=null){
+        if(StringUtils.isEmpty(this.levelHead)){
+          if(this.userType === "1"){
             this.levelHead = value[0].levelHead
+          }
+        }
         this.levelId = value[0].level
       }
     }).catch((err:Error)=>{

@@ -4,16 +4,18 @@ import { router } from '@kit.ArkUI';
 @Component
 struct ShowUserHeaderPage {
   @State headPhotoUrl: string = '';
+  @State headType: string = ''
   @State params:Record<string, string> =  router.getParams() as Record<string, string>;
 
   onPageShow() {
     this.headPhotoUrl = this.params?.['headPhotoUrl'];
+    this.headType = this.params?.['headType'] ?? '';
   }
 
   build() {
     Row() {
       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')
         .height('720lpx')
         .objectFit(ImageFit.Auto)

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

@@ -3,6 +3,7 @@ import { touchMoveLoadMore, touchUpLoadMore } from './PullUpLoadMore';
 import PageModel from '../viewmodel/PageModel';
 import PageHelper from '../viewmodel/PageHelper';
 import PageAdModel from '../viewmodel/PageAdvModel';
+import { LoadStatus } from '../components/refresh/RefreshLayoutBean';
 
 export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel, event: TouchEvent) {
   switch (event.type) {
@@ -46,7 +47,7 @@ export function listTouchEvent(pageModel: PageModel, pageAdvModel: PageAdModel,
 export function touchMovePullRefresh(pageModel: PageModel, event: TouchEvent) {
   if (pageModel.startIndex === 0) {
     pageModel.isPullRefreshOperation = true;
-    let height = vp2px(pageModel.pullDownRefreshHeight);
+    let height = vp2px(Const.CUSTOM_REFRESH_DECIDE_HEIGHT);
     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.
     if (pageModel.offsetY >= height) {
@@ -98,12 +99,14 @@ export function pullRefreshState(pageModel: PageModel, state: number) {
       pageModel.isCanRefresh = false;
       pageModel.isRefreshing = false;
       pageModel.isVisiblePullDown = true;
+      pageModel.load = LoadStatus.PRELOAD
       break;
     case RefreshState.Release:
       pageModel.pullDownRefreshText = $r('app.string.release_refresh_text');
       pageModel.pullDownRefreshImage = $r('app.media.ic_pull_up_refresh');
       pageModel.isCanRefresh = true;
       pageModel.isRefreshing = false;
+      pageModel.load = LoadStatus.PRELOAD
       break;
     case RefreshState.Refreshing:
       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.isCanRefresh = true;
       pageModel.isRefreshing = true;
+      pageModel.load = LoadStatus.LOADING
       break;
     case RefreshState.Success:
       pageModel.pullDownRefreshText = $r('app.string.refresh_success_text');
       pageModel.pullDownRefreshImage = $r('app.media.ic_succeed_refresh');
       pageModel.isCanRefresh = true;
       pageModel.isRefreshing = true;
+      pageModel.load = LoadStatus.LOADED
       break;
     case RefreshState.Fail:
       pageModel.pullDownRefreshText = $r('app.string.refresh_fail_text');
       pageModel.pullDownRefreshImage = $r('app.media.ic_fail_refresh');
       pageModel.isCanRefresh = true;
       pageModel.isRefreshing = true;
+      pageModel.load = LoadStatus.LOADED
       break;
     default:
       break;

@@ -34,7 +34,11 @@ export class RefreshConstants {
   /**
    * The refresh and load height.
    */
-  static readonly CUSTOM_LAYOUT_HEIGHT: number = 90;
+  static readonly CUSTOM_LAYOUT_HEIGHT: number = 80;
+  /**
+   * 下拉刷新，判定距离
+   */
+  static readonly CUSTOM_REFRESH_DECIDE_HEIGHT: number = 20;
   /**
    * Full the width.
    */

@@ -9,4 +9,10 @@ export class MineUserDetailItem{
   commentNum:number = 0//评论数
   attentionNum:number = 0//关注数
   registTime:number = 0//账号注册时间
+
+  honoraryIcon = ""//荣誉称号 (优先)
+  avatarFrame:string = ""//最佳评论员头像框地址
+
+
+
 }
\ No newline at end of file

 import { CompDTO, ContentDTO, PageDTO, PageInfoDTO } from 'wdBean';
 import { CompStyle, ViewType } from 'wdConstant/Index';
-import { CollectionUtils, DateTimeUtils, Logger, NetworkUtil } from 'wdKit';
+import { CollectionUtils, DateTimeUtils, Logger, NetworkUtil, StringUtils } from 'wdKit';
 import { closeRefresh } from '../utils/PullDownRefresh';
 import PageModel from './PageModel';
 import PageViewModel from './PageViewModel';
@@ -9,6 +9,7 @@ import { CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean';
 import PageAdModel from './PageAdvModel';
 import { ArrayList } from '@kit.ArkTS';
 import { WDViewDefaultType } from '../components/view/EmptyComponent';
+import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 
 const TAG = 'PageHelper';
 
@@ -21,6 +22,7 @@ export class PageHelper {
    */
   async refreshUI(pageModel: PageModel, pageAdvModel: PageAdModel) {
     pageModel.loadStrategy = 2
+    pageModel.pageTotalCompSize = 0;
     this.getPageInfo(pageModel, pageAdvModel)
   }
 
@@ -52,7 +54,7 @@ export class PageHelper {
     PageViewModel.getPageInfo(pageModel.pageId).then(pageInfo => {
       if (pageInfo == null) {
         pageModel.viewType = ViewType.EMPTY;
-        pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoListContent;
+        pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
         return;
       }
       pageModel.pageInfo = pageInfo;
@@ -94,7 +96,7 @@ export class PageHelper {
       // 没数据，展示空页面
       Logger.debug(TAG, 'aboutToAppear, data response page ' + pageModel.pageId + ', comp list is empty.');
       pageModel.viewType = ViewType.EMPTY;
-      pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoListContent;
+      pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
 
     }
   }
@@ -114,7 +116,6 @@ export class PageHelper {
       //移除音频 和 活动
       this.collectPageComp(pageModel, pageDto)
 
-
       // pageModel.compList.push(...pageDto.compList)
 
       // TODO 暂时去掉互动数据，待优化。（主要是互动数据返回，如何渲染到ui上）
@@ -147,7 +148,7 @@ export class PageHelper {
    *   处理页面中的广告组件信息
    * @param pageDto
    */
-  private handlePageCompAdvPostion(pageCompList: ArrayList<CompDTO>, pageDto: PageDTO) {
+  private handlePageCompAdvPostion(pageCompList: ArrayList<CompDTO>, pageModel: PageModel, pageDto: PageDTO) {
 
     let compAdvList = pageDto.compAdList
 
@@ -160,16 +161,17 @@ export class PageHelper {
     }
 
     let pageCompSize = pageCompList.length // 信息流组件业务数量
-    console.error("ZZZXXXXX", " start--->" + pageCompSize);
-
+    //  console.error("ZZZXXXXX", " start--->" + pageCompSize);
     if (pageCompSize == 0) {
       flag = false
     }
 
     if (flag) {
+      let bannerAdvIndex = 0; // banner组件展示数据投放
+      let layoutAdvIndex = 0; //稿件投放统计
       // 升序排序
       compAdvList.sort((a: CompAdvBean, b: CompAdvBean) => a.slotInfo.position - b.slotInfo.position)
-      console.error("ZZZXXXXX", " 排序后的广告--->" + JSON.stringify(compAdvList));
+     //  console.error("ZZZXXXXX", " 排序后的广告--->" + JSON.stringify(compAdvList));
       //当前日期
       let serverTimeLong: number = DateTimeUtils.getTimeStamp();
       for (let advBean of compAdvList) {
@@ -192,22 +194,97 @@ export class PageHelper {
             // 插入轮播组件的广告
             if (4 == advSubType) {
 
+              let position = slotInfo.position - 1;
+              // 检测newCompList 集合中是否有轮播组件资源
+              let adCompId = slotInfo.compId;
+              if (!StringUtils.isEmpty(adCompId)) {
+                for (let compBean of pageCompList) {
+                  if (StringUtils.isEmpty(compBean.id)) {
+                    continue
+                  }
+                  let compId = compBean.id.toString();
+                  //匹配组件
+                  if (adCompId == compId) {
+                    // 运营位数据
+                    let dataList = compBean.operDataList;
+                    if (dataList != null) {
+
+                      // 数组转成 ArrayList
+                      let changeArrayList = (dataList: ContentDTO[]) => {
+                        let compOperData: ArrayList<ContentDTO> = new ArrayList()
+                        for (let dataListBean of dataList) {
+                          compOperData.add(dataListBean)
+                        }
+                        return compOperData
+                      }
+
+                      let compOperData = changeArrayList(dataList)
+
+                      // 轮播组件广告数据转 业务信息
+                      let changeContentDTO = (matInfo: CompAdvMatInfoBean) => {
+                        let advContentBean: ContentDTO = {} as ContentDTO;
+                        advContentBean.newsTitle = matInfo.advTitle
+                        advContentBean.objectType = matInfo.advType == "0" ? matInfo.advType.toString() : "4"
+                        advContentBean.coverUrl = matInfo.matImageUrl[0]
+                        advContentBean.linkUrl = matInfo.linkUrl
+                        advContentBean.openType = matInfo.linkType
+                        advContentBean.corner = ''
+                        return advContentBean
+                      }
+                      let advContentBean = changeContentDTO(matInfo)
+
+                      let dataListSize = dataList.length;
+                      if (position < dataListSize) {
+                        //dataList.add(position + bannerAdvIndex, advContentBean);
+                        compOperData.insert(advContentBean, position + bannerAdvIndex)
+                      } else {
+                        compOperData.add(advContentBean);
+                      }
+                      bannerAdvIndex = bannerAdvIndex + 1;
+
+                      // ArrayList转成 数组
+                      compBean.operDataList = compOperData.convertToArray()
+                    }
+                  }
+                }
+              }
+
             } else {
+
+
               let advPosition = slotInfo.position //广告位置,从1开始
+              // 页面的comp总数 - 这次请求的comp总数 = 剩余comp总数
               advPosition = advPosition - 1
+
+              let a = pageModel.pageTotalCompSize - pageCompSize
+              if (advPosition <= pageModel.pageTotalCompSize && advPosition >= a) {
+
+                let b = advPosition - a;
+                //  console.error('ZZZXXXXX', matInfo.advSubType + '-------------' + matInfo.advTitle + "  " + advPosition + "  " + a + "  " + b)
+                if (b <= pageCompSize && b >= 0) {
+
                   let advComp: CompDTO = {
                     compStyle: CompStyle.Card_Comp_Adv,
                     matInfo: matInfo
                   } as CompDTO;
-              pageCompList.insert(advComp, 0)
+
+                  if (pageCompSize == slotInfo.position) {
+                    pageCompList.add(advComp)
+                  } else {
+                    pageCompList.insert(advComp, b + layoutAdvIndex)
+                  }
+
+                  layoutAdvIndex = layoutAdvIndex + 1;
+
+                }
+              }
             }
           }
         }
-
       }
 
     }
-    console.error("ZZZXXXXX", " end--->" + pageCompList.length);
+    // console.error("ZZZXXXXX", " end--->" + pageCompList.length);
   }
 
 
@@ -228,19 +305,21 @@ export class PageHelper {
 
           //移除音频 和 活动
           this.collectPageComp(pageModel, data)
-          //
+
           // 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) => {
       promptAction.showToast({ message: err });
     })
   }
 
+
   /**
    * 移除comp
    */
@@ -256,11 +335,22 @@ export class PageHelper {
       if (contentInfo && (contentInfo.objectType === '13' || contentInfo.objectType === '3')) {
         Logger.debug(TAG, 'getGroupData 移除音频 和 活动');
       } else {
+        // 暂时屏蔽活动和音频详情入口
+        if (element.operDataList[0]?.objectType === '3' || element.operDataList[0]?.objectType === '13') {
+        } else {
           pageCompList.add(element)
         }
+
       }
+    }
+
+    // 记录
+    pageModel.pageTotalCompSize = pageCompList.length + pageModel.pageTotalCompSize
+    // console.error("ZZZXXXXX", " collectPageComp--->" + pageModel.pageTotalCompSize);
+
     // 处理页面广告数据，投放到页面的位置
-    //this.handlePageCompAdvPostion(pageCompList, pageDto);
+    this.handlePageCompAdvPostion(pageCompList, pageModel, pageDto);
+
 
     //遍历所有组件和稿件数据 push到页面
     for (let element of pageCompList) {

@@ -6,6 +6,7 @@ import { PageUIReqBean } from '../components/page/bean/PageUIReqBean';
 import { GroupInfoDTO, PageInfoDTO } from 'wdBean/src/main/ets/bean/navigation/PageInfoDTO';
 import { AdvRuleBean, CompAdvBean } from 'wdBean/src/main/ets/bean/adv/AdvsRuleBean';
 import { WDViewDefaultType } from '../components/view/EmptyComponent';
+import { LoadStatus } from '../components/refresh/RefreshLayoutBean';
 
 /**
  * 页面下拉刷新、上拉加载数据bean。
@@ -33,6 +34,7 @@ export default class PageModel {
   pullDownRefreshImage: Resource = $r('app.media.ic_pull_down_refresh');
   pullDownRefreshHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
   isVisiblePullDown: boolean = false;
+  load: LoadStatus = LoadStatus.IDLE;
   pullUpLoadText: Resource = $r('app.string.pull_up_load_text');
   pullUpLoadImage: Resource = $r('app.media.ic_pull_up_load');
   pullUpLoadHeight: number = Const.CUSTOM_LAYOUT_HEIGHT;
@@ -54,6 +56,9 @@ export default class PageModel {
   timestamp: String = '1';
 
 
+  // 记录已经展示的稿件和组件数量
+  pageTotalCompSize: number = 0;
+
   /**
    * 简单复制业务数据
    */

@@ -8,7 +8,8 @@ import {
   NavigationBodyDTO,
   PageDTO,
   PageInfoBean,
-  PageInfoDTO
+  PageInfoDTO,
+  GoldenPositionExtraBean
 } from 'wdBean';
 
 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) => {
       Logger.info(TAG, `postThemeList pageInfo start`);
-      PageRepository.postThemeList({ sort, pageNum, pageSize }).then((resDTO) => {
+      PageRepository.postThemeList(bean).then((resDTO) => {
         if (!resDTO || !resDTO.data) {
           Logger.error(TAG, 'postThemeList then navResDTO is empty');
           error('resDTO is empty');

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

@@ -221,6 +221,10 @@
       "value": "36vp"
     },
     {
+      "name": "margin_44",
+      "value": "44vp"
+    },
+    {
       "name": "vp_3",
       "value": "3vp"
     },

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="9" height="6" viewBox="0 0 9 6"><g><g><path d="M2.63066,0.5L7.79156,0.5C8.13703,0.5,8.3784,0.8420000000000001,8.26266,1.167505L6.84044,5.1675C6.76957,5.36684,6.5809,5.5,6.36934,5.5L1.208442,5.5C0.862974,5.5,0.6216,5.158,0.737335,4.8325L2.15956,0.832495C2.23043,0.633155,2.4191000000000003,0.5,2.63066,0.5" fill-rule="evenodd" fill="#ED2800" fill-opacity="1"/></g></g></svg>
\ No newline at end of file

 import font from '@ohos.font'
 import { LiveDetailsBean } from 'wdBean/Index'
-import { DateTimeUtils, StringUtils } from 'wdKit/Index'
+import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { HttpUtils } from 'wdNetwork/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
@@ -167,6 +167,11 @@ export struct LiveCountdownComponent {
       (data) => {
         if (data.success) {
           this.isAppointmentLive = !this.isAppointmentLive
+          if (this.isAppointmentLive) {
+            ToastUtils.showToast('预约成功', 1000)
+          } else {
+            ToastUtils.showToast('取消预约成功', 1000)
+          }
         }
       },
       () => {

@@ -34,7 +34,7 @@ export struct TabComponent {
     .layoutWeight(1)
     .vertical(false)
     .barMode(BarMode.Fixed)
-    .barWidth(200)
+    .barWidth(70 * this.tabs.length)
     .barHeight(48)
     .animationDuration(100)
     .onChange((index: number) => {

 import { LiveDetailsBean, LiveRoomItemBean } from 'wdBean/Index'
-import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI,
-  WDViewDefaultType } from 'wdComponent/Index'
+import { EmptyComponent, ErrorComponent, ListHasNoMoreDataUI, WDViewDefaultType } from 'wdComponent/Index'
 import { TabLiveItemComponent } from './TabLiveItemComponent'
 import CustomRefreshLoadLayout from 'wdComponent/src/main/ets/components/page/CustomRefreshLoadLayout'
 import { RefreshLayoutBean } from 'wdComponent/src/main/ets/components/page/RefreshLayoutBean'
@@ -59,10 +58,10 @@ export struct TabLiveComponent {
       // 加载更多
       ListItem() {
         if (this.pageModel.hasMore) {
-          LoadMoreLayout({
-            refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
-              this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
-          })
+          // LoadMoreLayout({
+          //   refreshBean: new RefreshLayoutBean(this.pageModel.isVisiblePullUpLoad, this.pageModel.pullUpLoadImage,
+          //     this.pageModel.pullUpLoadText, this.pageModel.pullUpLoadHeight)
+          // })
         } else {
           ListHasNoMoreDataUI()
         }
@@ -90,7 +89,7 @@ export struct TabLiveComponent {
           if (data.barrageResponses && data.barrageResponses.length > 0) {
             /**
              * 在直播聊天添加一条新内容逻辑：
-             判断 oldNewsId：迁移id非空 且 直播状态不是预约："wait"
+             判断 oldNewsId：迁移id为空 且 直播状态不是预约："wait"
              消息内容：
              1.头像固定：APP默认头像
              2.名称固定：人民日报主持人
@@ -106,24 +105,39 @@ export struct TabLiveComponent {
               if (StringUtils.isEmpty(this.liveDetailsBean.oldNewsId)
                 && this.liveDetailsBean
                 && this.liveDetailsBean.liveInfo.liveState != 'wait') {
-                let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean
-                liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction
-                liveRoomItemBeanTemp.senderUserName = '人民日报主持人'
-                liveRoomItemBeanTemp.pictureUrls=[]
-                liveRoomItemBeanTemp.pictureUrls.push(this.liveDetailsBean?.fullColumnImgUrls[0]?.url)
-                liveRoomItemBeanTemp.dataType='ZH_TEXT_AND_IMAGE_MSG'
-                this.liveList.push(liveRoomItemBeanTemp)
+                this.updateLiveListData()
               }
             }
           } else {
+            if (StringUtils.isEmpty(this.liveDetailsBean.oldNewsId)
+              && this.liveDetailsBean
+              && this.liveDetailsBean.liveInfo.liveState != 'wait') {
+              this.updateLiveListData()
+            } else {
               this.pageModel.viewType = ViewType.EMPTY;
             }
+          }
         },
         () => {
 
         })
   }
 
+  updateLiveListData() {
+    let liveRoomItemBeanTemp: LiveRoomItemBean = {} as LiveRoomItemBean
+    liveRoomItemBeanTemp.text = this.liveDetailsBean.newIntroduction
+    liveRoomItemBeanTemp.senderUserName = '人民日报主持人'
+    liveRoomItemBeanTemp.pictureUrls = []
+    liveRoomItemBeanTemp.pictureUrls.push(this.liveDetailsBean?.fullColumnImgUrls[0]?.url)
+    liveRoomItemBeanTemp.dataType = 'ZH_TEXT_AND_IMAGE_MSG'
+    let temp = this.liveDetailsBean?.fullColumnImgUrls[0]
+    if (temp) {
+      liveRoomItemBeanTemp.pictureResolutions = []
+      liveRoomItemBeanTemp.pictureResolutions.push(`${temp.height}*${temp.weight}`)
+    }
+    this.liveList.push(liveRoomItemBeanTemp)
+  }
+
   aboutToDisappear(): void {
   }
 }
\ No newline at end of file

@@ -28,7 +28,7 @@ export struct TabLiveItemComponent {
             .fontSize('14fp')
             .fontWeight(400)
             .fontColor('#222222')
-          Text('主持人')
+          Text(this.item.role === 'host' ? '主持人' : '嘉宾')
             .maxLines(1)
             .textOverflow({ overflow: TextOverflow.Ellipsis })
             .fontSize('11fp')
@@ -43,7 +43,7 @@ export struct TabLiveItemComponent {
             })
             .borderRadius(2)
             .margin({ left: 8 })
-            .visibility('host' == this.item.role ? Visibility.Visible : Visibility.None)
+            .visibility(StringUtils.isNotEmpty(this.item.role) ? Visibility.Visible : Visibility.None)
           Text(DateTimeUtils.getCommentTime(new Date(this.item.time).getTime()))
             .maxLines(1)
             .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -85,21 +85,21 @@ export struct TabLiveItemComponent {
           List({ space: this.item.pictureUrls.length == 1 ? 0 : 5 }) {
             ForEach(this.item.pictureUrls, (itemSub: string, index: number) => {
               ListItem() {
+                if (this.item.pictureUrls.length > 1) {
                   Image(itemSub)
                     .width(`${100 / this.item.pictureUrls.length}%`)
-                  .height(this.item.pictureUrls.length > 1 ? 70 : 174)
+                    .height(70)
+                    .objectFit(ImageFit.Auto)
+                    .borderRadius(4)
+                } else {
+                  Image(itemSub)
+                    .width(`100%`)
+                    // .aspectRatio(this.getAspectRation())
+                    .height(177)
                     .objectFit(ImageFit.Auto)
                     .borderRadius(4)
-              }.onClick(() => {
-                this.photoList = []
-                for (let item of this.item.pictureUrls) {
-                  this.photoList.push({
-                    width: 0,
-                    height: 0,
-                    picPath: item,
-                    picDesc: ''
-                  })
                 }
+              }.onClick(() => {
                 this.gotoMultipleListImagePage(index)
               })
             })
@@ -147,7 +147,7 @@ export struct TabLiveItemComponent {
           .margin({
             top: 8,
           })
-          .aspectRatio(Number.parseFloat(this.item.pictureResolutions[0]?.split('*')[0]) / Number.parseFloat(this.item.pictureResolutions[0]?.split('*')[1]))
+          .aspectRatio(this.getAspectRation())
           .onClick(() => {
             this.gotoVideoPlayPage()
           })
@@ -188,6 +188,15 @@ export struct TabLiveItemComponent {
    * @param content
    * */
   gotoMultipleListImagePage(index: number) {
+    this.photoList = []
+    for (let item of this.item.pictureUrls) {
+      this.photoList.push({
+        width: 0,
+        height: 0,
+        picPath: item,
+        picDesc: ''
+      })
+    }
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       params: {
@@ -204,4 +213,20 @@ export struct TabLiveItemComponent {
   aboutToDisappear(): void {
 
   }
+
+  getAspectRation(): number {
+    try {
+      if (this.item && this.item.pictureResolutions && this.item.pictureResolutions.length > 0) {
+        let temp: string[] = this.item.pictureResolutions[0]?.split('*')
+        if (temp && temp.length == 2) {
+          let width = Number.parseFloat(this.item.pictureResolutions[0]?.split('*')[0])
+          let height = Number.parseFloat(this.item.pictureResolutions[0]?.split('*')[1])
+          return height / width
+        }
+      }
+    } catch (e) {
+      return 1
+    }
+    return 1
+  }
 }
\ No newline at end of file

@@ -20,6 +20,9 @@ export struct PlayUIComponent {
   @Consume displayDirection: DisplayDirection
 
   onChangeMenuVisible() {
+    if (!this.liveDetailsBean || !this.liveDetailsBean.liveInfo || this.liveDetailsBean?.liveInfo?.liveState === 'wait') {
+      return
+    }
     let time: number = 0
     if (this.isMenuVisible) {
       setTimeout(() => {
@@ -38,15 +41,16 @@ export struct PlayUIComponent {
       this.totalTime = DateFormatUtil.secondToTime(Math.floor(duration / 1000));
       this.progressVal = Math.floor(position * 100 / duration);
     }
-
   }
 
   build() {
     Column() {
+      if (this.liveDetailsBean && this.liveDetailsBean.liveInfo) {
         this.getTopUIComponent()
         this.getMiddleUIComponent()
         this.getBottomUIComponent()
       }
+    }
     .width('100%')
     .height('100%')
     .alignItems(HorizontalAlign.Start)
@@ -67,7 +71,7 @@ export struct PlayUIComponent {
             this.displayDirection = DisplayDirection.VERTICAL
             WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
             window.Orientation.PORTRAIT :
-            window.Orientation.LANDSCAPE)
+            window.Orientation.LANDSCAPE_INVERTED)
             // devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
             // window.Orientation.PORTRAIT :
             // window.Orientation.LANDSCAPE);
@@ -106,15 +110,17 @@ export struct PlayUIComponent {
         }
         this.getLiveStatusView()
       }
-    }.width('100%')
+    }
+    .width('100%')
     .padding({
-      top: 20,
+      top: 15,
       bottom: 6,
       left: 10,
       right: 10
     })
     .alignItems(HorizontalAlign.Start)
     .visibility(this.isMenuVisible ? Visibility.Visible : Visibility.None)
+    .linearGradient({ angle: 0, colors: [['#00000000', 0], ['#99000000', 1]] })
   }
 
   @Builder
@@ -194,6 +200,9 @@ export struct PlayUIComponent {
       .layoutWeight(1)
       .width('100%')
       .onClick(() => {
+        if (this.liveDetailsBean?.liveInfo?.liveState === 'wait') {
+          return
+        }
         this.isMenuVisible = !this.isMenuVisible
       })
   }
@@ -233,11 +242,12 @@ export struct PlayUIComponent {
             this.displayDirection = this.displayDirection == DisplayDirection.VERTICAL ? DisplayDirection.VIDEO_HORIZONTAL : DisplayDirection.VERTICAL
             WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
             window.Orientation.PORTRAIT :
-            window.Orientation.LANDSCAPE)
+            window.Orientation.LANDSCAPE_INVERTED)
             // devicePLSensorManager.devicePLSensorOn(this.displayDirection == DisplayDirection.VERTICAL ?
             // window.Orientation.PORTRAIT :
             // window.Orientation.LANDSCAPE);
           })
+          .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
       }
     }
     .alignItems(VerticalAlign.Center)

@@ -32,6 +32,7 @@ export struct TopPlayComponent {
         playUrl = this.liveDetailsBean.liveInfo.vlive[0].replayUri
       }
       this.playerController?.firstPlay(playUrl);
+      // this.playerController?.firstPlay('https://rmrbcmsonline.peopleapp.com/upload/rmh/video/mp4/202404/1713752415708fb81d0b8f137b.mp4');
     }
   }
 

@@ -16,5 +16,6 @@
     "wdConstant": "file:../../commons/wdConstant",
     "wdDetailPlayApi": "file:../../features/wdDetailPlayApi",
     //    "wdComponent": "file:../../features/wdComponent"
+    "wdShare": "file:../../features/wdShare"
   }
 }

@@ -11,6 +11,7 @@ import { SPHelper, ToastUtils, NumberFormatterUtils } from 'wdKit';
 import { WDPlayerController } from 'wdPlayer/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { SpConstants } from 'wdConstant/Index'
+import { WDShare } from "wdShare"
 
 interface ILikeStyleResp {
   url: Resource;
@@ -336,6 +337,8 @@ export struct PlayerRightView {
         .aspectRatio(1)
         .onClick((event: ClickEvent) => {
           ToastUtils.showToast('分享为公共方法，待开发', 1000);
+
+          this.share()
         })
       Text('分享')
         .width('100%')
@@ -349,4 +352,9 @@ export struct PlayerRightView {
     }
     .margin({ bottom: 20 })
   }
+
+  share() {
+
+    WDShare.shareContent(this.contentDetailData)
+  }
 }
\ No newline at end of file

 export { add } from "./src/main/ets/utils/Calc"
 
 export { HWLocationUtils } from './src/main/ets/location/HWLocationUtils'
+
+export { WDPushNotificationManager } from "./src/main/ets/notification/WDPushNotificationManager"
\ No newline at end of file

+
+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))
+  }
+
+}
\ No newline at end of file

@@ -3,10 +3,6 @@
     {
       "name": "shared_desc",
       "value": "description"
-    },
-    {
-      "name": "location_reason",
-      "value": " "
     }
   ]
 }
\ No newline at end of file

@@ -3,11 +3,10 @@ import { LoginInputComponent } from './LoginInputComponent'
 import { LoginViewModel } from './LoginViewModel'
 import router from '@ohos.router'
 import promptAction from '@ohos.promptAction'
-import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index'
 import { WDRouterRule, WDRouterPage } from 'wdRouter';
 import { SettingPasswordParams } from './SettingPasswordLayout'
 import { Router } from '@ohos.arkui.UIContext'
-import { SPHelper, ToastUtils } from 'wdKit/Index'
+import { EmitterEventId, EmitterUtils, SPHelper, ToastUtils } from 'wdKit/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { emitter } from '@kit.BasicServicesKit'
 
@@ -26,6 +25,7 @@ struct ForgetPasswordPage {
   @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
   pageType:number = (router.getParams() as Record<string, number>)['pageType']; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
   @State pageTitle:string = '找回密码';
+  @State codeStateSuccess:boolean=false
   onCodeSend() {
     if (this.isCodeSend) {
       this.sendVerifyCode()
@@ -47,7 +47,8 @@ struct ForgetPasswordPage {
         codeContent: $codeContent,
         isSubmit: $isSubmit,
         isCodeSend: $isCodeSend,
-        pageType:this.pageType
+        pageType:this.pageType,
+        codeStateSuccess:$codeStateSuccess
       })
       Row() {
         Text("确认")
@@ -99,16 +100,26 @@ struct ForgetPasswordPage {
 
     if(this.pageType == 1){
       this.loginViewModel.sendVerifyCodeByToken().then(()=>{
-        promptAction.showToast({ message: "验证码已发送成功" })
+        promptAction.showToast({ message: "已发送" })
+        this.codeStateSuccess=true
+        this.isCodeSend=false
       }).catch((message: string)=>{
         promptAction.showToast({ message: message })
+        this.codeStateSuccess=false
+        this.isCodeSend=false
       })
       return
     }
 
     this.loginViewModel.sendVerifyCode(this.phoneContent).then((verifyCode) => {
-      promptAction.showToast({ message: "验证码已发送成功" })
+      promptAction.showToast({ message: "已发送" })
+      this.codeStateSuccess=true
+      this.isCodeSend=false
       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,
         pageType:this.pageType
       }
-      WDRouterRule.jumpWithPage(WDRouterPage.settingPasswordPage, params)
+      WDRouterRule.jumpWithReplacePage(WDRouterPage.settingPasswordPage, params)
 
       promptAction.showToast({message:"校验成功，准备跳转设置页面"})
       Logger.debug(TAG,"校验成功")
@@ -173,6 +184,10 @@ struct ForgetPasswordPage {
     this.loginViewModel.changeBindPhone(this.phoneContent,this.codeContent).then(()=>{
       ToastUtils.shortToast('绑定成功')
       this.querySecurity()
+    }).catch((message: string) => {
+      if (message != '') {
+        ToastUtils.shortToast(message)
+      }
     })
   }
 
@@ -189,7 +204,7 @@ struct ForgetPasswordPage {
   sendEmitEvent(){
     // 定义一个eventId为1的事件，事件优先级为Low
     let event: emitter.InnerEvent = {
-      eventId: 10010,
+      eventId: EmitterEventId.PHONE_CHANGE_SUCCESS,
       priority: emitter.EventPriority.LOW
     };
 

 import { SpConstants } from 'wdConstant/Index'
-import { Logger, SPHelper } from 'wdKit'
+import { DateTimeUtils, Logger, SPHelper } from 'wdKit'
 
 @Component
 export struct LoginInputComponent {
@@ -11,6 +11,8 @@ export struct LoginInputComponent {
   @Link isSubmit: boolean //是否可以提交
   isFirst:boolean=true//是否第一次获取验证码
   pageType?:number; //0、登录->忘记密码 1、设置->重置密码 2、设置->更换手机号页面1 3、设置->更换手机号页面2
+  lastTime: number = 0
+  @Link @Watch('startCount') codeStateSuccess: boolean  //验证码获取成功与否回调 成功显示倒计时
   build() {
     Column() {
       this.addCodeLayout()
@@ -81,28 +83,24 @@ export struct LoginInputComponent {
           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')
         .width(110)
         .fontSize(14)
         .fontWeight( FontWeight.Bold)
         .height(48)
         .textAlign(TextAlign.Center)
+        .enabled(this.codeStateSuccess?false:true)
         .onClick(() => {
           if (this.phoneContent.length < 11) {
             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,'****')
     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)
+  }
 }
\ No newline at end of file

@@ -60,7 +60,7 @@ export class LoginModel {
     let bean: Record<string, Object> = {};
     bean['phone'] = phone
     bean['loginType'] = loginType
-    bean['deviceId'] = '60da5af6-9c59-3566-8622-8c6c00710994'
+    bean['deviceId'] = HttpUtils.getDeviceId()
     bean['verificationCode'] = verificationCode
     return new Promise<LoginBean>((success, fail) => {
       HttpRequest.post<ResponseDTO<LoginBean>>(HttpUrlUtils.getAppLoginUrl(), bean).then((data: ResponseDTO<LoginBean>) => {
@@ -90,7 +90,7 @@ export class LoginModel {
       bean['userName'] = phone
     }
     bean['loginType'] = loginType
-    bean['deviceId'] = '60da5af6-9c59-3566-8622-8c6c00710994'
+    bean['deviceId'] = HttpUtils.getDeviceId()
     bean['password'] = password
     bean['oldPassword'] = oldPassword
     return new Promise<LoginBean>((success, fail) => {

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

 import { Logger } from 'wdKit/src/main/ets/utils/Logger'
 import { LoginModel } from './LoginModel'
 import { LoginBean } from './LoginBean'
-import { SPHelper, StringUtils } from 'wdKit'
+import { EmitterEventId, EmitterUtils, SPHelper, StringUtils, UserDataLocal } from 'wdKit'
 import { CheckVerifyBean } from './CheckVerifyBean'
 import cryptoFramework from '@ohos.security.cryptoFramework'
 import buffer from '@ohos.buffer'
@@ -55,6 +55,7 @@ export class LoginViewModel {
         SPHelper.default.saveSync(SpConstants.USER_STATUS, data.status)
         SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
         SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
+        EmitterUtils.sendEmptyEvent(EmitterEventId.LOGIN_SUCCESS)
         success(data)
       }).catch((error:string) => {
         fail(error)
@@ -82,6 +83,7 @@ export class LoginViewModel {
         SPHelper.default.saveSync(SpConstants.USER_STATUS, data.status)
         SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
         SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
+        EmitterUtils.sendEmptyEvent(EmitterEventId.LOGIN_SUCCESS)
         success(data)
       }).catch((value: string) => {
         fail(value)
@@ -157,6 +159,7 @@ export class LoginViewModel {
         SPHelper.default.saveSync(SpConstants.USER_STATUS, '')
         SPHelper.default.saveSync(SpConstants.USER_Type, '')
         SPHelper.default.saveSync(SpConstants.USER_NAME, '')
+        UserDataLocal.clearUserData()
         success(data)
       }).catch((message: string) => {
         fail(message)
@@ -168,8 +171,8 @@ export class LoginViewModel {
     return new Promise<object>((success, fail) => {
       this.loginModel.changeBindPhone(phone, verificationCode).then((data: object) => {
         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 HuaweiAuth from '../../utils/HuaweiAuth'
 import { BusinessError } from '@kit.BasicServicesKit'
+import { ToastUtils } from 'wdKit/Index'
 
 @Entry
 @Component
@@ -44,8 +45,13 @@ struct OneKeyLoginPage {
               return
             }
             HuaweiAuth.sharedInstance().oneKeyLogin().then((authorizeCode) => {
-
               //TODO: 调用服务端接口登录
+
+              ToastUtils.shortToast("获取到授权code: " + authorizeCode + "，由于需要后台接口支持，暂时先跳转其他登录方式")
+              setTimeout(() => {
+                router.replaceUrl({url: WDRouterPage.loginPage.url()})
+              }, 3000)
+
             }).catch((error: BusinessError) => {
 
             })

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

@@ -5,13 +5,40 @@
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "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"
   },
   "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": {
       "name": "wdkit",
       "resolved": "../../commons/wdKit",
-      "registryType": "local"
+      "registryType": "local",
+      "dependencies": {
+        "@umeng/common": "^1.0.21",
+        "@umeng/analytics": "^1.0.19"
+      }
     }
   }
 }
\ No newline at end of file

@@ -15,12 +15,12 @@ enum LogLevel {
 
 /**
  * Common log for all features.
- *
+ * @deprecated 弃用
  * @param {string} prefix Identifies the log tag.
  */
 export class Logger {
   private static domain: number = 0xFF00;
-  private static prefix: string = 'MiguVideoApp';
+  private static prefix: string = 'SightApp';
   private static format: string = `%{public}s, %{public}s`;
 
   /**
@@ -29,7 +29,7 @@ export class Logger {
    * @param Prefix Identifies the log tag.
    * @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.domain = domain;
   }
@@ -59,4 +59,4 @@ export class Logger {
   }
 }
 
-export default new Logger('MiguVideoApp', 0xFF00)
\ No newline at end of file
+export default new Logger('SightApp', 0xFF00)
\ No newline at end of file

+/node_modules
+/oh_modules
+/.preview
+/build
+/.cxx
+/.test
\ No newline at end of file

+
+export { WDShare } from './src/main/ets/WDShare'
+

+{
+  "apiType": "stageMode",
+  "buildOption": {
+  },
+  "buildOptionSet": [
+    {
+      "name": "release",
+      "arkOptions": {
+        "obfuscation": {
+          "ruleOptions": {
+            "enable": true,
+            "files": [
+              "./obfuscation-rules.txt"
+            ]
+          }
+        }
+      },
+    },
+  ],
+  "targets": [
+    {
+      "name": "default"
+    }
+  ]
+}
\ No newline at end of file

+import { hspTasks } from '@ohos/hvigor-ohos-plugin';
+
+export default {
+    system: hspTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
+    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
+}

+# Define project specific obfuscation rules here.
+# You can include the obfuscation configuration files in the current module's build-profile.json5.
+#
+# For more details, see
+#   https://gitee.com/openharmony/arkcompiler_ets_frontend/blob/master/arkguard/README.md
+
+# Obfuscation options:
+# -disable-obfuscation: disable all obfuscations
+# -enable-property-obfuscation: obfuscate the property names
+# -enable-toplevel-obfuscation: obfuscate the names in the global scope
+# -compact: remove unnecessary blank spaces and all line feeds
+# -remove-log: remove all console.* statements
+# -print-namecache: print the name cache that contains the mapping from the old names to new names
+# -apply-namecache: reuse the given cache file
+
+# Keep options:
+# -keep-property-name: specifies property names that you want to keep
+# -keep-global-name: specifies names that you want to keep in the global scope
\ No newline at end of file

+{
+  "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",
+    "@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",
+    "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",
+    "wdShareBase@../../commons/wdShareBase": "wdShareBase@../../commons/wdShareBase"
+  },
+  "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"
+    },
+    "@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"
+      }
+    },
+    "wdRouter@../../commons/wdRouter": {
+      "name": "wdrouter",
+      "resolved": "../../commons/wdRouter",
+      "registryType": "local",
+      "dependencies": {
+        "wdKit": "file:../wdKit",
+        "wdBean": "file:../../features/wdBean",
+        "wdNetwork": "file:../../commons/wdNetwork",
+        "wdConstant": "file:../../commons/wdConstant"
+      }
+    },
+    "wdShareBase@../../commons/wdShareBase": {
+      "name": "wdsharebase",
+      "resolved": "../../commons/wdShareBase",
+      "registryType": "local",
+      "packageType": "InterfaceHar"
+    }
+  }
+}
\ No newline at end of file

+{
+  "name": "wdshare",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "Index.ets",
+  "author": "",
+  "license": "Apache-2.0",
+  "packageType": "InterfaceHar",
+  "dependencies": {
+    "wdKit": "file:../../commons/wdKit",
+    "wdBean": "file:../../features/wdBean",
+    "wdRouter": "file:../../commons/wdRouter",
+    "wdShareBase": "file:../../commons/wdShareBase"
+  }
+}
\ No newline at end of file

+import { ContentDetailDTO, ContentDTO, PageInfoDTO } from 'wdBean/Index';
+import { ShareScene, ShareType, WDShareBase } from 'wdShareBase/Index';
+import { ShareContentType } from 'wdShareBase/src/main/ets/Constant';
+
+export class WDShare {
+
+  static shareContent(content: ContentDetailDTO, pageName: string ="", pageId: string = "") {
+
+    //TODO: 处理分享弹框交互和 海报逻辑
+
+    WDShareBase.getInstance().share({
+      to: ShareType.System,
+      scene: ShareScene.System,
+      type: ShareContentType.Link,
+      obj: {
+        title: content.shareInfo.shareTitle,
+        desc: content.shareInfo.shareSummary,
+        link: content.shareInfo.shareUrl,
+      }
+    })
+  }
+
+  static shareProgram(program: ContentDTO, pageName: string ="", pageId: string = "") {
+
+  }
+
+  static shareSubject(subject: PageInfoDTO) {
+
+
+  }
+
+}
\ No newline at end of file

+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World';
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
\ No newline at end of file

+export function add(a:number, b:number) {
+    return a + b;
+}
\ No newline at end of file

+{
+  "module": {
+    "name": "wdShare",
+    "type": "shared",
+    "description": "$string:shared_desc",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "pages": "$profile:main_pages"
+  }
+}
\ No newline at end of file

+{
+  "color": [
+    {
+      "name": "white",
+      "value": "#FFFFFF"
+    }
+  ]
+}
\ No newline at end of file

+{
+  "string": [
+    {
+      "name": "shared_desc",
+      "value": "description"
+    }
+  ]
+}
\ No newline at end of file

+{
+  "src": [
+    "pages/Index"
+  ]
+}

+import localUnitTest from './LocalUnit.test';
+
+export default function testsuite() {
+  localUnitTest();
+}
\ No newline at end of file

+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+
+export default function localUnitTest() {
+  describe('localUnitTest',() => {
+    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
+    beforeAll(() => {
+      // Presets an action, which is performed only once before all test cases of the test suite start.
+      // This API supports only one parameter: preset action function.
+    });
+    beforeEach(() => {
+      // Presets an action, which is performed before each unit test case starts.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: preset action function.
+    });
+    afterEach(() => {
+      // Presets a clear action, which is performed after each unit test case ends.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: clear action function.
+    });
+    afterAll(() => {
+      // Presets a clear action, which is performed after all test cases of the test suite end.
+      // This API supports only one parameter: clear action function.
+    });
+    it('assertContain', 0, () => {
+      // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
+      let a = 'abc';
+      let b = 'b';
+      // Defines a variety of assertion methods, which are used to declare expected boolean conditions.
+      expect(a).assertContain(b);
+      expect(a).assertEqual(a);
+    });
+  });
+}
\ No newline at end of file

+{
+  "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"
+      }
+    }
+  }
+}
\ No newline at end of file

+{
+  "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"
+  }
+}
\ No newline at end of file

+../../../../oh_modules/.ohpm/@sensorsdata+analytics@0.0.2/oh_modules/@sensorsdata/analytics
\ No newline at end of file

+../../wdBean
\ No newline at end of file

+../../../commons/wdConstant
\ No newline at end of file

+../../../commons/wdKit
\ No newline at end of file

+../../../commons/wdNetwork
\ No newline at end of file

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

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

+{"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":[]}
\ No newline at end of file

+{"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":[]}
\ No newline at end of file

@@ -31,10 +31,10 @@ struct ENewspaper {
 
   pageTransition() {
     // 定义页面进入时的效果，从底侧滑入
-    PageTransitionEnter({ type: RouteType.None, duration: 300 })
+    PageTransitionEnter({ type: RouteType.Push, duration: 400 })
       .slide(SlideEffect.Bottom)
     // 定义页面退出时的效果，向底侧滑出
-    PageTransitionExit({ type: RouteType.None, duration: 300 })
+    PageTransitionExit({ type: RouteType.Pop, duration: 400 })
       .slide(SlideEffect.Bottom)
   }
 

@@ -2,9 +2,8 @@ import { BottomNavigationComponent, LogoutViewModel, PermissionDesComponent } fr
 import { BreakpointConstants } from 'wdConstant';
 
 import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger } from 'wdKit';
-import router from '@ohos.router';
-import { promptAction } from '@kit.ArkUI';
-import { HWLocationUtils } from 'wdHwAbility/Index';
+import { HWLocationUtils, WDPushNotificationManager } from 'wdHwAbility/Index';
+import { common } from '@kit.AbilityKit';
 
 
 const TAG = 'MainPage';
@@ -24,6 +23,16 @@ struct MainPage {
   aboutToAppear() {
     HWLocationUtils.startLocationService()
     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 `);
     EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
       LogoutViewModel.clearLoginInfo()
@@ -33,6 +42,11 @@ struct MainPage {
     })
   }
 
+  pageTransition() {
+    PageTransitionEnter({ type: RouteType.None, duration: 0 })
+    PageTransitionExit({ type: RouteType.None, duration: 0 })
+  }
+
   aboutToDisappear() {
     this.breakpointSystem.unregister()
     Logger.info(TAG, 'aboutToDisappear');

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

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

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

@@ -3,59 +3,35 @@ import webview from '@ohos.web.webview';
 import router from '@ohos.router';
 import { GlobalContext } from '../../utils/GlobalContext'
 import { WDRouterRule } from 'wdRouter';
+import { LikeComponent } from 'wdComponent'
 
 @Entry
 @Component
 struct PrivacyPage {
   @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() {
     Row() {
       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%')
     }

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

@@ -3,8 +3,9 @@ import { WdWebComponent } from 'wdWebComponent';
 import router from '@ohos.router';
 import { CommonConstants } from 'wdConstant'
 import { BridgeWebViewControl } from 'wdJsBridge';
-import { detailedSkeleton } from 'wdComponent/src/main/ets/components/skeleton/detailSkeleton'
+
 const TAG = 'DefaultWebPage'
+
 @Entry
 @Component
 struct DefaultWebPage {
@@ -16,9 +17,6 @@ struct DefaultWebPage {
 
   build() {
     Column() {
-      if (!this.isPageEnd) {
-        detailedSkeleton()
-      }
       Stack({ alignContent: Alignment.Bottom }) {
         Column() {
           WdWebComponent({

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