模块代码迁移

将foudations包下的mogo-utils模块下的代码迁移到core包下的mogo-core-utils模块下注：远程依赖库网约车模块目前使用的是foudations包下的mogo-utils模块下Logger, 目前看项目中无该网约车模块功能，暂时注释掉该模块
2021-12-28 14:52:30 +08:00
parent 4b93315959
commit 8682f9bcb2
379 changed files with 1423 additions and 2705 deletions
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -42,8 +42,13 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
+import com.mogo.eagle.core.utilcode.util.LaunchUtils;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.navi.IMogoAimlessModeListener;
@@ -82,11 +87,6 @@ import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.LaunchUtils;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.glide.GlideApp;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.storage.SharedPrefsMgr;

 import java.util.HashMap;
 import java.util.Map;
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -11,6 +11,8 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.network.utils.digest.DigestUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.constants.HostConst;
 import com.mogo.module.extensions.R;
@@ -28,8 +30,6 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.service.network.IMogoNetwork;
 import com.mogo.service.statusmanager.IMogoMsgCenter;
 import com.mogo.service.statusmanager.IMogoMsgCenterListener;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.storage.SharedPrefsMgr;

 import java.util.Map;

--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java
@@ -13,9 +13,9 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;

+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.widget.LiveRoundLayout;
 import com.mogo.module.extensions.R;
-import com.mogo.utils.logger.Logger;
 import com.tencent.rtmp.ITXLivePlayListener;
 import com.tencent.rtmp.TXLiveConstants;
 import com.tencent.rtmp.TXLivePlayConfig;
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java
@@ -8,11 +8,11 @@ import androidx.annotation.Nullable;

 import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.live.impl.AbsCameraScenario;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
-import com.mogo.utils.logger.Logger;

 /**
 * 路边摄像头直播控制  V2XPushLiveCarScenario
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
@@ -10,11 +10,11 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;

 import com.mogo.cloud.socket.entity.SocketDownData;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.live.impl.ICameraWindow;
 import com.mogo.service.imageloader.MogoImageView;
-import com.mogo.utils.logger.Logger;


 /**
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/AnimNavInfoView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/AnimNavInfoView.java
@@ -13,11 +13,11 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.Group;

+import com.mogo.eagle.core.utilcode.util.LaunchUtils;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.view.OnPreventFastClickListener;
 import com.mogo.module.extensions.R;
-import com.mogo.utils.LaunchUtils;

 import java.util.HashMap;
 import java.util.Map;
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/TopView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/TopView.java
@@ -5,10 +5,10 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;

-import com.mogo.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+

 /**
 * 顶部view封装，用于处理手指滑动
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
@@ -8,6 +8,7 @@ import android.util.Log;

 import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
@@ -19,7 +20,6 @@ import com.mogo.module.extensions.live.CameraWindow3DAdapter;
 import com.mogo.module.extensions.live.PushDataType;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
-import com.mogo.utils.logger.Logger;


 /**
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
@@ -9,11 +9,11 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;

+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.bean.BottomLayerViewWrapper;
 import com.mogo.service.windowview.IMogoEntranceViewListener;
-import com.mogo.utils.logger.Logger;

 import java.util.ArrayList;
 import java.util.Iterator;
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java
@@ -3,7 +3,7 @@ package com.mogo.module.extensions.utils;
 import android.view.View;

 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;

 /**
 * 没有地图场景下，topView底层蒙版帮助类，因为有两个地方涉及到蒙版的显示隐藏{@link TopViewAnimHelper}和{@link TopViewNoLinkageAnimHelper}
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -10,6 +10,7 @@ import android.widget.TextView;

 import androidx.constraintlayout.widget.ConstraintLayout;

+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.map.MapCenterPointStrategy;
@@ -18,7 +19,6 @@ import com.mogo.module.extensions.ExtensionsModuleConst;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.navi.TopView;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
-import com.mogo.utils.logger.Logger;

 import java.util.ArrayList;
 import java.util.List;
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java
@@ -7,6 +7,7 @@ import android.view.ViewGroup.LayoutParams;

 import androidx.constraintlayout.widget.ConstraintLayout;

+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.map.MapCenterPointStrategy;
@@ -15,10 +16,6 @@ import com.mogo.module.extensions.ExtensionsModuleConst;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.navi.TopView;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
-import com.mogo.utils.logger.Logger;
-
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;


--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/VerticalTrafficLightView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/VerticalTrafficLightView.java
@@ -13,9 +13,9 @@ import androidx.annotation.IntDef;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;

+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.module.common.constants.TrafficLightConst;
 import com.mogo.module.extensions.R;
-import com.mogo.utils.logger.Logger;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/WeatherModel.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/WeatherModel.java
@@ -9,10 +9,11 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;

+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.util.ThreadPoolService;
+
 import androidx.annotation.NonNull;

-import com.mogo.utils.ThreadPoolService;
-import com.mogo.utils.logger.Logger;

 /**
 * @author congtaowang
@@ -79,7 +80,7 @@ public class WeatherModel {


    private void startNewThreadToQuery() {
-        ThreadPoolService.execute( new Runnable() {
+        ThreadPoolService.execute(new Runnable() {
            @Override
            public void run() {
                if ( mContentResolver == null ) {