Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display

# Conflicts:
#	gradle.properties

libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java

@@ -19,7 +19,6 @@ import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.SystemClock;
 import android.os.Trace;
 import android.text.TextUtils;
 import android.util.Log;
@@ -45,7 +44,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
-import com.mogo.eagle.core.utilcode.util.GsonUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.navi.MogoCarLocationChangedListenerRegister;

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java

@@ -302,11 +302,6 @@ public class AMapWrapper implements IMogoMap {
         return null;
     }
 
-    @Override
-    public String getMapVersion() {
-        return MapAutoApi.INSTANCE.getSDKVersion();
-    }
-
     private boolean checkAMap() {
         mAMap = mMapView.getMapAutoViewHelper();
         sAMap = mAMap;