From 728ceead4ea3f18abcb6f70772e64e4549f9dcac Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 02 四月 2021 17:06:31 +0800 Subject: [PATCH] 2021-04-02 1.ZigBee 丰林同样更新SDK。 --- xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs | 57 ------------------ xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a | 0 xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs | 3 xamarin/Shared.IOS.ESVideoPhoneSDK/Library/ESVideoPhoneSDk.a | 0 xamarin/Shared.IOS.ESVideoPhoneSDK/Structs.cs | 4 + xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj | 1 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/xcshareddata/xcschemes/ESVideoPhoneSDKXamarin.xcscheme | 67 ++++++++++++++++++++++ 7 files changed, 75 insertions(+), 57 deletions(-) diff --git a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj index 9ea7459..453ea63 100644 --- a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj +++ b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj @@ -310,6 +310,7 @@ B956B475248D28B70093C489 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = arm64; CODE_SIGN_STYLE = Automatic; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/xcshareddata/xcschemes/ESVideoPhoneSDKXamarin.xcscheme b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/xcshareddata/xcschemes/ESVideoPhoneSDKXamarin.xcscheme new file mode 100644 index 0000000..7d188b1 --- /dev/null +++ b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/xcshareddata/xcschemes/ESVideoPhoneSDKXamarin.xcscheme @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "1220" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B956B469248D28B70093C489" + BuildableName = "libESVideoPhoneSDKXamarin.a" + BlueprintName = "ESVideoPhoneSDKXamarin" + ReferencedContainer = "container:ESVideoPhoneSDKXamarin.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES"> + <Testables> + </Testables> + </TestAction> + <LaunchAction + buildConfiguration = "Release" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES"> + </LaunchAction> + <ProfileAction + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES"> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B956B469248D28B70093C489" + BuildableName = "libESVideoPhoneSDKXamarin.a" + BlueprintName = "ESVideoPhoneSDKXamarin" + ReferencedContainer = "container:ESVideoPhoneSDKXamarin.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs b/xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs index 267a4e5..34e5874 100644 --- a/xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs +++ b/xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs @@ -6,62 +6,7 @@ namespace Shared.IOS.ESVideoPhoneSDK { - // The first step to creating a binding is to add your native library ("libNativeLibrary.a") - // to the project by right-clicking (or Control-clicking) the folder containing this source - // file and clicking "Add files..." and then simply select the native library (or libraries) - // that you want to bind. - // - // When you do that, you'll notice that MonoDevelop generates a code-behind file for each - // native library which will contain a [LinkWith] attribute. VisualStudio auto-detects the - // architectures that the native library supports and fills in that information for you, - // however, it cannot auto-detect any Frameworks or other system libraries that the - // native library may depend on, so you'll need to fill in that information yourself. - // - // Once you've done that, you're ready to move on to binding the API... - // - // - // Here is where you'd define your API definition for the native Objective-C library. - // - // For example, to bind the following Objective-C class: - // - // @interface Widget : NSObject { - // } - // - // The C# binding would look like this: - // - // [BaseType (typeof (NSObject))] - // interface Widget { - // } - // - // To bind Objective-C properties, such as: - // - // @property (nonatomic, readwrite, assign) CGPoint center; - // - // You would add a property definition in the C# interface like so: - // - // [Export ("center")] - // CGPoint Center { get; set; } - // - // To bind an Objective-C method, such as: - // - // -(void) doSomething:(NSObject *)object atIndex:(NSInteger)index; - // - // You would add a method definition to the C# interface like so: - // - // [Export ("doSomething:atIndex:")] - // void DoSomething (NSObject object, int index); - // - // Objective-C "constructors" such as: - // - // -(id)initWithElmo:(ElmoMuppet *)elmo; - // - // Can be bound as: - // - // [Export ("initWithElmo:")] - // IntPtr Constructor (ElmoMuppet elmo); - // - // For more information, see https://aka.ms/ios-binding - // + //***************************鐩戞帶椤甸潰*********************** // typedef void (^CollectButtonCallBack)(_Bool); diff --git a/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/ESVideoPhoneSDk.a b/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/ESVideoPhoneSDk.a index 6867847..d1587ef 100644 --- a/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/ESVideoPhoneSDk.a +++ b/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/ESVideoPhoneSDk.a Binary files differ diff --git a/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a b/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a index 1fe6224..84019a6 100644 --- a/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a +++ b/xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a Binary files differ diff --git a/xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs b/xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs index b996201..2d9dcc3 100644 --- a/xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs +++ b/xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs @@ -25,7 +25,8 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("1.0.3")] + +[assembly: AssemblyVersion("1.0.4")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/xamarin/Shared.IOS.ESVideoPhoneSDK/Structs.cs b/xamarin/Shared.IOS.ESVideoPhoneSDK/Structs.cs index e7b46d2..a7fead3 100644 --- a/xamarin/Shared.IOS.ESVideoPhoneSDK/Structs.cs +++ b/xamarin/Shared.IOS.ESVideoPhoneSDK/Structs.cs @@ -4,3 +4,7 @@ { } + +//2021-04-02 +//1.0.4 +//1.鏇存柊涓版灄鏈�鏂癝DK銆� -- Gitblit v1.8.0