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

Merge branch 'test_robotaxi-d_231024_6.1.2.1' into 'release_robotaxi-d_231024_6.1.2.1'

Browse Source 
Test robotaxi d 231024 6.1.2.1

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!828
This commit is contained in:
yangyakun
2023-10-30 11:31:34 +00:00
parent 08c22c5d9f d119101877
commit a59af9a8fe
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
View File

@@ -343,20 +343,15 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
}
private void startNaviToStation(boolean isVoicePlay, double stationLat, double stationLng) {
UiThreadHandler.post(new Runnable() {
@Override
public void run() {
AmapNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
AmapNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
double mCurLatitude = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLatitude();
double mCurLongitude =CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLongitude();
double mCurLatitude = CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLatitude();
double mCurLongitude =CallerChassisLocationGCJ02ListenerManager.INSTANCE.getChassisLocationGCJ02().getLongitude();
CallerLogger.d(M_TAXI + TAG, "currentLatLng=" + mCurLatitude + " " +mCurLongitude);
CallerLogger.d(M_TAXI + TAG, "currentLatLng=" + mCurLatitude + " " +mCurLongitude);
NaviLatLng startNaviLatLng = new NaviLatLng(mCurLatitude, mCurLongitude);
NaviLatLng endNaviLatLng = new NaviLatLng(stationLat, stationLng);
AmapNaviToDestinationModel.getInstance(getContext()).initAMapNavi(startNaviLatLng, endNaviLatLng);
}
});
NaviLatLng startNaviLatLng = new NaviLatLng(mCurLatitude, mCurLongitude);
NaviLatLng endNaviLatLng = new NaviLatLng(stationLat, stationLng);
AmapNaviToDestinationModel.getInstance(getContext()).initAMapNavi(startNaviLatLng, endNaviLatLng);
AmapNaviToDestinationModel.getInstance(getContext()).setVoiceIsMute(isVoicePlay);
AmapNaviToDestinationModel.getInstance(getContext()).setTaxiNaviChangedCallback(this);
}

26
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
View File

@@ -599,20 +599,18 @@ class TaxiCurrentTaskFragment : BaseFragment(),
}
private fun startNaviToStation(isVoicePlay: Boolean, stationLat: Double, stationLng: Double) {
UiThreadHandler.post{
AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
val mCurLatitude = getChassisLocationGCJ02().latitude
val mCurLongitude = getChassisLocationGCJ02().longitude
d(
TAG,
"currentLatLng=$mCurLatitude $mCurLongitude"
)
val startNaviLatLng = NaviLatLng(mCurLatitude, mCurLongitude)
val endNaviLatLng = NaviLatLng(stationLat, stationLng)
AmapNaviToDestinationModel.getInstance(context).initAMapNavi(startNaviLatLng, endNaviLatLng)
AmapNaviToDestinationModel.getInstance(context).setVoiceIsMute(isVoicePlay)
AmapNaviToDestinationModel.getInstance(context).setTaxiNaviChangedCallback(this)
}
AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
val mCurLatitude = getChassisLocationGCJ02().latitude
val mCurLongitude = getChassisLocationGCJ02().longitude
d(
TAG,
"currentLatLng=$mCurLatitude $mCurLongitude"
)
val startNaviLatLng = NaviLatLng(mCurLatitude, mCurLongitude)
val endNaviLatLng = NaviLatLng(stationLat, stationLng)
AmapNaviToDestinationModel.getInstance(context).initAMapNavi(startNaviLatLng, endNaviLatLng)
AmapNaviToDestinationModel.getInstance(context).setVoiceIsMute(isVoicePlay)
AmapNaviToDestinationModel.getInstance(context).setTaxiNaviChangedCallback(this)
}
/**