Merge branch 'qa' into dev

gradle.properties

@@ -73,7 +73,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
 # v2x
-MOGO_MODULE_V2X_VERSION=1.1.47
+MOGO_MODULE_V2X_VERSION=1.1.48
 # 推送
 MOGO_MODULE_PUSH_VERSION=1.0.1
 # 广告资源位

modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java

@@ -22,7 +22,7 @@ public class MapCenterPointStrategy {
 
     public static final MapCenterPoint DEFAULT = new MapCenterPoint( 0.677734D, 0.5733333D );
 
-    static {
+    public static void init()  {
         // 普通场景，使用高德内部值
         {
             Map< Integer, MapCenterPoint > common = new HashMap<>();

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -133,16 +133,18 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
 
         EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {
             Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );
+
+            // 右移地图中心点
+            mMogoMapUIController = mMogoMapService.getMapUIController();
+            MapCenterPointStrategy.init();
+            MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS );
+
             // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
             addModule();
             loadContainerModules();
             MogoModulesManager.getInstance().loadModules();
             mPresenter.delayOperations();
 
-            // 右移地图中心点
-            mMogoMapUIController = mMogoMapService.getMapUIController();
-            MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS );
-
             // 启动一些基本的服务：定位等
             startBaseService();
 

modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt

@@ -44,7 +44,7 @@ object AddressManager {
     fun init(context: Context) {
 
         poiDao = AppDataBase.getDatabase(context).poiDao()
-        WorkThreadHandler.getInstance().post {
+        WorkThreadHandler.getInstance().postDelayed({
             try {
                 var zdCompany = SearchApisHolder.getPersonalInfoManager().company
                 companyAddress = EntityConvertUtils.zd2Mogo(zdCompany, DataConstants.TYPE_COMPANY_ADDRESS)
@@ -53,7 +53,7 @@ object AddressManager {
             } catch (e: Exception) {
                 Logger.d(TAG, Log.getStackTraceString(e))
             }
-        }
+        }, 1000)
 
         SearchApisHolder.getPersonalInfoManager().addListener(object : PersonalInfoManager.InfoListener {
             override fun onCompanyChanged(company: ZDPoi?) {

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -703,6 +703,11 @@ public class MogoServices implements IMogoMapListener,
                 CarIconDisplayStrategy.getInstance().changeCarIconStatus( isTrue );
                 notifySeekHelpingStatusChanged( isTrue );
                 break;
+            case ACC_STATUS:
+                if ( isTrue ) {
+                    mADASController.showADAS();
+                }
+                break;
         }
     }