Merge branch 'dev_lishuo' into dev_cyp

# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

Assets/Scripts/UI/Prefab/Confirm.cs

@@ -71,8 +71,8 @@ public class Confirm : PFUIPanel
         //    return;
         //}
         //text.text = txt;
-        _title.Text = title;
-        _content.Text = content;
+        _title.Text = App.GetLocalString(title);
+        _content.Text = App.GetLocalString(content);
         _callback = callback;
         _cancelCallback = cancelCallback;
     }
@@ -85,6 +85,9 @@ public class Confirm : PFUIPanel
             ok = "Yes";
             cancel = "No";
         }
+        ok = App.GetLocalString(ok);
+        cancel = App.GetLocalString(cancel);
+
         _ok.transform.Find("Text").GetComponent<Text>().text = ok;
         _cancel.transform.Find("Text").GetComponent<Text>().text = cancel;
     }

Assets/Scripts/UI/Prefab/Device/DeviceView.cs

@@ -276,8 +276,8 @@ public class DeviceView : MonoBehaviour
             connectionPanel.SetActive(false);
 
             logo.sprite = sprite0;
-            noDevice.text = "NO DEVICE";
-            searchState.text = "Searching...";
+            noDevice.text = App.GetLocalString("NO DEVICE");
+            searchState.text = App.GetLocalString("Searching...");
 
             var hasDevice = false;
             if (SensorType == SensorType.SpeedCadence) {

Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs

@@ -54,13 +54,14 @@ namespace Assets.Scripts.UI.Prefab.Login
             {
                 months.Add(new Dropdown.OptionData(m.ToString()));
             }
+            
             days = new List<Dropdown.OptionData>();
-            genders = new List<Dropdown.OptionData>() {new Dropdown.OptionData("Male"), new Dropdown.OptionData("FeMale") };
+            genders = new List<Dropdown.OptionData>() {new Dropdown.OptionData(App.GetLocalString("Male")), new Dropdown.OptionData(App.GetLocalString("FeMale")) };
             var countryJson = Resources.Load<TextAsset>("UI/flags-mini").text;
             countryList = JsonConvert.DeserializeObject<List<CountryModel>>(countryJson);
             countrys = countryList.Select(x => new Dropdown.OptionData(x.country)).ToList();
             countryDefaultValue = countryList.FindIndex(x => x.country == "中国");
-            units = new List<Dropdown.OptionData>() { new Dropdown.OptionData("Metric"), new Dropdown.OptionData("Imperial") };
+            units = new List<Dropdown.OptionData>() { new Dropdown.OptionData(App.GetLocalString("Metric")), new Dropdown.OptionData(App.GetLocalString("Imperial")) };
         }
         public Texture GetCountryImage(int index) 
         {

Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs

@@ -9,7 +9,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
 {
     public class MapFilterOptions
     {
-        public static List<Dropdown.OptionData> distances = new string[] {"All",
+        public static List<Dropdown.OptionData> distances = new string[] {App.GetLocalString("All"),
                 "0-5KM",
                 "5-10KM",
                 "10-20KM",
@@ -20,7 +20,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
                 "Over 200KM", }.Select(x=>new Dropdown.OptionData(x)).ToList();
         public static Dictionary<string, string> distanceDict = new Dictionary<string, string>()
         {
-            {"All","" },
+            {App.GetLocalString("All"),"" },
             {"0-5KM","0-5" },
             {"5-10KM","5-10" },
             {"10-20KM","10-20" },
@@ -32,7 +32,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
         };
         public static Dictionary<string,string> diffDict = new Dictionary<string, string>()
         {
-            {"FLAT","0-100" },
+            {App.GetLocalString("FLAT"),"0-100" },
             {"LV.4","100-250" },
             {"LV.3","250-350" },
             {"LV.2","350-550" },
@@ -40,11 +40,22 @@ namespace Assets.Scripts.UI.Prefab.MapList
             {"HC","750-99999" },
         };
         public static List<Dropdown.OptionData> sorts = new string[] {
-           "Near", "Trend","Name","Distance","Difficulty","Time"
+           App.GetLocalString("Near"),  App.GetLocalString("Trend"), App.GetLocalString("Name"), App.GetLocalString("Distance"), App.GetLocalString("Difficulty"), App.GetLocalString("Time")
         }.Select(x => new Dropdown.OptionData(x)).ToList();
+
+        public static Dictionary<string, string> sortsDict = new Dictionary<string, string>()
+        {
+            {App.GetLocalString("Near"),"Near" },
+            {App.GetLocalString("Trend"),"Trend" },
+            {App.GetLocalString("Name"),"Name" },
+            {App.GetLocalString("Distance"),"Distance" },
+            {App.GetLocalString("Difficulty"),"Difficulty" },
+            {App.GetLocalString("Time"),"Time" },
+        };
+
         public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
         {
-            {"FLAT","0-100" },
+            {App.GetLocalString("FLAT"),"0-100" },
             {"LV.4","100-250" },
             {"LV.3","250-350" },
             {"LV.2","350-550" },

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -175,7 +175,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
         mSexDropdown.ClearOptions();
         mSexDropdown.AddOptions(new List<string>
         {
-            "Male","Female"
+            App.GetLocalString("Male"),App.GetLocalString("Female")
         });
         mUnitDropdown.ClearOptions();
         mUnitDropdown.AddOptions(UIManager.Instance.loginRegOptions.units);

Assets/Scripts/UI/Prefab/Panel/MapListController.cs

@@ -226,7 +226,9 @@ public class MapListController : PFUIPanel
             drop.value = 0;
             drop.onValueChanged.AddListener((int index)=> 
             {
-                sort = drop.options[index].text;
+                var text = drop.options[index].text;
+
+                sort = MapFilterOptions.sortsDict[text];
                 if (sort == "Trend") 
                 {
                     sort = "Hot";

Assets/Scripts/UI/Prefab/Race/RaceScript.cs

@@ -85,10 +85,10 @@ public class RaceScript : PFUIPanel
             var map = currentItem.GetComponent<RaceItemScript>().mapCompetition;
             if (map.Status == 1)
             {
-                currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start for Registration";
+                currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = App.GetLocalString("Start for Registration");
                 currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
                     map.StartApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
-                currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Deadline for Registration";
+                currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = App.GetLocalString("Deadline for Registration");
                 currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
                     map.EndApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
 
@@ -104,7 +104,7 @@ public class RaceScript : PFUIPanel
             }
             else if (map.Status == 3)
             {
-                currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start Time";
+                currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = App.GetLocalString("Start Time");
                 currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
                     map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
             }
@@ -132,7 +132,7 @@ public class RaceScript : PFUIPanel
                 {
                     currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 1;
                     currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text
-                        = map.HasJoin ? "Get Ready" : "Start Time";
+                        = App.GetLocalString(map.HasJoin ?  "Get Ready" : "Start Time");
                     currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
                         = map.HasJoin ? Utils.GetCountDown(time): map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
                 }