From 21739b9094c77815724721edfb621e7d86188f7c Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 27 Jul 2022 15:14:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9A=90=E8=97=8Fp=E6=A1=A3=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/hmi_tap_position.xml | 1 + .../src/main/res/layout/hmi_traffic_data.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml index 263bee811c..a2a8beedd6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml @@ -15,6 +15,7 @@ android:textColor="@color/p_default_txt_color" android:textSize="@dimen/dp_46" android:textStyle="bold" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/tap_r" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml index b940564d5b..23d6a361c6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml @@ -49,7 +49,7 @@ android:id="@+id/traffic_position" android:layout_width="@dimen/dp_220" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_28" + android:layout_marginLeft="@dimen/dp_8" android:layout_marginTop="@dimen/dp_70" android:layout_marginRight="@dimen/dp_80" app:defaultColor="@color/acc_default_txt_color" From 8f6a23b91db28e7943c71cf717ebfc46a9eb4a06 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 27 Jul 2022 15:24:59 +0800 Subject: [PATCH 2/5] ui --- .../src/main/res/layout/hmi_traffic_data.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml index 23d6a361c6..e96bc08d6a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml @@ -49,7 +49,6 @@ android:id="@+id/traffic_position" android:layout_width="@dimen/dp_220" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_8" android:layout_marginTop="@dimen/dp_70" android:layout_marginRight="@dimen/dp_80" app:defaultColor="@color/acc_default_txt_color" From 678cbe2c23aced26d5189a5114a54784d7b9b756 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 27 Jul 2022 15:51:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8B=E6=9C=9F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/BindingcarNetWorkManager.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index fb56249b62..d9ea6a223b 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -87,15 +87,15 @@ public class BindingcarNetWorkManager { } //根据车辆类型切换不同的车辆模型 - if (info.getData().getVendor().equals("一汽红旗")) { //TODO - CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); - } else if (info.getData().getVendor().equals("东风")) { - CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); - } else if (info.getData().getVendor().equals("金旅星辰")) { - CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); - } else { - CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); - } +// if (info.getData().getVendor().equals("一汽红旗")) { //TODO +// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); +// } else if (info.getData().getVendor().equals("东风")) { +// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); +// } else if (info.getData().getVendor().equals("金旅星辰")) { +// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); +// } else { +// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); +// } SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData())); } From 95753d71af25c21434603eb9d62a541daff282cd Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 27 Jul 2022 16:07:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[Update]=E6=98=BE=E7=A4=BA=E9=AB=98?= =?UTF-8?q?=E5=BE=B7=E5=B0=8F=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/eagle/core/function/main/MainActivity.java | 4 ++-- .../java/com/mogo/eagle/core/function/smp/AMapCustomView.java | 1 + .../src/main/res/layout/module_small_map_fragment.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index 5d2a5cdae6..5fabab1775 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -303,8 +303,8 @@ public class MainActivity extends MvpActivity implement BaseFragment fragmentHdMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_HMI).navigation(); addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_waring_fragment); // 加载 小地图 图层 -// BaseFragment fragmentSmpMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP).navigation(); -// addFragment(fragmentSmpMap, fragmentSmpMap.getTagName(), R.id.module_main_id_smp_fragment); + BaseFragment fragmentSmpMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP).navigation(); + addFragment(fragmentSmpMap, fragmentSmpMap.getTagName(), R.id.module_main_id_smp_fragment); } /** diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java index 22876725e2..b001e213e5 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java @@ -764,6 +764,7 @@ public class AMapCustomView markerOption.icon(BitmapDescriptorFactory.fromBitmap( bitmap )); + markerOption.zIndex(2f); posInfMap.put(latLng, structureList); markerOptionsList.add(markerOption); } diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml index 0392a650c8..b994fca1a4 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_marginRight="30px" android:layout_marginBottom="30px" - android:visibility="gone" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> From affc766483162f20f16bd504111f2b72a4caa654 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 27 Jul 2022 16:57:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E7=B1=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/passenger/widget/indicator/option/AttrsController.java | 2 +- .../taxi/passenger/widget/indicator/option/IndicatorOptions.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java index fbab69e62f..3a439ec7ea 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.mogo.och.taxi.passenger.R; -import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils; +import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils; public class AttrsController { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt index 0bcf57b165..47a993e1d7 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt @@ -7,7 +7,7 @@ import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorSlideMo import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorStyle import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode -import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils +import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils /** *