Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

支持聊天记录 #257

Merged
merged 6 commits into from
Jan 26, 2024
Merged

支持聊天记录 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1288b83
添加会话列表
Richasy Jan 24, 2024
48f40a1
添加聊天获取
Richasy Jan 25, 2024
b1b3010
对话界面
Richasy Jan 26, 2024
95f4386
添加发送消息逻辑（未完成）
Richasy Jan 26, 2024
0669d71
迁移消息页面入口至第一级
Richasy Jan 26, 2024
7818903
支持发送消息
Richasy Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/App/App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<None Remove="Assets\ReaderClean.js" />
<None Remove="Controls\AppTitleBar.xaml" />
<None Remove="Controls\Base\BiliPlayer\BiliPlayer.xaml" />
<None Remove="Controls\Base\ChatMessageItemControl.xaml" />
<None Remove="Controls\Base\DownloadSection.xaml" />
<None Remove="Controls\Base\DynamicImageItem.xaml" />
<None Remove="Controls\Base\DynamicNotSupportItem.xaml" />
Expand Down Expand Up @@ -86,6 +87,8 @@
<None Remove="Controls\Modules\AllDynamicDetailModule.xaml" />
<None Remove="Controls\Modules\AnimeNavListModule.xaml" />
<None Remove="Controls\Modules\ArticleNavListModule.xaml" />
<None Remove="Controls\Modules\ChatSessionListModule.xaml" />
<None Remove="Controls\Modules\ChatSessionModule.xaml" />
<None Remove="Controls\Modules\DynamicUpListModule.xaml" />
<None Remove="Controls\Modules\EmotePanel.xaml" />
<None Remove="Controls\Modules\FavoritesNavListModule.xaml" />
Expand Down Expand Up @@ -282,6 +285,15 @@
<Content Update="Assets\AppCenterSecret.txt">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</Content>
<Page Update="Controls\Modules\ChatSessionModule.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Update="Controls\Base\ChatMessageItemControl.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Update="Controls\Modules\ChatSessionListModule.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Update="Controls\Modules\EmotePanel.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
Expand Down
1 change: 1 addition & 0 deletions src/App/Controls/Base/BiliPlayer/BiliPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public bool Player_CanHideCursor()
/// <inheritdoc/>
public void Player_Disposed()
{
_mediaElement?.MediaPlayer?.Dispose();
_mediaElement?.SetMediaPlayer(null);

// if (_vlcView != null)
Expand Down
112 changes: 112 additions & 0 deletions src/App/Controls/Base/ChatMessageItemControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8" ?>
<local:ChatMessageItemControlBase
x:Class="Bili.Copilot.App.Controls.Base.ChatMessageItemControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Bili.Copilot.App.Controls.Base"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">

<Grid ColumnSpacing="8">
<Grid.ColumnDefinitions>
<ColumnDefinition x:Name="LeftColumn" Width="*" />
<ColumnDefinition x:Name="RightColumn" Width="0.2*" />
</Grid.ColumnDefinitions>

<local:CardPanel
x:Name="RootCard"
HorizontalAlignment="Left"
Background="Transparent"
DisabledBackground="Transparent"
PointerOverBackground="Transparent"
PressedBackground="Transparent"
StrokeThickness="0">
<Grid HorizontalAlignment="Left" ColumnSpacing="12">
<Grid.ColumnDefinitions>
<ColumnDefinition x:Name="InnerLeftColumn" Width="Auto" />
<ColumnDefinition x:Name="InnerRightColumn" />
</Grid.ColumnDefinitions>
<local:UserAvatar
x:Name="AvatarImage"
Width="28"
Height="28"
Margin="0,4,0,0"
VerticalAlignment="Top"
Avatar="{x:Bind ViewModel.User.Data.Avatar.Uri, Mode=OneWay}"
AvatarRadius="14"
Background="{ThemeResource AppBarBackgroundThemeBrush}"
CornerRadius="14"
UserName="{x:Bind ViewModel.User.Data.Name, Mode=OneWay}"
Visibility="{x:Bind ViewModel.IsMe, Mode=OneWay, Converter={StaticResource BoolToVisibilityReverseConverter}}" />
<Grid
x:Name="MessageContainer"
Grid.Column="1"
RowSpacing="4">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle
x:Name="MessageBackground"
Fill="{ThemeResource CardBackgroundFillColorDefaultBrush}"
RadiusX="4"
RadiusY="4"
Stroke="{ThemeResource ControlStrokeColorDefaultBrush}"
StrokeThickness="1" />
<Grid x:Name="TextContainer" Padding="12,8,12,4">
<local:EmoteTextBlock
x:Name="PlainMessageBlock"
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
MaxLines="99"
Text="{x:Bind ViewModel.Content, Mode=OneWay}"
Visibility="{x:Bind ViewModel.IsImage, Mode=OneWay, Converter={StaticResource BoolToVisibilityReverseConverter}}" />
<local:ImageEx
MaxWidth="280"
CornerRadius="{StaticResource ControlCornerRadius}"
DecodePixelWidth="400"
Source="{x:Bind ViewModel.ImageUri, Mode=OneWay}"
Stretch="Uniform"
Tapped="OnImageTapped"
Visibility="{x:Bind ViewModel.IsImage, Mode=OneWay}" />
</Grid>

<TextBlock
x:Name="TimeBlock"
Grid.Row="1"
HorizontalAlignment="Left"
FontSize="10"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind ViewModel.SlimTime, Mode=OneWay}"
ToolTipService.ToolTip="{x:Bind ViewModel.FullTime, Mode=OneWay}" />
</Grid>
</Grid>
</local:CardPanel>

<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutGroup">
<VisualStateGroup.States>
<VisualState x:Name="AssistantState" />
<VisualState x:Name="MyState">
<VisualState.Setters>
<Setter Target="MessageBackground.Fill" Value="{ThemeResource AccentFillColorDefaultBrush}" />
<Setter Target="MessageBackground.Stroke" Value="{ThemeResource ControlStrokeColorOnAccentDefaultBrush}" />
<Setter Target="PlainMessageBlock.Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
<Setter Target="LeftColumn.Width" Value="0.2*" />
<Setter Target="RightColumn.Width" Value="*" />
<Setter Target="RootCard.(Grid.Column)" Value="1" />
<Setter Target="RootCard.HorizontalAlignment" Value="Right" />
<Setter Target="TimeBlock.HorizontalAlignment" Value="Right" />
<Setter Target="AvatarImage.(Grid.Column)" Value="1" />
<Setter Target="AvatarImage.Visibility" Value="Collapsed" />
<Setter Target="MessageContainer.(Grid.Column)" Value="0" />
<Setter Target="InnerLeftColumn.Width" Value="*" />
<Setter Target="InnerRightColumn.Width" Value="Auto" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup.States>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</local:ChatMessageItemControlBase>
46 changes: 46 additions & 0 deletions src/App/Controls/Base/ChatMessageItemControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Copyright (c) Bili Copilot. All rights reserved.

using Bili.Copilot.Libs.Adapter;
using Bili.Copilot.Models.App.Args;
using Bili.Copilot.ViewModels;
using Bili.Copilot.ViewModels.Items;

namespace Bili.Copilot.App.Controls.Base;

/// <summary>
/// 聊天消息项控件.
/// </summary>
public sealed partial class ChatMessageItemControl : ChatMessageItemControlBase
{
/// <summary>
/// Initializes a new instance of the <see cref="ChatMessageItemControl"/> class.
/// </summary>
public ChatMessageItemControl()
{
InitializeComponent();
}

internal override void OnViewModelChanged(DependencyPropertyChangedEventArgs e)
{
if (e.NewValue is ChatMessageItemViewModel vm)
{
_ = vm.IsMe
? VisualStateManager.GoToState(this, nameof(MyState), false)
: VisualStateManager.GoToState(this, nameof(AssistantState), false);
}
}

private void OnImageTapped(object sender, TappedRoutedEventArgs e)
{
var img = ImageAdapter.ConvertToImage(ViewModel.ImageUri);
var args = new ShowImageEventArgs(new[] { img });
AppViewModel.Instance.ShowImagesCommand.Execute(args);
}
}

/// <summary>
/// 聊天消息项控件基类.
/// </summary>
public abstract class ChatMessageItemControlBase : ReactiveUserControl<ChatMessageItemViewModel>
{
}
10 changes: 0 additions & 10 deletions src/App/Controls/Base/EmoteTextBlock/EmoteTextBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,6 @@ protected override void OnApplyTemplate()
base.OnApplyTemplate();
}

private static void OnReplyInfoChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var instance = d as EmoteTextBlock;
instance.Text = null;
if (e.NewValue != null)
{
instance.InitializeContent();
}
}

private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var instance = d as EmoteTextBlock;
Expand Down
10 changes: 10 additions & 0 deletions src/App/Controls/Base/NavigateItemControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@
<ToolTip Content="{x:Bind ViewModel.Data.Title, Mode=OneWay}" IsEnabled="{x:Bind TitleBlock.IsTextTrimmed, Mode=OneWay}" />
</ToolTipService.ToolTip>
</TextBlock>

<Ellipse
Grid.RowSpan="2"
Width="8"
Height="8"
Margin="0,4,4,0"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Fill="{ThemeResource SystemFillColorAttentionBrush}"
Visibility="{x:Bind ViewModel.HasUnread, Mode=OneWay}" />
</Grid>
</local:CardPanel>
</local:NavigateItemControlBase>
15 changes: 8 additions & 7 deletions src/App/Controls/Base/NavigationPanel.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ScrollViewer
HorizontalScrollMode="Disabled"
Expand All @@ -31,11 +30,13 @@
</ItemsRepeater>
</ScrollViewer>

<local:NavigateItemControl
Grid.Row="1"
Margin="0,0,0,8"
ViewModel="{x:Bind ViewModel.WebDavItem, Mode=OneWay}"
Visibility="{x:Bind ViewModel.WebDavItem.IsVisible, Mode=OneWay}" />
<local:NavigateItemControl Grid.Row="2" ViewModel="{x:Bind ViewModel.SettingsItem, Mode=OneWay}" />
<StackPanel Grid.Row="1">
<local:NavigateItemControl
Margin="0,0,0,4"
ViewModel="{x:Bind ViewModel.WebDavItem, Mode=OneWay}"
Visibility="{x:Bind ViewModel.WebDavItem.IsVisible, Mode=OneWay}" />
<local:NavigateItemControl Margin="0,0,0,4" ViewModel="{x:Bind ViewModel.MessageItem, Mode=OneWay}" />
<local:NavigateItemControl ViewModel="{x:Bind ViewModel.SettingsItem, Mode=OneWay}" />
</StackPanel>
</Grid>
</local:NavigationPanelBase>
30 changes: 0 additions & 30 deletions src/App/Controls/Modules/AccountModule.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@
Height="28"
CornerRadius="18"
Source="{x:Bind ViewModel.Avatar, Mode=OneWay}" />
<Ellipse
Width="8"
Height="8"
Margin="0,-4,-4,0"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Fill="{ThemeResource SystemFillColorAttentionBrush}"
Visibility="{x:Bind ViewModel.MessageCountInt, Converter={StaticResource ObjectToVisibilityConverter}, Mode=OneWay}" />
</Grid>
<Button.Flyout>
<Flyout
Expand Down Expand Up @@ -158,28 +150,6 @@
Symbol="Person"
Text="{ext:Locale Name=Personal}" />
</Button>
<Button
HorizontalContentAlignment="Stretch"
Click="OnItemButtonClick"
Command="{x:Bind ViewModel.OpenMessageCommand}"
Style="{StaticResource ItemButtonStyle}">
<Grid ColumnSpacing="2">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<base:IconTextBlock
HorizontalAlignment="Left"
FontSize="14"
IconFontSize="16"
Symbol="Chat"
Text="{ext:Locale Name=Message}" />
<InfoBadge
Grid.Column="1"
Visibility="{x:Bind ViewModel.MessageCountInt, Mode=OneWay, Converter={StaticResource ObjectToVisibilityConverter}}"
Value="{x:Bind ViewModel.MessageCountInt, Mode=OneWay}" />
</Grid>
</Button>
<Button
Click="OnItemButtonClick"
Command="{x:Bind ViewModel.ShowFavoritesCommand}"
Expand Down
Loading
Loading