Commit 2dc8ea84 by wangonghui

修改赛程选中事件慢的改造

parent 35c08c36
......@@ -9,6 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.Package.Domain;
using VIZ.Package.Module;
namespace VIZ.TVP.CBA.Module
......@@ -285,33 +286,38 @@ namespace VIZ.TVP.CBA.Module
#region 球员统计信息
if (TeamStatsViewModel.TeamStatsViewModelInstance.Count>0)
{
// Log.Error(string.Format("TeamStatsViewModel.CreateInstance Count:{0}", TeamStatsViewModel.TeamStatsViewModelInstance.Count));
foreach(var tempTeamStatsViewModel in TeamStatsViewModel.TeamStatsViewModelInstance)
{
// TeamStatsViewModel teamStatsViewModel = tempTeamStatsViewModel;
// Log.Error("DateHeaderViewModel_CreateTeamStatsViewModel");
tempTeamStatsViewModel.ScheduleID = selectMatchData.ScheduleID;
tempTeamStatsViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
// Log.Error(string.Format("DateHeader_ScheduleId:{0}", selectMatchData.ScheduleID));
//Log.Error(string.Format("DateHeader_ScheduleTypeId:{0}", selectMatchData.ScheduleTypeID));
tempTeamStatsViewModel.SetTeamData();
}
//if (TeamStatsViewModel.TeamStatsViewModelInstance.Count>0)
//{
// // Log.Error(string.Format("TeamStatsViewModel.CreateInstance Count:{0}", TeamStatsViewModel.TeamStatsViewModelInstance.Count));
// foreach(var tempTeamStatsViewModel in TeamStatsViewModel.TeamStatsViewModelInstance)
// {
// // if(ApplicationDomainEx.CurrentPage == page;
// // TeamStatsViewModel teamStatsViewModel = tempTeamStatsViewModel;
// // Log.Error("DateHeaderViewModel_CreateTeamStatsViewModel");
// tempTeamStatsViewModel.ScheduleID = selectMatchData.ScheduleID;
// tempTeamStatsViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
// // Log.Error(string.Format("DateHeader_ScheduleId:{0}", selectMatchData.ScheduleID));
// //Log.Error(string.Format("DateHeader_ScheduleTypeId:{0}", selectMatchData.ScheduleTypeID));
// tempTeamStatsViewModel.SetTeamData();
// }
}
//}
if(NewTeamStatsViewModel.TeamStatsViewModelInstance.Count>0)
{
foreach (var tempTeamStatsViewModel in NewTeamStatsViewModel.TeamStatsViewModelInstance)
{
tempTeamStatsViewModel.ScheduleID = selectMatchData.ScheduleID;
tempTeamStatsViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
if (tempTeamStatsViewModel.page!=null&& ApplicationDomainEx.CurrentPage == tempTeamStatsViewModel.page)
{
tempTeamStatsViewModel.SetTeamData();
}
}
}
......@@ -321,17 +327,17 @@ namespace VIZ.TVP.CBA.Module
#region 单个球员信息
if(SinglePlayerViewModel.SinglePlayerViewModelInstance.Count>0)
{
//if(SinglePlayerViewModel.SinglePlayerViewModelInstance.Count>0)
//{
foreach(var tempSinglePlayerViewModel in SinglePlayerViewModel.SinglePlayerViewModelInstance)
{
tempSinglePlayerViewModel.ScheduleID = selectMatchData.ScheduleID;
tempSinglePlayerViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
tempSinglePlayerViewModel.SetSingleData();
}
// foreach(var tempSinglePlayerViewModel in SinglePlayerViewModel.SinglePlayerViewModelInstance)
// {
// tempSinglePlayerViewModel.ScheduleID = selectMatchData.ScheduleID;
// tempSinglePlayerViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
// tempSinglePlayerViewModel.SetSingleData();
// }
}
//}
if(NewSinglePlayerViewModel.SinglePlayerViewModelInstance.Count>0)
......@@ -340,8 +346,13 @@ namespace VIZ.TVP.CBA.Module
{
tempSinglePlayerViewModel.ScheduleID = selectMatchData.ScheduleID;
tempSinglePlayerViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
if (tempSinglePlayerViewModel.page != null && ApplicationDomainEx.CurrentPage == tempSinglePlayerViewModel.page)
{
tempSinglePlayerViewModel.SetSingleData();
}
}
}
......@@ -349,32 +360,33 @@ namespace VIZ.TVP.CBA.Module
#region 球员对比信息
if(PlayerCompareViewModel.PlayerCompareViewModelInstance.Count>0)
{
foreach(var playerCompareViewModel in PlayerCompareViewModel.PlayerCompareViewModelInstance)
{
//PlayerCompareViewModel playerCompareViewModel = PlayerCompareViewModel.CreateInstance;
playerCompareViewModel.ScheduleID = selectMatchData.ScheduleID;
playerCompareViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
playerCompareViewModel.SetCompareData();
}
//if(PlayerCompareViewModel.PlayerCompareViewModelInstance.Count>0)
//{
// foreach(var playerCompareViewModel in PlayerCompareViewModel.PlayerCompareViewModelInstance)
// {
// //PlayerCompareViewModel playerCompareViewModel = PlayerCompareViewModel.CreateInstance;
// playerCompareViewModel.ScheduleID = selectMatchData.ScheduleID;
// playerCompareViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
// playerCompareViewModel.SetCompareData();
// }
}
//}
if(NewPlayerComPareViewModel.PlayerCompareViewModelInstance.Count>0)
{
foreach (var playerCompareViewModel in NewPlayerComPareViewModel.PlayerCompareViewModelInstance)
{
//PlayerCompareViewModel playerCompareViewModel = PlayerCompareViewModel.CreateInstance;
playerCompareViewModel.ScheduleID = selectMatchData.ScheduleID;
playerCompareViewModel.Matchtypeid = selectMatchData.ScheduleTypeID;
//PlayerCompareViewModel playerCompareViewModel = PlayerCompareViewModel.CreateInstance;
if (playerCompareViewModel.page != null && ApplicationDomainEx.CurrentPage == playerCompareViewModel.page)
{
playerCompareViewModel.SetCompareData();
}
}
}
......
......@@ -40,8 +40,27 @@ namespace VIZ.TVP.CBA.Module
task_Start.IsEnabled = true;
task_Stop.IsEnabled = false;
task_continue.IsEnabled = false;
this.Loaded += NewPlayerComPareView_Loaded;
this.IsVisibleChanged += NewPlayerComPareView_IsVisibleChanged;
}
private void NewPlayerComPareView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
{
if (!string.IsNullOrEmpty(vm.ScheduleID) && !string.IsNullOrEmpty(vm.Matchtypeid))
{
vm.SetCompareData();
}
}
private void NewPlayerComPareView_Loaded(object sender, RoutedEventArgs e)
{
var service = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
if (service == null)
return;
vm.page = service.GetPageModelFromView(this);
}
public void Dispose()
{
......@@ -144,8 +163,12 @@ namespace VIZ.TVP.CBA.Module
vm.BtnCmd();
//task.CanExecute = vm.flag;
//SCRIPT_INVOKE
if(vm.onAirDataModel!=null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
}
}
}
private void OnTakeUpdate(ConnModel conn)
......@@ -154,9 +177,13 @@ namespace VIZ.TVP.CBA.Module
{
vm.BtnCmd();
//SCRIPT_INVOKE
if(vm.onAirDataModel!=null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombinePlayerCommand()));
}
//SCRIPT_INVOKE
}
}
private void task_Start_Click(object sender, RoutedEventArgs e)
......
......@@ -13,6 +13,7 @@ using VIZ.Framework.Core;
using System.Windows.Media;
using DevExpress.Data;
using System.IO;
using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module
{
......@@ -499,7 +500,8 @@ namespace VIZ.TVP.CBA.Module
/// </summary>
public Dictionary<string, string> SetMatchDict = new Dictionary<string, string>();
//初始话页面
public PageModel page = null;
/// <summary>
/// 组装包装发送的球员信息
......
......@@ -29,6 +29,8 @@ namespace VIZ.TVP.CBA.Module
public NewSinglePlayerView()
{
InitializeComponent();
//vm = new SinglePlayerViewModel(); dqyData
NewSinglePlayerViewModel.SinglePlayerViewModelInstance.Add(vm);
WPFHelper.BindingViewModel(this, vm);
......@@ -40,6 +42,28 @@ namespace VIZ.TVP.CBA.Module
task_Start.IsEnabled = true;
task_Stop.IsEnabled = false;
task_continue.IsEnabled = false;
this.Loaded += NewSinglePlayerView_Loaded;
this.IsVisibleChanged += NewSinglePlayerView_IsVisibleChanged;
}
private void NewSinglePlayerView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
{
if (!string.IsNullOrEmpty(vm.ScheduleID) && !string.IsNullOrEmpty(vm.Matchtypeid))
{
vm.SetSingleData();
}
}
private void NewSinglePlayerView_Loaded(object sender, RoutedEventArgs e)
{
var service = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
if (service == null)
return;
vm.page = service.GetPageModelFromView(this);
}
public void Dispose()
......@@ -139,9 +163,13 @@ namespace VIZ.TVP.CBA.Module
if (conn.IsConnected)
{
vm.BtnCommand();
if(vm.onAirDataModel!=null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineSingleData()));
}
//task.CanExecute = vm.flag;
//SCRIPT_INVOKE
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineSingleData()));
}
}
......@@ -152,8 +180,12 @@ namespace VIZ.TVP.CBA.Module
vm.BtnCommand();
//SCRIPT_INVOKE
if(vm.onAirDataModel!=null)
{
conn.EndpointManager.Send(String.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineSingleData()));
}
}
}
private void task_Start_Click(object sender, RoutedEventArgs e)
......
......@@ -11,6 +11,7 @@ using System.Windows;
using VIZ.Framework.Core;
using System.Windows.Media;
using System.IO;
using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module
{
......@@ -61,6 +62,8 @@ namespace VIZ.TVP.CBA.Module
}
//初始话界面
public PageModel page = null;
public ObservableCollection<string> PlayerDataCompareOptionChinese = new ObservableCollection<string> { "得分","篮板","助攻", "抢断", "盖帽","上场时间","投篮命中率","两分命中率","三分命中率","罚球命中率",
"篮下投篮命中率","中距离投篮命中率","三分","两分","两分区","三分区","三秒区","罚球","失误"};
......
......@@ -28,6 +28,8 @@ namespace VIZ.TVP.CBA.Module
{
InitializeComponent();
NewTeamStatsViewModel.TeamStatsViewModelInstance.Add(vm);
WPFHelper.BindingViewModel(this, vm);
......@@ -38,8 +40,31 @@ namespace VIZ.TVP.CBA.Module
task_Start.IsEnabled = true;
task_Stop.IsEnabled = false;
task_continue.IsEnabled = false;
this.Loaded += NewTeamStatsView_Loaded;
this.IsVisibleChanged += NewTeamStatsView_IsVisibleChanged;
}
private void NewTeamStatsView_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
{
if(!string.IsNullOrEmpty(vm.ScheduleID)&&!string.IsNullOrEmpty(vm.Matchtypeid))
{
vm.SetTeamData();
}
}
private void NewTeamStatsView_Loaded(object sender, RoutedEventArgs e)
{
var service = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
if (service == null)
return;
vm.page = service.GetPageModelFromView(this);
}
public void Dispose()
{
......@@ -102,9 +127,13 @@ namespace VIZ.TVP.CBA.Module
if (conn.IsConnected)
{
vm.BtnCmd();
if(vm.onAirDataModel!=null)
{
conn.EndpointManager.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
}
//task.CanExecute = vm.flag;
//SCRIPT_INVOKE
conn.EndpointManager.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
}
}
......@@ -114,9 +143,13 @@ namespace VIZ.TVP.CBA.Module
{
vm.BtnCmd();
//SCRIPT_INVOKE
if(vm.onAirDataModel!=null)
{
conn.EndpointManager.Send(string.Format(VizEngineCommands.SCRIPT_INVOKE, "dqyData", vm.CombineTeamComData()));
}
//SCRIPT_INVOKE
}
}
......@@ -190,6 +223,14 @@ namespace VIZ.TVP.CBA.Module
return;
service.Register(task);
//var service2 = ApplicationDomainEx.ServiceManager.GetService<IPluginService>(ViewServiceKeys.PLUGIN_SERVICE);
//if (service2 == null)
// return;
//PageModel page= service2.GetPageModelFromView(this);
//ApplicationDomainEx.CurrentPage == page;
}
}
}
......@@ -11,6 +11,7 @@ using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using VIZ.Framework.Core;
using VIZ.Package.Domain;
namespace VIZ.TVP.CBA.Module
{
......@@ -1365,7 +1366,7 @@ namespace VIZ.TVP.CBA.Module
}
public PageModel page = null;
static ObservableCollection<string> listTechStats = new ObservableCollection<string>() { "得分", "篮板", "助攻", "抢断", "盖帽", "上场时间", "投篮命中率", "两分命中率", "三分命中率", "罚球命中率", "篮下投篮命中率",
"中距离投篮命中率","三分","两分","两分区","三分区","三秒区","罚球","失误","犯规","三分得分"};
......
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