Skip to content

Commit b192061

Browse files
Merge pull request #172 from TakayukiHoshi1984/modify_rfc3339_date_format
日付のフォーマットをRFC3339に統一
2 parents 7ed16a0 + e03e6e5 commit b192061

56 files changed

Lines changed: 765 additions & 248 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
ABBD5F401987767600B81007 /* DCMDevicePluginSDKTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ABBD5F3F1987767600B81007 /* DCMDevicePluginSDKTests.m */; };
4343
ABBD5F501987774B00B81007 /* DCMDriveControllerProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = ABBD5F4F1987774B00B81007 /* DCMDriveControllerProfile.m */; };
4444
ABBD5F54198777F200B81007 /* DCMTemperatureProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = ABBD5F53198777F200B81007 /* DCMTemperatureProfile.m */; };
45-
BE58BE7C1D6463B500354F08 /* DCMUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = BE58BE7B1D6463B500354F08 /* DCMUtil.m */; };
4645
BEB89BEE1D8E5F790032C5A3 /* DCMECGProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB89BE91D8E5F790032C5A3 /* DCMECGProfile.m */; };
4746
BEB89BEF1D8E5F790032C5A3 /* DCMHealthProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB89BEA1D8E5F790032C5A3 /* DCMHealthProfile.m */; };
4847
BEB89BF01D8E5F790032C5A3 /* DCMPoseEstimationProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB89BEB1D8E5F790032C5A3 /* DCMPoseEstimationProfile.m */; };
@@ -92,8 +91,6 @@
9291
ABBD5F52198777EC00B81007 /* DCMTemperatureProfile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DCMTemperatureProfile.h; sourceTree = "<group>"; };
9392
ABBD5F53198777F200B81007 /* DCMTemperatureProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCMTemperatureProfile.m; sourceTree = "<group>"; };
9493
ABBD5F5C19877A4900B81007 /* DConnectSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DConnectSDK.framework; path = ../../dConnectSDK/dConnectSDKForIOS/DConnectSDK/DConnectSDK.framework; sourceTree = "<group>"; };
95-
BE58BE7A1D6463B500354F08 /* DCMUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCMUtil.h; sourceTree = "<group>"; };
96-
BE58BE7B1D6463B500354F08 /* DCMUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCMUtil.m; sourceTree = "<group>"; };
9794
BEB89BE91D8E5F790032C5A3 /* DCMECGProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCMECGProfile.m; sourceTree = "<group>"; };
9895
BEB89BEA1D8E5F790032C5A3 /* DCMHealthProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCMHealthProfile.m; sourceTree = "<group>"; };
9996
BEB89BEB1D8E5F790032C5A3 /* DCMPoseEstimationProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCMPoseEstimationProfile.m; sourceTree = "<group>"; };
@@ -229,8 +226,6 @@
229226
BEBA9D091D3DD62900970FDC /* DCMHumidityProfile.m */,
230227
ABBD5F53198777F200B81007 /* DCMTemperatureProfile.m */,
231228
AB056F9D1B6A327B00E1482F /* DCMTVProfile.m */,
232-
BE58BE7A1D6463B500354F08 /* DCMUtil.h */,
233-
BE58BE7B1D6463B500354F08 /* DCMUtil.m */,
234229
);
235230
path = Classes;
236231
sourceTree = "<group>";
@@ -352,7 +347,6 @@
352347
isa = PBXSourcesBuildPhase;
353348
buildActionMask = 2147483647;
354349
files = (
355-
BE58BE7C1D6463B500354F08 /* DCMUtil.m in Sources */,
356350
BEB89BF21D8E5F790032C5A3 /* DCMWalkStateProfile.m in Sources */,
357351
AB056F9E1B6A327B00E1482F /* DCMTVProfile.m in Sources */,
358352
BEB89BEE1D8E5F790032C5A3 /* DCMECGProfile.m in Sources */,

dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0920"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK.xcodeproj/xcshareddata/xcschemes/DCMDevicePluginSDK_framework.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0920"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK/Classes/DCMHumidityProfile.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
// http://opensource.org/licenses/mit-license.php
88
//
99

10+
#import <DConnectSDK/DConnectSDK.h>
1011
#import "DCMHumidityProfile.h"
11-
#import "DCMUtil.h"
1212

1313
NSString *const DCMHumidityProfileName = @"humidity";
1414

@@ -31,7 +31,7 @@ + (void) setHumidity:(float)humidity target:(DConnectMessage *)message
3131
+ (void) setTimeStamp:(long)timeStamp target:(DConnectMessage *)message
3232
{
3333
[message setLong:timeStamp forKey:DCMHumidityProfileParamTimeStamp];
34-
[message setString:[DCMUtil timeStampToString:timeStamp] forKey:DCMHumidityProfileParamTimeStampString];
34+
[message setString:[DConnectRFC3339DateUtils stringWithTimeStamp:timeStamp] forKey:DCMHumidityProfileParamTimeStampString];
3535
}
3636

37-
@end
37+
@end

dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK/Classes/DCMTemperatureProfile.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
// http://opensource.org/licenses/mit-license.php
88
//
99

10+
#import <DConnectSDK/DConnectSDK.h>
1011
#import "DCMTemperatureProfile.h"
11-
#import "DCMUtil.h"
12+
1213

1314
NSString *const DCMTemperatureProfileName = @"temperature";
1415
NSString *const DCMTemperatureProfileParamTemperature = @"temperature";
@@ -28,7 +29,7 @@ + (void) setTemperature:(float)temperature target:(DConnectMessage *)message {
2829

2930
+ (void) setTimeStamp:(long)timeStamp target:(DConnectMessage *)message {
3031
[message setLong:timeStamp forKey:DCMTemperatureProfileParamTimeStamp];
31-
[message setString:[DCMUtil timeStampToString:timeStamp] forKey:DCMTemperatureProfileParamTimeStampString];
32+
[message setString:[DConnectRFC3339DateUtils stringWithTimeStamp:timeStamp] forKey:DCMTemperatureProfileParamTimeStampString];
3233
}
3334

3435
+ (void) setType:(DCMTemperatureType)type target:(DConnectMessage *)message {

dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK/Classes/DCMUtil.h

Lines changed: 0 additions & 14 deletions
This file was deleted.

dConnectDevicePlugin/DCMDevicePluginSDK/DCMDevicePluginSDK/Classes/DCMUtil.m

Lines changed: 0 additions & 22 deletions
This file was deleted.

dConnectDevicePlugin/dConnectDeviceAllJoyn/dConnectDeviceAllJoyn.xcodeproj/xcshareddata/xcschemes/dConnectDeviceAllJoyn_framework.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0920"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

dConnectDevicePlugin/dConnectDeviceAllJoyn/deps/CocoaPods/AllJoynSSL.xcworkspace/contents.xcworkspacedata

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dConnectDevicePlugin/dConnectDeviceAllJoyn/deps/CocoaPods/Pods/AllJoynSSL.xcodeproj/project.pbxproj

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)