eagle 处理异常

2021-10-09 18:37:14 +08:00
parent 19d2fd45a6
commit 7d5845fb60
7 changed files with 71 additions and 24 deletions
--- 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
@@ -21,10 +21,16 @@ import com.mogo.eagle.core.utilcode.util.LogUtils;
 import com.mogo.eagle.core.function.api.check.IMogoCheckListener;
 import com.mogo.eagle.core.function.check.view.CheckActivity;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
+import com.mogo.module.common.MogoApisHandler;
+import com.mogo.module.service.MogoServiceProvider;
+import com.mogo.module.service.MogoServices;
 import com.mogo.module.service.receiver.MogoReceiver;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.eagle.core.function.api.check.ICheckProvider;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.ActivityLifecycleManager;
+import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.network.RequestOptions;

 import java.util.List;
@@ -44,7 +50,7 @@ import io.reactivex.schedulers.Schedulers;
 * wiki：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=58204952
 */
@Route(path = MogoServicePaths.PATH_CHECK)
-public class VehicleMonitoringManager implements ICheckProvider {
+public class VehicleMonitoringManager implements ICheckProvider , IMogoStatusChangedListener {
    private static final String TAG = "VehicleMonitoringManager";
    private Context mContext;
    private final Map<String, CopyOnWriteArrayList> mListeners = new ConcurrentHashMap<>();
@@ -55,6 +61,7 @@ public class VehicleMonitoringManager implements ICheckProvider {
    public void init(Context context) {
        LogUtils.dTag(TAG, "初始化 CheckProvider 模块");
        mContext = context;
+        MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener(TAG,StatusDescriptor.MAIN_PAGE_RESUME,this);
    }

    @Override
@@ -155,4 +162,15 @@ public class VehicleMonitoringManager implements ICheckProvider {
            }
        }
    }
+
+    @Override
+    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+        if (descriptor == StatusDescriptor.MAIN_PAGE_RESUME) {
+            if (!isTrue){
+                if (dialog != null && dialog.isShowing()){
+                    dialog.dismiss();
+                }
+            }
+        }
+    }
 }
--- 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
@@ -51,7 +51,7 @@ import io.reactivex.schedulers.Schedulers;
 public class CheckActivity extends AppCompatActivity {

    private static final String TAG = "CheckActivity";
-    private static RecyclerView mRecyclerView;
+    private RecyclerView mRecyclerView;
    private static CheckResultData sCheckResultData;
 //    private static Context mContext;
    private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus;
@@ -109,7 +109,7 @@ public class CheckActivity extends AppCompatActivity {
                new CheckLinearLayout(this, CheckLinearLayout.VERTICAL, false);
        mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.check_item_space_vr)));
        mRecyclerView.setLayoutManager(linearLayoutManager);
-        mCheckAdapter = new CheckAdapter(this, sCheckResultData);
+        mCheckAdapter = new CheckAdapter(CheckActivity.this, sCheckResultData);
        mRecyclerView.setAdapter(mCheckAdapter);
    }

@@ -119,7 +119,7 @@ public class CheckActivity extends AppCompatActivity {
    public static void checkMonitor(Context context, ICheckResultCallBack checkResultCallBack) {
        Log.d(TAG, "checkMonitor");
 //        mContext = context;
-        loadDetail(context.getApplicationContext(), checkResultCallBack);
+        loadDetail(context, checkResultCallBack);
    }

    //网络请求,获取自车检测结果(工控机上报云端)
@@ -249,6 +249,9 @@ public class CheckActivity extends AppCompatActivity {
    @Override
    protected void onPause() {
        super.onPause();
+        if (mCheckAdapter!=null){
+            mCheckAdapter.dismissDialog();
+        }
    }

    @Override
@@ -264,7 +267,8 @@ public class CheckActivity extends AppCompatActivity {
    @Override
    protected void onDestroy() {
        super.onDestroy();
-        isFront = false;
+//        isFront = false;
+        mCheckAdapter.ondestry();
    }

 }
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckAdapter.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckAdapter.java
@@ -35,7 +35,7 @@ public class CheckAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
    public CheckAdapter(@NonNull Context context, @NonNull CheckResultData checkResult) {
        mContext = context;
        mCheckResultData = checkResult;
-        mLayoutInflater = LayoutInflater.from(context);
+        mLayoutInflater = LayoutInflater.from(mContext);
    }

    @Override
@@ -62,6 +62,17 @@ public class CheckAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
        return holder;
    }

+    public void dismissDialog() {
+        if (mCheckInfoListDialog!=null && mCheckInfoListDialog.isShowing()){
+            mCheckInfoListDialog.dismiss();
+        }
+    }
+
+    public void ondestry() {
+        mContext = null;
+        mCheckInfoListDialog = null;
+    }
+
    /**
     * 顶部view列表
     */
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
@@ -6,13 +6,16 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AdasOCHData
+import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.LogUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.service.adas.IMogoAdasOCHCallback
+import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.view_autopilot_status.view.*
+import java.util.*

 /**
 * @author xiaoyuzhou
@@ -20,8 +23,8 @@ import kotlinx.android.synthetic.main.view_autopilot_status.view.*
 * 自动驾驶状态按钮
 */
 class AutoPilotStatusView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet
+        context: Context,
+        attrs: AttributeSet
 ) : ConstraintLayout(context, attrs), View.OnClickListener, IMogoAdasOCHCallback {

    private val TAG = "AutopilotStatusView"
@@ -53,7 +56,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
        when (mAutopilotStatus) {
            0 -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常
                LogUtils.eTag(TAG, "不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
-                ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
+//                ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
                // TODO 这里临时触发自动驾驶能力,测试功过这里删除
                CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(true)
            }
@@ -64,6 +67,15 @@ class AutoPilotStatusView @JvmOverloads constructor(
                CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(false)
            }
        }
+//        startAutoPilot();
+    }
+    private fun startAutoPilot() {
+        val currentAutopilot = RemoteControlAutoPilotParameters()
+        currentAutopilot.isSpeakVoice = false
+        currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409);
+        currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199730,116.735687);
+        currentAutopilot.vehicleType = 10
+        MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot)
    }

    /**