diff --git a/Wpf_AiSportsMicrospace/App.xaml b/Wpf_AiSportsMicrospace/App.xaml index d73e5b9..7854626 100644 --- a/Wpf_AiSportsMicrospace/App.xaml +++ b/Wpf_AiSportsMicrospace/App.xaml @@ -6,7 +6,10 @@ - + ./Resoures/Fonts/myFontFamily + diff --git a/Wpf_AiSportsMicrospace/MyUserControl/ImageStateToVisibilityConverter.cs b/Wpf_AiSportsMicrospace/MyUserControl/ImageStateToVisibilityConverter.cs new file mode 100644 index 0000000..c24c465 --- /dev/null +++ b/Wpf_AiSportsMicrospace/MyUserControl/ImageStateToVisibilityConverter.cs @@ -0,0 +1,24 @@ +using System; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace Wpf_AiSportsMicrospace.MyUserControl +{ + public class ImageStateToVisibilityConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is int state && parameter is string param && int.TryParse(param, out int target)) + { + return state == target ? Visibility.Visible : Visibility.Collapsed; + } + return Visibility.Collapsed; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/Wpf_AiSportsMicrospace/MyUserControl/SportUserItem.xaml b/Wpf_AiSportsMicrospace/MyUserControl/SportUserItem.xaml new file mode 100644 index 0000000..de28d38 --- /dev/null +++ b/Wpf_AiSportsMicrospace/MyUserControl/SportUserItem.xaml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + diff --git a/Wpf_AiSportsMicrospace/MyUserControl/SportUserItem.xaml.cs b/Wpf_AiSportsMicrospace/MyUserControl/SportUserItem.xaml.cs new file mode 100644 index 0000000..df49419 --- /dev/null +++ b/Wpf_AiSportsMicrospace/MyUserControl/SportUserItem.xaml.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Threading; + +namespace Wpf_AiSportsMicrospace.MyUserControl +{ + /// + /// CoverFlowControl.xaml 的交互逻辑 + /// + /// ST + public partial class SportUserItem : UserControl + { + public SportUserItem() + { + InitializeComponent(); + } + + public string DisplayText + { + get => (string)GetValue(DisplayTextProperty); + set => SetValue(DisplayTextProperty, value); + } + + public static readonly DependencyProperty DisplayTextProperty = + DependencyProperty.Register(nameof(DisplayText), typeof(string), typeof(SportUserItem), new PropertyMetadata("??")); + + public string NumberText + { + get => (string)GetValue(NumberTextProperty); + set => SetValue(DisplayTextProperty, value); + } + + public static readonly DependencyProperty NumberTextProperty = + DependencyProperty.Register(nameof(NumberText), typeof(string), typeof(SportUserItem), new PropertyMetadata("??")); + + public string ImageState + //0 没有人 1 准备中 2 运动中 3 出圈了 + { + get => (string)GetValue(ImageStateProperty); + set => SetValue(ImageStateProperty, value); + } + + public static readonly DependencyProperty ImageStateProperty = + DependencyProperty.Register(nameof(NumberText), typeof(string), typeof(SportUserItem), new PropertyMetadata("0")); + } +} \ No newline at end of file diff --git a/Wpf_AiSportsMicrospace/Resources/Font/myFontFamily.ttf b/Wpf_AiSportsMicrospace/Resources/Font/myFontFamily.ttf new file mode 100644 index 0000000..b20919e Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Font/myFontFamily.ttf differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/jump_rope.gif b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/jump_rope.gif new file mode 100644 index 0000000..4d91245 Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/jump_rope.gif differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/nopeople.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/nopeople.png new file mode 100644 index 0000000..fbdbf41 Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/nopeople.png differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/out_user.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/out_user.png new file mode 100644 index 0000000..c5c66a9 Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/out_user.png differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/pre_people.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/pre_people.png new file mode 100644 index 0000000..c5c66a9 Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/pre_people.png differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/pre_user.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/pre_user.png new file mode 100644 index 0000000..7369350 Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/pre_user.png differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/test_home_bg.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/test_home_bg.png new file mode 100644 index 0000000..b1ecd85 Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/test_home_bg.png differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/title.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/title.png new file mode 100644 index 0000000..5344224 Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/title.png differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/top_bg.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/top_bg.png new file mode 100644 index 0000000..de928ab Binary files /dev/null and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/one_rope/top_bg.png differ diff --git a/Wpf_AiSportsMicrospace/Resources/Img/test_img/test_home_bg.png b/Wpf_AiSportsMicrospace/Resources/Img/test_img/test_home_bg.png index 4f65775..b1ecd85 100644 Binary files a/Wpf_AiSportsMicrospace/Resources/Img/test_img/test_home_bg.png and b/Wpf_AiSportsMicrospace/Resources/Img/test_img/test_home_bg.png differ diff --git a/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml b/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml index 959f92a..2a90899 100644 --- a/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml +++ b/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml @@ -3,14 +3,23 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:Wpf_AiSportsMicrospace.Views" + xmlns:local="clr-namespace:Wpf_AiSportsMicrospace.MyUserControl" mc:Ignorable="d" Height="1080" Width="1920" Loaded="UserControl_Loaded" Unloaded="UserControl_Unloaded"> - + - + + + + diff --git a/Wpf_AiSportsMicrospace/Wpf_AiSportsMicrospace.csproj b/Wpf_AiSportsMicrospace/Wpf_AiSportsMicrospace.csproj index ea0c921..61f30af 100644 --- a/Wpf_AiSportsMicrospace/Wpf_AiSportsMicrospace.csproj +++ b/Wpf_AiSportsMicrospace/Wpf_AiSportsMicrospace.csproj @@ -9,6 +9,7 @@ + @@ -43,6 +44,14 @@ + + + + + + + + @@ -102,6 +111,9 @@ + + Always + Always @@ -195,6 +207,30 @@ Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always