diff --git a/Wpf_AiSportsMicrospace/Common/SportOperate.cs b/Wpf_AiSportsMicrospace/Common/SportOperate.cs index 3c75f9b..cfce7d3 100644 --- a/Wpf_AiSportsMicrospace/Common/SportOperate.cs +++ b/Wpf_AiSportsMicrospace/Common/SportOperate.cs @@ -56,7 +56,7 @@ namespace Wpf_AiSportsMicrospace.Common { try { - _webcamClient = WebcamClient.CreateRTSP("192.168.3.64", "admin", "yd708090", 554u); + _webcamClient = WebcamClient.CreateRTSP("172.17.30.64", "admin", "yd708090", 554u); } catch (Exception) { diff --git a/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml b/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml index 1a9b0a2..658dfdd 100644 --- a/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml +++ b/Wpf_AiSportsMicrospace/Views/JumpRope/GroupJumpRope.xaml @@ -18,10 +18,10 @@ /> - + sports = new(); private List circleTexts = new(); private List userList = new(); - private List userNumberList = ["0", "0", "0", "0", "0", "0", "0"]; + private List userNumberList = ["0", "0", "0", "0", "0", "0"]; private double[] circlePositionsX = { 0.07, 0.21, 0.36, 0.50, 0.64, 0.78, 0.92 }; private Main _mainWin => Application.Current.MainWindow as Main; private List<(double XNorm, double YNorm)> circlePositions = new(); private MediaPlayer _mediaPlayer = new MediaPlayer(); private bool IsGameStarted = false; - List _useName = ["四号位", "一号位", "五号位", "二号位", "六号位", "三号位", "七号位",]; + List _useName = ["一号位", "四号位", "二号位", "五号位", "三号位", "六号位",]; public GroupJumpRope() { InitializeComponent(); @@ -441,13 +441,13 @@ namespace Wpf_AiSportsMicrospace.Views // 每个圆的位置:X 和 Y 都归一化 0~1 circlePositions = new List<(double XNorm, double YNorm)> { - (0.07, 0.58), + //(0.07, 0.58), (0.21, 0.88 ), - (0.36, 0.58 ), + (0.36, 0.68 ), (0.50, 0.88), - (0.64, 0.58 ), + (0.64, 0.68 ), (0.78, 0.88), - (0.92, 0.58 ) + (0.92, 0.68 ) }; for (int i = 0; i < circlePositions.Count; i++) @@ -511,7 +511,8 @@ namespace Wpf_AiSportsMicrospace.Views userItem.VerticalAlignment = VerticalAlignment.Top; userItem.HorizontalAlignment = HorizontalAlignment.Left; userItem.ImageState = "1"; - userItem.Margin = new Thickness(centerX - (index == 0 ? 80 : index == 6 ? 190 : 135), centerY - 540, 0, 0); + //userItem.Margin = new Thickness(centerX - (index == 0 ? 80 : index == 6 ? 190 : 135), centerY - 540, 0, 0); + userItem.Margin = new Thickness(centerX - 265, centerY - 500, 0, 0); userBox.Children.Add(userItem); userList.Add(userItem); return userItem; //