feito nova parte de danfe de NFe

Author: danilobreda

DFe.Utils/CertificadoDigitalUtils.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
-#if (NETFRAMEWORK || NETCOREAPP)
+#if (NETFRAMEWORK)
 using DFe.Utils.Assinatura;
 #endif
 using System.Security;
@@ -10,7 +10,7 @@ namespace DFe.Utils
 {
     public class CertificadoDigitalUtils
     {
-#if (NETFRAMEWORK || NETCOREAPP)
+#if (NETFRAMEWORK)
 
         /// <summary>
         /// Exibe a lista de certificados instalados no PC e devolve o certificado selecionado

DFe.Utils/DFe.Utils.csproj

@@ -5,6 +5,10 @@
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.0" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\DFe.Classes\DFe.Classes.csproj" />
 	</ItemGroup>

GraphicsPrinter/GraphicsPrinter.csproj

@@ -1722,7 +1722,8 @@ private void BtnCupom_Click(object sender, RoutedEventArgs e)
 
 
                 DanfeNativoNfce impr = new DanfeNativoNfce(arquivo,
-                    _configuracoes.ConfiguracaoDanfeNfce,
+                    _configuracoes.ConfiguracaoDanfeNfce.VersaoQrCode,
+                    _configuracoes.ConfiguracaoDanfeNfce.Logomarca,
                     _configuracoes.ConfiguracaoCsc.CIdToken,
                     _configuracoes.ConfiguracaoCsc.Csc,
                     0 /*troco*//*, "Arial Black"*/);

GraphicsPrinter/Properties/AssemblyInfo.cs

@@ -108,7 +108,7 @@
       <Name>NFe.Classes</Name>
     </ProjectReference>
     <ProjectReference Include="..\NFe.Danfe.Base\NFe.Danfe.Base.csproj">
-      <Project>{7696cc7f-83b7-434a-9759-4fcacc2fd483}</Project>
+      <Project>{7696CC7F-83B7-434A-9759-4FCACC2FD483}</Project>
       <Name>NFe.Danfe.Base</Name>
     </ProjectReference>
     <ProjectReference Include="..\NFe.Danfe.Fast\NFe.Danfe.Fast.csproj">

NFe.AppTeste/MainWindow.xaml.cs

@@ -9,8 +9,7 @@
     <ProjectReference Include="..\DFe.Classes\DFe.Classes.csproj" />
     <ProjectReference Include="..\DFe.Utils\DFe.Utils.csproj" />
     <ProjectReference Include="..\NFe.Classes\NFe.Classes.csproj" />
-    <ProjectReference Include="..\NFe.Danfe.Base\NFe.Danfe.Base.csproj" />
-    <ProjectReference Include="..\NFe.Danfe.Fast\NFe.Danfe.Fast.csproj" />
+    <ProjectReference Include="..\NFe.Danfe.OpenFast\NFe.Danfe.OpenFast.csproj" />
     <ProjectReference Include="..\NFe.Utils\NFe.Utils.csproj" />
   </ItemGroup>
 

NFe.Danfe.AppTeste/App.xaml NFe.Danfe.AppTeste.Fast/App.xaml

@@ -4,13 +4,13 @@
 using NFe.Classes.Servicos.Consulta;
 using NFe.Danfe.Base.NFCe;
 using NFe.Danfe.Base.NFe;
-using NFe.Danfe.Fast.NFCe;
-using NFe.Danfe.Fast.NFe;
 using NFe.Utils.NFe;
 using System;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
+using NFe.Danfe.OpenFast.NFCe;
+using NFe.Danfe.OpenFast.NFe;
 
 namespace NFe.Danfe.AppTeste.NetCore
 {

NFe.Danfe.AppTeste/App.xaml.cs NFe.Danfe.AppTeste.Fast/App.xaml.cs

@@ -31,9 +31,6 @@
 /* Rua Comendador Francisco josé da Cunha, 111 - Itabaiana - SE - 49500-000     */
 /********************************************************************************/
 
-using System.Drawing;
-using System.IO;
-
 namespace NFe.Danfe.Base
 {
     public class ConfiguracaoDanfe
@@ -47,18 +44,5 @@ public class ConfiguracaoDanfe
         /// Determina se deve ser impresso uma tarja "DOCUMENTO CANCELADO", indicando que o DANFE impresso refere-se ao DANFE de uma NFe cancelada
         /// </summary>
         public bool DocumentoCancelado { get; set; }
-
-        /// <summary>
-        /// Retorna um objeto do tipo <see cref="Image"/> a partir da logo armazenada na propriedade <see cref="Logomarca"/>
-        /// </summary>
-        /// <returns></returns>
-        public Image ObterLogo()
-        {
-            if (Logomarca == null)
-                return null;
-            var ms = new MemoryStream(Logomarca);
-            var image = Image.FromStream(ms);
-            return image;
-        }
     }
 }

NFe.Danfe.AppTeste/ConfiguracaoApp.cs NFe.Danfe.AppTeste.Fast/ConfiguracaoApp.cs

@@ -0,0 +1,28 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace NFe.Danfe.Base
+{
+    public static class FrxFileHelper
+    {
+        public static byte[] TryGetFrxFile(string caminho)
+        {
+            try
+            {
+                if (!caminho.EndsWith(".frx"))
+                {
+                    caminho += ".frx";
+                }
+
+                var path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("Erro no Zeus. Assembly de relatório nao encontrado"), caminho);
+                var bytes = File.ReadAllBytes(path);
+                return bytes.Length == 0 ? null : bytes;
+            }
+            catch (Exception e)
+            {
+                return null;
+            }
+        }
+    }
+}

NFe.Danfe.AppTeste/EnumParaBool.cs NFe.Danfe.AppTeste.Fast/EnumParaBool.cs

@@ -31,11 +31,7 @@
 /* Rua Comendador Francisco josé da Cunha, 111 - Itabaiana - SE - 49500-000     */
 /********************************************************************************/
 
-using System.Drawing;
-using System.Drawing.Text;
-using NFe.Danfe.Base.Fontes;
 using NFe.Utils;
-using NFe.Danfe.Base.Properties;
 
 namespace NFe.Danfe.Base.NFCe
 {
@@ -56,7 +52,6 @@ public ConfiguracaoDanfeNfce(NfceDetalheVendaNormal detalheVendaNormal,
             MargemDireita = margemDireita;
             ModoImpressao = modoImpressao;
             NfceLayoutQrCode = nfceLayoutQrCode;
-            CarregarFontePadraoNfceNativa();
             VersaoQrCode = versaoQrCode;
             SegundaViaContingencia = true;
         }
@@ -116,23 +111,9 @@ public ConfiguracaoDanfeNfce()
         /// </summary>
         public VersaoQrCode VersaoQrCode { get; set; }
 
-        public string FontPadraoNfceNativa { get; set; }
-
+        /// <summary>
+        /// Envia segunda via de contingencia para a impressora (apenas suportado no fastreport clássico)
+        /// </summary>
         public bool SegundaViaContingencia { get; set; }
-
-        public FontFamily CarregarFontePadraoNfceNativa(string font = null)
-        {
-            if (font != null)
-            {
-                FontPadraoNfceNativa = font;
-                return new FontFamily(font);
-            }
-
-
-            PrivateFontCollection colecaoDeFontes; //todo dispose na coleção
-            var openSans = Fonte.CarregarDeByteArray(Resources.OpenSans_CondBold, out colecaoDeFontes);
-
-            return openSans;
-        }
     }
 }

NFe.Danfe.AppTeste/Funcoes.cs NFe.Danfe.AppTeste.Fast/Funcoes.cs

@@ -23,6 +23,28 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="NFCe\NFCe.frx" />
+    <None Remove="NFe\NFeEvento.frx" />
+    <None Remove="NFe\NFeRetrato.frx" />
+    <None Remove="NFe\NFeSimplificado.frx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="NFCe\NFCe.frx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="NFe\NFeEvento.frx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="NFe\NFeRetrato.frx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="NFe\NFeSimplificado.frx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\NFe.Utils\NFe.Utils.csproj" />
   </ItemGroup>