Merge branch 'master' of https://github.com/aiqinxuancai/Aria2Fast

aiqinxuancai · Jun 11, 2024 · ee8143e · ee8143e
2 parents ed8f350 + 85710ad
commit ee8143e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Aria2Fast/View/AddSubscriptionView.xaml.cs b/Aria2Fast/View/AddSubscriptionView.xaml.cs
@@ -57,7 +57,11 @@ private void Page_DataContextChanged(object sender, DependencyPropertyChangedEve
                 UrlTextBox.Text = obj.Item1; //订阅地址
                 _customNamePath = obj.Item2; //指定订阅存储名称
                 _anime = obj.Item3;
-                _subscriptionModel = obj.Item4;
+                if (!string.IsNullOrEmpty(obj.Item4.Url))
+                {
+                    _subscriptionModel = obj.Item4;
+                }
+
 
 
                 TextBoxRssPath.Text = _customNamePath; //

diff --git a/Aria2Fast/View/MikanAnimeRssView.xaml.cs b/Aria2Fast/View/MikanAnimeRssView.xaml.cs
@@ -1,4 +1,5 @@
 using Aria2Fast.Service.Model;
+using Aria2Fast.Service.Model.SubscriptionModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -37,7 +38,7 @@ private void Border_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
             //MainWindow.Instance.RootNavigation.NavigateWithHierarchy(typeof(MikanAnimeRssView), animeItem);
             //弹出订阅页面？
             //MainWindow.Instance.RootNavigation.IsBackButtonVisible = Wpf.Ui.Controls.NavigationViewBackButtonVisible.Visible;
-            MainWindow.Instance.RootNavigation.Navigate(typeof(AddSubscriptionView), (mikanAnimeRss.Url, mikanAnime.Name, mikanAnime));
+            MainWindow.Instance.RootNavigation.Navigate(typeof(AddSubscriptionView), (mikanAnimeRss.Url, mikanAnime.Name, mikanAnime, new SubscriptionModel()));
         }
     }
 }