diff --git a/src/components/devices/DPadControl.tsx b/src/components/devices/DPadControl.tsx index 2a876fa..6ea4243 100644 --- a/src/components/devices/DPadControl.tsx +++ b/src/components/devices/DPadControl.tsx @@ -172,7 +172,7 @@ const DPadControl: React.FC = ({ onGamepadUpdate, onSpeedChang ); return ( -
+
{/* 十字方向键 */}
diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index a242659..5fae939 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -34,6 +34,9 @@ import { EnvironmentOutlined, DeleteOutlined, SafetyOutlined, + LockOutlined, + UnlockOutlined, + LoadingOutlined, } from '@ant-design/icons'; import { @@ -87,6 +90,8 @@ export default function DeviceStatusPage() { const [isLoopMode, setIsLoopMode] = useState(true); const controllerRef = useRef(null); const isFirstConnect = useRef(true); + // 标记本次会话是否已经发起过控制权限申请,避免手柄/方向盘高频更新时重复申请 + const hasRequestedControlRef = useRef(false); const [messageApi, contextHolder] = message.useMessage(); @@ -633,18 +638,34 @@ export default function DeviceStatusPage() { }, [device, uavState, currentDroneData]); const handleGamepadUpdate = useCallback((state) => { + // 无控制权限时:不发送消息,且只发起一次权限申请(避免手柄/方向盘高频更新刷屏) + if (!isControlled) { + if (!hasRequestedControlRef.current && !connecting) { + hasRequestedControlRef.current = true; + handleControlModal(); + } + return; + } console.log('Gamepad state updated:', state); // 记录方向盘 xy 坐标,用于倒车影像叠加层 if (state?.axes) { setSteerXY({ x: state.axes[0] || 0, y: state.axes[1] || 0 }); } controllerRef.current?.sendGamepad(state); - }, []); + }, [isControlled, connecting]); const handleControlModal = useCallback(() => { + console.log('请求控制权限'); controllerRef.current?.requestControl(); }, []); + // 获得控制权限后,重置"已申请"标记,以便后续失去权限时可再次提示 + useEffect(() => { + if (isControlled) { + hasRequestedControlRef.current = false; + } + }, [isControlled]); + const handleOk = () => { controllerRef.current?.sendPermissionRequest( true, @@ -1423,24 +1444,66 @@ export default function DeviceStatusPage() { {t('devices.remoteControl')} } + extra={ + + {/* 权限状态标签 */} + : (isControlled ? : )} + color={connecting ? 'gold' : (isControlled ? 'green' : 'default')} + style={{ margin: 0, fontSize: 12 }} + > + {connecting + ? t('devices.controlRequesting') + : isControlled + ? t('devices.controlGranted') + : t('devices.noControlRight')} + + {/* 申请/释放控制按钮 */} + {isControlled ? ( + + ) : ( + + )} + + } variant="borderless" className="ds-card" - style={{ borderRadius: 12, background: '#0f172a', flex: 1, minHeight: 0 }} + style={{ borderRadius: 12, background: '#0f172a', flex: 1, minHeight: 0, position: 'relative' }} styles={{ header: { color: '#fff' }, body: { padding: 12, display: 'flex', flexDirection: 'row', - flexWrap: 'wrap', // ✅ 新增:空间不足自动换行 + flexWrap: 'wrap', gap: 12, height: 'calc(100% - 57px)', - overflow: 'auto', // ✅ 改成 auto,换行后内容不会被截断 - alignItems: 'center', // 垂直居中,换行后美观 + overflow: 'auto', + alignItems: 'center', justifyContent: 'center', }, }} > + + {/* Xbox 手柄 - 左侧,缩小显示 */}
@@ -1466,7 +1525,6 @@ export default function DeviceStatusPage() {
{ +const XboxController = ({ onGamepadUpdate }) => { const { t } = useTranslation(); const [gamepadState, setGamepadState] = useState<{ buttons: boolean[]; @@ -114,36 +114,15 @@ const XboxController = ({ onGamepadUpdate, handleControlModal, isControlled, isC }); return ( -
{ - if (!isControlled) { - console.log("点击了无控制权限,发起权限请求"); - // 示例:调用你代码中已有的权限请求弹窗逻辑 - handleControlModal({ control: true, type: "switchPermission" }); - } - }}> - {/* Gamepad Status Badge */} +
+ {/* 手柄硬件连接状态指示(仅表示物理手柄是否连接) */}
- {!connected ? ( - t('devices.controllerNotConnected') - ) : isConnecting ? ( - t('devices.control2') - ) : isControlled ? ( - t('devices.controlling') - ) : ( - t('devices.clickToRequestControl') - )} + {connected ? t('devices.controllerConnected') : t('devices.controllerNotConnected')}
diff --git a/src/locales/en/index.ts b/src/locales/en/index.ts index e41128b..e045468 100644 --- a/src/locales/en/index.ts +++ b/src/locales/en/index.ts @@ -1,4 +1,4 @@ -const en = { +const en = { common: { save: 'Save', saveChanges: 'Save Changes', @@ -814,6 +814,12 @@ repeatTypeLabel: 'Repeat Type Label', repeatWeekly: 'Repeat Weekly', requestControlPermission: 'Request Control Permission', + controlRequesting: 'Requesting...', + controlGranted: 'Control Granted', + noControlRight: 'No Control Right', + pleaseRequestControl: 'Please request control first', + requestControl: 'Request Control', + releaseControl: 'Release Control', requestFail: 'Request Fail', resumeAuto: 'Resume Auto', resumeBreakpoint: 'Resume Breakpoint', @@ -1057,6 +1063,7 @@ workingCurrent: 'Working Current', zoomLens: 'Zoom Lens', controllerNotConnected: "controllerNotConnected", + controllerConnected: "Controller Connected", otherWebConnected: "otherWebConnected", clickToRequestControl: "clickToRequestControl", diff --git a/src/locales/zh/index.ts b/src/locales/zh/index.ts index fdee69f..56645bd 100644 --- a/src/locales/zh/index.ts +++ b/src/locales/zh/index.ts @@ -1,4 +1,4 @@ -import WeatherRainy from "@/src/components/Weather/WeatherRainy"; +import WeatherRainy from "@/src/components/Weather/WeatherRainy"; const zh = { common: { @@ -610,6 +610,7 @@ const zh = { firmwareVersion: '固件版本', fixed: '固定', controllerNotConnected: "控制器未连接", + controllerConnected: "控制器已连接", otherWebConnected: "其他网页已连接", clickToRequestControl: "点击请求控制", @@ -839,6 +840,12 @@ const zh = { repeatTypeLabel: '重复类型标签', repeatWeekly: '重复每周', requestControlPermission: '请求控制权限', + controlRequesting: '申请中...', + controlGranted: '已获得控制', + noControlRight: '无控制权限', + pleaseRequestControl: '请先申请控制权限', + requestControl: '申请控制', + releaseControl: '释放控制', requestFail: '请求失败', resumeAuto: '恢复自动', resumeBreakpoint: '恢复断点',