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

add draw line and show

Browse Source
This commit is contained in:
lixiaopeng
2021-04-25 17:58:14 +08:00
parent b87d8f38ff
commit 707fa23eef
13 changed files with 177 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -50,6 +50,7 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.WindowUtils;
import com.mogo.utils.logger.Logger;
@@ -1044,7 +1045,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
}
@Override
public void setAdasRecognizedResult(String result) {
//liyz
public void setAdasRecognizedResult(ADASRecognizedResult result) {
}
}

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

@@ -47,6 +47,7 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.NetworkUtils;
import com.mogo.utils.WindowUtils;
import com.mogo.utils.logger.Logger;
@@ -817,7 +818,7 @@ public class AMapViewWrapper implements IMogoMapView,
}
@Override
public void setAdasRecognizedResult(String result) {
//liyz
public void setAdasRecognizedResult(ADASRecognizedResult result) {
}
}

3
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java
View File

@@ -14,6 +14,7 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.logger.Logger;
import java.util.List;
@@ -300,7 +301,7 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public void setAdasRecognizedResult(String result) {
public void setAdasRecognizedResult(ADASRecognizedResult result) {
if ( mClient != null ) {
mClient.setAdasRecognizedResult(result);
}

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

@@ -16,8 +16,6 @@ import android.view.ViewGroup;
import android.view.animation.Interpolator;
import android.widget.TextView;
import com.autonavi.nge.map.LonLat;
import com.mogo.commons.data.ADASRecognizedResultConvert;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoMapView;
@@ -35,6 +33,7 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.TipToast;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.WorkThreadHandler;
@@ -288,15 +287,6 @@ public class AMapViewWrapper implements IMogoMapView,
}
private ADASRecognizedResultConvert mAdasResultConvert;
@Override
public void setAdasRecognizedResult(String result) {
Log.d("liyz", "------- setAdasRecognizedResult ------>result = " + result);
mAdasResultConvert = GsonUtil.objectFromJson(result, ADASRecognizedResultConvert.class);
}
@Override
public void setTrafficEnabled(boolean visible) {
if (checkAMapView()) {
@@ -773,7 +763,6 @@ public class AMapViewWrapper implements IMogoMapView,
}
if (mSelfMarker == null) { //TODO mAdasResultConvert
// Log.d("liyz", "-------1------>");
try {
mSelfMarker = mMapView.getMapAutoViewHelper().getMyLocationStyle().getSelfMarker();
mSelfMarker.setInfoWindowEnable(true);
@@ -781,15 +770,28 @@ public class AMapViewWrapper implements IMogoMapView,
} catch (Exception e) {
}
// } else {
// Log.d("liyz", "-------2------>");
// mSelfMarker.marker3DIcon(R.raw.people);
// WorkThreadHandler.getInstance().postDelayed(() -> {
// mSelfMarker.marker3DIcon(R.raw.people);
// }, 10000);
// if (mAdasResult.type == 1) { //通过不同的方向类型来改变车模，目前暂定三种模型，还未定
// Log.d("liyz", "-------1------>")
// mSelfMarker.marker3DIcon(R.raw.people);
// }
}
showSelfSpeed(location.getSpeed());
}
private ADASRecognizedResult mAdasResult;
@Override
public void setAdasRecognizedResult(ADASRecognizedResult result) {
mAdasResult = result;
}
private TextView mSpeedView = null;
private int mLastYOffset = 20;

3
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
View File

@@ -13,6 +13,7 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.zhidaoauto.map.sdk.open.MapAutoApi;
import org.json.JSONObject;
@@ -359,7 +360,7 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public void setAdasRecognizedResult(String result) {
public void setAdasRecognizedResult(ADASRecognizedResult result) {
if (mClient != null) {
mClient.setAdasRecognizedResult(result);
}

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

@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
import com.mogo.map.MogoLatLng;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.anim.OnMarkerAnimationListener;
import com.mogo.realtime.entity.ADASRecognizedResult;
import org.json.JSONObject;
@@ -236,7 +237,7 @@ public interface IMogoMapUIController {
*/
void changeBearing( float bearing );
void setAdasRecognizedResult(String result);
void setAdasRecognizedResult(ADASRecognizedResult result);
/**
* 获取瓦片id

3
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
View File

@@ -12,6 +12,7 @@ import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
import com.mogo.map.uicontroller.MapControlResult;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.utils.logger.Logger;
import org.json.JSONObject;
@@ -403,7 +404,7 @@ public class MogoMapUIController implements IMogoMapUIController {
}
@Override
public void setAdasRecognizedResult(String result) {
public void setAdasRecognizedResult(ADASRecognizedResult result) {
initDelegate();
if (mDelegate != null) {
mDelegate.setAdasRecognizedResult(result);