Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-12-18 b3b96cfd900c3dee5dc84e53d5677fc6642f85e6

 ard-route/src/main/java/com/ard/route/util/InitializationUtils.java

@@ -8,6 +8,7 @@
import java.util.ArrayList;
import java.util.List;

import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
import static com.ard.route.util.ToolUtils.getDoublePoint;

/**
@@ -55,8 +56,10 @@
        }
        uavRouteReq.setWaypointTurnReq(waypointTurnReq);
        uavRouteReq.setGimbalPitchMode("usePointSetting");
        // 变焦数值加工
        buildZoom(uavRouteReq);
        if (M350_RTK.getValue().equals(uavRouteReq.getDroneType())) {
            // 变焦数值加工
            buildZoom(uavRouteReq);
        }
        // 修改每个航点的高度
        buildHeight(uavRouteReq);
        // 动作组编号数据加工
@@ -103,7 +106,6 @@
                    for (PointActionReq action : actionGroupReq.getActions()) {
                        if (action.getZoom() != null){
                            action.setZoom(multiple_23(action.getZoom()));
                            //action.setZoom(multiple_6(action.getZoom()));
                        }
                    }
                }
@@ -115,16 +117,8 @@
        return zoom * CHANSI_H20T;
    }

    public static Double multiple_6(Double zoom){
        return zoom * CHANSI_H20_FOCUS;
    }

    public static Double divided_23(Double zoom){
        return zoom / CHANSI_H20T;
    }

    public static Double divided_6(Double zoom){
        return zoom / CHANSI_H20_FOCUS;
    }

    /**