Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs

@@ -43,6 +43,8 @@ namespace Assets.Scenes.Ride.Scripts
         GameObject shareWxBtn;
         GameObject shareWxGpButton;
         Transform toolbar;
+        Image DNF;
+        Image newRecord;
         #endregion
 
         CyclingController cyclingController;
@@ -75,6 +77,9 @@ namespace Assets.Scenes.Ride.Scripts
 #if UNITY_ANDROID || UNITY_IOS
             shareWxBtn = transform.Find("ToolBarPanel/WeChatButton").gameObject;
             shareWxGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject;
+#else
+            DNF = transform.Find("DNF").GetComponent<Image>();
+            newRecord = transform.Find("TimePanel/NewRecord").GetComponent<Image>();
 #endif
         }
 
@@ -155,6 +160,12 @@ namespace Assets.Scenes.Ride.Scripts
             maxSpeed.text = record.RiderDatas.Max(c => c._Speed).ToString("f1");
             wkgText.text = Math.Round(power / record.CurrentUser.Weight,2).ToString();
             avCadence.text = record.RiderDatas.Average(c => c._Cadence).GetValueOrDefault(0).ToString("f0");
+#if !(UNITY_ANDROID || UNITY_IOS)
+            DNF.gameObject.SetActive(!record.IsCompleted);
+            var recordImagePath = App.GetLocalLanguage().Equals("zh") ? "Images/Ride/img_newrecord_cn" : "img_newrecord";
+            newRecord.sprite =  Resources.Load<Sprite>(recordImagePath);
+            newRecord.gameObject.SetActive(record.IsCompleted);
+#endif
         }
     }
 }