update

Former-commit-id: 05a56e17d9a028b669334456bdd302472d16413b

labs/IoTClient/Assets/Scenes/FaceDetectionScene.unity

@@ -171,7 +171,7 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -470,7 +470,7 @@ MonoBehaviour:
   _requestedDeviceName: 
   _requestedWidth: 640
   _requestedHeight: 480
-  _requestedIsFrontFacing: 0
+  _requestedIsFrontFacing: 1
   _requestedFPS: 30
   _rotate90Degree: 0
   _flipVertical: 0
@@ -852,7 +852,7 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1013,7 +1013,7 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2

labs/IoTClient/Assets/Scripts/FaceDetectionController.cs

@@ -171,7 +171,6 @@ namespace Assets.Scripts
         private void OnDestroy()
         {
             webCamTextureToMatHelper.Dispose();
-
             if (cascade != null)
                 cascade.Dispose();
         }
@@ -181,6 +180,7 @@ namespace Assets.Scripts
         /// </summary>
         public void OnBackButtonClick()
         {
+            webCamTextureToMatHelper.Stop();
             SceneManager.LoadScene(0);
         }
 
@@ -227,8 +227,6 @@ namespace Assets.Scripts
                         this._isChecking = true;
                     }
                     {
-                        //var tempTexture = new Texture2D(grayMat.cols(), grayMat.rows(), TextureFormat.RGBA32, false);
-                        //var jpgBytes = tempTexture.EncodeToJPG();
                         var form = new WWWForm();
                         form.AddBinaryData("face", jpgBytes);
                         using (var request = UnityWebRequest.Post("http://192.168.253.1:8000/Account/FaceLogin", form))

labs/IoTClient/Assets/Scripts/VlcPlayerController.cs

@@ -1,5 +1,4 @@
-using System;
+using UMP;
-using UMP;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -22,11 +21,6 @@ public class VlcPlayerController : MonoBehaviour, IPointerClickHandler
         player.Play();
     }
 
-    private Action<PointerEventData> OnPointerDown(PointerEventData eventData)
-    {
-        throw new NotImplementedException();
-    }
-
     public void OnPointerClick(PointerEventData eventData)
     {
         this.controlCanvas.enabled = !this.controlCanvas.enabled;

labs/IoTClient/Assets/Scripts/WebViewController.cs

@@ -8,7 +8,6 @@ public class WebViewController : MonoBehaviour
 
     private void Start()
     {
-        SceneManager.LoadScene(1, LoadSceneMode.Additive);
         var webViewGameObject = new GameObject("UniWebView");
         webView = webViewGameObject.AddComponent<UniWebView>();
         webView.SetUserAgent(webView.GetUserAgent() + "app");
@@ -40,20 +39,13 @@ public class WebViewController : MonoBehaviour
         webView.UpdateFrame();
     }
 
-    //private void OnEnable()
-    //{
-    //    webView.Show();
-    //}
-
     private void OnDestroy()
     {
         CloseWebView();
     }
 
-    //
     private void FaceLogin()
     {
-        webView.Hide();
         SceneManager.LoadScene(1);
     }
 

labs/IoTClient/Assets/StreamingAssets/wwwroot/index.html

@@ -24,12 +24,15 @@
     </div>
     <template id="page-login">
         <f7-page>
-            <f7-navbar>
+		<div class="navbar">
-                <f7-nav-title>登录5</f7-nav-title>
+            <div class="navbar-inner">
-                <f7-nav-right>
+			<div class="left"></div>
-                    <a external panel-open="right" icon-f7="add" href="uniwebview://facelogin" onclick="window.location.href ='uniwebview://facelogin'">face</a>
+              <div class="title">登录</div>
-                </f7-nav-right>
+			  <div class="right">
-            </f7-navbar>
+					<a class="link external" href="javascript:;" onclick="window.location.href ='uniwebview://facelogin'"><i class="icon f7-icons">add</i></a>
+			  </div>
+            </div>
+          </div>
             <form v-bind:action="Server+'/Account/AppLogin'" v-on:submit.prevent="OnSubmit" class="login">
                 <div class="list no-hairlines-md">
                     <ul>