Merge remote-tracking branch 'origin/main'

@@ -2,46 +2,30 @@ import { StringUtils } from './StringUtils';
 import { SPHelper } from './SPHelper';
 import { Logger } from './Logger';
 
-const KEY_USER_TOKEN = 'userToken';
-
 const TAG: string = 'AccountManagerUtils';
 
 // 是否已登录hadLogin
 let hasLogin: boolean = false;
 
 export class AccountManagerUtils {
-  // 是否已登录hadLogin
-  // private static hasLogin: boolean = undefined;
+
+  // 这里需要和其他模块value值一致 ！！！！
+  // TODO: 以前清楚谁写的遗留代码，后续考虑删除
+  static readonly USER_ID = "userId"
 
   constructor() {
   }
 
-  static async getUserToken(): Promise<string> {
-    let userToken = await SPHelper.default.get(KEY_USER_TOKEN, '') as string;
+  static async getUserId(): Promise<string> {
+    let userId = await SPHelper.default.get(AccountManagerUtils.USER_ID, '') as string;
     // Logger.info(TAG, 'getUserToken UserToken.' + userToken);
-    return userToken;
+    return userId;
   }
 
-  static getUserTokenSync(): string {
-    let userToken = SPHelper.default.getSync(KEY_USER_TOKEN, '') as string;
+  static getUserIdSync(): string {
+    let userId = SPHelper.default.getSync(AccountManagerUtils.USER_ID, '') as string;
     // Logger.info(TAG, 'getUserToken UserToken.' + userToken);
-    return userToken;
-  }
-
-  static async putUserToken(value: string) {
-    await SPHelper.default.save(KEY_USER_TOKEN, value);
-  }
-
-  static putUserTokenSync(value: string) {
-    SPHelper.default.saveSync(KEY_USER_TOKEN, value);
-  }
-
-  static async deleteUserToken() {
-    await SPHelper.default.delete(KEY_USER_TOKEN);
-  }
-
-  static deleteUserTokenSync() {
-    SPHelper.default.deleteSync(KEY_USER_TOKEN);
+    return userId;
   }
 
   /**
@@ -51,7 +35,7 @@ export class AccountManagerUtils {
    */
   static async isLogin() {
     Logger.info(TAG, 'isLogin hasLogin1:' + hasLogin);
-    let lastUserToken = await AccountManagerUtils.getUserToken()
+    let lastUserToken = await AccountManagerUtils.getUserId()
     Logger.info(TAG, 'isLogin lastUserToken:' + lastUserToken);
     if (StringUtils.isEmpty(lastUserToken)) {
       hasLogin = false;
@@ -72,7 +56,7 @@ export class AccountManagerUtils {
    */
   static isLoginSync() {
     Logger.info(TAG, 'isLogin hasLogin1:' + hasLogin);
-    let lastUserToken = AccountManagerUtils.getUserTokenSync()
+    let lastUserToken = AccountManagerUtils.getUserIdSync()
     Logger.info(TAG, 'isLogin lastUserToken:' + lastUserToken);
     if (StringUtils.isEmpty(lastUserToken)) {
       hasLogin = false;

@@ -70,6 +70,7 @@ export struct DynamicDetailComponent {
   @State isPageEnd: boolean = false
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State reachEndIncreament: number = 0
+  @State operationButtonList: string[] = []
 
   async aboutToAppear() {
     await this.getContentDetailData()
@@ -532,15 +533,7 @@ export struct DynamicDetailComponent {
                 if (this.contentDetailData?.openComment) {
                   Divider().strokeWidth(6).color('#f5f5f5').margin({ top: $r('app.float.margin_24') })
                   CommentComponent({
-                    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
+                    publishCommentModel: this.publishCommentModel
                   })
                 }
                 Blank().layoutWeight(1)
@@ -557,7 +550,7 @@ export struct DynamicDetailComponent {
         OperRowListView({
           contentDetailData: this.contentDetailData,
           publishCommentModel: this.publishCommentModel,
-          operationButtonList: ['comment', 'collect', 'share'],
+          operationButtonList: this.operationButtonList,
           styleType: 1,
         })
 
@@ -574,13 +567,6 @@ export struct DynamicDetailComponent {
    * */
   private async getContentDetailData() {
     this.isNetConnected = NetworkUtil.isNetConnected()
-    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)
     try {
       let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
       this.isPageEnd = true;
@@ -590,6 +576,20 @@ export struct DynamicDetailComponent {
       let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
       this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime)
       console.log('动态详情', JSON.stringify(this.contentDetailData))
+
+      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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
+      }
+
+      this.operationButtonList = ['comment', 'collect', 'share']
+
     } catch (exception) {
       console.log('请求失败', JSON.stringify(exception))
       this.isPageEnd = true;

@@ -234,13 +234,13 @@ export struct ImageAndTextPageComponent {
         }
         if (this.contentDetailData?.openComment) {
           this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+          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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+          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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         }
         if (this.contentDetailData?.openAudio && this.contentDetailData?.audioList?.length &&
         this.contentDetailData?.audioList[0].audioUrl) {

@@ -445,13 +445,13 @@ export struct MultiPictureDetailPageComponent {
           // }
           if (this.contentDetailData?.openComment) {
             this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-            this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+            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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+            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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
           }
           // this.contentDetailData.photoList = []
           if (this.contentDetailData?.photoList && this.contentDetailData?.photoList?.length === 0) {

@@ -72,13 +72,13 @@ export struct SpacialTopicPageComponent {
         this.contentDetailData = detailBeans[0];
         // if (this.contentDetailData[0]?.openComment) {
         this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-        this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+        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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+        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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         // }
         this.trySendData2H5()
       }

@@ -93,6 +93,9 @@ export struct CommentComponent {
         }
       });
     }
+    if (model) {
+      this.isComments = true
+    }
 
   }
 

@@ -164,7 +164,7 @@ class CommentViewModel {
   publishComment(model: publishCommentModel) {
 
     return new Promise<commentItemModel>((success, fail) => {
-      const visitorMode = model.visitorComment == "1" && AccountManagerUtils.isLoginSync() == false
+      const visitorMode = model.visitorComment == "1" && HttpUtils.isLogin() == false
       let url = visitorMode ? HttpUrlUtils.getNoUserPublishCommentUrl() : HttpUrlUtils.getPublishCommentUrl()
 
       let bean: Record<string, string> = {};

@@ -64,13 +64,13 @@ export struct DetailPlayLiveCommon {
           // if (this.contentDetailData.openComment === 1) {
           console.log(TAG, '查询视频详情用于评论展示 openComment:', this.contentDetailData.openComment)
           this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-          this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+          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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+          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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
           this.publishCommentModel.commentContent = ''
           // }
         }

@@ -166,12 +166,13 @@ export struct DetailPlayShortVideoPage {
     this.queryNewsInfoOfUser()
 
     this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+    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.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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
     this.publishCommentModel.commentContent = ''
 
   }

@@ -17,13 +17,13 @@ export struct CommentComponentPage {
   aboutToAppear(): void {
 
     this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
-    this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId)
+    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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment)
+    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.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
   }
 
   build() {

-import { WDRouterPage } from 'wdRouter/src/main/ets/router/WDRouterPage'
-import { WDRouterRule } from 'wdRouter/src/main/ets/router/WDRouterRule'
-import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index'
-
-@CustomDialog
-export struct CustomProtocolDialog {
-  controller: CustomDialogController
-
-  cancel: () => void = () => {
-  }
-
-  confirm: () => void = () => {
-  }
-
-  build() {
-    Column() {
-      Text("温馨提示")
-        .fontColor("#222222")
-        .fontSize(18)
-        .width("100%")
-        .fontWeight(FontWeight.Bold)
-        .textAlign(TextAlign.Center)
-        .margin({ top: 20 })
-      Text() {
-        Span("为保障您的合法权益，请阅读并同意").fontSize(14).fontColor("#666666")
-        Span("《用户协议》").fontSize(14).fontColor("#ED2800").onClick(()=>{
-          let bean={contentID:"1",pageID:""} as Params
-          WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
-          this.controller.close()
-        })
-        Span("及").fontSize(14).fontColor("#666666")
-        Span("《隐私政策》").fontSize(14).fontColor("#ED2800").onClick(()=>{
-          let bean={contentID:"2",pageID:""} as Params
-          WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
-          this.controller.close()
-        })
-        Span("后进行登录").fontSize(14).fontColor("#666666")
-      }.margin({ top: 12, left: 16, right: 16 })
-
-      Divider().color("#999999").width("100%").margin({ top: 14 }).height('1vp')
-      Row() {
-        Text('放弃登录')
-          .fontSize(16)
-          .fontColor("#999999")
-          .layoutWeight(1)
-          .fontWeight(FontWeight.Medium)
-          .textAlign(TextAlign.Center)
-          .onClick(() => {
-            this.controller.close()
-            if (this.cancel) {
-              this.cancel()
-            }
-
-          })
-          .height('100%')
-        // Divider().color("#999999").height('100%').width('0.5vp')
-        Text('同意并登录')
-          .fontSize(16)
-          .fontColor("#ED2800")
-          .layoutWeight(1)
-          .fontWeight(FontWeight.Medium)
-          .textAlign(TextAlign.Center)
-          .border({
-            width: { left: 1 },
-            color: "#999999",
-            style: { left: BorderStyle.Solid }
-
-          })
-          .onClick(() => {
-            this.controller.close()
-            if (this.confirm) {
-              this.confirm()
-            }
-          })
-          .height('100%')
-      }.layoutWeight(1).justifyContent(FlexAlign.Center)
-    }.height(161).backgroundColor(Color.White).borderRadius(6).width('74%')
-  }
-}
\ No newline at end of file

 import { Logger, EmitterEventId, EmitterUtils, DateTimeUtils,CustomToast, StringUtils, NetworkUtil  } from 'wdKit'
-import { CustomProtocolDialog } from './CustomProtocolDialog'
 import router from '@ohos.router'
 import { LoginViewModel } from './LoginViewModel'
 import { LoginInputComponent } from './LoginInputComponent'
@@ -57,18 +56,6 @@ struct LoginPage {
     maskColor:"#00000000"
   })
 
-  dialogController: CustomDialogController = new CustomDialogController({
-    builder: CustomProtocolDialog({
-      cancel: () => {
-
-      },
-      confirm: () => {
-        this.requestLogin()
-      }
-    }),
-    customStyle: true,
-    alignment:DialogAlignment.Center
-  })
   loginViewModel = new LoginViewModel()
   @State isProtocol:boolean=false
   onCodeSend() {
@@ -467,32 +454,58 @@ struct ProtocolComponent {
       Column() {
         Text("温馨提示")
           .fontColor("#222222")
-          .fontSize(18)
+          .fontSize("35lpx")
+          .lineHeight("50lpx")
           .width("100%")
-          .fontWeight(FontWeight.Bold)
+          .fontWeight(500)
           .textAlign(TextAlign.Center)
-          .margin({ top: 20 })
+          .margin({ top: "38lpx" })
         Text() {
-          Span("为保障您的合法权益，请阅读并同意").fontSize(14).fontColor("#666666")
-          Span("《用户协议》").fontSize(14).fontColor("#ED2800").onClick(() => {
+          Span("为保障您的合法权益，请阅读并同意")
+            .fontSize("27lpx")
+            .lineHeight("42lpx")
+            .fontWeight(400)
+            .fontColor("#666666")
+
+          Span("《用户协议》")
+            .fontSize("27lpx")
+            .lineHeight("42lpx")
+            .fontWeight(400)
+            .fontColor("#ED2800")
+            .onClick(() => {
             let bean = { contentID: "1", pageID: "" } as Params
             WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
           })
-          Span("及").fontSize(14).fontColor("#666666")
-          Span("《隐私政策》").fontSize(14).fontColor("#ED2800").onClick(() => {
+          Span("及").fontSize("27lpx")
+            .lineHeight("42lpx")
+            .fontWeight(400)
+            .fontColor("#666666")
+          Span("《隐私政策》")
+            .fontSize("27lpx")
+            .lineHeight("42lpx")
+            .fontWeight(400)
+            .fontColor("#ED2800")
+            .onClick(() => {
             let bean = { contentID: "2", pageID: "" } as Params
             WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
           })
-          Span("后进行登录").fontSize(14).fontColor("#666666")
-        }.margin({ top: 12, left: 16, right: 16 })
-
-        Divider().color("#999999").width("100%").margin({ top: 14 }).height('1vp')
+          Span("后进行登录")
+            .fontSize("27lpx")
+            .lineHeight("42lpx")
+            .fontWeight(400)
+            .fontColor("#666666")
+        }.margin({ top: "23lpx", left: "31lpx", right: "31lpx" })
+        .wordBreak(WordBreak.BREAK_ALL)
+        .textAlign(TextAlign.Start)
+
+        Divider().color("#f5f5f5").width("100%").margin({ top: "27lpx" }).height('1lpx').strokeWidth('1lpx')
         Row() {
           Text('放弃登录')
-            .fontSize(16)
+            .fontSize("31lpx")
+            .fontWeight(500)
+            .lineHeight("42lpx")
             .fontColor("#999999")
             .layoutWeight(1)
-            .fontWeight(FontWeight.Medium)
             .textAlign(TextAlign.Center)
             .onClick(() => {
               if (this.cancelMethod) {
@@ -500,18 +513,26 @@ struct ProtocolComponent {
               }
             })
             .height('100%')
-          // Divider().color("#999999").height('100%').width('0.5vp')
+
+          Divider()
+            .width("1lpx")
+            .strokeWidth('1lpx')
+            .vertical(true)
+            .height('100%')
+            .color("#F5F5F5")
+
+
           Text('同意并登录')
-            .fontSize(16)
+            .fontSize("31lpx")
+            .fontWeight(500)
+            .lineHeight("42lpx")
             .fontColor("#ED2800")
             .layoutWeight(1)
-            .fontWeight(FontWeight.Medium)
             .textAlign(TextAlign.Center)
             .border({
               width: { left: 1 },
-              color: "#999999",
+              color: "#F5F5F5",
               style: { left: BorderStyle.Solid }
-
             })
             .onClick(() => {
               if (this.agreeMethod) {
@@ -519,8 +540,13 @@ struct ProtocolComponent {
               }
             })
             .height('100%')
-        }.layoutWeight(1).justifyContent(FlexAlign.Center)
-      }.height(161).backgroundColor(Color.White).borderRadius(6).width('74%')
+        }.layoutWeight(1)
+        .justifyContent(FlexAlign.Center)
+      }
+      .backgroundColor(Color.White)
+      .borderRadius("12lpx")
+      .width("528lpx")
+      .height("309lpx")
 
     }.width('100%')
     .height('100%')