Commit 77add42a by wangonghui

CBA界面得修改

parent b897aaf0
......@@ -27,24 +27,22 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<WrapPanel Width="650" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-2,0,0,0" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="175"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<TextBlock TextBlock.TextAlignment="Center" Text="日期:" Width="60" Grid.Column="2" FontSize="16" VerticalAlignment="Center"/>
......
<UserControl x:Class="VIZ.TVP.CBA.Module.DayMatchNewView"
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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:core="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:storage="clr-namespace:VIZ.TVP.CBA.Module"
xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
d:DesignHeight="300" d:DesignWidth="650">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.TVP.CBA.Module;component/Style/DataGrid.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
<core:Enum2EnumDescriptionConverter x:Key="Enum2EnumDescriptionConverter" EnumType="{x:Type storage:HighLightEnum}"></core:Enum2EnumDescriptionConverter>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<dxlc:FlowLayoutControl Orientation="Horizontal" x:Name="flowLayoutControl" >
<!--<dxlc:FlowLayoutControl.ItemTemplate>
--><!--<DataTemplate>
<dxe:ComboBoxEdit ItemsSource="{Binding Source={x:Static Member=storage:StaticEnumInfos.EnumDescriptions}}" IsTextEditable="False" Width="60" />
<dxe:TextEdit Name="dates" Text="{Binding dates}" Width="80"/>
<dxe:TextEdit Name="time" Text="{Binding time}" Width="80"/>
<dxe:TextEdit Name="HomeTeamName" Text="{Binding HomeTeamName}" Width="80"/>
<dxe:TextEdit Name="HomeTeamScore" Text="{Binding HomeTeamScore}" Width="80"/>
<dxe:TextEdit Name="VisitingTeamName" Text="{Binding VisitingTeamName}" Width="80"/>
<dxe:TextEdit Name="Status" Text="{Binding Status}" Width="80"/>
</DataTemplate>--><!--
</dxlc:FlowLayoutControl.ItemTemplate>-->
</dxlc:FlowLayoutControl>
</Grid>
</UserControl>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
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.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core;
namespace VIZ.TVP.CBA.Module
{
/// <summary>
/// Interaction logic for DayMatchNew.xaml
/// </summary>
public partial class DayMatchNewView : UserControl
{
public DayMatchNewView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, new DayMatchNewViewModel());
}
}
}
using DevExpress.Mvvm.POCO;
using log4net;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.TVP.CBA.Module
{
public class DayMatchNewViewModel : ViewModelBase
{
public DayMatchNewViewModel()
{
GetSchedule();
visiblity = "Hidden";
}
/// <summary>
/// 日志
/// </summary>
private static ILog Log = LogManager.GetLogger(typeof(DayMatchNewViewModel));
private ObservableCollection<Dayschedule> matchData;
/// <summary>
/// 绑定数据列表
/// </summary>
public ObservableCollection<Dayschedule> MatchData
{
get { return matchData; }
set { matchData = value; this.RaisePropertyChanged(nameof(MatchData)); }
}
private string visiblity;
public string Visiblity
{
get { return visiblity; }
set { visiblity = value; this.RaisePropertyChanged(nameof(Visiblity)); }
}
private async void GetSchedule()
{
try
{
string date = "2023-1-4";
//Convert.ToDateTime("20").ToString("yyyy-MM-dd");
var dayschedules = await JsonModel.TomorrowMatch_Path(date);
if (dayschedules == null) return;
// matchData.AddRange(dayschedules.dayschedule);
MatchData = new ObservableCollection<Dayschedule>();
foreach (var dayschedule in dayschedules.dayschedule)
{
if (dayschedule.Status == "1")
{
dayschedule.Status = "未开赛";
}
else if (dayschedule.Status == "2")
{
dayschedule.Status = "进行中";
}
else if (dayschedule.Status == "3")
{
dayschedule.Status = "进行中";
}
else if (dayschedule.Status == "4")
{
dayschedule.Status = "已结束";
}
else if (dayschedule.Status == "5")
{
dayschedule.Status = "延期";
}
MatchData.Add(dayschedule);
}
}
catch (Exception ex)
{
Log.Error(ex.Message);
}
}
}
}
......@@ -447,7 +447,7 @@ namespace VIZ.TVP.CBA.Module
set { aNums = value; this.RaisePropertyChanged(nameof(ANums)); }
}
private string title = "球员对比数据";
private string title = "球员对比数据数据数据";
public string Title
{
......
......@@ -30,15 +30,15 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="175"/>
<ColumnDefinition Width="65"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center" />
<dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<TextBlock Grid.Column="2" Text="轮次:" FontSize="16" VerticalAlignment="Center"/>
......@@ -46,10 +46,9 @@
Width="120" ItemsSource="{Binding Path=RoundMatchs,Mode=TwoWay}"
SelectedItem="{Binding Path=RoundMatchItem,Mode=TwoWay}">
</dxe:ComboBoxEdit>
<!--<TextBlock TextBlock.TextAlignment="Center" Text="球队排行榜" Grid.Column="0" Foreground="White" FontSize="20" Background="Black" Margin="100,0,3,0" Grid.ColumnSpan="2" />-->
<Button Grid.Column="4" Content="刷新" FontSize="14" Height="30" Width="95" Command="{Binding BtnCmd}" />
<!--<Button Grid.Column="5" Content="数据上" FontSize="14" Height="30" Width="95" Command="{Binding BtnCmdUp}" />-->
<dx:SimpleButton Grid.Row="0" Grid.Column="5" Content="刷新" Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16"
Command="{Binding BtnCmd}" HorizontalContentAlignment="Center" Width="95" Height="30" />
</Grid>
</WrapPanel>
......
......@@ -28,36 +28,38 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<WrapPanel Grid.Row="2" VerticalAlignment="Center" >
<WrapPanel Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Width="760" >
<Grid>
<Grid.ColumnDefinitions>
<!--<ColumnDefinition Width="50"/>
<ColumnDefinition Width="120"/>-->
<ColumnDefinition Width="120"/> 650-->
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/>
</Grid.ColumnDefinitions>
<!--<TextBlock Grid.Column="0" Text="标题:" FontSize="16" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>-->
<TextBlock Grid.Column="0" Text="球队:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<dxe:ComboBoxEdit Grid.Column="1" Name="com_TeamItem" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center"
<dxe:ComboBoxEdit Grid.Column="1" Name="com_TeamItem" Width="135" HorizontalAlignment="Left" VerticalAlignment="Center"
ItemsSource="{Binding Path=TeamItems,Mode=TwoWay}" SelectedItem="{Binding Path=SelectTeamItem,Mode=TwoWay}" SelectedIndex="{Binding SelectedIndex}"
FontSize="16">
</dxe:ComboBoxEdit>
<TextBlock Text="球员:" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="16" />
<dxe:ComboBoxEdit Grid.Column="3" x:Name="com_players" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80"
<dxe:ComboBoxEdit Grid.Column="3" x:Name="com_players"
HorizontalAlignment="Left" VerticalAlignment="Center" Width="135"
ItemsSource="{Binding Path=PlayerItems,Mode=TwoWay}"
SelectedItem="{Binding Path=SelectPlayer,Mode=TwoWay}" FontSize="16" />
......@@ -82,30 +84,33 @@
</Grid>
</WrapPanel>
<WrapPanel Grid.Row="1" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Center">
<WrapPanel Grid.Row="1" HorizontalAlignment="Left" Width="760" VerticalAlignment="Center">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="65"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="175"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="16" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<Button Content="刷新" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
Grid.Column="2" Width="95" Height="30" FontSize="14"/>
<Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="2" FontSize="14" Height="30" Width="90"/>
<Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="3" FontSize="14" Height="30" Width="90"/>
<Button Content="任务暂停" Name="task_continue" Click="task_continue_Click" Grid.Column="3" FontSize="14" Height="30" Width="90"/>
<Button Content="任务暂停" Name="task_continue" Click="task_continue_Click" Grid.Column="4" FontSize="14" Height="30" Width="90"/>
<Button Content="任务停止" Name="task_Stop" Click="task_Stop_Click" Grid.Column="4" FontSize="14" Height="30" Width="90"/>
<!--<Button Content="刷新" Command="{Binding BtnCmd}" HorizontalContentAlignment="Center"
Grid.Column="5" Width="95" Height="30" FontSize="14"/>-->
<Button Content="任务停止" Name="task_Stop" Click="task_Stop_Click" Grid.Column="5" FontSize="14" Height="30" Width="90"/>
<dx:SimpleButton Grid.Row="0" Grid.Column="5" Content="刷新" Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16"
Command="{Binding BtnCmd}" HorizontalContentAlignment="Center" Width="95" Height="30" />
......@@ -128,7 +133,7 @@
</Grid>
</WrapPanel>-->
<WrapPanel Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Width="650" Margin="80,0,0,0">
<WrapPanel Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Width="650" Margin="150,0,0,0">
<Grid>
<Grid.RowDefinitions>
......
......@@ -29,19 +29,19 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="175"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="120"/>
<!--<ColumnDefinition Width="120"/>-->
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalContentAlignment="Center"
HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }"></dxe:TextEdit>
<!--<TextBlock TextBlock.TextAlignment="Center" Text="球队排行榜" Grid.Column="0" Foreground="White" FontSize="20" Background="Black" Margin="100,0,3,0" Grid.ColumnSpan="2" />-->
<Button Grid.Column="3" Content="加载数据" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmd}" />
<Button Grid.Column="4" Content="加载数据" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmd}" />
<!--<Button Grid.Column="4" Content="数据上" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmdTeamStandingUp}" />
<Button Grid.Column="5" Content="下一页数据" FontSize="14" Width="95" Height="30" Command="{Binding BtnCmdNextPage}" />-->
......
......@@ -24,11 +24,11 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<WrapPanel Grid.Row="1" VerticalAlignment="Center" >
<WrapPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left" Width="760">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="75"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="40"/>
<ColumnDefinition Width="120"/>
......@@ -36,9 +36,9 @@
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }" />
<TextBlock Grid.Column="0" Text="球队:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<!--<dxe:TextEdit Grid.Column="1" Width="120" FontSize="16" HorizontalContentAlignment="Center"
VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }" />-->
<dxe:TextEdit Text="{Binding HomeTeam}" Grid.Column="2" Width="120" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"/>
......@@ -55,30 +55,36 @@
</Grid>
</WrapPanel>
<WrapPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
<WrapPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="760">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="75"/>
<ColumnDefinition Width="175"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="110"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="标题:" FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<dxe:TextEdit Grid.Column="1" Width="170" FontSize="16" HorizontalAlignment="Left" HorizontalContentAlignment="Center"
VerticalAlignment="Center" Text="{Binding Title,Mode=TwoWay }" />
<Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="2" FontSize="14" Height="30" Width="90"/>
<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"
Grid.Column="0" Width="95" Height="30" FontSize="14"/>
<Button Content="任务暂停" Name="task_continue" Click="task_continue_Click" Grid.Column="3" FontSize="14" Height="30" Width="90"/>
<Button Content="任务开始" Name="task_Start" Click="task_Start_Click" Grid.Column="1" FontSize="14" Height="30" Width="90"/>
<Button Content="任务停止" Name="task_Stop" Click="task_Stop_Click" Grid.Column="4" FontSize="14" Height="30" Width="90"/>
<Button Content="任务暂停" Name="task_continue" Click="task_continue_Click" Grid.Column="2" FontSize="14" Height="30" Width="90"/>
<!--<Button Content="刷新" Command="{Binding BtnCommand}" HorizontalContentAlignment="Center"
Grid.Column="5" Width="95" Height="30" FontSize="14"/>-->
<Button Content="任务停止" Name="task_Stop" Click="task_Stop_Click" Grid.Column="3" FontSize="14" Height="30" Width="90"/>
<dx:SimpleButton Grid.Row="0" Grid.Column="5" Content="刷新" Glyph='/VIZ.TVP.CBA.Module;component/Image/CBAPng/refresh2525.png' FontSize="16"
Command="{Binding BtnCommand}" HorizontalContentAlignment="Center" Width="95" Height="30" />
</Grid>
</WrapPanel>
<WrapPanel Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Width="710">
<WrapPanel Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Width="760">
<Grid>
<Grid.RowDefinitions>
......@@ -92,7 +98,7 @@
<RowDefinition Height="34"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="40"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="115"/>
<ColumnDefinition Width="116"/>
<ColumnDefinition Width="127"/>
......
......@@ -121,10 +121,6 @@
<Compile Include="Common\PluginConstant.cs" />
<Compile Include="Common\Utils.cs" />
<Compile Include="ConfigHelper\ConfigManage.cs" />
<Compile Include="DayMatchNew\ViewModel\DayMatchNewViewModel.cs" />
<Compile Include="DayMatchNew\View\DayMatchNewView.xaml.cs">
<DependentUpon>DayMatchNewView.xaml</DependentUpon>
</Compile>
<Compile Include="DayMatch\DayMatchPlugin.cs" />
<Compile Include="DayMatch\Model\Dayschedules.cs" />
<Compile Include="HeaderPage\HeaderPagePlugin.cs" />
......@@ -301,10 +297,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="DayMatchNew\View\DayMatchNewView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="DayMatch\View\DayMatchView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......@@ -439,6 +431,12 @@
<ItemGroup>
<Folder Include="Image\PlayerLogo\" />
</ItemGroup>
<ItemGroup>
<Resource Include="Image\CBAPng\refresh3030.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Image\CBAPng\refresh2525.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment