feat: add WebViewBridgeEnabled (#198)

* feat: add WebViewBridgeEnabled * fix: return value * fix: ignoreView * fix: log * release 3.5.1 --------- Co-authored-by: tianhui <[email protected]>
growingio · Aug 16, 2023 · 3fdfac6 · 3fdfac6
1 parent 47f01dc
commit 3fdfac6
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,8 +11,8 @@ buildscript {
         ]
 
         releaseConfiguration = [
-                releaseVersion    : "3.5.1-SNAPSHOT",
-                releaseVersionCode: 30500,
+                releaseVersion    : "3.5.1",
+                releaseVersionCode: 30501,
 
                 pluginVersion     : "3.5.0-SNAPSHOT"
         ]

diff --git a/...o-autotracker-core/src/main/java/com/growingio/android/sdk/autotrack/AutotrackConfig.java b/...o-autotracker-core/src/main/java/com/growingio/android/sdk/autotrack/AutotrackConfig.java
@@ -36,6 +36,15 @@ public float getImpressionScale() {
         return mImpressionScale;
     }
 
+    public AutotrackConfig setWebViewBridgeEnabled(boolean webViewBridgeEnabled) {
+        mAutotrackOptions.setWebViewBridgeEnabled(webViewBridgeEnabled);
+        return this;
+    }
+
+    public boolean isWebViewBridgeEnabled() {
+        return mAutotrackOptions.isWebViewBridgeEnabled();
+    }
+
 //    public AutotrackConfig setAutotrackOptions(AutotrackOptions options) {
 //        this.mAutotrackOptions = options;
 //        return this;

diff --git a/...-autotracker-core/src/main/java/com/growingio/android/sdk/autotrack/AutotrackOptions.java b/...-autotracker-core/src/main/java/com/growingio/android/sdk/autotrack/AutotrackOptions.java
@@ -48,6 +48,7 @@ public class AutotrackOptions {
     private boolean seekbarChangeEnabled = true;
     private boolean ratingBarChangeEnabled = true;
     private boolean sliderChangeEnabled = true;
+    private boolean webViewBridgeEnabled = true;
 
     public boolean isActivityMenuItemClickEnabled() {
         return activityMenuItemClickEnabled;
@@ -216,4 +217,12 @@ public boolean isSliderChangeEnabled() {
     public void setSliderChangeEnabled(boolean sliderChangeEnabled) {
         this.sliderChangeEnabled = sliderChangeEnabled;
     }
+
+    public void setWebViewBridgeEnabled(boolean webViewBridgeEnabled) {
+        this.webViewBridgeEnabled = webViewBridgeEnabled;
+    }
+
+    public boolean isWebViewBridgeEnabled() {
+        return webViewBridgeEnabled;
+    }
 }
diff --git a/...cker-core/src/main/java/com/growingio/android/sdk/autotrack/inject/UcWebViewInjector.java b/...cker-core/src/main/java/com/growingio/android/sdk/autotrack/inject/UcWebViewInjector.java
@@ -17,9 +17,12 @@
 package com.growingio.android.sdk.autotrack.inject;
 
 import com.growingio.android.sdk.TrackerContext;
+import com.growingio.android.sdk.autotrack.AutotrackConfig;
+import com.growingio.android.sdk.autotrack.view.ViewHelper;
 import com.growingio.android.sdk.track.log.Logger;
 import com.growingio.android.sdk.track.modelloader.ModelLoader;
 import com.growingio.android.sdk.track.middleware.hybrid.HybridBridge;
+import com.growingio.android.sdk.track.providers.ConfigurationProvider;
 import com.uc.webview.export.WebView;
 
 import java.util.Map;
@@ -33,6 +36,14 @@ private static void bridgeForWebView(WebView view) {
             return;
         }
 
+        AutotrackConfig config = ConfigurationProvider.get().getConfiguration(AutotrackConfig.class);
+        boolean webViewBridgeEnabled = config.isWebViewBridgeEnabled();
+        boolean ignoredView = ViewHelper.isIgnoredView(view);
+        if (!webViewBridgeEnabled || ignoredView) {
+            Logger.d(TAG, "Autotracker webViewBridgeEnabled: " + webViewBridgeEnabled + ", isIgnoredView: " + ignoredView);
+            return;
+        }
+
         boolean result = false;
         ModelLoader<HybridBridge, Boolean> modelLoader = TrackerContext.get().getRegistry().getModelLoader(HybridBridge.class, Boolean.class);
         if (modelLoader != null) {

diff --git a/...racker-core/src/main/java/com/growingio/android/sdk/autotrack/inject/WebViewInjector.java b/...racker-core/src/main/java/com/growingio/android/sdk/autotrack/inject/WebViewInjector.java
@@ -20,9 +20,12 @@
 import android.webkit.WebView;
 
 import com.growingio.android.sdk.TrackerContext;
+import com.growingio.android.sdk.autotrack.AutotrackConfig;
+import com.growingio.android.sdk.autotrack.view.ViewHelper;
 import com.growingio.android.sdk.track.log.Logger;
 import com.growingio.android.sdk.track.modelloader.ModelLoader;
 import com.growingio.android.sdk.track.middleware.hybrid.HybridBridge;
+import com.growingio.android.sdk.track.providers.ConfigurationProvider;
 
 import java.util.Map;
 
@@ -35,6 +38,14 @@ private static void bridgeForWebView(View view) {
             return;
         }
 
+        AutotrackConfig config = ConfigurationProvider.get().getConfiguration(AutotrackConfig.class);
+        boolean webViewBridgeEnabled = config.isWebViewBridgeEnabled();
+        boolean ignoredView = ViewHelper.isIgnoredView(view);
+        if (!webViewBridgeEnabled || ignoredView) {
+            Logger.d(TAG, "Autotracker webViewBridgeEnabled: " + webViewBridgeEnabled + ", isIgnoredView: " + ignoredView);
+            return;
+        }
+
         boolean result = false;
         ModelLoader<HybridBridge, Boolean> modelLoader = TrackerContext.get().getRegistry().getModelLoader(HybridBridge.class, Boolean.class);
         if (modelLoader != null) {

diff --git a/...cker-core/src/main/java/com/growingio/android/sdk/autotrack/inject/X5WebViewInjector.java b/...cker-core/src/main/java/com/growingio/android/sdk/autotrack/inject/X5WebViewInjector.java
@@ -18,9 +18,12 @@
 
 
 import com.growingio.android.sdk.TrackerContext;
+import com.growingio.android.sdk.autotrack.AutotrackConfig;
+import com.growingio.android.sdk.autotrack.view.ViewHelper;
 import com.growingio.android.sdk.track.log.Logger;
 import com.growingio.android.sdk.track.modelloader.ModelLoader;
 import com.growingio.android.sdk.track.middleware.hybrid.HybridBridge;
+import com.growingio.android.sdk.track.providers.ConfigurationProvider;
 import com.tencent.smtt.sdk.WebView;
 
 import java.util.Map;
@@ -34,6 +37,14 @@ private static void bridgeForWebView(WebView view) {
             return;
         }
 
+        AutotrackConfig config = ConfigurationProvider.get().getConfiguration(AutotrackConfig.class);
+        boolean webViewBridgeEnabled = config.isWebViewBridgeEnabled();
+        boolean ignoredView = ViewHelper.isIgnoredView(view);
+        if (!webViewBridgeEnabled || ignoredView) {
+            Logger.d(TAG, "Autotracker webViewBridgeEnabled: " + webViewBridgeEnabled + ", isIgnoredView: " + ignoredView);
+            return;
+        }
+
         boolean result = false;
         ModelLoader<HybridBridge, Boolean> modelLoader = TrackerContext.get().getRegistry().getModelLoader(HybridBridge.class, Boolean.class);
         if (modelLoader != null) {

diff --git a/...autotracker-core/src/test/java/com/growingio/android/sdk/autotrack/hybrid/HybridTest.java b/...autotracker-core/src/test/java/com/growingio/android/sdk/autotrack/hybrid/HybridTest.java
@@ -22,11 +22,15 @@
 
 import androidx.test.core.app.ApplicationProvider;
 
+import com.growingio.android.sdk.Configurable;
+import com.growingio.android.sdk.CoreConfiguration;
 import com.growingio.android.sdk.TrackerContext;
+import com.growingio.android.sdk.autotrack.AutotrackConfig;
 import com.growingio.android.sdk.autotrack.RobolectricActivity;
 import com.growingio.android.sdk.autotrack.inject.UcWebViewInjector;
 import com.growingio.android.sdk.autotrack.inject.WebViewInjector;
 import com.growingio.android.sdk.autotrack.inject.X5WebViewInjector;
+import com.growingio.android.sdk.track.providers.ConfigurationProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,6 +40,7 @@
 import org.robolectric.annotation.Config;
 
 import java.util.HashMap;
+import java.util.Map;
 
 @Config(manifest = Config.NONE, sdk = 23)
 @RunWith(RobolectricTestRunner.class)
@@ -47,6 +52,10 @@ public class HybridTest {
     public void setup() {
         TrackerContext.init(application);
         TrackerContext.initSuccess();
+
+        Map<Class<? extends Configurable>, Configurable> modules = new HashMap<>();
+        modules.put(AutotrackConfig.class, new AutotrackConfig());
+        ConfigurationProvider.initWithConfig(new CoreConfiguration("HybridTest", "growingio.hybridtest"), modules);
     }
 
     @Test