diff --git a/app/build.gradle b/app/build.gradle index d4faf0281..e0de1419e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -183,6 +183,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = "1.8" + } + productFlavors { accompany { dimension 'default' diff --git a/build.gradle b/build.gradle index 1316cfbfd..fac749db6 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { mavenCentral() maven {url 'http://developer.huawei.com/repo/'} maven { url "http://mvn.mob.com/android" } - maven { url 'https://dl.bintray.com/umsdk/release' } + maven { url 'https://repo1.maven.org/maven2/' } maven { url 'https://dl.bintray.com/linkedme2016/lkme-deeplinks' } } @@ -38,7 +38,7 @@ allprojects { maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://jitpack.io' } maven { url "http://mvn.mob.com/android" } - maven { url 'https://dl.bintray.com/umsdk/release' } + maven { url 'https://repo1.maven.org/maven2/' } maven { url 'https://dl.bintray.com/linkedme2016/lkme-deeplinks' } maven { url 'http://developer.huawei.com/repo/' } } diff --git a/core/build.gradle b/core/build.gradle index 2749c1bfc..8b9253599 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -64,10 +64,7 @@ android { } def loggerVersion = "2.2.0" -def BaiduMtjVersion = "3.8.2.1" def Lombok = "1.16.20" -def umeng_common = "2.2.5" -def umeng_analytics = "8.1.6" dependencies { api fileTree(dir: 'libs', include: ['*.jar']) @@ -75,11 +72,10 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - api "com.orhanobut:logger:${loggerVersion}" - // 百度统计 - api "com.baidu.mobstat:mtj-sdk:${BaiduMtjVersion}" + api 'com.umeng.umsdk:common:9.3.8'// 必选 + api 'com.umeng.umsdk:asms:1.2.2'// 必选 compileOnly "org.projectlombok:lombok:${Lombok}" annotationProcessor "org.projectlombok:lombok:${Lombok}" diff --git a/core/libs/analytics-8.1.6.jar b/core/libs/analytics-8.1.6.jar deleted file mode 100644 index f18defed0..000000000 Binary files a/core/libs/analytics-8.1.6.jar and /dev/null differ diff --git a/core/libs/common-2.2.5.jar b/core/libs/common-2.2.5.jar deleted file mode 100644 index 2f9a7bfdd..000000000 Binary files a/core/libs/common-2.2.5.jar and /dev/null differ diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java index 9daffb934..8baca3f8c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java @@ -1,9 +1,9 @@ package com.yizhuan.xchat_android_core.statistic; import android.content.Context; + import androidx.annotation.Keep; -import com.baidu.mobstat.StatService; import com.umeng.analytics.MobclickAgent; import java.util.Map; @@ -18,37 +18,26 @@ import java.util.Map; public class StatisticModel { void onEventEnd(Context context, String eventId, String eventLabel, Map arguments) { - if (arguments == null) { - StatService.onEventEnd(context, eventId, eventLabel); - MobclickAgent.onPageEnd(eventId); - } else { - StatService.onEventEnd(context, eventId, eventLabel, arguments); - MobclickAgent.onPageEnd(eventId); - } + MobclickAgent.onPageEnd(eventId); } void onEventStart(Context context, String eventId, String eventLabel) { - StatService.onEventStart(context, eventId, eventLabel); MobclickAgent.onPageStart(eventId); } void onEvent(Context context, String eventId, String eventLabel, Map arguments) { if (arguments != null) { - StatService.onEvent(context, eventId, eventLabel, 1, arguments); MobclickAgent.onEvent(context, eventId, arguments); } else { - StatService.onEvent(context, eventId, eventLabel); MobclickAgent.onEvent(context, eventId, eventLabel); } } void onResume(Context context) { - StatService.onResume(context); MobclickAgent.onResume(context); } void onPause(Context context) { - StatService.onPause(context); MobclickAgent.onPause(context); } @@ -59,7 +48,6 @@ public class StatisticModel { * @param pageName 页面名称 */ void onPageStart(Context context, String pageName) { - StatService.onPageStart(context, pageName); } /** @@ -69,7 +57,6 @@ public class StatisticModel { * @param pageName 页面名称 */ void onPageEnd(Context context, String pageName) { - StatService.onPageEnd(context, pageName); }