Merge branch 'dev_robotaxi-d_250620_8.1.0_new_ota' into dev_robotaxi-d_250804_8.2.0

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java

@@ -3096,6 +3096,21 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
         return sendSsmFuncMsg(true, system_master.SsmInfo.MessageType.OTA_STATUS_QUERY, builder.build().toByteString());
     }
 
+    /**
+     * 查询OTA2.0状态
+     * @param queryStr 域控发送OTA升级请求中的 {"cmd":"PAD_QUERY_UPGRADE_STATUS","token":"123"}
+     * @return 消息是否添加到WS消息发送队列，返回值为非0的正整数时表示下发消息的消息ID
+     * *       >=0：表示添加到WS发送消息队列
+     * *       =0：表示乘客屏模式添加到WS发送消息队列
+     * *       -1L：添加到WS发送消息队列失败
+     */
+    @Override
+    public long sendOtaPadMsgQuery(@Nullable String queryStr) {
+        SsmInfo.PureStr.Builder builder = SsmInfo.PureStr.newBuilder();
+        builder.setData(TextUtils.isEmpty(queryStr) ? "" : queryStr);
+        return sendSsmFuncMsg(false,system_master.SsmInfo.MessageType.OTA_PAD_MSG,builder.build().toByteString());
+    }
+
     /**
      * 查询冷启动状态
      *

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java

@@ -1848,6 +1848,16 @@ public class AdasManager implements IAdasNetCommApi {
         return mChannel == null ? -1L : mChannel.sendSsmFuncOtaStatusQuery(token);
     }
 
+    /**
+     * OTA2.0 请求命令下发
+     * @param queryStr {"cmd":"PAD_QUERY_UPGRADE_STATUS","token":"123"} JSON
+     * @return
+     */
+    @Override
+    public long sendOtaPadMsgQuery(@Nullable String queryStr) {
+        return mChannel == null ? -1L : mChannel.sendOtaPadMsgQuery(queryStr);
+    }
+
     /**
      * 查询冷启动状态
      *

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java

@@ -1348,6 +1348,12 @@ public interface IAdasNetCommApi {
      */
     long sendSsmFuncOtaStatusQuery(@Nullable String token);
 
+    /**
+     * OTA2.0查询
+     * @param queryStr {"cmd":"PAD_QUERY_UPGRADE_STATUS","token":"123"} JSON
+     */
+    long sendOtaPadMsgQuery(@Nullable String queryStr);
+
     /**
      * 查询冷启动状态
      *