修改Friends包名

croire 2 years ago
parent 0c5cc2d7ca
commit 0356b94d71

@ -4,14 +4,14 @@ using DownKyi.Utils;
using DownKyi.ViewModels; using DownKyi.ViewModels;
using DownKyi.ViewModels.Dialogs; using DownKyi.ViewModels.Dialogs;
using DownKyi.ViewModels.DownloadManager; using DownKyi.ViewModels.DownloadManager;
using DownKyi.ViewModels.Friend; using DownKyi.ViewModels.Friends;
using DownKyi.ViewModels.Settings; using DownKyi.ViewModels.Settings;
using DownKyi.ViewModels.Toolbox; using DownKyi.ViewModels.Toolbox;
using DownKyi.ViewModels.UserSpace; using DownKyi.ViewModels.UserSpace;
using DownKyi.Views; using DownKyi.Views;
using DownKyi.Views.Dialogs; using DownKyi.Views.Dialogs;
using DownKyi.Views.DownloadManager; using DownKyi.Views.DownloadManager;
using DownKyi.Views.Friend; using DownKyi.Views.Friends;
using DownKyi.Views.Settings; using DownKyi.Views.Settings;
using DownKyi.Views.Toolbox; using DownKyi.Views.Toolbox;
using DownKyi.Views.UserSpace; using DownKyi.Views.UserSpace;
@ -186,7 +186,7 @@ namespace DownKyi
containerRegistry.RegisterForNavigation<ViewPublication>(ViewPublicationViewModel.Tag); containerRegistry.RegisterForNavigation<ViewPublication>(ViewPublicationViewModel.Tag);
containerRegistry.RegisterForNavigation<Views.ViewChannel>(ViewModels.ViewChannelViewModel.Tag); containerRegistry.RegisterForNavigation<Views.ViewChannel>(ViewModels.ViewChannelViewModel.Tag);
containerRegistry.RegisterForNavigation<Views.ViewSeasonsSeries>(ViewModels.ViewSeasonsSeriesViewModel.Tag); containerRegistry.RegisterForNavigation<Views.ViewSeasonsSeries>(ViewModels.ViewSeasonsSeriesViewModel.Tag);
containerRegistry.RegisterForNavigation<ViewFriend>(ViewFriendViewModel.Tag); containerRegistry.RegisterForNavigation<ViewFriends>(ViewFriendsViewModel.Tag);
containerRegistry.RegisterForNavigation<ViewMySpace>(ViewMySpaceViewModel.Tag); containerRegistry.RegisterForNavigation<ViewMySpace>(ViewMySpaceViewModel.Tag);
containerRegistry.RegisterForNavigation<ViewMyFavorites>(ViewMyFavoritesViewModel.Tag); containerRegistry.RegisterForNavigation<ViewMyFavorites>(ViewMyFavoritesViewModel.Tag);

@ -179,7 +179,7 @@
<Compile Include="ViewModels\ViewChannelViewModel.cs" /> <Compile Include="ViewModels\ViewChannelViewModel.cs" />
<Compile Include="ViewModels\ViewDownloadManagerViewModel.cs" /> <Compile Include="ViewModels\ViewDownloadManagerViewModel.cs" />
<Compile Include="ViewModels\Toolbox\ViewExtractMediaViewModel.cs" /> <Compile Include="ViewModels\Toolbox\ViewExtractMediaViewModel.cs" />
<Compile Include="ViewModels\ViewFriendViewModel.cs" /> <Compile Include="ViewModels\ViewFriendsViewModel.cs" />
<Compile Include="ViewModels\ViewIndexViewModel.cs" /> <Compile Include="ViewModels\ViewIndexViewModel.cs" />
<Compile Include="ViewModels\ViewLoginViewModel.cs" /> <Compile Include="ViewModels\ViewLoginViewModel.cs" />
<Compile Include="ViewModels\Settings\ViewNetworkViewModel.cs" /> <Compile Include="ViewModels\Settings\ViewNetworkViewModel.cs" />
@ -262,8 +262,8 @@
<Compile Include="Views\ViewDownloadManager.xaml.cs"> <Compile Include="Views\ViewDownloadManager.xaml.cs">
<DependentUpon>ViewDownloadManager.xaml</DependentUpon> <DependentUpon>ViewDownloadManager.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\ViewFriend.xaml.cs"> <Compile Include="Views\ViewFriends.xaml.cs">
<DependentUpon>ViewFriend.xaml</DependentUpon> <DependentUpon>ViewFriends.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\ViewIndex.xaml.cs"> <Compile Include="Views\ViewIndex.xaml.cs">
<DependentUpon>ViewIndex.xaml</DependentUpon> <DependentUpon>ViewIndex.xaml</DependentUpon>
@ -476,7 +476,7 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Views\ViewFriend.xaml"> <Page Include="Views\ViewFriends.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>

@ -1,7 +1,7 @@
using DownKyi.Events; using DownKyi.Events;
using DownKyi.Images; using DownKyi.Images;
using DownKyi.Utils; using DownKyi.Utils;
using DownKyi.ViewModels.Friend; using DownKyi.ViewModels.Friends;
using DownKyi.ViewModels.PageViewModels; using DownKyi.ViewModels.PageViewModels;
using Prism.Commands; using Prism.Commands;
using Prism.Events; using Prism.Events;
@ -11,9 +11,9 @@ using System.Collections.ObjectModel;
namespace DownKyi.ViewModels namespace DownKyi.ViewModels
{ {
public class ViewFriendViewModel : BaseViewModel public class ViewFriendsViewModel : BaseViewModel
{ {
public const string Tag = "PageFriend"; public const string Tag = "PageFriends";
private readonly IRegionManager regionManager; private readonly IRegionManager regionManager;
@ -44,7 +44,7 @@ namespace DownKyi.ViewModels
#endregion #endregion
public ViewFriendViewModel(IRegionManager regionManager, IEventAggregator eventAggregator) : base(eventAggregator) public ViewFriendsViewModel(IRegionManager regionManager, IEventAggregator eventAggregator) : base(eventAggregator)
{ {
this.regionManager = regionManager; this.regionManager = regionManager;

@ -360,15 +360,15 @@ namespace DownKyi.ViewModels
{ {
case 0: case 0:
data["friendId"] = 0; data["friendId"] = 0;
NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); NavigateToView.NavigationView(eventAggregator, ViewFriendsViewModel.Tag, Tag, data);
break; break;
case 1: case 1:
data["friendId"] = 0; data["friendId"] = 0;
NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); NavigateToView.NavigationView(eventAggregator, ViewFriendsViewModel.Tag, Tag, data);
break; break;
case 2: case 2:
data["friendId"] = 1; data["friendId"] = 1;
NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); NavigateToView.NavigationView(eventAggregator, ViewFriendsViewModel.Tag, Tag, data);
break; break;
default: default:
break; break;

@ -261,11 +261,11 @@ namespace DownKyi.ViewModels
{ {
case 0: case 0:
data["friendId"] = 0; data["friendId"] = 0;
NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); NavigateToView.NavigationView(eventAggregator, ViewFriendsViewModel.Tag, Tag, data);
break; break;
case 1: case 1:
data["friendId"] = 1; data["friendId"] = 1;
NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); NavigateToView.NavigationView(eventAggregator, ViewFriendsViewModel.Tag, Tag, data);
break; break;
} }

@ -1,5 +1,5 @@
<UserControl <UserControl
x:Class="DownKyi.Views.ViewFriend" x:Class="DownKyi.Views.ViewFriends"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:custom="clr-namespace:DownKyi.CustomControl" xmlns:custom="clr-namespace:DownKyi.CustomControl"

@ -18,9 +18,9 @@ namespace DownKyi.Views
/// <summary> /// <summary>
/// ViewFriend.xaml 的交互逻辑 /// ViewFriend.xaml 的交互逻辑
/// </summary> /// </summary>
public partial class ViewFriend : UserControl public partial class ViewFriends : UserControl
{ {
public ViewFriend() public ViewFriends()
{ {
InitializeComponent(); InitializeComponent();
} }
Loading…
Cancel
Save