updated binaries.

gree · Nov 30, 2023 · a29fa36 · a29fa36
1 parent 99caa99
commit a29fa36
Show file tree

Hide file tree

Showing 16 changed files with 368 additions and 8 deletions.
diff --git a/dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl b/dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl
diff --git a/dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl b/dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl
diff --git a/dist/package-nofragment/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs b/dist/package-nofragment/Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs
@@ -93,6 +93,8 @@ public void OnPostGenerateGradleAndroidProject(string basePath) {
             }
         }
         changed = (androidManifest.SetExported(true) || changed);
+        changed = (androidManifest.SetApplicationTheme("@style/UnityThemeSelector") || changed);
+        changed = (androidManifest.SetActivityTheme("@style/UnityThemeSelector.Translucent") || changed);
         changed = (androidManifest.SetWindowSoftInputMode("adjustPan") || changed);
         changed = (androidManifest.SetHardwareAccelerated(true) || changed);
 #if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC
@@ -105,6 +107,9 @@ public void OnPostGenerateGradleAndroidProject(string basePath) {
 #if UNITYWEBVIEW_ANDROID_ENABLE_MICROPHONE
         changed = (androidManifest.AddMicrophone() || changed);
 #endif
+//#if UNITY_5_6_0 || UNITY_5_6_1
+        changed = (androidManifest.SetActivityName("net.gree.unitywebview.CUnityPlayerActivity") || changed);
+//#endif
         if (changed) {
             androidManifest.Save();
             Debug.Log("unitywebview: adjusted AndroidManifest.xml.");
@@ -205,9 +210,9 @@ public static void OnPostprocessBuild(BuildTarget buildTarget, string path) {
 #if UNITYWEBVIEW_ANDROID_ENABLE_MICROPHONE
             changed = (androidManifest.AddMicrophone() || changed);
 #endif
-#if UNITY_5_6_0 || UNITY_5_6_1
+//#if UNITY_5_6_0 || UNITY_5_6_1
             changed = (androidManifest.SetActivityName("net.gree.unitywebview.CUnityPlayerActivity") || changed);
-#endif
+//#endif
             if (changed) {
                 androidManifest.Save();
                 Debug.LogError("unitywebview: adjusted AndroidManifest.xml and/or WebView.aar. Please rebuild the app.");
@@ -269,6 +274,132 @@ public static void OnPostprocessBuild(BuildTarget buildTarget, string path) {
                 dst = (string)method.Invoke(proj, null);
             }
             File.WriteAllText(projPath, dst);
+
+            // Classes/UI/UnityAppController+ViewHandling.mm
+            {
+                var text = File.ReadAllText(path + "/Classes/UI/UnityAppController+ViewHandling.mm");
+                text = text.Replace(
+                    @"
+    _rootController.view = _rootView = _unityView;
+",
+                    @"
+    UIView *view = [[UIView alloc] initWithFrame:controller.view.bounds];
+    [view addSubview:_unityView];
+    _rootController.view = _rootView = view;
+");
+                File.WriteAllText(path + "/Classes/UI/UnityAppController+ViewHandling.mm", text);
+            }
+            // Classes/UI/UnityView.h
+            {
+                var lines0 = File.ReadAllText(path + "/Classes/UI/UnityView.h").Split('\n');
+                var lines = new List<string>();
+                var phase = 0;
+                foreach (var line in lines0) {
+                    switch (phase) {
+                    case 0:
+                        lines.Add(line);
+                        if (line.StartsWith("@interface UnityView : UnityRenderingView")) {
+                            phase++;
+                        }
+                        break;
+                    case 1:
+                        lines.Add(line);
+                        if (line.StartsWith("}")) {
+                            phase++;
+                            lines.Add("");
+                            lines.Add("- (void)clearMasks;");
+                            lines.Add("- (void)addMask:(CGRect)r;");
+                        }
+                        break;
+                    default:
+                        lines.Add(line);
+                        break;
+                    }
+                }
+                File.WriteAllText(path + "/Classes/UI/UnityView.h", string.Join("\n", lines));
+            }
+            // Classes/UI/UnityView.mm
+            {
+                var lines0 = File.ReadAllText(path + "/Classes/UI/UnityView.mm").Split('\n');
+                var lines = new List<string>();
+                var phase = 0;
+                foreach (var line in lines0) {
+                    switch (phase) {
+                    case 0:
+                        lines.Add(line);
+                        if (line.StartsWith("@implementation UnityView")) {
+                            phase++;
+                        }
+                        break;
+                    case 1:
+                        if (line.StartsWith("}")) {
+                            phase++;
+                            lines.Add("    NSMutableArray<NSValue *> *_masks;");
+                            lines.Add(line);
+                            lines.Add(@"
+- (void)clearMasks
+{
+    if (_masks == nil) {
+        _masks = [[NSMutableArray<NSValue *> alloc] init];
+    }
+    [_masks removeAllObjects];
+}
+
+- (void)addMask:(CGRect)r
+{
+    if (_masks == nil) {
+        _masks = [[NSMutableArray<NSValue *> alloc] init];
+    }
+    [_masks addObject:[NSValue valueWithCGRect:r]];
+}
+
+- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
+{
+    //CGRect mask = CGRectMake(0, 0, 1334, 100);
+    //return CGRectContainsPoint(mask, point);
+    for (NSValue *v in _masks) {
+        if (CGRectContainsPoint([v CGRectValue], point)) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+");
+                        } else {
+                            lines.Add(line);
+                        }
+                        break;
+                    default:
+                        lines.Add(line);
+                        break;
+                    }
+                }
+                lines.Add(@"
+extern ""C"" {
+    UIView *UnityGetGLView();
+    void CWebViewPlugin_ClearMasks();
+    void CWebViewPlugin_AddMask(int x, int y, int w, int h);
+}
+
+void CWebViewPlugin_ClearMasks()
+{
+    [(UnityView *)UnityGetGLView() clearMasks];
+}
+
+void CWebViewPlugin_AddMask(int x, int y, int w, int h)
+{
+    UIView *view = UnityGetGLViewController().view;
+    CGFloat scale = 1.0f;
+    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0) {
+        scale = view.window.screen.nativeScale;
+    } else {
+        scale = view.contentScaleFactor;
+    }
+    [(UnityView *)UnityGetGLView() addMask:CGRectMake(x / scale, y / scale, w / scale, h / scale)];
+}
+");
+                File.WriteAllText(path + "/Classes/UI/UnityView.mm", string.Join("\n", lines));
+            }
         }
     }
 }
@@ -345,6 +476,25 @@ internal bool SetExported(bool enabled) {
         return changed;
     }
 
+    internal bool SetApplicationTheme(string theme) {
+        bool changed = false;
+        if (ApplicationElement.GetAttribute("theme", AndroidXmlNamespace) != theme) {
+            ApplicationElement.SetAttribute("theme", AndroidXmlNamespace, theme);
+            changed = true;
+        }
+        return changed;
+    }
+
+    internal bool SetActivityTheme(string theme) {
+        bool changed = false;
+        var activity = GetActivityWithLaunchIntent() as XmlElement;
+        if (activity.GetAttribute("theme", AndroidXmlNamespace) != theme) {
+            activity.SetAttribute("theme", AndroidXmlNamespace, theme);
+            changed = true;
+        }
+        return changed;
+    }
+
     internal bool SetWindowSoftInputMode(string mode) {
         bool changed = false;
         var activity = GetActivityWithLaunchIntent() as XmlElement;

diff --git a/dist/package-nofragment/Assets/Plugins/WebViewObject.cs b/dist/package-nofragment/Assets/Plugins/WebViewObject.cs
@@ -500,6 +500,10 @@ private static extern void _CWebViewPlugin_Reload(
     [DllImport("WebView")]
     private static extern string _CWebViewPlugin_GetMessage(IntPtr instance);
 #elif UNITY_IPHONE
+    [DllImport("__Internal")]
+    private static extern void CWebViewPlugin_ClearMasks();
+    [DllImport("__Internal")]
+    private static extern void CWebViewPlugin_AddMask(int x, int y, int w, int h);
     [DllImport("__Internal")]
     private static extern IntPtr _CWebViewPlugin_Init(string gameObject, bool transparent, bool zoom, string ua, bool enableWKWebView, int wkContentMode, bool wkAllowsLinkPreview, bool wkAllowsBackForwardNavigationGestures, int radius);
     [DllImport("__Internal")]
@@ -599,6 +603,32 @@ public static bool IsWebViewAvailable()
 #endif
     }
 
+    public static void ClearMasks()
+    {
+#if !UNITY_EDITOR && UNITY_ANDROID
+        using(AndroidJavaClass UnityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
+        {
+            var activity = UnityClass.GetStatic<AndroidJavaObject>("currentActivity");
+            activity.Call("clearMasks");
+        }
+#elif !UNITY_EDITOR && UNITY_IPHONE
+        CWebViewPlugin_ClearMasks();
+#endif
+    }
+
+    public static void AddMask(int x, int y, int w, int h)
+    {
+#if !UNITY_EDITOR && UNITY_ANDROID
+        using(AndroidJavaClass UnityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
+        {
+            var activity = UnityClass.GetStatic<AndroidJavaObject>("currentActivity");
+            activity.Call("addMask", x, y, w, h);
+        }
+#elif !UNITY_EDITOR && UNITY_IPHONE
+        CWebViewPlugin_AddMask(x, y, w, h);
+#endif
+    }
+
     public void Init(
         Callback cb = null,
         Callback err = null,

diff --git a/dist/package-nofragment/Assets/Plugins/iOS/WebView.mm b/dist/package-nofragment/Assets/Plugins/iOS/WebView.mm
@@ -260,7 +260,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
 
     [webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
 
-    [view addSubview:webView];
+    [view insertSubview:webView atIndex:0];
 
     return self;
 }

diff --git a/dist/package-nofragment/Assets/Plugins/iOS/WebViewWithUIWebView.mm b/dist/package-nofragment/Assets/Plugins/iOS/WebViewWithUIWebView.mm
@@ -320,7 +320,7 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra
 
     [webView addObserver:self forKeyPath: @"loading" options: NSKeyValueObservingOptionNew context:nil];
 
-    [view addSubview:webView];
+    [view insertSubview:webView atIndex:0];
 
     return self;
 }

diff --git a/dist/package/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl b/dist/package/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl
diff --git a/dist/package/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl b/dist/package/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl