diff --git a/uFCoderSimple/build/built-jar.properties b/uFCoderSimple/build/built-jar.properties index 21b1037ff5e96852b0889c98e0c74f99a40d5bfc..7cc549296f02e0f987820ca1ed6c39675349bc63 100644 --- a/uFCoderSimple/build/built-jar.properties +++ b/uFCoderSimple/build/built-jar.properties @@ -1,4 +1,4 @@ -#Wed, 31 Aug 2016 10:53:36 +0200 +#Fri, 23 Sep 2016 15:12:51 +0200 E\:\\RADNIFOLDER\\SVN\\sw_open\\ufr\\java\\examples\\trunk\\uFCoderSimple= diff --git a/uFCoderSimple/build/classes/uFRSimple/UFRSimple$11.class b/uFCoderSimple/build/classes/uFRSimple/UFRSimple$11.class index 720b54ea4b034219d6b1b2b128721d156e0730a5..e33e97d0bc683bdd3b859d1ff15f4c9def1f954e 100644 Binary files a/uFCoderSimple/build/classes/uFRSimple/UFRSimple$11.class and b/uFCoderSimple/build/classes/uFRSimple/UFRSimple$11.class differ diff --git a/uFCoderSimple/build/classes/uFRSimple/UFRSimple$ThreadMain.class b/uFCoderSimple/build/classes/uFRSimple/UFRSimple$ThreadMain.class index 4e5785e2229d2c988b86e3f9191cf682fc3d37b0..269a62c80bc491dc729d6d1632c8d795f29ab01a 100644 Binary files a/uFCoderSimple/build/classes/uFRSimple/UFRSimple$ThreadMain.class and b/uFCoderSimple/build/classes/uFRSimple/UFRSimple$ThreadMain.class differ diff --git a/uFCoderSimple/build/classes/uFRSimple/UFRSimple.class b/uFCoderSimple/build/classes/uFRSimple/UFRSimple.class index affebc736b1d0025e70546ef846f449e01b15202..960552cae2896d192847e42a10a953fc34293f58 100644 Binary files a/uFCoderSimple/build/classes/uFRSimple/UFRSimple.class and b/uFCoderSimple/build/classes/uFRSimple/UFRSimple.class differ diff --git a/uFCoderSimple/build/classes/uFRSimple/UfrCoder.class b/uFCoderSimple/build/classes/uFRSimple/UfrCoder.class index 5de14a9efee3d3e7cfc2bafa622e5978a6967e1a..53ba5e61abf3c9f110d0013ac42d70a6c3235b77 100644 Binary files a/uFCoderSimple/build/classes/uFRSimple/UfrCoder.class and b/uFCoderSimple/build/classes/uFRSimple/UfrCoder.class differ diff --git a/uFCoderSimple/dist/uFCoderSimple.jar b/uFCoderSimple/dist/uFCoderSimple.jar index 60150d391d2d92de41da53af144e8af55c76eb5b..4fe2545d9ac373e94a428a5a830bd30560d137c7 100644 Binary files a/uFCoderSimple/dist/uFCoderSimple.jar and b/uFCoderSimple/dist/uFCoderSimple.jar differ diff --git a/uFCoderSimple/src/uFRSimple/UFRSimple.java b/uFCoderSimple/src/uFRSimple/UFRSimple.java index f35784fc51d5381e6c0fa95aa9f61628e4a58bb4..11267477844316e31e3686e4068bec0f5beb9fff 100644 --- a/uFCoderSimple/src/uFRSimple/UFRSimple.java +++ b/uFCoderSimple/src/uFRSimple/UFRSimple.java @@ -24,7 +24,7 @@ import java.io.IOException; /** * - * @author DLogic + * @author D-Logic * @version 2.5 * */ @@ -897,21 +897,26 @@ public class UFRSimple extends javax.swing.JFrame implements KeyListener, FocusL txtReaderSerial.setText("0x" + Integer.toHexString(iReaderSerial[0]).toUpperCase()); new GLFunctions().ERRORS_CODE(iResult, stbReaderCode, stbReaderExplain); } - - if ((iResult = uFrINSTANCE.GetCardIdEx(bCardType, baCardUID, bCardUIDSize)) == DL_OK) { - for (byte bCount = 0; bCount < bCardUIDSize.getValue(); bCount++) { - sBuffer += Integer.toHexString((((char) baCardUID[bCount] & 0xFF))); - } - txtCardType.setText("0x" + (String.format("%02X",bCardType.getValue())).toUpperCase()); - //txtCardType.setText("0x" + Integer.toHexString(iCardId[0])); - txtCardSerial.setText("0x" + sBuffer.toUpperCase().toUpperCase()); - //txtCardSerial.setText("0x" + Integer.toHexString(iCardSerial[0]).toUpperCase()); - new GLFunctions().ERRORS_CODE(iResult, stbCard_Code, stbCard_Explain); - } else { - txtCardType.setText(null); - txtCardSerial.setText(null); - new GLFunctions().ERRORS_CODE(iResult, stbCard_Code, stbCard_Explain); - } + iResult = uFrINSTANCE.GetDlogicCardType(bDLCardType); + if (iResult==DL_OK) + { + iResult = uFrINSTANCE.GetCardIdEx(bCardType, baCardUID, bCardUIDSize); + if (iResult == DL_OK) { + for (byte bCount = 0; bCount < bCardUIDSize.getValue(); bCount++) { + sBuffer += Integer.toHexString((((char) baCardUID[bCount] & 0xFF))); + } + txtCardType.setText("0x" + (String.format("%02X",bDLCardType.getValue())).toUpperCase()); + //txtCardType.setText("0x" + Integer.toHexString(iCardId[0])); + txtCardSerial.setText("0x" + sBuffer.toUpperCase().toUpperCase()); + //txtCardSerial.setText("0x" + Integer.toHexString(iCardSerial[0]).toUpperCase()); + new GLFunctions().ERRORS_CODE(iResult, stbCard_Code, stbCard_Explain); + } + }else { + txtCardType.setText(null); + txtCardSerial.setText(null); + new GLFunctions().ERRORS_CODE(iResult, stbCard_Code, stbCard_Explain); + } + } boThreadStart = false; } diff --git a/uFCoderSimple/src/uFRSimple/UfrCoder.java b/uFCoderSimple/src/uFRSimple/UfrCoder.java index 783fff5b8d15d749281e0a64d4b3352abfba6293..585c9f8225931c15bb18b4ad0712e85a90b0b8e0 100644 --- a/uFCoderSimple/src/uFRSimple/UfrCoder.java +++ b/uFCoderSimple/src/uFRSimple/UfrCoder.java @@ -130,9 +130,6 @@ public class UfrCoder { } sPlatformType += "." + extension; - - System.out.println("lib: " + sPlatformType); - return sPlatformType; } @@ -182,10 +179,7 @@ public class UfrCoder { if (isApplet) { lib_path = ""; // only for applet } - lib_path += GetPlatformType(); - - System.out.println("GetLibFullPath(): " + lib_path); - + lib_path += GetPlatformType(); return lib_path; }