From 8682f9bcb283ace5df81e281a441610da5e22c93 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Tue, 28 Dec 2021 14:52:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将foudations包下的mogo-utils模块下的代码迁移到core包下的mogo-core-utils模块下 注：远程依赖库网约车模块目前使用的是foudations包下的mogo-utils模块下Logger, 目前看项目中无该网约车模块功能，暂时注释掉该模块 --- .../com/mogo/launcher/MogoApplication.java | 10 +- .../check/VehicleMonitoringManager.kt | 2 +- .../logcatch/MogoLogCatchManager.kt | 4 +- .../function/hmi/notification/WarningFloat.kt | 4 +- .../notification/WarningFloatWindowHelper.kt | 5 +- .../hmi/notification/anim/DefaultAnimator.kt | 2 +- .../receiver/NoticeNormalBroadcastReceiver.kt | 4 - .../V2XLimitingVelocityBroadcastReceiver.kt | 2 +- .../V2XTrafficLightBroadcastReceiver.kt | 2 +- .../receiver/V2XWarningBroadcastReceiver.kt | 2 +- .../core/function/hmi/ui/MoGoHmiFragment.kt | 2 +- .../function/hmi/ui/camera/CameraListView.kt | 2 +- .../hmi/ui/notice/NoticeBannerView.java | 6 +- .../hmi/ui/notice/NoticeCheckDialog.kt | 12 +- .../hmi/ui/notice/NoticeNormalBannerView.java | 8 +- .../hmi/ui/notice/NoticeTrafficDialog.java | 8 +- .../hmi/ui/setting/DebugSettingView.kt | 11 +- .../hmi/ui/widget/AutoPilotStatusView.kt | 2 +- .../function/hmi/ui/widget/SpeedPanelView.kt | 12 +- .../hmi/ui/widget/TrafficLightView.kt | 2 +- .../hmi/ui/widget/V2XNotificationView.kt | 2 +- .../function/hmi/ui/widget/V2XWarningView.kt | 4 +- .../hmi/ui/widget/VipIdentificationView.kt | 2 +- .../function/main/MainLauncherActivity.java | 6 +- .../function/main/MainMoGoApplication.java | 6 +- .../function/monitoring/CronTaskManager.kt | 3 +- .../mogo-core-function-notice/build.gradle | 2 - .../function/notice/NoticeSocketManager.java | 2 +- .../fragment/MessageHistoryFragment.java | 2 +- .../notice/network/NoticeNetWorkManager.java | 2 +- .../notice/repository/PushRepository.kt | 2 +- .../test/TestNoticeBroadcastReceiver.kt | 2 +- .../function/notice/utils/AnimatorUtils.kt | 2 +- .../core/function/notice/view/FloatView.kt | 6 +- .../core/function/obu/mogo/MoGoObuProvider.kt | 2 +- .../obu/mogo/MogoPrivateObuManager.kt | 2 +- .../function/smp/SmallMapDirectionView.java | 2 +- .../core/function/smp/SmallMapFragment.java | 2 +- .../redlightwarning/RedLightWarningManager.kt | 2 +- .../v2x/speedlimit/SpeedLimitDataManager.java | 4 +- .../core/MogoTrafficLightManager.kt | 2 +- .../core/function/v2x/vip/VipCarManager.kt | 4 +- core/mogo-core-utils/build.gradle | 17 +- .../utilcode/mogo}/glide/BaseGlideModule.java | 8 +- .../mogo}/glide/GlideBlurTransformation.java | 8 +- .../glide/GlideRoundedCornersTransform.java | 8 +- .../permissions/PermissionsDialogUtils.java | 3 +- .../utilcode/mogo}/sqlite/SQLBaseDao.java | 4 +- .../utilcode/mogo}/sqlite/SQLDaoFactory.kt | 2 + .../core/utilcode/mogo}/sqlite/SQLIDao.java | 2 +- .../mogo}/sqlite/annotation/DbDatabase.kt | 0 .../mogo}/sqlite/annotation/DbField.kt | 0 .../mogo}/sqlite/annotation/DbTable.kt | 0 .../mogo}/sqlite/proxy/BaseDaoProxyLog.kt | 2 +- .../mogo}/storage/SharedPrefsMgr.java | 6 +- .../mogo}/storage/lrucache/CacheUtil.java | 2 +- .../storage/lrucache/DiskCacheManager.java | 2 +- .../mogo}/storage/lrucache/DiskLruCache.java | 2 +- .../mogo}/storage/lrucache/SecretUtil.java | 2 +- .../storage/lrucache/StrictLineReader.java | 2 +- .../util}/ActivityLifecycleManager.java | 2 +- .../eagle/core/utilcode/util/AppUtils.java | 131 +++++ .../core/utilcode/util}/AssetsUtils.java | 3 +- .../core/utilcode/util}/BitmapHelper.java | 6 +- .../eagle/core/utilcode/util/ColorUtils.java | 160 ++++++ .../core/utilcode/util}/CommonUtils.java | 18 +- .../core/utilcode/util}/CountDownTimer.java | 2 +- .../core/utilcode/util}/DateTimeUtils.java | 2 +- .../core/utilcode/util}/DeviceIdUtils.java | 6 +- .../eagle/core/utilcode/util/FileUtils.java | 394 +++++++++++++++ .../eagle/core/utilcode/util}/IOUtils.java | 6 +- .../core/utilcode/util}/LaunchUtils.java | 2 +- .../core/utilcode/util}/MatcherUtils.java | 2 +- .../core/utilcode/util/NetworkUtils.java | 115 +++++ .../core/utilcode/util/ProcessUtils.java | 78 ++- .../utilcode/util}/SoftKeyBoardJobber.java | 2 +- .../utilcode/util}/ThreadPoolService.java | 2 +- .../core/utilcode/util}/UiThreadHandler.java | 2 +- .../eagle/core/utilcode/util/ViewUtils.java | 29 ++ .../core/utilcode/util}/WindowUtils.java | 2 +- .../mogo-aicloud-services-sdk/build.gradle | 4 +- .../aicloud/services/httpdns/MogoHttpDns.java | 2 +- .../MogoLocationInfoServices.java | 2 +- .../socket/MogoAiCloudSocketManager.java | 2 +- .../mogo-base-websocket-sdk/build.gradle | 4 +- .../base/websocket/WebSocketDnsManager.java | 1 - .../websocket/WebSocketHandlerThread.java | 1 - .../mogo/base/websocket/WebSocketManager.java | 1 - foudations/mogo-commons/build.gradle | 4 +- .../com/mogo/commons/AbsMogoApplication.java | 4 +- .../commons/crash/FinalizeCrashFixer.java | 3 +- .../java/com/mogo/commons/device/Devices.java | 4 +- .../com/mogo/commons/mvp/MvpActivity.java | 3 +- .../com/mogo/commons/network/ParamsUtil.java | 8 +- .../java/com/mogo/commons/network/Utils.java | 2 +- .../com/mogo/commons/storage/SpStorage.java | 2 +- .../java/com/mogo/commons/voice/AIAssist.java | 2 +- .../java/com/mogo/utils/ActivityStack.java | 84 ---- .../main/java/com/mogo/utils/AppUtils.java | 149 ------ .../main/java/com/mogo/utils/ArrayUtils.java | 464 ------------------ .../main/java/com/mogo/utils/ColorUtils.java | 170 ------- .../main/java/com/mogo/utils/FileUtils.java | 412 ---------------- .../main/java/com/mogo/utils/MapUtils.java | 25 - .../java/com/mogo/utils/NetworkUtils.java | 127 ----- .../com/mogo/utils/OnItemClickedListener.java | 12 - .../java/com/mogo/utils/ProcessUtils.java | 86 ---- .../java/com/mogo/utils/ValidateUtils.java | 10 - .../main/java/com/mogo/utils/ViewUtils.java | 42 -- .../java/com/mogo/utils/logger/LogLevel.java | 24 - .../java/com/mogo/utils/logger/Logger.java | 57 --- .../com/mogo/utils/logger/LoggerPrinter.java | 261 ---------- .../java/com/mogo/utils/logger/Printer.java | 26 - .../java/com/mogo/utils/logger/Settings.java | 52 -- .../com/mogo/utils/tts/AndroidTTSPlayer.java | 89 ---- .../java/com/mogo/utils/tts/TTSPlayer.java | 14 - .../com/mogo/utils/tts/TTSPlayerFactory.java | 16 - libraries/map-autonavi/build.gradle | 4 +- .../map/impl/automap/navi/AutoNaviClient.java | 2 +- .../impl/automap/navi/AutoNaviReceiver.java | 2 +- libraries/map-custom/build.gradle | 4 +- .../impl/custom/AMapMarkerClickHandler.java | 2 +- .../mogo/map/impl/custom/AMapViewWrapper.java | 6 +- .../com/mogo/map/impl/custom/AMapWrapper.java | 2 +- .../map/impl/custom/CustomMapApiBuilder.java | 2 +- .../impl/custom/location/ALocationClient.java | 4 +- .../impl/custom/marker/AMapMarkerWrapper.java | 2 +- .../mogo/map/impl/custom/navi/NaviClient.java | 4 +- .../impl/custom/search/InputtipsSearch.java | 2 +- .../impl/custom/search/PoiSearchClient.java | 2 +- .../custom/utils/PointInterpolatorUtil.java | 2 +- libraries/mogo-map-api/build.gradle | 5 +- .../java/com/mogo/map/MogoBaseMapView.java | 2 - .../src/main/java/com/mogo/map/MogoMap.java | 2 +- libraries/mogo-map/build.gradle | 4 +- .../com/mogo/map/MogoMapDelegateFactory.java | 3 +- .../com/mogo/map/MogoMapUIController.java | 2 +- .../main/java/com/mogo/map/MogoMapView.java | 4 +- modules/mogo-module-adas/build.gradle | 4 +- .../module/adas/AdasAutoPilotManager.java | 2 +- .../mogo/module/adas/AdasEventManager.java | 2 +- .../com/mogo/module/adas/AdasProvider.java | 4 +- .../module/adas/OnAdasListenerAdapter.java | 2 +- .../module/adas/model/AdasServiceModel.java | 2 +- .../adas/overlay/LineOverlayManager.java | 4 +- .../AdasTestPanelBroadCastReceiver.java | 3 +- .../adas/receiver/TestAdasFuncManager.java | 2 +- .../adas/view/DispatchRemindDialog.java | 2 +- modules/mogo-module-carchatting/build.gradle | 4 +- .../adapter/VehicleTeamAdapter.java | 3 +- .../module/carchatting/biz/CallChatCenter.kt | 2 +- .../module/carchatting/biz/CallChatManager.kt | 2 +- .../invoke/CarsChattingProviderImpl.kt | 2 +- .../carchatting/view/CallingWindowManager.kt | 6 +- .../module/carchatting/view/MapViewManager.kt | 2 +- .../view/TeamInvitationWindowManager.kt | 2 +- .../module/carchatting/view/UserDialog.kt | 5 +- .../carchatting/view/UserWindowManager.kt | 3 +- .../module/carchatting/view/VrModeHelper.kt | 2 +- .../module/carchatting/voice/VoiceUtil.kt | 2 +- modules/mogo-module-chat/build.gradle | 4 +- modules/mogo-module-common/build.gradle | 4 +- .../mogo/module/common/api/CallChatApi.java | 2 +- ...napShotMockTestPanelBroadCastReceiver.java | 2 +- .../module/common/dialog/BaseFloatDialog.java | 2 +- .../common/drawer/IdentifyDataDrawer.java | 2 +- .../module/common/drawer/MarkerDrawer.java | 2 +- .../module/common/drawer/OnlineCarDrawer.java | 2 +- .../common/drawer/RoadConditionDrawer.java | 2 +- .../common/drawer/SnapshotSetDataDrawer.java | 4 +- .../common/drawer/TrafficMarkerDrawer.kt | 2 +- .../common/drawer/V2XWarnDataDrawer.java | 6 +- .../drawer/marker/MapCameraInfoView.java | 13 +- .../drawer/marker/MapMarkerBaseView.java | 8 +- .../drawer/marker/MapMarkerInfoView.java | 2 +- .../common/drawer/marker/MapMarkerView.java | 2 +- .../RoadConditionInfoWindow3DAdapter.java | 2 +- .../common/error/ARoutDegradeService.java | 2 +- .../common/map/CustomNaviInterrupter.java | 3 +- .../common/map/MapCenterPointStrategy.java | 4 +- .../module/common/map/MyLocationUtil.java | 9 +- .../module/common/utils/CloudPoiManager.java | 4 +- .../com/mogo/module/common/wm/DialogImpl.java | 2 +- modules/mogo-module-extensions/build.gradle | 4 +- .../extensions/entrance/EntranceFragment.java | 10 +- .../entrance/EntrancePresenter.java | 4 +- .../live/CameraLiveGSYVideoView.java | 2 +- .../extensions/live/CameraLiveManager.java | 2 +- .../extensions/live/PushCameraLiveWindow.java | 2 +- .../extensions/navi/AnimNavInfoView.java | 2 +- .../mogo/module/extensions/navi/TopView.java | 4 +- .../utils/CameraLiveNoticeHelper.java | 2 +- .../extensions/utils/EntranceViewHolder.java | 2 +- .../utils/NoMapTopViewShaderHelper.java | 2 +- .../extensions/utils/TopViewAnimHelper.java | 2 +- .../utils/TopViewNoLinkageAnimHelper.java | 5 +- .../view/VerticalTrafficLightView.java | 2 +- .../extensions/weather/WeatherModel.java | 7 +- modules/mogo-module-main/build.gradle | 4 +- .../mogo/module/main/EventDispatchCenter.java | 2 +- .../com/mogo/module/main/MainActivity.java | 6 +- .../com/mogo/module/main/MogoCardManager.java | 2 +- .../com/mogo/module/main/SchemeIntent.java | 6 +- .../module/main/cards/MogoModulesManager.java | 2 +- .../main/delaycheck/DelayCheckUtil.java | 4 +- .../module/main/service/MogoMainService.java | 4 +- .../main/windowview/FloatingViewHandler.java | 3 +- .../main/windowview/IWindowViewHandler.java | 3 +- modules/mogo-module-map/build.gradle | 4 +- .../mogo/module/map/MapBroadCastHelper.java | 3 +- .../module/map/MapControlCommandHandler.java | 2 +- .../java/com/mogo/module/map/MapFragment.java | 2 +- .../com/mogo/module/map/MapPresenter.java | 4 +- modules/mogo-module-push/build.gradle | 4 +- modules/mogo-module-service/build.gradle | 2 - .../module/service/MarkerServiceHandler.java | 2 +- .../module/service/MogoServiceProvider.java | 4 +- .../com/mogo/module/service/MogoServices.java | 4 +- .../module/service/StatusChangedAdapter.java | 4 +- .../actionmanager/MogoActionHandler.java | 2 +- .../autopilot/AutoPilotRemoteController.java | 2 +- .../service/datamanager/MogoDataHandler.java | 2 +- .../dispatch/DispatchAirportDialog.java | 2 +- .../dispatch/DispatchAutoPilotManager.java | 2 +- .../service/dispatch/DispatchCarsDialog.java | 2 +- .../dispatch/DispatchDialogManager.java | 2 +- .../DispatchTestPanelBroadCastReceiver.java | 3 +- .../service/handler/MainLooperHandler.java | 2 +- .../handler/RefreshWorkThreadHandler.java | 5 +- .../intent/ADASStatusIntentHandler.java | 2 +- .../intent/AccStatusIntentHandler.java | 2 +- .../intent/AppOperationIntentHandler.java | 2 +- .../service/intent/EmptyIntentHandler.java | 2 - .../service/intent/MockIntentHandler.java | 4 +- .../intent/MogoControllerIntentHandler.java | 4 +- .../service/intent/MyLocationHandler.java | 2 +- .../intent/NetworkChangedIntentHandler.java | 4 +- .../intent/OnlineCarSearchIntentHandler.java | 2 +- .../WholeVoiceCommandIntentHandler.java | 2 +- .../launchercard/LauncherCardRefresher.java | 8 +- .../service/location/MogoRTKLocation.java | 2 +- .../service/marker/MapMarkerManager.java | 8 +- .../service/marker/MogoMarkerServiceImpl.java | 2 +- .../module/service/network/RefreshModel.java | 2 +- .../panel/OnlineCarListPanelProvider.java | 2 +- .../panel/OnlineCarPanelAdapter.java | 4 +- .../panel/OnlineCarPanelPresenter.java | 2 +- .../service/receiver/AccStatusReceiver.java | 2 +- .../routeoverlay/RouteOverlayDrawer.java | 2 +- .../service/status/EnvStatusManager.java | 6 +- .../MogoRefreshStrategyController.java | 2 +- .../timedelay/TimeDelayUploadManager.java | 2 +- .../service/unwake/GlobalUnwakeManager.java | 2 +- .../utils/SimpleLocationCorrectStrategy.java | 2 +- .../service/vrmode/VrModeController.java | 2 +- modules/mogo-module-share/build.gradle | 4 +- .../module/share/MogoTanluApiProvider.java | 2 +- .../com/mogo/module/share/ShareControl.java | 6 +- .../module/share/StrategyShareProvider.kt | 8 +- .../module/share/TanluCardViewProvider.java | 2 +- .../com/mogo/module/share/TanluManager.java | 6 +- .../com/mogo/module/share/VoiceCmdService.kt | 2 +- .../module/share/adapter/ShareBtnAdapter.kt | 2 +- .../share/dialog/GridFixableShareDialog.kt | 2 +- .../share/dialog/LaucherShareDialog.java | 2 +- .../module/share/manager/GridBtnManager.kt | 6 +- .../module/share/manager/SeekHelpManager.kt | 4 +- .../share/manager/TrafficUploadManager.kt | 2 +- .../mogo/module/share/manager/UploadHelper.kt | 6 +- .../mogo/module/share/net/TanluModelData.java | 2 +- .../module/share/net/TrafficModelData.java | 2 +- .../receiver/SearchTrafficInfoReceiver.kt | 2 +- .../share/service/CarCorderController.kt | 4 +- .../mogo/module/share/service/MainService.kt | 4 +- .../share/service/MainServiceController.kt | 2 +- .../AccidentStrategyReceiver.kt | 2 +- .../share/strategyreceiver/BlockStrategy.kt | 5 +- modules/mogo-module-v2x/build.gradle | 2 - .../com/mogo/module/v2x/V2XDemoManager.java | 2 +- .../v2x/V2XEventPanelModuleProvider.java | 2 +- .../com/mogo/module/v2x/V2XMarkerService.java | 2 +- .../mogo/module/v2x/V2XModuleProvider.java | 4 +- .../com/mogo/module/v2x/V2XSocketManager.java | 2 +- .../v2x/adapter/V2XShareEventAdapter.java | 2 +- .../adapter/V2XSurroundingDetailAdapter.java | 4 +- .../v2x/adapter/holder/V2XBaseViewHolder.java | 2 +- .../holder/V2XHistoryBaseViewHolder.java | 2 +- .../v2x/adapter/holder/V2XIllegalParkVH.java | 2 +- .../adapter/holder/V2XOtherSeekHelpVH.java | 2 +- .../v2x/adapter/holder/V2XRoadEventVH.java | 8 +- .../V2XScenarioHistoryIllegalParkVH.java | 2 +- .../holder/V2XScenarioHistoryRoadEventVH.java | 2 +- .../mogo/module/v2x/alarm/V2XAlarmServer.java | 6 +- .../module/v2x/alarm/V2XCalculateServer.java | 2 +- .../v2x/fragment/V2XEventPanelFragment.kt | 2 +- .../fragment/V2XScenarioHistoryFragment.java | 2 +- .../v2x/fragment/V2XSurroundingFragment.java | 2 +- .../v2x/listener/V2XLocationListener.java | 2 +- .../v2x/listener/V2XMarkerClickListener.java | 2 +- .../listener/V2XMessageListener_401003.java | 2 +- .../listener/V2XMessageListener_401005.java | 2 +- .../listener/V2XMessageListener_401006.java | 2 +- .../listener/V2XMessageListener_401007.java | 2 +- .../listener/V2XMessageListener_401009.java | 2 +- .../listener/V2XMessageListener_401010.java | 2 +- .../listener/V2XMessageListener_401012.java | 2 +- .../listener/V2XMessageListener_402000.java | 2 +- .../v2x/listener/V2XMessageListener_404000.kt | 2 +- .../manager/impl/MoGoV2XMarkerManager.java | 4 +- .../module/v2x/marker/V2XMarkerCarInfoView.kt | 2 +- .../module/v2x/marker/V2XMarkerCarView.kt | 2 +- .../v2x/marker/V2XMarkerRoadEventView.kt | 2 +- .../module/v2x/network/V2XRefreshModel.java | 2 +- .../v2x/overlay/V2XOptimalRouteOverlay.java | 2 +- .../presenter/SurroundingEventPresenter.java | 2 +- .../receiver/TestPanelBroadcastReceiver.java | 2 +- .../v2x/scenario/impl/AbsV2XScenario.java | 2 +- .../v2x/scenario/impl/V2XScenarioManager.java | 2 +- .../v2x/scenario/scene/V2XBasWindow.java | 2 +- .../scene/animation/V2XAnimationScenario.java | 2 +- .../scene/animation/V2XAnimationWindow.java | 2 +- .../fatigue/V2XFatigueDrivingScenario.java | 2 +- .../fatigue/V2XFatigueDrivingWindow.java | 1 - .../scene/help/V2XCarForHelpScenario.java | 4 +- .../scene/help/V2XSeekHelpDialog.java | 2 +- .../scene/livecar/V2XRoadLiveCarScenario.java | 2 +- .../scene/livecar/V2XVoiceCallLiveBiz.java | 2 +- .../livecar/V2XVoiceCallLiveCarWindow.java | 2 +- .../livecar/V2XVoiceCallLiveScenario.java | 2 +- .../livecar/V2XVoiceCrossRoadLiveWindow.java | 2 +- .../scene/park/V2XIllegalParkMarker.java | 2 +- .../scene/push/V2XPushEventScenario.java | 2 +- .../scene/push/V2XPushEventWindow.java | 2 +- .../scene/road/V2XRoadEventScenario.java | 2 +- .../scene/road/V2XRoadVideoWindow.java | 2 +- .../route/V2XOptimalRouteVREventMarker.java | 2 +- .../route/V2XOptimalRouteVREventScenario.java | 2 +- .../route/V2XOptimalRouteVREventWindow.java | 2 +- .../scene/seek/V2XSeekHelpWindow.java | 1 - .../scene/ugc/V2XEventUgcScenario.java | 2 +- .../scenario/scene/ugc/V2XEventUgcWindow.java | 2 +- .../scene/warning/V2XWarningMarker.java | 2 +- .../com/mogo/module/v2x/utils/ADASUtils.java | 4 +- .../mogo/module/v2x/utils/ChartingUtil.java | 3 +- .../module/v2x/utils/FatigueDrivingUtils.java | 4 +- .../mogo/module/v2x/utils/LocationUtils.java | 2 +- .../mogo/module/v2x/utils/MarkerUtils.java | 2 +- .../mogo/module/v2x/utils/V2XSQLiteUtils.java | 4 +- .../com/mogo/module/v2x/utils/V2XUtils.java | 2 +- .../module/v2x/view/CarZegoLiveVideoView.java | 2 +- .../module/v2x/view/SimpleCoverVideoPlayer.kt | 2 +- .../module/v2x/view/V2XCarLiveVideoView.java | 2 +- .../v2x/view/V2XCrossRoadVideoView.java | 2 +- .../module/v2x/view/V2XLiveGSYVideoView.java | 2 +- .../mogo/module/v2x/voice/V2XVoiceManager.kt | 2 +- services/mogo-service/build.gradle | 4 +- .../mogo/service/impl/MogoServiceApis.java | 2 +- .../service/impl/adas/MogoADASController.java | 4 +- .../impl/adas/SubscribeImplTemporary.java | 2 +- .../location/MogoLocationInfoService.java | 2 +- .../cloud/passport/MogoPassportManager.java | 2 +- .../impl/cloud/socket/MogoSocketManager.java | 2 +- .../cloud/socket/MogoWebSocketManager.java | 2 +- .../impl/fragmentmanager/FragmentStack.java | 2 +- .../imageloader/glide/GlideImageLoader.java | 2 +- .../impl/statusmanager/MogoStatusManager.java | 2 +- settings.gradle | 1 - test/crashreport-bugly/build.gradle | 4 +- .../bugly/BuglyCrashReportProvider.java | 4 +- test/crashreport-noop/build.gradle | 4 +- .../noop/NoopCrashReportProvider.java | 2 +- test/crashreport-upgrade/build.gradle | 4 +- .../upgrade/UpgradeReportProvider.java | 4 +- test/crashreport/build.gradle | 4 +- tts/tts-di/build.gradle | 4 +- .../java/com/mogo/tts/noop/TTSManager.java | 2 +- tts/tts-pad/build.gradle | 2 - .../main/java/com/mogo/tts/pad/PadTTS.java | 2 +- tts/tts-zhi/build.gradle | 4 +- .../main/java/com/mogo/tts/pad/ZhiTTS.java | 5 +- 379 files changed, 1423 insertions(+), 2705 deletions(-) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/glide/BaseGlideModule.java (84%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/glide/GlideBlurTransformation.java (96%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/glide/GlideRoundedCornersTransform.java (98%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/permissions/PermissionsDialogUtils.java (96%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/sqlite/SQLBaseDao.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/sqlite/SQLDaoFactory.kt (95%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/sqlite/SQLIDao.java (96%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/sqlite/annotation/DbDatabase.kt (100%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/sqlite/annotation/DbField.kt (100%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/sqlite/annotation/DbTable.kt (100%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/sqlite/proxy/BaseDaoProxyLog.kt (96%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/storage/SharedPrefsMgr.java (98%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/storage/lrucache/CacheUtil.java (97%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/storage/lrucache/DiskCacheManager.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/storage/lrucache/DiskLruCache.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/storage/lrucache/SecretUtil.java (94%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/storage/lrucache/StrictLineReader.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/ActivityLifecycleManager.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/AssetsUtils.java (95%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/BitmapHelper.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/CommonUtils.java (98%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/CountDownTimer.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/DateTimeUtils.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/DeviceIdUtils.java (97%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/IOUtils.java (96%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/LaunchUtils.java (94%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/MatcherUtils.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/SoftKeyBoardJobber.java (99%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/ThreadPoolService.java (96%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/UiThreadHandler.java (96%) rename {foudations/mogo-utils/src/main/java/com/mogo/utils => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/WindowUtils.java (97%) delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/ActivityStack.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/ArrayUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/ColorUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/FileUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/MapUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/NetworkUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/OnItemClickedListener.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/ProcessUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/ValidateUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/ViewUtils.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LogLevel.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Logger.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/logger/LoggerPrinter.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Printer.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/logger/Settings.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/tts/AndroidTTSPlayer.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/tts/TTSPlayer.java delete mode 100644 foudations/mogo-utils/src/main/java/com/mogo/utils/tts/TTSPlayerFactory.java diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index e51b4aa2ff..57712b9387 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -11,13 +11,13 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.main.MainMoGoApplication; +import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.eagle.core.utilcode.util.AppUtils; +import com.mogo.eagle.core.utilcode.util.CommonUtils; import com.mogo.module.v2x.utils.ObuConfig; import com.mogo.test.crashreport.CrashReportConstants; -import com.mogo.utils.AppUtils; -import com.mogo.utils.CommonUtils; -import com.mogo.utils.logger.LogLevel; -import com.mogo.utils.logger.Logger; -import com.mogo.utils.storage.SharedPrefsMgr; import java.util.HashMap; import java.util.Map; diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt index e7c6518596..88eeed3a61 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt @@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.check.net.CheckNetWork.checkNetWork import com.mogo.eagle.core.function.check.net.CheckResultData import com.mogo.eagle.core.function.check.view.CheckActivity import com.mogo.eagle.core.function.check.view.CheckDialog +import com.mogo.eagle.core.utilcode.util.ActivityLifecycleManager import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.LogUtils @@ -19,7 +20,6 @@ import com.mogo.module.common.MogoApisHandler import com.mogo.module.service.receiver.MogoReceiver import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor -import com.mogo.utils.ActivityLifecycleManager import java.util.concurrent.ConcurrentHashMap /** diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index d9dfd1b9da..50acd3b2d0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -9,13 +9,13 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.network.NetConfig +import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.module.common.MogoApisHandler import com.mogo.service.cloud.socket.IMogoOnMessageListener -import com.mogo.utils.logger.LogLevel -import com.mogo.utils.logger.Logger import com.zhidao.loglib.bean.RemoteLogPushContent import com.zhidao.loglib.call.LogInfoManagerFactory import com.zhidao.loglib.core.ILogListener diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloat.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloat.kt index 18a97b553a..158e2c132d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloat.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloat.kt @@ -5,8 +5,8 @@ import android.view.View import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener -import com.mogo.utils.WindowUtils -import com.mogo.utils.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.WindowUtils /** * @author donghongyu diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt index fa8f7bedfc..20c9b90796 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt @@ -12,12 +12,11 @@ import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.WindowManager -import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.notification.anim.AnimatorManager import com.mogo.eagle.core.function.hmi.notification.enums.ShowPattern import com.mogo.eagle.core.function.hmi.notification.widget.ParentFrameLayout -import com.mogo.utils.WindowUtils -import com.mogo.utils.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.WindowUtils /** * @author donghongyu diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/anim/DefaultAnimator.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/anim/DefaultAnimator.kt index f80831999c..675ed6ddda 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/anim/DefaultAnimator.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/anim/DefaultAnimator.kt @@ -7,7 +7,7 @@ import android.view.View import android.view.WindowManager import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator -import com.mogo.utils.WindowUtils +import com.mogo.eagle.core.utilcode.util.WindowUtils import kotlin.math.min /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt index 9f44cb8aa0..93fad68c28 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt @@ -4,15 +4,11 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.module.common.enums.EventTypeEnum -import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.service.IMogoServiceApis import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.notice.NoticeNormalData -import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.utilcode.util.SharedPrefs -import com.mogo.utils.logger.Logger /** * 用于普通云公告的测试 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt index 03c9780f2b..554c398818 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt @@ -7,8 +7,8 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.WaringConst +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.service.IMogoServiceApis -import com.mogo.utils.logger.Logger /** * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式 控制限速标志 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt index 3d6b064735..9cfd191f6c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt @@ -7,8 +7,8 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.WaringConst +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.service.IMogoServiceApis -import com.mogo.utils.logger.Logger /** * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式 触发红绿灯场景 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt index d5b6f7e4d3..49b3472569 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt @@ -7,9 +7,9 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.WaringConst +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.module.common.enums.EventTypeEnum import com.mogo.service.IMogoServiceApis -import com.mogo.utils.logger.Logger /** * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式弹出预警提示框 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index fb28a0da14..adf88cd446 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -31,10 +31,10 @@ import com.mogo.eagle.core.function.hmi.ui.notice.NoticeNormalBannerView import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.module.common.enums.EventTypeEnum -import com.mogo.utils.logger.Logger import kotlinx.android.synthetic.main.fragment_hmi.* /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt index 0850bb341d..66a91604f8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt @@ -23,8 +23,8 @@ import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive import com.mogo.eagle.core.data.camera.CameraEntity import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer -import com.mogo.utils.logger.Logger import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.model.VideoOptionModel diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java index d311dfe146..80bd913233 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java @@ -17,10 +17,10 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.function.hmi.WaringConst; import com.mogo.eagle.core.function.hmi.notification.WarningFloat; +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp; +import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform; +import com.mogo.eagle.core.utilcode.util.BitmapHelper; import com.mogo.eagle.core.utilcode.util.ThreadUtils; -import com.mogo.utils.BitmapHelper; -import com.mogo.utils.glide.GlideApp; -import com.mogo.utils.glide.GlideRoundedCornersTransform; /** * @author liujing diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt index 7d436491e6..652fc002f8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt @@ -10,15 +10,15 @@ import android.widget.TextView import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.data.notice.NoticeNormalData import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp +import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform +import com.mogo.eagle.core.utilcode.util.BitmapHelper import com.mogo.eagle.core.widget.media.video.NoticeSimpleVideoPlayer import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.dialog.BaseFloatDialog import com.mogo.service.IMogoServiceApis import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor -import com.mogo.utils.BitmapHelper -import com.mogo.utils.glide.GlideApp -import com.mogo.utils.glide.GlideRoundedCornersTransform import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack @@ -122,8 +122,10 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO pushVideo?.visibility = View.GONE pushImageView?.visibility = View.VISIBLE pushImageView?.let { - GlideApp.with(context).load(noticeNormal.imageUrl).optionalTransform(GlideRoundedCornersTransform( - 20f, GlideRoundedCornersTransform.CornerType.ALL)).into(it) + GlideApp.with(context).load(noticeNormal.imageUrl).optionalTransform( + GlideRoundedCornersTransform( + 20f, GlideRoundedCornersTransform.CornerType.ALL) + ).into(it) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeNormalBannerView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeNormalBannerView.java index 866dc0a10a..7f67613a45 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeNormalBannerView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeNormalBannerView.java @@ -12,14 +12,12 @@ import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.eagle.core.data.notice.NoticeNormalData; -import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; -import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.function.hmi.WaringConst; import com.mogo.eagle.core.function.hmi.notification.WarningFloat; -import com.mogo.eagle.core.utilcode.util.SharedPrefs; -import com.mogo.utils.glide.GlideApp; -import com.mogo.utils.glide.GlideRoundedCornersTransform; +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp; +import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform; + /** * @author lixiaopeng diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java index c11ff09f3f..45034361db 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java @@ -22,6 +22,10 @@ import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.function.call.notice.CallerNoticeManager; import com.mogo.eagle.core.function.hmi.R; +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp; +import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform; +import com.mogo.eagle.core.utilcode.util.BitmapHelper; +import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.dialog.BaseFloatDialog; @@ -29,11 +33,7 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.imageloader.MogoImageView; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; -import com.mogo.utils.BitmapHelper; -import com.mogo.utils.glide.GlideApp; -import com.mogo.utils.glide.GlideRoundedCornersTransform; import com.shuyu.gsyvideoplayer.GSYVideoManager; -import com.mogo.utils.DateTimeUtils; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack; import com.shuyu.gsyvideoplayer.utils.NetworkUtils; diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 68c1ac2cb3..5d37bdf4e1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -36,14 +36,9 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel import com.mogo.eagle.core.utilcode.mogo.logger.Logger -import com.mogo.eagle.core.utilcode.util.AppUtils -import com.mogo.eagle.core.utilcode.util.GsonUtils -import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr +import com.mogo.eagle.core.utilcode.util.* import com.mogo.map.MogoMap -import com.mogo.utils.DeviceIdUtils -import com.mogo.utils.UiThreadHandler -import com.mogo.utils.storage.SharedPrefsMgr import kotlinx.android.synthetic.main.view_debug_setting.view.* /** @@ -279,13 +274,11 @@ class DebugSettingView @JvmOverloads constructor( if (isChecked) { LogUtils.getConfig().isLogSwitch = false Logger.init(LogLevel.OFF) - com.mogo.utils.logger.Logger.init(com.mogo.utils.logger.LogLevel.OFF) com.elegant.log.simplelog.Logger.init(com.elegant.log.simplelog.LogLevel.OFF) com.zhidao.account.sdk.utils.Logger.init(false) } else { LogUtils.getConfig().isLogSwitch = true Logger.init(LogLevel.DEBUG) - com.mogo.utils.logger.Logger.init(com.mogo.utils.logger.LogLevel.DEBUG) com.elegant.log.simplelog.Logger.init(com.elegant.log.simplelog.LogLevel.DEBUG) com.zhidao.account.sdk.utils.Logger.init(true) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index 4eaff4d909..6c085c6514 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -16,8 +16,8 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.LogUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.module.common.MogoApisHandler -import com.mogo.utils.UiThreadHandler import kotlinx.android.synthetic.main.view_autopilot_status.view.* /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index c1be2d3062..93053a6b37 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -1,28 +1,18 @@ package com.mogo.eagle.core.function.hmi.ui.widget -import android.animation.Animator import android.content.Context import android.graphics.Color import android.location.Location import android.util.AttributeSet -import android.util.Log import android.view.Gravity -import android.view.View -import android.view.WindowManager -import android.view.animation.OvershootInterpolator import android.widget.FrameLayout import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.function.hmi.R -import com.mogo.eagle.core.function.hmi.notification.WarningFloat -import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator -import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern -import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.navi.IMogoCarLocationChangedListener2 import com.mogo.service.IMogoServiceApis -import com.mogo.service.statusmanager.StatusDescriptor -import com.mogo.utils.UiThreadHandler import java.util.* /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt index fe36e5b43c..368fb3d8d2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.hmi.R -import com.mogo.utils.UiThreadHandler +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.view_traffic_light_vr.view.* /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt index fe29b7a87f..24cc46d07e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XNotificationView.kt @@ -9,7 +9,7 @@ import androidx.annotation.Nullable import androidx.annotation.StringRes import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.hmi.R -import com.mogo.utils.UiThreadHandler +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.notification_v2x_msg_vr.view.* /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt index 0798a50182..e3b412d190 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt @@ -7,8 +7,8 @@ import android.view.View import android.widget.RelativeLayout import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.function.hmi.R -import com.mogo.utils.UiThreadHandler -import com.mogo.utils.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.module_hmi_warning_v2x.view.* /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt index 9ebfc434dc..cc8f2fc571 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt @@ -5,7 +5,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.function.hmi.R -import com.mogo.utils.UiThreadHandler +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.view_vip_identification.view.* /** diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 3b07e5274d..6304b558ca 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -12,12 +12,12 @@ import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.mogo.eagle.core.utilcode.util.ActivityLifecycleManager; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.main.MainActivity; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.StatusDescriptor; -import com.mogo.utils.ActivityLifecycleManager; -import com.mogo.utils.logger.Logger; /** * 针对作为Launcher的情况，做个性化操作 @@ -79,7 +79,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis protected void loadOthersModules() { super.loadOthersModules(); Logger.d(TAG, "loadOthersModules"); - loadOCHModule(); +// loadOCHModule(); } /** diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 43fa7f62c0..5b85300f54 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -20,7 +20,10 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.notice.PushUIConstants; import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.DeviceUtils; +import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.map.MapApiPath; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoApisHandler; @@ -34,9 +37,6 @@ import com.mogo.module.v2x.V2XConst; import com.mogo.service.IMogoServiceApis; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.test.crashreport.upgrade.UpgradeReportConstants; -import com.mogo.utils.ProcessUtils; -import com.mogo.utils.logger.Logger; -import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.boot.persistent.lib.PersistentManager; import com.zhidao.support.obu.ami.AmiClientManager; import com.zhjt.service.chain.core.ChainTraceStarter; diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt index 3a5dd4546d..14bc50cb20 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt +++ b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt @@ -6,11 +6,10 @@ import android.os.Looper import android.os.Message import com.mogo.eagle.core.data.camera.* import com.mogo.eagle.core.function.call.hmi.CallerHmiManager -import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager import com.mogo.eagle.core.function.monitoring.net.CameraListServices +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.constants.HostConst -import com.mogo.utils.logger.Logger import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers diff --git a/core/function-impl/mogo-core-function-notice/build.gradle b/core/function-impl/mogo-core-function-notice/build.gradle index 8e04efb4cf..31b5a813f3 100644 --- a/core/function-impl/mogo-core-function-notice/build.gradle +++ b/core/function-impl/mogo-core-function-notice/build.gradle @@ -68,7 +68,6 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_res implementation rootProject.ext.dependencies.mogo_core_network implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogoutils } else { implementation project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') @@ -79,7 +78,6 @@ dependencies { implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-network') implementation project(':core:mogo-core-function-call') - implementation project(':foudations:mogo-utils') } } diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java index 80d7d2ef50..2a93ae3669 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java @@ -7,9 +7,9 @@ import com.mogo.eagle.core.data.notice.NoticeNormalData; import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.network.utils.GsonUtil; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.module.common.MogoApisHandler; import com.mogo.service.cloud.socket.IMogoOnMessageListener; -import com.mogo.utils.logger.Logger; /** * @author Jing diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java index be181b21f8..e0c02a3839 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java @@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.notice.utils.AnimatorUtilsKt; import com.mogo.eagle.core.function.notice.view.GlobalToolsKt; import com.mogo.eagle.core.function.notice.view.PushItemAnimator; import com.mogo.eagle.core.function.notice.view.SwipeItemLayout; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.module.common.view.OnPreventFastClickListener; import com.mogo.eagle.core.function.notice.Config; import com.mogo.eagle.core.function.notice.adapter.PushMessageAdapter; @@ -23,7 +24,6 @@ import com.mogo.eagle.core.function.notice.repository.PushRepository; import com.mogo.eagle.core.function.notice.utils.HandlerUtils; import com.mogo.eagle.core.function.notice.viewmodel.MessageViewModel; import com.mogo.service.statusmanager.IMogoMsgCenterListener; -import com.mogo.utils.UiThreadHandler; import org.jetbrains.annotations.NotNull; diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java index 38993c1bbf..16e0868f0d 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java @@ -12,7 +12,7 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack; import com.mogo.eagle.core.network.utils.GsonUtil; -import com.mogo.utils.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import java.util.HashMap; import java.util.Map; diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/repository/PushRepository.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/repository/PushRepository.kt index 204d42de99..0e6f2bfb31 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/repository/PushRepository.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/repository/PushRepository.kt @@ -11,9 +11,9 @@ import com.mogo.eagle.core.function.notice.model.PushBean import com.mogo.eagle.core.function.notice.utils.HandlerUtils import com.mogo.eagle.core.function.notice.view.getApis import com.mogo.eagle.core.function.notice.viewmodel.PushViewModel +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor -import com.mogo.utils.logger.Logger import java.util.* import kotlin.collections.HashSet diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt index f4620b3373..d77c7e6422 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.util.Log import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.function.call.hmi.CallerHmiManager -import com.mogo.utils.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.Logger /** * @author Jing diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnimatorUtils.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnimatorUtils.kt index e257d3dfa3..0a34f27f7a 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnimatorUtils.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnimatorUtils.kt @@ -4,7 +4,7 @@ import android.view.View import android.view.ViewGroup import androidx.core.view.get import androidx.core.view.isNotEmpty -import com.mogo.utils.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.Logger const val TAG: String = "AnimatorUtils.kt" diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/FloatView.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/FloatView.kt index 1ea4590aed..dccf8b8aa6 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/FloatView.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/FloatView.kt @@ -17,11 +17,11 @@ import com.mogo.eagle.core.function.notice.utils.AnalyticsUtils import com.mogo.eagle.core.function.notice.utils.stringConverterBitmap import com.mogo.eagle.core.function.notice.view.roundimage.RoundedImageView import com.mogo.eagle.core.function.notice.viewmodel.PushViewModel +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp +import com.mogo.eagle.core.utilcode.util.ThreadPoolService +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.service.windowview.IMogoTopViewManager import com.mogo.service.windowview.IMogoTopViewStatusListener -import com.mogo.utils.ThreadPoolService -import com.mogo.utils.UiThreadHandler -import com.mogo.utils.glide.GlideApp class FloatView constructor( private val pushViewModel: PushViewModel, diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt index 6a607149fc..0f7d8cfd77 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt @@ -5,8 +5,8 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.utils.storage.SharedPrefsMgr /** * @author xiaoyuzhou diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index cb5619e798..478c36dd21 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -10,12 +10,12 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager import com.mogo.eagle.core.function.obu.mogo.utils.TrafficDataConvertUtils import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.EventTypeEnum import com.mogo.service.IMogoServiceApis import com.mogo.service.map.IMogoMapService -import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.support.obu.MogoObuManager import com.zhidao.support.obu.OnMogoObuListener import com.zhidao.support.obu.constants.ObuConstants diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index cf8c67d41f..e5b7d7f0bf 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -35,10 +35,10 @@ import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener; import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; import com.mogo.eagle.core.function.smp.utils.MapAssetStyleUtils; import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.widget.RoundLayout; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.utils.DrivingDirectionUtils; -import com.mogo.utils.logger.Logger; import java.util.ArrayList; import java.util.List; diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index 3f9b9c3d8e..ea1b62527e 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -18,9 +18,9 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.module.common.MogoApisHandler; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.utils.UiThreadHandler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt index d8d1f500ba..a45002369f 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt @@ -10,11 +10,11 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerManager import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager import com.mogo.eagle.core.function.v2x.vip.VipCarManager +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.map.navi.IMogoCarLocationChangedListener2 import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.enums.EventTypeEnum -import com.mogo.utils.logger.Logger import kotlin.math.abs import kotlin.math.ceil import kotlin.math.floor diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java index 56879ae613..3e2a45ccc3 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java @@ -5,12 +5,10 @@ import android.location.Location; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; -import com.mogo.utils.UiThreadHandler; -import com.mogo.utils.logger.Logger; -import java.util.Date; import java.util.Timer; import java.util.TimerTask; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt index 5b149e9eb3..1d3f9d5248 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt @@ -16,9 +16,9 @@ import com.mogo.eagle.core.function.v2x.trafficlight.core.TrafficLightThreadHand import com.mogo.eagle.core.function.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_CROSS_ROAD import com.mogo.eagle.core.function.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT import com.mogo.eagle.core.function.v2x.trafficlight.network.TrafficLightNetWorkModel +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.map.navi.IMogoCarLocationChangedListener2 import com.mogo.module.common.MogoApisHandler -import com.mogo.utils.logger.Logger class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index 9c1828bc5c..4793df328e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -15,11 +15,11 @@ import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerMa import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager import com.mogo.eagle.core.function.v2x.trafficlight.core.MogoTrafficLightManager import com.mogo.eagle.core.function.v2x.vip.network.VipNetWorkModel +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.enums.EventTypeEnum import com.mogo.service.cloud.socket.IMogoOnMessageListener -import com.mogo.utils.UiThreadHandler -import com.mogo.utils.logger.Logger import kotlin.math.abs class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListener, diff --git a/core/mogo-core-utils/build.gradle b/core/mogo-core-utils/build.gradle index 2be6f1dd7b..f2534dc44c 100644 --- a/core/mogo-core-utils/build.gradle +++ b/core/mogo-core-utils/build.gradle @@ -38,16 +38,31 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + kapt.includeCompileClasspath = false + + } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - + implementation rootProject.ext.dependencies.androidxappcompat + kapt rootProject.ext.dependencies.androidxannotation + api rootProject.ext.dependencies.glide + kapt rootProject.ext.dependencies.glidecompiler implementation rootProject.ext.dependencies.kotlinstdlibjdk7 implementation rootProject.ext.dependencies.androidxannotation implementation rootProject.ext.dependencies.material implementation rootProject.ext.dependencies.gson + implementation rootProject.ext.dependencies.glideanno + implementation rootProject.ext.dependencies.glideokhttp3 + + implementation rootProject.ext.dependencies.coroutinescore + implementation rootProject.ext.dependencies.coroutinesandroid + api rootProject.ext.dependencies.mogoaicloudpassport + api 'ch.hsr:geohash:1.4.0' + api rootProject.ext.dependencies.mogoaicloudnetwork + } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/BaseGlideModule.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/BaseGlideModule.java similarity index 84% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/glide/BaseGlideModule.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/BaseGlideModule.java index 33f5bc5563..82760f3b30 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/BaseGlideModule.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/BaseGlideModule.java @@ -1,18 +1,12 @@ -package com.mogo.utils.glide; +package com.mogo.eagle.core.utilcode.mogo.glide; import android.content.Context; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import com.bumptech.glide.GlideBuilder; import com.bumptech.glide.annotation.GlideModule; -import com.bumptech.glide.load.Key; -import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.cache.ExternalPreferredCacheDiskCacheFactory; import com.bumptech.glide.load.engine.cache.LruResourceCache; -import com.bumptech.glide.load.engine.cache.MemoryCache; import com.bumptech.glide.load.engine.executor.GlideExecutor; import com.bumptech.glide.module.AppGlideModule; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideBlurTransformation.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/GlideBlurTransformation.java similarity index 96% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideBlurTransformation.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/GlideBlurTransformation.java index 9ee136f036..ed4fb8253c 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideBlurTransformation.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/GlideBlurTransformation.java @@ -1,4 +1,4 @@ -package com.mogo.utils.glide; +package com.mogo.eagle.core.utilcode.mogo.glide; import android.content.Context; import android.graphics.Bitmap; @@ -7,11 +7,11 @@ import android.renderscript.Element; import android.renderscript.RenderScript; import android.renderscript.ScriptIntrinsicBlur; -import androidx.annotation.NonNull; - import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.mogo.utils.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; + +import androidx.annotation.NonNull; /** * 使用Glide加载图片时，使该图片进行高斯模糊 diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideRoundedCornersTransform.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/GlideRoundedCornersTransform.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideRoundedCornersTransform.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/GlideRoundedCornersTransform.java index 5f0e0b9a89..1beeae7e25 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideRoundedCornersTransform.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/GlideRoundedCornersTransform.java @@ -1,4 +1,4 @@ -package com.mogo.utils.glide; +package com.mogo.eagle.core.utilcode.mogo.glide; import android.graphics.Bitmap; import android.graphics.BitmapShader; @@ -7,14 +7,14 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; -import androidx.annotation.NonNull; - import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.mogo.utils.BuildConfig; +import com.mogo.eagle.core.utilcode.util.BuildConfig; import java.security.MessageDigest; +import androidx.annotation.NonNull; + /** * Glide加载图片，使图片变成圆角图片工具 * 基本用法Glide.with(this).load(imgUrl).apply(RequestOptions.bitmapTransform(GlideRoundedCornersTransform(this))).into(imageView) diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/permissions/PermissionsDialogUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/PermissionsDialogUtils.java similarity index 96% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/permissions/PermissionsDialogUtils.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/PermissionsDialogUtils.java index fecc8e5309..23cc37ddb1 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/permissions/PermissionsDialogUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/permissions/PermissionsDialogUtils.java @@ -1,8 +1,7 @@ -package com.mogo.utils.permissions; +package com.mogo.eagle.core.utilcode.mogo.permissions; import android.app.Activity; import android.app.AlertDialog; -import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLBaseDao.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLBaseDao.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLBaseDao.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLBaseDao.java index 762f31c1b9..b20c512084 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLBaseDao.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLBaseDao.java @@ -1,10 +1,10 @@ -package com.mogo.utils.sqlite; +package com.mogo.eagle.core.utilcode.mogo.sqlite; import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import com.mogo.utils.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.utils.sqlite.annotation.DbField; import com.mogo.utils.sqlite.annotation.DbTable; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLDaoFactory.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLDaoFactory.kt similarity index 95% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLDaoFactory.kt rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLDaoFactory.kt index ad3a98da14..a512cb829a 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLDaoFactory.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLDaoFactory.kt @@ -2,6 +2,8 @@ package com.mogo.utils.sqlite import android.content.Context import android.database.sqlite.SQLiteDatabase +import com.mogo.eagle.core.utilcode.mogo.sqlite.SQLBaseDao +import com.mogo.eagle.core.utilcode.mogo.sqlite.SQLIDao import com.mogo.utils.sqlite.annotation.DbDatabase import com.mogo.utils.sqlite.proxy.BaseDaoProxyLog diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLIDao.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLIDao.java similarity index 96% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLIDao.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLIDao.java index 012a8aa6e2..7ada65227c 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLIDao.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/SQLIDao.java @@ -1,4 +1,4 @@ -package com.mogo.utils.sqlite; +package com.mogo.eagle.core.utilcode.mogo.sqlite; import android.database.sqlite.SQLiteDatabase; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbDatabase.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/annotation/DbDatabase.kt similarity index 100% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbDatabase.kt rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/annotation/DbDatabase.kt diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbField.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/annotation/DbField.kt similarity index 100% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbField.kt rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/annotation/DbField.kt diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbTable.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/annotation/DbTable.kt similarity index 100% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbTable.kt rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/annotation/DbTable.kt diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/proxy/BaseDaoProxyLog.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/proxy/BaseDaoProxyLog.kt similarity index 96% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/proxy/BaseDaoProxyLog.kt rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/proxy/BaseDaoProxyLog.kt index 5724539c61..ce22e3f982 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/proxy/BaseDaoProxyLog.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/proxy/BaseDaoProxyLog.kt @@ -1,6 +1,6 @@ package com.mogo.utils.sqlite.proxy -import com.mogo.utils.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import java.lang.reflect.InvocationHandler import java.lang.reflect.Method import java.lang.reflect.Proxy diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/SharedPrefsMgr.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/SharedPrefsMgr.java similarity index 98% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/SharedPrefsMgr.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/SharedPrefsMgr.java index f7a7c4649d..23f32a03d4 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/SharedPrefsMgr.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/SharedPrefsMgr.java @@ -1,12 +1,12 @@ -package com.mogo.utils.storage; +package com.mogo.eagle.core.utilcode.mogo.storage; import android.content.Context; import android.content.SharedPreferences; -import androidx.annotation.NonNull; - import java.util.Set; +import androidx.annotation.NonNull; + public class SharedPrefsMgr { private static final String File_Name = "app_shared_pref"; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/CacheUtil.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/CacheUtil.java similarity index 97% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/CacheUtil.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/CacheUtil.java index ca7c761c06..ff440780d9 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/CacheUtil.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/CacheUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.utils.storage.lrucache; +package com.mogo.eagle.core.utilcode.mogo.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/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/DiskCacheManager.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskCacheManager.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/DiskCacheManager.java index a37aa56d37..42b6cfaa21 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskCacheManager.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/DiskCacheManager.java @@ -1,4 +1,4 @@ -package com.mogo.utils.storage.lrucache; +package com.mogo.eagle.core.utilcode.mogo.storage.lrucache; import android.content.Context; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskLruCache.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/DiskLruCache.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskLruCache.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/DiskLruCache.java index 72db55be4d..aec89acf1a 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/DiskLruCache.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/DiskLruCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.utils.storage.lrucache; +package com.mogo.eagle.core.utilcode.mogo.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/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/SecretUtil.java similarity index 94% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/SecretUtil.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/SecretUtil.java index dc833b9d79..97c20a4cf5 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/SecretUtil.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/SecretUtil.java @@ -1,4 +1,4 @@ -package com.mogo.utils.storage.lrucache; +package com.mogo.eagle.core.utilcode.mogo.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/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/StrictLineReader.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/StrictLineReader.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/StrictLineReader.java index 5ee84ab744..dddeaeaa61 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/storage/lrucache/StrictLineReader.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/StrictLineReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.utils.storage.lrucache; +package com.mogo.eagle.core.utilcode.mogo.storage.lrucache; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/ActivityLifecycleManager.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ActivityLifecycleManager.java similarity index 99% rename from foudations/mogo-utils/src/main/java/com/mogo/utils/ActivityLifecycleManager.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ActivityLifecycleManager.java index 603c370191..9f6f750aba 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/ActivityLifecycleManager.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ActivityLifecycleManager.java @@ -1,4 +1,4 @@ -package com.mogo.utils; +package com.mogo.eagle.core.utilcode.util; import android.annotation.TargetApi; import android.app.Activity; diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java index ccb55aae7a..c4133b9577 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java @@ -2,6 +2,7 @@ package com.mogo.eagle.core.utilcode.util; import android.app.Activity; import android.app.ActivityManager; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -12,6 +13,8 @@ import android.content.pm.SigningInfo; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; +import android.os.Bundle; +import android.text.TextUtils; import android.util.Log; import java.io.File; @@ -31,10 +34,106 @@ import androidx.annotation.Nullable; */ public final class AppUtils { + private static final String MOGO_MAP_SDK_VERSION = "MAP_SDK_VERSION"; + private AppUtils() { throw new UnsupportedOperationException("u can't instantiate me..."); } + public static String getCustomMapSDKVersion(Context context){ + return getApplicationMetaValue(context,MOGO_MAP_SDK_VERSION); + } + + private static String getApplicationMetaValue(Context context,String metaName){ + try { + ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(),PackageManager.GET_META_DATA); + Bundle bundle = applicationInfo.metaData; + if (bundle != null){ + return bundle.getString(metaName); + } + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return ""; + } + + public static String getApplicationLabel( Context context, String pkgName ) { + try { + PackageManager pm = context.getPackageManager(); + ApplicationInfo appInfo = pm.getApplicationInfo( pkgName, PackageManager.GET_META_DATA ); + return pm.getApplicationLabel( appInfo ).toString(); + } catch ( Exception e ) { + return null; + } + } + + public static boolean isAppForeground( Context context ) { + if ( context != null ) { + ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE ); + List< ActivityManager.RunningAppProcessInfo > processes = activityManager.getRunningAppProcesses(); + for ( ActivityManager.RunningAppProcessInfo processInfo : processes ) { + if ( processInfo.processName.equals( context.getPackageName() ) ) { + if ( processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ) { + return true; + } + } + } + } + return false; + } + + public static boolean isAppForeground( Context context, String pkg ) { + if ( context != null ) { + ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE ); + List< ActivityManager.RunningAppProcessInfo > processes = activityManager.getRunningAppProcesses(); + for ( ActivityManager.RunningAppProcessInfo processInfo : processes ) { + if ( processInfo.processName.equals( pkg ) ) { + if ( processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ) { + return true; + } + } + } + } + return false; + } + + //获取已安装应用的 uid，-1 表示未安装此应用或程序异常 + public static int getPackageUid( Context context, String packageName ) { + try { + ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo( packageName, 0 ); + if ( applicationInfo != null ) { + return applicationInfo.uid; + } + } catch ( Exception e ) { + return -1; + } + return -1; + } + + /** + * 判断某一 uid 的程序是否有正在运行的进程，即是否存活 + * Created by cafeting on 2017/2/4. + * + * @param context 上下文 + * @param uid 已安装应用的 uid + * @return true 表示正在运行，false 表示没有运行 + */ + public static boolean isProcessRunning( Context context, int uid ) { + if ( context == null ) { + return false; + } + ActivityManager am = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE ); + List< ActivityManager.RunningServiceInfo > runningServiceInfos = am.getRunningServices( 200 ); + if ( runningServiceInfos.size() > 0 ) { + for ( ActivityManager.RunningServiceInfo appProcess : runningServiceInfos ) { + if ( uid == appProcess.uid ) { + return true; + } + } + } + return false; + } + /** * Register the status of application changed listener. * @@ -680,6 +779,38 @@ public final class AppUtils { return result; } + public static boolean isApplicationBroughtToBackground( final Context context ) { + ActivityManager am = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE ); + List< ActivityManager.RunningTaskInfo > tasks = am.getRunningTasks( 1 ); + if ( !tasks.isEmpty() ) { + ComponentName topActivity = tasks.get( 0 ).topActivity; + if ( !topActivity.getPackageName().equals( context.getPackageName() ) ) { + return true; + } + } + return false; + } + + public static boolean isAppInstalled( Context context, String pkg ) { + PackageInfo packageInfo; + if ( TextUtils.isEmpty( pkg ) ) { + return false; + } + try { + packageInfo = context.getPackageManager().getPackageInfo( pkg, 0 ); + } catch ( PackageManager.NameNotFoundException e ) { + packageInfo = null; + e.printStackTrace(); + } + if ( packageInfo == null ) { + return false; + } else { + return true; + } + } + + + /** * Return the application's information. *