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

Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-d_230217_1.0.1'

Browse Source 
[Fix]解决合并的冲突

See merge request zhjt/AndroidApp/MoGoEagleEye!550
This commit is contained in:
wangmingjun
2023-02-17 13:11:38 +00:00
parent dcd02be11c 18f3954545
commit 30a06cd575
9 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import android.content.Context;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.Bundle;
import android.os.Looper;
import android.os.Trace;
import android.text.TextUtils;
import android.util.Log;
@@ -44,7 +45,6 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.hdcache.IHdCacheListener;
import com.mogo.map.listener.MogoMapListenerHandler;
import com.mogo.map.location.GDLocationClient;
import com.mogo.map.navi.MogoCarLocationChangedListenerRegister;
import com.mogo.map.uicontroller.CarCursorOption;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;