超时时间改为20s

Model/HostModel.cs

@@ -53,7 +53,7 @@ namespace OnlineUserPool.Model
         {
             get
             {
-                return DateTime.Now.Subtract(LastActiveTime).TotalSeconds > 60;
+                return DateTime.Now.Subtract(LastActiveTime).TotalSeconds > 20;
             }
         }
 

Model/MsgModel.cs

@@ -64,11 +64,6 @@ namespace OnlineUserPool.Model
             set => SetProperty(ref _TotalTicks, value);
         }
  
-        ///// <summary>
-        ///// 需要展示的属性
-        ///// </summary>
-        //public string Prop { get; set; }
-
         private double _PreDistance = 0;
         public double PreDistance {
             get => _PreDistance;
@@ -83,8 +78,6 @@ namespace OnlineUserPool.Model
 
         //public bool IsVirtual { get; set; }
 
-        //public double Power { get; set; }
-        //public double Weight { get; set; }
         /// <summary>
         /// 功率体重比
         /// </summary>
@@ -106,12 +99,10 @@ namespace OnlineUserPool.Model
             set => SetProperty(ref _Saved, value);
         }
 
-        //public bool ShowVirtual { get; set; }
-
-        private int _FrameRate = 0;
-        public int FrameRate {
-            get => _FrameRate;
-            set => SetProperty(ref _FrameRate, value);
+        private int _Frame = 0;
+        public int Frame {
+            get => _Frame;
+            set => SetProperty(ref _Frame, value);
         }
        
         private int _RoomId = 0;
@@ -133,18 +124,35 @@ namespace OnlineUserPool.Model
             get => _Model;
             set => SetProperty(ref _Model, value);
         }
+        
+        private string _UserName;
+        public string UserName {
+            get => _UserName;
+            set => SetProperty(ref _UserName, value);
+        }
+        
+        private string _RouteName;
+        public string RouteName {
+            get => _RouteName;
+            set => SetProperty(ref _RouteName, value);
+        }
+        
+        private string _WxHeadImage;
+        public string WxHeadImage {
+            get => _WxHeadImage;
+            set => SetProperty(ref _WxHeadImage, value);
+        }
 
-        public string ToString(int v)
+        public override string ToString()
         {
-            if (v == 2)
-            {
-                return $"{ RouteId },{ MemberId },{ string.Join(":", Point) },{ Convert.ToInt32(IsCompleted) },{ Speed },{ PreDistance },{ EndDistance },{ WeightKg },{ CompetitionId },{ Convert.ToInt32(Saved)},{ Power} ,{ HeartRate},{ Cadence},{ TotalTicks},{ FrameRate},{RoomId},{StartTime}";
-            }
-            return $"{ RouteId },{ MemberId },{ string.Join(":", Point) },{ Convert.ToInt32(IsCompleted) },{ Speed },{ PreDistance },{ EndDistance },{ WeightKg },{ CompetitionId },{ Convert.ToInt32(Saved)}";
+            return $"{RouteName},{RouteId},{UserName},{MemberId},{WxHeadImage},{string.Join(":", Point)},{Speed},{PreDistance},{EndDistance},{WeightKg},{Power},{HeartRate},{Cadence},{TotalTicks},{Convert.ToInt32(IsCompleted)},{Frame}";
         }
 
         public void Update(MsgModel model)
         {
+            this.RouteName = model.RouteName;
+            this.UserName = model.UserName;
+            this.WxHeadImage = model.WxHeadImage;
             this.CompetitionId = model.CompetitionId;
             this.EndDistance = model.EndDistance;
             this.HeartRate = model.HeartRate;
@@ -159,7 +167,7 @@ namespace OnlineUserPool.Model
             this.HeartRate = model.HeartRate;
             this.Cadence = model.Cadence;
             this.TotalTicks = model.TotalTicks;
-            this.FrameRate = model.FrameRate;
+            this.Frame = model.Frame;
             this.RoomId = model.RoomId;
             this.StartTime = model.StartTime;
             this.Request = model.Request;