Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_290_220715_2.9.0' into test_robotaxi-d-app-module_290_220715_2.9.0.1

2022-08-10 18:01:04 +08:00
parent 284429769d 1887bc898f
commit ce82ec912d
2 changed files with 4 additions and 0 deletions
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_unknow.png
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xxhdpi/icon_dev_status_rtk_unknow.png
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
@@ -246,6 +246,10 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
            return false;
        }
        ByteString byteString = ByteString.of(bytes);
+        if (!byteString.startsWith(Constants.RAW_MG)) {
+            CupidLogUtils.e(TAG, "协议不匹配，命令下发失败 bytes=" + ByteUtil.byteArrToHex(bytes));
+            return false;
+        }
        return mSocket.sendDataWebSocket(byteString);
    }