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

[Fix] 升级地图版本

Browse Source 
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2021-11-16 22:09:40 +08:00
parent 45ca9081e9
commit cc1cc247fd
5 changed files with 88 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,7 @@ class DebugSettingView @JvmOverloads constructor(
}
}
/*// 切换地图中心点视角
// 切换地图中心点视角
tbChangeCarCenter100.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(1)
}
@@ -231,7 +231,25 @@ class DebugSettingView @JvmOverloads constructor(
}
tbChangeCarTwoFifths80.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(4)
}*/
}
tbChangeCAR_AFTER_30_FRONT_80.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(5)
}
tbChangeCAR_AFTER_30_FRONT_100.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(6)
}
tbChangeCAR_AFTER_30_FRONT_120.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(7)
}
tbChangeCAR_AFTER_40_FRONT_80.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(8)
}
tbChangeCAR_AFTER_40_FRONT_100.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(9)
}
tbChangeCAR_AFTER_40_FRONT_120.setOnClickListener {
CallerHDMapManager.changeMaoViewAngle(10)
}
}
/**

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

@@ -91,7 +91,7 @@
android:textOn="显示「车辆检测」"
android:textSize="@dimen/dp_34" />
<!-- <Button
<Button
android:id="@+id/tbChangeCarCenter100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -125,7 +125,61 @@
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_TWO_FIFTHS_80"
android:textSize="@dimen/dp_34" />-->
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_30_FRONT_120"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_30_FRONT_120"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_80"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_80"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_100"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_100"
android:textSize="@dimen/dp_34" />
<Button
android:id="@+id/tbChangeCAR_AFTER_40_FRONT_120"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:gravity="center"
android:text="切换 CAR_AFTER_40_FRONT_120"
android:textSize="@dimen/dp_34" />
</com.google.android.flexbox.FlexboxLayout>

2
gradle.properties
View File

@@ -79,7 +79,7 @@ MOGO_TRAFFICLIVE_VERSION=1.2.9
MOGO_LOCATION_VERSION=1.2.9
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=V2.0.0.6
MAP_SDK_VERSION=V2.0.0.7
# websocket
WEBSOCKET_VERSION=1.1.7
## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级

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

@@ -725,7 +725,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void changeMapViewAngle(int type) {
if (checkAMapView()) {
//mMapView.getMapAutoViewHelper().testMapViewAngle(type);
mMapView.getMapAutoViewHelper().testMapViewAngle(type);
}
}

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

@@ -4,14 +4,11 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.location.Location;
import android.view.View;
import android.view.animation.Interpolator;
import androidx.annotation.Nullable;
import androidx.annotation.RawRes;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.anim.OnMarkerAnimationListener;
import org.json.JSONObject;
@@ -239,10 +236,16 @@ public interface IMogoMapUIController {
/**
* 修改地图中心
* MapAutoApi.CAR_CENTER_100 1/4
* MapAutoApi.CAR_CENTER_100 2/5
* MapAutoApi.CAR_CENTER_100 80米
* MapAutoApi.CAR_CENTER_100 2/5
* MapAutoApi.CAR_CENTER_100 = 1
* MapAutoApi.CAR_QUARTER_100 = 2
* MapAutoApi.CAR_TWO_FIFTHS_100 = 3
* MapAutoApi.CAR_TWO_FIFTHS_80= 4
* MapAutoApi.CAR_AFTER_30_FRONT_80 = 5
* MapAutoApi.CAR_AFTER_30_FRONT_100 = 6
* MapAutoApi.CAR_AFTER_30_FRONT_120 = 7
* MapAutoApi.CAR_AFTER_40_FRONT_80= 8
* MapAutoApi.CAR_AFTER_40_FRONT_100 = 9
* MapAutoApi.CAR_AFTER_40_FRONT_120 = 10
*/
void changeMapViewAngle(int type);