diff --git a/OCH/mogo-och-common-module/build.gradle b/OCH/mogo-och-common-module/build.gradle index 25fe5914f5..41c0d2ad9b 100644 --- a/OCH/mogo-och-common-module/build.gradle +++ b/OCH/mogo-och-common-module/build.gradle @@ -64,6 +64,7 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_function_call implementation rootProject.ext.dependencies.mogo_core_function_v2x + implementation rootProject.ext.dependencies.mogo_core_function_hmi }else { implementation project(":core:mogo-core-utils") implementation project(":foudations:mogo-commons") @@ -71,6 +72,7 @@ dependencies { implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') implementation project(':core:function-impl:mogo-core-function-v2x') + implementation project(':core:function-impl:mogo-core-function-hmi') } implementation project(':libraries:mogo-adas') diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt index d11780d5dc..a9a27faf36 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt @@ -9,7 +9,7 @@ import com.mogo.och.common.module.R /** * 带有title, tip,confirm,cancel的dialog */ -class OCHCommitDialog: com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog, LifecycleObserver { +class OCHCommitDialog: BaseFloatDialog, LifecycleObserver { private var commonConfirm : TextView? = null private var commonCancel : TextView? = null diff --git a/core/function-impl/mogo-core-function-autopilot/build.gradle b/core/function-impl/mogo-core-function-autopilot/build.gradle index a63ca70355..ba162e7500 100644 --- a/core/function-impl/mogo-core-function-autopilot/build.gradle +++ b/core/function-impl/mogo-core-function-autopilot/build.gradle @@ -66,7 +66,6 @@ dependencies { implementation project(':libraries:mogo-adas') } else { implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-service') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') diff --git a/core/function-impl/mogo-core-function-chat/build.gradle b/core/function-impl/mogo-core-function-chat/build.gradle index b016d5a2a4..ad0fdda3a6 100644 --- a/core/function-impl/mogo-core-function-chat/build.gradle +++ b/core/function-impl/mogo-core-function-chat/build.gradle @@ -70,7 +70,6 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_res } else { implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-service') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') diff --git a/core/function-impl/mogo-core-function-check/build.gradle b/core/function-impl/mogo-core-function-check/build.gradle index ffa5e9b62b..49bb6db089 100644 --- a/core/function-impl/mogo-core-function-check/build.gradle +++ b/core/function-impl/mogo-core-function-check/build.gradle @@ -70,7 +70,6 @@ dependencies { implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-service') //implementation project(':modules:mogo-module-carchattingprovider') implementation project(':core:mogo-core-data') diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java index aa31c60104..2638bf24e4 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java @@ -1,7 +1,10 @@ package com.mogo.eagle.core.function.check.view; +import android.app.Dialog; import android.content.Context; +import android.os.Build; import android.view.View; +import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; @@ -9,7 +12,6 @@ import androidx.annotation.NonNull; import com.mogo.eagle.core.function.call.check.CallerCheckManager; import com.mogo.eagle.core.function.check.R; -import com.mogo.module.common.dialog.BaseFloatDialog; /** * @author liujing @@ -17,13 +19,21 @@ import com.mogo.module.common.dialog.BaseFloatDialog; * 第一版本为添加长时间未检测的提示框,因为逻辑冲突,二期需求与产品确认,UI公用 * @since: 7/30/21 */ -public class CheckDialog extends BaseFloatDialog { +public class CheckDialog extends Dialog { private boolean showWarning; private Context mContext; public CheckDialog(@NonNull Context context, boolean hasError) { - super(context); + super(context,R.style.CheckInfoDialogStyle); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY); + } else { + getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); + } + getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN + | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION + | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE); mContext = context; showWarning = hasError; initView(); diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java index e61b7f2541..3fc27d82ac 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java @@ -1,6 +1,9 @@ package com.mogo.eagle.core.function.check.view; +import android.app.Dialog; import android.content.Context; +import android.os.Build; +import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.NonNull; @@ -9,7 +12,6 @@ import androidx.recyclerview.widget.GridLayoutManager; import com.mogo.eagle.core.function.check.R; import com.mogo.eagle.core.function.check.model.CheckItemInfo; import com.mogo.eagle.core.function.check.net.CheckResultData; -import com.mogo.module.common.dialog.BaseFloatDialog; import java.util.ArrayList; import java.util.List; @@ -19,7 +21,7 @@ import java.util.List; * @description 检测指标详情弹框 * @since: 9/22/21 */ -public class CheckInfoListDialog extends BaseFloatDialog { +public class CheckInfoListDialog extends Dialog { private static final String TAG = "CheckInfoListDialog"; private CheckInfoRecyclerView mRecyclerView; @@ -28,10 +30,18 @@ public class CheckInfoListDialog extends BaseFloatDialog { private int span; private String mStyle; private CheckResultData mCheckResultData; - private List result = new ArrayList<>(); + private final List result = new ArrayList<>(); public CheckInfoListDialog(@NonNull Context context, String style, CheckResultData checkResultData) { - super(context); + super(context,R.style.CheckInfoDialogStyle); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY); + } else { + getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); + } + getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN + | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION + | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE); mContext = context; mStyle = style; mCheckResultData = checkResultData; diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml index d965666262..be4393e839 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml @@ -46,7 +46,7 @@ android:gravity="center" android:text="角激光" android:textColor="@android:color/white" - android:textSize="@dimen/dp_32" + android:textSize="@dimen/dp_42" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -78,7 +78,7 @@ android:gravity="center" android:text="Pad" android:textColor="@android:color/white" - android:textSize="@dimen/dp_32" /> + android:textSize="@dimen/dp_42" /> + android:textSize="@dimen/dp_42" /> + android:textSize="@dimen/dp_42" /> + android:textSize="@dimen/dp_42" /> + android:textSize="@dimen/dp_42" /> + android:textSize="@dimen/dp_42" /> @@ -266,14 +266,14 @@ android:gravity="center" android:text="OBU" android:textColor="@android:color/white" - android:textSize="@dimen/dp_32" + android:textSize="@dimen/dp_42" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @drawable/check_progress @drawable/check_item_left_shape + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/DispatchBaseDialog.java b/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/DispatchBaseDialog.java index a946513bb5..d414f4c6ae 100644 --- a/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/DispatchBaseDialog.java +++ b/core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/DispatchBaseDialog.java @@ -1,16 +1,26 @@ package com.zhjt.dispatch; +import android.app.Dialog; import android.content.Context; +import android.os.Build; +import android.view.WindowManager; import androidx.annotation.NonNull; import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean; -import com.mogo.module.common.dialog.BaseFloatDialog; -public abstract class DispatchBaseDialog extends BaseFloatDialog { +public abstract class DispatchBaseDialog extends Dialog { public DispatchBaseDialog(@NonNull Context context) { - super(context); + super(context,R.style.Base_AlertDialog_AppCompat); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY); + } else { + getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); + } + getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN + | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION + | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE); } public abstract void addIDispatchRemindListener(IDispatchRemindClickListener listener); diff --git a/core/function-impl/mogo-core-function-dispatch/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-dispatch/src/main/res/values/styles.xml new file mode 100644 index 0000000000..c4912ff1e0 --- /dev/null +++ b/core/function-impl/mogo-core-function-dispatch/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index ccccc40f85..a20e15fcd9 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -114,7 +114,6 @@ dependencies { api project(':services:mogo-service-api') api project(':services:mogo-service') - api project(':modules:mogo-module-service') api project(':libraries:mogo-map') api project(':test:crashreport-upgrade') // api project(':test:crashreport-bugly') 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 1f8b24ae24..d2758973de 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 @@ -98,7 +98,6 @@ import com.mogo.eagle.core.utilcode.reminder.api.impl.* import com.mogo.eagle.core.utilcode.util.* import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String import com.mogo.map.MogoMap -import com.mogo.module.common.enums.* import com.zhidao.support.adas.high.common.MogoReport.Code.Error.EMAP.* import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import com.zhjt.service_biz.BizConfig diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt index 4caa7e4038..df4e2a1d15 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt @@ -1,15 +1,13 @@ package com.mogo.eagle.core.function.hmi.ui.widget -import android.content.* -import android.util.* -import android.view.* -import android.widget.* -import com.mogo.commons.* +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import android.widget.FrameLayout import com.mogo.eagle.core.function.hmi.R -import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.* -import com.mogo.map.* -import com.mogo.map.uicontroller.* -import com.mogo.module.common.constants.* +import com.mogo.map.MogoMapUIController +import com.mogo.map.uicontroller.VisualAngleMode import kotlinx.android.synthetic.main.view_perspective_switch.view.* /** @@ -34,17 +32,20 @@ class PerspectiveSwitchView @JvmOverloads constructor( if (MogoMapUIController.getInstance().currentMapVisualAngle.isLongSight) { // MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) // .visibleAllMarkers() - MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) + MogoMapUIController.getInstance() + .changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) textSwitch.setText(R.string.module_map_model_normal) } else if (MogoMapUIController.getInstance().currentMapVisualAngle.isMediumSight) { // MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) // .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS) - MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null) + MogoMapUIController.getInstance() + .changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null) textSwitch.setText(R.string.module_map_model_faster) } else { // MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) // .visibleAllMarkers() - MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) + MogoMapUIController.getInstance() + .changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) textSwitch.setText(R.string.module_map_model_normal) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java index d63f6bdaa4..a29dc98c19 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java @@ -22,7 +22,6 @@ public interface MogoModulesHandler { * 加载基本服务模块，需要不启动页面就能运行 *

* 1. v2x - * 2. mogo-module-service */ void loadBaseModule(); diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index b57b7098e4..87a85a74c5 100644 --- a/core/function-impl/mogo-core-function-map/build.gradle +++ b/core/function-impl/mogo-core-function-map/build.gradle @@ -94,7 +94,6 @@ dependencies { implementation project(":libraries:mogo-map") implementation project(":libraries:mogo-map-api") implementation project(':libraries:mogo-adas') - implementation project(':modules:mogo-module-service') } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java index 517c1e298d..8980c0f1ea 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java @@ -6,9 +6,9 @@ import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; import com.mogo.eagle.core.data.traffic.TrafficData; import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService; -import com.mogo.eagle.core.function.impl.marker.MarkerDrawer; -import com.mogo.eagle.core.function.impl.marker.TrafficMarkerDrawer; -import com.mogo.eagle.core.function.impl.marker.V2XWarnDataDrawer; +import com.mogo.eagle.core.function.impl.marker.drawer.MarkerDrawer; +import com.mogo.eagle.core.function.impl.marker.drawer.TrafficMarkerDrawer; +import com.mogo.eagle.core.function.impl.marker.drawer.V2XWarnDataDrawer; import com.mogo.map.marker.IMogoMarker; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/BaseDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java similarity index 90% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/BaseDrawer.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java index 3eee9cee29..b91a16170e 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/BaseDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java @@ -1,10 +1,11 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.drawer; import android.content.Context; import com.mogo.commons.AbsMogoApplication; -import com.mogo.module.common.R; +import com.mogo.eagle.core.function.impl.marker.AdasRecognizedType; +import com.mogo.eagle.core.function.map.R; /** * @author congtaowang diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MarkerDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java similarity index 95% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MarkerDrawer.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java index 871e5bd47e..63bba6385f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MarkerDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.drawer; import android.text.TextUtils; @@ -11,6 +11,10 @@ import com.mogo.eagle.core.data.map.entity.MarkerNoveltyInfo; import com.mogo.eagle.core.data.map.entity.MarkerOnlineCar; import com.mogo.eagle.core.data.map.entity.MarkerShareMusic; import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; +import com.mogo.eagle.core.function.impl.marker.view.EmptyMarkerView; +import com.mogo.eagle.core.function.impl.marker.view.IMarkerView; +import com.mogo.eagle.core.function.impl.marker.view.MapMarkerAdapter; +import com.mogo.eagle.core.function.impl.marker.view.OnlineCarMarkerView; import com.mogo.map.MogoMarkerManager; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/TrafficMarkerDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt similarity index 99% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/TrafficMarkerDrawer.kt rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt index 206f86b627..e4de659129 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/TrafficMarkerDrawer.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker +package com.mogo.eagle.core.function.impl.marker.drawer import android.annotation.SuppressLint import android.content.Context diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/V2XWarnDataDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/V2XWarnDataDrawer.java similarity index 96% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/V2XWarnDataDrawer.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/V2XWarnDataDrawer.java index e890aa878e..63b3c9f30b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/V2XWarnDataDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/V2XWarnDataDrawer.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.drawer; import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA; import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA; @@ -6,6 +6,8 @@ import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WAR import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.entity.MarkerLocation; import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; +import com.mogo.eagle.core.function.impl.marker.view.IMarkerView; +import com.mogo.eagle.core.function.impl.marker.view.MapMarkerAdapter; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.MogoMarkerManager; import com.mogo.map.marker.IMogoMarker; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/EmptyMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/EmptyMarkerView.java similarity index 94% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/EmptyMarkerView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/EmptyMarkerView.java index 33df70ab27..5dbe40c392 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/EmptyMarkerView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/EmptyMarkerView.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.view; import android.content.Context; import android.util.AttributeSet; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/IMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/IMarkerView.java similarity index 85% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/IMarkerView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/IMarkerView.java index 9f8a8ae9ae..dd5eba9d65 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/IMarkerView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/IMarkerView.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.view; import android.graphics.Bitmap; import android.view.View; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java similarity index 96% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java index a022bc145f..1a74ba53a8 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.view; import android.content.Context; import android.util.AttributeSet; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerAdapter.java similarity index 95% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerAdapter.java index 0559792de1..9102b50ca8 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.view; import static com.mogo.commons.module.ServiceConst.CARD_TYPE_USER_DATA; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerBaseView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java similarity index 98% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerBaseView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java index b007fecdea..527d352ed4 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerBaseView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.view; import android.content.Context; import android.graphics.Bitmap; @@ -12,15 +12,15 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; +import com.mogo.eagle.core.function.map.R; import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.eagle.core.utilcode.util.ViewUtils; import com.mogo.eagle.core.utilcode.util.WindowUtils; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.module.common.R; import com.mogo.eagle.core.utilcode.mogo.imageloader.IMogoImageLoaderListener; import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView; +import com.mogo.map.marker.IMogoMarker; +import com.mogo.map.marker.MogoMarkerOptions; /** * author : donghongyu diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java similarity index 98% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java index 5394de5de8..47bd5de1cf 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.view; import static com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/OnlineCarMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java similarity index 96% rename from core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/OnlineCarMarkerView.java rename to core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java index 71e01d88cb..e2faf4387b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/OnlineCarMarkerView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java @@ -1,12 +1,12 @@ -package com.mogo.eagle.core.function.impl.marker; +package com.mogo.eagle.core.function.impl.marker.view; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.view.View; import com.mogo.commons.AbsMogoApplication; +import com.mogo.eagle.core.function.map.R; import com.mogo.map.marker.IMogoMarker; -import com.mogo.module.common.R; import java.lang.ref.SoftReference; import java.util.HashMap; diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_default_user_head.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_default_user_head.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_default_user_head.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png deleted file mode 100644 index a51384a08e..0000000000 Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png deleted file mode 100644 index 33fbef70c4..0000000000 Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml index 357a944fac..d4b22ccc24 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml @@ -20,7 +20,7 @@ android:layout_width="@dimen/dp_60" android:layout_height="@dimen/dp_60" android:layout_gravity="center" - android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom" + android:layout_marginBottom="@dimen/dp_4" tools:src="@drawable/icon_map_marker_road_block_up2" /> diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml index 55f73ce388..47e48a0cf9 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml @@ -17,10 +17,10 @@ diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveNoticeHelper.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveNoticeHelper.java deleted file mode 100644 index d7bc443291..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveNoticeHelper.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.mogo.eagle.core.function.live; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MONITOR; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.text.TextUtils; - -import com.mogo.cloud.socket.entity.SocketDownData; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.function.monitoring.R; -import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.realtime.api.MoGoAiCloudRealTime; -import com.mogo.realtime.socket.IMogoCloudOnMsgListener; - - -/** - * vr模式下，摄像头消息 CameraLiveNoticeHelper - */ -public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener { - private static final String TAG = "CameraLiveNoticeHelper"; - private Context mContext; - private static IMogoMarker mMogoMarker; - private SocketDownData.CloudRoadDataProto mCloudRoadData; - private volatile boolean isVrMode; - private volatile boolean isVrModeMarker; - private volatile String mCurrentUuid; - - - public void init(Context context) { - mContext = context; - - MoGoAiCloudRealTime.registerOnMsgListener(this); - MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, new IMogoMarkerClickListener() { - @Override - public boolean onMarkerClicked(IMogoMarker marker) { - //点击的marker的具体数据 - if (mCloudRoadData != null && !TextUtils.isEmpty(mCloudRoadData.getRtmpUrl())) { - CameraLiveManager.getInstance().init(mCloudRoadData); - } else { - TipToast.shortTip("直播流地址为空"); - } - return false; - } - }); - - } - - public void release() { - MoGoAiCloudRealTime.unRegisterOnMsgListener(this); - MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA); - mCloudRoadData = null; - mContext = null; - } - - /** - * PushRoadConditionDrawer - * vr模式 - * - * @param roadData 道路数据 - */ - private void addVrCameraMarker(SocketDownData.CloudRoadDataProto roadData) { - CallerLogger.INSTANCE.e(M_MONITOR + TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl()); - if (!TextUtils.isEmpty(roadData.getRtmpUrl())) { - removeCameraMarker(); - MogoMarkerOptions options = new MogoMarkerOptions() - .data(roadData) - .latitude(roadData.getLat()) - .longitude(roadData.getLon()); - options.anchor(0.5f, 0.5f); - - Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null); - options.icon(bitmap); - mMogoMarker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(mContext) - .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options); - if (mMogoMarker != null) { - mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options)); - mMogoMarker.showInfoWindow(); - mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA); - } - } - } - - /** - * 普通模式 - * - * @param roadData 道路数据 - */ - private void addNormalCameraMarker(SocketDownData.CloudRoadDataProto roadData) { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "addNormalCameraMarker --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl()); - if (!TextUtils.isEmpty(roadData.getRtmpUrl())) { - removeCameraMarker(); - if (mMogoMarker != null) { - mMogoMarker.hideInfoWindow(); - } - MogoMarkerOptions options = new MogoMarkerOptions() - .data(roadData) - .latitude(roadData.getLat()) - .longitude(roadData.getLon()); - options.anchor(0.5f, 0.5f); - - Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null); - options.icon(bitmap); - mMogoMarker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(mContext) - .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options); - if (mMogoMarker != null) { - mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA); - } - } - } - - private void removeCameraMarker() { - if (mMogoMarker != null) { - mMogoMarker.remove(); - } - } - - private void renderMarker(SocketDownData.LauncherSnapshotProto obj) { - if (obj != null) { - if (obj.getCamera() != null && !TextUtils.isEmpty(obj.getCamera().getRtmpUrl())) { - mCloudRoadData = obj.getCamera(); - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + " ---isVrModeMarker = " + isVrModeMarker + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid()); - if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) { - if (isVrMode == isVrModeMarker) { - // do nothing. - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------1------------"); - } else { - if (isVrMode) { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------2------------"); - addVrCameraMarker(mCloudRoadData); - isVrModeMarker = true; - } else { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------3------------"); - addNormalCameraMarker(mCloudRoadData); - isVrModeMarker = false; - } - } - } else { - mCurrentUuid = mCloudRoadData.getUuid(); - // 是否需要延迟 - if (isVrMode) { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------4------------"); - addVrCameraMarker(mCloudRoadData); - isVrModeMarker = true; - } else { - CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------5------------"); - addNormalCameraMarker(mCloudRoadData); - isVrModeMarker = false; - } - } - } else { - //删除marker - if (obj.getCamera() != null) { - CallerLogger.INSTANCE.e(M_MONITOR + TAG, "onMsgReceived RtmpUrl() = " + obj.getCamera().getRtmpUrl()); - } else { - CallerLogger.INSTANCE.e(M_MONITOR + TAG, "obj.getCamera() == null ----------- "); - } - removeCameraMarker(); - } - } else { - CallerLogger.INSTANCE.e(M_MONITOR + TAG, "onMsgReceived obj == null "); - } - } - - @Override - public void onMsgSend(long id) { - // CallerLogger.INSTANCEger.d(M_MONITOR + TAG, "onMsgSend id : " + id); - } - - @Override - public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) { - renderMarker(mogoSnapshotSetData); - } - -} diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraWindow3DAdapter.java b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraWindow3DAdapter.java deleted file mode 100644 index 1e823d7499..0000000000 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraWindow3DAdapter.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.mogo.eagle.core.function.live; - -import android.content.Context; -import android.view.View; - -import com.mogo.map.marker.IMogoInfoWindowAdapter; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.module.common.drawer.marker.MapCameraInfoView; - -/** - * @author lixiaopeng - * @since 2020/12/16 - * 描述 - */ -public class CameraWindow3DAdapter implements IMogoInfoWindowAdapter { - private Context mContext; - private MogoMarkerOptions mOptions; - - public CameraWindow3DAdapter(Context context, MogoMarkerOptions options) { - this.mContext = context; - this.mOptions = options; - } - - @Override - public View getInfoWindow(IMogoMarker marker) { - return new MapCameraInfoView(mContext, mOptions); - } -} 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 029de4696f..12a1375c8e 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 @@ -796,7 +796,6 @@ class MogoPrivateObuManager private constructor() { * * @param appId 使用WarningTypeEnum获取icon、提示内容、tts内容 * - * @see com.mogo.module.common.enums.EventTypeEnum */ private fun handleSdkObu( appId: Int, diff --git a/core/function-impl/mogo-core-function-v2x/build.gradle b/core/function-impl/mogo-core-function-v2x/build.gradle index d3e3235a93..22c30dfdfe 100644 --- a/core/function-impl/mogo-core-function-v2x/build.gradle +++ b/core/function-impl/mogo-core-function-v2x/build.gradle @@ -65,7 +65,6 @@ dependencies { } else { implementation project(":foudations:mogo-commons") implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-service') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt index 4cf98fa202..5adc3dda75 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt @@ -25,7 +25,6 @@ import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.logger.* import com.mogo.map.* import com.mogo.map.overlay.* -import com.mogo.module.common.utils.* import io.netty.util.internal.* import java.lang.Runnable import java.util.* diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt index 3ac0858d07..971eec6f0b 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -12,7 +12,6 @@ import com.mogo.map.* import com.mogo.map.R.raw import com.mogo.map.marker.* import com.mogo.map.overlay.* -import com.mogo.module.common.utils.* import java.util.* import java.util.concurrent.atomic.* import kotlin.Pair diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml index 33a3d85876..31bfe9e10d 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -244,7 +244,7 @@ android:paddingLeft="@dimen/dp_40" android:paddingRight="@dimen/dp_40" android:textColor="@color/v2x_white" - android:textSize="@dimen/dp_32" /> + android:textSize="@dimen/dp_42" /> - - - - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 95ae6271ee..9c85f515c8 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -78,7 +78,7 @@ android:paddingBottom="@dimen/dp_3" android:text="待评价" android:textColor="#ffffff" - android:textSize="@dimen/panel_list_item_title_size" + android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="@+id/tagEventType" app:layout_constraintStart_toEndOf="@+id/tagEventType" app:layout_constraintTop_toTopOf="@+id/tagEventType" /> diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml index 759382f950..b2ce0e24cb 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml @@ -2,16 +2,16 @@ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java index e22a80b7bb..45666c116e 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java @@ -10,7 +10,7 @@ import com.mogo.map.marker.IMogoMarker; public interface IMogoMarkerService { /** - * @param object instance of com.mogo.module.common.entity.MarkerShowEntity + * @param object * @return */ @Nullable diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_default_user_head.png b/core/mogo-core-res/src/main/res/drawable-mdpi/icon_default_user_head.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-ldpi/icon_default_user_head.png rename to core/mogo-core-res/src/main/res/drawable-mdpi/icon_default_user_head.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_module_small_map_four_corners.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2_cursor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/map_api_ic_current_location2_cursor.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2_cursor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/map_api_ic_current_location2_cursor.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/map_bus_icon.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/map_bus_icon.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/map_bus_icon.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/map_bus_icon.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/map_car_icon.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/map_car_icon.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/map_car_icon.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/map_car_icon.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_close.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_close.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_close_press.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_close_press.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_close_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_vr.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_close_vr.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_unlike_selected_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_unlike_selected_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_unlike_selected_vr.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_unlike_selected_vr.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_unlike_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_unlike_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_unlike_vr.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_unlike_vr.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_ext_shadow_bkg_pressed.9.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_bkg.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_services_marker_bkg.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_bkg.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_services_marker_bkg.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_small_map_view_border.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_small_map_view_border.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_small_map_view_border_north.png diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png similarity index 100% rename from core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_small_map_view_my_location_logo.png diff --git a/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/selector_call_btn_normal.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/selector_call_btn_normal.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_like_selected_vr.png b/core/mogo-core-res/src/main/res/drawable-xxhdpi/module_common_icon_like_selected_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_like_selected_vr.png rename to core/mogo-core-res/src/main/res/drawable-xxhdpi/module_common_icon_like_selected_vr.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_like_vr.png b/core/mogo-core-res/src/main/res/drawable-xxhdpi/module_common_icon_like_vr.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_like_vr.png rename to core/mogo-core-res/src/main/res/drawable-xxhdpi/module_common_icon_like_vr.png diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_blue.xml b/core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_blue.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_blue.xml rename to core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_blue.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml b/core/mogo-core-res/src/main/res/drawable/module_common_close_selector.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml rename to core/mogo-core-res/src/main/res/drawable/module_common_close_selector.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector_vr.xml b/core/mogo-core-res/src/main/res/drawable/module_common_close_selector_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_common_close_selector_vr.xml rename to core/mogo-core-res/src/main/res/drawable/module_common_close_selector_vr.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_like_vr.xml b/core/mogo-core-res/src/main/res/drawable/module_common_like_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_common_like_vr.xml rename to core/mogo-core-res/src/main/res/drawable/module_common_like_vr.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml b/core/mogo-core-res/src/main/res/drawable/module_common_selector_call.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml rename to core/mogo-core-res/src/main/res/drawable/module_common_selector_call.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_unlike_vr.xml b/core/mogo-core-res/src/main/res/drawable/module_common_unlike_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_common_unlike_vr.xml rename to core/mogo-core-res/src/main/res/drawable/module_common_unlike_vr.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_dialog_bg.xml b/core/mogo-core-res/src/main/res/drawable/module_commons_dialog_bg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_dialog_bg.xml rename to core/mogo-core-res/src/main/res/drawable/module_commons_dialog_bg.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_dialog_left_bg.xml b/core/mogo-core-res/src/main/res/drawable/module_commons_dialog_left_bg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_dialog_left_bg.xml rename to core/mogo-core-res/src/main/res/drawable/module_commons_dialog_left_bg.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_dialog_right_bg.xml b/core/mogo-core-res/src/main/res/drawable/module_commons_dialog_right_bg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_dialog_right_bg.xml rename to core/mogo-core-res/src/main/res/drawable/module_commons_dialog_right_bg.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_dw_common_corner_bkg_light.xml b/core/mogo-core-res/src/main/res/drawable/module_dw_common_corner_bkg_light.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_dw_common_corner_bkg_light.xml rename to core/mogo-core-res/src/main/res/drawable/module_dw_common_corner_bkg_light.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_ext_drawable_shadow_bg.xml b/core/mogo-core-res/src/main/res/drawable/module_ext_drawable_shadow_bg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_ext_drawable_shadow_bg.xml rename to core/mogo-core-res/src/main/res/drawable/module_ext_drawable_shadow_bg.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png b/core/mogo-core-res/src/main/res/drawable/module_ext_shadow_bkg.9.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png rename to core/mogo-core-res/src/main/res/drawable/module_ext_shadow_bkg.9.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png b/core/mogo-core-res/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png rename to core/mogo-core-res/src/main/res/drawable/module_ext_shadow_bkg_pressed.9.png diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 7d019b799f..de34bc2082 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1,14 +1,1091 @@ + + + + -60px + -30px + -20px + -12px + -10px + -8px + -5px + -2px + -1px + 0px + 0.1px + 0.5px + 1px + 1.5px + 2px + 2.5px + 3px + 3.5px + 4px + 4.5px + 5px + 6px + 7px + 7.5px + 8px + 9px 10px + 11px + 12px + 13px + 14px + 15px + 16px + 17px + 18px + 19px 20px + 21px + 22px + 23px + 24px + 25px + 26px + 27px + 28px + 29px + 30px + 31px + 32px + 33px + 34px + 35px + 36px + 37px + 38px + 39px + 40px + 41px + 42px + 43px + 44px + 45px + 46px + 47px + 48px + 49px + 50px + 51px 52px + 53px + 54px + 55px + 56px + 57px + 58px + 59px + 60px + 61px + 62px + 63px + 64px 65px - 200px + 66px + 67px + 68px + 69px + 70px + 71px + 72px + 73px + 74px + 75px + 76px + 77px + 78px + 79px + 80px + 81px + 82px + 83px + 84px + 85px + 86px + 87px + 88px + 89px + 90px + 91px + 92px + 93px + 94px + 95px + 96px + 97px + 98px + 99px 100px + 101px + 102px + 103px + 104px + 104.5px + 105px + 106px + 107px + 108px + 109px + 110px + 111px + 112px + 113px + 114px + 115px + 116px + 117px + 118px + 119px + 120px + 121px + 122px + 123px + 124px + 125px + 126px + 127px + 128px + 129px + 130px + 131px + 132px + 133px + 134px + 134.5px + 135px + 136px + 137px + 138px + 139px + 140px + 141px + 142px + 143px + 144px + 145px + 146px + 147px + 148px + 149px + 150px + 151px + 152px + 153px + 154px + 155px + 156px + 157px + 158px + 159px + 160px + 161px + 162px + 163px + 164px + 165px + 166px + 167px + 168px + 169px + 170px + 171px + 172px + 173px + 174px + 175px + 176px + 177px + 178px + 179px + 180px + 181px + 182px + 183px + 184px + 185px + 186px + 187px + 188px + 189px + 190px + 191px + 191.25px + 192px + 193px + 194px + 195px + 196px + 197px + 198px + 199px + 200px + 201px + 202px + 203px + 204px + 205px + 206px + 207px + 208px + 209px + 210px + 211px + 212px + 213px + 214px + 215px + 216px + 217px + 218px + 219px + 220px + 221px + 222px + 223px + 224px + 225px + 226px + 227px + 228px + 229px + 230px + 231px + 232px + 233px + 234px + 235px + 236px + 237px + 238px + 239px + 240px + 241px + 242px + 243px + 244px + 245px + 246px + 247px + 248px + 249px + 250px + 251px + 252px + 253px + 254px + 255px + 256px + 257px + 258px + 259px + 260px + 261px + 262px + 263px + 264px + 265px + 266px + 267px + 268px + 269px + 270px + 271px + 272px + 273px + 274px + 275px + 276px + 277px + 278px + 279px + 280px + 281px + 282px + 283px + 284px + 285px + 286px + 287px + 288px + 289px + 290px + 291px + 292px + 293px + 294px + 295px + 296px + 297px + 298px + 299px + 300px + 301px + 302px + 303px + 304px + 305px + 306px + 307px + 308px + 309px + 310px + 311px + 312px + 313px + 314px + 315px + 316px + 317px + 318px + 319px + 320px + 321px + 322px + 323px + 324px + 325px + 326px + 327px + 328px + 329px + 330px + 331px + 332px + 333px + 334px + 335px + 336px + 337px + 338px + 339px + 340px + 341px + 342px + 343px + 344px + 345px + 346px + 347px + 348px + 349px + 350px + 351px + 352px + 353px + 354px + 355px + 356px + 357px + 358px + 359px + 366px + 367px + 368px + 369px + 370px + 371px + 372px + 373px + 374px + 375px + 376px + 377px + 378px + 379px + 380px + 381px + 382px + 383px + 384px + 385px + 386px + 387px + 388px + 389px + 390px + 391px + 392px + 393px + 394px + 395px + 396px + 397px + 398px + 399px + 400px + 401px + 402px + 403px + 404px + 405px + 406px + 407px + 408px + 409px + 410px + 411px + 412px + 413px + 414px + 415px + 416px + 417px + 418px + 419px + 420px + 421px + 422px + 423px + 424px + 425px + 426px + 427px + 428px + 429px + 430px + 431px + 432px + 433px + 434px + 435px + 436px + 437px + 438px + 439px + 440px + 441px + 442px + 443px + 444px + 445px + 446px + 447px + 448px + 449px + 450px + 451px + 452px + 453px + 454px + 455px + 456px + 457px + 458px + 459px + 460px + 461px + 462px + 463px + 464px + 465px + 466px + 467px + 468px + 469px + 470px + 471px + 472px + 473px + 474px + 475px + 476px + 477px + 478px + 479px + 480px + 481px + 482px + 483px + 484px + 485px + 486px + 487px + 488px + 489px + 490px + 491px + 492px + 493px + 494px + 495px + 496px + 497px + 498px + 499px + 500px + 501px + 502px + 503px + 504px + 505px + 506px + 507px + 508px + 509px + 510px + 511px + 512px + 513px + 514px + 515px + 516px + 517px + 518px + 519px + 520px + 521px + 522px + 523px + 524px + 525px + 526px + 527px + 528px + 529px + 530px + 531px + 532px + 533px + 534px + 535px + 536px + 537px + 538px + 539px + 540px + 541px + 542px + 543px + 544px + 545px + 546px + 547px + 548px + 549px + 550px + 551px + 552px + 553px + 554px + 555px + 556px + 557px + 558px + 559px + 560px + 561px + 562px + 563px + 564px + 565px + 566px + 567px + 568px + 569px + 570px + 571px + 572px + 573px + 574px + 575px + 576px + 577px + 578px + 579px + 580px + 581px + 582px + 583px + 584px + 585px + 586px + 587px + 588px + 589px + 590px + 591px + 592px + 593px + 594px + 595px + 596px + 597px + 598px + 599px + 600px + 601px + 602px + 603px + 604px + 605px + 606px + 607px + 608px + 609px + 610px + 611px + 612px + 613px + 614px + 615px + 616px + 617px + 618px + 619px + 620px + 621px + 622px + 623px + 624px + 625px + 626px + 627px + 628px + 629px + 630px + 631px + 632px + 633px + 634px + 635px + 636px + 637px + 638px + 639px + 640px + 641px + 642px + 643px + 644px + 645px + 646px + 647px + 648px + 649px + 650px + 651px + 652px + 653px + 654px + 655px + 656px + 657px + 658px + 659px + 660px + 661px + 662px + 663px + 664px + 665px + 666px + 667px + 668px + 669px + 670px + 671px + 672px + 673px + 674px + 675px + 676px + 677px + 678px + 679px + 680px + 681px + 682px + 683px + 684px + 685px + 686px + 687px + 688px + 689px + 690px + 691px + 692px + 693px + 694px + 695px + 696px + 697px + 698px + 699px + 700px + 701px + 702px + 703px + 704px + 705px + 706px + 707px + 708px + 709px + 710px + 711px + 712px + 713px + 714px + 715px + 716px + 717px + 718px + 719px + 720px + 721px + 722px + 723px + 724px + 725px + 726px + 727px + 728px + 729px + 730px + 731px + 732px + 733px + 734px + 735px + 736px + 737px + 738px + 739px + 740px + 741px + 742px + 743px + 744px + 745px + 746px + 747px + 748px + 749px + 750px + 751px + 752px + 753px + 754px + 755px + 756px + 757px + 758px + 759px + 760px + 761px + 762px + 763px + 764px + 765px + 766px + 767px + 768px + 769px + 770px + 771px + 772px + 773px + 774px + 775px + 776px + 777px + 778px + 779px + 780px + 781px + 782px + 783px + 784px + 785px + 786px + 787px + 788px + 789px + 790px + 791px + 792px + 793px + 794px + 795px + 796px + 797px + 798px + 799px + 800px + 801px + 802px + 803px + 804px + 805px + 806px + 807px + 808px + 809px + 810px + 811px + 812px + 813px + 814px + 815px + 816px + 817px + 818px + 819px + 820px + 821px + 822px + 823px + 824px + 825px + 826px + 827px + 828px + 829px + 830px + 831px + 832px + 833px + 834px + 835px + 836px + 837px + 838px + 839px + 840px + 841px + 842px + 843px + 844px + 845px + 846px + 847px + 848px + 849px + 850px + 851px + 852px + 853px + 854px + 855px + 856px + 857px + 858px + 859px + 860px + 861px + 862px + 863px + 864px + 865px + 866px + 867px + 868px + 869px + 870px + 871px + 872px + 873px + 874px + 875px + 876px + 877px + 878px + 879px + 880px + 881px + 882px + 883px + 884px + 885px + 886px + 887px + 888px + 889px + 890px + 891px + 892px + 893px + 894px + 895px + 896px + 897px + 898px + 899px + 900px + 901px + 902px + 903px + 904px + 905px + 906px + 907px + 908px + 909px + 910px + 911px + 912px + 913px + 914px + 915px + 916px + 917px + 918px + 919px + 920px + 921px + 922px + 923px + 924px + 925px + 926px + 927px + 928px + 929px + 930px + 931px + 932px + 933px + 934px + 935px + 936px + 937px + 938px + 939px + 940px + 941px + 942px + 943px + 944px + 945px + 946px + 947px + 948px + 949px + 950px + 951px + 952px + 953px + 954px + 955px + 956px + 957px + 958px + 959px + 960px + 961px + 962px + 963px + 964px + 965px + 966px + 967px + 968px + 969px + 970px + 971px + 972px + 973px + 974px + 975px + 976px + 977px + 978px + 979px + 980px + 981px + 982px + 983px + 984px + 985px + 986px + 987px + 988px + 989px + 990px + 991px + 992px + 993px + 994px + 995px + 996px + 997px + 998px + 999px + 1000px + 1100px 1200px + 1300px 1600px + 1920px + + + + + 6px + 7px + 8px + 9px + 10px + 11px + 12px + 13px + 14px + 15px + 16px + 17px + 18px + 19px + 20px + 21px + 22px + 23px + 24px + 25px + 28px + 30px + 32px + 34px + 36px + 38px + 40px + 42px + 46px + 48px + 76px + 120px + + + 50px + 36px + 151px + 33px + 102px + 26px + 30px + 34px + 9px + 40px + 20px + 70px + 16px + 21px + 28px + 45px + 22px + 42px + 20px + 34px + 28px + 60px + 22.5px + + 300px 300px 60px diff --git a/modules.txt b/modules.txt index cb16026052..b952d62967 100644 --- a/modules.txt +++ b/modules.txt @@ -21,7 +21,6 @@ :test:crashreport-noop :test:crashreport-upgrade :core:function-impl:mogo-core-function-obu-mogo -:modules:mogo-module-service :core:function-impl:mogo-core-function-check :services:mogo-service :core:function-impl:mogo-core-function-autopilot diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index ae3ef8c046..6406ea586a 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -16,7 +16,6 @@ android { versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' //ARouter apt 参数 kapt { @@ -30,7 +29,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/modules/mogo-module-common/consumer-rules.pro b/modules/mogo-module-common/consumer-rules.pro deleted file mode 100644 index f337687df3..0000000000 --- a/modules/mogo-module-common/consumer-rules.pro +++ /dev/null @@ -1 +0,0 @@ -#-----CommonModule----- diff --git a/modules/mogo-module-common/proguard-rules.pro b/modules/mogo-module-common/proguard-rules.pro deleted file mode 100644 index 815a04c16c..0000000000 --- a/modules/mogo-module-common/proguard-rules.pro +++ /dev/null @@ -1,23 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile - -#-----CommonModule----- diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_car_red.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_car_red.png deleted file mode 100644 index 86df8de9b4..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_car_red.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/module_common_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/module_common_default_user_head.png deleted file mode 100644 index 726124020a..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/module_common_default_user_head.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_accident_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_accident_small.png deleted file mode 100644 index 815dc5b40c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_accident_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png deleted file mode 100644 index 658a74c2e4..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png deleted file mode 100644 index 33e7d8873e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png deleted file mode 100644 index d8c73a8404..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png deleted file mode 100644 index 28f0db939b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png deleted file mode 100644 index 7a1c124871..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png deleted file mode 100644 index 0efac11676..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png deleted file mode 100644 index 06163dda3f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png deleted file mode 100644 index dcef2a496c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png deleted file mode 100644 index 37ed59c3b4..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png deleted file mode 100644 index 23aaf88e60..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_small.png deleted file mode 100644 index c93bd218fb..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png deleted file mode 100644 index 3901854251..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png deleted file mode 100644 index 698b84ffbc..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png deleted file mode 100644 index 632d1e5ad3..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png deleted file mode 100644 index 0a255cbe93..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png deleted file mode 100644 index c25514506f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png deleted file mode 100644 index bdba45d7e0..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_1.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_1.png deleted file mode 100644 index 174477c2fc..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_1.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_11.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_11.png deleted file mode 100644 index 8738be70b0..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_11.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_16.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_16.png deleted file mode 100644 index 214f478744..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_16.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_2.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_2.png deleted file mode 100644 index 1f4a2feed3..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_3.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_3.png deleted file mode 100644 index 94af8b123e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_3.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_5.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_5.png deleted file mode 100644 index d639a60d25..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_5.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_6.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_6.png deleted file mode 100644 index 897581cb7c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_6.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_7.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_7.png deleted file mode 100644 index 70494e5cdb..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_7.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_8.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_8.png deleted file mode 100644 index 1dc21e8b40..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_8.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_9.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_9.png deleted file mode 100644 index 5d34a4cb45..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_9.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_express.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_express.png deleted file mode 100644 index 6d29d53b7c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_express.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png deleted file mode 100644 index 06c554c25c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png deleted file mode 100644 index 51038d26f4..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_default_user_head.png deleted file mode 100644 index a1349fc088..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_default_user_head.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/module_common_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/module_common_default_user_head.png deleted file mode 100644 index 726124020a..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/module_common_default_user_head.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png deleted file mode 100644 index df3b80e92c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_accident_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_accident_small.png deleted file mode 100644 index afb24a513b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_accident_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_daolushigong_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_daolushigong_small.png deleted file mode 100644 index 0a9bd75fb4..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_daolushigong_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_fenglu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_fenglu_small.png deleted file mode 100644 index 9ec480e6ad..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_fenglu_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiaotongjiancha_small.png deleted file mode 100644 index e466283c43..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiaotongjiancha_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiebing_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiebing_small.png deleted file mode 100644 index aad0a13730..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiebing_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jishui_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jishui_small.png deleted file mode 100644 index aeaf6b9b67..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jishui_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_nongwu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_nongwu_small.png deleted file mode 100644 index 412c1eafa5..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_nongwu_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_shishilukuang_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_shishilukuang_small.png deleted file mode 100644 index ae021bc829..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_shishilukuang_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_yongdu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_yongdu_small.png deleted file mode 100644 index 6f6083dc10..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_yongdu_small.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png deleted file mode 100644 index 8ac13e867f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png deleted file mode 100644 index 6c74ff6d78..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png deleted file mode 100644 index 2a1ca48c62..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png deleted file mode 100644 index e6f2ee2d5c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png deleted file mode 100644 index 94af8b123e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png deleted file mode 100644 index f9f29cbe61..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png deleted file mode 100644 index 28c6860a3c..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png deleted file mode 100644 index 72fbb4359f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png deleted file mode 100644 index 148086c831..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png deleted file mode 100644 index 7ad3b4abb5..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png deleted file mode 100644 index 7e260c5693..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png deleted file mode 100644 index c8ce535e58..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png deleted file mode 100644 index ed1542ea36..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/common_marker_bottom_floor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/common_marker_bottom_floor.png deleted file mode 100644 index a46f85caff..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/common_marker_bottom_floor.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png deleted file mode 100644 index 2c7b60f98d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png deleted file mode 100644 index 128d8259b6..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second_other.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second_other.png deleted file mode 100644 index 1c49555541..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second_other.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png deleted file mode 100644 index c5965e9414..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose_other.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose_other.png deleted file mode 100644 index 09ab4af9e3..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose_other.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png deleted file mode 100644 index d4266a6bc5..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_gray_selected.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_gray_selected.png deleted file mode 100644 index 725a560b4f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_gray_selected.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type2.png deleted file mode 100644 index 10221fcb01..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png deleted file mode 100644 index 74f12e781d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png deleted file mode 100644 index db23ff7144..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png deleted file mode 100644 index 1c929ca8a0..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png deleted file mode 100644 index afe1372cb9..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png deleted file mode 100644 index 0b363c6d61..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png deleted file mode 100644 index f05356795e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png deleted file mode 100644 index eca4f04cef..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png deleted file mode 100644 index 8c6b30842b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png deleted file mode 100644 index 29fd407dca..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_default_user_head.png deleted file mode 100644 index baa717be4d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_default_user_head.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_parking2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_parking2.png deleted file mode 100644 index 8026654bdf..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_parking2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_4s.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_4s.png deleted file mode 100644 index 11c5c6ea7b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_4s.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_refuel.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_refuel.png deleted file mode 100644 index bac7ee2e40..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_refuel.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shear_news.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shear_news.png deleted file mode 100644 index f446cba155..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shear_news.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop.png deleted file mode 100644 index d8be56fd47..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop_discount.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop_discount.png deleted file mode 100644 index 97e8a4967b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop_discount.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_call.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_call.png deleted file mode 100644 index 9a9321b3a6..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_call.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident.png deleted file mode 100644 index 8dd43b20a7..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident2.png deleted file mode 100644 index 1e61298d35..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png deleted file mode 100755 index fe68bc7cba..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png deleted file mode 100755 index 911bee2df4..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog.png deleted file mode 100644 index 61296d59d2..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2.png deleted file mode 100755 index 787101fbb1..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png deleted file mode 100755 index b6164bcfdd..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze.png deleted file mode 100644 index ea07251424..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2.png deleted file mode 100755 index d34779845e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png deleted file mode 100755 index 353cfefec6..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png deleted file mode 100644 index 5923d114f6..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png deleted file mode 100644 index dbc420e8e6..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_parking.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_parking.png deleted file mode 100644 index 33cb8fd3ce..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_parking.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_parking2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_parking2.png deleted file mode 100644 index 8026654bdf..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_parking2.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery.png deleted file mode 100644 index f11b4a4178..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery_light.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery_light.png deleted file mode 100644 index e78307acd8..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery_light.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_seek_helping.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_seek_helping.png deleted file mode 100755 index aa6eb75043..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_service_ic_seek_helping.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png deleted file mode 100644 index c597a3f1d0..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png deleted file mode 100644 index dffedc1725..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png deleted file mode 100644 index 5cbd0c6809..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png deleted file mode 100644 index a940b46a7a..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png deleted file mode 100644 index b3420a00d7..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png deleted file mode 100644 index 9c33431aae..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png deleted file mode 100644 index 5480b6d165..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png deleted file mode 100644 index f6e145dbea..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png deleted file mode 100644 index e530db6a3d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_fenglu.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_fenglu.png deleted file mode 100644 index b3328eba18..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_fenglu.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigu.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigu.png deleted file mode 100644 index 91f9827041..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigu.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_express.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_express.png deleted file mode 100644 index 7e260c5693..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_express.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_taxi.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_taxi.png deleted file mode 100644 index c8ce535e58..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_taxi.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_map_marker_yellow_info.xml b/modules/mogo-module-common/src/main/res/drawable/bg_map_marker_yellow_info.xml deleted file mode 100644 index b2be8e312e..0000000000 --- a/modules/mogo-module-common/src/main/res/drawable/bg_map_marker_yellow_info.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_shape_reverse_yellow.xml b/modules/mogo-module-common/src/main/res/drawable/bg_shape_reverse_yellow.xml deleted file mode 100644 index 6bc80c96dc..0000000000 --- a/modules/mogo-module-common/src/main/res/drawable/bg_shape_reverse_yellow.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_cancel_help.xml b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_cancel_help.xml deleted file mode 100644 index 8882692332..0000000000 --- a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_cancel_help.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png deleted file mode 100644 index a2d1364f83..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png deleted file mode 100644 index eff1afe5a3..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_second_other.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second_other.png deleted file mode 100644 index e26dbe8a7b..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_second_other.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png deleted file mode 100644 index 919c363a9d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose_other.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose_other.png deleted file mode 100644 index c1dbeacc1d..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose_other.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_default_user_head.png b/modules/mogo-module-common/src/main/res/drawable/module_common_default_user_head.png deleted file mode 100644 index 726124020a..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/module_common_default_user_head.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml deleted file mode 100644 index ee83cb56c4..0000000000 --- a/modules/mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/sr.png b/modules/mogo-module-common/src/main/res/drawable/sr.png deleted file mode 100644 index 2836c8de09..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/sr.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable/sy.png b/modules/mogo-module-common/src/main/res/drawable/sy.png deleted file mode 100644 index 6ce0a5dbbc..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable/sy.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml deleted file mode 100644 index 1d6dc7be07..0000000000 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 12px - 14px - 20px - 22px - 43px - 50px - 57px - 60px - 72px - 80px - 88px - 26px - 30px - 270px - 320px - 616px - 630px - diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml deleted file mode 100644 index 13f48cd860..0000000000 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 12px - 42px - 628px - 188px - 120px - 26px - 37px - 435px - 186px - 120px - 37px - 27px - 20px - 22px - 88px - 90px - 144px - 186px - 300px - 328px - 730px - 1600px - 630px - diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml deleted file mode 100644 index e7abac6002..0000000000 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,1121 +0,0 @@ - - - - - - -60px - -30px - -20px - -12px - -10px - -8px - -5px - -2px - -1px - 0px - 0.1px - 0.5px - 1px - 1.5px - 2px - 2.5px - 3px - 3.5px - 4px - 4.5px - 5px - 6px - 7px - 7.5px - 8px - 9px - 10px - 11px - 12px - 13px - 14px - 15px - 16px - 17px - 18px - 19px - 20px - 21px - 22px - 23px - 24px - 25px - 26px - 27px - 28px - 29px - 30px - 31px - 32px - 33px - 34px - 35px - 36px - 37px - 38px - 39px - 40px - 41px - 42px - 43px - 44px - 45px - 46px - 47px - 48px - 49px - 50px - 51px - 52px - 53px - 54px - 55px - 56px - 57px - 58px - 59px - 60px - 61px - 62px - 63px - 64px - 65px - 66px - 67px - 68px - 69px - 70px - 71px - 72px - 73px - 74px - 75px - 76px - 77px - 78px - 79px - 80px - 81px - 82px - 83px - 84px - 85px - 86px - 87px - 88px - 89px - 90px - 91px - 92px - 93px - 94px - 95px - 96px - 97px - 98px - 99px - 100px - 101px - 102px - 103px - 104px - 104.5px - 105px - 106px - 107px - 108px - 109px - 110px - 111px - 112px - 113px - 114px - 115px - 116px - 117px - 118px - 119px - 120px - 121px - 122px - 123px - 124px - 125px - 126px - 127px - 128px - 129px - 130px - 131px - 132px - 133px - 134px - 134.5px - 135px - 136px - 137px - 138px - 139px - 140px - 141px - 142px - 143px - 144px - 145px - 146px - 147px - 148px - 149px - 150px - 151px - 152px - 153px - 154px - 155px - 156px - 157px - 158px - 159px - 160px - 161px - 162px - 163px - 164px - 165px - 166px - 167px - 168px - 169px - 170px - 171px - 172px - 173px - 174px - 175px - 176px - 177px - 178px - 179px - 180px - 181px - 182px - 183px - 184px - 185px - 186px - 187px - 188px - 189px - 190px - 191px - 191.25px - 192px - 193px - 194px - 195px - 196px - 197px - 198px - 199px - 200px - 201px - 202px - 203px - 204px - 205px - 206px - 207px - 208px - 209px - 210px - 211px - 212px - 213px - 214px - 215px - 216px - 217px - 218px - 219px - 220px - 221px - 222px - 223px - 224px - 225px - 226px - 227px - 228px - 229px - 230px - 231px - 232px - 233px - 234px - 235px - 236px - 237px - 238px - 239px - 240px - 241px - 242px - 243px - 244px - 245px - 246px - 247px - 248px - 249px - 250px - 251px - 252px - 253px - 254px - 255px - 256px - 257px - 258px - 259px - 260px - 261px - 262px - 263px - 264px - 265px - 266px - 267px - 268px - 269px - 270px - 271px - 272px - 273px - 274px - 275px - 276px - 277px - 278px - 279px - 280px - 281px - 282px - 283px - 284px - 285px - 286px - 287px - 288px - 289px - 290px - 291px - 292px - 293px - 294px - 295px - 296px - 297px - 298px - 299px - 300px - 301px - 302px - 303px - 304px - 305px - 306px - 307px - 308px - 309px - 310px - 311px - 312px - 313px - 314px - 315px - 316px - 317px - 318px - 319px - 320px - 321px - 322px - 323px - 324px - 325px - 326px - 327px - 328px - 329px - 330px - 331px - 332px - 333px - 334px - 335px - 336px - 337px - 338px - 339px - 340px - 341px - 342px - 343px - 344px - 345px - 346px - 347px - 348px - 349px - 350px - 351px - 352px - 353px - 354px - 355px - 356px - 357px - 358px - 359px - 366px - 367px - 368px - 369px - 370px - 371px - 372px - 373px - 374px - 375px - 376px - 377px - 378px - 379px - 380px - 381px - 382px - 383px - 384px - 385px - 386px - 387px - 388px - 389px - 390px - 391px - 392px - 393px - 394px - 395px - 396px - 397px - 398px - 399px - 400px - 401px - 402px - 403px - 404px - 405px - 406px - 407px - 408px - 409px - 410px - 411px - 412px - 413px - 414px - 415px - 416px - 417px - 418px - 419px - 420px - 421px - 422px - 423px - 424px - 425px - 426px - 427px - 428px - 429px - 430px - 431px - 432px - 433px - 434px - 435px - 436px - 437px - 438px - 439px - 440px - 441px - 442px - 443px - 444px - 445px - 446px - 447px - 448px - 449px - 450px - 451px - 452px - 453px - 454px - 455px - 456px - 457px - 458px - 459px - 460px - 461px - 462px - 463px - 464px - 465px - 466px - 467px - 468px - 469px - 470px - 471px - 472px - 473px - 474px - 475px - 476px - 477px - 478px - 479px - 480px - 481px - 482px - 483px - 484px - 485px - 486px - 487px - 488px - 489px - 490px - 491px - 492px - 493px - 494px - 495px - 496px - 497px - 498px - 499px - 500px - 501px - 502px - 503px - 504px - 505px - 506px - 507px - 508px - 509px - 510px - 511px - 512px - 513px - 514px - 515px - 516px - 517px - 518px - 519px - 520px - 521px - 522px - 523px - 524px - 525px - 526px - 527px - 528px - 529px - 530px - 531px - 532px - 533px - 534px - 535px - 536px - 537px - 538px - 539px - 540px - 541px - 542px - 543px - 544px - 545px - 546px - 547px - 548px - 549px - 550px - 551px - 552px - 553px - 554px - 555px - 556px - 557px - 558px - 559px - 560px - 561px - 562px - 563px - 564px - 565px - 566px - 567px - 568px - 569px - 570px - 571px - 572px - 573px - 574px - 575px - 576px - 577px - 578px - 579px - 580px - 581px - 582px - 583px - 584px - 585px - 586px - 587px - 588px - 589px - 590px - 591px - 592px - 593px - 594px - 595px - 596px - 597px - 598px - 599px - 600px - 601px - 602px - 603px - 604px - 605px - 606px - 607px - 608px - 609px - 610px - 611px - 612px - 613px - 614px - 615px - 616px - 617px - 618px - 619px - 620px - 621px - 622px - 623px - 624px - 625px - 626px - 627px - 628px - 629px - 630px - 631px - 632px - 633px - 634px - 635px - 636px - 637px - 638px - 639px - 640px - 641px - 642px - 643px - 644px - 645px - 646px - 647px - 648px - 649px - 650px - 651px - 652px - 653px - 654px - 655px - 656px - 657px - 658px - 659px - 660px - 661px - 662px - 663px - 664px - 665px - 666px - 667px - 668px - 669px - 670px - 671px - 672px - 673px - 674px - 675px - 676px - 677px - 678px - 679px - 680px - 681px - 682px - 683px - 684px - 685px - 686px - 687px - 688px - 689px - 690px - 691px - 692px - 693px - 694px - 695px - 696px - 697px - 698px - 699px - 700px - 701px - 702px - 703px - 704px - 705px - 706px - 707px - 708px - 709px - 710px - 711px - 712px - 713px - 714px - 715px - 716px - 717px - 718px - 719px - 720px - 721px - 722px - 723px - 724px - 725px - 726px - 727px - 728px - 729px - 730px - 731px - 732px - 733px - 734px - 735px - 736px - 737px - 738px - 739px - 740px - 741px - 742px - 743px - 744px - 745px - 746px - 747px - 748px - 749px - 750px - 751px - 752px - 753px - 754px - 755px - 756px - 757px - 758px - 759px - 760px - 761px - 762px - 763px - 764px - 765px - 766px - 767px - 768px - 769px - 770px - 771px - 772px - 773px - 774px - 775px - 776px - 777px - 778px - 779px - 780px - 781px - 782px - 783px - 784px - 785px - 786px - 787px - 788px - 789px - 790px - 791px - 792px - 793px - 794px - 795px - 796px - 797px - 798px - 799px - 800px - 801px - 802px - 803px - 804px - 805px - 806px - 807px - 808px - 809px - 810px - 811px - 812px - 813px - 814px - 815px - 816px - 817px - 818px - 819px - 820px - 821px - 822px - 823px - 824px - 825px - 826px - 827px - 828px - 829px - 830px - 831px - 832px - 833px - 834px - 835px - 836px - 837px - 838px - 839px - 840px - 841px - 842px - 843px - 844px - 845px - 846px - 847px - 848px - 849px - 850px - 851px - 852px - 853px - 854px - 855px - 856px - 857px - 858px - 859px - 860px - 861px - 862px - 863px - 864px - 865px - 866px - 867px - 868px - 869px - 870px - 871px - 872px - 873px - 874px - 875px - 876px - 877px - 878px - 879px - 880px - 881px - 882px - 883px - 884px - 885px - 886px - 887px - 888px - 889px - 890px - 891px - 892px - 893px - 894px - 895px - 896px - 897px - 898px - 899px - 900px - 901px - 902px - 903px - 904px - 905px - 906px - 907px - 908px - 909px - 910px - 911px - 912px - 913px - 914px - 915px - 916px - 917px - 918px - 919px - 920px - 921px - 922px - 923px - 924px - 925px - 926px - 927px - 928px - 929px - 930px - 931px - 932px - 933px - 934px - 935px - 936px - 937px - 938px - 939px - 940px - 941px - 942px - 943px - 944px - 945px - 946px - 947px - 948px - 949px - 950px - 951px - 952px - 953px - 954px - 955px - 956px - 957px - 958px - 959px - 960px - 961px - 962px - 963px - 964px - 965px - 966px - 967px - 968px - 969px - 970px - 971px - 972px - 973px - 974px - 975px - 976px - 977px - 978px - 979px - 980px - 981px - 982px - 983px - 984px - 985px - 986px - 987px - 988px - 989px - 990px - 991px - 992px - 993px - 994px - 995px - 996px - 997px - 998px - 999px - 1000px - 1100px - 1200px - 1300px - 1920px - - - - - 6px - 7px - 8px - 9px - 10px - 11px - 12px - 13px - 14px - 15px - 16px - 17px - 18px - 19px - 20px - 21px - 22px - 23px - 24px - 25px - 28px - 30px - 32px - 34px - 36px - 38px - 40px - 42px - 46px - 48px - 76px - 120px - - 35px - 35px - 8px - - - 1000px - 390px - 200px - 200px - 10px - 10px - 100px - 80px - 80px - 24px - 20px - 120px - 20px - - - 36px - 50px - 36px - 151px - 33px - 102px - 26px - 30px - 34px - 9px - 40px - 20px - 70px - 16px - 21px - 28px - 45px - 22px - 42px - 20px - 34px - 28px - 60px - 22.5px - - 360px - 63px - 96px - 470px - 140px - 100px - 28px - 30px - 28px - 320px - 140px - 28px - 20px - 100px - - diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml deleted file mode 100644 index f3c22e1a08..0000000000 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ /dev/null @@ -1,1099 +0,0 @@ - - - -32.8125px - -16.4062px - -10.9375px - -6.5625px - -5.4688px - -4.3750px - -2.7344px - -1.0938px - -0.5469px - 0.0000px - 0.0547px - 0.2734px - 0.5469px - 0.8203px - 1.0938px - 1.3672px - 1.6406px - 1.9141px - 2.1875px - 2.4609px - 2.7344px - 3.2812px - 3.8281px - 4.1016px - 4.3750px - 4.9219px - 5.4688px - 6.0156px - 6.5625px - 7.1094px - 7.6562px - 8.2031px - 8.7500px - 9.2969px - 9.8438px - 10.3906px - 10.9375px - 11.4844px - 12.0312px - 12.5781px - 13.1250px - 13.6719px - 14px - 14.7656px - 15.3125px - 15.8594px - 16.4062px - 16.9531px - 17.5000px - 18.0469px - 18.5938px - 19.1406px - 19.6875px - 20.2344px - 20.7812px - 21.3281px - 21.8750px - 22.4219px - 22.9688px - 23.5156px - 24.0625px - 24.6094px - 25.1562px - 25.7031px - 26.2500px - 26.7969px - 27.3438px - 27.8906px - 28.4375px - 28.9844px - 29.5312px - 30.0781px - 30.6250px - 31.1719px - 31.7188px - 32.2656px - 32.8125px - 33.3594px - 33.9062px - 34.4531px - 35.0000px - 35.5469px - 36.0938px - 36.6406px - 37.1875px - 37.7344px - 38.2812px - 38.8281px - 39.3750px - 39.9219px - 40.4688px - 41.0156px - 41.5625px - 42.1094px - 42.6562px - 43.2031px - 43.7500px - 44.2969px - 44.8438px - 45.3906px - 45.9375px - 46.4844px - 47.0312px - 47.5781px - 48.1250px - 48.6719px - 49.2188px - 49.7656px - 50.3125px - 50.8594px - 51.4062px - 51.9531px - 52.5000px - 53.0469px - 53.5938px - 54.1406px - 54.6875px - 55.2344px - 55.7812px - 56.3281px - 56.8750px - 57.1484px - 57.4219px - 57.9688px - 58.5156px - 59.0625px - 59.6094px - 60.1562px - 60.7031px - 61.2500px - 61.7969px - 62.3438px - 62.8906px - 63.4375px - 63.9844px - 64.5312px - 65.0781px - 65.6250px - 66.1719px - 66.7188px - 67.2656px - 67.8125px - 68.3594px - 68.9062px - 69.4531px - 70.0000px - 70.5469px - 71.0938px - 71.6406px - 72.1875px - 72.7344px - 73.2812px - 73.5547px - 73.8281px - 74.3750px - 74.9219px - 75.4688px - 76.0156px - 76.5625px - 77.1094px - 77.6562px - 78.2031px - 78.7500px - 79.2969px - 79.8438px - 80.3906px - 80.9375px - 81.4844px - 82.0312px - 82.5781px - 83.1250px - 83.6719px - 84.2188px - 84.7656px - 85.3125px - 85.8594px - 86.4062px - 86.9531px - 87.5000px - 88.0469px - 88.5938px - 89.1406px - 89.6875px - 90.2344px - 90.7812px - 91.3281px - 91.8750px - 92.4219px - 92.9688px - 93.5156px - 94.0625px - 94.6094px - 95.1562px - 95.7031px - 96.2500px - 96.7969px - 97.3438px - 97.8906px - 98.4375px - 98.9844px - 99.5312px - 100.0781px - 100.6250px - 101.1719px - 101.7188px - 102.2656px - 102.8125px - 103.3594px - 103.9062px - 104.4531px - 104.5898px - 105.0000px - 105.5469px - 106.0938px - 106.6406px - 107.1875px - 107.7344px - 108.2812px - 108.8281px - 109.3750px - 109.9219px - 110.4688px - 111.0156px - 111.5625px - 112.1094px - 112.6562px - 113.2031px - 113.7500px - 114.2969px - 114.8438px - 115.3906px - 115.9375px - 116.4844px - 117.0312px - 117.5781px - 118.1250px - 118.6719px - 119.2188px - 119.7656px - 120.3125px - 120.8594px - 121.4062px - 121.9531px - 122.5000px - 123.0469px - 123.5938px - 124.1406px - 124.6875px - 125.2344px - 125.7812px - 126.3281px - 126.8750px - 127.4219px - 127.9688px - 128.5156px - 129.0625px - 129.6094px - 130.1562px - 130.7031px - 131.2500px - 131.7969px - 132.3438px - 132.8906px - 133.4375px - 133.9844px - 134.5312px - 135.0781px - 135.6250px - 136.1719px - 136.7188px - 137.2656px - 137.8125px - 138.3594px - 138.9062px - 139.4531px - 140.0000px - 140.5469px - 141.0938px - 141.6406px - 142.1875px - 142.7344px - 143.2812px - 143.8281px - 144.3750px - 144.9219px - 145.4688px - 146.0156px - 146.5625px - 147.1094px - 147.6562px - 148.2031px - 148.7500px - 149.2969px - 149.8438px - 150.3906px - 150.9375px - 151.4844px - 152.0312px - 152.5781px - 153.1250px - 153.6719px - 154.2188px - 154.7656px - 155.3125px - 155.8594px - 156.4062px - 156.9531px - 157.5000px - 158.0469px - 158.5938px - 159.1406px - 159.6875px - 160.2344px - 160.7812px - 161.3281px - 161.8750px - 162.4219px - 162.9688px - 163.5156px - 164.0625px - 164.6094px - 165.1562px - 165.7031px - 166.2500px - 166.7969px - 167.3438px - 167.8906px - 168.4375px - 168.9844px - 169.5312px - 170.0781px - 170.6250px - 171.1719px - 171.7188px - 172.2656px - 172.8125px - 173.3594px - 173.9062px - 174.4531px - 175.0000px - 175.5469px - 176.0938px - 176.6406px - 177.1875px - 177.7344px - 178.2812px - 178.8281px - 179.3750px - 179.9219px - 180.4688px - 181.0156px - 181.5625px - 182.1094px - 182.6562px - 183.2031px - 183.7500px - 184.2969px - 184.8438px - 185.3906px - 185.9375px - 186.4844px - 187.0312px - 187.5781px - 188.1250px - 188.6719px - 189.2188px - 189.7656px - 190.3125px - 190.8594px - 191.4062px - 191.9531px - 192.5000px - 193.0469px - 193.5938px - 194.1406px - 194.6875px - 195.2344px - 195.7812px - 196.3281px - 200.1562px - 200.7031px - 201.2500px - 201.7969px - 202.3438px - 202.8906px - 203.4375px - 203.9844px - 204.5312px - 205.0781px - 205.6250px - 206.1719px - 206.7188px - 207.2656px - 207.8125px - 208.3594px - 208.9062px - 209.4531px - 210.0000px - 210.5469px - 211.0938px - 211.6406px - 212.1875px - 212.7344px - 213.2812px - 213.8281px - 214.3750px - 214.9219px - 215.4688px - 216.0156px - 216.5625px - 217.1094px - 217.6562px - 218.2031px - 218.7500px - 219.2969px - 219.8438px - 220.3906px - 220.9375px - 221.4844px - 222.0312px - 222.5781px - 223.1250px - 223.6719px - 224.2188px - 224.7656px - 225.3125px - 225.8594px - 226.4062px - 226.9531px - 227.5000px - 228.0469px - 228.5938px - 229.1406px - 229.6875px - 230.2344px - 230.7812px - 231.3281px - 231.8750px - 232.4219px - 232.9688px - 233.5156px - 234.0625px - 234.6094px - 235.1562px - 235.7031px - 236.2500px - 236.7969px - 237.3438px - 237.8906px - 238.4375px - 238.9844px - 239.5312px - 240.0781px - 240.6250px - 241.1719px - 241.7188px - 242.2656px - 242.8125px - 243.3594px - 243.9062px - 244.4531px - 245.0000px - 245.5469px - 246.0938px - 246.6406px - 247.1875px - 247.7344px - 248.2812px - 248.8281px - 249.3750px - 249.9219px - 250.4688px - 251.0156px - 251.5625px - 252.1094px - 252.6562px - 253.2031px - 253.7500px - 254.2969px - 254.8438px - 255.3906px - 255.9375px - 256.4844px - 257.0312px - 257.5781px - 258.1250px - 258.6719px - 259.2188px - 259.7656px - 260.3125px - 260.8594px - 261.4062px - 261.9531px - 262.5000px - 263.0469px - 263.5938px - 264.1406px - 264.6875px - 265.2344px - 265.7812px - 266.3281px - 266.8750px - 267.4219px - 267.9688px - 268.5156px - 269.0625px - 269.6094px - 270.1562px - 270.7031px - 271.2500px - 271.7969px - 272.3438px - 272.8906px - 273.4375px - 273.9844px - 274.5312px - 275.0781px - 275.6250px - 276.1719px - 276.7188px - 277.2656px - 277.8125px - 278.3594px - 278.9062px - 279.4531px - 280.0000px - 280.5469px - 281.0938px - 281.6406px - 282.1875px - 282.7344px - 283.2812px - 283.8281px - 284.3750px - 284.9219px - 285.4688px - 286.0156px - 286.5625px - 287.1094px - 287.6562px - 288.2031px - 288.7500px - 289.2969px - 289.8438px - 290.3906px - 290.9375px - 291.4844px - 292.0312px - 292.5781px - 293.1250px - 293.6719px - 294.2188px - 294.7656px - 295.3125px - 295.8594px - 296.4062px - 296.9531px - 297.5000px - 298.0469px - 298.5938px - 299.1406px - 299.6875px - 300.2344px - 300.7812px - 301.3281px - 301.8750px - 302.4219px - 302.9688px - 303.5156px - 304.0625px - 304.6094px - 305.1562px - 305.7031px - 306.2500px - 306.7969px - 307.3438px - 307.8906px - 308.4375px - 308.9844px - 309.5312px - 310.0781px - 310.6250px - 311.1719px - 311.7188px - 312.2656px - 312.8125px - 313.3594px - 313.9062px - 314.4531px - 315.0000px - 315.5469px - 316.0938px - 316.6406px - 317.1875px - 317.7344px - 318.2812px - 318.8281px - 319.3750px - 319.9219px - 320.4688px - 321.0156px - 321.5625px - 322.1094px - 322.6562px - 323.2031px - 323.7500px - 324.2969px - 324.8438px - 325.3906px - 325.9375px - 326.4844px - 327.0312px - 327.5781px - 328.1250px - 328.6719px - 329.2188px - 329.7656px - 330.3125px - 330.8594px - 331.4062px - 331.9531px - 332.5000px - 333.0469px - 333.5938px - 334.1406px - 334.6875px - 335.2344px - 335.7812px - 336.3281px - 336.8750px - 337.4219px - 337.9688px - 338.5156px - 339.0625px - 339.6094px - 340.1562px - 340.7031px - 341.2500px - 341.7969px - 342.3438px - 342.8906px - 343.4375px - 343.9844px - 344.5312px - 345.0781px - 345.6250px - 346.1719px - 346.7188px - 347.2656px - 347.8125px - 348.3594px - 348.9062px - 349.4531px - 350.0000px - 350.5469px - 351.0938px - 351.6406px - 352.1875px - 352.7344px - 353.2812px - 353.8281px - 354.3750px - 354.9219px - 355.4688px - 356.0156px - 356.5625px - 357.1094px - 357.6562px - 358.2031px - 358.7500px - 359.2969px - 359.8438px - 360.3906px - 360.9375px - 361.4844px - 362.0312px - 362.5781px - 363.1250px - 363.6719px - 364.2188px - 364.7656px - 365.3125px - 365.8594px - 366.4062px - 366.9531px - 367.5000px - 368.0469px - 368.5938px - 369.1406px - 369.6875px - 370.2344px - 370.7812px - 371.3281px - 371.8750px - 372.4219px - 372.9688px - 373.5156px - 374.0625px - 374.6094px - 375.1562px - 375.7031px - 376.2500px - 376.7969px - 377.3438px - 377.8906px - 378.4375px - 378.9844px - 379.5312px - 380.0781px - 380.6250px - 381.1719px - 381.7188px - 382.2656px - 382.8125px - 383.3594px - 383.9062px - 384.4531px - 385.0000px - 385.5469px - 386.0938px - 386.6406px - 387.1875px - 387.7344px - 388.2812px - 388.8281px - 389.3750px - 389.9219px - 390.4688px - 391.0156px - 391.5625px - 392.1094px - 392.6562px - 393.2031px - 393.7500px - 394.2969px - 394.8438px - 395.3906px - 395.9375px - 396.4844px - 397.0312px - 397.5781px - 398.1250px - 398.6719px - 399.2188px - 399.7656px - 400.3125px - 400.8594px - 401.4062px - 401.9531px - 402.5000px - 403.0469px - 403.5938px - 404.1406px - 404.6875px - 405.2344px - 405.7812px - 406.3281px - 406.8750px - 407.4219px - 407.9688px - 408.5156px - 409.0625px - 409.6094px - 410.1562px - 410.7031px - 411.2500px - 411.7969px - 412.3438px - 412.8906px - 413.4375px - 413.9844px - 414.5312px - 415.0781px - 415.6250px - 416.1719px - 416.7188px - 417.2656px - 417.8125px - 418.3594px - 418.9062px - 419.4531px - 420.0000px - 420.5469px - 421.0938px - 421.6406px - 422.1875px - 422.7344px - 423.2812px - 423.8281px - 424.3750px - 424.9219px - 425.4688px - 426.0156px - 426.5625px - 427.1094px - 427.6562px - 428.2031px - 428.7500px - 429.2969px - 429.8438px - 430.3906px - 430.9375px - 431.4844px - 432.0312px - 432.5781px - 433.1250px - 433.6719px - 434.2188px - 434.7656px - 435.3125px - 435.8594px - 436.4062px - 436.9531px - 437.5000px - 438.0469px - 438.5938px - 439.1406px - 439.6875px - 440.2344px - 440.7812px - 441.3281px - 441.8750px - 442.4219px - 442.9688px - 443.5156px - 444.0625px - 444.6094px - 445.1562px - 445.7031px - 446.2500px - 446.7969px - 447.3438px - 447.8906px - 448.4375px - 448.9844px - 449.5312px - 450.0781px - 450.6250px - 451.1719px - 451.7188px - 452.2656px - 452.8125px - 453.3594px - 453.9062px - 454.4531px - 455.0000px - 455.5469px - 456.0938px - 456.6406px - 457.1875px - 457.7344px - 458.2812px - 458.8281px - 459.3750px - 459.9219px - 460.4688px - 461.0156px - 461.5625px - 462.1094px - 462.6562px - 463.2031px - 463.7500px - 464.2969px - 464.8438px - 465.3906px - 465.9375px - 466.4844px - 467.0312px - 467.5781px - 468.1250px - 468.6719px - 469.2188px - 469.7656px - 470.3125px - 470.8594px - 471.4062px - 471.9531px - 472.5000px - 473.0469px - 473.5938px - 474.1406px - 474.6875px - 475.2344px - 475.7812px - 476.3281px - 476.8750px - 477.4219px - 477.9688px - 478.5156px - 479.0625px - 479.6094px - 480.1562px - 480.7031px - 481.2500px - 481.7969px - 482.3438px - 482.8906px - 483.4375px - 483.9844px - 484.5312px - 485.0781px - 485.6250px - 486.1719px - 486.7188px - 487.2656px - 487.8125px - 488.3594px - 488.9062px - 489.4531px - 490.0000px - 490.5469px - 491.0938px - 491.6406px - 492.1875px - 492.7344px - 493.2812px - 493.8281px - 494.3750px - 494.9219px - 495.4688px - 496.0156px - 496.5625px - 497.1094px - 497.6562px - 498.2031px - 498.7500px - 499.2969px - 499.8438px - 500.3906px - 500.9375px - 501.4844px - 502.0312px - 502.5781px - 503.1250px - 503.6719px - 504.2188px - 504.7656px - 505.3125px - 505.8594px - 506.4062px - 506.9531px - 507.5000px - 508.0469px - 508.5938px - 509.1406px - 509.6875px - 510.2344px - 510.7812px - 511.3281px - 511.8750px - 512.4219px - 512.9688px - 513.5156px - 514.0625px - 514.6094px - 515.1562px - 515.7031px - 516.2500px - 516.7969px - 517.3438px - 517.8906px - 518.4375px - 518.9844px - 519.5312px - 520.0781px - 520.6250px - 521.1719px - 521.7188px - 522.2656px - 522.8125px - 523.3594px - 523.9062px - 524.4531px - 525.0000px - 525.5469px - 526.0938px - 526.6406px - 527.1875px - 527.7344px - 528.2812px - 528.8281px - 529.3750px - 529.9219px - 530.4688px - 531.0156px - 531.5625px - 532.1094px - 532.6562px - 533.2031px - 533.7500px - 534.2969px - 534.8438px - 535.3906px - 535.9375px - 536.4844px - 537.0312px - 537.5781px - 538.1250px - 538.6719px - 539.2188px - 539.7656px - 540.3125px - 540.8594px - 541.4062px - 541.9531px - 542.5000px - 543.0469px - 543.5938px - 544.1406px - 544.6875px - 545.2344px - 545.7812px - 546.3281px - 601.5624px - 656.250px - 710.9375px - 3.2812px - 3.8281px - 4.3750px - 4.9219px - 5.4688px - 6.0156px - 6.5625px - 7.1094px - 7.6562px - 8.2031px - 8.7500px - 9.2969px - 9.8438px - 10.3906px - 10.9375px - 11.4844px - 12.0312px - 12.5781px - 13.1250px - 13.6719px - 15.3125px - 16.4062px - 17.5000px - 18.5938px - 19.6875px - 20.7812px - 21.8750px - 22.9688px - 26.2500px - - 70px - 76px - 35px - 35px - 4px - - 550px - 208px - 100px - 100px - 100px - 10px - 54px - 44px - 44px - 14px - 12px - 64px - 6.5px - 10px - - - 20px - 28px - 20px - 84px - 18px - 58px - 14px - 16px - 18px - 5px - 20px - 13px - 42px - 8.89px - 13px - 16px - 25px - 13px - 26px - 20px - 18px - 17px - 60px - 12.5px - - 36px - 53px - 194px - diff --git a/modules/mogo-module-service/.gitignore b/modules/mogo-module-service/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/modules/mogo-module-service/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/modules/mogo-module-service/README.md b/modules/mogo-module-service/README.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle deleted file mode 100644 index 874fb57567..0000000000 --- a/modules/mogo-module-service/build.gradle +++ /dev/null @@ -1,77 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' - id 'com.alibaba.arouter' -} - -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - // buildToolsVersion rootProject.ext.android.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - - //ARouter apt 参数 - kapt { - useBuildCache = false - arguments { - arg("AROUTER_MODULE_NAME", project.getName()) - } - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation rootProject.ext.dependencies.arouter - kapt rootProject.ext.dependencies.aroutercompiler - - implementation rootProject.ext.dependencies.rxjava - implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.androidxrecyclerview - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogomap - implementation rootProject.ext.dependencies.mogomapapi - implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.mogoserviceapi - implementation rootProject.ext.dependencies.modulecommon - //implementation rootProject.ext.dependencies.callchatprovider - - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_res - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_function_call - } else { - implementation project(":libraries:mogo-map") - implementation project(":libraries:mogo-map-api") - implementation project(":foudations:mogo-commons") - implementation project(':services:mogo-service-api') - implementation project(':modules:mogo-module-common') - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-call') - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-service/consumer-rules.pro b/modules/mogo-module-service/consumer-rules.pro deleted file mode 100644 index 663869ef85..0000000000 --- a/modules/mogo-module-service/consumer-rules.pro +++ /dev/null @@ -1 +0,0 @@ -#-----ServiceModule----- diff --git a/modules/mogo-module-service/gradle.properties b/modules/mogo-module-service/gradle.properties deleted file mode 100644 index b4f157aabf..0000000000 --- a/modules/mogo-module-service/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-service -VERSION_CODE=1 diff --git a/modules/mogo-module-service/proguard-rules.pro b/modules/mogo-module-service/proguard-rules.pro deleted file mode 100644 index 5c028de74c..0000000000 --- a/modules/mogo-module-service/proguard-rules.pro +++ /dev/null @@ -1,23 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile - -#-----ServiceModule----- diff --git a/modules/mogo-module-service/src/main/AndroidManifest.xml b/modules/mogo-module-service/src/main/AndroidManifest.xml deleted file mode 100644 index 9dca875b64..0000000000 --- a/modules/mogo-module-service/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_blue.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_blue.png deleted file mode 100644 index 53a17783bb..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_blue.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_blue_dark.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_blue_dark.png deleted file mode 100644 index 674ef02f31..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_blue_dark.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_green.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_green.png deleted file mode 100644 index b848a42232..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_green.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_green_dark.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_green_dark.png deleted file mode 100644 index 0feaf8ae71..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_green_dark.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_oragne.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_oragne.png deleted file mode 100644 index c9c886a543..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_oragne.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_purple.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_purple.png deleted file mode 100644 index a1c6408a30..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_purple.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_red.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_red.png deleted file mode 100644 index 994e8b92c4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_red.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_4s.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_4s.png deleted file mode 100644 index 92e8b9bc07..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_4s.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_book.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_book.png deleted file mode 100644 index f081765bbe..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_book.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living.png deleted file mode 100644 index 48d2485529..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_white.png deleted file mode 100644 index 0feeb0f206..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_location_blue.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_location_blue.png deleted file mode 100644 index 34823616ee..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_location_blue.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_misic.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_misic.png deleted file mode 100644 index 8d61bc6155..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_misic.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_news.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_news.png deleted file mode 100644 index 24fa29d739..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_news.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl.png deleted file mode 100644 index 9e6d4dd051..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2.png deleted file mode 100644 index 61bb224ffc..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_white.png deleted file mode 100644 index 85de6dcee6..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_refuel.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_refuel.png deleted file mode 100644 index 05521e49df..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_refuel.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off.png deleted file mode 100644 index 061c1cc779..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2.png deleted file mode 100644 index a29d82adb4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_white.png deleted file mode 100644 index 3241e2adf4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up.png deleted file mode 100644 index 31bc0f9eb0..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_white.png deleted file mode 100644 index 33fbef70c4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check.png deleted file mode 100644 index 6a815494e9..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2.png deleted file mode 100644 index 45fac29f3f..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_white.png deleted file mode 100644 index 4b7288d976..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work.png deleted file mode 100644 index 02aa506066..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2.png deleted file mode 100644 index 4e721b457e..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_white.png deleted file mode 100644 index 5e63a96978..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png deleted file mode 100644 index 4ce9272666..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shop.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shop.png deleted file mode 100644 index bc30e55974..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shop.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shop_discount.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shop_discount.png deleted file mode 100644 index a21fb5aa7c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shop_discount.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/map_api_ic_current_location2_cursor.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/map_api_ic_current_location2_cursor.png deleted file mode 100644 index 5f91be07f3..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/map_api_ic_current_location2_cursor.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_call.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_call.png deleted file mode 100644 index a66ed29d09..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_call.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident.png deleted file mode 100644 index 3d93b45561..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident2.png deleted file mode 100644 index aff3481105..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3.png deleted file mode 100644 index 3ceef9aa09..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_white.png deleted file mode 100644 index cea530e6d2..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog.png deleted file mode 100644 index f546fb08de..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2.png deleted file mode 100644 index 1222b2b6c7..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_white.png deleted file mode 100644 index 45b9e35622..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze.png deleted file mode 100644 index b42cf90efe..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2.png deleted file mode 100644 index c363e5feda..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_white.png deleted file mode 100644 index 70419c886f..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park.png deleted file mode 100644 index 6e1443d3b4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park_white.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park_white.png deleted file mode 100644 index 116f5ffb1a..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_parking.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_parking.png deleted file mode 100644 index 84057231a5..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_parking.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_parking2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_parking2.png deleted file mode 100644 index 41eca665ca..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_parking2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_online_car_panel_background.9.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_online_car_panel_background.9.png deleted file mode 100644 index 80ab4b841f..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_online_car_panel_background.9.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_online_car_panel_empty_icon.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_online_car_panel_empty_icon.png deleted file mode 100644 index 0befdbd823..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_online_car_panel_empty_icon.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_blue.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_blue.png deleted file mode 100644 index 53a17783bb..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_blue.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_blue_dark.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_blue_dark.png deleted file mode 100644 index 674ef02f31..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_blue_dark.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_green.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_green.png deleted file mode 100644 index b848a42232..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_green.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_green_dark.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_green_dark.png deleted file mode 100644 index 0feaf8ae71..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_green_dark.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_oragne.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_oragne.png deleted file mode 100644 index c9c886a543..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_oragne.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_purple.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_purple.png deleted file mode 100644 index a1c6408a30..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_purple.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_red.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_red.png deleted file mode 100644 index 994e8b92c4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_red.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_4s.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_4s.png deleted file mode 100644 index 92e8b9bc07..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_4s.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_book.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_book.png deleted file mode 100644 index f081765bbe..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_book.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living.png deleted file mode 100644 index 48d2485529..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living_white.png deleted file mode 100644 index 0feeb0f206..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_location_blue.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_location_blue.png deleted file mode 100644 index 34823616ee..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_location_blue.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_misic.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_misic.png deleted file mode 100644 index 8d61bc6155..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_misic.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_news.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_news.png deleted file mode 100644 index 24fa29d739..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_news.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl.png deleted file mode 100644 index 9e6d4dd051..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2.png deleted file mode 100644 index 61bb224ffc..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2_white.png deleted file mode 100644 index 85de6dcee6..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_refuel.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_refuel.png deleted file mode 100644 index 05521e49df..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_refuel.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off.png deleted file mode 100644 index 061c1cc779..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2.png deleted file mode 100644 index a29d82adb4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2_white.png deleted file mode 100644 index 3241e2adf4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check.png deleted file mode 100644 index 6a815494e9..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2.png deleted file mode 100644 index 45fac29f3f..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2_white.png deleted file mode 100644 index 4b7288d976..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work.png deleted file mode 100644 index 02aa506066..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2.png deleted file mode 100644 index 4e721b457e..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2_white.png deleted file mode 100644 index 5e63a96978..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shear_news.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shear_news.png deleted file mode 100644 index 4ce9272666..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shear_news.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shop.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shop.png deleted file mode 100644 index bc30e55974..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shop.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shop_discount.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shop_discount.png deleted file mode 100644 index a21fb5aa7c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_shop_discount.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/map_api_ic_current_location2_cursor.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/map_api_ic_current_location2_cursor.png deleted file mode 100644 index 5f91be07f3..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/map_api_ic_current_location2_cursor.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_call.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_call.png deleted file mode 100644 index a66ed29d09..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_call.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident.png deleted file mode 100644 index 3d93b45561..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident2.png deleted file mode 100644 index aff3481105..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3.png deleted file mode 100644 index 3ceef9aa09..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3_white.png deleted file mode 100644 index cea530e6d2..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog.png deleted file mode 100644 index f546fb08de..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2.png deleted file mode 100644 index 1222b2b6c7..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2_white.png deleted file mode 100644 index 45b9e35622..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze.png deleted file mode 100644 index b42cf90efe..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2.png deleted file mode 100644 index c363e5feda..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2_white.png deleted file mode 100644 index 70419c886f..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park.png deleted file mode 100644 index 6e1443d3b4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park_white.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park_white.png deleted file mode 100644 index 116f5ffb1a..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_parking.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_parking.png deleted file mode 100644 index 84057231a5..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_parking.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_parking2.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_parking2.png deleted file mode 100644 index 41eca665ca..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_parking2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_online_car_panel_background.9.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_online_car_panel_background.9.png deleted file mode 100644 index 80ab4b841f..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_online_car_panel_background.9.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_online_car_panel_empty_icon.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_online_car_panel_empty_icon.png deleted file mode 100644 index 0befdbd823..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_online_car_panel_empty_icon.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi-2560x1600/icon_route_ending.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi-2560x1600/icon_route_ending.png deleted file mode 100644 index 04580a8f0d..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi-2560x1600/icon_route_ending.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi-2560x1600/map_api_ic_current_location2_cursor.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi-2560x1600/map_api_ic_current_location2_cursor.png deleted file mode 100644 index c24c56f3db..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi-2560x1600/map_api_ic_current_location2_cursor.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png deleted file mode 100644 index 95c0bca39d..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_dark.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_dark.png deleted file mode 100644 index df6eca5847..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_dark.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.png deleted file mode 100644 index 4433d7643e..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_dark.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_dark.png deleted file mode 100644 index 7b64775b1c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_dark.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_oragne.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_oragne.png deleted file mode 100644 index 1b4403048e..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_oragne.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.png deleted file mode 100644 index df3e9cae23..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png deleted file mode 100644 index b3cb1f8896..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png deleted file mode 100644 index 11c5c6ea7b..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_book.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_book.png deleted file mode 100644 index f846dcefc3..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_book.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living.png deleted file mode 100644 index d6f1dea192..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png deleted file mode 100644 index 1b87f0ce86..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_blue.png deleted file mode 100644 index 34823616ee..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_blue.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png deleted file mode 100644 index b0dc73d75a..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png deleted file mode 100644 index 26edaa7f7a..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png deleted file mode 100644 index fc3ff86372..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2.png deleted file mode 100755 index 478232ac79..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png deleted file mode 100755 index 700226f150..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png deleted file mode 100644 index bac7ee2e40..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png deleted file mode 100644 index 8c6b30842b..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png deleted file mode 100755 index 2fb4ef553e..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png deleted file mode 100755 index 9b424494ee..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png deleted file mode 100644 index 29fd407dca..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png deleted file mode 100755 index e62fd5ec03..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png deleted file mode 100644 index 7f8f80be69..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png deleted file mode 100755 index 001974ba87..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png deleted file mode 100644 index 0b0d4bbab5..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png deleted file mode 100755 index c11e911f15..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png deleted file mode 100755 index 7875086c3e..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png deleted file mode 100644 index f446cba155..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png deleted file mode 100644 index d8be56fd47..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png deleted file mode 100644 index 97e8a4967b..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/map_api_ic_current_location2_cursor.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/map_api_ic_current_location2_cursor.png deleted file mode 100644 index c24c56f3db..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/map_api_ic_current_location2_cursor.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png deleted file mode 100644 index 9a9321b3a6..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_call.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident.png deleted file mode 100644 index 8dd43b20a7..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident2.png deleted file mode 100644 index 1e61298d35..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png deleted file mode 100755 index fe68bc7cba..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png deleted file mode 100755 index 911bee2df4..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog.png deleted file mode 100644 index 61296d59d2..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2.png deleted file mode 100755 index 787101fbb1..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png deleted file mode 100755 index b6164bcfdd..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze.png deleted file mode 100644 index ea07251424..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2.png deleted file mode 100755 index d34779845e..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png deleted file mode 100755 index 353cfefec6..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png deleted file mode 100644 index 5923d114f6..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png deleted file mode 100644 index dbc420e8e6..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_parking.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_parking.png deleted file mode 100644 index 33cb8fd3ce..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_parking.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_parking2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_parking2.png deleted file mode 100644 index 8026654bdf..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_parking2.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery.png deleted file mode 100644 index f11b4a4178..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery_light.png deleted file mode 100644 index e78307acd8..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_road_slippery_light.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_online_car_panel_background.9.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_online_car_panel_background.9.png deleted file mode 100644 index b3149721b1..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_online_car_panel_background.9.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_online_car_panel_empty_icon.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_online_car_panel_empty_icon.png deleted file mode 100644 index e225da807b..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_online_car_panel_empty_icon.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_details_normal.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_details_normal.png deleted file mode 100644 index 090f492954..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_details_normal.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_details_pressed.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_details_pressed.png deleted file mode 100644 index 4394952533..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_details_pressed.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable/module_service_ic_rc_road_slippery.png b/modules/mogo-module-service/src/main/res/drawable/module_service_ic_rc_road_slippery.png deleted file mode 100644 index f11b4a4178..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable/module_service_ic_rc_road_slippery.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable/module_service_ic_rc_road_slippery_light.png b/modules/mogo-module-service/src/main/res/drawable/module_service_ic_rc_road_slippery_light.png deleted file mode 100644 index e78307acd8..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable/module_service_ic_rc_road_slippery_light.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_info_window_bkg.xml b/modules/mogo-module-service/src/main/res/drawable/module_services_driver_info_window_bkg.xml deleted file mode 100644 index e71c897020..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_info_window_bkg.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_blue_info.xml b/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_blue_info.xml deleted file mode 100644 index eefd1be813..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_blue_info.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_green_info.xml b/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_green_info.xml deleted file mode 100644 index d9d5e5dade..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_green_info.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_red_info.xml b/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_red_info.xml deleted file mode 100644 index 6c70c8805c..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/module_services_driver_type_red_info.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_info_window_cursor.xml b/modules/mogo-module-service/src/main/res/drawable/module_services_info_window_cursor.xml deleted file mode 100644 index 9320416f62..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/module_services_info_window_cursor.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_online_car_panel_background.9.png b/modules/mogo-module-service/src/main/res/drawable/module_services_online_car_panel_background.9.png deleted file mode 100644 index f19ee05db1..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable/module_services_online_car_panel_background.9.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml deleted file mode 100644 index a456d5b3dd..0000000000 --- a/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/raw/taxi.n3d b/modules/mogo-module-service/src/main/res/raw/taxi.n3d deleted file mode 100644 index 8352a248bc..0000000000 Binary files a/modules/mogo-module-service/src/main/res/raw/taxi.n3d and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml deleted file mode 100644 index 0b0ce58fe0..0000000000 --- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 550px - 208px - 100px - 100px - 100px - 10px - 54px - 44px - 44px - 14px - 12px - 64px - 6.5px - 10px - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml deleted file mode 100644 index f3c6319576..0000000000 --- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - 1000px - 390px - 200px - 200px - 10px - 10px - 100px - 80px - 80px - 24px - 20px - 120px - 20px - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml deleted file mode 100644 index 68aefd5e5e..0000000000 --- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - 1000px - 390px - 200px - 200px - 10px - 10px - 100px - 80px - 80px - 24px - 20px - 120px - 20px\ - - diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml deleted file mode 100644 index a9ff73ff8f..0000000000 --- a/modules/mogo-module-service/src/main/res/values/dimens.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - 1000px - 390px - 200px - 200px - 10px - 10px - 100px - 80px - 80px - 24px - 20px - 120px - 20px - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/values/strings.xml b/modules/mogo-module-service/src/main/res/values/strings.xml deleted file mode 100644 index 06591aab34..0000000000 --- a/modules/mogo-module-service/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - mogo-module-service - - diff --git a/services/mogo-service-api/src/main/res/values/strings.xml b/services/mogo-service-api/src/main/res/values/strings.xml deleted file mode 100644 index eb1356c817..0000000000 --- a/services/mogo-service-api/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - amap-api - diff --git a/services/mogo-service/src/main/res/values/strings.xml b/services/mogo-service/src/main/res/values/strings.xml deleted file mode 100644 index eb1356c817..0000000000 --- a/services/mogo-service/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - amap-api - diff --git a/settings.gradle b/settings.gradle index 715ab2164c..a5808b7198 100644 --- a/settings.gradle +++ b/settings.gradle @@ -67,7 +67,6 @@ include ':libraries:mogo-adas-other' // OLD业务模块 include ':modules:mogo-module-common' -include ':modules:mogo-module-service' // 语音 include ':tts:tts-base'