From 65cc40d6c384c6d1f757f8c1f072df6f77e6d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 17:50:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../mogo/eagle/core/data/map/MogoLatLng.java | 17 +---------------- .../mogo/map/impl/custom/AMapViewWrapper.java | 2 +- .../map/impl/custom/utils/MogoMapUtils.java | 12 ++++++------ .../module/navi/bean/EntityConvertUtils.java | 2 +- .../com/mogo/module/service/MogoServices.java | 4 ++-- .../module/service/network/RefreshModel.java | 6 +++--- .../com/mogo/module/share/TanluManager.java | 4 ++-- 7 files changed, 16 insertions(+), 31 deletions(-) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java index 8c47532497..951c21a907 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java @@ -14,13 +14,10 @@ import java.util.Objects; public class MogoLatLng implements Parcelable { public final double lat; - @Deprecated - public final double lng; public final double lon; public MogoLatLng( double lat, double lon ) { this.lat = lat; - this.lng = lon; this.lon = lon; } @@ -28,16 +25,6 @@ public class MogoLatLng implements Parcelable { return lat; } - /** - * Deprecated, use {@link #getLon()} instead. - * - * @return - */ - @Deprecated - public double getLng() { - return lng; - } - public double getLon() { return lon; } @@ -53,7 +40,7 @@ public class MogoLatLng implements Parcelable { @Override public int hashCode() { - return Objects.hash( lat, lng, lon ); + return Objects.hash( lat, lon ); } @Override @@ -72,13 +59,11 @@ public class MogoLatLng implements Parcelable { @Override public void writeToParcel( Parcel dest, int flags ) { dest.writeDouble( this.lat ); - dest.writeDouble( this.lng ); dest.writeDouble( this.lon ); } protected MogoLatLng( Parcel in ) { this.lat = in.readDouble(); - this.lng = in.readDouble(); this.lon = in.readDouble(); } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 376bd68a9a..1949915969 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -436,7 +436,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void moveToCenter(MogoLatLng latLng, boolean animate) { Logger.d(TAG, "move to center %s", latLng); - if (latLng == null || latLng.lat == 0.0d || latLng.lng == 0.0d) { + if (latLng == null || latLng.lat == 0.0d || latLng.lon == 0.0d) { Logger.e(TAG, "latlng = null or is illegal"); return; } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java index a6e709160c..a818446f4f 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java @@ -53,24 +53,24 @@ public class MogoMapUtils { if ( latLngBounds.getNortheast() == null ) { dLat = Math.abs( carPosition.lat - latLngBounds.getSouthwest().getLatitude() ); - dLon = Math.abs( carPosition.lng - latLngBounds.getSouthwest().getLongitude() ); + dLon = Math.abs( carPosition.lon - latLngBounds.getSouthwest().getLongitude() ); } else if ( latLngBounds.getSouthwest() == null ) { dLat = Math.abs( carPosition.lat - latLngBounds.getNortheast().getLatitude() ); - dLon = Math.abs( carPosition.lng - latLngBounds.getNortheast().getLongitude() ); + dLon = Math.abs( carPosition.lon - latLngBounds.getNortheast().getLongitude() ); } else { final double dLat1 = Math.abs( carPosition.lat - latLngBounds.getSouthwest().getLatitude() ); - final double dLon1 = Math.abs( carPosition.lng - latLngBounds.getSouthwest().getLongitude() ); + final double dLon1 = Math.abs( carPosition.lon - latLngBounds.getSouthwest().getLongitude() ); final double dLat2 = Math.abs( carPosition.lat - latLngBounds.getNortheast().getLatitude() ); - final double dLon2 = Math.abs( carPosition.lng - latLngBounds.getNortheast().getLongitude() ); + final double dLon2 = Math.abs( carPosition.lon - latLngBounds.getNortheast().getLongitude() ); dLat = dLat1 > dLat2 ? dLat1 : dLat2; dLon = dLon1 > dLon2 ? dLon1 : dLon2; } west = carPosition.lat - dLat; - south = carPosition.lng + dLon; + south = carPosition.lon + dLon; east = carPosition.lat + dLat; - north = carPosition.lng - dLon; + north = carPosition.lon - dLon; if ( south == 0.0 || west == 0.0 || east == 0.0 || north == 0.0 ) { return null; diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java index 67e79545d7..13a0e1bd28 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java @@ -79,7 +79,7 @@ public class EntityConvertUtils { double lng = 0.0; if ( MogoTip.getPoint() != null ) { lat = MogoTip.getPoint().getLat(); - lng = MogoTip.getPoint().getLng(); + lng = MogoTip.getPoint().getLon(); } return new SearchPoi( MogoTip.getPoiID(), MogoTip.getName(), diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 3e220c7e9f..e8a1953100 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -509,7 +509,7 @@ public class MogoServices implements IMogoMapListener, */ private float getMapCameraFactWidth() { try { - return Utils.calculateLineDistance( mCameraNorthEastPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng ) ); + return Utils.calculateLineDistance( mCameraNorthEastPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lon ) ); } catch ( Exception e ) { return ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS; } @@ -520,7 +520,7 @@ public class MogoServices implements IMogoMapListener, */ private float getMapCameraFactHeight() { try { - return Utils.calculateLineDistance( mCameraSouthWestPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lng ) ); + return Utils.calculateLineDistance( mCameraSouthWestPosition, new MogoLatLng( mCameraNorthEastPosition.lat, mCameraSouthWestPosition.lon ) ); } catch ( Exception e ) { return ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index 161ab53eb6..0ad608281c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java @@ -47,7 +47,7 @@ public class RefreshModel { final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build(); final RefreshBody refreshBody = new RefreshBody(); refreshBody.limit = limit; - refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng ); + refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lon ); refreshBody.radius = radius; refreshBody.viewPush = true; refreshBody.dataType.add( ServiceConst.CARD_TYPE_ROAD_CONDITION ); @@ -93,7 +93,7 @@ public class RefreshModel { final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build(); final RefreshBody refreshBody = new RefreshBody(); refreshBody.limit = limit; - refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng ); + refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lon ); refreshBody.radius = radius; refreshBody.dataType.add( ServiceConst.CARD_TYPE_ROAD_CONDITION ); refreshBody.dataType.add( ServiceConst.CARD_TYPE_USER_DATA ); @@ -157,7 +157,7 @@ public class RefreshModel { refreshBody.limit = limit; } refreshBody.radius = radius; - refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng ); + refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lon ); refreshBody.onlyFocus = onlyFocus; refreshBody.onlySameCity = onlySameCity; refreshBody.onlyRealUser = onlyRealUser; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 178d489cf8..c5f888c3df 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -180,7 +180,7 @@ public class TanluManager implements IMogoMarkerClickListener, lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); } else { Logger.d(TAG, "其他 ---1----"); - longit = latLon.lng; + longit = latLon.lon; lat = latLon.lat; } Logger.d(TAG, "geoSearch keywords =" + mKeywords + ">>longitude= " + longit + "--latitude= " + lat); @@ -546,7 +546,7 @@ public class TanluManager implements IMogoMarkerClickListener, lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); } else { Logger.d(TAG, "其他 -onPoiSearched---1----"); - longit = latLon.lng; + longit = latLon.lon; lat = latLon.lat; } // getVoiceControlRoadData(mKeywords, lat, longit); From 32c126fe176129ffcf161fc32e6dc3164de7ae05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 18:06:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9C=86=E5=BD=A2?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E4=B8=8B=E6=B2=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../core/function/api/map}/smp/IMogoSmallMapProvider.java | 2 +- .../src/main/function-common-res/values/styles.xml | 8 ++++++++ .../main/java/com/mogo/eagle/core}/view/RoundLayout.java | 7 +++---- .../mogo/module/main/launcher/MainLauncherActivity.java | 2 +- modules/mogo-module-smp/build.gradle | 3 +++ .../com/mogo/module/small/map/SmallMapDirectionView.java | 2 +- .../java/com/mogo/module/small/map/SmallMapProvider.java | 2 +- .../src/main/res/layout/module_small_map_view.xml | 4 ++-- .../main/java/com/mogo/module/v2x/V2XServiceManager.java | 2 +- .../src/main/java/com/mogo/service/IMogoServiceApis.java | 2 +- .../main/java/com/mogo/service/impl/MogoServiceApis.java | 2 +- 11 files changed, 23 insertions(+), 13 deletions(-) rename {services/mogo-service-api/src/main/java/com/mogo/service => core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map}/smp/IMogoSmallMapProvider.java (94%) create mode 100644 core/mogo-core-res/src/main/function-common-res/values/styles.xml rename {modules/mogo-module-common/src/main/java/com/mogo/module/common => core/mogo-core-res/src/main/java/com/mogo/eagle/core}/view/RoundLayout.java (91%) diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java similarity index 94% rename from services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java index 8485cae808..f6468c625e 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java @@ -1,4 +1,4 @@ -package com.mogo.service.smp; +package com.mogo.eagle.core.function.api.map.smp; import androidx.annotation.IdRes; import androidx.fragment.app.FragmentActivity; diff --git a/core/mogo-core-res/src/main/function-common-res/values/styles.xml b/core/mogo-core-res/src/main/function-common-res/values/styles.xml new file mode 100644 index 0000000000..e727caa8e8 --- /dev/null +++ b/core/mogo-core-res/src/main/function-common-res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/RoundLayout.java similarity index 91% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java rename to core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/RoundLayout.java index 20150f4a19..2158c157e5 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/RoundLayout.java +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/view/RoundLayout.java @@ -1,4 +1,4 @@ -package com.mogo.module.common.view; +package com.mogo.eagle.core.view; import android.content.Context; import android.content.res.TypedArray; @@ -10,9 +10,8 @@ import android.graphics.RectF; import android.util.AttributeSet; import android.widget.RelativeLayout; -import com.mogo.module.common.R; -import com.mogo.skin.support.IMogoSkinCompatSupportable; -import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; +import com.mogo.eagle.core.function.call.api.R; + /** * author : donghongyu diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index b892b3df2d..30310154e1 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -28,7 +28,7 @@ import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.module.service.receiver.MogoReceiver; import com.mogo.och.IMogoOCH; import com.mogo.service.intent.IMogoIntentListener; -import com.mogo.service.smp.IMogoSmallMapProvider; +import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.service.v2x.IV2XWarningListener; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-smp/build.gradle b/modules/mogo-module-smp/build.gradle index c182940292..35c4c4d4a3 100644 --- a/modules/mogo-module-smp/build.gradle +++ b/modules/mogo-module-smp/build.gradle @@ -50,7 +50,10 @@ dependencies { } else { api project(":foudations:mogo-commons") api project(':services:mogo-service-api') + implementation project(':modules:mogo-module-common') + + implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-data') } } diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index c3be13474a..e93b828326 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java @@ -24,9 +24,9 @@ import com.amap.api.navi.AMapNaviViewOptions; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.view.RoundLayout; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.view.RoundLayout; import com.mogo.module.small.map.animation.DirectionRotateAnimation; import com.mogo.module.small.map.utils.MapAssetStyleUtils; import com.mogo.module.small.map.view.ISmallMapDirectionView; diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java index 8b126f32f0..abae2ac2a5 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java @@ -10,7 +10,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.module.common.MogoApisHandler; import com.mogo.service.MogoServicePaths; import com.mogo.service.adas.IMogoAdasRouteCallBack; -import com.mogo.service.smp.IMogoSmallMapProvider; +import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml index e243671e27..fdf0e6dddc 100644 --- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml +++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml @@ -12,7 +12,7 @@ android:layout_centerInParent="true" android:background="@drawable/module_small_map_view_border" /> - --> - + Date: Fri, 17 Sep 2021 19:00:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E8=AE=BF=E9=97=AE=E5=88=B0MoGoEagleEye.core.mogo-core?= =?UTF-8?q?-function-call?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .idea/gradle.xml | 2 +- app/build.gradle | 2 +- .../mogo-core-function-smp}/.gitignore | 0 .../mogo-core-function-smp}/build.gradle | 0 .../consumer-rules.pro | 0 .../mogo-core-function-smp}/gradle.properties | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 2 +- .../src/main/assets/small_map_style.data | Bin .../main/assets/small_map_style_extra.data | Bin .../function/smp}/SmallMapDirectionView.java | 8 ++--- .../core/function/smp}/SmallMapFragment.java | 3 +- .../core/function/smp}/SmallMapProvider.java | 2 +- .../core/function/smp}/SmpServiceManager.java | 2 +- .../animation/DirectionRotateAnimation.java | 3 +- .../smp}/utils/MapAssetStyleUtils.java | 3 +- .../smp}/view/ISmallMapDirectionView.java | 2 +- .../module_small_map_view_dir_end.png | Bin .../module_small_map_view_dir_start.png | Bin .../module_small_map_view_end.png | Bin ...module_small_map_view_my_location_logo.png | Bin .../module_small_map_view_start.png | Bin .../icon_module_small_map_four_corners.png | Bin .../module_small_map_view_border.png | Bin .../module_small_map_view_border_north.png | Bin ...module_small_map_view_my_location_logo.png | Bin .../bg_module_small_map_view_border.xml | 0 .../res/layout/module_small_map_fragment.xml | 2 +- .../main/res/layout/module_small_map_view.xml | 0 .../res/values-xhdpi-2560x1440/dimens.xml | 0 .../src/main/res/values-xhdpi/dimens.xml | 0 .../function/call/map/CallerSmpManager.java | 32 ++++++++++++++++++ .../mogo-module-main-launcher/build.gradle | 2 +- modules.txt | 2 +- modules/mogo-module-v2x/build.gradle | 1 + .../receiver/TestPanelBroadcastReceiver.java | 5 +-- settings.gradle | 4 ++- 37 files changed, 58 insertions(+), 19 deletions(-) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/.gitignore (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/build.gradle (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/consumer-rules.pro (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/gradle.properties (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/proguard-rules.pro (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/AndroidManifest.xml (71%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/assets/small_map_style.data (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/assets/small_map_style_extra.data (100%) rename {modules/mogo-module-smp/src/main/java/com/mogo/module/small/map => core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp}/SmallMapDirectionView.java (97%) rename {modules/mogo-module-smp/src/main/java/com/mogo/module/small/map => core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp}/SmallMapFragment.java (94%) rename {modules/mogo-module-smp/src/main/java/com/mogo/module/small/map => core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp}/SmallMapProvider.java (99%) rename {modules/mogo-module-smp/src/main/java/com/mogo/module/small/map => core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp}/SmpServiceManager.java (96%) rename {modules/mogo-module-smp/src/main/java/com/mogo/module/small/map => core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp}/animation/DirectionRotateAnimation.java (97%) rename {modules/mogo-module-smp/src/main/java/com/mogo/module/small/map => core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp}/utils/MapAssetStyleUtils.java (96%) rename {modules/mogo-module-smp/src/main/java/com/mogo/module/small/map => core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp}/view/ISmallMapDirectionView.java (87%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_end.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_my_location_logo.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_start.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi/module_small_map_view_border.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/drawable/bg_module_small_map_view_border.xml (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/layout/module_small_map_fragment.xml (90%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/layout/module_small_map_view.xml (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/values-xhdpi-2560x1440/dimens.xml (100%) rename {modules/mogo-module-smp => core/function-impl/mogo-core-function-smp}/src/main/res/values-xhdpi/dimens.xml (100%) create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index afee79145e..c6183ce37c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -19,6 +19,7 @@