diff --git a/app/build.gradle b/app/build.gradle index 96ea154e6d..d4ac491dbc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -297,7 +297,6 @@ dependencies { implementation project(':libraries:TalkingData') implementation project(':libraries:UmengPush') // implementation project(':libraries:WechatShare') - implementation project(':libraries:LogHub') implementation project(':libraries:im') implementation project(':libraries:Matisse') implementation project(path: ':libraries:gsyVideoPlayer-proxy_cache') diff --git a/libraries/LogHub/libs/loghubHelper-bundles-1.2.jar b/app/libs/loghubHelper-bundles-1.2.jar similarity index 100% rename from libraries/LogHub/libs/loghubHelper-bundles-1.2.jar rename to app/libs/loghubHelper-bundles-1.2.jar diff --git a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubDatabase.kt b/app/src/main/java/com/gh/common/loghub/LoghubDatabase.kt similarity index 95% rename from libraries/LogHub/src/main/java/com/gh/loghub/LoghubDatabase.kt rename to app/src/main/java/com/gh/common/loghub/LoghubDatabase.kt index 3e716224d8..f94d0bc27f 100644 --- a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubDatabase.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubDatabase.kt @@ -1,4 +1,4 @@ -package com.gh.loghub +package com.gh.common.loghub import android.content.Context import androidx.room.Database diff --git a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubEvent.kt b/app/src/main/java/com/gh/common/loghub/LoghubEvent.kt similarity index 94% rename from libraries/LogHub/src/main/java/com/gh/loghub/LoghubEvent.kt rename to app/src/main/java/com/gh/common/loghub/LoghubEvent.kt index 7452a36fba..e79d09bafc 100644 --- a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubEvent.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubEvent.kt @@ -1,4 +1,4 @@ -package com.gh.loghub +package com.gh.common.loghub import android.os.Parcelable import androidx.annotation.Keep diff --git a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubEventDao.kt b/app/src/main/java/com/gh/common/loghub/LoghubEventDao.kt similarity index 93% rename from libraries/LogHub/src/main/java/com/gh/loghub/LoghubEventDao.kt rename to app/src/main/java/com/gh/common/loghub/LoghubEventDao.kt index 92aa4b53ea..1f3b4bf0a0 100644 --- a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubEventDao.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubEventDao.kt @@ -1,4 +1,4 @@ -package com.gh.loghub +package com.gh.common.loghub import androidx.room.* diff --git a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubUtils.kt b/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt similarity index 97% rename from libraries/LogHub/src/main/java/com/gh/loghub/LoghubUtils.kt rename to app/src/main/java/com/gh/common/loghub/LoghubUtils.kt index 4e6b659355..1f8c95d5ac 100644 --- a/libraries/LogHub/src/main/java/com/gh/loghub/LoghubUtils.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt @@ -1,8 +1,9 @@ -package com.gh.loghub +package com.gh.common.loghub import android.app.Application import com.aliyun.sls.android.sdk.model.Log import com.aliyun.sls.android.sdk.model.LogGroup +import com.gh.loghub.LoghubHelper import org.json.JSONObject import java.util.concurrent.Executors import kotlin.concurrent.fixedRateTimer diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java index 569581cec3..396ed18693 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -9,6 +9,7 @@ import android.text.TextUtils; import com.gh.common.exposure.ExposureSource; import com.gh.common.exposure.meta.Meta; import com.gh.common.exposure.meta.MetaUtil; +import com.gh.common.loghub.LoghubUtils; import com.gh.download.DownloadDataHelper; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.entity.CommunityEntity; @@ -16,7 +17,6 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.SpecialColumn; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.qa.entity.Questions; -import com.gh.loghub.LoghubUtils; import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; import com.lightgame.utils.Util_System_Phone_State; diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 78b1c6c89a..b85e28ff71 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -13,6 +13,7 @@ import com.gh.common.PushManager; import com.gh.common.constant.Config; import com.gh.common.exposure.ExposureManager; import com.gh.common.im.ImReceiver; +import com.gh.common.loghub.LoghubUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceUtils; import com.gh.common.util.DownloadNotificationHelper; @@ -31,7 +32,6 @@ import com.gh.gamecenter.receiver.NetworkStateReceiver; import com.gh.gamecenter.receiver.UmengMessageReceiver; import com.gh.gamecenter.video.detail.CustomProxyCacheManager; import com.gh.gid.GidHelper; -import com.gh.loghub.LoghubUtils; import com.github.piasy.biv.BigImageViewer; import com.github.piasy.biv.loader.fresco.FrescoImageLoader; import com.leon.channel.helper.ChannelReaderUtil; diff --git a/libraries/LogHub/.gitignore b/libraries/LogHub/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/libraries/LogHub/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/libraries/LogHub/build.gradle b/libraries/LogHub/build.gradle deleted file mode 100644 index ab0589a40c..0000000000 --- a/libraries/LogHub/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' // kotlin -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' - -dependencies { - api fileTree(dir: 'libs', exclude: 'android-support-*.jar', include: '*.jar') - - implementation "androidx.room:room-runtime:$room" - kapt "androidx.room:room-compiler:$room" -} - -android { - defaultConfig { - consumerProguardFiles 'proguard-library.txt' - } - - androidExtensions { - experimental = true - } - - buildToolsVersion '28.0.3' -} \ No newline at end of file diff --git a/libraries/LogHub/proguard-library.txt b/libraries/LogHub/proguard-library.txt deleted file mode 100644 index 418171ce55..0000000000 --- a/libraries/LogHub/proguard-library.txt +++ /dev/null @@ -1,30 +0,0 @@ -# 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 - --keep class com.taobao.** {*;} --keep class com.alibaba.** {*;} --dontwarn com.taobao.** --dontwarn com.alibaba.** --keep class com.ut.** {*;} --dontwarn com.ut.** --keep class com.ta.** {*;} --dontwarn com.ta.** \ No newline at end of file diff --git a/libraries/LogHub/src/main/AndroidManifest.xml b/libraries/LogHub/src/main/AndroidManifest.xml deleted file mode 100644 index 45d76de7e0..0000000000 --- a/libraries/LogHub/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/settings.gradle b/settings.gradle index ab0df2933b..2e68c5c5ce 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,6 +6,5 @@ include ':libraries:QQShare' include ':libraries:TalkingData' include ':libraries:UmengPush' //include ':libraries:WechatShare' -include ':libraries:LogHub' include ':libraries:Matisse' include ':libraries:gsyVideoPlayer-proxy_cache' \ No newline at end of file