Merge pull request #5 from t-34400/feature/add_address_bar_support

Feature/add address bar support

Author: t-34400

.gitignore

@@ -1,5 +1,6 @@
 *.meta
-/SamplePrefabs/
+*.unitypackage
+/Sample/
 /Textures/
 
 # This .gitignore file should be placed at the root of your Unity project directory

Plugins/Android/WebViewManager.java

@@ -35,6 +35,9 @@ public class WebViewManager
     public interface WebViewBitmapListener {
         void onWebViewUpdated(byte[] bytes);
     }
+    public interface WebViewUrlChangeListener {
+        void onUrlChanged(String url);
+    }
 
     public final int webViewWidth;
     public final int webViewHeight;
@@ -54,7 +57,9 @@ public interface WebViewBitmapListener {
     private long downTime = 0;
 
     public WebViewManager(Activity activity, int _webViewWidth, int _webViewHeight, int _outputWidth, int _outputHeight, long intervalMSec,
-                          WebViewBitmapListener listener, WebAppInterface.WebViewDataListener webViewDataListener,
+                          WebViewBitmapListener bitmapListener, 
+                          WebViewUrlChangeListener urlListener,
+                          WebAppInterface.WebViewDataListener webViewDataListener,
                           ViewGroup rootView, View defaultFocusView)
     {
         webViewWidth = _webViewWidth;
@@ -87,7 +92,7 @@ public WebViewManager(Activity activity, int _webViewWidth, int _webViewHeight,
                 if(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream))
                 {
                     byte[] bitmapArray = stream.toByteArray();
-                    listener.onWebViewUpdated(bitmapArray);
+                    bitmapListener.onWebViewUpdated(bitmapArray);
                 }
             }, mainHandler);
 
@@ -131,6 +136,7 @@ public void onLoadResource (WebView view, String url){
                 public void onPageFinished(WebView view, String url) {
                     webAppInterface.Reset();
                     webView.evaluateJavascript(WebViewJavaScriptConstants.SCRIPT__ADD_INPUT_FOCUS_LISTENER, null);
+                    urlListener.onUrlChanged(url);
                 }
                 @Override
                 public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {

Plugins/Android/WebViewUnityPlayerActivity.java

@@ -127,6 +127,7 @@ public WebViewManager generateWebViewTextureProvider(String gameObjectName, int
             WebViewManager webViewManager = new WebViewManager(
                 this, webViewWidth, webViewHeight, outputWidth, outputHeight, intervalMSec, 
                 (bitmapBytes) -> sendUpdateCallbackMessage(gameObjectName, bitmapBytes), 
+                (url) -> sendUrlChangedCallbackMessage(gameObjectName, url),
                 (dataType, data) -> sendJsonData(gameObjectName, dataType, data),
                 (ViewGroup)getWindow().getDecorView().getRootView(), mUnityPlayer);
             webViewManagers.put(gameObjectName, webViewManager);
@@ -156,6 +157,10 @@ private void sendUpdateCallbackMessage(String gameObjectName, byte[] bitmapBytes
         UnityPlayer.UnitySendMessage(gameObjectName, "ReceiveUpdateCallback", "");
     }
 
+    private void sendUrlChangedCallbackMessage(String gameObjectName, String url) {
+        UnityPlayer.UnitySendMessage(gameObjectName, "ReceiveNewUrl", url);
+    }
+
     private void sendJsonData(String gameObjectName, String dataType, String data) {
         try {
             JSONObject jsonObject = new JSONObject();

Scripts/WebViewBitmapReceiver.cs

@@ -25,6 +25,7 @@ class WebViewBitmapReceiver : WebViewReceivedDataManager
         [SerializeField] private Vector2Int webViewSize = new Vector2Int(600, 480);
         [SerializeField] private Vector2Int textureSize = new Vector2Int(300, 240);
         [SerializeField] private float intervalSec = 0.05f;
+        [SerializeField] private UnityEvent<string> urlChanged = default!;
         [SerializeField] private UnityEvent<string, string> dataReceived = default!;
 
         private IWebViewController? webViewController;
@@ -38,6 +39,9 @@ class WebViewBitmapReceiver : WebViewReceivedDataManager
         private object bitmapByteArrayLock = new object();
         private byte[]? bitmapByteArray;
 
+        private object newUrlLock = new object();
+        private string? newUrl = null;
+
         private object receivedDataLock = new object();
         private List<ReceivedData> receivedDataList = new List<ReceivedData>();
 
@@ -95,16 +99,24 @@ private void OnApplicationPause(bool paused)
 
         private void Update()
         {
-            lock(receivedDataLock)
+            lock (receivedDataLock)
             {
-                foreach(var receivedData in receivedDataList)
+                foreach (var receivedData in receivedDataList)
                 {
                     Debug.Log($"Data received: {receivedData.type} {receivedData.data}");
                     InvokeDataReceivedEvent(receivedData);
                     dataReceived?.Invoke(receivedData.type, receivedData.data);
                 }
                 receivedDataList.Clear();
             }
+            lock (newUrlLock)
+            {
+                if (newUrl != null)
+                {
+                    urlChanged?.Invoke(newUrl);
+                    newUrl = null;
+                }
+            }
 
             UpdateTextureIfNeeded();
         }
@@ -150,6 +162,14 @@ public void ReceiveUpdateCallback()
             IsUpdated = true;
         }
 
+        public void ReceiveNewUrl(string url)
+        {
+            lock (newUrlLock)
+            {
+                newUrl = url;
+            }
+        }
+
         public void ReceiveJsonData(string json)
         {
             var data = JsonUtility.FromJson<ReceivedData>(json);

Scripts/WebViewControllerClient.cs

@@ -8,6 +8,7 @@ namespace WebView
     public class WebViewControllerClient : MonoBehaviour
     {
         [SerializeField] private WebViewBitmapReceiver webViewBitmapReceiver = default!;
+        [SerializeField] private bool loadOnFirstFrame = true;
         [SerializeField] private string loadUrl = "https://www.google.com/";
 
         private IWebViewController? webViewController;
@@ -31,7 +32,10 @@ private IEnumerator StartUpdateCoroutine()
             yield return null;
             webViewController = webViewBitmapReceiver.WebViewController;
             webViewController?.StartUpdate();
-            webViewController?.LoadUrl(loadUrl);
+            if (loadOnFirstFrame)
+            {
+                webViewController?.LoadUrl(loadUrl);
+            }
         }
     }
 }