This commit is contained in:
tongchenfei
2020-07-29 11:24:12 +08:00
parent b4db944889
commit 259773d236
2 changed files with 15 additions and 25 deletions

View File

@@ -3,13 +3,11 @@ package com.mogo.module.extensions.entrance;
import android.content.Intent;
import android.graphics.Rect;
import android.os.Bundle;
import android.util.Log;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@@ -18,6 +16,7 @@ import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.map.listener.IMogoMapListener;
@@ -58,7 +57,6 @@ import com.mogo.utils.ResourcesHelper;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.glide.GlideApp;
import com.mogo.utils.logger.Logger;
import com.zhidao.roadcondition.service.DelayService;
import java.util.HashMap;
import java.util.Map;
@@ -168,7 +166,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
mDisplayOverviewText = findViewById(R.id.module_ext_id_display_overview_text);
mDisplayOverviewIcon = findViewById(R.id.module_ext_id_display_overview_icon);
mDisplayOverview.setOnClickListener(view -> {
if(getContext()!=null) {
if (getContext() != null) {
// 加此判断是解决下面setDisplayOverview后本Fragment回调中出现not attached to a context问题
if (!mStatusManager.isDisplayOverview()) {
mMApUIController.displayOverview(mDisplayOverviewBounds);
@@ -463,29 +461,21 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
if (!mMogoNavi.isNaviing()) {
return;
}
if(getContext()!=null) {
// 加此判断是为了规避not attached to a context问题
if (isTrue) {
mDisplayOverviewText.setText("退出全览");
mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getContext().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize));
if (isTrue) {
mDisplayOverviewText.setText("退出全览");
mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
AbsMogoApplication.getApp().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize));
mCameraMode.setVisibility(View.GONE);
} else {
mDisplayOverviewText.setText("全览");
mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
AbsMogoApplication.getApp().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize_large));
if (CustomNaviInterrupter.getInstance().interrupt()) {
mCameraMode.setVisibility(View.GONE);
} else {
mDisplayOverviewText.setText("全览");
mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getContext().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize_large));
if (CustomNaviInterrupter.getInstance().interrupt()) {
mCameraMode.setVisibility(View.GONE);
} else {
mCameraMode.setVisibility(View.VISIBLE);
}
mCameraMode.setVisibility(View.VISIBLE);
}
}
} else if (descriptor == StatusDescriptor.ACC_STATUS) {
Log.d(TAG, " onStatusChanged isTrue = " + isTrue);
if (isTrue) {
DelayService.Companion.launchService(getContext());
}
}
}
@@ -521,8 +511,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
}
private int[] heights = new int[]{100,200,300};
private int[] heights = new int[]{100, 200, 300};
private int currentHeight;
private void debugTopView() {
findViewById(R.id.btnDebugCtrlNaviView).setOnClickListener(view -> {
if (!toggle) {