diff --git a/Clients/MonoAndroidDemo/DecoderActivity.cs b/Clients/MonoAndroidDemo/DecoderActivity.cs index e055e6d7..58feaca5 100644 --- a/Clients/MonoAndroidDemo/DecoderActivity.cs +++ b/Clients/MonoAndroidDemo/DecoderActivity.cs @@ -15,7 +15,9 @@ namespace MonoAndroidDemo { - [Activity (Label = "Read:")] + using ZXing.Android; + + [Activity (Label = "Read:")] public class DecoderActivity : Activity { public static BarcodeFormat CurrentFormat = BarcodeFormat.QR_CODE; @@ -160,7 +162,7 @@ void Decode (Android.Graphics.Bitmap image) { try { - var reader = new BarcodeReader (); + var reader = new BarcodeReader(); reader.Options.PossibleFormats = new List () { CurrentFormat }; reader.Options.TryHarder = true; var result = reader.Decode (image); diff --git a/Clients/MonoAndroidDemo/MonoAndroidDemo.csproj b/Clients/MonoAndroidDemo/MonoAndroidDemo.csproj index b94f6d54..61622038 100644 --- a/Clients/MonoAndroidDemo/MonoAndroidDemo.csproj +++ b/Clients/MonoAndroidDemo/MonoAndroidDemo.csproj @@ -47,8 +47,8 @@ - - ..\..\packages\ZXing.Net.0.16.6-beta1\lib\netstandard2.0\zxing.dll + + ..\..\packages\ZXing.Net.0.16.6\lib\netstandard2.0\zxing.dll @@ -94,11 +94,11 @@ - + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + \ No newline at end of file diff --git a/Clients/MonoAndroidDemo/packages.config b/Clients/MonoAndroidDemo/packages.config new file mode 100644 index 00000000..f1d5dd8e --- /dev/null +++ b/Clients/MonoAndroidDemo/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/zxing.vs2017.sln b/zxing.vs2017.sln index 7b64a3cf..adbf4207 100644 --- a/zxing.vs2017.sln +++ b/zxing.vs2017.sln @@ -120,6 +120,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bindings", "Bindings", "{E1 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Android", "Source\Bindings\ZXing.Android\ZXing.Android.csproj", "{8080C792-EB9B-4CE8-B52E-740ABB68AE50}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoAndroidDemo", "Clients\MonoAndroidDemo\MonoAndroidDemo.csproj", "{14DFA0B8-A311-46BD-A1BD-A0808473CD80}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug - Reduced|Any CPU = Debug - Reduced|Any CPU @@ -1211,6 +1213,54 @@ Global {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x64.Build.0 = Release|Any CPU {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x86.ActiveCfg = Release|Any CPU {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x86.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|Any CPU.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|Any CPU.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|Any CPU.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|ARM.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|ARM.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|ARM.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|x64.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|x64.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|x64.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|x86.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|x86.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug - Reduced|x86.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|ARM.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|ARM.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|ARM.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|x64.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|x64.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|x64.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|x86.ActiveCfg = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|x86.Build.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Debug|x86.Deploy.0 = Debug|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|Any CPU.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|Any CPU.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|Any CPU.Deploy.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|ARM.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|ARM.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|ARM.Deploy.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|x64.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|x64.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|x64.Deploy.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|x86.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|x86.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release with Documentation|x86.Deploy.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|Any CPU.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|Any CPU.Deploy.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|ARM.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|ARM.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|ARM.Deploy.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|x64.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|x64.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|x64.Deploy.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|x86.ActiveCfg = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|x86.Build.0 = Release|Any CPU + {14DFA0B8-A311-46BD-A1BD-A0808473CD80}.Release|x86.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1240,6 +1290,7 @@ Global {F983B572-DCD7-4AB4-B9D5-D218A22BA5FE} = {7D5D173D-0A00-4F57-9F02-0739E4C70555} {CD937642-91A0-4371-9452-336F8CC63121} = {7D5D173D-0A00-4F57-9F02-0739E4C70555} {8080C792-EB9B-4CE8-B52E-740ABB68AE50} = {E13D10BC-67C7-4D85-AAA9-8D7650327B9F} + {14DFA0B8-A311-46BD-A1BD-A0808473CD80} = {751F738A-6DBF-4E2B-8FCD-D381E46D979D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73A9B453-AE71-4A98-B68A-2389573CD311}