yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_290_220715_2.9.0' into 'test_robotaxi-d-app-module_290_220715_2.9.0.1'

Browse Source 
Dev robotaxi d app module 290 220715 2.9.0

See merge request zhjt/AndroidApp/MoGoEagleEye!78
This commit is contained in:
wangmingjun
2022-07-28 03:32:15 +00:00
parent bc93bd8e45 affc766483
commit 1dce360950
8 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java
View File

@@ -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 {

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt
View File

@@ -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
/**
* <pre>

18
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
View File

@@ -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()));
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
View File

@@ -303,8 +303,8 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> 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);
}
/**

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml
View File

@@ -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"

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml
View File

@@ -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_28"
android:layout_marginTop="@dimen/dp_70"
android:layout_marginRight="@dimen/dp_80"
app:defaultColor="@color/acc_default_txt_color"

1
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
View File

@@ -764,6 +764,7 @@ public class AMapCustomView
markerOption.icon(BitmapDescriptorFactory.fromBitmap(
bitmap
));
markerOption.zIndex(2f);
posInfMap.put(latLng, structureList);
markerOptionsList.add(markerOption);
}

2
core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml
View File

@@ -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" />