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

Merge remote-tracking branch 'origin/feature/v2.0.0' into feature/v2.0.0

Browse Source
This commit is contained in:
tongchenfei
2020-05-27 13:16:02 +08:00
parent 3f2d963087 39d78094af
commit 76eb4eaca5
15 changed files with 286 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
View File

@@ -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 );
}

1
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/InternalFunctionLauncher.java
View File

@@ -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:

1
modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml
View File

@@ -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" />

13
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -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);

442
modules/mogo-module-extensions/src/main/res/xml/module_ext_top_motion.xml
View File

@@ -1,442 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Transition
android:id="@+id/navi_transition"
app:constraintSetEnd="@+id/end"
app:constraintSetStart="@+id/start"
app:duration="500">
<OnSwipe
app:dragDirection="dragUp"
app:onTouchUp="autoComplete"
app:touchRegionId="@+id/module_entrance_id_top_container" />
</Transition>
<ConstraintSet android:id="@+id/start">
<Constraint
android:id="@+id/module_entrance_id_top_container"
android:layout_width="@dimen/module_ext_navi_info_panel_width"
android:layout_height="300dp"
android:background="#cccccc"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<Constraint
android:id="@+id/module_map_id_navi_bg"
android:layout_width="@dimen/module_ext_navi_info_panel_width"
android:layout_height="@dimen/module_ext_navi_info_panel_height"
android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/module_entrance_id_top_container" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_road_turn_icon"
android:layout_width="@dimen/module_ext_navi_info_panel_turn_icon_width"
android:layout_height="@dimen/module_ext_navi_info_panel_turn_icon_height"
android:layout_marginStart="@dimen/module_ext_navi_info_panel_turn_icon_marginLeft"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
android:src="@drawable/ic_11" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_52"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_textSize"
android:textStyle="bold"
app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_road_turn_icon"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_next_info_road_turn_icon"
android:text="53" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_distance_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
android:textColor="#FFFFFF"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance"
app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance"
android:text="米" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_turn_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
android:textColor="#7FF1F1F1"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance_unit"
app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance_unit"
android:text="左转进入" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_road"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/module_ext_navi_next_info_road_marginTop"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_road_textSize"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_next_info_road_turn_icon"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_navi_next_info_distance"
android:text="北三环东路辅路" />
<!--remain distance-->
<Constraint
android:id="@+id/module_map_id_remaining_distance_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_117"
android:src="@drawable/module_ext_ic_navi_info1"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_distance"
app:layout_constraintRight_toLeftOf="@id/module_map_id_remaining_time_icon"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<Constraint
android:id="@+id/module_map_id_remaining_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_distance_textSize"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@+id/module_map_id_remaining_distance_notice"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance_icon"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_remaining_distance_icon"
android:text="3599" />
<Constraint
android:id="@+id/module_map_id_remaining_distance_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="visible"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_distance"
app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_distance"
android:text="km" />
<Constraint
android:id="@+id/module_map_id_remaining_distance_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="剩余"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance"
app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_distance" />
<!--remain time-->
<Constraint
android:id="@+id/module_map_id_remaining_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_117"
android:src="@drawable/module_ext_ic_navi_info2"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time"
app:layout_constraintRight_toLeftOf="@id/module_map_id_arrive_time_icon"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<Constraint
android:id="@+id/module_map_id_remaining_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_time_textSize"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time_notice"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time_icon"
app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_time_icon"
android:text="3599" />
<Constraint
android:id="@+id/module_map_id_remaining_time_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_time_unit_textSize"
android:visibility="visible"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_time"
app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_time"
android:text="km" />
<Constraint
android:id="@+id/module_map_id_remaining_time_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="时间"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time"
app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_time" />
<!--arrive time-->
<Constraint
android:id="@+id/module_map_id_arrive_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_95"
android:src="@drawable/module_ext_ic_navi_info3"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time"
app:layout_constraintRight_toRightOf="@+id/module_map_id_navi_bg"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<Constraint
android:id="@+id/module_map_id_arrive_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_arrive_time_textSize"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time_notice"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time_icon"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_arrive_time_icon"
android:text="3599" />
<Constraint
android:id="@+id/module_map_id_arrive_time_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="到达"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time"
app:layout_constraintTop_toBottomOf="@id/module_map_id_arrive_time" />
</ConstraintSet>
<ConstraintSet android:id="@+id/end">
<Constraint
android:id="@+id/module_entrance_id_top_container"
android:layout_width="@dimen/module_ext_navi_info_panel_width"
android:layout_height="300dp"
android:background="#cccccc"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Constraint
android:id="@+id/module_map_id_navi_bg"
android:layout_width="@dimen/module_ext_navi_info_panel_width"
android:layout_height="@dimen/module_ext_navi_info_panel_small_height"
android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/module_entrance_id_top_container" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_road_turn_icon"
android:layout_width="@dimen/module_ext_navi_info_panel_turn_icon_small_width"
android:layout_height="@dimen/module_ext_navi_info_panel_turn_icon_small_height"
android:layout_marginStart="@dimen/module_ext_navi_info_panel_turn_icon_marginLeft"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
android:src="@drawable/ic_11" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_52"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_textSize"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_next_info_road_turn_icon"
app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_road_turn_icon"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_next_info_road_turn_icon"
android:text="53" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_distance_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
android:textColor="#FFFFFF"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance"
app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance"
android:text="米" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_turn_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
android:textColor="#7FF1F1F1"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance_unit"
app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance_unit"
android:text="左转进入" />
<Constraint
android:id="@+id/module_map_id_navi_next_info_road"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/module_ext_navi_next_info_road_marginTop"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_road_textSize"
app:layout_constraintBaseline_toBaselineOf="@+id/module_map_id_navi_next_info_turn_info"
app:layout_constraintLeft_toRightOf="@+id/module_map_id_navi_next_info_turn_info"
android:text="北三环东路辅路" />
<!--remain distance-->
<Constraint
android:id="@+id/module_map_id_remaining_distance_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_117"
android:src="@drawable/module_ext_ic_navi_info1"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_distance"
app:layout_constraintRight_toLeftOf="@id/module_map_id_remaining_time_icon"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<Constraint
android:id="@+id/module_map_id_remaining_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_distance_textSize"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/module_map_id_remaining_distance_notice"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance_icon"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_remaining_distance_icon"
android:text="3599" />
<Constraint
android:id="@+id/module_map_id_remaining_distance_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_distance"
app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_distance"
android:text="km" />
<Constraint
android:id="@+id/module_map_id_remaining_distance_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="剩余"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance"
app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_distance" />
<!--remain time-->
<Constraint
android:id="@+id/module_map_id_remaining_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_117"
android:src="@drawable/module_ext_ic_navi_info2"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time"
app:layout_constraintRight_toLeftOf="@id/module_map_id_arrive_time_icon"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<Constraint
android:id="@+id/module_map_id_remaining_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_time_textSize"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time_notice"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time_icon"
app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_time_icon"
android:text="3599" />
<Constraint
android:id="@+id/module_map_id_remaining_time_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_remaining_time_unit_textSize"
android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_time"
app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_time"
android:text="km" />
<Constraint
android:id="@+id/module_map_id_remaining_time_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="时间"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time"
app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_time" />
<!--arrive time-->
<Constraint
android:id="@+id/module_map_id_arrive_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_95"
android:src="@drawable/module_ext_ic_navi_info3"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time"
app:layout_constraintRight_toRightOf="@+id/module_map_id_navi_bg"
app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg"
app:layout_constraintVertical_chainStyle="packed" />
<Constraint
android:id="@+id/module_map_id_arrive_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F1F1F1"
android:textSize="@dimen/module_ext_arrive_time_textSize"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time_notice"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time_icon"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_arrive_time_icon"
android:text="3599" />
<Constraint
android:id="@+id/module_map_id_arrive_time_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="到达"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time"
app:layout_constraintTop_toBottomOf="@id/module_map_id_arrive_time" />
</ConstraintSet>
</MotionScene>

35
modules/mogo-module-extensions/src/main/res/xml/module_ext_top_no_navi_motion.xml
View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Transition
app:constraintSetEnd="@+id/end_no_navi"
app:constraintSetStart="@+id/start_no_navi"
app:duration="1000">
<OnSwipe
app:dragDirection="dragUp"
app:onTouchUp="autoComplete"
app:touchRegionId="@+id/module_entrance_id_top_container" />
</Transition>
<ConstraintSet android:id="@+id/start_no_navi">
<Constraint
android:id="@+id/module_entrance_id_top_container"
android:layout_width="@dimen/module_ext_navi_info_panel_width"
android:layout_height="@dimen/dp_350"
android:background="#cccccc"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</ConstraintSet>
<ConstraintSet android:id="@+id/end_no_navi">
<Constraint
android:id="@+id/module_entrance_id_top_container"
android:layout_width="@dimen/module_ext_navi_info_panel_width"
android:layout_height="@dimen/dp_350"
android:background="#cccccc"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</ConstraintSet>
</MotionScene>

350
modules/mogo-module-search/src/main/res/layout/fragment_search.xml
View File

@@ -2,212 +2,196 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/amap_fragment_container_padding_style"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/module_search_fragment_padding"
android:paddingLeft="@dimen/module_search_fragment_padding"
android:paddingRight="@dimen/module_search_fragment_padding"
android:paddingTop="@dimen/module_search_fragment_padding_top"
android:background="#7f000000"
android:clickable="true"
tools:context=".ui.search.SearchFragment"
style="@style/amap_fragment_container_padding_style"
>
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">
<include layout="@layout/include_search_bar" />
<TextView
android:layout_width="@dimen/module_search_btn_width"
android:text="@string/search_action"
android:layout_marginRight="@dimen/module_search_btn_right_margin"
android:gravity="center"
android:id="@+id/tv_navi_search"
android:visibility="gone"
android:textColor="@color/white"
android:textSize="@dimen/module_search_txt_big"
android:background="@drawable/shape_round_blue_grident"
app:layout_constraintRight_toRightOf="@+id/ll_navi_search"
app:layout_constraintTop_toTopOf="@+id/ll_navi_search"
app:layout_constraintBottom_toBottomOf="@+id/ll_navi_search"
android:layout_height="@dimen/module_search_btn_height"/>
<LinearLayout
android:id="@+id/ll_navi_home"
android:layout_width="@dimen/module_search_navi_home_width"
android:layout_height="@dimen/module_search_navi_home_height"
android:background="@drawable/shape_round_gray"
android:gravity="center_vertical"
android:layout_marginLeft="@dimen/module_search_navi_home_margin_left"
android:orientation="horizontal"
app:layout_constraintLeft_toRightOf="@id/ll_navi_search"
app:layout_constraintTop_toTopOf="parent"
>
<include layout="@layout/include_search_bar" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="@dimen/txt_normal"
android:paddingLeft="@dimen/module_search_navi_home_padding_left"
android:id="@+id/tv_navi_home"
android:gravity="center_vertical"
android:drawableLeft="@mipmap/icon_navi_home"
android:text="@string/navi_home"
android:id="@+id/tv_navi_search"
android:layout_width="@dimen/module_search_btn_width"
android:layout_height="@dimen/module_search_btn_height"
android:layout_marginRight="@dimen/module_search_btn_right_margin"
android:background="@drawable/shape_round_blue_grident"
android:gravity="center"
android:text="@string/search_action"
android:textColor="@color/white"
/>
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" />
<View
android:layout_width="1dp"
android:layout_height="@dimen/module_search_dp_72"
android:background="#17D8D8D8"
/>
<TextView
android:layout_width="0dp"
android:textSize="@dimen/txt_normal"
android:text="@string/navi_company"
android:paddingLeft="@dimen/module_search_navi_home_padding_left"
android:id="@+id/tv_navi_company"
<LinearLayout
android:id="@+id/ll_navi_home"
android:layout_width="@dimen/module_search_navi_home_width"
android:layout_height="@dimen/module_search_navi_home_height"
android:layout_marginLeft="@dimen/module_search_navi_home_margin_left"
android:background="@drawable/shape_round_gray"
android:gravity="center_vertical"
android:drawableLeft="@mipmap/icon_navi_company"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="@color/white"
/>
android:orientation="horizontal"
app:layout_constraintLeft_toRightOf="@id/ll_navi_search"
app:layout_constraintTop_toTopOf="parent">
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_navi_history"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_height="@dimen/module_search_dp_778"
android:layout_marginTop="@dimen/module_search_dp_32"
android:background="@drawable/shape_round_gray"
android:padding="@dimen/module_search_dp_40"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_navi_search"
>
<TextView
android:id="@+id/tv_navi_home"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableLeft="@mipmap/icon_navi_home"
android:gravity="center_vertical"
android:paddingLeft="@dimen/module_search_navi_home_padding_left"
android:text="@string/navi_home"
android:textColor="@color/white"
android:textSize="@dimen/txt_normal" />
<TextView
android:id="@+id/tv_navi_history"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/history_search"
android:textColor="@color/white_60"
android:textSize="@dimen/txt_normal"
/>
<View
android:layout_width="1dp"
android:layout_height="@dimen/module_search_dp_72"
android:background="#17D8D8D8" />
<TextView
android:id="@+id/tv_navi_company"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableLeft="@mipmap/icon_navi_company"
android:gravity="center_vertical"
android:paddingLeft="@dimen/module_search_navi_home_padding_left"
android:text="@string/navi_company"
android:textColor="@color/white"
android:textSize="@dimen/txt_normal" />
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_navi_history"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_height="@dimen/module_search_dp_778"
android:layout_marginTop="@dimen/module_search_dp_32"
android:background="@drawable/shape_round_gray"
android:padding="@dimen/module_search_dp_40"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_navi_search">
<TextView
android:id="@+id/tv_navi_history"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/history_search"
android:textColor="@color/white_60"
android:textSize="@dimen/txt_normal" />
<TextView
android:id="@+id/tv_navi_history_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<TextView
android:id="@+id/tv_navi_history_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="@string/history_clear"
android:textColor="@color/txt_blue"
android:textSize="@dimen/txt_normal" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_navi_history"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/module_search_dp_60" />
</RelativeLayout>
android:layout_alignParentRight="true"
android:text="@string/history_clear"
android:textColor="@color/txt_blue"
android:textSize="@dimen/txt_normal"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:id="@+id/rv_navi_history"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/module_search_dp_60"
/>
</RelativeLayout>
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" />
<androidx.recyclerview.widget.RecyclerView
android:visibility="gone"
android:layout_marginTop="@dimen/dp_32"
android:padding="@dimen/module_search_dp_37"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
android:background="@drawable/shape_round_gray"
app:layout_constraintTop_toBottomOf="@id/ll_navi_search"
app:layout_constraintLeft_toLeftOf="parent"
android:id="@+id/rv_navi_search"/>
<TextView
android:id="@+id/tv_navi_list_empty"
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:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/txt_large"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_navi_search" />
<TextView
android:id="@+id/tv_navi_restaurant"
style="@style/txt_navi_style"
android:layout_marginTop="@dimen/dp_32"
android:drawableTop="@mipmap/icon_navi_restrant"
android:text="@string/navi_restrant"
app:layout_constraintLeft_toLeftOf="@id/ll_navi_home"
app:layout_constraintTop_toBottomOf="@id/ll_navi_home" />
<TextView
android:id="@+id/tv_navi_gas"
style="@style/txt_navi_style"
android:layout_marginLeft="@dimen/dp_32"
android:drawableTop="@mipmap/icon_navi_gas"
android:text="@string/navi_gas"
app:layout_constraintLeft_toRightOf="@id/tv_navi_restaurant"
app:layout_constraintTop_toTopOf="@id/tv_navi_restaurant" />
<TextView
android:visibility="gone"
android:layout_marginTop="@dimen/dp_32"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_height="0dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/txt_large"
app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
android:background="@drawable/shape_round_gray"
app:layout_constraintTop_toBottomOf="@id/ll_navi_search"
app:layout_constraintLeft_toLeftOf="parent"
android:id="@+id/tv_navi_list_empty"/>
<TextView
android:drawableTop="@mipmap/icon_navi_restrant"
app:layout_constraintTop_toBottomOf="@id/ll_navi_home"
app:layout_constraintLeft_toLeftOf="@id/ll_navi_home"
android:text="@string/navi_restrant"
android:layout_marginTop="@dimen/dp_32"
android:id="@+id/tv_navi_restaurant"
style="@style/txt_navi_style"
/>
<TextView
android:drawableTop="@mipmap/icon_navi_gas"
android:id="@+id/tv_navi_gas"
app:layout_constraintTop_toTopOf="@id/tv_navi_restaurant"
app:layout_constraintLeft_toRightOf="@id/tv_navi_restaurant"
android:text="@string/navi_gas"
android:layout_marginLeft="@dimen/dp_32"
style="@style/txt_navi_style"
/>
<TextView
android:id="@+id/tv_navi_toilet"
style="@style/txt_navi_style"
android:layout_marginTop="@dimen/dp_32"
android:drawableTop="@mipmap/icon_navi_tolit"
android:text="@string/navi_toilet"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_restaurant"
app:layout_constraintTop_toBottomOf="@id/tv_navi_restaurant" />
<TextView
android:drawableTop="@mipmap/icon_navi_tolit"
android:id="@+id/tv_navi_toilet"
app:layout_constraintTop_toBottomOf="@id/tv_navi_restaurant"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_restaurant"
android:text="@string/navi_toilet"
android:layout_marginTop="@dimen/dp_32"
style="@style/txt_navi_style"
/>
<TextView
android:id="@+id/tv_navi_wash"
style="@style/txt_navi_style"
android:layout_marginTop="@dimen/dp_32"
android:drawableTop="@mipmap/icon_navi_wash"
android:text="@string/navi_park"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_restaurant"
app:layout_constraintTop_toBottomOf="@id/tv_navi_toilet" />
<TextView
android:id="@+id/tv_navi_park"
style="@style/txt_navi_style"
android:layout_marginTop="@dimen/dp_32"
android:drawableTop="@mipmap/icon_navi_park"
android:text="@string/navi_wash"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas"
app:layout_constraintTop_toBottomOf="@id/tv_navi_gas" />
<TextView
android:drawableTop="@mipmap/icon_navi_wash"
android:id="@+id/tv_navi_wash"
app:layout_constraintTop_toBottomOf="@id/tv_navi_toilet"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_restaurant"
android:text="@string/navi_park"
android:layout_marginTop="@dimen/dp_32"
style="@style/txt_navi_style"
/>
<TextView
android:drawableTop="@mipmap/icon_navi_park"
android:id="@+id/tv_navi_park"
app:layout_constraintTop_toBottomOf="@id/tv_navi_gas"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas"
android:text="@string/navi_wash"
android:layout_marginTop="@dimen/dp_32"
style="@style/txt_navi_style"
/>
<TextView
android:drawableTop="@mipmap/icon_navi_setting"
android:id="@+id/tv_navi_setting"
app:layout_constraintTop_toBottomOf="@id/tv_navi_park"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas"
android:text="@string/navi_setting"
android:background="@drawable/shape_round_blue"
android:layout_marginTop="@dimen/dp_32"
style="@style/txt_navi_style"
/>
<TextView
android:id="@+id/tv_navi_setting"
style="@style/txt_navi_style"
android:layout_marginTop="@dimen/dp_32"
android:background="@drawable/shape_round_blue"
android:drawableTop="@mipmap/icon_navi_setting"
android:text="@string/navi_setting"
app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas"
app:layout_constraintTop_toBottomOf="@id/tv_navi_park" />
</androidx.constraintlayout.widget.ConstraintLayout>

5
modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
View File

@@ -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 );
}
/**

40
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java Normal file
View File

@@ -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
* <p>
* 描述
*/
@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 ) {
}
}