Merge pull request #43 from ZeusAutomacao/master

Atualizando repositório
ZeusAutomacao · Nov 5, 2019 · 7ffa296 · 7ffa296
2 parents 4066995 + dc7febc
commit 7ffa296
Show file tree

Hide file tree

Showing 6 changed files with 260 additions and 242 deletions.
diff --git a/MDFe.Damdfe.Fast/MDFeRetrato.frx b/MDFe.Damdfe.Fast/MDFeRetrato.frx
diff --git a/MDFe.Damdfe.Fast/Resources/MDFeRetrato.frx b/MDFe.Damdfe.Fast/Resources/MDFeRetrato.frx
diff --git a/NFe.Danfe.AppTeste/MainWindow.xaml.cs b/NFe.Danfe.AppTeste/MainWindow.xaml.cs
@@ -223,9 +223,9 @@ private void BtnNfeDanfeA4_Click(object sender, RoutedEventArgs e)
                                     desenvolvedor: "NOME DA SOFTWARE HOUSE",
                                     arquivoRelatorio: string.Empty);
 
-                //danfe.Visualizar();
+                danfe.Visualizar();
                 //danfe.Imprimir();
-                danfe.ExibirDesign();
+                //danfe.ExibirDesign();
                 //danfe.ExportarPdf(@"d:\teste.pdf");
 
                 #endregion

diff --git a/Shared.DFe.Utils/ConfiguracaoCertificado.cs b/Shared.DFe.Utils/ConfiguracaoCertificado.cs
@@ -166,12 +166,12 @@ public string CacheId
         /// <summary>
         ///     Algoritmo de Assinatura (Padrao: http://www.w3.org/2000/09/xmldsig#rsa-sha1)
         /// </summary>
-        public string SignatureMethodSignedXml { get; set; }
+        public string SignatureMethodSignedXml { get; set; } = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
 
 
         /// <summary>
         ///     URI para DigestMethod na Classe Reference para auxiliar para a assinatura (Padrao: http://www.w3.org/2000/09/xmldsig#sha1)
         /// </summary>
-        public string DigestMethodReference { get; set; }
+        public string DigestMethodReference { get; set; } = "http://www.w3.org/2000/09/xmldsig#sha1";
     }
 }
diff --git a/Shared.NFe.Danfe.Fast/DanfeSharedHelper.cs b/Shared.NFe.Danfe.Fast/DanfeSharedHelper.cs
@@ -45,7 +45,11 @@ public static Report GenerateDanfeNfceReport(nfeProc proc, ConfiguracaoDanfeNfce
             //alteracao necessaria para .netstandard, o código abaixo utiliza um método onde não é compativel para .netstandard:
             //de : //((PictureObject)relatorio.FindObject("poEmitLogo")).Image = configuracaoDanfeNfce.ObterLogo();
             //para:
+#if Standard
             ((PictureObject)relatorio.FindObject("poEmitLogo")).SetImageData(configuracaoDanfeNfce.Logomarca);
+#else
+            ((PictureObject)relatorio.FindObject("poEmitLogo")).Image = configuracaoDanfeNfce.ObterLogo();
+#endif
 
             ((TextObject)relatorio.FindObject("txtUrl")).Text = string.IsNullOrEmpty(proc.NFe.infNFeSupl.urlChave) ? proc.NFe.infNFeSupl.ObterUrlConsulta(proc.NFe, configuracaoDanfeNfce.VersaoQrCode) : proc.NFe.infNFeSupl.urlChave;
             ((BarcodeObject)relatorio.FindObject("bcoQrCode")).Text = proc.NFe.infNFeSupl == null ? proc.NFe.infNFeSupl.ObterUrlQrCode(proc.NFe, configuracaoDanfeNfce.VersaoQrCode, cIdToken, csc) : proc.NFe.infNFeSupl.qrCode;

diff --git a/Shared.NFe.Utils/InformacoesSuplementares/ExtinfNFeSupl.cs b/Shared.NFe.Utils/InformacoesSuplementares/ExtinfNFeSupl.cs
@@ -386,6 +386,14 @@ public static string ObterUrlConsulta(this infNFeSupl infNFeSupl, Classes.NFe nf
         /// </summary>
         public static string ObterUrlQrCode(this infNFeSupl infNFeSupl, Classes.NFe nfe, VersaoQrCode versaoQrCode, string cIdToken, string csc)
         {
+            Func<string, string> msgErro = parametro => $"O {parametro} não foi informado!";
+
+            if (string.IsNullOrEmpty(cIdToken))
+                throw new ArgumentNullException(nameof(cIdToken), msgErro("token"));
+
+            if (string.IsNullOrEmpty(csc))
+                throw new ArgumentNullException(nameof(cIdToken), msgErro("CSC"));
+
             var versaoServico = Conversao.StringParaVersaoServico(nfe.infNFe.versao);
             switch (versaoQrCode)
             {