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

8.0.17 视角变换

Browse Source
This commit is contained in:
lianglihui
2021-12-28 14:28:22 +08:00
parent 8682f9bcb2
commit af800c6f9c
8 changed files with 116 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,6 +551,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
dismissToolsFloatView()
}
override fun changeMapDAngle(mode: Int) {
TODO("Not yet implemented")
}
private fun showCameraList(cameraList: List<CameraEntity>?) {
context?.let {
if (cameraViewFloat == null) {

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -96,7 +96,6 @@ class DebugSettingView @JvmOverloads constructor(
}
}
tbSpeedView.setOnCheckedChangeListener { buttonView, isChecked ->
if (!isChecked) {
CallerHmiManager.setSpeedChartViewVisibility(View.VISIBLE)
@@ -129,6 +128,11 @@ class DebugSettingView @JvmOverloads constructor(
}
}
changesight_top_btn.setOnClickListener {
CallerHDMapManager.setMapDAngle(0);
}
tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
tvAutopilotInfo.text =
CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()

51
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -101,6 +101,57 @@
android:textOn="显示「小地图」"
android:textSize="@dimen/dp_34" />
<ToggleButton
android:id="@+id/tbChangeSight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:textOff="隐藏「视角切换工具」"
android:textOn="显示「视角切换工具」"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/changesight_top_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 顶视角"
android:textSize="@dimen/dp_34"/>
<Button
android:id="@+id/changesight_back_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 后方来车视角"
android:textSize="@dimen/dp_34"/>
<Button
android:id="@+id/changesight_cross_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 十字路口视角"
android:textSize="@dimen/dp_34"/>
<Button
android:id="@+id/changesight_far_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 远视角"
android:textSize="@dimen/dp_34"/>
<Button
android:id="@+id/reset_changesight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="恢复视角"
android:textSize="@dimen/dp_34"/>
<!-- <Button
android:id="@+id/tbChangeCarCenter100"
android:layout_width="wrap_content"

5
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
View File

@@ -23,4 +23,9 @@ interface IMoGoMapFragmentProvider : IMoGoFunctionServerProvider {
* 传入资源ID
*/
fun changeCurrentIcon(@RawRes iconId: Int)
/**
* 设置地图视线角度
*/
fun setMapDAngle(mode: Int)
}

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
View File

@@ -35,4 +35,8 @@ object CallerHDMapManager : CallerBase() {
fun changeCurrentIcon(@RawRes iconId: Int){
mapProviderApi.changeCurrentIcon(iconId)
}
fun setMapDAngle(mode: Int) {
mapProviderApi.setMapDAngle(mode)
}
}

5
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -1218,4 +1218,9 @@ public class AMapViewWrapper implements IMogoMapView,
ResIdCache.putVal(speedVal, val);
}
@Override
public void setMapDAngle(float angle) {
mMapView.getMapAutoViewHelper().setMapDAngle(angle);
}
}

5
libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
View File

@@ -344,4 +344,9 @@ public interface IMogoMapUIController {
default void setMarkerInfoResName(String speedVal, String val) {
}
/**
* 设置地图视线角度
*/
void setMapDAngle(float angle);
}

37
modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
View File

@@ -221,4 +221,41 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter >
public void changeCurrentIcon(int iconId) {
mMogoMapView.getMap().getUIController().changeCurrentIcon(iconId);
}
/**
* sight mode
* @param mode
*/
public static final int SIGHT_MODE_NORMAL = 0;
public static final int SIGHT_MODE_TOP = 1;
public static final int SIGHT_MODE_BACK = 2;
public static final int SIGHT_MODE_CROSS = 3;
public static final int SIGHT_MODE_FAR = 4;
@Override
public void setMapDAngle(int mode) {
float angle = getSightModeAngle(mode);
mMogoMapView.getMap().getUIController().setMapDAngle(angle);
}
private float getSightModeAngle(int mode) {
float angle = 0.0f;
switch (mode){
case SIGHT_MODE_NORMAL:
angle = 16.5f;
case SIGHT_MODE_TOP:
angle = 16.5f;
case SIGHT_MODE_BACK:
angle = 16.5f;
case SIGHT_MODE_CROSS:
angle = 16.5f;
case SIGHT_MODE_FAR:
angle = 16.5f;
}
return angle;
}
}