merge
This commit is contained in:
@@ -18,6 +18,7 @@ import android.widget.EditText;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.RadioButton;
|
||||
import android.widget.TextView;
|
||||
|
||||
@@ -184,6 +185,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
//远景和中景的切换
|
||||
private ImageView mSwitchMapModeImage;
|
||||
private FrameLayout mSwitchMapModeLayout;
|
||||
private TextView mSwitchText;
|
||||
|
||||
/**
|
||||
* 搜索莫模块
|
||||
@@ -376,9 +378,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
|
||||
mSwitchMapModeLayout = (FrameLayout) findViewById(R.id.module_switch_model_layout);
|
||||
mSwitchMapModeImage = (ImageView) findViewById(R.id.module_switch_model_icon);
|
||||
mSwitchMapModeImage.setOnClickListener(clickListener);
|
||||
mSwitchMapModeLayout.setOnClickListener(clickListener);
|
||||
mSwitchText = (TextView) findViewById(R.id.module_switch_model_text);
|
||||
|
||||
//TODO
|
||||
if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
|
||||
enterVrMode();
|
||||
}
|
||||
@@ -724,7 +726,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
|
||||
// 进入vr模式,不可缩放地图
|
||||
if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
|
||||
UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_000L );
|
||||
UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_500L );
|
||||
}
|
||||
|
||||
mClickShareVoiceStrings =
|
||||
@@ -1367,7 +1369,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
// show panel
|
||||
debugPanelGroup.setVisibility(View.VISIBLE);
|
||||
}
|
||||
} else if (v.getId() == R.id.module_switch_model_icon) { //切换地图的远近视图
|
||||
} else if (v.getId() == R.id.module_switch_model_layout) { //切换地图的远近视图
|
||||
if (MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getCurrentMapVisualAngle().isLongSight()) {
|
||||
MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).visibleAllMarkers();
|
||||
MogoApisHandler.getInstance().getApis().getMapServiceApi()
|
||||
|
||||
Reference in New Issue
Block a user