release 3.4.6 (#190)

* release 3.4.6 * Update build.gradle * update urlscheme
growingio · Feb 23, 2023 · 88eb796 · 88eb796
1 parent a74567d
commit 88eb796
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 62 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,10 +11,10 @@ buildscript {
         ]
 
         releaseConfiguration = [
-                releaseVersion    : "3.4.5",
-                releaseVersionCode: 30405,
+                releaseVersion    : "3.4.6",
+                releaseVersionCode: 30406,
 
-                pluginVersion     : "3.4.4",
+                pluginVersion     : "3.4.5",
         ]
 
         versions = [

diff --git a/...rc/androidTest/java/com/growingio/autotest/autotracker/webservices/CircleServiceTest.java b/...rc/androidTest/java/com/growingio/autotest/autotracker/webservices/CircleServiceTest.java
@@ -66,12 +66,12 @@ public class CircleServiceTest extends WebServicesTest {
     @BeforeAppOnCreate
     public static void beforeAppOnCreate() {
         DataHelper.deleteEventsDatabase();
-        DemoApplication.setConfiguration(TestTrackConfiguration.getTestConfig("growing.47d2b990025d67f5"));
+        DemoApplication.setConfiguration(TestTrackConfiguration.getTestConfig("growing.ff8a70351000af43"));
     }
 
     @Test
     public void circleServiceTest() {
-        String uri = "growing.47d2b990025d67f5://growingio/webservice?serviceType=circle&wsUrl=" + Uri.encode(getWsUrl());
+        String uri = "growing.ff8a70351000af43://growingio/webservice?serviceType=circle&wsUrl=" + Uri.encode(getWsUrl());
         Intent intent = new Intent();
         intent.setData(Uri.parse(uri));
         ActivityScenario.launch(intent);

diff --git a/.../androidTest/java/com/growingio/autotest/autotracker/webservices/DebuggerServiceTest.java b/.../androidTest/java/com/growingio/autotest/autotracker/webservices/DebuggerServiceTest.java
@@ -68,7 +68,7 @@ public void setup() {
     @BeforeAppOnCreate
     public static void beforeAppOnCreate() {
         DataHelper.deleteEventsDatabase();
-        DemoApplication.setConfiguration(TestTrackConfiguration.getTestConfig("growing.47d2b990025d67f5"));
+        DemoApplication.setConfiguration(TestTrackConfiguration.getTestConfig("growing.ff8a70351000af43"));
     }
 
     protected String getWsUrl() {
@@ -126,7 +126,7 @@ public void onMessage(WebSocket webSocket, String text) {
         });
         mMockWebServer.enqueue(ready);
 
-        String uri = "growing.47d2b990025d67f5://growingio/webservice?serviceType=debugger&wsUrl=" + Uri.encode(getWsUrl());
+        String uri = "growing.ff8a70351000af43://growingio/webservice?serviceType=debugger&wsUrl=" + Uri.encode(getWsUrl());
         Intent intent = new Intent();
         intent.setData(Uri.parse(uri));
         ActivityScenario.launch(intent);

diff --git a/demos/demo/src/main/AndroidManifest.xml b/demos/demo/src/main/AndroidManifest.xml
@@ -38,88 +38,53 @@
             android:exported="true"
             android:process=":OtherProcess" />
 
-        <activity android:name=".three.MainActivity" android:exported="true">
+        <activity
+            android:name=".three.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
-                <data android:scheme="growing.47d2b990025d67f5" />
-
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="gio.ren"
-                    android:pathPattern="/v8rud.*"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
+                <data android:scheme="growing.ff8a70351000af43" />
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="gio.ren"
-                    android:pathPattern="/v8r.*id.*"
-                    android:scheme="https" />
             </intent-filter>
+            <!-- GIO APPLinks 配置，广告监测用途，APP 用户点击广告监测短链直接跳转 APP-->
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data
-                    android:host="gio.ren"
-                    android:pathPattern="/v8r.*td.*"
+                    android:host="ads-test.growingio.cn"
+                    android:pathPattern="/k4gud.*"
                     android:scheme="https" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data
-                    android:host="datayi.cn"
-                    android:pathPattern="/v8rud.*"
+                    android:host="ads-test.growingio.cn"
+                    android:pathPattern="/k4g.*id.*"
                     android:scheme="https" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data
-                    android:host="datayi.cn"
-                    android:pathPattern="/v8r.*id.*"
+                    android:host="ads-uat.growingio.cn"
+                    android:pathPattern="/k4vsd.*"
                     android:scheme="https" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="datayi.cn"
-                    android:pathPattern="/v8r.*td.*"
-                    android:scheme="https" />
-            </intent-filter>
         </activity>
-        <activity android:name=".three.core.TrackActivity"
+        <activity
+            android:name=".three.core.TrackActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.gio.test.three.Entry" />

diff --git a/demos/demo/src/main/java/com/gio/test/three/DemoApplication.java b/demos/demo/src/main/java/com/gio/test/three/DemoApplication.java
@@ -28,17 +28,21 @@
 
 import androidx.annotation.RequiresApi;
 
+import com.growingio.android.advert.AdvertConfig;
 import com.growingio.android.advert.AdvertLibraryGioModule;
+import com.growingio.android.apm.ApmConfig;
 import com.growingio.android.apm.ApmLibraryGioModule;
 import com.growingio.android.oaid.OaidLibraryGioModule;
 import com.growingio.android.sdk.autotrack.CdpAutotrackConfiguration;
 import com.growingio.android.sdk.autotrack.GrowingAutotracker;
 import com.growingio.android.sdk.track.events.helper.EventExcludeFilter;
 import com.growingio.android.sdk.track.events.helper.FieldIgnoreFilter;
 import com.growingio.android.sdk.track.log.Logger;
+import com.growingio.android.sdk.track.middleware.advert.DeepLinkCallback;
 import com.tencent.smtt.sdk.QbSdk;
 
 import java.util.List;
+import java.util.Map;
 
 public class DemoApplication extends Application {
     private static final String TAG = "DemoApplication";
@@ -82,20 +86,40 @@ public void onViewInitFinished(boolean b) {
 //            startService(new Intent(this, OtherProcessService.class));
         }
 
+        AdvertConfig advertConfig = new AdvertConfig();
+        advertConfig.setDeepLinkCallback(new DeepLinkCallback() {
+            @Override
+            public void onReceive(Map<String, String> params, int error, long appAwakePassedTime) {
+                Log.e(TAG, "DeepLinkCallback");
+                Log.e(TAG, String.valueOf(params));
+            }
+        });
+        advertConfig.setDeepLinkHost("https://ads-uat.growingio.cn"); // uat-uba
+        advertConfig.setReadClipBoardEnable(true);
+
+        ApmConfig apmConfig = new ApmConfig();
+        apmConfig.setActivityLifecycleTracing(true)
+                .setFragmentXLifecycleTracing(false)
+                .setFragmentSupportLifecycleTracing(true)
+                .setFragmentSystemLifecycleTracing(false)
+                .setUncaughtException(true)
+                .setPrintUncaughtException(true);
         if (sConfiguration == null) {
-            sConfiguration = new CdpAutotrackConfiguration("bc675c65b3b0290e", "growing.47d2b990025d67f5")
-                    .setDataSourceId("939c0b26233d3ed1")
-                    .setDataCollectionServerHost("http://uat-api.growingio.com")
+            sConfiguration = new CdpAutotrackConfiguration("bc675c65b3b0290e", "growing.ff8a70351000af43") //uat-uba
+                    .setDataSourceId("8b17366d9e90b05b")
+                    .setDataCollectionServerHost("http://117.50.84.75:8080")
                     .setUploadExceptionEnabled(false)
                     .setDebugEnabled(true)
                     .setDataCollectionEnabled(true)
                     .setIdMappingEnabled(true)
-                    //.setRequireAppProcessesEnabled(true)
+                    .setRequireAppProcessesEnabled(true)
                     .setExcludeEvent(EventExcludeFilter.of(EventExcludeFilter.REENGAGE))
                     .setIgnoreField(FieldIgnoreFilter.of(FieldIgnoreFilter.FIELD_IGNORE_ALL))
                     //.addConfiguration(oaidConfig)
-                    .addPreloadComponent(new AdvertLibraryGioModule())
-                    .addPreloadComponent(new ApmLibraryGioModule())
+                    .addPreloadComponent(new AdvertLibraryGioModule(), advertConfig)
+                    .addPreloadComponent(new ApmLibraryGioModule(), apmConfig)
+//                    .addPreloadComponent(new ProtobufLibraryModule())
+//                    .addPreloadComponent(new EncoderLibraryGioModule())
                     .addPreloadComponent(new OaidLibraryGioModule());
         }
 

diff --git a/demos/demo/src/main/java/com/gio/test/three/core/TrackActivity.java b/demos/demo/src/main/java/com/gio/test/three/core/TrackActivity.java
@@ -28,6 +28,7 @@
 import com.gio.test.three.ModuleEntry;
 import com.growingio.android.sdk.autotrack.GrowingAutotracker;
 import com.growingio.android.sdk.track.events.CustomEvent;
+import com.growingio.android.sdk.track.middleware.advert.DeepLinkCallback;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -51,6 +52,7 @@ public class TrackActivity extends Activity {
     private static final String TRACK_TIMER_END = "end timerId";
     private static final String REMOVE_TIMER = "remove timer";
     private static final String CLEAR_TRACK_TIMER = "clear all timer";
+    private static final String DO_DEEPLINK = "doDeepLinkByUrl";
     private String timerId1 = "";
     private String timerId2 = "";
 
@@ -67,7 +69,8 @@ public class TrackActivity extends Activity {
             TRACK_TIMER_RESUME,
             TRACK_TIMER_END,
             REMOVE_TIMER,
-            CLEAR_TRACK_TIMER
+            CLEAR_TRACK_TIMER,
+            DO_DEEPLINK
     };
 
     @Override
@@ -122,6 +125,14 @@ private void handleItemClick(String itemString) {
             case CLOSE_DATA_COLLECTION:
                 GrowingAutotracker.get().setDataCollectionEnabled(false);
                 break;
+            case DO_DEEPLINK:
+                GrowingAutotracker.get().doDeepLinkByUrl("https://ads-uat.growingio.cn/k4vsdOx", new DeepLinkCallback() {
+                    @Override
+                    public void onReceive(Map<String, String> params, int error, long appAwakePassedTime) {
+                        Log.e(TAG, String.valueOf(params));
+                    };
+                });
+                break;
             case TRACK_TIMER_START:
                 timerId1 = GrowingAutotracker.get().trackTimerStart("event_1");
                 timerId2 = GrowingAutotracker.get().trackTimerStart("event_2");