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

fix bug

Browse Source
This commit is contained in:
zhongchao
2021-06-23 19:14:03 +08:00
parent dd92fbd365
commit e43307ba05
7 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
View File

@@ -1,6 +1,8 @@
package com.mogo.module.adas;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import com.mogo.module.adas.entity.AdasAutoPilotLocReceiverBean;
import com.mogo.module.adas.model.AdasServiceModel;
@@ -11,10 +13,6 @@ import com.mogo.utils.logger.Logger;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import com.zhidao.support.adas.high.bean.AutopilotStatus;
import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_AFFIRM;
import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_MANUAL_CANCEL;
import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_TIMER_CANCEL;
//负责监听自动驾驶状态并进行状态上报，自动驾驶路线上报，接收调度指令展示指令弹窗
public class AdasAutoPilotManager implements IMogoOnMessageListener<AdasAutoPilotLocReceiverBean>
, IAdasDataListener
@@ -23,7 +21,7 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<AdasAutoPilo
private static final String TAG = "AdasAutoPilotManager";
private static volatile AdasAutoPilotManager instance;
private static final byte[] obj = new byte[0];
private static final int MSG_SOCKET_TYPE = 1;
private static final int MSG_SOCKET_TYPE = 501000;
private DispatchRemindDialog dispatchRemindDialog;
@@ -81,16 +79,16 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<AdasAutoPilo
@Override
public void affirm() {
AdasServiceModel.getInstance().dispatchResultUpload(DISPATCH_RESULT_AFFIRM);
// AdasServiceModel.getInstance().dispatchResultUpload(DISPATCH_RESULT_AFFIRM);
}
@Override
public void cancel(boolean manualTrigger) {
AdasServiceModel.getInstance().dispatchResultUpload(manualTrigger ?
DISPATCH_RESULT_MANUAL_CANCEL : DISPATCH_RESULT_TIMER_CANCEL);
// AdasServiceModel.getInstance().dispatchResultUpload(manualTrigger ?
// DISPATCH_RESULT_MANUAL_CANCEL : DISPATCH_RESULT_TIMER_CANCEL);
}
public void test(){
public void test() {
dispatchRemindDialog.showDialog("123123123");
}
}

27
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java
View File

@@ -22,18 +22,17 @@ public class DispatchRemindDialog extends BaseFloatDialog {
private final TextView tvTimer;
private final TextView tvLoc;
private final Button tvAffirm;
private final Button tvCancel;
private final Handler handler = new Handler() {
private Handler handler = new Handler() {
@Override
public void handleMessage(Message msg) {
super.handleMessage(msg);
if (msg.what == MSG_TYPE_TIMER) {
if (TIMER >= 0) {
if (TIMER > 0) {
TIMER--;
Logger.d(TAG,"timer : " + TIMER);
tvTimer.setText(String.valueOf(TIMER));
handler.sendEmptyMessage(MSG_TYPE_TIMER);
handler.sendEmptyMessageDelayed(MSG_TYPE_TIMER,1000L);
} else {
hideDialog();
}
@@ -46,17 +45,19 @@ public class DispatchRemindDialog extends BaseFloatDialog {
setContentView(R.layout.dialog_adas_dispatch_remind);
tvTimer = findViewById(R.id.module_adas_dispatch_remind_timer);
tvLoc = findViewById(R.id.module_adas_dispatch_remind_loc);
tvAffirm = (Button)findViewById(R.id.module_adas_dispatch_remind_affirm);
tvCancel = (Button)findViewById(R.id.module_adas_dispatch_remind_cancel);
Button btnAffirm = (Button) findViewById(R.id.module_adas_dispatch_remind_affirm);
Button btnCancel = (Button) findViewById(R.id.module_adas_dispatch_remind_cancel);
tvTimer.setText(String.valueOf(TIMER));
tvAffirm.setOnClickListener(v -> {
btnAffirm.setOnClickListener(v -> {
if (mListener != null) {
mListener.affirm();
dismissDialog();
}
});
tvCancel.setOnClickListener(v -> {
btnCancel.setOnClickListener(v -> {
if (mListener != null) {
mListener.cancel(true);
dismissDialog();
}
});
}
@@ -67,12 +68,16 @@ public class DispatchRemindDialog extends BaseFloatDialog {
tvLoc.setText(locContent);
}
public void hideDialog() {
private void hideDialog() {
if (mListener != null) {
mListener.cancel(false);
}
mListener = null;
dismissDialog();
}
private void dismissDialog(){
handler.removeMessages(MSG_TYPE_TIMER);
TIMER = 10;
dismiss();
}