ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -224,6 +224,7 @@ <None Include="Properties\AndroidManifest.xml"> <SubType>Designer</SubType> </None> <AndroidAsset Include="Assets\Phone\Center\FaceManagement.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\layout\Main.axml" /> @@ -2717,6 +2718,10 @@ <Project>{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}</Project> <Name>AndriodBluetooth</Name> </ProjectReference> <ProjectReference Include="..\SPhoneLib\SPhoneLib.csproj"> <Project>{A6CA3387-58A7-4819-992F-C800C8839AFB}</Project> <Name>SPhoneLib</Name> </ProjectReference> </ItemGroup> <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0121011401" android:installLocation="auto" android:versionName="1.1.0121011401"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" /> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26" /> <permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> <!--8.0权限--> ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
Diff too large ZigbeeApp/GateWay.sln
@@ -8,13 +8,15 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{85F1AF50-75A6-4011-B811-56B32DA77568}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{F1296E2C-3777-4385-85B2-DA77617E3178}" Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EzvizLib.ios", "..\..\..\HDLDemo\全视通\EzvizLib.ios\EzvizLib.ios.csproj", "{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}" Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{441E285A-C255-4ACE-970D-28E679F88F57}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "EzvizLib.ios", "..\..\..\HDLDemo\全视通\EzvizLib.ios\EzvizLib.ios.csproj", "{4930B212-5FF8-40A0-B07C-7E0BF843F461}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPhoneLib", "SPhoneLib\SPhoneLib.csproj", "{A6CA3387-58A7-4819-992F-C800C8839AFB}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -54,18 +56,6 @@ {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhone.Build.0 = Release|Any CPU {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.Build.0 = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.ActiveCfg = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.Build.0 = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|Any CPU.ActiveCfg = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|Any CPU.Build.0 = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.ActiveCfg = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.Build.0 = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.Build.0 = Debug|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -78,30 +68,54 @@ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhone.Build.0 = Release|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.ActiveCfg = Debug|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.Build.0 = Debug|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.ActiveCfg = Release|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.Build.0 = Release|iPhone {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|Any CPU.Build.0 = Debug|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhone.ActiveCfg = Debug|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhone.Build.0 = Debug|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|Any CPU.ActiveCfg = Release|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|Any CPU.Build.0 = Release|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhone.ActiveCfg = Release|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhone.Build.0 = Release|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|Any CPU.Build.0 = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhone.ActiveCfg = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhone.Build.0 = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|Any CPU.ActiveCfg = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|Any CPU.Build.0 = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhone.ActiveCfg = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhone.Build.0 = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhone.ActiveCfg = Debug|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhone.Build.0 = Debug|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhone.ActiveCfg = Release|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhone.Build.0 = Release|iPhone {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|Any CPU.Build.0 = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhone.ActiveCfg = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhone.Build.0 = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|Any CPU.ActiveCfg = Release|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|Any CPU.Build.0 = Release|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|iPhone.ActiveCfg = Release|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|iPhone.Build.0 = Release|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhone.ActiveCfg = Debug|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhone.Build.0 = Debug|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|Any CPU.Build.0 = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhone.ActiveCfg = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhone.Build.0 = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE ZigbeeApp/SPhoneLib/Additions/AboutAdditions.txt
New file @@ -0,0 +1,48 @@ Additions allow you to add arbitrary C# to the generated classes before they are compiled. This can be helpful for providing convenience methods or adding pure C# classes. == Adding Methods to Generated Classes == Let's say the library being bound has a Rectangle class with a constructor that takes an x and y position, and a width and length size. It will look like this: public partial class Rectangle { public Rectangle (int x, int y, int width, int height) { // JNI bindings } } Imagine we want to add a constructor to this class that takes a Point and Size structure instead of 4 ints. We can add a new file called Rectangle.cs with a partial class containing our new method: public partial class Rectangle { public Rectangle (Point location, Size size) : this (location.X, location.Y, size.Width, size.Height) { } } At compile time, the additions class will be added to the generated class and the final assembly will a Rectangle class with both constructors. == Adding C# Classes == Another thing that can be done is adding fully C# managed classes to the generated library. In the above example, let's assume that there isn't a Point class available in Java or our library. The one we create doesn't need to interact with Java, so we'll create it like a normal class in C#. By adding a Point.cs file with this class, it will end up in the binding library: public class Point { public int X { get; set; } public int Y { get; set; } } ZigbeeApp/SPhoneLib/Jars/AboutJars.txt
New file @@ -0,0 +1,24 @@ This directory is for Android .jars. There are 2 types of jars that are supported: == Input Jar == This is the jar that bindings should be generated for. For example, if you were binding the Google Maps library, this would be Google's "maps.jar". Set the build action for these jars in the properties page to "InputJar". == Reference Jars == These are jars that are referenced by the input jar. C# bindings will not be created for these jars. These jars will be used to resolve types used by the input jar. NOTE: Do not add "android.jar" as a reference jar. It will be added automatically based on the Target Framework selected. Set the build action for these jars in the properties page to "ReferenceJar". ZigbeeApp/SPhoneLib/Jars/sphonelibs-release.aarBinary files differ
ZigbeeApp/SPhoneLib/Properties/AssemblyInfo.cs
New file @@ -0,0 +1,26 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Android.App; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("SPhoneLib")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SPhoneLib")] [assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] // Version information for an assembly consists of the following four values: // // Major Version // Minor Version // Build Number // Revision [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] ZigbeeApp/SPhoneLib/SPhoneLib.csproj
New file @@ -0,0 +1,67 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{A6CA3387-58A7-4819-992F-C800C8839AFB}</ProjectGuid> <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SPhoneLib</RootNamespace> <AssemblyName>SPhoneLib</AssemblyName> <FileAlignment>512</FileAlignment> <Deterministic>True</Deterministic> <TargetFrameworkVersion>v8.0</TargetFrameworkVersion> <AndroidClassParser>class-parse</AndroidClassParser> <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget> <RestoreProjectStyle>PackageReference</RestoreProjectStyle> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>portable</DebugType> <Optimize>false</Optimize> <OutputPath>bin\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>portable</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="Mono.Android" /> <Reference Include="System" /> <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> <None Include="Jars\AboutJars.txt" /> <None Include="Additions\AboutAdditions.txt" /> </ItemGroup> <ItemGroup> <TransformFile Include="Transforms\Metadata.xml" /> <TransformFile Include="Transforms\EnumFields.xml" /> <TransformFile Include="Transforms\EnumMethods.xml" /> </ItemGroup> <ItemGroup> <LibraryProjectZip Include="Jars\sphonelibs-release.aar" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> </Target> <Target Name="AfterBuild"> </Target> --> </Project> ZigbeeApp/SPhoneLib/Transforms/EnumFields.xml
New file @@ -0,0 +1,14 @@ <enum-field-mappings> <!-- This example converts the constants Fragment_id, Fragment_name, and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag to an enum called Android.Support.V4.App.FragmentTagType with values Id, Name, and Tag. <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType"> <field jni-name="Fragment_name" clr-name="Name" value="0" /> <field jni-name="Fragment_id" clr-name="Id" value="1" /> <field jni-name="Fragment_tag" clr-name="Tag" value="2" /> </mapping> --> </enum-field-mappings> ZigbeeApp/SPhoneLib/Transforms/EnumMethods.xml
New file @@ -0,0 +1,13 @@ <enum-method-mappings> <!-- This example changes the Java method: android.support.v4.app.Fragment.SavedState.writeToParcel (int flags) to be: android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags) when bound in C#. <mapping jni-class="android/support/v4/app/Fragment.SavedState"> <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" /> </mapping> --> </enum-method-mappings> ZigbeeApp/SPhoneLib/Transforms/Metadata.xml
New file @@ -0,0 +1,20 @@ <metadata> <!-- This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask: <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" /> This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground: <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" /> --> <remove-node path="/api/package[@name='com.sipphone.sdk']/class[@name='LinphoneContact']/implements[@name='Java.Lang.IComparable']" /> <remove-node path="/api/package[starts-with(@name,'org.linphone')]"/> <remove-node path="/api/package[starts-with(@name,'com.evoyohome.sphonelibs.util')]"/> <remove-node path="/api/package[starts-with(@name,'com.google.gson.internal.bind')]"/> <remove-node path="/api/package[starts-with(@name,'com.google.gson.internal')]"/> <remove-node path="/api/package[starts-with(@name,'com.google.gson')]"/> <remove-node path="/api/package[starts-with(@name,'com.google.zxing.client.result')]"/> <remove-node path="/api/package[starts-with(@name,'com.google.zxing.oned.rss.expanded.decoders')]"/> <remove-node path="/api/package[starts-with(@name,'com.sipphone.sdk')]"/> </metadata> ZigbeeApp/Shared/DLL/Android/Shared.Droid.dllold mode 100755 new mode 100644 Binary files differ
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -1,8 +1,6 @@ using Shared.Common; using System; using System.Collections.Generic; using System.Text; using Shared.IOS.HDLFVSDK; namespace Shared.Phone.UserCenter { /// <summary> @@ -306,6 +304,13 @@ Shared.IOS.HDLFVSDK.Video.Init("", listHouse[0].Id); #endif #if Android string userName = listHouse[0].Id; string uuid = "10F908BA-CA5A-4041-9D1A-382E6A004F74"; string code = "T0001"; string httpServer = "120.24.41.192"; Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null); #endif } } else { @@ -314,6 +319,13 @@ //初始化全视通 Shared.IOS.HDLFVSDK.Video.Init("", Config.Instance.HomeId); #endif #if Android string userName = Config.Instance.HomeId; string uuid = "10F908BA-CA5A-4041-9D1A-382E6A004F74"; string code = "T0001"; string httpServer = "120.24.41.192"; Com.Evoyohome.Sphonelibs.Global.Global.Login(Application.Activity, userName, uuid, code, httpServer, null); #endif } Config.Instance.Save(); } ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -4,7 +4,6 @@ using Shared.Common.ResponseEntity; using System.Collections.Generic; using System.Text; using Shared.IOS.HDLFVSDK; namespace Shared.Phone.UserCenter { /// <summary> ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -335,8 +335,10 @@ } //打开人脸管理页面 #if iOS Shared.IOS.HDLFVSDK.Video.ShowFaceManagement(); #endif #if Android Com.Evoyohome.Sphonelibs.Global.Global.OpenFaceManageActivity(Application.Activity); #endif }; @@ -452,6 +454,10 @@ #if iOS Shared.IOS.HDLFVSDK.Video.ShowDeviceList(); #endif #if Android Com.Evoyohome.Sphonelibs.Global.Global.OpenIntercomActivity(Application.Activity); #endif }; if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
