New Saas (#192)

1. update version: 3.4.7;
2. rollback saas SDKs.

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         ]
 
         releaseConfiguration = [
-                releaseVersion    : "3.4.7-SNAPSHOT",
+                releaseVersion    : "3.4.7",
                 releaseVersionCode: 30407,
 
                 pluginVersion     : "3.4.6",

gio-sdk/autotracker/.gitignore

@@ -0,0 +1 @@
+/build

gio-sdk/autotracker/build.gradle

@@ -0,0 +1,67 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion buildConfiguration.compileVersion
+    defaultConfig {
+        minSdkVersion buildConfiguration.minSdkVersion
+        targetSdkVersion buildConfiguration.targetSdkVersion
+        versionName releaseConfiguration.releaseVersion
+        versionCode releaseConfiguration.releaseVersionCode
+    }
+
+    buildTypes {
+        debug {
+            testCoverageEnabled = true
+        }
+
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'consumer-proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility buildConfiguration.sourceCompatibility
+        targetCompatibility buildConfiguration.targetCompatibility
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    debugApi project(':growingio-tracker-core')
+    releaseApi libraries.growingio.tracker_core
+
+    debugApi project(':growingio-autotracker-core')
+    releaseApi libraries.growingio.autotracker_core
+
+    debugApi project(':growingio-network:okhttp3')
+    releaseApi libraries.growingio.okhttp3
+
+    debugApi project(':growingio-data:database')
+    releaseApi libraries.growingio.database
+
+    debugApi project(':growingio-data:json')
+    releaseApi libraries.growingio.json
+
+    debugApi project(':growingio-webservice:circler')
+    releaseApi libraries.growingio.circler
+
+    debugApi project(':growingio-webservice:debugger')
+    releaseApi libraries.growingio.debugger
+
+    debugApi project(':growingio-hybrid')
+    releaseApi libraries.growingio.hybrid
+
+    compileOnly libraries.androidx.appcompat
+    compileOnly libraries.android.appcompat
+
+    releaseImplementation libraries.growingio.annotation
+    debugImplementation project(":growingio-annotation")
+    annotationProcessor project(":growingio-annotation:compiler")
+}
+
+apply from: "${rootProject.projectDir}/gradle/publishMaven.gradle"

gio-sdk/autotracker/gradle.properties

@@ -0,0 +1,20 @@
+#
+#   Copyright (C) 2020 Beijing Yishu Technology Co., Ltd.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+POM_NAME=autotracker
+POM_ARTIFACT_ID=autotracker
+POM_PACKAGING=aar
+POM_DESCRIPTION=GrowingIO Android SDK AutoTracker.

gio-sdk/autotracker/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

gio-sdk/autotracker/src/main/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<!--
+  ~   Copyright (C) 2020 Beijing Yishu Technology Co., Ltd.
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.growingio.android.sdk.autotrack.api" />

gio-sdk/autotracker/src/main/java/com/growingio/android/sdk/autotrack/GrowingAutoAppModule.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 Beijing Yishu Technology Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.growingio.android.sdk.autotrack;
+
+import com.growingio.android.sdk.AppGioModule;
+import com.growingio.sdk.annotation.GIOAppModule;
+import com.growingio.sdk.annotation.GIOTracker;
+
+@GIOAppModule(name = "GrowingAutotracker", configName = "AutotrackConfiguration")
+public class GrowingAutoAppModule extends AppGioModule {
+
+    @GIOTracker(path = Autotracker.class)
+    public void config(AutotrackConfiguration config) {
+    }
+}

gio-sdk/tracker/.gitignore

@@ -0,0 +1 @@
+/build

gio-sdk/tracker/build.gradle

@@ -0,0 +1,62 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion buildConfiguration.compileVersion
+    defaultConfig {
+        minSdkVersion buildConfiguration.minSdkVersion
+        targetSdkVersion buildConfiguration.targetSdkVersion
+        versionName releaseConfiguration.releaseVersion
+        versionCode releaseConfiguration.releaseVersionCode
+    }
+
+    buildTypes {
+        debug {
+            testCoverageEnabled = true
+        }
+
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'consumer-proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility buildConfiguration.sourceCompatibility
+        targetCompatibility buildConfiguration.targetCompatibility
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+dependencies {
+    compileOnly fileTree(dir: '../thirdLibs', include: ['*.jar'])
+
+    debugApi project(':growingio-tracker-core')
+    releaseApi libraries.growingio.tracker_core
+
+    debugApi project(':growingio-network:okhttp3')
+    releaseApi libraries.growingio.okhttp3
+
+    debugApi project(':growingio-data:database')
+    releaseApi libraries.growingio.database
+
+    debugApi project(':growingio-data:json')
+    releaseApi libraries.growingio.json
+
+    debugApi project(':growingio-webservice:debugger')
+    releaseApi libraries.growingio.debugger
+
+    compileOnly libraries.android.appcompat
+
+    releaseImplementation libraries.growingio.annotation
+    debugImplementation project(":growingio-annotation")
+    annotationProcessor project(":growingio-annotation:compiler")
+}
+
+apply from: "${rootProject.projectDir}/gradle/publishMaven.gradle"
+
+//tasks.withType(Javadoc) {
+//    failOnError false
+//    classpath += project.files("${buildDir}/generated/ap_generated_sources/debug/out")
+//}

gio-sdk/tracker/gradle.properties

@@ -0,0 +1,20 @@
+#
+#   Copyright (C) 2020 Beijing Yishu Technology Co., Ltd.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+POM_NAME=tracker
+POM_ARTIFACT_ID=tracker
+POM_PACKAGING=aar
+POM_DESCRIPTION=GrowingIO Android Tracker SDK.

gio-sdk/tracker/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

gio-sdk/tracker/src/main/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<!--
+  ~   Copyright (C) 2020 Beijing Yishu Technology Co., Ltd.
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.growingio.android.sdk.track.api" />

gio-sdk/tracker/src/main/java/com/growingio/android/sdk/track/GrowingAppModule.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2020 Beijing Yishu Technology Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.growingio.android.sdk.track;
+
+import com.growingio.android.sdk.AppGioModule;
+import com.growingio.android.sdk.Tracker;
+import com.growingio.sdk.annotation.GIOAppModule;
+import com.growingio.sdk.annotation.GIOTracker;
+
+/**
+ * <p>
+ *
+ * @author cpacm 4/28/21
+ */
+@GIOAppModule()
+public final class GrowingAppModule extends AppGioModule {
+
+    @GIOTracker(path = Tracker.class)
+    public void config(TrackConfiguration configuration) {
+    }
+}

gradle/jacoco.gradle

@@ -51,7 +51,7 @@ def coverageClassDirs = [
         "$rootDir/growingio-webservice/debugger/build/intermediates/javac/debug/classes",
         "$rootDir/growingio-hybrid/build/intermediates/javac/debug/classes",
         "$rootDir/growingio-annotation/compiler/build/classes/java/main",
-        //        "$rootDir/gio-sdk/tracker/build/intermediates/javac/debug/classes",
+//        "$rootDir/gio-sdk/tracker/build/intermediates/javac/debug/classes",
 //        "$rootDir/gio-sdk/tracker-cdp/build/intermediates/javac/debug/classes",
 //        "$rootDir/gio-sdk/autotracker/build/intermediates/javac/debug/classes",
 //        "$rootDir/gio-sdk/autotracker-cdp/build/intermediates/javac/debug/classes",

gradle/publishAllToMavenLocal.sh

@@ -22,6 +22,8 @@ export IS_EXCLUDE_DEMOS=true
 && ./gradlew :growingio-tools:oaid:publishMavenAgentPublicationToMavenLocal \
 && ./gradlew :gio-sdk:tracker-cdp:publishMavenAgentPublicationToMavenLocal \
 && ./gradlew :gio-sdk:autotracker-cdp:publishMavenAgentPublicationToMavenLocal \
+&& ./gradlew :gio-sdk:tracker:publishMavenAgentPublicationToMavenLocal \
+&& ./gradlew :gio-sdk:autotracker:publishMavenAgentPublicationToMavenLocal \
 && ./gradlew :growingio-sdk-bom:publishBomPublicationToMavenLocal \
 && ./gradlew clean
 export IS_EXCLUDE_DEMOS=false

growingio-advert/src/main/java/com/growingio/android/advert/AdvertConfig.java

@@ -16,6 +16,8 @@
 
 package com.growingio.android.advert;
 
+import static com.growingio.android.advert.AdvertUtils.DEEPLINK_AD_HOST;
+
 import com.growingio.android.sdk.Configurable;
 import com.growingio.android.sdk.track.middleware.advert.DeepLinkCallback;
 
@@ -27,7 +29,7 @@
 public class AdvertConfig implements Configurable {
 
     private boolean readClipBoardEnable = true;
-    private String deepLinkHost;
+    private String deepLinkHost = DEEPLINK_AD_HOST;
     private DeepLinkCallback deepLinkCallback;
 
     public AdvertConfig setReadClipBoardEnable(boolean readClipBoardEnable) {

growingio-advert/src/main/java/com/growingio/android/advert/AdvertUtils.java

@@ -58,11 +58,15 @@ class AdvertUtils {
     static final String DEEP_CLICK_TIME = "deep_click_time"; //timestamp
     static final String DEEP_PARAMS = "deep_params"; //{}
 
+    static final String DEEPLINK_AD_HOST = "https://n.datayi.cn";
 
     static final String DEEPLINK_PARAMS_REQUEST_URL = "%1$s/deep/v1/%2$s/android/%3$s/%4$s/%5$s";
 
     static String getRequestDeepLinkUrl(String url, String deepType, String projectId, String datasourceId, String trackId) {
-        return String.format(DEEPLINK_PARAMS_REQUEST_URL, url, deepType, projectId, datasourceId, trackId);
+        if (url != null && url.endsWith("/")) url = url.substring(0, url.length() - 1);
+        String deeplinkUrl = String.format(DEEPLINK_PARAMS_REQUEST_URL, url, deepType, projectId, datasourceId, trackId);
+        Logger.d(TAG, "Call DeepLink Url:" + deeplinkUrl);
+        return deeplinkUrl;
     }
 
     static AdvertData parseDeeplinkResponse(String body) {

growingio-tracker-core/src/main/java/com/growingio/android/sdk/CoreConfiguration.java

@@ -39,7 +39,7 @@ public class CoreConfiguration implements Configurable {
     private boolean mDataCollectionEnabled = true;
     private boolean mUploadExceptionEnabled = true;
     private boolean mRequireAppProcessesEnabled = true;
-    private String mDataCollectionServerHost = "http://api.growingio.com";
+    private String mDataCollectionServerHost = "http://napi.growingio.com";
 
     private EventFilterInterceptor mEventFilterInterceptor;
     @FieldToString(clazz = EventExcludeFilter.class, method = "getEventFilterLog", parameterTypes = {int.class})