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

Assets/Scripts/UI/Prefab/Activity/ActivityController.cs

@@ -6,35 +6,100 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-
+#if UNITY_STANDALONE_WIN
+using ZenFulcrum.EmbeddedBrowser;
+#endif
 public class ActivityController : PFUIPanel
 {
     Transform browser;
+#if UNITY_STANDALONE_WIN
+    Browser webView;
+#else
     UniWebView webView;
+#endif
     protected override void Awake()
     {
+        this.url = null;
         browser = transform.Find("Browser");
+#if UNITY_STANDALONE_WIN
+        webView = browser.GetComponent<Browser>();
+        webView.onLoad -= RegisterFunc;
+        webView.onLoad += RegisterFunc;
+#if UNITY_EDITOR
+        webView.ShowDevTools(true);
+#endif
+#else
         webView = browser.GetComponent<UniWebView>();
+#endif        
         //webView.Show();
     }
-
+#if UNITY_STANDALONE_WIN
+    private void RegisterFunc(JSONNode obj)
+    {
+        RunJavaScript($"navigator.pfLang = '{App.GetLocalLanguage()}';");
+        webView.RegisterFunction("Close", args =>
+        {
+            Debug.Log("执行返回");
+            CloseFunc();
+        });
+        webView.RegisterFunction("StartRide", args =>
+        {
+            if (args.Count == 2)
+            {
+                StartRide((int)args[0], args[1]);
+            }
+        });
+        webView.RegisterFunction("OpenUrl", args =>
+        {
+            if (args.Count == 1)
+            {
+                OpenUrl(args[0]);
+            }
+        });
+        webView.RegisterFunction("Share", args =>
+        {
+            if (args.Count == 2)
+            {
+                Share((int)args[0], (int)args[1]);
+            }
+        });
+    }
+#endif
     public override void Show()
     {
         base.Show();
         //Debug.Log(20);
         //Invoke("StartPageFunc",0.5f);
     }
-
-    private void StartPageFunc()
+#if UNITY_STANDALONE_WIN
+    private void StartPageFunc(Action action = null) 
+    {
+        if (action == null)
+        {
+            webView.LoadURL(url, true);
+        }
+        else 
+        {
+            action.Invoke();
+        }
+    }
+#else
+    private void StartPageFunc(Action action = null)
     {
         Debug.Log("开始");
         // Load a URL.
-
         webView.Frame = new Rect(0, 0, Screen.width, Screen.height);
         webView.ReferenceRectTransform = browser.GetComponent<RectTransform>();
         webView.SetUserAgent($"UniWebView {Application.platform} {Application.version}");
         webView.BackgroundColor = Utils.HexToColorHtml("#23232d");
-        webView.Load(url);
+        if (action == null)
+        {
+            webView.Load(url);
+        }
+        else 
+        {
+            action.Invoke();
+        }
         // Show it.
         webView.Show();
         webView.OnMessageReceived -= FromJs;
@@ -45,29 +110,22 @@ public class ActivityController : PFUIPanel
         switch (message.Path) 
         {
             case "Close": CloseFunc(); break;
-            case "StartRide": StartRide(message.Args); break;
-            case "Share": Share(message.Args); break;
-            case "OpenUrl": OpenUrl(message.Args); break;
+            case "StartRide": StartRide(int.Parse(message.Args["id"]),message.Args.ContainsKey("routeResult")?message.Args["routeResult"]:null); break;
+            case "Share": Share(int.Parse(message.Args["type"]),int.Parse(message.Args["id"])); break;
+            case "OpenUrl": OpenUrl(message.Args["url"]); break;
             default:break;
         }
-        //if (message.Path.Equals("Close"))
-        //{
-        //    Debug.Log(message.Args["msg"]);
-        //    //transform.Find("Text").GetComponent<Text>().text = message.Args["msg"];
-        //}
+    }
+#endif
+
+    private void OpenUrl(string url)
+    {
+        Application.OpenURL(System.Net.WebUtility.UrlDecode(url));
     }
 
-    private void OpenUrl(Dictionary<string, string> args)
+    private void Share(int type,int id)
     {
-        Application.OpenURL(System.Net.WebUtility.UrlDecode(args["url"]));
-    }
-
-    private void Share(Dictionary<string, string> args)
-    {
-        int type = int.Parse(args["type"]);
-        int id = int.Parse(args["id"]);
-
-        string url = $"http://192.168.0.101:3081/Activity/LightUpChina/Share?userId={App.CurrentUser.Id}";
+        string url = $"http://pfweb.juze.pro/Activity/LightUpChina/Share?userId={App.CurrentUser.Id}";
         if (type < 2)
         {
             if (App.weChatController.IsWeChatAppInstalled())
@@ -75,21 +133,26 @@ public class ActivityController : PFUIPanel
                 App.weChatController.ShareWebpageToWX(type, url, "点亮中国活动", "by " + App.CurrentUser.Nickname, null);
             }
         }
-        else 
+        else if (type == 2)
         {
             UnityEngine.GUIUtility.systemCopyBuffer = url;
-            browser.GetComponent<UniWebView>().EvaluateJavaScript("window.postMessage(\"webview;复制成功\")");
+            RunJavaScript("window.postMessage(\"webview;复制成功\")");
+        }
+        else 
+        {
+            Facebook.Unity.FB.ShareLink(contentURL: new Uri(url),
+                contentTitle: "点亮中国活动",
+                contentDescription: "By " + App.CurrentUser.Nickname,
+                photoURL: new Uri(App.CurrentUser.WxHeadImg));
         }
     }
 
-    private void StartRide(Dictionary<string, string> args)
+    private void StartRide(int id,string routeResult)
     {
-        var id = int.Parse(args["id"]);
         App.RouteIdParam = id;
-        if (args.ContainsKey("routeResult")) 
+        if (routeResult!=null) 
         {
-            Debug.Log(args.ContainsKey("routeResult"));
-            App.routeResult = JsonConvert.DeserializeObject<RouteResult>(args["routeResult"]);
+            App.routeResult = JsonConvert.DeserializeObject<RouteResult>(routeResult);
         }
         SceneManager.LoadScene("Ride");
     }
@@ -99,6 +162,15 @@ public class ActivityController : PFUIPanel
         CancelInvoke("StartPageFunc");
         Close();
     }
+
+    private void RunJavaScript(string js) 
+    {
+#if UNITY_STANDALONE_WIN
+        webView.EvalJS(js);
+#else
+        browser.GetComponent<UniWebView>().EvaluateJavaScript(js);
+#endif
+    }
     // Update is called once per frame
     void Update()
     {
@@ -108,10 +180,7 @@ public class ActivityController : PFUIPanel
 
     public void Initial(string url)
     {
-        this.url = url;
-        Debug.Log(this.url);
-        StartPageFunc();
-        return;
+        Debug.Log(url);
         if (this.url != url)
         {
             this.url = url;
@@ -120,6 +189,11 @@ public class ActivityController : PFUIPanel
         else 
         {
             //执行浏览器内刷新或者其他操作
+            StartPageFunc(()=> 
+            {
+                RunJavaScript("window.postMessage(\"webview;Refresh\")");
+            });
         }
+
     }
 }