diff --git a/projects/IoTClient/Assets/Scripts/FaceDetectionController.cs b/projects/IoTClient/Assets/Scripts/FaceDetectionController.cs index 83489665..a9492f12 100644 --- a/projects/IoTClient/Assets/Scripts/FaceDetectionController.cs +++ b/projects/IoTClient/Assets/Scripts/FaceDetectionController.cs @@ -229,9 +229,9 @@ namespace Assets.Scripts { var form = new WWWForm(); form.AddBinaryData("face", jpgBytes); - using (var request = UnityWebRequest.Post(WebViewController.Server + "/Account/FaceLogin", form)) + using (var request = UnityWebRequest.Post(WebViewController.FaceLoginUrl, form)) { - text.text = WebViewController.Server; + text.text = WebViewController.FaceLoginUrl; yield return request.SendWebRequest(); if (request.isNetworkError || request.isHttpError) { @@ -244,10 +244,7 @@ namespace Assets.Scripts var result = JsonUtility.FromJson(response); if (result.Code == 0) { - text.text = result.NickName; - result.Server = WebViewController.Server; - result.RememberMe = WebViewController.RememberMe; - WebViewController.LoginMessage = JsonUtility.ToJson(result); + WebViewController.Token = result.Token; SceneManager.LoadScene(0); } } diff --git a/projects/IoTClient/Assets/Scripts/LoginResult.cs b/projects/IoTClient/Assets/Scripts/LoginResult.cs index 467e46a7..0ade65df 100644 --- a/projects/IoTClient/Assets/Scripts/LoginResult.cs +++ b/projects/IoTClient/Assets/Scripts/LoginResult.cs @@ -1,11 +1,5 @@ public class LoginResult { public int Code; - public string UserName; - public string NickName; public string Token; - public string Title; - public string IoTServer; - public string Server; - public bool RememberMe; } \ No newline at end of file diff --git a/projects/IoTClient/Assets/Scripts/WebViewController.cs b/projects/IoTClient/Assets/Scripts/WebViewController.cs index ba186289..8008cb69 100644 --- a/projects/IoTClient/Assets/Scripts/WebViewController.cs +++ b/projects/IoTClient/Assets/Scripts/WebViewController.cs @@ -10,9 +10,8 @@ public class WebViewController : MonoBehaviour private UniWebView webView; private SerialDevice _sp; - public static string LoginMessage { get; set; } - public static string Server { get; set; } - public static bool RememberMe { get; set; } + public static string Token { get; set; } + public static string FaceLoginUrl { get; set; } private void Start() { @@ -26,22 +25,17 @@ public class WebViewController : MonoBehaviour }; webView.OnMessageReceived += (view, message) => { - if (message.Path == "init") + if (message.Path == "getToken") { - if (string.IsNullOrEmpty(LoginMessage)) + if (!string.IsNullOrEmpty(Token)) { - webView.EvaluateJavaScript($"load()"); - } - else - { - webView.EvaluateJavaScript($"load2('{LoginMessage}')"); - LoginMessage = null; + this.webView.EvaluateJavaScript($"faceLoginCallback('{Token}')"); + Token = null; } } else if (message.Path == "facelogin") { - Server = UnityWebRequest.UnEscapeURL(Regex.Match(message.RawMessage, "Server=(.*)&").Groups[1].Value); - RememberMe = Regex.Match(message.RawMessage, "RememberMe=(.*)").Groups[1].Value == "true"; + FaceLoginUrl = "http://" + UnityWebRequest.UnEscapeURL(Regex.Match(message.RawMessage, "host=(.*)").Groups[1].Value) + "/UserCenter/Account/FaceLogin"; this.FaceLogin(); } }; @@ -52,7 +46,7 @@ public class WebViewController : MonoBehaviour }; // webView.CleanCache(); - webView.Load(UniWebViewHelper.StreamingAssetURLForPath("wwwroot/index.html")); + webView.Load(UniWebViewHelper.StreamingAssetURLForPath("wwwroot/index2.html")); webView.Show(); } diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html index 3d9a7af3..dcc16246 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html @@ -24,9 +24,9 @@