Эх сурвалжийг харах

fix: 历史记录删除不能立即刷新
fix:跳转网页时,部分页面中下载不能跳转到应用市场
fix: 分享内容为主页时,无法访问:使其跳转到百度首页,并加以说明

hyj 1 сар өмнө
parent
commit
3f300d8d42

+ 2 - 1
home/src/main/ets/blocks/modules/meowTitleBar.ets

@@ -270,7 +270,8 @@ struct meowTitleBar {
             title: this.current_title,
             createTime: "" + parseTimestamp(Date.now()),
             isVideo: false,
-            link: this.current_url,
+            isHome: this.current_url === "meow://home",
+            link: this.current_url === "meow://home" ? "https://www.baidu.com/?tn=49055317_59_hao_pg" : this.current_url,
           },
           shareRenderBuilder: () => {
             this.shareCommentBuilder()

+ 11 - 2
shared/components/module_share/src/main/ets/ComponentScreenshot/Screenshot.ets

@@ -20,6 +20,15 @@ export struct Screenshot {
             .fontColor($r('sys.color.font_primary'))
             .textOverflow({ overflow: TextOverflow.Ellipsis })
             .margin({ top: 12 })
+          if (this.qrCodeInfo.isHome){
+            Text("注意:当前主页内容无法分享,分享跳转的内容为百度主页")
+              .fontWeight(FontWeight.Medium)
+              .fontSize(12)
+              .maxLines(2)
+              .fontColor($r('sys.color.font_primary'))
+              .textOverflow({ overflow: TextOverflow.Ellipsis })
+              .margin({ top: 12 })
+          }
           Row({ space: 8 }) {
             Text(this.qrCodeInfo.articleFrom)
               .fontSize(12)
@@ -28,7 +37,7 @@ export struct Screenshot {
               .fontSize(12)
               .fontColor($r('sys.color.font_secondary'))
           }
-          .margin({ top: '20%', bottom: 16 })
+          .margin({ top: '15%', bottom: 16 })
           .width('100%')
           .justifyContent(FlexAlign.Start)
         }
@@ -49,7 +58,7 @@ export struct Screenshot {
           .fontColor($r('sys.color.font_secondary'))
       }
       .width('100%')
-      .margin({ top: 12 })
+      .margin({ top: 10 })
       .justifyContent(FlexAlign.Start)
     }
     .id(this.qrCodeInfo.id)

+ 0 - 9
shared/components/module_share/src/main/ets/buider/SecondPosterShareBuilder.ets

@@ -37,15 +37,6 @@ export struct SecondPosterShare {
                   this.popClose(isClose)
                 })
                 break;
-              // case 'wechat':
-              //   this.wxShareViewModel.newsPosterShare('WXSceneSession',this.pixmap)
-              //   break;
-              // case 'wechat_feed':
-              //   this.wxShareViewModel.newsPosterShare('WXSceneTimeline',this.pixmap)
-              //   break;
-              // case 'qq':
-              //   this.qqShareViewModel.share(this.qrCodeInfo)
-              //   break;
             }
             this.onCancel()
           })

+ 1 - 0
shared/components/module_share/src/main/ets/model/Model.ets

@@ -8,6 +8,7 @@ export class ShareOptions {
   createTime: string = ''
   link:string | undefined = ''
   isVideo:boolean = false
+  isHome: boolean = false
   articleFrom?: string | undefined = ''
 }