From c89c3620b96934c2f48ea008706919870a86ff48 Mon Sep 17 00:00:00 2001 From: TakayukiHoshi1984 Date: Mon, 12 Mar 2018 10:32:16 +0900 Subject: [PATCH] =?UTF-8?q?Sphero=E3=81=AEBrightness=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 更新内容 * Spheroのライトの挙動をAndroid側に合わせた。 --- .../dConnectDeviceSphero/Classes/DPSpheroLightProfile.m | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroLightProfile.m b/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroLightProfile.m index 7dc4a281..d26288b7 100755 --- a/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroLightProfile.m +++ b/dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroLightProfile.m @@ -217,7 +217,9 @@ -(BOOL) postLightRequest:(DConnectRequestMessage *)request [response setErrorToInvalidRequestParameterWithMessage:@"invalid brightness value."]; return YES; } - + if (!brightness) { + brightness = @(1.0); + } if ([lightId isEqualToString:kDPSpheroCalibration]) { // キャリブレーションライト点灯。 colorは変えられない。点灯、消灯のみ if (flashing.count > 0) { @@ -260,9 +262,9 @@ -(BOOL) postLightRequest:(DConnectRequestMessage *)request return YES; } - ledColor = [UIColor colorWithRed:redValue/255. green:greenValue/255. blue:blueValue/255. alpha:[brightness doubleValue] / 255.]; + ledColor = [UIColor colorWithRed:redValue/255. green:greenValue/255. blue:blueValue/255. alpha:[brightness doubleValue]]; } else { - ledColor = [UIColor colorWithRed:255. green:255. blue:255. alpha:[brightness doubleValue] / 255.]; + ledColor = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:[brightness doubleValue]]; } if (flashing.count>0) { // 点滅