Pebbleプラグインのsettingプロファイル修正。Spheroプラグインのタイムスタンプ修正。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDevicePebble/dConnectDevicePebble/Classes/profile/DPPebbleSettingProfile.m

@@ -40,7 +40,7 @@ - (id)init
                                          || [rfc3339String characterAtIndex:date.length - 5] == '-') {
                                          //ISO8601形式で日付データがくるので、「:」を入れRFC3339形式にする
                                          rfc3339String = [NSString stringWithFormat:@"%@:%@",
-                                                          [rfc3339String substringWithRange:NSMakeRange(1, rfc3339String.length - 3)],
+                                                          [rfc3339String substringWithRange:NSMakeRange(0, rfc3339String.length - 2)],
                                                           [rfc3339String substringWithRange:NSMakeRange(rfc3339String.length - 2, 2)]];
                                      }
                                      [DConnectSettingProfile setDate:rfc3339String target:response];

dConnectDevicePlugin/dConnectDeviceSphero/dConnectDeviceSphero/Classes/DPSpheroManager.m

@@ -288,18 +288,22 @@ - (void)handleAsyncMessage:(RKAsyncMessage *)message forRobot:(id<RKRobotBase>)r
 
     } else if ([message isKindOfClass:[RKCollisionDetectedAsyncData class]]) {
         // Collision
+        
         RKCollisionDetectedAsyncData *collisionData = (RKCollisionDetectedAsyncData *)message;
         if (collisionData
             && [_sensorDelegate respondsToSelector:
                 @selector(spheroManagerStreamingCollisionForServiceId:impactAcceleration:axis:power:speed:time:)]) {
-            DPPoint3D accel;
-            accel.x = collisionData.impactAcceleration.x;
-            accel.y = collisionData.impactAcceleration.y;
-            accel.z = collisionData.impactAcceleration.z;
-            CGPoint axis = CGPointMake(collisionData.impactAxis.x, collisionData.impactAxis.y);
-            CGPoint power = CGPointMake(collisionData.impactPower.x, collisionData.impactPower.y);
-            float speed = collisionData.impactSpeed;
-            NSTimeInterval time = collisionData.timeStamp;
+                DPPoint3D accel;
+                accel.x = collisionData.impactAcceleration.x;
+                accel.y = collisionData.impactAcceleration.y;
+                accel.z = collisionData.impactAcceleration.z;
+                CGPoint axis = CGPointMake(collisionData.impactAxis.x, collisionData.impactAxis.y);
+                CGPoint power = CGPointMake(collisionData.impactPower.x, collisionData.impactPower.y);
+                float speed = collisionData.impactSpeed;
+                //collisionData.timeStamp; SDK側のデータを元に日付文字列を生成すると31年ずれる。
+                //collisionData.impactTimeStampは0
+                //Sphero側とスマートフォン側との差異が少ないためスマートフォン側の値を使用する。
+                NSTimeInterval time = [NSDate date].timeIntervalSince1970;
                 [_sensorDelegate spheroManagerStreamingCollisionForServiceId:robot.identifier
                                                             impactAcceleration:accel
                                                                           axis:axis