Merge branch 'dev_lishuo' into dev_mobile

Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs

@@ -20,6 +20,7 @@ namespace Assets.Scenes.Ride.Scripts
 		protected RawImage mapCountry;
 		protected RawImage altitudeGraph;
 		protected Transform mapRanking;
+		protected Text mapId;
 		#endregion
 
 		public override void InjectController(CyclingController controller)
@@ -54,6 +55,7 @@ namespace Assets.Scenes.Ride.Scripts
 			head = panel.transform.Find("UploadByHead").GetComponent<RawImage>();
 			altitudeGraph = panel.transform.Find("AltitudeGraph").GetComponent<RawImage>();
 			mapRanking = panel.transform.Find("MapRanking");
+			mapId = panel.transform.Find("MapId").GetComponent<Text>();
 		}
 		protected override void InitGameObjectData()
 		{
@@ -67,6 +69,7 @@ namespace Assets.Scenes.Ride.Scripts
 			rideNum.text = route.TheHeat.ToString();
 			distance.text = route.Distance.ToString("f1") + "KM";
 			mapDescText.text = route.Dec;
+			mapId.text = route.Id.ToString();
 			var userList = ConfigHelper.mapApi.GetOnlineUserInfo(new int[] { route.UserId }).data;
 			if (userList.Count > 0)
 			{

Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs

@@ -29,8 +29,21 @@ namespace Assets.Scenes.Ride.Scripts
         protected override void CreateList()
         {
             OnlineUserNum.text =  MapUDPService.GetNearRiderCount().ToString();
+            LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform);
             var nearList = MapUDPService.GetNearRiderData(pageIndex, pageSize, new double[] { playerController.Currentlatlong.x, playerController.Currentlatlong.y });
             totalPages = MapUDPService.GetNearRiderCount();
+            //删除
+            var currentNearList = FindObjectsOfType<NearByItemScript>();
+            foreach (var item in currentNearList)
+            {
+                var e = nearList.Where(c => c.Id == item.UserId).FirstOrDefault();
+                if (e == null)
+                {
+                    item.transform.gameObject.SetActive(false);
+                    bufferSize--;
+                }
+            }
+
             for (int i = 0; i < nearList.Count(); i++)
             {
                 Create(nearList[i]);