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

# Conflicts:
#	Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab

Assets/Scripts/Scenes/MainController.cs

@@ -104,6 +104,7 @@ public class MainController : BaseScene
         else
         {
             UIManager.ShowHomePanel();
+            //UIManager.ShowNewRouteOverviewPanel();
             //UIManager.ShowUserInfoPanel();
             //UIManager.ShowEditUserPanel();
             //UIManager.ShowBigMapPanel();

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -1090,8 +1090,11 @@ public BaseUIManager singleUIManager;
         }
         cyclingController.recorderData.SaveWithLocalRecordAysnc(cyclingModel, selectParamModel, imageFileName, recordId, path);
     }
-
-    protected void CaptureCamera(Camera camera, Rect rect,string fileName)
+    public byte[] CaptureCamera() 
+    {
+        return CaptureCameraReturnByte(Camera.main, new Rect(Screen.width * 0f, Screen.height * 0f, Screen.width * 0.5f, Screen.height * 0.5f));
+    }
+    private byte[] CaptureCameraReturnByte(Camera camera, Rect rect) 
     {
         // 创建一个RenderTexture对象  
         RenderTexture rt = new RenderTexture((int)rect.width, (int)rect.height, 0);
@@ -1115,8 +1118,11 @@ public BaseUIManager singleUIManager;
         RenderTexture.active = null; // JC: added to avoid errors  
         GameObject.Destroy(rt);
         // 最后将这些纹理数据，成一个图片文件  
-        byte[] bytes = screenShot.EncodeToJPG();
-
+        return screenShot.EncodeToJPG();
+    }
+    protected void CaptureCamera(Camera camera, Rect rect,string fileName)
+    {
+        byte[] bytes = CaptureCameraReturnByte(camera, rect);
         //var path = Helper.GetDataDir("MapWorkoutRecords/images");
         //string filename = path + "/" + Guid.NewGuid().ToString() + ".png";
         System.IO.File.WriteAllBytes(fileName, bytes);

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

@@ -39,6 +39,7 @@ namespace Assets.Scenes.Ride.Scripts
         #region 功能按钮
         GameObject goResultBtn;
         GameObject cancelBtn;
+        GameObject shareWxBtn;
         #endregion
 
         CyclingController cyclingController;
@@ -67,6 +68,8 @@ namespace Assets.Scenes.Ride.Scripts
             #endregion
             goResultBtn = transform.Find("ConFirmButton").gameObject;
             cancelBtn = transform.Find("CloseButton").gameObject;
+            shareWxBtn = transform.Find("ToolBarPanel/WeChatButton").gameObject;
+
         }
 
         public void InjectController(CyclingController controller)
@@ -74,7 +77,15 @@ namespace Assets.Scenes.Ride.Scripts
             cyclingController = controller;
             cyclingController.AddEvent(goResultBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, GoResult);
             cyclingController.AddEvent(cancelBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel);
+            cyclingController.AddEvent(shareWxBtn, EventTriggerType.PointerClick, shareToWx);
         }
+
+        private void shareToWx(BaseEventData b)
+        {
+            var bs = cyclingController.CaptureCamera();
+            WeChatController.Instance.ShareImageToWX(0, bs);
+        }
+
         private void GoResult(BaseEventData baseEventData)
         {
             if (App.MainSceneParam.ContainsKey("Name"))