【ID871407511】合规修复-升级firebase版本，把firebase数据收集时机放置同意协议之后。

http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192871407511

Change-Id: Ibec07cc765a6e9dcead2393eec811129976a9152

Author: SundoggyNew

app/build.gradle

@@ -60,8 +60,8 @@ android {
     productFlavors {
         opensource {
             applicationId "com.tencent.iot.explorer.link.opensource"
-            resValue("string" , "app_name_zh", "腾讯连连开源版")
-            resValue("string" , "app_name_en", "Tencent LLink (OSS)")
+            resValue("string", "app_name_zh", "腾讯连连开源版")
+            resValue("string", "app_name_en", "Tencent LLink (OSS)")
         }
         //-tencentOfficial {
         //-    applicationId "com.tencent.iot.explorer.link"
@@ -70,7 +70,7 @@ android {
         //-}
     }
 
-    kotlinOptions { jvmTarget = 1.8}
+    kotlinOptions { jvmTarget = 1.8 }
 
 
     buildTypes {
@@ -102,15 +102,20 @@ android {
     }
     applicationVariants.all { variant ->
         variant.outputs.all {
-            def date = new Date().format("yyyyMMddHH" , TimeZone.getTimeZone("GMT+08"))
-            if(variant.buildType.name == 'debug') {
+            def date = new Date().format("yyyyMMddHH", TimeZone.getTimeZone("GMT+08"))
+            if (variant.buildType.name == 'debug') {
                 outputFileName = "iot-link-android-debug-${date}.apk"
             }
-            if(variant.buildType.name == 'release') {
+            if (variant.buildType.name == 'release') {
                 outputFileName = "iot-link-android-release-${date}.apk"
             }
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -169,12 +174,12 @@ dependencies {
         implementation 'com.tencent.iot.explorer:explorer-link-android:+'
     }
 
-    implementation 'com.google.firebase:firebase-analytics-ktx:17.5.0'
+    implementation 'com.google.firebase:firebase-analytics-ktx:20.0.2'
 
     // Add the Firebase Crashlytics SDK.
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.6'
 
-    implementation 'com.google.firebase:firebase-perf:19.0.8'
+    implementation 'com.google.firebase:firebase-perf:20.0.4'
 
     implementation 'com.squareup.picasso:picasso:2.71828'
 

app/src/main/AndroidManifest.xml

@@ -49,6 +49,8 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:allowBackup">
+        <!-- 如果您出于某些原因（例如为了在收集数据前征得最终用户的同意）希望暂时停用 Analytics 数据收集功能 -->
+        <meta-data android:name="firebase_analytics_collection_enabled" android:value="false" />
         <!-- 请您务必确保终端用户首次安装启动应用时，配置不自动启动推送服务,以确保应用首次安装启动时不会自启推送服务，直到调用了推送服务注册接口 XGPushManager.registerPush() 才会开启 -->
         <meta-data
             android:name="XG_SERVICE_PULL_UP_OFF"

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/PrivicyDialogActivity.kt

@@ -2,9 +2,9 @@ package com.tencent.iot.explorer.link.kitlink.activity
 
 import android.content.Intent
 import android.text.TextUtils
+import com.google.firebase.analytics.FirebaseAnalytics
 import com.tencent.iot.explorer.link.App
 import com.tencent.iot.explorer.link.R
-import com.tencent.iot.explorer.link.T
 import com.tencent.iot.explorer.link.core.utils.Utils
 import com.tencent.iot.explorer.link.customview.dialog.UserAgreeDialog
 import com.tencent.iot.explorer.link.kitlink.consts.CommonField
@@ -21,6 +21,7 @@ class PrivicyDialogActivity : BaseActivity() {
 
     override fun initView() {
         if (!TextUtils.isEmpty(App.data.getToken())) {
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(true)
             startActivity(Intent(this, MainActivity::class.java))
             return
         }
@@ -33,6 +34,7 @@ class PrivicyDialogActivity : BaseActivity() {
             }
             override fun onOkClicked() {
                 Utils.setXmlStringValue(this@PrivicyDialogActivity, CommonField.AGREED_RULE_FLAG, CommonField.AGREED_RULE_FLAG, "1")
+                FirebaseAnalytics.getInstance(this@PrivicyDialogActivity).setAnalyticsCollectionEnabled(true)
                 finish()
                 App.toLogin()
             }

build.gradle

@@ -10,9 +10,9 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
-        classpath 'com.google.firebase:perf-plugin:1.3.1'  // Performance Monitoring plugin
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+        classpath 'com.google.firebase:perf-plugin:1.4.0'  // Performance Monitoring plugin
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

sdkdemo/build.gradle

@@ -118,10 +118,10 @@ dependencies {
         implementation 'com.tencent.iot.explorer:explorer-link-android:+'
     }
 
-    implementation 'com.google.firebase:firebase-analytics-ktx:17.4.3'
+    implementation 'com.google.firebase:firebase-analytics-ktx:20.0.2'
 
     // Add the Firebase Crashlytics SDK.
-    implementation 'com.google.firebase:firebase-crashlytics:17.0.1'
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.6'
 
 //    implementation 'com.google.firebase:firebase-perf:19.0.7'
     implementation 'com.alibaba:fastjson:1.2.73'