diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index ff07cb08e7..6066b2456c 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -199,25 +199,13 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
mUpload = findViewById( R.id.module_entrance_id_upload );
mUploading = findViewById( R.id.module_entrance_id_uploading );
mUploadRoadCondition.setOnClickListener( view -> {
- // todo 测试动画
- if (!naviToggle) {
- View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
- ViewGroup.LayoutParams params =
- new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
- (int) getResources().getDimension(R.dimen.dp_350));
- mApis.getTopViewManager().addTopView(v, params);
- }else{
- mApis.getTopViewManager().removeTopView();
+ isClickShare = true;
+ if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) {
+ mIMogoAuthorizeModuleManager.invokeAuthorization( AUTHORIZE_TYPE_LAUNCHER_SHARE );
+ } else {
+ ShareControl.getInstance( getActivity() ).showDialog();
+ traceData( "1" );
}
- naviToggle = !naviToggle;
- // 原始逻辑
-// isClickShare = true;
-// if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) {
-// mIMogoAuthorizeModuleManager.invokeAuthorization( AUTHORIZE_TYPE_LAUNCHER_SHARE );
-// } else {
-// ShareControl.getInstance( getActivity() ).showDialog();
-// traceData( "1" );
-// }
} );
mDisplayOverview = findViewById( R.id.module_ext_id_display_overview );
@@ -234,24 +222,16 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
mMove2CurrentLocation = findViewById( R.id.module_entrance_id_move2_current_location );
mMove2CurrentLocation.setOnClickListener( view -> {
- // todo 测试动画
- if (!toggle) {
- TopViewAnimHelper.getInstance().showNaviView();
- }else{
- TopViewAnimHelper.getInstance().hideNaviView();
+ final MogoLocation location = mMogoLocationClient.getLastKnowLocation();
+ if ( location != null ) {
+ if ( !mMogoStatusManager.isV2XShow() ) {
+ mMogoStatusManager.setUserInteractionStatus( TAG, true, false );
+ mMApUIController.setLockZoom( 16 );
+ mMApUIController.changeZoom( 16.0f );
+ }
+ mMogoStatusManager.setUserInteractionStatus( TAG, true, false );
+ mMApUIController.recoverLockMode();
}
- toggle = !toggle;
- // 原始逻辑
-// final MogoLocation location = mMogoLocationClient.getLastKnowLocation();
-// if ( location != null ) {
-// if ( !mMogoStatusManager.isV2XShow() ) {
-// mMogoStatusManager.setUserInteractionStatus( TAG, true, false );
-// mMApUIController.setLockZoom( 16 );
-// mMApUIController.changeZoom( 16.0f );
-// }
-// mMogoStatusManager.setUserInteractionStatus( TAG, true, false );
-// mMApUIController.recoverLockMode();
-// }
} );
// mNaviInfo = findViewById( R.id.module_entrance_id_navi_info_panel );
@@ -284,16 +264,13 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
mCameraMode = findViewById( R.id.module_ext_id_north );
mCameraMode.setOnClickListener( view -> {
- // todo 测试动画
- TopViewAnimHelper.getInstance().debug();
- // 原始逻辑
-// if ( mCameraMode.isSelected() ) {
-// mMApUIController.changeMapMode( EnumMapUI.CarUp_2D );
-// } else {
-// mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
-// }
-// mCameraMode.setSelected( !mCameraMode.isSelected() );
-// mCameraMode.setText( getString( mCameraMode.isSelected() ? R.string.mode_car_up : R.string.mode_north_up ) );
+ if ( mCameraMode.isSelected() ) {
+ mMApUIController.changeMapMode( EnumMapUI.CarUp_2D );
+ } else {
+ mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
+ }
+ mCameraMode.setSelected( !mCameraMode.isSelected() );
+ mCameraMode.setText( getString( mCameraMode.isSelected() ? R.string.mode_car_up : R.string.mode_north_up ) );
} );
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 9d63dbd215..4547548674 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
@@ -1,7 +1,5 @@
package com.mogo.module.extensions.utils;
-import android.annotation.SuppressLint;
-import android.content.res.Resources;
import android.transition.AutoTransition;
import android.transition.Transition;
import android.transition.TransitionManager;
@@ -18,8 +16,6 @@ import androidx.constraintlayout.widget.Group;
import com.mogo.module.extensions.R;
import com.mogo.utils.logger.Logger;
-import java.util.Random;
-
/**
* 顶部动画帮助类
@@ -116,6 +112,12 @@ public class TopViewAnimHelper {
public void startTopInAnim(View view, ViewGroup.LayoutParams params) {
Logger.d("TopViewAnimHelper", "startTopInAnim=====");
+ if (view == null) {
+ throw new IllegalArgumentException("method addTopView params view is null");
+ }
+ if (params == null) {
+ throw new IllegalArgumentException("method addTopView params LayoutParams is null");
+ }
if (isTopViewOut) {
isTopViewOut = false;
@@ -287,12 +289,4 @@ public class TopViewAnimHelper {
void onAnimEnd();
}
-
- private int[] iconRes = new int[]{R.drawable.ic_1, R.drawable.ic_2, R.drawable.ic_3};
-
- public void debug() {
- Random random = new Random();
- int index = random.nextInt(3);
- ivTurnIcon.setImageResource(iconRes[index]);
- }
}
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
index 05dc6052c7..54a9485d89 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
@@ -18,12 +18,6 @@ public class TopViewManager implements IMogoTopViewManager {
@Override
public void addTopView(View view, ViewGroup.LayoutParams params) {
- if (view == null) {
- throw new IllegalArgumentException("method addTopView params view is null");
- }
- if (params == null) {
- throw new IllegalArgumentException("method addTopView params LayoutParams is null");
- }
TopViewAnimHelper.getInstance().startTopInAnim(view, params);
}
diff --git a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
index 2c9dfd1b3c..044c42aef9 100644
--- a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml
@@ -82,8 +82,8 @@
144px
85px
85px
- 56px
- 56px
+ 52px
+ 52px
13px
13px
20px
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index 9374230b56..bff31eac96 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -79,8 +79,8 @@
144px
159px
159px
- 56px
- 56px
+ 96px
+ 96px
24px
83px
24px