Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt

app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java

@@ -152,6 +152,32 @@ public class DataDistribution {
     private long listBagManagerCmdSize = 0;
     private long listObuWarningDataSize = 0;
 
+    public void clearCount() {
+        listTrajectorySize = 1;
+        listTrackedObjectsSize = 1;
+        listGnssInfoSize = 1;
+        listVehicleStateSize = 1;
+        listAutopilotStateSize = 1;
+        listMogoReportMessageSize = 1;
+        listPerceptionTrafficLightSize = 1;
+        listPredictionObstacleTrajectorySize = 1;
+        listRecordPanelSize = 1;
+        listGlobalPathRespSize = 1;
+        listWarnSize = 1;
+        listArrivalNotificationSize = 1;
+        listStatusInfoSize = 1;
+        listRecordDataConfigSize = 1;
+        listErrorDataSize = 1;
+        listOriginalPointCloudSize = 1;
+        listPlanningObjectsSize = 1;
+        listPlanningDecisionStateSize = 1;
+        listChassisStatesSize = 1;
+        listFSMFunctionStatesSize = 1;
+        listRoboSweeperTaskIndexSize = 1;
+        listBagManagerCmdSize = 1;
+        listObuWarningDataSize = 1;
+    }
+
     public String cutDown(String str) {
         if (isCutDown && str.length() > 650) {
             str = str.substring(0, 650) + "\n（已缩短。如需查看完整数据，请勾选日志存储复选框）";

app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java

@@ -12,6 +12,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.PowerManager;
+import android.os.SystemClock;
 import android.provider.Settings;
 import android.text.Editable;
 import android.text.Html;
@@ -43,6 +44,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
 import com.google.protobuf.TextFormat;
+import com.mogo.support.obu.ObuPenetrate;
+import com.mogo.support.obu.ObuScene;
 import com.mogo.telematic.MogoProtocolMsg;
 import com.mogo.telematic.NSDNettyManager;
 import com.mogo.telematic.client.listener.NettyClientListener;
@@ -136,6 +139,9 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
     private static final int WHAT_IPC_IP = 0x00;
     private static final int WHAT_DRIVER_IP = 0x01;
     private static final int WHAT_IPC_CONNECT_STATE = 0x02;
+    private static final int WHAT_RECEIVE_ERROR_DATA_SHOW = 0x03;
+    private static final int WHAT_RECEIVE_ERROR_DATA_HINT = 0x04;
+    private static final int WHAT_RECEIVE_ERROR_DATA_STOP = 0x05;
     private EditText etIp;
     private ImageView role;
     private ImageView tvIp;
@@ -179,6 +185,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
     private boolean isAutopilotAbility = true;
     private String autopilotAbilityReason;
     private List<SpecialVehicleBean> specialVehicleBeanList;//特种车辆
+    private long errorDataUpdateTime = 0;
 //    @Override
 //    protected void onStart() {
 //        super.onStart();
@@ -546,7 +553,14 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
         title.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                showLocalIP();
+                if (TextUtils.equals(title.getText(), getString(R.string.have_error_data))) {
+                    int position=titleFragmentData.size() - 1;
+                    infoFragment.smoothScrollToPosition(position);
+                    fragmentAdapter.setSelectedPosition(position);
+                    showFragment(Constants.TITLE.RECEIVE_ERROR);
+                } else {
+                    showLocalIP();
+                }
             }
         });
         title.setOnLongClickListener(new View.OnLongClickListener() {
@@ -826,6 +840,18 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
 
     @Override
     public void onError(ProtocolStatus status, byte[] bytes) {
+        long errorDataReceiveTime = SystemClock.elapsedRealtime();
+        if (errorDataUpdateTime == 0) {
+            errorDataUpdateTime = errorDataReceiveTime + 800;
+        }
+        if (errorDataReceiveTime > errorDataUpdateTime) {
+            errorDataUpdateTime = 0;
+            getHandler().sendEmptyMessage(WHAT_RECEIVE_ERROR_DATA_SHOW);
+            if (getHandler().hasMessages(WHAT_RECEIVE_ERROR_DATA_STOP)) {
+                getHandler().removeMessages(WHAT_RECEIVE_ERROR_DATA_STOP);
+            }
+            getHandler().sendEmptyMessageDelayed(WHAT_RECEIVE_ERROR_DATA_STOP, 1500);
+        }
         ErrorData base = new ErrorData(status, bytes);
         DataDistribution.getInstance().addData(base);
     }
@@ -1037,6 +1063,26 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
         DataDistribution.getInstance().addData(base);
     }
 
+    @Override
+    public void onoObuSpatWarning(MessagePad.Header header, ObuScene.SpatWarningData spatWarningData) {
+
+    }
+
+    @Override
+    public void onoObuRsiWarning(MessagePad.Header header, ObuScene.RsiWarningData rsiWarningData) {
+
+    }
+
+    @Override
+    public void onoObuRsmWarning(MessagePad.Header header, ObuScene.RsmWarningData rsmWarningData) {
+
+    }
+
+    @Override
+    public void onoObuObuMapMath(MessagePad.Header header, ObuScene.MapMatchData mapMatchData) {
+
+    }
+
     @Override
     public void onFunctionStates(MessagePad.Header header, FunctionStates.FSMFunctionStates functionStates) {
         FSMFunctionStates base = new FSMFunctionStates(header, functionStates, sdf);
@@ -1169,6 +1215,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
         connectStatus = ipcConnectionStatus;
         String status = onUpdateConnectStateView();
         if (connectStatus == IPC_CONNECTION_STATUS.CONNECTED) {
+            DataDistribution.getInstance().clearCount();
             getHandler().sendEmptyMessage(WHAT_IPC_IP);
             String tem = getIPCIP();
             if (!TextUtils.isEmpty(tem)) {
@@ -1573,6 +1620,21 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
                 tvConnectState.setText(status.status);
                 tvConnectState.setTextColor(getResources().getColor(status.color));
                 break;
+            case WHAT_RECEIVE_ERROR_DATA_SHOW:
+                title.setText(R.string.have_error_data);
+                title.setTextColor(getColor(android.R.color.holo_red_light));
+                title.setVisibility(View.VISIBLE);
+                getHandler().sendEmptyMessageDelayed(WHAT_RECEIVE_ERROR_DATA_HINT, 500);
+                break;
+            case WHAT_RECEIVE_ERROR_DATA_HINT:
+                title.setVisibility(View.INVISIBLE);
+                break;
+            case WHAT_RECEIVE_ERROR_DATA_STOP:
+                title.setText(R.string.app_name);
+                title.setTextColor(getColor(R.color.colorWhile));
+                title.setVisibility(View.VISIBLE);
+                errorDataUpdateTime = 0;
+                break;
         }
     }
 }

app_ipc_monitoring/src/main/res/layout/item_main.xml

@@ -17,6 +17,7 @@
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
+            android:minWidth="110dp"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:text="@string/app_name"

app_ipc_monitoring/src/main/res/values/strings.xml

@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">工控机监控</string>
+    <string name="have_error_data">存在错误数据</string>
     <string name="action_settings">添加</string>
     <string name="action_save">保存</string>
     <string name="action_del">删除</string>