Merge branch 'dev_cyp' into dev_ar_cyp

# Conflicts:
#	Assets/Resources/UI/Font/HanWangZonYi.ttf.meta
#	Assets/Resources/UI/language.json
#	Assets/Scenes/Login.unity
#	Assets/Scripts/Apis/Models/MapRoute.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scripts/UIManager.cs
#	Assets/Scripts/Utils/Utils.cs

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

@@ -229,8 +229,13 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
             {"ContactPhone",mPhone.GetComponent<InputField>() },
             {"ContactAddress",mAddr.GetComponent<InputField>() },
         };
-        
-        
+        #region 划船机功能：隐藏骑行相关的
+        if (App.IsRowerMode == true) 
+        {
+            transform.Find("Panel/MainPanel/BW").gameObject.SetActive(false);
+            transform.Find("Panel/MainPanel/WD").gameObject.SetActive(false);
+        }
+        #endregion
     }
     async Task Login() 
     {

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

@@ -43,7 +43,10 @@ public class HomeController : PFUIPanel
         var BtnContainer = transform.Find("MainFuncContainer");
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 1, 3, 4, 6 });
+        nav.SetButtonActive(new List<int> { 1, 3, 4, 6 },null,new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/RowerNew/ICON_mode_44"), () => 
+        {
+            UIManager.ShowRowerSelector();
+        },false));
         newNav = nav;
         UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
         {