From a46fd6cec3dc8aa99e7a3067de4c0617b232ff88 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 8 May 2019 13:35:30 +0300 Subject: Working on TCC... --- .../Android_Studio/ColorCapture/app/build.gradle | 4 +-- .../views/capture/CaptureFragmentVM.java | 6 ++--- Software/DB/TCC/TCC.mdf | Bin 8388608 -> 8388608 bytes Software/DB/TCC/TCC_log.ldf | Bin 8388608 -> 8388608 bytes .../Controllers/ColorDetectionController.cs | 16 +++++++----- .../Tango.UnitTesting/SendGrid/SendGrid_TST.cs | 29 +++------------------ 6 files changed, 18 insertions(+), 37 deletions(-) (limited to 'Software') diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index 0ca125d7f..b74f3a18c 100644 --- a/Software/Android_Studio/ColorCapture/app/build.gradle +++ b/Software/Android_Studio/ColorCapture/app/build.gradle @@ -6,7 +6,7 @@ android { applicationId "com.twine.colorcapture" minSdkVersion 22 targetSdkVersion 27 - versionCode 1 + versionCode 2 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { @@ -23,7 +23,7 @@ android { buildTypes { debug { - buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://10.100.102.88:45455/api/\"" + buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://192.168.1.229:45455/api/\"" buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\"" } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java index 263aad444..1d92323ea 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java @@ -249,12 +249,12 @@ public class CaptureFragmentVM extends ViewModelBase implement { notificationProvider.showDialog(new WelcomeDialog(), (vm) -> { + SettingsManager.getInstance().setWelcomeScreenShown(true); + SettingsManager.save(); + isCardDetected.set(false); view.startCamera(); }); - - SettingsManager.getInstance().setWelcomeScreenShown(true); - SettingsManager.save(); } else { diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf index 6cd05b1c4..5ecfefac1 100644 Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf index 9a2f05be1..4ad4ff344 100644 Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ diff --git a/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs b/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs index e2560ff41..d508c2f10 100644 --- a/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs +++ b/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs @@ -196,19 +196,21 @@ namespace Tango.TCC.Service.Controllers ResultByEmailResponse response = new ResultByEmailResponse(); var client = new SendGridClient(TCCServiceConfig.SEND_GRID_API_KEY); - //var from = new EmailAddress(request.From); - //var subject = "SnapMatch Color Result"; - //var to = new EmailAddress(request.To); SendGridMessage msg = new SendGridMessage(); msg.SetFrom(request.From); msg.AddTo(request.To); msg.Subject = "SnapMatch Color Result"; + msg.SetTemplateId("d-619b8adc604d4f6fa486d7bbc9e3c2cc"); - + var dynamicTemplateData = new + { + Message = request.Message, + R = request.DetectionResponse.ProcessedColor.R, + G = request.DetectionResponse.ProcessedColor.G, + B = request.DetectionResponse.ProcessedColor.B, + }; - //var plainTextContent = request.Message; - //var htmlContent = $"
{request.Message}."; - //var msg = MailHelper.CreateSingleEmail(from, to, subject, plainTextContent, htmlContent); + msg.SetTemplateData(dynamicTemplateData); DetectionColorFile file = new DetectionColorFile(); file.RawColor = request.DetectionResponse.RawColor; diff --git a/Software/Visual_Studio/Tango.UnitTesting/SendGrid/SendGrid_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/SendGrid/SendGrid_TST.cs index 9465676ef..ca0ba1143 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/SendGrid/SendGrid_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/SendGrid/SendGrid_TST.cs @@ -50,26 +50,12 @@ namespace Tango.UnitTesting.SendGrid msg.Subject = "SnapMatch Color Result"; msg.SetTemplateId("d-619b8adc604d4f6fa486d7bbc9e3c2cc"); - Bitmap rect = new Bitmap(80, 80); - using (Graphics g = Graphics.FromImage(rect)) + var dynamicTemplateData = new { - g.Clear(Color.FromArgb(255, 0, 0)); - } - - String image64 = String.Empty; - - using (MemoryStream ms = new MemoryStream()) - { - rect.Save(ms, ImageFormat.Jpeg); - ms.Position = 0; - image64 = Convert.ToBase64String(ms.ToArray()); - } - - var dynamicTemplateData = new ExampleTemplateData - { - Name = "Roy", Message = "This is my personal note...", - ImageSource = image64, + R = 0, + G = 255, + B = 0, }; msg.SetTemplateData(dynamicTemplateData); @@ -86,12 +72,5 @@ namespace Tango.UnitTesting.SendGrid Assert.IsTrue(result.StatusCode == HttpStatusCode.Accepted); } - - public class ExampleTemplateData - { - public String Name { get; set; } - public String ImageSource { get; set; } - public String Message { get; set; } - } } } -- cgit v1.3.1