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

解决冲突-EntranceFragment再验证一遍

Browse Source
This commit is contained in:
liujing
2021-09-15 19:57:10 +08:00
parent f270ea54c6
commit 99cd66191c
6 changed files with 28 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -7,6 +7,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -67,14 +68,11 @@ import com.mogo.module.extensions.utils.EntranceViewHolder;
import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper;
import com.mogo.module.extensions.utils.TopViewAnimHelper;
import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper;
import com.mogo.module.service.receiver.MogoReceiver;
import com.mogo.module.share.manager.ServiceApisManager;
import com.mogo.service.IMogoServiceApis;
<<<<<<< HEAD
import com.mogo.service.MogoServicePaths;
=======
import com.mogo.service.adas.IMogoAdasOCHCallback;
import com.mogo.service.adas.entity.AdasOCHData;
>>>>>>> dev/dev_eagle_architecture_upgrade
import com.mogo.service.analytics.IMogoAnalytics;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.entrance.ButtonIndex;
@@ -132,15 +130,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
IMogoAimlessModeListener,
IMogoStatusChangedListener,
IMogoIntentListener,
<<<<<<< HEAD
// IMogoLocationListener,
IMogoCarLocationChangedListener2,
IMogoCheckListener {
=======
IMogoCheckListener ,
IMogoAdasOCHCallback,
IMogoCarLocationChangedListener2 {
>>>>>>> dev/dev_eagle_architecture_upgrade
private static final String TAG = "EntranceFragment";
@@ -393,21 +386,19 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
// 根据本地配置设置自车图标
MyLocationUtil.setMyLocationIconUrl(getContext());
<<<<<<< HEAD
flSpeed = (FrameLayout) findViewById(R.id.fl_speed);
mouduleArc = (ArcView) findViewById(R.id.moudule_arc);
if (DebugConfig.isDebug()) {
mouduleArc.setLongClickable(true);
mouduleArc.setOnLongClickListener(v -> {
Log.d(TAG, "长按显示状态工具栏");
Intent intent = new Intent();
intent.putExtra("oper", 52);
MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent);
return true;
});
}
=======
>>>>>>> dev/dev_eagle_architecture_upgrade
// flSpeed = (FrameLayout) findViewById(R.id.fl_speed);
// mouduleArc = (ArcView) findViewById(R.id.moudule_arc);
// if (DebugConfig.isDebug()) {
// mouduleArc.setLongClickable(true);
// mouduleArc.setOnLongClickListener(v -> {
// Log.d(TAG, "长按显示状态工具栏");
// Intent intent = new Intent();
// intent.putExtra("oper", 52);
// MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent);
// return true;
// });
// }
clTrafficLight = (ConstraintLayout) findViewById(R.id.cl_traffic_light);
tvYellow = (TextView) findViewById(R.id.tv_yellow);
tvRed = (TextView) findViewById(R.id.tv_red);
@@ -1447,15 +1438,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
@Override
<<<<<<< HEAD
public void updateMonitoringStatus(boolean hasError) {
Log.d(TAG, "updateCheckStatus");
if (hasError == true) {
tipImageView.setVisibility(View.VISIBLE);
} else {
tipImageView.setVisibility(View.INVISIBLE);
public void updateMonitoringStatus(boolean hasError){
Log.d(TAG,"updateCheckStatus");
if(hasError==true){
tipImageView.setVisibility(View.VISIBLE);
}else{
tipImageView.setVisibility(View.INVISIBLE);
}
}
=======
public void onArriveAt(AdasOCHData data) {
}
@@ -1463,6 +1453,5 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
@Override
public void onStateChanged(int state, String reason) {
ctvAutopilotStatus.setChecked(state == IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING);
>>>>>>> dev/dev_eagle_architecture_upgrade
}
}