发布新版本1.0.28-SNAPSHOT

修改utils包结构

.idea/gradle.xml

@@ -26,7 +26,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

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;
 
 /**
  * 查看配置信息

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

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;
 
 
 /**

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;
 

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;

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

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

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

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

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;

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 中的参数

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

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;

foudations/mogo-utils/src/main/java/com/mogo/cloud/DevicesUtils.java

@@ -1,4 +1,4 @@
-package com.mogo.utils;
+package com.mogo.cloud;
 
 /**
  * 设备信息

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;
 

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;

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;

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;

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;
 

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;

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;

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;

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 {
 

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();

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;

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);

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;

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

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;

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;
 

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;

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;

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;
 
 /**

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;
 

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;

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;
 

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;