解决合并冲突

mgz0227 · Jul 20, 2024 · ec1c15c · ec1c15c
1 parent ecb2b24
commit ec1c15c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/entry/src/main/ets/pages/view/Subscription/components/SubscriptionContent.ets b/entry/src/main/ets/pages/view/Subscription/components/SubscriptionContent.ets
@@ -121,6 +121,7 @@ export default struct SubscriptionContent{
                       url: item.sourceUrl
                     }
                   })
+                  rssSourcesUtils.pushRssSourcesHistory(item)
                   this.refresh()
                 })
                 .gesture(
@@ -150,6 +151,7 @@ export default struct SubscriptionContent{
                     url: item.sourceUrl
                   }
                 })
+                rssSourcesUtils.pushRssSourcesHistory(item)
                 this.refresh()
               })
               .gesture(

diff --git a/entry/src/main/ets/pages/view/Subscription/components/SubscriptionSearch.ets b/entry/src/main/ets/pages/view/Subscription/components/SubscriptionSearch.ets
@@ -9,11 +9,12 @@ import CommonConstants from '../../../../common/constants/CommonConstants';
 import FontConstants from '../../../../common/constants/FontConstants';
 import { router } from '@kit.ArkUI';
 import PaddingConstants from '../../../../common/constants/PaddingConstants';
-import { IconTitleVo } from '../../../../componetsmodel/IconTitleVo';
 import ImageConstants from '../../../../common/constants/ImageConstants';
 import { rssSources } from '../../../../database/entities/rssSources';
 import SubscriptionDao from '../../../../database/dao/SubscriptionDao';
 import { showMessage } from '../../../../componets/common/promptShow';
+import rssSourcesUtils from '../../../../common/utils/rssSourcesUtils';
+import PreviewEffectImage from './PreviewEffectImage';
 
 @Entry
 @Component
@@ -28,18 +29,9 @@ struct SubscriptionSearch {
   }
 
   onPageHide(): void {
-    this.searchValue = ''
-    this.searchList = []
+    // this.searchValue = ''
+    // this.searchList = []
   }
-  // aboutToAppear(): void {
-  //   this.changeSearchValue()
-  // }
-
-  // aboutToDisappear(): void {
-  //   this.searchValue = ''
-  //   this.searchList = []
-  // }
-
 
   changeSearchValue(){
     showMessage('模糊匹配中')
@@ -129,10 +121,15 @@ struct SubscriptionSearch {
           Column({
             space: CommonConstants.SPACE_6
           }){
-            Image(item.sourceIcon.concat('app.media')?$r(item.sourceIcon):item.sourceIcon)
-              .width(ImageConstants.IMG_WIDTH_40)
-              .height(ImageConstants.IMG_HEIGHT_40)
-              .borderRadius(50)
+            PreviewEffectImage({
+              customizeTitle:item.customizeTitle,
+              sourceIcon:item.sourceIcon,
+
+              sourceIconIsUrl:item.sourceIconIsUrl,
+              isShowTitle:false,
+              PreviewWidth:ImageConstants.IMG_WIDTH_40,
+              PreviewHeight:ImageConstants.IMG_HEIGHT_40
+            }).borderRadius(50)
 
             Text(`${item.sourceName}`).fontSize(10)
               .fontColor($r('app.string.color_black_88'))