diff --git a/config.gradle b/config.gradle
index e12bbcd7bf..692a12e959 100644
--- a/config.gradle
+++ b/config.gradle
@@ -12,7 +12,7 @@ ext {
// androidx
androidxappcompat : "androidx.appcompat:appcompat:1.0.2",
androidxccorektx : "androidx.core:core-ktx:1.2.0",
- androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:2.0.0-beta6",
+ androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:1.1.3",
androidxmultidex : "androidx.multidex:multidex:2.0.1",
androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0",
androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0",
@@ -121,7 +121,7 @@ ext {
jetbrainsannotationsjava5: "org.jetbrains:annotations-java5:15.0",
// 统一登录
- accountsdk : "com.zhidao.accountservice:account-sdk:1.0.5",
+ accountsdk : "com.zhidao.accountservice:account-sdk:1.0.8",
// crash
crashSdk : "com.zhidaoauto.crash.log:library:1.0.5",
kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7",
diff --git a/gradle.properties b/gradle.properties
index a8b8b32956..477e0b1fd1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,29 +27,29 @@ PASSWORD=xintai2018
RELEASE=false
# 模块版本
## 工程内模块
-MOGO_COMMONS_VERSION=1.1.0.8
-MOGO_UTILS_VERSION=1.1.0.8
-MAP_AMAP_VERSION=1.1.0.8
-MOGO_MAP_VERSION=1.1.0.8
-MOGO_MAP_API_VERSION=1.1.0.8
-MOGO_SERVICE_VERSION=1.1.0.8
-MOGO_SERVICE_API_VERSION=1.1.0.8
-MOGO_CONNECTION_VERSION=1.1.0.8
-MOGO_MODULE_APPS_VERSION=1.1.0.8
-MOGO_MODULE_NAVI_VERSION=1.1.0.8
-MOGO_MODULE_SHARE_VERSION=1.1.0.8
-MOGO_MODULE_COMMON_VERSION=1.1.0.8
-MOGO_MODULE_MAIN_VERSION=1.1.0.8
-MOGO_MODULE_MAP_VERSION=1.1.0.8
-MOGO_MODULE_SERVICE_VERSION=1.1.0.8
-MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.8
-MOGO_MODULE_SEARCH_VERSION=1.1.0.8
-MOGO_MODULE_BACK_VERSION=1.1.0.8
-MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.8
-MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.8
-MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.8
-MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.8
-MOGO_MODULE_GUIDE_VERSION=1.1.0.8
+MOGO_COMMONS_VERSION=1.1.0.11
+MOGO_UTILS_VERSION=1.1.0.11
+MAP_AMAP_VERSION=1.1.0.11
+MOGO_MAP_VERSION=1.1.0.11
+MOGO_MAP_API_VERSION=1.1.0.11
+MOGO_SERVICE_VERSION=1.1.0.11
+MOGO_SERVICE_API_VERSION=1.1.0.11
+MOGO_CONNECTION_VERSION=1.1.0.11
+MOGO_MODULE_APPS_VERSION=1.1.0.11
+MOGO_MODULE_NAVI_VERSION=1.1.0.11
+MOGO_MODULE_SHARE_VERSION=1.1.0.11
+MOGO_MODULE_COMMON_VERSION=1.1.0.11
+MOGO_MODULE_MAIN_VERSION=1.1.0.11
+MOGO_MODULE_MAP_VERSION=1.1.0.11
+MOGO_MODULE_SERVICE_VERSION=1.1.0.11
+MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.11
+MOGO_MODULE_SEARCH_VERSION=1.1.0.11
+MOGO_MODULE_BACK_VERSION=1.1.0.11
+MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.11
+MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.11
+MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.11
+MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.11
+MOGO_MODULE_GUIDE_VERSION=1.1.0.11
## 工程外部模块
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
index d72b53e10a..82dd3d7976 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
@@ -27,6 +27,7 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
private IMogoFragmentManager mMogoFragmentManager;
public static void start( Activity context ) {
+ AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
Intent starter = new Intent( context, AppsListActivity.class );
context.startActivity( starter );
}
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java
index 5db46d1315..99ba75c675 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java
@@ -28,7 +28,6 @@ public class InternalFunctionLauncher extends BaseAppLauncher {
AppServiceHandler.getApis().getSearchManagerApi().showSearch();
break;
case "com.mogo.launcher.applist":
- AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
AppsListActivity.start( mActivity );
break;
default:
diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml
index 6129c52c1e..ea8e2d1cc6 100644
--- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml
+++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml
@@ -26,6 +26,7 @@
android:id="@+id/module_apps_id_apps_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:overScrollMode="never"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
index 4c75e753e0..8f593faa22 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -152,10 +152,9 @@ public class TopViewAnimHelper {
topContainer.addView(view, params);
constraintSet.clone(topMotionLayout);
- constraintSet.getConstraint(R.id.module_entrance_id_top_container).layout.bottomToTop = -1;
- constraintSet.getConstraint(R.id.module_entrance_id_top_container).layout.topToTop =
- R.id.module_entrance_id_top_motion_layout;
-
+ constraintSet.clear(R.id.module_entrance_id_top_container,ConstraintSet.BOTTOM);
+ constraintSet.connect(R.id.module_entrance_id_top_container, ConstraintSet.TOP,
+ R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP);
TransitionManager.beginDelayedTransition(topMotionLayout, transition);
checkCameraModePosition(false);
if (naviGroup.getVisibility() == View.VISIBLE) {
@@ -229,9 +228,9 @@ public class TopViewAnimHelper {
isTopViewOut = true;
constraintSet.clone(topMotionLayout);
- constraintSet.getConstraint(R.id.module_entrance_id_top_container).layout.bottomToTop =
- R.id.module_entrance_id_top_motion_layout;
- constraintSet.getConstraint(R.id.module_entrance_id_top_container).layout.topToTop = -1;
+ constraintSet.clear(R.id.module_entrance_id_top_container,ConstraintSet.TOP);
+ constraintSet.connect(R.id.module_entrance_id_top_container, ConstraintSet.BOTTOM,
+ R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP);
TransitionManager.beginDelayedTransition(topMotionLayout, transition);
checkCameraModePosition(false);
diff --git a/modules/mogo-module-extensions/src/main/res/xml/module_ext_top_motion.xml b/modules/mogo-module-extensions/src/main/res/xml/module_ext_top_motion.xml
deleted file mode 100644
index 99a7f0e15c..0000000000
--- a/modules/mogo-module-extensions/src/main/res/xml/module_ext_top_motion.xml
+++ /dev/null
@@ -1,442 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/xml/module_ext_top_no_navi_motion.xml b/modules/mogo-module-extensions/src/main/res/xml/module_ext_top_no_navi_motion.xml
deleted file mode 100644
index 8fda6c7123..0000000000
--- a/modules/mogo-module-extensions/src/main/res/xml/module_ext_top_no_navi_motion.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_search.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search.xml
index 57459ecbae..3d3cf20259 100644
--- a/modules/mogo-module-search/src/main/res/layout/fragment_search.xml
+++ b/modules/mogo-module-search/src/main/res/layout/fragment_search.xml
@@ -2,212 +2,196 @@
+ android:paddingLeft="@dimen/module_search_fragment_padding"
+ android:paddingTop="@dimen/module_search_fragment_padding_top"
+ android:paddingRight="@dimen/module_search_fragment_padding"
+ android:paddingBottom="@dimen/module_search_fragment_padding"
+ tools:context=".ui.search.SearchFragment">
-
-
-
-
-
-
+
+ android:textSize="@dimen/module_search_txt_big"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="@+id/ll_navi_search"
+ app:layout_constraintRight_toRightOf="@+id/ll_navi_search"
+ app:layout_constraintTop_toTopOf="@+id/ll_navi_search" />
-
-
-
+ android:orientation="horizontal"
+ app:layout_constraintLeft_toRightOf="@id/ll_navi_search"
+ app:layout_constraintTop_toTopOf="parent">
-
-
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
- android:layout_alignParentRight="true"
- android:text="@string/history_clear"
- android:textColor="@color/txt_blue"
- android:textSize="@dimen/txt_normal"
- />
-
-
+ android:id="@+id/rv_navi_search"
+ android:layout_width="@dimen/module_search_dp_1200"
+ android:layout_height="0dp"
+ android:layout_marginTop="@dimen/dp_32"
+ android:background="@drawable/shape_round_gray"
+ android:padding="@dimen/module_search_dp_37"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/ll_navi_search" />
-
+
+
+
+
+
-
-
-
-
-
+
-
+
+
-
-
-
-
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
index b2f2391ff6..c88d8206ac 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
@@ -4,6 +4,7 @@ import android.content.Context;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.map.location.IMogoLocationClient;
+import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.IMogoMarkerManager;
import com.mogo.map.navi.IMogoNavi;
import com.mogo.map.uicontroller.IMogoMapUIController;
@@ -189,8 +190,8 @@ public class MarkerServiceHandler {
* @see MapMarkerManager#drawMapMarker(MarkerShowEntity)
*/
@Deprecated
- public static void drawMapMarker( MarkerShowEntity markerShowEntity ) {
- getMapMarkerManager().drawMapMarker( markerShowEntity );
+ public static IMogoMarker drawMapMarker( MarkerShowEntity markerShowEntity ) {
+ return getMapMarkerManager().drawMapMarker( markerShowEntity );
}
/**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java
new file mode 100644
index 0000000000..f964562c48
--- /dev/null
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java
@@ -0,0 +1,40 @@
+package com.mogo.module.service.marker;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.map.marker.IMogoMarker;
+import com.mogo.module.common.entity.MarkerShowEntity;
+import com.mogo.module.service.MarkerServiceHandler;
+import com.mogo.service.MogoServicePaths;
+import com.mogo.service.module.IMogoMarkerService;
+import com.mogo.utils.logger.Logger;
+
+/**
+ * @author congtaowang
+ * @since 2020-05-27
+ *
+ * 描述
+ */
+@Route( path = MogoServicePaths.PATH_MARKER_SERVICE )
+public class MogoMarkerServiceImpl implements IMogoMarkerService {
+
+ private static final String TAG = "MogoMarkerServiceImpl";
+
+ @Nullable
+ @Override
+ public IMogoMarker drawMarker( Object object ) {
+ if ( object instanceof MarkerShowEntity ) {
+ return MarkerServiceHandler.drawMapMarker( ( ( MarkerShowEntity ) object ) );
+ }
+ Logger.w(TAG, "object must instance of [com.mogo.module.common.entity.MarkerShowEntity]");
+ return null;
+ }
+
+ @Override
+ public void init( Context context ) {
+
+ }
+}
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
index ba87481b25..647a236561 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
@@ -16,6 +16,7 @@ import com.mogo.service.launcher.IMogoLauncher;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoActionManager;
import com.mogo.service.module.IMogoAddressManager;
+import com.mogo.service.module.IMogoMarkerService;
import com.mogo.service.module.IMogoRegisterCenter;
import com.mogo.service.module.IMogoSearchManager;
import com.mogo.service.module.IMogoSettingManager;
@@ -187,4 +188,10 @@ public interface IMogoServiceApis extends IProvider {
* @return
*/
IMogoTopViewManager getTopViewManager();
+
+ /**
+ * 其他模块调用公共的marker打点
+ * @return
+ */
+ IMogoMarkerService getMarkerService();
}
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
index 59bfa910b0..93986037c7 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
@@ -171,4 +171,10 @@ public class MogoServicePaths {
* 顶部1/2屏管理
*/
public static final String PATH_EXTENSIONS_TOP_VIEW_MANAGER = "/topview/api";
+
+ /**
+ * 其他模块调用公共的marker打点
+ */
+ @Deprecated
+ public static final String PATH_MARKER_SERVICE = "/mogomarker/api";
}
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoMarkerService.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoMarkerService.java
new file mode 100644
index 0000000000..8493cba40c
--- /dev/null
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoMarkerService.java
@@ -0,0 +1,22 @@
+package com.mogo.service.module;
+
+import androidx.annotation.Nullable;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+import com.mogo.map.marker.IMogoMarker;
+
+/**
+ * @author congtaowang
+ * @since 2020-05-27
+ *
+ * 描述
+ */
+public interface IMogoMarkerService extends IProvider {
+
+ /**
+ * @param object instance of com.mogo.module.common.entity.MarkerShowEntity
+ * @return
+ */
+ @Nullable
+ IMogoMarker drawMarker( Object object );
+}
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
index 91363abc52..534de90589 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
@@ -25,6 +25,7 @@ import com.mogo.service.launcher.IMogoLauncher;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoActionManager;
import com.mogo.service.module.IMogoAddressManager;
+import com.mogo.service.module.IMogoMarkerService;
import com.mogo.service.module.IMogoRegisterCenter;
import com.mogo.service.module.IMogoSearchManager;
import com.mogo.service.module.IMogoSettingManager;
@@ -162,10 +163,15 @@ public class MogoServiceApis implements IMogoServiceApis {
@Override
public IMogoTopViewManager getTopViewManager() {
- return getApiInstance(IMogoTopViewManager.class,MogoServicePaths.PATH_EXTENSIONS_TOP_VIEW_MANAGER);
+ return getApiInstance( IMogoTopViewManager.class, MogoServicePaths.PATH_EXTENSIONS_TOP_VIEW_MANAGER );
}
- private static < T extends IProvider > T getApiInstance(Class< T > clazz, String path ) {
+ @Override
+ public IMogoMarkerService getMarkerService() {
+ return getApiInstance( IMogoMarkerService.class, MogoServicePaths.PATH_MARKER_SERVICE );
+ }
+
+ private static < T extends IProvider > T getApiInstance( Class< T > clazz, String path ) {
T inst = SingletonsHolder.get( clazz );
if ( inst == null ) {
synchronized ( sLock ) {