Skip to content

Commit

Permalink
Merge pull request #2 from dji-sdk/Beta_1.1_release
Browse files Browse the repository at this point in the history
Updating to beta 1.1 code
  • Loading branch information
dji-dev authored Oct 16, 2019
2 parents d6077d2 + df59560 commit c955ac4
Show file tree
Hide file tree
Showing 30 changed files with 1,808 additions and 152 deletions.
2 changes: 1 addition & 1 deletion DJI-UXSDK-iOS-Beta-Communication.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DJI-UXSDK-iOS-Beta-Communication'
s.version = '0.1.0'
s.version = '0.1.1'
s.license = 'MIT'
s.summary = 'Intra-framework, and system communication infrastructure for DJI iOS UX SDK.'
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
Expand Down
8 changes: 4 additions & 4 deletions DJI-UXSDK-iOS-Beta-Core.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DJI-UXSDK-iOS-Beta-Core'
s.version = '0.1.0'
s.version = '0.1.1'
s.license = 'MIT'
s.summary = 'Core utilities for DJI iOS UX SDK.'
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
Expand All @@ -15,6 +15,6 @@ Pod::Spec.new do |s|
s.cocoapods_version = '>= 1.7.1'
s.source_files = 'DJIUXSDKCore/**/*.{h,m}'
s.public_header_files = 'DJIUXSDKCore/**/*.h'
s.dependency 'DJI-SDK-iOS', '4.10'
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.1.0'
end
s.dependency 'DJI-SDK-iOS', '4.11'
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.1.1'
end
10 changes: 5 additions & 5 deletions DJI-UXSDK-iOS-Beta-Widgets.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DJI-UXSDK-iOS-Beta-Widgets'
s.version = '0.1.0'
s.version = '0.1.1'
s.license = 'MIT'
s.summary = 'A collection of widget, widget model, and related helpers for DJI iOS UX SDK.'
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
Expand All @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.cocoapods_version = '>= 1.7.1'
s.source_files = 'DJIUXSDKWidgets/**/*.{h,m}'
s.resource_bundle = { 'DUXBetaAssets' => 'DJIUXSDKWidgets/**/*.xcassets' }
s.dependency 'DJI-SDK-iOS', '4.10'
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '0.1.0'
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.1.0'
end
s.dependency 'DJI-SDK-iOS', '4.11'
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '0.1.1'
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.1.1'
end
10 changes: 5 additions & 5 deletions DJI-UXSDK-iOS-Beta.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DJI-UXSDK-iOS-Beta'
s.version = '0.1.0'
s.version = '0.1.1'
s.license = 'MIT'
s.summary = 'DJI iOS UX SDK'
s.homepage = 'https://github.com/dji-sdk/Mobile-UXSDK-Beta-iOS'
Expand All @@ -14,7 +14,7 @@ Pod::Spec.new do |s|
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'DEFINES_MODULE' => 'YES', 'SWIFT_OBJC_BRIDGING_HEADER' => '$(PODS_TARGET_SRCROOT)/'}
s.cocoapods_version = '>= 1.7.1'
s.source_files = 'DJIUXSDKBeta/**/*.{h,m}'
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '0.1.0'
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.1.0'
s.dependency 'DJI-UXSDK-iOS-Beta-Widgets', '0.1.0'
end
s.dependency 'DJI-UXSDK-iOS-Beta-Core', '0.1.1'
s.dependency 'DJI-UXSDK-iOS-Beta-Communication', '0.1.1'
s.dependency 'DJI-UXSDK-iOS-Beta-Widgets', '0.1.1'
end
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
//
// NSObject+DUXBetaCommand.h
// DJIUXSDK
//
// Copyright © 2018-2019 DJI. All rights reserved.
//
// MIT License
//
// Copyright © 2018-2019 DJI
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//

#import <Foundation/Foundation.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
//
// NSObject+DUXBetaMapping.h
// DJIUXSDK
//
// Copyright © 2018-2019 DJI. All rights reserved.
//
// MIT License
//
// Copyright © 2018-2019 DJI
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//

#import <Foundation/Foundation.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
//
// NSObject+DUXBetaMapping.m
// DJIUXSDK
//
// Copyright © 2018-2019 DJI. All rights reserved.
//
// MIT License
//
// Copyright © 2018-2019 DJI
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//

#import "NSObject+DUXBetaMapping.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
//
// NSObject+DUXBetaRKVOExtension.h
// DJIUXSDK
//
// Copyright © 2018-2019 DJI. All rights reserved.
//
// MIT License
//
// Copyright © 2018-2019 DJI
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//


Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
//
// NSObject+DUXBetaRKVOExtension.m
// DJIUXSDK
//
// Copyright © 2018-2019 DJI. All rights reserved.
//
// MIT License
//
// Copyright © 2018-2019 DJI
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//

#import "NSObject+DUXBetaRKVOExtension.h"
Expand Down
24 changes: 22 additions & 2 deletions DJIUXSDKWidgets/VisionWidget/DUXBetaVisionWidget.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
//
// DUXBetaVisionWidget.h
// DJIUXSDK
//
// Copyright © 2018-2019 DJI. All rights reserved.
//
// MIT License
//
// Copyright © 2018-2019 DJI
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//

#import <DJIUXSDKWidgets/DUXBetaBaseWidget.h>
Expand Down
24 changes: 22 additions & 2 deletions DJIUXSDKWidgets/VisionWidget/DUXBetaVisionWidget.m
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
//
// DUXBetaVisionWidget.m
// DJIUXSDK
//
// Copyright © 2018-2019 DJI. All rights reserved.
//
// MIT License
//
// Copyright © 2018-2019 DJI
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//

#import "DUXBetaVisionWidget.h"
Expand Down
11 changes: 6 additions & 5 deletions UXSDKBetaSample/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ platform :ios, '11.0'

target 'UXSDKBetaSample' do
use_frameworks!
pod 'DJI-SDK-iOS', '~> 4.10'
pod 'DJI-UXSDK-iOS', '~> 4.10'
pod 'DJIWidget', '~> 1.5'
pod 'DJI-UXSDK-iOS-Beta', '~> 0.1.0'
end
pod 'DJI-SDK-iOS', '~> 4.11'
pod 'DJI-UXSDK-iOS', '~> 4.11'
pod 'DJIWidget', '~> 1.6.1'
pod 'DJI-UXSDK-iOS-Beta', '~> 0.1.1'
pod 'iOS-Color-Picker'
end
Loading

0 comments on commit c955ac4

Please sign in to comment.