From 6fc593c4e3d26b3161b6d0e8e96e25bcf2754380 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 26 Sep 2021 20:25:57 +0800 Subject: [PATCH 1/3] no message --- .../eagle/core/function/check/view/CheckActivity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java index 0470f2ecc5..05cbb437af 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java @@ -75,6 +75,7 @@ public class CheckActivity extends AppCompatActivity { private ProgressBar mProgressBar; private final static long DURATION_TIME = 1000; private static CheckAdapter mCheckAdapter; + private static boolean isFront = false; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -87,6 +88,7 @@ public class CheckActivity extends AppCompatActivity { * 列表View初始化 */ public void initView() { + isFront = true; setAnimation = new AnimatorSet(); mImageView = findViewById(R.id.btnBack); scanBottomCarImage = findViewById(R.id.scan_car_image); @@ -141,9 +143,10 @@ public class CheckActivity extends AppCompatActivity { } if (((CheckResultData) o).getData().getVehicle().getState() == 1) { - CallerCheckManager.updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, true); - } else { CallerCheckManager.updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, false); + } else { + CallerCheckManager.updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, true); + showDialog(context); } } }); @@ -153,6 +156,7 @@ public class CheckActivity extends AppCompatActivity { public void onError(String message, int code) { super.onError(message, code); Log.d(TAG, "车辆自检失败，请稍后重试"+"=="+message+String.valueOf(code)); + showDialog(context); } }); @@ -279,6 +283,7 @@ public class CheckActivity extends AppCompatActivity { @Override protected void onDestroy() { super.onDestroy(); + isFront = false; } @Override From e938a21446bf936daeb36ffc86531b4d1afdf777 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 26 Sep 2021 22:15:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81,=E6=B7=BB=E5=8A=A0error=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../check/VehicleMonitoringManager.java | 2 +- .../function/check/view/CheckActivity.java | 27 ++++++++++++------- .../core/function/check/view/CheckDialog.java | 12 +++++++++ 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java index 301228f8ee..8fe80c047e 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java @@ -71,7 +71,7 @@ public class VehicleMonitoringManager implements ICheckProvider { @Override public boolean checkMonitor(Context context) { if (context != null) { - return CheckActivity.checkMonitor(); + return CheckActivity.checkMonitor(context); } return false; } diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java index 05cbb437af..4791e27a9d 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java @@ -76,6 +76,7 @@ public class CheckActivity extends AppCompatActivity { private final static long DURATION_TIME = 1000; private static CheckAdapter mCheckAdapter; private static boolean isFront = false; + private static CheckDialog dialog; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -102,7 +103,7 @@ public class CheckActivity extends AppCompatActivity { finish(); }); animation(); - loadDetail(); + loadDetail(context); mRecyclerView = findViewById(R.id.check_list); CheckLinearLayout linearLayoutManager = new CheckLinearLayout(this, CheckLinearLayout.VERTICAL, false); @@ -115,16 +116,16 @@ public class CheckActivity extends AppCompatActivity { /** * 自动驾驶状态下指标监测 */ - public static boolean checkMonitor() { + public static boolean checkMonitor(Context context) { Log.d(TAG, "checkMonitor"); - loadDetail(); + loadDetail(context); return true; } - //网络请求,获取自车检测结果(工控机上报云端)append("sn", MoGoAiCloudClientConfig.getInstance().getSn()) - public static void loadDetail() { + //网络请求,获取自车检测结果(工控机上报云端) + public static void loadDetail(Context context) { final Map params = ParamsBuilder.of(false) - .append("sn", "X2020210915BEAEDAE69E1E745A")//测试代码 + .append("sn", MoGoAiCloudClientConfig.getInstance().getSn()) .build(); CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params) .subscribeOn(Schedulers.io()) @@ -155,8 +156,7 @@ public class CheckActivity extends AppCompatActivity { @Override public void onError(String message, int code) { super.onError(message, code); - Log.d(TAG, "车辆自检失败，请稍后重试"+"=="+message+String.valueOf(code)); - showDialog(context); + Log.d(TAG, "车辆自检失败，请稍后重试" + "==" + message + String.valueOf(code)); } }); @@ -276,8 +276,15 @@ public class CheckActivity extends AppCompatActivity { * 指标异常弹框 */ public static void showDialog(Context context) { - CheckDialog dialog = new CheckDialog(context, true); - dialog.show(); + try { + if (dialog != null) { + dialog.cancel(); + } + dialog = new CheckDialog(context, true); + dialog.show(); + } catch (Exception e) { + e.printStackTrace(); + } } @Override diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java index 72946b7e1d..7972e22fd7 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java @@ -1,26 +1,33 @@ package com.mogo.eagle.core.function.check.view; import android.content.Context; +import android.content.Intent; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; +import com.mogo.eagle.core.function.call.check.CallerCheckManager; import com.mogo.eagle.core.function.check.R; import com.mogo.module.common.dialog.BaseFloatDialog; /** * @author liujing * @description 车辆监控弹框提示(长时间未检测或者后台任务检测出现问题的弹框) + * 第一版本为添加长时间未检测的提示框,因为逻辑冲突,二期需求与产品确认,UI公用 * @since: 7/30/21 */ public class CheckDialog extends BaseFloatDialog { private ImageView cancel; private boolean showWarning; + private TextView checkDetail; + private Context mContext; public CheckDialog(@NonNull Context context, boolean hasError) { super(context); + mContext = context; showWarning = hasError; initView(); } @@ -35,6 +42,11 @@ public class CheckDialog extends BaseFloatDialog { cancel.setOnClickListener(v -> { cancel(); }); + checkDetail = findViewById(R.id.check_detail); + checkDetail.setOnClickListener(v -> { + cancel(); + CallerCheckManager.startCheckActivity(mContext); + }); //根据条件显示体检页面/风险提示 if (showWarning == true) { From b1e15325785683eb699c9bbc728bd8d2ff19771c Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 26 Sep 2021 22:16:20 +0800 Subject: [PATCH 3/3] no message --- .../com/mogo/eagle/core/function/check/view/CheckDialog.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java index 7972e22fd7..cb597417dd 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java @@ -45,7 +45,9 @@ public class CheckDialog extends BaseFloatDialog { checkDetail = findViewById(R.id.check_detail); checkDetail.setOnClickListener(v -> { cancel(); - CallerCheckManager.startCheckActivity(mContext); + if (mContext != null) { + CallerCheckManager.startCheckActivity(mContext); + } }); //根据条件显示体检页面/风险提示