附近的人
This commit is contained in:
lishuo committed
1 parent
725b510748
commit
2fcd9b23fa
94 files changed
+7063
-2007
No files matched your search
@@ -64,7 +64,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
/// 骑行函数(如果此方法不满足，可以在子类中重写此方法)
|
||||
/// </summary>
|
||||
/// <param name="data"></param>
|
||||
protected virtual void Run(TargetData targetData)
|
||||
public virtual void Run(TargetData targetData)
|
||||
{
|
||||
//将当前用户的位置发送到udf服务
|
||||
SendUserPositionToServer();
|
||||
|
||||
@@ -23,8 +23,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
this.IsRecord = true;
|
||||
recorderData = new RecorderDataModel()
|
||||
{
|
||||
CurrentUser = null,//TODO:PubCommData.CurrentUser,
|
||||
//BelongUserId = PubCommData.CurrentUser.Id,
|
||||
CurrentUser = App.CurrentUser,
|
||||
//BelongUserId = App.CurrentUser.Id,
|
||||
Competitionid = 0,
|
||||
ContinueIndex = 0,
|
||||
ContinueMark = Guid.NewGuid().ToString(),
|
||||
@@ -51,44 +51,41 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
// recorderData.ContinueIndex = param.ContinueIndex.GetValueOrDefault(0);
|
||||
//}
|
||||
//recorderData.PreDistance = recorderData.EndDistance;
|
||||
//Rhino.PowerFun.Services.MapUDPService.Send(route.RouteInstance.Id, riders.First().UserId, route.Point.First());
|
||||
|
||||
|
||||
//riders = new List<BaseRider>();
|
||||
//TODO 附件的人列表加上自己
|
||||
//var rider = new OnlineRiderModel()
|
||||
//{
|
||||
// NickName = PubCommData.CurrentUser.Nickname,
|
||||
// UserId = PubCommData.CurrentUser.Id,
|
||||
// WxHeadImg = PubCommData.CurrentUser.WxHeadImg + "?t=1",
|
||||
// //Point = new GeoJSON.Net.Geometry.GeographicPosition(this.route.RouteInstance.Point[0], this.route.RouteInstance.Point[1]),
|
||||
// EndDistance = recorderData.EndDistance
|
||||
//};
|
||||
//rider.Point = _turfHelper.Along(rider.EndDistance);
|
||||
riders = new List<BaseRider>();
|
||||
var rider = new OnlineRiderModel()
|
||||
{
|
||||
NickName = App.CurrentUser.Nickname,
|
||||
UserId = App.CurrentUser.Id,
|
||||
WxHeadImg = App.CurrentUser.WxHeadImg + "?t=1",
|
||||
//Point = new GeoJSON.Net.Geometry.GeographicPosition(this.route.RouteInstance.Point[0], this.route.RouteInstance.Point[1]),
|
||||
EndDistance = recorderData.EndDistance
|
||||
};
|
||||
rider.Point = _turfHelper.Along(rider.EndDistance);
|
||||
|
||||
//riders.Add(rider);
|
||||
riders.Add(rider);
|
||||
#endregion
|
||||
}
|
||||
|
||||
protected override void Run(TargetData targetData)
|
||||
public override void Run(TargetData targetData)
|
||||
{
|
||||
#region TODO 获取在线用户
|
||||
//riders.RemoveAll(r => r.IsSelf == false);
|
||||
//var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id).Where(d => d.IsSelf == false)
|
||||
// .ToList();
|
||||
|
||||
//foreach (var item in onlineUsers)
|
||||
//{
|
||||
// riders.Add(new OnlineRiderModel()
|
||||
// {
|
||||
// NickName = item.Name,
|
||||
// UserId = item.Id,
|
||||
// WxHeadImg = item.HeadImage,
|
||||
// Point = new GeoJSON.Net.Geometry.GeographicPosition(item.Point[0], item.Point[1]),
|
||||
// EndDistance = item.EndDistance,
|
||||
// PreDistance = item.PreDistance,
|
||||
// });
|
||||
//}
|
||||
riders.RemoveAll(r => r.IsSelf == false);
|
||||
var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id).Where(d => d.IsSelf == false)
|
||||
.ToList();
|
||||
foreach (var item in onlineUsers)
|
||||
{
|
||||
riders.Add(new OnlineRiderModel()
|
||||
{
|
||||
NickName = item.Name,
|
||||
UserId = item.Id,
|
||||
WxHeadImg = item.HeadImage,
|
||||
Point = new GeoJSON.Net.Geometry.GeographicPosition(item.Point[0], item.Point[1]),
|
||||
EndDistance = item.EndDistance,
|
||||
PreDistance = item.PreDistance,
|
||||
});
|
||||
}
|
||||
#endregion
|
||||
base.Run(targetData);
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.UserId == PubCommData.CurrentUser.Id;
|
||||
return this.UserId == App.CurrentUser.Id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -276,6 +276,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
|
||||
public class NearRiderModel
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
|
||||
public string Headimage { get; set; }
|
||||
@@ -499,7 +500,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
{
|
||||
get
|
||||
{
|
||||
return Id == PubCommData.CurrentUser.Id;
|
||||
return Id == App.CurrentUser.Id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
{
|
||||
//private readonly MapWorkoutService service = new MapWorkoutService();
|
||||
|
||||
public t_user CurrentUser { get; set; }
|
||||
public UserResultModel CurrentUser { get; set; }
|
||||
/// <summary>
|
||||
/// 所属人ID
|
||||
/// </summary>
|
||||
@@ -147,8 +147,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
AveragePower = averagePower,//平均功率
|
||||
MaxPower = RiderDatas.Max(a => a._Power),//最大功率
|
||||
WeightKg = Math.Round(averagePower / 65, 2),
|
||||
Weight = 65, //PubCommData.CurrentUser.Weight,
|
||||
BicycleWeight =7, //PubCommData.CurrentUser.BicycleWeight,
|
||||
Weight = 65, //App.CurrentUser.Weight,
|
||||
BicycleWeight =7, //App.CurrentUser.BicycleWeight,
|
||||
ContinueMark = ContinueMark,
|
||||
ContinueIndex = ContinueIndex,
|
||||
IsDelete = false,
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.UserId == PubCommData.CurrentUser.Id;
|
||||
return this.UserId == App.CurrentUser.Id;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
|
||||
Reference in new issue
Block a user