feat: global url

codize-app · Nov 13, 2021 · 50404ca · 50404ca
1 parent 8552b82
commit 50404ca
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 48 deletions.
diff --git a/Capture.java b/Capture.java
@@ -47,6 +47,8 @@ public class Capture
 	private Reader        m_reader;
 	private ImagePanel    m_image;
 	private boolean       m_bStreaming;
+
+	private String odooUrl;
 
 	private Capture(Reader reader, boolean bStreaming){
 		m_reader = reader;
@@ -74,7 +76,7 @@ private Capture(Reader reader, boolean bStreaming){
 		add(btnBack);
 		add(Box.createVerticalStrut(vgap));
 
-		System.out.println(OdooDigitalPersona.fids); 
+		odooUrl = OdooDigitalPersona.odooUrl;
 	}
 
 	private void StartCaptureThread(){
@@ -115,7 +117,7 @@ else if(e.getActionCommand().equals(CaptureThread.ACT_CAPTURE)){
 						System.out.println(s);
 
 						try{
-							URL url = new URL("http://localhost:8069/dp/api/save_fingerprint");
+							URL url = new URL(odooUrl + "/dp/api/save_fingerprint");
 							String urlParameters = "{\"params\":{\"binary\":\"" + s + "\", \"badge\":\"" + textField.getText() + "\"}}";
 							byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
 							int postDataLength = postData.length;

diff --git a/OdooDigitalPersona.java b/OdooDigitalPersona.java
@@ -3,6 +3,7 @@
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.BorderLayout;
 import java.net.HttpURLConnection;
 import java.net.ProtocolException;
 import java.net.MalformedURLException;
@@ -39,13 +40,15 @@ public class OdooDigitalPersona
 	private Reader           m_reader;
 
 	public static String[] fids;
+	public static String odooUrl;
 
 	private OdooDigitalPersona(){
 
 		//Odoo POST
         System.out.println("Odoo Post");
+		odooUrl = "http://localhost:8069";
 		try{
-			URL url = new URL ("http://localhost:8069/dp/api/get_connection");
+			URL url = new URL (odooUrl + "/dp/api/get_connection");
 			String urlParameters = "{}";
 			byte[] postData = urlParameters.getBytes( StandardCharsets.UTF_8 );
 			int postDataLength = postData.length;
@@ -75,7 +78,7 @@ private OdooDigitalPersona(){
 		}
 		// End Odoo POST
 
-		final int vgap = 5;
+		final int vgap = 8;
 		final int width = 300;
 
 		BoxLayout layout = new BoxLayout(this, BoxLayout.PAGE_AXIS);
@@ -145,6 +148,10 @@ private OdooDigitalPersona(){
 		add(btnExit);
 		add(Box.createVerticalStrut(vgap));
 
+		JLabel copy = new JLabel("powered by Exemax-Codize", SwingConstants.CENTER);
+		add(copy);
+		add(Box.createVerticalStrut(vgap));
+
 		setOpaque(true);
 	}
 

diff --git a/Selection.java b/Selection.java
@@ -36,7 +36,7 @@ private Selection(ReaderCollection collection){
 		setLayout(layout);
 
 		add(Box.createVerticalStrut(vgap));
-		JLabel lblReader = new JLabel("Available readers:");
+		JLabel lblReader = new JLabel("Lectores DP Disponibles:");
 		add(lblReader);
 		add(Box.createVerticalStrut(vgap));
 
@@ -46,19 +46,22 @@ private Selection(ReaderCollection collection){
 		add(paneReaders);
 		add(Box.createVerticalStrut(vgap));
 
-		JButton btnRefresh = new JButton("Refresh list");
+		JButton btnRefresh = new JButton("Recargar lista");
+		btnRefresh.setContentAreaFilled(false);
 		btnRefresh.setActionCommand(ACT_REFRESH);
 		btnRefresh.addActionListener(this);
 		add(btnRefresh);
 		add(Box.createVerticalStrut(vgap));
 
-		JButton btnGetCaps = new JButton("Get reader capabilities");
+		JButton btnGetCaps = new JButton("Ver datos del lector");
+		btnGetCaps.setContentAreaFilled(false);
 		btnGetCaps.setActionCommand(ACT_GETCAPS);
 		btnGetCaps.addActionListener(this);
 		add(btnGetCaps);
 		add(Box.createVerticalStrut(vgap));
 
-		JButton btnBack = new JButton("Back");
+		JButton btnBack = new JButton("Volver");
+		btnBack.setContentAreaFilled(false);
 		btnBack.setActionCommand(ACT_BACK);
 		btnBack.addActionListener(this);
 		add(btnBack);

diff --git a/Verification.java b/Verification.java
@@ -47,6 +47,7 @@ public class Verification
 	private final String m_strPrompt2 = "    put the same or any other finger on the reader\n\n";
 
 	private String[] fids;
+	private String odooUrl;
 
 	private Verification(Reader reader){
 		m_reader = reader;
@@ -68,7 +69,8 @@ private Verification(Reader reader){
 
 		add(Box.createVerticalStrut(vgap));
 
-		JButton btnBack = new JButton("Back");
+		JButton btnBack = new JButton("Volver");
+		btnBack.setContentAreaFilled(false);
 		btnBack.setActionCommand(ACT_BACK);
 		btnBack.addActionListener(this);
 		add(btnBack);
@@ -77,6 +79,7 @@ private Verification(Reader reader){
 		setOpaque(true);
 
 		fids = OdooDigitalPersona.fids;
+		odooUrl = OdooDigitalPersona.odooUrl;
 	}
 
 	public void actionPerformed(ActionEvent e){
@@ -139,7 +142,7 @@ private boolean ProcessCaptureResult(CaptureThread.CaptureEvent evt){
 								m_text.append("Concidencia con: " + as[1] + "\n");
 
 								try{
-									URL url = new URL ("http://localhost:8069/dp/api/hr_check");
+									URL url = new URL (odooUrl + "/dp/api/hr_check");
 									String urlParameters = "{\"params\":{\"badge\":\"" + as[1] + "\"}}";
 									byte[] postData = urlParameters.getBytes( StandardCharsets.UTF_8 );
 									int postDataLength = postData.length;
@@ -172,44 +175,6 @@ private boolean ProcessCaptureResult(CaptureThread.CaptureEvent evt){
 					}
 					catch(UareUException e){ MessageBox.DpError("Engine.CreateFmd()", e); }
 				}
-
-				/*try{
-					Fmd fmd = engine.CreateFmd(evt.capture_result.image, Fmd.Format.ANSI_378_2004);
-					if(null == m_fmds[0]) m_fmds[0] = fmd;
-					else if(null == m_fmds[1]) m_fmds[1] = fmd;
-				}
-				catch(UareUException e){ MessageBox.DpError("Engine.CreateFmd()", e); }*/
-
-				/*if(null != m_fmds[0] &&  null != m_fmds[1]){
-					//perform comparison
-					try{
-						int falsematch_rate = engine.Compare(m_fmds[0], 0, m_fmds[1], 0);
-							
-						int target_falsematch_rate = Engine.PROBABILITY_ONE / 100000; //target rate is 0.00001
-						if(falsematch_rate < target_falsematch_rate){
-							m_text.append("Fingerprints matched.\n");
-							String str = String.format("dissimilarity score: 0x%x.\n", falsematch_rate);
-							m_text.append(str);
-							str = String.format("false match rate: %e.\n\n\n", (double)(falsematch_rate / Engine.PROBABILITY_ONE));
-							m_text.append(str);
-						}
-						else{
-							m_text.append("Fingerprints did not match.\n\n\n");
-						}
-					}
-					catch(UareUException e){ MessageBox.DpError("Engine.CreateFmd()", e); }
-						
-					//discard FMDs
-					m_fmds[0] = null;
-					m_fmds[1] = null;
-
-					//the new loop starts
-					m_text.append(m_strPrompt1);
-				}
-				else{
-					//the loop continues
-					m_text.append(m_strPrompt2);
-				}*/
 			}
 			else if(Reader.CaptureQuality.CANCELED == evt.capture_result.quality){
 				//capture or streaming was canceled, just quit