From 3e28c3a11fdc99934145ab24c01746ef57fe2cc2 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 17 Aug 2021 19:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/check/view/CheckActivity.java | 18 +++++++-------- .../mogo/module/check/view/CheckDialog.java | 6 ++--- .../main/monitoring/VehicleMonitoring.java | 23 +++++++++---------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java index c146715ba6..e3917a3f2c 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java @@ -40,7 +40,6 @@ public class CheckActivity extends AppCompatActivity { private static final String TAG = "CheckActivity"; private RecyclerView mRecyclerView; private ArrayList dataArrayList = new ArrayList(); - private CheckItemInfo mCheckItemInfo = new CheckItemInfo(); private Context context; private static String mSignalStrength; private ImageView mImageView; @@ -63,16 +62,16 @@ public class CheckActivity extends AppCompatActivity { mImageView.setOnClickListener(v -> { finish(); }); - //版本号 + //版本检测 versionCheckResult(); - //系统 + //系统检测 systemCheckResult(); - //软件 + //软件检测 software(); - //硬件 + //硬件检测 hardware(); - //根据以上4个结果插入第一个元素 - usualTitle(); + //根据以上4个结果插入第一个元素(自动驾驶车辆是否存在风险) + topListTitle(); mRecyclerView = findViewById(R.id.check_list); mRecyclerView.setAdapter(new CheckAdapter(context, dataArrayList)); @@ -87,14 +86,14 @@ public class CheckActivity extends AppCompatActivity { /** * 自动驾驶状态下指标监测 */ - public static void checkMonitor(){ + public static void checkMonitor() { } /** * 自动驾驶是否存在风险 */ - private void usualTitle() { + private void topListTitle() { ArrayList list = new ArrayList(1); CheckItemInfo info = new CheckItemInfo(); info.setUsual(false); @@ -428,7 +427,6 @@ public class CheckActivity extends AppCompatActivity { context.startActivity(starter); } - /** * 指标异常弹框 */ diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckDialog.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckDialog.java index 0fb17b669e..45335b2972 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckDialog.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckDialog.java @@ -17,11 +17,11 @@ import com.mogo.module.common.dialog.BaseFloatDialog; public class CheckDialog extends BaseFloatDialog { private ImageView cancel; - private boolean showError; + private boolean showWarning; public CheckDialog(@NonNull Context context, boolean hasError) { super(context); - showError = hasError; + showWarning = hasError; initView(); } @@ -37,7 +37,7 @@ public class CheckDialog extends BaseFloatDialog { }); //根据条件显示体检页面/风险提示 - if (showError == true) { + if (showWarning == true) { findViewById(R.id.error_view).setVisibility(View.VISIBLE); findViewById(R.id.check_view).setVisibility(View.INVISIBLE); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java index dc5b29d8fb..d70726b2e2 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/monitoring/VehicleMonitoring.java @@ -19,14 +19,12 @@ public class VehicleMonitoring implements Handler.Callback { private static final String TAG = "VehicleMonitoring"; private final Context mContext; private final Handler mHandler = new Handler(this); - //自动驾驶状态下10分钟弹框提示一次 + //自动驾驶状态下10分钟间隔弹框提示一次 private static final long AUTO_CHECK_STATUS_DELAY = 10 * 60 * 1000;//自动驾驶状态下10分钟弹框提示一次 - //非自动驾驶测试数据 后期根据需求做修改 + //非自动驾驶测试数据 后期根据需求做修改 1分钟间隔 private static final long MANUAL_CHECK_STATUS_DELAY = 1 * 60 * 1000; //自动驾驶状态 - private static final int AUTO_CHECK_STATUS = 10001; - //费自动驾驶状态 - private static final int MANUAL_CHECK_STATUS = 10002; + private static int AutopilotStatus = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus(); public VehicleMonitoring(Context context) { mContext = context; @@ -34,25 +32,27 @@ public class VehicleMonitoring implements Handler.Callback { public void vehicleCheck() { Log.d(TAG, "vehicleCheck"); - if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING) { + if (AutopilotStatus == IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING) { Log.d(TAG, "自动驾驶中..."); - mHandler.sendEmptyMessageDelayed(AUTO_CHECK_STATUS, AUTO_CHECK_STATUS_DELAY); + mHandler.sendEmptyMessageDelayed(AutopilotStatus, AUTO_CHECK_STATUS_DELAY); } else { Log.d(TAG, "非自动驾驶状态"); //非自动驾驶状态只展示一次 - mHandler.sendEmptyMessageDelayed(MANUAL_CHECK_STATUS, MANUAL_CHECK_STATUS_DELAY); + mHandler.sendEmptyMessageDelayed(AutopilotStatus, MANUAL_CHECK_STATUS_DELAY); } } @Override public boolean handleMessage(Message msg) { + AutopilotStatus = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus(); switch (msg.what) { - case AUTO_CHECK_STATUS: + case IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING: vehicleMonitor(); - mHandler.sendEmptyMessageDelayed(AUTO_CHECK_STATUS, AUTO_CHECK_STATUS_DELAY); + mHandler.sendEmptyMessageDelayed(AutopilotStatus, AUTO_CHECK_STATUS_DELAY); return true; - case MANUAL_CHECK_STATUS: + case IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE: + case IMogoAdasOCHCallback.STATUS_AUTOPILOT_ENABLE: vehicleMonitor(); return true; default: @@ -65,5 +65,4 @@ public class VehicleMonitoring implements Handler.Callback { MogoApisHandler.getInstance().getApis().getCheckProvider().checkMonitor(mContext); } - }