From e30e9cab0ef2ed58d44b494cbcdf122a7c39d509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 22 Feb 2021 14:32:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88=E6=9C=AC1.?= =?UTF-8?q?0.28-SNAPSHOT=20=E4=BF=AE=E6=94=B9utils=E5=8C=85=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 - .../com/mogo/cloud/ConfigInfoActivity.java | 1 - .../java/com/mogo/cloud/RealTimeActivity.java | 3 +-- .../live/manager/LiveStreamManagerImpl.java | 2 +- .../cloud/live/manager/MoGoLiveManager.java | 2 +- .../cloud/live/manager/RequestLiveManager.java | 2 +- .../mogo/cloud/live/server/PushService.java | 8 +------- .../network/interceptor/HttpDnsInterceptor.kt | 2 +- .../interceptor/HttpLoggingInterceptor.kt | 2 +- .../interceptor/HttpPassportInterceptor.kt | 4 ++-- .../mogo/cloud/passport/MoGoAiCloudClient.java | 4 ++-- .../passport/MoGoAiCloudClientConfig.java | 2 +- .../com/mogo/cloud/passport/SpStorage.java | 2 +- .../com/mogo/cloud/socket/SocketManager.java | 4 ++-- .../mogo/{utils => cloud}/DevicesUtils.java | 2 +- .../com/mogo/{utils => cloud}/GsonUtil.java | 2 +- .../{utils => cloud}/WorkThreadHandler.java | 2 +- .../storage/SharedPrefsMgr.java | 2 +- .../storage/lrucache/CacheUtil.java | 2 +- .../storage/lrucache/DiskCacheManager.java | 2 +- .../storage/lrucache/DiskLruCache.java | 2 +- .../storage/lrucache/SecretUtil.java | 2 +- .../storage/lrucache/StrictLineReader.java | 2 +- .../{ => cloud}/utils/logger/LogLevel.java | 2 +- .../mogo/{ => cloud}/utils/logger/Logger.java | 2 +- .../utils/logger/LoggerPrinter.java | 2 +- .../mogo/{ => cloud}/utils/logger/Printer.java | 2 +- .../{ => cloud}/utils/logger/Settings.java | 2 +- gradle.properties | 18 +++++++++--------- .../core/SimpleLocationCorrectStrategy.java | 2 +- .../realtime/core/UploadInTimeHandler.java | 2 +- .../realtime/location/MogoRTKLocation.java | 2 +- .../mogo/realtime/socket/SocketHandler.java | 4 ++-- .../spi/RealTimeProviderDelegateManager.java | 2 +- .../mogo/realtime/spi/RealTimeProviderImp.java | 2 +- .../cloud/tanlu/api/MogoRoadSearchManager.java | 2 +- .../api/MoGoAiCloudTrafficLive.java | 2 +- .../trafficlive/core/TrafficLiveManager.java | 2 +- 38 files changed, 48 insertions(+), 57 deletions(-) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/DevicesUtils.java (69%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/GsonUtil.java (98%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/WorkThreadHandler.java (98%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/storage/SharedPrefsMgr.java (99%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/storage/lrucache/CacheUtil.java (98%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/storage/lrucache/DiskCacheManager.java (99%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/storage/lrucache/DiskLruCache.java (99%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/storage/lrucache/SecretUtil.java (96%) rename foudations/mogo-utils/src/main/java/com/mogo/{utils => cloud}/storage/lrucache/StrictLineReader.java (99%) rename foudations/mogo-utils/src/main/java/com/mogo/{ => cloud}/utils/logger/LogLevel.java (86%) rename foudations/mogo-utils/src/main/java/com/mogo/{ => cloud}/utils/logger/Logger.java (97%) rename foudations/mogo-utils/src/main/java/com/mogo/{ => cloud}/utils/logger/LoggerPrinter.java (99%) rename foudations/mogo-utils/src/main/java/com/mogo/{ => cloud}/utils/logger/Printer.java (94%) rename foudations/mogo-utils/src/main/java/com/mogo/{ => cloud}/utils/logger/Settings.java (96%) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8116b81..1563bc1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -26,7 +26,6 @@ diff --git a/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java b/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java index e8b9a9a..6d69f5b 100644 --- a/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java +++ b/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java @@ -7,7 +7,6 @@ import android.widget.TextView; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.utils.GsonUtil; /** * 查看配置信息 diff --git a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java index f6005ec..0ebb86d 100644 --- a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java +++ b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java @@ -3,7 +3,6 @@ package com.mogo.cloud; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.widget.Button; @@ -11,7 +10,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.realtime.entity.MogoSnapshotSetData; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; /** * @author liujing diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java index 2f4c1a8..94013bb 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java @@ -12,7 +12,7 @@ import com.mogo.cloud.live.socket.SocketMsgUtils; import com.mogo.cloud.live.socket.SocketRequestUtils; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.cloud.socket.MsgBody; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; /** diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java index 7f91da6..da778fb 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java @@ -7,7 +7,7 @@ import android.view.SurfaceView; import com.mogo.cloud.live.listener.ILiveProgressListener; import com.mogo.cloud.live.listener.ILiveRoomPersonListener; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import org.json.JSONObject; diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java index 8c397bf..453c659 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java @@ -9,7 +9,7 @@ import com.mogo.cloud.live.network.LiveApiServer; import com.mogo.cloud.network.NetConstants; import com.mogo.cloud.network.RetrofitFactory; import com.mogo.cloud.passport.MoGoAiCloudClient; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import java.util.HashMap; import java.util.Map; diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java index 612103f..2c152cb 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java @@ -8,18 +8,12 @@ import android.os.IBinder; import android.os.SystemClock; import android.util.Log; -import com.mogo.cloud.live.listener.ILiveRoomPersonListener; import com.mogo.cloud.live.listener.IYUVDataListener; import com.mogo.cloud.live.manager.CameraFrameManager; import com.mogo.cloud.live.manager.MoGoLiveManager; import com.mogo.cloud.live.manager.MoGoLivePushConfig; import com.mogo.cloud.live.utils.ByteUtils; -import com.mogo.utils.logger.Logger; - -import java.util.ArrayList; - -import im.zego.zegoexpress.constants.ZegoUpdateType; -import im.zego.zegoexpress.entity.ZegoUser; +import com.mogo.cloud.utils.logger.Logger; public class PushService extends Service diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt index a190f9d..b1cc00c 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt @@ -1,7 +1,7 @@ package com.mogo.cloud.network.interceptor import com.mogo.cloud.httpdns.MogoHttpDnsClient -import com.mogo.utils.logger.Logger +import com.mogo.cloud.utils.logger.Logger import okhttp3.Interceptor import okhttp3.Request import okhttp3.Response diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt index a043650..5a2b7bd 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt @@ -1,7 +1,7 @@ package com.mogo.cloud.network.interceptor import com.mogo.cloud.network.NetConstants.Companion.TAG -import com.mogo.utils.logger.Logger +import com.mogo.cloud.utils.logger.Logger import okhttp3.* import okio.Buffer import java.io.IOException diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt index 8139340..b741c0b 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt @@ -2,8 +2,8 @@ package com.mogo.cloud.network.interceptor import com.mogo.cloud.network.BaseData import com.mogo.cloud.passport.MoGoAiCloudClient -import com.mogo.utils.GsonUtil -import com.mogo.utils.logger.Logger +import com.mogo.cloud.GsonUtil +import com.mogo.cloud.utils.logger.Logger import okhttp3.Interceptor import okhttp3.MediaType import okhttp3.Response diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java index 6368385..dfe214c 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java @@ -7,8 +7,8 @@ import android.widget.Toast; import com.mogo.cloud.httpdns.MogoHttpDnsClient; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; -import com.mogo.utils.logger.LogLevel; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.LogLevel; +import com.mogo.cloud.utils.logger.Logger; import com.zhidao.thirdlogin.Environment; import com.zhidao.thirdlogin.LoginManager; import com.zhidao.thirdlogin.model.ThirdLoginParam; diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java index e64ac0d..66d0a61 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java @@ -4,7 +4,7 @@ import android.text.TextUtils; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; import com.mogo.cloud.httpdns.listener.IHttpDnsCurrentLocation; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; /** * SDK 中的参数 diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java index 1235712..5f50d5d 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java @@ -1,6 +1,6 @@ package com.mogo.cloud.passport; -import com.mogo.utils.storage.SharedPrefsMgr; +import com.mogo.cloud.storage.SharedPrefsMgr; /** * @author donghongyu diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java index ec07b65..2989400 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java @@ -8,8 +8,8 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.utils.GsonUtil; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.GsonUtil; +import com.mogo.cloud.utils.logger.Logger; import com.zhidao.locupload.Platform; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/DevicesUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/DevicesUtils.java similarity index 69% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/DevicesUtils.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/DevicesUtils.java index 810d3c6..4502563 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/DevicesUtils.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/DevicesUtils.java @@ -1,4 +1,4 @@ -package com.mogo.utils; +package com.mogo.cloud; /** * 设备信息 diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/GsonUtil.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/GsonUtil.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/GsonUtil.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/GsonUtil.java index 96fbbd5..d16a37a 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/GsonUtil.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/GsonUtil.java @@ -1,4 +1,4 @@ -package com.mogo.utils; +package com.mogo.cloud; import android.text.TextUtils; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/WorkThreadHandler.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/WorkThreadHandler.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/WorkThreadHandler.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/WorkThreadHandler.java index 3bde8ef..49b2d8c 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/WorkThreadHandler.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/WorkThreadHandler.java @@ -1,4 +1,4 @@ -package com.mogo.utils; +package com.mogo.cloud; import android.os.Handler; import android.os.HandlerThread; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/SharedPrefsMgr.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/SharedPrefsMgr.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/SharedPrefsMgr.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/SharedPrefsMgr.java index 97d439e..e6932ed 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/SharedPrefsMgr.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/SharedPrefsMgr.java @@ -1,4 +1,4 @@ -package com.mogo.utils.storage; +package com.mogo.cloud.storage; import android.content.Context; import android.content.SharedPreferences; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/CacheUtil.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/CacheUtil.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/CacheUtil.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/CacheUtil.java index ca7c761..f772375 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/CacheUtil.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/CacheUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.utils.storage.lrucache; +package com.mogo.cloud.storage.lrucache; import java.io.Closeable; import java.io.File; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskCacheManager.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/DiskCacheManager.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskCacheManager.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/DiskCacheManager.java index a37aa56..7d6a2bd 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskCacheManager.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/DiskCacheManager.java @@ -1,4 +1,4 @@ -package com.mogo.utils.storage.lrucache; +package com.mogo.cloud.storage.lrucache; import android.content.Context; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskLruCache.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/DiskLruCache.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskLruCache.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/DiskLruCache.java index 6e945af..e0db8ff 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskLruCache.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/DiskLruCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.utils.storage.lrucache; +package com.mogo.cloud.storage.lrucache; import java.io.BufferedWriter; import java.io.Closeable; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/SecretUtil.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/SecretUtil.java similarity index 96% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/SecretUtil.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/SecretUtil.java index dc833b9..5d6a71d 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/SecretUtil.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/SecretUtil.java @@ -1,4 +1,4 @@ -package com.mogo.utils.storage.lrucache; +package com.mogo.cloud.storage.lrucache; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/StrictLineReader.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/StrictLineReader.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/StrictLineReader.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/StrictLineReader.java index 5ee84ab..c382f0c 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/StrictLineReader.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/storage/lrucache/StrictLineReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.utils.storage.lrucache; +package com.mogo.cloud.storage.lrucache; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LogLevel.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/LogLevel.java similarity index 86% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LogLevel.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/LogLevel.java index 1296d3a..68b295a 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LogLevel.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/LogLevel.java @@ -1,5 +1,5 @@ -package com.mogo.utils.logger; +package com.mogo.cloud.utils.logger; public enum LogLevel { diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Logger.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Logger.java similarity index 97% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Logger.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Logger.java index 1527799..e9a7439 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Logger.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Logger.java @@ -1,5 +1,5 @@ -package com.mogo.utils.logger; +package com.mogo.cloud.utils.logger; public final class Logger { private static final Printer sPrinter = new LoggerPrinter(); diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/LoggerPrinter.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/LoggerPrinter.java index d822a53..e17b963 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/LoggerPrinter.java @@ -1,5 +1,5 @@ -package com.mogo.utils.logger; +package com.mogo.cloud.utils.logger; import android.text.TextUtils; import android.util.Log; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Printer.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Printer.java similarity index 94% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Printer.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Printer.java index 7bfec3f..f61944e 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Printer.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Printer.java @@ -1,5 +1,5 @@ -package com.mogo.utils.logger; +package com.mogo.cloud.utils.logger; public interface Printer { Settings init(LogLevel logLevel); diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Settings.java b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Settings.java similarity index 96% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Settings.java rename to foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Settings.java index af6ec22..7d4d75b 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Settings.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/cloud/utils/logger/Settings.java @@ -1,5 +1,5 @@ -package com.mogo.utils.logger; +package com.mogo.cloud.utils.logger; public final class Settings { private int methodCount = 2; diff --git a/gradle.properties b/gradle.properties index a96be15..8a3409b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.27-SNAPSHOT +MOGO_UTILS_VERSION=1.0.28-SNAPSHOT # 网络请求 -MOGO_NETWORK_VERSION=1.0.27-SNAPSHOT +MOGO_NETWORK_VERSION=1.0.28-SNAPSHOT # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.27-SNAPSHOT +MOGO_HTTPDNS_VERSION=1.0.28-SNAPSHOT # 鉴权 -MOGO_PASSPORT_VERSION=1.0.27-SNAPSHOT +MOGO_PASSPORT_VERSION=1.0.28-SNAPSHOT # 常链接 -MOGO_SOCKET_VERSION=1.0.27-SNAPSHOT +MOGO_SOCKET_VERSION=1.0.28-SNAPSHOT # 数据采集 -MOGO_REALTIME_VERSION=1.0.27-SNAPSHOT +MOGO_REALTIME_VERSION=1.0.28-SNAPSHOT # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.0.27-SNAPSHOT +MOGO_TANLU_VERSION=1.0.28-SNAPSHOT # 直播推流 -MOGO_LIVE_VERSION=1.0.27-SNAPSHOT +MOGO_LIVE_VERSION=1.0.28-SNAPSHOT # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.27-SNAPSHOT +MOGO_TRAFFICLIVE_VERSION=1.0.28-SNAPSHOT diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/SimpleLocationCorrectStrategy.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/SimpleLocationCorrectStrategy.java index ac806c5..e701d11 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/SimpleLocationCorrectStrategy.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/SimpleLocationCorrectStrategy.java @@ -7,7 +7,7 @@ import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.realtime.entity.CloudLocationInfo; import com.mogo.realtime.util.MogoLatLng; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import java.util.ArrayList; import java.util.List; diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java index 9ed7490..5ab7013 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java @@ -4,7 +4,7 @@ import android.os.Handler; import android.os.Message; import android.support.annotation.Keep; -import com.mogo.utils.WorkThreadHandler; +import com.mogo.cloud.WorkThreadHandler; import static com.mogo.realtime.constant.RealTimeConstant.TAG; diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/location/MogoRTKLocation.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/location/MogoRTKLocation.java index 5f3c7e3..d7eb6d0 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/location/MogoRTKLocation.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/location/MogoRTKLocation.java @@ -9,7 +9,7 @@ import android.os.Bundle; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.realtime.entity.CloudLocationInfo; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import java.util.ArrayList; import java.util.List; diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java index 4ede3a3..a3159bf 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java @@ -16,8 +16,8 @@ import com.mogo.realtime.entity.MogoSnapshotSetData; import com.mogo.realtime.entity.OnePerSecondSendContent; import com.mogo.realtime.spi.RealTimeProviderImp; import com.mogo.realtime.util.MortonCode; -import com.mogo.utils.GsonUtil; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.GsonUtil; +import com.mogo.cloud.utils.logger.Logger; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; import java.util.ArrayList; diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java index 33096ad..7cfd229 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java @@ -3,7 +3,7 @@ package com.mogo.realtime.spi; import com.elegant.spi.AbstractDelegateManager; import com.mogo.cloud.passport.MoGoAiCloudClient; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import com.mogo.realtime.api.IRealTimeProvider; /** diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java index 57c52ac..b00286b 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java @@ -3,7 +3,7 @@ package com.mogo.realtime.spi; import com.mogo.realtime.api.IRealTimeProvider; import com.mogo.realtime.entity.ADASRecognizedResult; import com.mogo.realtime.entity.CloudLocationInfo; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import java.util.List; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java index 801e907..008b6d1 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java @@ -11,7 +11,7 @@ import com.mogo.cloud.tanlu.bean.RoadInfoRequest; import com.mogo.cloud.tanlu.bean.RoadInfos; import com.mogo.cloud.tanlu.constant.HttpConstant; import com.mogo.cloud.tanlu.net.TanluApiService; -import com.mogo.utils.GsonUtil; +import com.mogo.cloud.GsonUtil; import java.util.HashMap; import java.util.Map; diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java index c867080..2806e71 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java @@ -4,7 +4,7 @@ import android.app.Application; import android.view.SurfaceView; import com.mogo.cloud.trafficlive.core.TrafficLiveManager; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import static com.mogo.cloud.trafficlive.constant.TrafficLiveConstant.TAG; diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java index fe6d851..ab5d0bd 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java @@ -11,7 +11,7 @@ import com.mogo.cloud.live.manager.MoGoLiveManager; import com.mogo.cloud.live.manager.RequestLiveManager; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.trafficlive.api.ITrafficLiveCallBack; -import com.mogo.utils.logger.Logger; +import com.mogo.cloud.utils.logger.Logger; import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_CLOSE; import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_OPEN;