Merge pull request #148 from TakayukiHoshi1984/modify_alljoyn_change_name_and_flashing

Luminaireを操作するときのAllJoynデバイスプラグインの挙動修正

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/DPAllJoynHandler.mm

@@ -436,6 +436,7 @@ - (void) updateManageServices: (BOOL) onlineForSet {
         for (DPAllJoynServiceEntity *serviceEntity in [self.discoveredAllJoynServices allValues]) {
             DConnectService *service = [_serviceProvider service: serviceEntity.appId];
             if (service) {
+                [service setName:serviceEntity.serviceName];
                 [service setOnline: YES];
             } else {
                 service = [[DPAllJoynService alloc] initWithServiceId:serviceEntity.appId

dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn/Sources/Profiles/DPAllJoynLightProfile.mm

@@ -672,10 +672,10 @@ - (void) didReceivePostLightRequestForSingleLampWithResponse:(DConnectResponseMe
                  int delay = [flashing[i] intValue];
                  if (i % 2 == 0) {
                      proxy.OnOff = YES;
-                     sleep(delay / 1000);
+                     usleep(delay * 1000);
                  } else {
                      proxy.OnOff = NO;
-                     sleep(delay / 1000);
+                     usleep(delay * 1000);
                  }
              }
          }
@@ -813,12 +813,44 @@ - (void) didReceivePostLightRequestForLampControllerWithResponse:(DConnectRespon
          MsgArg newStateArg("a{sv}", count, newStates);
          AJNMessageArgument *newState =
          [[AJNMessageArgument alloc] initWithHandle:&newStateArg];
-         [proxy transitionLampStateWithLampID:_lightId
-                                    lampState:newState
-                             transitionPeriod:@10
-                                 responseCode:&responseCode
-                                       lampID:&ignored];
 
+         if (flashing && flashing.count > 0) {
+             MsgArg offStates[1];
+             MsgArg offTmp1;
+             MsgArg offTmp2("b", NO);
+             offTmp1.Set("{sv}", "OnOff", &offTmp2);
+             offStates[0] = offTmp1;
+             MsgArg offStateArg("a{sv}", 1, offStates);
+             AJNMessageArgument *offState =
+             [[AJNMessageArgument alloc] initWithHandle:&offStateArg];
+             
+             for (int i = 0; i < flashing.count; i++) {
+                 int delay = [flashing[i] intValue];
+                 if (i % 2 == 0) {
+                     [proxy transitionLampStateWithLampID:_lightId
+                                                lampState:newState
+                                         transitionPeriod:@10
+                                             responseCode:&responseCode
+                                                   lampID:&ignored];
+                     usleep(delay * 1000);
+                 } else {
+                     [proxy transitionLampStateWithLampID:_lightId
+                                                lampState:offState
+                                         transitionPeriod:@10
+                                             responseCode:&responseCode
+                                                   lampID:&ignored];
+                     usleep(delay * 1000);
+                 }
+             }
+         } else {
+             [proxy transitionLampStateWithLampID:_lightId
+                                        lampState:newState
+                                 transitionPeriod:@10
+                                     responseCode:&responseCode
+                                           lampID:&ignored];
+
+         }
+
          if (!responseCode) {
              [response setErrorToUnknownWithMessage:@"Failed to change status."];
          }
@@ -937,10 +969,10 @@ - (void) didReceivePutLightRequestForSingleLampWithResponse:(DConnectResponseMes
                  int delay = [flashing[i] intValue];
                  if (i % 2 == 0) {
                      proxy.OnOff = YES;
-                     sleep(delay / 1000);
+                     usleep(delay * 1000);
                  } else {
                      proxy.OnOff = NO;
-                     sleep(delay / 1000);
+                     usleep(delay * 1000);
                  }
              }
          }
@@ -1076,11 +1108,43 @@ - (void) didReceivePutLightRequestForLampControllerWithResponse:(DConnectRespons
          MsgArg newStateArg("a{sv}", count, newStates);
          AJNMessageArgument *newState =
          [[AJNMessageArgument alloc] initWithHandle:&newStateArg];
-         [proxy transitionLampStateWithLampID:_lightId
-                                    lampState:newState
-                             transitionPeriod:@10
-                                 responseCode:&responseCode
-                                       lampID:&ignored];
+         if (flashing && flashing.count > 0) {
+             MsgArg offStates[1];
+             MsgArg offTmp1;
+             MsgArg offTmp2("b", NO);
+             offTmp1.Set("{sv}", "OnOff", &offTmp2);
+             offStates[0] = offTmp1;
+             MsgArg offStateArg("a{sv}", 1, offStates);
+             AJNMessageArgument *offState =
+             [[AJNMessageArgument alloc] initWithHandle:&offStateArg];
+             
+             for (int i = 0; i < flashing.count; i++) {
+                 int delay = [flashing[i] intValue];
+                 if (i % 2 == 0) {
+                     [proxy transitionLampStateWithLampID:_lightId
+                                                lampState:newState
+                                         transitionPeriod:@10
+                                             responseCode:&responseCode
+                                                   lampID:&ignored];
+                     usleep(delay * 1000);
+                 } else {
+                     [proxy transitionLampStateWithLampID:_lightId
+                                                lampState:offState
+                                         transitionPeriod:@10
+                                             responseCode:&responseCode
+                                                   lampID:&ignored];
+                     usleep(delay * 1000);
+                 }
+             }
+         } else {
+             [proxy transitionLampStateWithLampID:_lightId
+                                        lampState:newState
+                                 transitionPeriod:@10
+                                     responseCode:&responseCode
+                                           lampID:&ignored];
+             
+         }
+
 
          if (name) {
              NSString *ignored;