删除mogo-module-obu 场景

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2021-12-20 17:55:41 +08:00
parent daf002569f
commit 9bbb5ede54
51 changed files with 18 additions and 4072 deletions

View File

@@ -21,10 +21,8 @@ import android.os.Handler;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
@@ -46,12 +44,9 @@ import com.mogo.commons.mvp.MvpFragment;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper;
import com.mogo.eagle.core.utilcode.mogo.toast.TipDrawable;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.listener.MogoMapListenerHandler;
import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.marker.IMogoMarkerManager;
import com.mogo.map.navi.IMogoAimlessModeListener;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
import com.mogo.map.navi.IMogoNavi;
@@ -92,18 +87,14 @@ import com.mogo.service.module.IMogoRegisterCenter;
import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.service.windowview.IMogoTopViewStatusListener;
import com.mogo.utils.LaunchUtils;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.glide.GlideApp;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.storage.SharedPrefsMgr;
import com.zhidao.manager.ts.TsThreshold;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Random;
/**
* @author congtaowang
@@ -133,18 +124,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
private AnimNavInfoView animNavInfoView;
private VrModeNavInfoView vrModeNavInfoView;
private View mDisplayOverview;
private ImageView mDisplayOverviewIcon;
private TextView mDisplayOverviewText;
private IMogoServiceApis mApis;
private IMogoMapService mService;
private IMogoMapUIController mMApUIController;
private IMogoLocationClient mMogoLocationClient;
private IMogoNavi mMogoNavi;
private IMogoFragmentManager mMogoFragmentManager;
private IMogoMarkerManager mMogoMarkerManager;
private IMogoRegisterCenter mMogoRegisterCenter;
private IMogoAnalytics mAnalytics;
@@ -161,11 +148,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
private TextView mMsgCounter;
private ImageView mUserHeadImg;
private View thresholdSetContainer;
private EditText topEditC, frontLeftEditC, frontRightEditC, backLeftEditC, backRightEditC,
bottomEditC;
private EditText topEditS, frontLeftEditS, frontRightEditS, backLeftEditS, backRightEditS,
bottomEditS;
private String[] mClickShareVoiceStrings;
@@ -173,11 +155,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
private String[] mOuterGuideVoiceStrings;
private boolean isShowGuide;
/**
* 搜索模块
* 搜索模块
*/
private boolean mIsLock = true;
private TextView mCameraMode;
@@ -186,17 +165,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
private Rect mDisplayOverviewBounds;
private boolean toggle = false;
private TextView tvEnterVrMode;
private TextView tvExitVrMode;
private ConstraintLayout clTrafficLight;
private TextView tvYellow;
private TextView tvRed;
private TextView tvGreen;
/**
* 内部变量标识是否在vrMode用于方法执行过滤避免重复或异常调用
*/
@@ -227,11 +199,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
@Override
protected int getLayoutId() {
if (DebugConfig.isMapBased()) {
return R.layout.module_ext_layout_entrance;
} else {
return R.layout.module_ext_layout_entrance_no_map;
}
return R.layout.module_ext_layout_entrance;
}
@Override
@@ -263,7 +231,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
mUploadRoadCondition.setOnClickListener(clickListener);
mDisplayOverview = findViewById(R.id.module_ext_id_display_overview);
mDisplayOverviewText = findViewById(R.id.module_ext_id_display_overview_text);
mDisplayOverviewIcon = findViewById(R.id.module_ext_id_display_overview_icon);
mMove2CurrentLocation = findViewById(R.id.module_entrance_id_move2_current_location);
mUserHeadImg = findViewById(R.id.ivUserHeadImg);
groupFix = findViewById(R.id.groupFix);
@@ -334,26 +301,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
dealWeatherContainer();
listenSeekNumber();
debugTopView();
debugCrashWarn();
etTimes = findViewById(R.id.etTimes);
findViewById(R.id.btnFix).setOnClickListener(clickListener);
findViewById(R.id.debugPanel).setOnClickListener(clickListener);
initDebugPanel();
clTrafficLight = (ConstraintLayout) findViewById(R.id.cl_traffic_light);
tvYellow = (TextView) findViewById(R.id.tv_yellow);
tvRed = (TextView) findViewById(R.id.tv_red);
tvGreen = (TextView) findViewById(R.id.tv_green);
// 检查是否在vr模式
if (mStatusManager.isVrMode()) {
enterVrMode();
@@ -405,67 +360,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoLocationListener(TAG);
localIsVrMode = false;
clTrafficLight.setVisibility(View.GONE);
}
private void debugCrashWarn() {
thresholdSetContainer = findViewById(R.id.thresholdSetContainer);
topEditC = findViewById(R.id.etTopC);
frontLeftEditC = findViewById(R.id.etFrontLeftC);
backLeftEditC = findViewById(R.id.etBackLeftC);
frontRightEditC = findViewById(R.id.etFrontRightC);
backRightEditC = findViewById(R.id.etBackRightC);
bottomEditC = findViewById(R.id.etBottomC);
topEditS = findViewById(R.id.etTopS);
frontLeftEditS = findViewById(R.id.etFrontLeftS);
backLeftEditS = findViewById(R.id.etBackLeftS);
frontRightEditS = findViewById(R.id.etFrontRightS);
backRightEditS = findViewById(R.id.etBackRightS);
bottomEditS = findViewById(R.id.etBottomS);
findViewById(R.id.btnClose).setOnClickListener(view -> {
thresholdSetContainer.setVisibility(View.GONE);
mApis.getAdasControllerApi().showADAS();
});
mUploadRoadCondition.setOnLongClickListener(v -> {
mApis.getAdasControllerApi().closeADAS();
thresholdSetContainer.setVisibility(View.VISIBLE);
TsThreshold threshold = mApis.getCrashWarnProvider().getCurrentCrashThreshold();
topEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC5()));
topEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS5()));
bottomEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC6()));
bottomEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS6()));
frontLeftEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC4()));
frontLeftEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS4()));
backLeftEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC3()));
backLeftEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS3()));
frontRightEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC1()));
frontRightEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS1()));
backRightEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC2()));
backRightEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS2()));
return true;
});
findViewById(R.id.btnSet).setOnClickListener(view -> {
// 设置阈值
TsThreshold threshold = new TsThreshold(
Integer.parseInt(frontRightEditC.getText().toString()),
Integer.parseInt(frontRightEditS.getText().toString()),
Integer.parseInt(backRightEditC.getText().toString()),
Integer.parseInt(backRightEditS.getText().toString()),
Integer.parseInt(backLeftEditC.getText().toString()),
Integer.parseInt(backLeftEditS.getText().toString()),
Integer.parseInt(frontLeftEditC.getText().toString()),
Integer.parseInt(frontLeftEditS.getText().toString()),
Integer.parseInt(topEditC.getText().toString()),
Integer.parseInt(topEditS.getText().toString()),
Integer.parseInt(bottomEditC.getText().toString()),
Integer.parseInt(bottomEditS.getText().toString())
);
mApis.getCrashWarnProvider().setCrashThreshold(threshold);
thresholdSetContainer.setVisibility(View.GONE);
mApis.getAdasControllerApi().showADAS();
});
if (!DebugConfig.isMapBased()) {
// 不基于地图的版本需要隐藏一些按钮
@@ -610,7 +512,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
break;
case MotionEvent.ACTION_UP:
if (isShowGuide && isGreaterThanOneDay()) {
if (isGreaterThanOneDay()) {
if (motionEvent.getX() > 200) {
showSlideMapVoiceGuide();
}
@@ -660,13 +562,11 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
mService = mApis.getMapServiceApi();
mMogoRegisterCenter = mApis.getRegisterCenterApi();
mMApUIController = mService.getMapUIController();
mMogoLocationClient = mService.getSingletonLocationClient(getContext());
mMogoNavi = mService.getNavi(getContext());
mAnalytics = mApis.getAnalyticsApi();
mMogoRegisterCenter.registerMogoNaviListener(TYPE_ENTRANCE, this);
mMogoRegisterCenter.registerMogoMapListener(TYPE_ENTRANCE, this);
mMogoMarkerManager = mService.getMarkerManager(getContext());
mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.UPLOADING, this);
mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.DISPLAY_OVERVIEW, this);
@@ -923,103 +823,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
}
private final int[] heights = new int[]{100, 200, 300};
private int currentHeight;
private void debugTopView() {
findViewById(R.id.btnDebugCtrlNaviView).setOnClickListener(view -> {
if (!toggle) {
TopViewAnimHelper.getInstance().showNaviView();
} else {
TopViewAnimHelper.getInstance().hideNaviView();
}
toggle = !toggle;
});
findViewById(R.id.btnDebugCtrlSubView).setOnClickListener(view -> {
View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
TextView tv = v.findViewById(R.id.tvIndex);
tv.setText("sub view height: " + currentHeight + ": " + v);
mApis.getTopViewManager().addSubView(v, new IMogoTopViewStatusListener() {
@Override
public void onViewAdded(View view) {
Logger.d(TAG, "onSubViewAdded: " + view);
}
@Override
public void onViewRemoved(View view) {
Logger.d(TAG, "onSubViewRemoved: " + view);
}
@Override
public void beforeViewAddAnim(View view) {
Logger.d(TAG, "beforeSubViewAddAnim: " + view);
}
@Override
public void beforeViewRemoveAnim(View view) {
Logger.d(TAG, "beforeSubViewRemoveAnim: " + view);
}
});
});
findViewById(R.id.btnDebugCtrlTopView).setOnClickListener(view -> {
View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
TextView tv = v.findViewById(R.id.tvIndex);
Random random = new Random();
currentHeight = heights[random.nextInt(3)];
tv.setText(" height: " + currentHeight + ": " + v);
ViewGroup.LayoutParams params =
new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, currentHeight);
// mApis.getEntranceButtonController().addLeftFeatureView(v);
mApis.getTopViewManager().addView(v, params, new IMogoTopViewStatusListener() {
@Override
public void onViewAdded(View view) {
Logger.d(TAG, "onViewAdded: " + view);
}
@Override
public void onViewRemoved(View view) {
Logger.d(TAG, "onViewRemoved: " + view);
}
@Override
public void beforeViewAddAnim(View view) {
Logger.d(TAG, "beforeViewAddAnim: " + view);
}
@Override
public void beforeViewRemoveAnim(View view) {
Logger.d(TAG, "beforeViewRemoveAnim: " + view);
}
});
});
findViewById(R.id.btnDebugAddBottomLayerView).setOnClickListener(v -> {
TextView tv = new TextView(getContext());
tv.setText("entrance add");
mApis.getEntranceButtonController().addBottomLayerView(tv, 50, 50);
});
findViewById(R.id.btnShowTextTip).setOnClickListener(v -> TipToast.tip("分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功"));
findViewById(R.id.btnShowDrawableTip).setOnClickListener(v -> {
mMsgContainer.setVisibility(View.VISIBLE);
TipDrawable drawable =
new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150);
TipToast.tip("分享成功", drawable);
});
findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v -> {
mMsgContainer.setVisibility(View.GONE);
TipDrawable drawable =
new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head));
TipToast.tip("分享成功", drawable);
});
}
private boolean mLastStatusIsVr = false;
@Override
public void onMapModeChanged(EnumMapUI ui) {
if (mCameraMode == null) {

View File

@@ -5,11 +5,10 @@ import android.view.View;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.module.extensions.utils.EntranceViewHolder;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.module.extensions.utils.EntranceViewHolder;
import com.mogo.service.entrance.ButtonIndex;
import com.mogo.service.entrance.IMogoEntranceButtonController;
import com.mogo.service.windowview.IMogoEntranceViewListener;
/**
* @author congtaowang
@@ -17,17 +16,12 @@ import com.mogo.service.windowview.IMogoEntranceViewListener;
* <p>
* 描述
*/
@Route( path = MogoServicePaths.PATH_ENTRANCE_BUTTON_API )
@Route(path = MogoServicePaths.PATH_ENTRANCE_BUTTON_API)
public class MogoEntranceButtonControllerImpl implements IMogoEntranceButtonController {
@Override
public TextView getButton( ButtonIndex index ) {
return MogoEntranceButtons.getButton( index );
}
@Override
public void addBottomLayerView(View view) {
EntranceViewHolder.getInstance().addBottomLayerView(view);
public TextView getButton(ButtonIndex index) {
return MogoEntranceButtons.getButton(index);
}
@Override
@@ -40,15 +34,6 @@ public class MogoEntranceButtonControllerImpl implements IMogoEntranceButtonCont
EntranceViewHolder.getInstance().removeBottomLayerView(view);
}
@Override
public void showLeftNoticeView(View view) {
EntranceViewHolder.getInstance().showLeftNoticeView(view);
}
@Override
public void hideLeftNoticeView(View view) {
EntranceViewHolder.getInstance().hideLeftNoticeView(view);
}
@Override
public void showLeftNoticeByType(int noticeType, int iconRes, String content) {
@@ -61,17 +46,7 @@ public class MogoEntranceButtonControllerImpl implements IMogoEntranceButtonCont
}
@Override
public void addEntranceViewListener(IMogoEntranceViewListener listener) {
EntranceViewHolder.getInstance().addEntranceViewListener(listener);
}
@Override
public void removeEntranceViewListener(IMogoEntranceViewListener listener) {
EntranceViewHolder.getInstance().removeEntranceViewListener(listener);
}
@Override
public void init( Context context ) {
public void init(Context context) {
}