From e07c9bf2ccc28124261d76ecddd9250090b1bbc0 Mon Sep 17 00:00:00 2001 From: developer8 Date: Fri, 23 Sep 2016 13:17:07 +0000 Subject: [PATCH] - BUGFIX:solved bug with reading card type.Now the value reading from function 'GetDLogicCardType' git-svn-id: svn://192.168.1.162/sw_open/ufr/java/examples/trunk@150 8cd9067d-c999-334f-a84c-f700af356b08 --- uFCoderSimple/build/built-jar.properties | 2 +- .../classes/uFRSimple/UFRSimple$11.class | Bin 652 -> 652 bytes .../uFRSimple/UFRSimple$ThreadMain.class | Bin 871 -> 871 bytes .../build/classes/uFRSimple/UFRSimple.class | Bin 35648 -> 35756 bytes .../build/classes/uFRSimple/UfrCoder.class | Bin 2421 -> 2217 bytes uFCoderSimple/dist/uFCoderSimple.jar | Bin 63025 -> 62929 bytes uFCoderSimple/src/uFRSimple/UFRSimple.java | 37 ++++++++++-------- uFCoderSimple/src/uFRSimple/UfrCoder.java | 8 +--- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/uFCoderSimple/build/built-jar.properties b/uFCoderSimple/build/built-jar.properties index 21b1037..7cc5492 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 GIT binary patch delta 31 ncmeBS?P1;Ug^}^mA9bcB$e`a3PzQ<^fsqS4X_Jv~RjEP-H1(DRdxOp67;U5MU|Gff{~}&7436j-x6m zm#H9(u^9zl!RICH( zRsF3RJUPx%@eVYX=e=lAFNityEtTXzd*bvIH3l#z%~FjV=;oi*m^tYTnpmo-1HJw1 zX3S~MpoOI}9O&<7w`9)s3|cX0ZK*a63?|tJMPW2^23qP?2PXMP53K)bHhjHq3*WS3|rmffN!0;ml-n|+-Ip-4s2AjdFCAE(9F3G zJfr6E%=u(OHPcoL7%#NdB3muC)e=iBb)Z-+3sjz3&eZ*udcaXD)Pvku$>1Sdts-ly znU-2@sfTT~##WEm>QP(y9<$Y22llDQxqqFd*7MpMxIt?dIq zUgu>7uP}I(E%O?$_&T`^Tks8Ay=kkr$Vq&>_}h*Uyu@Jjj;-Fc)O(K5YO<}4@DXgb z)%%P;u+)c+sHBc^;~2~Rh^w>R zY^z@^^Jm9Q&zh$;G9W`-Ci^dByDenj zxMCqVC{U8iqar{<5E;{mB|K>fY6}A#(Ur}$gwJXrQaYK3HhDY-GH@KML{6?&pv%o5 z8!I~)j3L|zCEH<@K-h?3Y{k3C|D&-gGsA79+!DOT2Sc_gYKo z9<#)++nx^ZFEEo%%?pTFE|z(#BI*lo+o1>)LCb0JvW2#N5P4Sk7RyXmToS*#(v!BcF2R!%RKN)L!|5D_3!Ig?!MJ4>8DP0pE*buJ}Rx#}z+{pIq@XgI^f@ zSN!UV^9+8YHN*u57a3d@zYC}~(rf30JFb*cxe~>%-oWaKNm>TD(qdrC01NMT@c~@n z%0Nj2$4J`QgD$SbhXllVkxpEQg{xd#jSsuxiWCBBcwIwlct2Nfo4f`eaq&@n%*D0% zxPXX}nRjJQN-3B)V$ATAb`!>r&l}S@KX1ZVSBA>$-CAb2@;0fwyJI49>dRPH zCNUVy%Ed9&kEsSs^<}CJkFP6Z1%y|W-L-w*=sWV-GdH_4 z=pkdhOEHllA<}ha3UgY>3;~heW0fO=U3r6S>&kWvTFMNsTWm~~rm~qUuV*3gJh~>$ zpAsAGt0p5{S&4-tGy8Vdtrd@oNrR!K=bs6o-A>2`in*({J+DzTTR1K#3FcmCa0aeNH-jSft8m>&2O$3Dg z;UKzakD1`gMzXQDzeco5m1*9|8u5+S;d%kigid{i^&K&K?5J!PH(-&APvAxYZchH_ zn>+Qn+VLcJJcS#*w7BT-T=|8IPvbKdZgTNi-0b2O-0BUDYuIfYZg+79&ky4DQ!*!x zPwA95X1oBae|COW<`~*)E*87E6H8p&#p_ot8`wT?R9-&!Kj-3ZeBL`2*C;j@_qe#1 zy*8*%c4k&~eth5T{1KU>TzmnGyn68+(sOa2h5KE65f8d}2oDPgHWEi=l6Uvb&C92h z^sy;fKC8y(4vS`kfi@pl(5;6+~Y65HXji&yZ3tAS^Ip(!5(^~jzW-##-x zEB>bJ$px;KTG44ncxP+1p{ty>aYbt{IdN2c03S<02eNYBaF;Iijjpz7uR4$^M_2Mn z5~nB^&w5R2_lOR1b!8pw>JS|&06R_^G2Ycxct_Q|cWPDjrKQp?br^%Ht`67LTpgh! zEgeN$(b2B1u44oQk_-AB&C;>1u0g)0<0zZzcshMuQzy8(mQHkaZCytIxVkQDyI0q9 zb$uR{q#L+8SvPd`b@-Tourg^WH+vt~vc2YYnqHSe*-xkHG*>s0ndIGrG8^W!ZP;l@ zYQq+{xw^4VcXbop)Y8pd-CVcuR@X_6%W!o|o^?G-Zlznhx(%;(1B14@op-KIs%o#( zyy&`h+IP?$*}y&f#kcR-qesW~{W^AVbtm0ffJ~ia=^I_$MR#@eO)Re)YtdbIc6ATk z)78CnZ&&xxeZA>*V`}$fHEwowe?7p`x43#BWqEz8s|S(&m17XdbnrT>#Nr4T<`XJ)9ev?q^s}Lqr5Zq4n(xl zqg_2l=TW@rv8=#2o{;bDu3s;_K+_>k(093dqRzAQBv((?Q@r!_+t|5$G*k67uT4_Z zltNce*JjXkC|7yV@*E&vx}3 zJ=fCnTs>beaP>mH$UBv^IAF1>m*^qe#y1EKaF>!Sb0-N%@Om|?xovaWhXR)gNb*vf zCT-i%_>vPI+BtiC2XfI7!`P|&O&*&qAko|3IziU&vTbwgngPD|K#C*ceHa1J;;1+V zLVQHu#8Mom_Qw_4C#Ze0Li-f8PgiJj|0jQHpQ+IPl=?rb&^}A;&&4rc*@EYY@rC%Z zti7GuUsY(YrS{hq+S%0prb0W1+TT`a4~IzcU4`~;+7wkDW^+`082qE~{bUHLK@6rc z#9*pK45nhlV5&z9rjo>9s!9x|TF783PzVDT72M_$h1*=E7)(`)!BnUiOtp%^fj;_J z;0bgg8%+1F!F0_TO!t<-bn6>T)rY}UD;P|bg28mF8%&qD!E})tO!uR~bo&}iH=@B* zp&0C=+Q1N09vDn_zrl2I8%$TZ!E~t_OxLWzRLK}j_r1YX0U1n1kik^=7)(Wm!Bp26 zOt-edRKYOzNxEnagDzf!>1H;V$`^yFv@n>e9fPU7F_%!Bor`Om&aJR9YHLMW?}3x*1I6 z58*_TG*o7Skau`%Zj5L!jCc-6f}KD^XPHHm3+$c&GF#>lmYf#N_|tzF-<8JSbdB+X z%Xc$Aq075snDI(sR1s(=r$x#eON7JfQma~*? z^SkCpiDBC=4;vonV>x4?55$1Vx+DvT z!k`(IPRsE`>B>(z#c~2s0l}LCx5&GQvO-SU_sWSx+2QZ21#%Kmfst8oNlqrpAuZ^> zFgyBe^dj0(!I<_&lfe)OVUQ)Kk%cW#FkTi?=CDb}!cyBYHJ#I$;rWPSOBc$!iQ-c! zlrxAzL)}AJNE_;2a*Y6E7dn|sG*J8o1+@N5c^_**38c5zB<~Puav`s0UA9TQk+!*P z)y-t(S+uHzO>#CR9Vzeh#*Gd0&7rw+?o}~hLWrh|Ed-=wUkG4bRX204d}2Jo?*~lz zr3yLk{}<8g8Y22vlrdi}@bBh-tI_WoGW;SIlA1y;@{8~WjvGYA*fFkdnWF)8EmONI zsZHaJK@nt3GHsPUQT>ancyn|hn|KlVi^W>6D1Spn!Y*;2gdGr^v>k#Uf|rsA*QdXD z`irH%n!Cg-Ebo6^wTfYGv6$_RDrg-(2lt4%0~N6nh*cuy^(_(ey%!25T5REEbhWk` zKfpIrv{CnoPHMIoqUMMkHCGgc3uK!7R{3(NhYGJBZX1cB;V2vVCX98BdhLsypf%LiBvf6B95 zZ{&m;zC}qPw}jLVi3^Dh6FDS(V6iZ)U_Wa(vF>0N;hbWzIK(LtOLjmA>#-dmWNeG>Ze~Y$Rgg1snzR3W>kO)r&YzgmY5hOR)>j)u|zyl z1nqdNzB;zcHO4*~CLSY~ex%HfMbI!K&@X50U;9Ec93JT%nRK0xqjn9{B?})V3sZ(y z$H~GUlZ8)^g-?=&PmzUBlZDSfqWYA4@-wKf&O$?V4w|Yjpr!f}ZcyKl<-diI>N}XB zet6Jtq8%|i zp%yn0uLsfnh#riVIldflL^@QKYvdzzHPMk=4Nao_p_wRJ$VW}es3V%m$B0r;U!=>m zL?JX3sq%56G&B`;3@K>;sV^?`X)=x8AL7-(TLqMB{r*q5L47(FbN5%ARw$vKv~3N=nFfaJ66;LJ5>1yyQ})EGUK>|+eVL0k=8mf_8rNjQUwtmQ$KSXk z8h5m(`Q7m@psEn7f`#E=V*~_YB!prVL}E0=V0Ea8F_3^Y=xsS3T47D-i3!jjYr!3u z2$Qfj%*DEJKh}e%us-a<6xf5QZ~)Wb5GKP**bt5o?OpMaS zVsnYuVp380c}ICYr&o#Fyi@#-aaWH&s#&RyMv)?DoMD$8{Z`IWf9$TB5qNb^Z%^-G z^3fS+P7ctN9H1FFKnrq!403>$;x^bGql4l z&bYv+AmQ1Fpe~FOGUO=NzOKcavGJ^;$`V8tw)Kxn$*^n zCAGD3i`;6G+9PrsQ3#F119H3EL4n;;ER@A^CndFZVwNo7oM!wp6)JHi>kW2UCbQ%& zOFm~3Sz2XIWpgh;ryk_Hw_7rOHGQt|uNtM!`xEKK7vSG#jkoTO^cj!M2ndxwJa1=M zenbZk_Y{k5#Uj606s&|qzawlf_gm`SA!Ip&`xREPoUo$#j#vv`7+Gox~^ z3IRdPYmFn1Z>njLKg9+I1h328Sf+HbcW_3{#yi6?Tt@|PZA|H~#45kUn-OacU)Cgpdz(Bl*LgZcwkM%GXH&A#K z!DO5XQ*ajj9y=Qz#5wQ?^*u&?>#6TaoJ%=%z7KZe0(b=%QkblVcd7FO>O78%;A30@ zU*J->Ku>TME*D|=fQZEvbfvEp-SHv1%2$b8TrFnc8nFZ)5v%c0v6Wttx8nv;f< zfP%?i6{My{b2QCP?M|_D8{GrJ6iW0Hpg)u#pW>Bol<*R9to#q-5tPZ41E zE#`AH1i}RWdmP3ul$O6$Xd2)%5Q1AE3^zg5PPnzgr5|2)KZVnl_t9E>D_J1>T5>-? zpgbU7^eZ5ak|cg}J1Dx9h<#p*`x1ToyA^>ICJqqe#qP;_`R)nF*tJk6IUE~h=mvZh z94r=xC`mE-Qi(WR1c5VA6kYkK2>Nvo6IsRLl@jslR`HrhE*7sBL7Qtaldi=K@9z7{ z{N3Vhy7}HI5$|pxZ5u&0MZ^$Jm*pHIoMZB% zQb#5^-n!YL|40Y=WF{Ss%a6IVUFvNJv6RNJxOtLJ7SD=|$;PkRlLF2qh#K0)%>{NJq*66qG6u zKoKw)LX#pWRbd?N$>5l`? z0zd=3#1Sd-%RmBOIm?2Z1iT@Cp~kXq4SbeT4n&!zLgFcHsQ?Gc`#BbKYzBdja#Rpg zF3D0Q992@4vQ)66LR4vHhgvGkQsEBNkiXcf3}F?)psXX-sz^&kIZ)Rxw49})9cW-0 zVJe0vm$y``15Nz>abCEnR>D%%9cb(4BzT=f`F@tF>p&MjrykF$&!B;&8amL^&u+w= z#tfQRs;L8g{p=*>G-GfFgXWfM;lLn&UrXm3o*Pk1$wmt2Jb8HOo?u zTIw-dt+mxUTdlX%23u`(d~j54;{L}iwVBu6!VOw`s{^m7TyAW$)plF$u+Vjj)THfk9pM98+Ysp6Z0HPBLD^fHZxc*Li`# zDF!dHWnSVHUnZAf3%+8jS8eqgIf+_isnb432wq~4I%BKXE%k;Yw92v7n|uVjZ1oo7 zw=H$n5kcx5Zk%Je@AB^6W9mGw@IJ3_!B!V}kq<0&$r0f!I)ywm};vpZS|F{zP8nW$UhZvr>Jji^(|xC=M?oFgYOyqz<}(Wqkgp2 zPnPIXTZ-ptdm}LtGIGzeHg<3!`m} zv9Y|3lu)8D&VgfCfd^Hzu@d8W=2UjD3RbnTnuXOJOkfGeum*#g4jjN*Jhe81M9LRf z$7f^RAgGGuT?zQG8^suQXL&uyhiS94dQWcl z;#s|I>|^8I7WSoNi~Vf8$Hx9P4&YG(dDI{q@3nETg+m;%mGUzVwK3VoVZ7PBIGi@B}i2Zm!x3er9XJNL3 z<8gwG6K%|Ka1u^-sm3h-FobI5H*!Td>2*jBcWbK4{?_3+Gxm&k?7| z(&)~|1r{!}aFK%};+!4|G|aScA|ia#U>DDQO-Deqk=*E;wyTPTr2KPtm*ipGT}?*2vO0r-tZsRx zdNY;4R4=Alu!JfyT0rh>=q+>G zjL*)_%y4BX8RW{^JgA9m>Q#-2DbZ54a%F1r^U7Zc?R zmt|b(@cbIgzL!TW6&vyRyF=;K~xLPIs1Di>F7) zNLLQ#j>_D;hvmjI)sLwdrg}0}QU-a;%16f5mkk7j++xA5sTt#4Sy$Ghm6s=l-{Z2D+=aUZRP#QJtr*-Tc~a*1Y!~<7 z(=O)Gq&2b8)zWaUi_c)bi~D%llB`)`^2F@KwwdXfStJn)T-=Wbyo<5*V$$%Si-*{y zOY}-jPD#y*>z$f4GCAGF!??w(71u5}4WG5}h>OSYxQox>NpD76Sn%^MzJRA(d=X!9 z@l|}q+Y&c9C=Fk8@id;{xcRPjnAf6$8~ZxGA)wSv6~VGJfIoQwmFlSf;?G{w zN}YQA!jnxz8=JKoIVLq@+(?d@H2l@YEBG5Lag|N+yNlQGyo-OZoXdEfY}hSzVqDwg ztdzLUsguUJ8nobZ^uDar(w4ljYg&1AR>wT^_9!{4(SluwJz=IP#xy#a9zgI5wt5^ z*42?ZNnWQQNlP?7>y3>bkm~tLy6qmTu_kM!K=Lu}aO@Ca!MEvyxbPGku4voAZh-7_`)_ysxX&QLS~N7hAPT zi#EC~Teo|kxVGK9b!*?YPy2SRZl~J|kacn_-NDs&>bqRsk>zz_EjsJ=uI{3{y1JY0 z?#-(jU9AUe(9_kubZ<-darNDl{dHeg_anQ@NpiBQ@6r9)bz4^q^Db3&s|?TsT{(ob zk;7S~K`i!OJ=oPlG&Pg;FuD-*eO~Emz10St;*F>_)lSvJU7e;!cwbjL9??vXboD4b znmk9RvmRr3LWXy;dbRLOJ=WFt>nvA~)1xg-2RdF)@MJB}S5MbIS3khpoe>21OV4rjTs_a# z^YsD&ab9BCIM1z-9tW! zgTEKP9}GdYhrv{S7)%w2!Bm78Om&FCREii()ri4V0~t((31Q%Jg4>dc6GKpaVldSw z22+V*FjXlA+ddgcgyfsnV7gchrW?&*x}prGo7`ZkL=2{qz+fr}45sVaV7i?RraRMM zx(W@ZYt>-7{0yc_#9$v?`i7u;-(b4b4W=8}V7j9Xru)-ix={_Lip5~M$PK1S$6zXU z45k9dV5%Mrrt-yLx}XiFs)VtR?^VN~yVhX3j18u`#9*o!45kXkV5(aTrjo^ADoPBd zO3YxYrwpb_$6zXU45sqLV5(INrb>mdPjasy&0L{xg^=Ct9D*p6VXMpi0PKs!|N5y2W5BaSWys z(qJk#4W^pRV5)Qo$CD&VV<2QQwHg2ywg3SM_zcKBX527>4)FmxfQCEeeMI$l{ljF6 zOf`cj3I0Wdx{ZiVB%-qsajOKuwLMGl(mK8&hIvVy1~%h`%Fx2===E%b9BEeE?_W`l zqP}2|*I_LPOO9rc9z|QBs-30eo#~VnDTd{>O-T#%v7E6$fe@MOpRH$wUX&R!6NFtc zq@^57lyu6K>LBkYN(H5qxF)lR!V)urF3E93>5@-4`7)cRfKs~y_sH=?S-}_WS#knV zcKF+Bk(@|WVA&M7CUb~#NDI0)%#NyOJVZMx$Y^Uc83ch43Mq059fJi5vgK4tFE;5o ztkc3mw)q8c4Zi9IZb~&SotD zL{D#W=1J0|)!6PvlQ<)7chRc5$;uDXsuG@(b7;0S(n28ccZe5d%7m2-3vXk|xg<%> zyCD=B(&DV1xalkbthwr9PMOb-C;0t@DYFLUZ#n<}m(k;&WRQpjav?$5+uy6v=e8n3 zSdT@dr;v;NGQ4&74CO73#|+bYYSG>C47%f0Sk9Qoh{GKFaaQcC_TOmRF%&$*a)gcPKA@gL+qC zOl8_0eWRQ0^&>kNuK*}Xn#S)J3k9eGvFPTBmt;>;+aXZxfD-D7VkR$HWWkbhgdR8*&+xq10)dX3&!Ps0$RQ-~g|&JF7BoNS!oNCEOgXrMs zamH^S>3uvg(k;Ff&(29``tWM7gNNpV4o+Uy{Ggc9f1j92JL(@QQV9*t7mp-ax3Kxd zneC0vi7c}^khe@63Y7MQs#}We;KfZXR~3>Y15ALd$rtw~>=hG3#iOC(F)R@4a-j{6 z)i=g=yv^A4p<)9$?7AYG=R&QdK);-gf9(rNa*Ul@O{#6|ybh|8o!=xozeRRFOLl&T z?0k;w{4Uw~J+kw8vhxLqR~O0SK7i`#64X*3K_m4sG*h2IEA<)K|8p3nzJM9(D_Ez# zgDvWN*rR@c7u1h%R{aE@sh{CT^@|8pztTJP6;VZ97YPVHk%&UnQ@@J_>Y8Xn%nk^m zGx53+-G}HwD9s@b2S+r3l5(wFM;8o;dv6>kQU1V-7ft1QlMt$i#&QEu3aX0+awAa) zwL~4ci6{+?L{<4X6`BFiOmwR#H&ZQYK`Rj>w-99;uc!rqcI0)a34wI?T5_wP|16nn z$!+uxptZOPD_eA?yJ8@DP6_fHdeJixaA0ywuT8hQK#hE{>1OnrOoAFpV*tdXRm?vt z-`EgTrVTw|0+yZ(jo9i_Vp56;G1Uq>BqXSqfY2fVp+y4d;nDBW;zP0lU!>oXH$|=n z+`|=6B>BNDUcO^WZ2Ti#O~lrufx-L5<0epvCa-P8o_ND+W5YHVxoCavxZ$F)4Y&N& z=W2HQ2X{o{j@eWF?l=Kr0I(ET7z{R+h7uSGAs7Z_F&v_?3{=1fsECpDd|VEiV>EQf z80d@TVHn0j4#vTJtOzTy50k-x)m@{2@vhyjHTLC?PC>T&R|b?4|~Cn*c*Ps zKB5HPEuyinsD}OMXP*9|9}W=1aiGY;L1G>zi-kB$EW!K43QQ3X<6yBGhlpI_?;!qD z#LpvsKD7^0`v|pPz*G~TR1%BTC=Rh*LwLh zQ3&++{LW9SGu#)f4QZjAh9JOYS!bt8Ph7S@W+# zhi>GfgDvTMls+!_2MT|7pd@Yc2ZZ>??BMsf!tB=7c(7`u3!OMAAVhw5$WF5Sh0`R>X}Ey)3`zG#f_o>H;Kda415&VisQIWkZeJ+ z1<4lYiGPvWA5r@<`ZkGgaI=Xct^tl0#u3*5Mah{ce;6f*lO{YQ)D+K|fKresj+%ht zFgk1kioD%b?QWMRL!l^ zm162%%KN1#r07>Ye@HkQV7@q%3)pp!`D_e^P;r=sFn$)4 zFO?bH!_g78(wbWTAYJSU^|9VX6a;LJd3)web}B{A+L*o`ybn zhJMh09fnXl72k&uNKd)wdz+m7eVB%4VLHA8ONd^M=fJ~vVKdRW_#SM-^K?I4fambC zvHD$P+q)n_J|~~2>^l-dr~rL|4sW`lP7&o9>P4cq8R{i-v?t`t@)a_^gyZtn8(*Y8 zs0J=QHqa-j3{Zb?b@`eQ6@LXy?+&N?Sn>@0y-t5`gaq62P5D-#DD z#LZ&TJVZcjG4}|NZ<_}z8Y|E8S0BlFr$~Aq1+n9kocHC0+sO(1J2^gM#9K^6bv6mQc>A5%e<$d#a{L?n;Pwhxg>rm+hE&+Y zKb)Cgp-Z<{DB#~J^x-XX{QGAo(*IV_N4E$naz^}Da(ra!k8dxC9x^CcOa}b_EaW%! zC-T$6vri<8vQ7C$mrveSjQ=fG2m6nnw74uk diff --git a/uFCoderSimple/build/classes/uFRSimple/UfrCoder.class b/uFCoderSimple/build/classes/uFRSimple/UfrCoder.class index 5de14a9efee3d3e7cfc2bafa622e5978a6967e1a..53ba5e61abf3c9f110d0013ac42d70a6c3235b77 100644 GIT binary patch delta 847 zcmYk4NlX+`5Qe{=t=}}QnHi9Aa1h0X5d;NB7;(c5QOA8nQA8F+1aS}qjp1axcu+gh zs4;GdL=Ogo0?`B`i5D;4G*M$>VvHA$-i%t)5Fp+C>VNhA`cv<({vCMi?|Jw4r(_0i`ca8I=c;g$yy(K6nm3#pOUPnPEqeyG#El{)H$YeT&L;ky;<6c`)@R@*&5MWQu0`+ zbJC=RR;$br$vH)vhO;)&VshGsZEbZX2^)6BN=(|5Flb$H1!E>>=n!^INz|m1Vv_~r z>NK02rBy@Am#;uWb+k7m3hJ8@I$b8+oU?v8E;)-R?!W9T(yTOhtUg=30S#M0kV~+1 zCTqUz7D?13x^oB7o(XVJAgjktdgT}?viNG`t1pq2A~wsNl_uQRJvKtim`4QMaUsVUjm^aGU7uxtQUH8`iubr1Ej@!>3)T;Y7l>( zWCCGJQ(-OBnyErrGsh{x$&{?IwB=W6JsCIg1YGe+=R?dMBjiooyh3gOSH!?;M7SYN z-xAwyQ^_5wxl0WXXyBoY>JdHka-ApgJY|@EMtII!2KdCF?OXcjby&$N(GkfHl-tH7 zt?}XgLqtq*gwsRe)Km|O)uUsz3cbPni7CcKW{p%hSj&8g0YP)+zn$mtk|Qxv9{LZ2 C42GZp delta 1122 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 O_9f~Z=aY4vN&g3+779)P diff --git a/uFCoderSimple/src/uFRSimple/UFRSimple.java b/uFCoderSimple/src/uFRSimple/UFRSimple.java index f35784f..1126747 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 783fff5..585c9f8 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; } -- GitLab