From 528bcbb004dd7dc28fbcfdab9d6df0e8d48658a6 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Fri, 8 May 2026 14:10:14 +0630 Subject: [PATCH] prod ready --- app/build.gradle | 4 ++-- .../main/java/com/utsmm/kbz/MainActivity.java | 19 ++++++------------ .../main/java/com/utsmm/kbz/MainFragment.java | 12 ++--------- .../ui/qr_pay/RefundCertificateManager.java | 3 +-- .../layout/fragment_capture_card_screen.xml | 2 +- .../baselineProfiles/0/app-uat-release.dm | Bin 1923 -> 3262 bytes .../baselineProfiles/1/app-uat-release.dm | Bin 1849 -> 3182 bytes app/uat/release/output-metadata.json | 4 ++-- .../utsmyanmar/baselib/TerminalKeyUtil.java | 14 +++---------- .../utsmyanmar/baselib/di/NetworkModule.java | 9 +++++---- .../baselib/network/KPayApiService.java | 15 +++++--------- .../utsmyanmar/baselib/repo/Repository.java | 6 +++--- .../core_utils/SystemParamsSettings.java | 10 +++------ 13 files changed, 33 insertions(+), 65 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3efa929..f57d89d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.utsmm.kbz" minSdk 24 targetSdk 33 - versionCode 32 - versionName "2.12" + versionCode 2 + versionName "2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index 7776103..ea2f59d 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -116,8 +116,8 @@ public class MainActivity extends AppCompatActivity implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); - BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); + BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); +// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); // Keep screen on getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -160,10 +160,8 @@ public class MainActivity extends AppCompatActivity implements } private void initKey(){ -// SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); - SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com/api/v1"); -// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); - SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com/api/v1"); + SystemParamsOperation.getInstance().setTmsAddress("https://api-tms.kbzbank.com/sirius"); + SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms.kbzbank.com/receipt"); PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad(); byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK(); @@ -436,16 +434,14 @@ public class MainActivity extends AppCompatActivity implements SystemParamsOperation.getInstance().setDownloadedParams(false); handleAutoSettlementIntent(getIntent()); -// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); - BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); + BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); +// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); } @Override public void onStop(){ super.onStop(); BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton(); } @Override @@ -563,9 +559,6 @@ public class MainActivity extends AppCompatActivity implements @Override public void onDestroy() { super.onDestroy(); -// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton(); // Clean up RxJava disposables compositeDisposable.clear(); // Reset screen mode diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java index 4d7d56b..3651273 100644 --- a/app/src/main/java/com/utsmm/kbz/MainFragment.java +++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java @@ -160,18 +160,10 @@ public class MainFragment extends DataBindingFragment { NexGoSDK.getInstance().cancelCheckCard(); NexGoSDK.getInstance().closeReader(); enableHomeButton(); -// enablePinPadSound(false); -// disableTaskButton(); -// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); -// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); + }); } - -// private void enablePinPadSound(boolean flag) {n -// int result = BaseApplication.getInstance().deviceEngine.getPlatform().enablePinpadBeep(flag); -// LogUtil.d(TAG, "Pin Pad Beep Result:" + result); -// } - + private void disableHomeButton() { int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableHomeButton(); LogUtil.d(TAG, "Disable Home Button Result:" + result); diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java index 136ab3f..009c5ea 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java +++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java @@ -42,8 +42,7 @@ public class RefundCertificateManager { return; }; -// String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath="; //local - String downloadBase = tmsAddress.trim() + "/file/download?filePath="; // uat and prod + String downloadBase = tmsAddress.trim() + "/file/download?filePath="; String certUrl = SystemParamsOperation.getInstance().getCertificateUrl(); String clientCertUrl = SystemParamsOperation.getInstance().getCertificateClientUrl(); diff --git a/app/src/main/res/layout/fragment_capture_card_screen.xml b/app/src/main/res/layout/fragment_capture_card_screen.xml index 72c9d20..3445f63 100644 --- a/app/src/main/res/layout/fragment_capture_card_screen.xml +++ b/app/src/main/res/layout/fragment_capture_card_screen.xml @@ -142,6 +142,7 @@ android:weightSum="3"> + CExV^d;hPmbH3-E=lq^?p8MQ;&vWlNzuz@CW#1t}e6Tc!O_I#-Y=us3J z4J2*oyCGIisOO!f--n4yOz0lVAIKfJIAE8mIxC@VOhqQ<*_Iv67vK%I4g! zAACSQq<$$t!=rly|J1SU!;nS(?CXp4#Hhkz`1!V(4F{(hk(Xch?*stnY+cg znjX3D>BXaYPdu~o^moF_Jx*QcPBO{ueYZVz@sFJIRwkby0^IXV>hc%$$2Jy@Nutv@ z-}Th{?f#PM$(1Eq{*Yrd^@qI=k2Hot?LeaJe}kX0asQ3)sfvDByI>LuehW*AJBS`XR>d#h0_9m4Es#w&8J1VLZ^&7Rr1XBH3LVlZS|{8e>~cd% z84Dfn?o9e1Y``6*712XbZtK`SK|A2|;H3TKpj^=n>#YYCbd!!qpTJjxBth?mr|%gV zjl=E<9AxlKEn7hd+LcGs)Mj50=@W8Fi!qRjtE7FF1b@9IjUsr^$`y0WK9svWA(^S} zWG&@#A#bg1gf$m^aCQs_IaR)1K?LQzfWJJlK}z}JD`i-AMoWyFhjM0K*E*pQ67+2o z@?$3gsdzU|#dN-Nl5?G?{AAM-STS?$1{&jHsYtGDC^EjD`f}HYc zOqZ6EM}AFYz5A`wHvt-td?JK<(X~CtKJ){RRx{#3k9aF z7ZWeRXye)r>F+Ebf7u**_v&NnrX0GGejTZt2#9xmt4zJoPrW9i04?6$j2U`ch%%#3 zBOobiI`G`Ftfo@o;?c31K>!mac;ROcS+CD9@+E4Ap0ZSo71)z`F{-%D|?_wGu$#i83SyjpfdT_EXM)AayLgCkoWZ^9%@5Q;o`5~*cczu$w z|0WGT^7$OvCvH1Ka{f!~uHrrZl#1h(qczJ0;^UrOvX6M7M?U{x_Kpr&t}>)R{Ji%Sg6`BsSv=Hw(E7|QmrvLCVu$fc zKC^^~ll;R1u!A0#2hGs7wj2&Kt#vics~;lXzUcDw-r*d|E**^v=M=9xI)O?bPM9HH z8WGIa@gyQM=G5F**dx89>Vr$w7*?oE0gaVAeJ)#NYTNiZmT%5X)In0C_#30NTS9eaZn`$dH#YpnOPQezT(Lm&P!0Dje@RxxOP$Ye&L)b@J5giHf z9pRbWr`sUaq3J%AL1s>3!tte}+rh@-vtfGUY~<}|ppJXz6;5z4Ojbmb{+b_kj=w#9 zp{wkwIQ`M4UKXDpg!jc{Epj**+tkD@fgaILch+tQ1A*ppYRN>!sU|%oUHsD2WCuiZ ztX2ghMJ=o?&p4i{H6fd-?LY#!kBwd&cJO)S_dqdF@98!QST z!+OBjEPl7ejJMa#;9=xhJyfytt&vUvu9Okmb@cM`U_3s99q;<5tGH(4%gauR4*koU zt{dlbh=E8)oXCHT?^)0VZtA=bIvAj z&RWwC1IV~2S2^mu$h*0Iui&8Iw^i5@O;xl#&MSPg4sZKhu)v47WP9FBOmzuHz>F_& ztfARcVWE>B#YFt{z>N*(2q_aHs#0q7#tLF4lnZ;bo@?1?fp(zeig@bmL<|!lh^mDI z;9d}Pd?^>Si8*ZqBkgf1Io~@gMjfyq`0Ym2tqliod{L^6GWN71y|y$Ovz@x3ijKmi z9ZFw!wU^v2WeX7qJ@X{Zbcs?QFqanvp#pb`)H;cWa!~wwEetW&veeaD&KJ7z_w4dx zf7H~p_r+W1##A*d?QoHaJ&A>~8h5d8&ugE>JtSG&-jIfj+fXl_?gK17Z%xjHG(NU` zfmk#Wa}7l`IAQxO6M)#~u2KI=3@iI|(F#q>(opkO`8v(jNf>|0{U7=9ONFqYX4}qANYAS1 zciyZ(a55?rMOyoJkA&Fn5<{z#CwKKcDZ7ES3q8ym_tqMSQIZ;X`K_vV8QGG-8>L%! z7t%Hrg3PL$b^)YZDQR<4uKms?z`Oz;03es;=KoXY^0DOVUY+X>EC@Cqk zMC%upgk{N6KmhQjg_Z{!R7iqW$&h>egw4=IM80#M3ol&%LOln9L-T|C$o2R7@F&ME zC_Xu9V%AC-pl8d`GSyWUm|tqxzxrRMdC&q&hN{~`A=}wtu$T?Fo;bSFpWeV*Voa8C zj3-zej9L1VtrRNi=jN3iD{YVPTdb1o2(BsWj(CZBMA%MTeN9MZ4{YG}mpApZRXTqB zw&DeY+tfBC(7i0nJCX|TKeyT&zWj?>j2V&OG~|F;3(6TCLWJxJ!-~q6Z_r<_NoLFv zv9Xy~IuJeGX$}v`^J-s{yOuF)#@8%WHJndk1*`4b233$*kB}ODkRMC@VS;gWA|^ju z*97FU!qMfowv6e?JX-+x+v>@ZYw#wZB*HUG?WR{A*LJE8AP?Zf?rK`7_PN M8uwVJ^7l^v0R!;v*Z=?k literal 1923 zcma)72~bn#7QP9fiEO1vgR%sqC5i-+u#`mtEss(}X($NfK}{%xMfLhG02ESv;u(Tw_y1n z3EW184)J1*X=h_#r;4GKmBl(!FqR0a^RnRQ;Bw3JROB&@MD{K+fgN?|CMy2zqeIbQ z!CDL6t3x@aH1yyOxRomEVAUweXD6{#xWfFvkN@SYw5idsgC%^UX{(>DJNzSbfDU=Z zCKUu8G8Sg7_Bz>>FG#pd>VF z&U~0Ti@k2P+vjxr#f$b<=TGe3l?=Bc{iNaWRmfQHu?G|L5)A%{=d`RP+3DrlI_ELh zRcrOp;fB(psN(}4L3b^3-rHUDi-yQ2m~H8M**z|;mN=M}n0(dD0Aan~Tl^0X_1`^l zE42S^PpLsz%&1{!P@SS|YWlmPJjuCQtrZlvrYeKQ?4Q4WB=ox*B^53OnvJ6rdUK#= z{LSS9&6aZOBn!p};=_ep7JY0$s_a6%6t)&swl*hCR+Wl#SK{~FY42}qLJAQqMJ=ji z=36&+n>}XT7crsY1F{R9)pz*tbJ5@uEQ1wf|7Txw zhi}gswky|i2Itx6y$AWtb4HkL`Qxu8IyU!~9<=PH zc0APYdaiVvk}+qHF8DnpZeR;p{}$@uV7c3g*1USJsRy~ zZKdWYzuExh7@0ahd<)U4nAzV)3E+Rht=+TUzYqPYb3(WlB}A{zhj2b}9p~X0jMx4R zGtz70v%T}ty(+w@yom&F_AeXILTRGot9g1MYI-pN(2w8n<&I-SwC}r7|2cDztefOS zOL0Fs2eaRQAt%yujon?xh~JqsiK@zmN4N-{VL^HWm?}#)2!cKqvL0{CX~kI z-d?$%HapcCSr;8TDabsqZ{n2Hf5`DczTyL}AdH6=EPB5(xh;1QFm;Z$=@k3lPrQx5 z$6Vs)r^}R%)tWfmGEH{Z*us`d^~=EIv#4(}wRt)Y?U#Aib>$3F;T0y@bns+wuuJq< zAD`8zT%QSK4#(W-^1qWL+}U2{7=jef7|SR5&Z_d4^z4NZhlMN4&K|EnuGXVf?{FK; zQ?zZv&8`UF*jA>C*A(+YWn1mp1t#)@Q&n-&NSN!<#ZM$bilC*nVZ(-~>aL;iFEHL( z<0M(eHQhJ?TQdJR<9y>-g#s(=5x>~keSzB-k!8qfK^8~+(w&1n!bO>Q<{y=3oK_kw z-Q^0J4AmIUPwh|{b8G45RqhFW1A-DPp0c>i;G&-JdC#`GNc9A=eb?MF1mQJv^@k-Q z*Bfp>f6Cii!AH>6$Ch|`g(;y$Dn%^wGN+;N49`Gcp{!Rq84gquGwqPw4CJ)NxvtxC ztZem+5=tGl?U7HOp~v?rkC!r4yuf1TO9A7r1)~TFQZ%(}Am@a-v^uu-%0-P!?hG}* zuC9C2Mxi`IPGZyMssB%&=mv#n;>jh;0kt))E2o3Ic9}u{U+?3or*SP9Y;kRBk*y*5 zF~Vu_dkB3VNTr(#I7;&p8-njvn0k)Va~fRP6CeoxRUNd!#lBe`5+G#&?e=n1QV)#==5P_mS^sX6{}`umA*Dt<&|`=#02!q?`l(QyBnv8;qrKb)WCvulwD5&-=X3Iq!3pKYr(&_xYK_SXlW0?Ck6Szq@5{z%Rmi zX!{{OyVJ&(6S(J_;we(8U&z1G~u!z0su28rz z$zfvR>?@zXXIU>i^gdU$`Vu>V$^*EADASZPudFJzZ#CEMnQ`Zn+k(&!jLMbG&Gm=E zwJT&K$7`W2;JeSQ99|$h_^d!$<06?W=B}dXT%ZCKf8O*)V&)7Ggmd&PwX7W`WGO(C z`zzi+k1|H_wIwfpZx_hq4Vih_{E;)rf`LxklR6%@6byX>MA~SoO?D;5L1~ZIyAzj;Z8p- zQ$3^8^(ff|v=DWY_66D??eb#bz)NyG+^KsSctGF!u4`aQF9BAupvb!7-D@Rc8gxx6 zhuSPRn2@$3G+zx?+hy^Xz2?*kB*Yaq2A9Jkkfa#yv|HWX*2_uQv9}nD!0u?J=sWme z631eVin9q=9Ejbkmfd1AQx8P978hcJ{33qTWYj2klWZkWESf{|@v@4q(#UU<-Nm=A&lwiSO(2|1`r&p7 zg@Dahz6%^F!XhHU;S*p&28F{6Oe!@o6GM5LE)TglFbZeK4XXH|)Fjomva+C7pL*(^ z%~b9Pexyi^PRGC%m)ELOqqyYjQaTf)_t$p@v7|~4t>YU2UTR?4L#O$|dmyp>kmR-T zxYSVDbF~8D-8+mvRr&{X#rJ?c`O**CTJ|RO;!4+Sq<5O6$^yh?ouKp7qb(iWs(Crn zt5Na<*pHcLV*akk4YE8SIgfj_021VDVc)#AgOaQS1{-};*@}bYYoPakct(9 zhP>ca`RsQ6V{8cBZ2(0YdMWVZThiBkG|fYNGzQcW;#WmEmz9?m$djaWV;-gdZY}(D zE$C~KZPz@_sW_l4{vuC2F>)QEd<`N{E@3F@jwIuR zJR)kee=`XL4grf4?=Jp)PFS!{F7EFY^r69sl^6Zk)slMaa3H^VUH zifH?+fp_g^4Wr2$#ETn7SG*UVoWb|lSmX4`J#h&vdA%r4b?j&qXhIQJnw8s&yNIhi z!+)XWxqI|g0cT02jdBy~!O7c!myNH?M*2%CGJcQjHIf>#p1p9f9Wy1z%E_eLcKn}e z=DW_!P|hay456VX^auw;UYJt{UTWMaqPxpw(2B<~%K*y~6+ zcQv(S&}a7u2Jv-w`6)}N%U1bLL#mV}?^ePhh%C&KP%4*=!WKDa>Kxrue+avgYmi6I zDeSM0-!1smNk6le^!jKt_0$)x`Fo|)xYAcEJ7^zYqHlIjjBZ%<(xAZhYvm(ib8*ED zWi&+%-RG2nMxaAKW2W?o0&R40nIjt4h^Rj|v86LoB@X+*knS)Y!A4X`eTnuo-4U~LVCe2GPPlKcRpCdkl&^kTzsD+x&-Eg038#Fi#+YjF2ww+ z+OOt;B<(dQSB0=XUU$?^7Qqe+LPdf29NLw)#SQP{WS_Uiear68x0nR$qf!hX+cK!r z_HRcsGh9{euHB=RJfqvJ;(HjuD35p<)n=JNp^hJ3A~}N0b4`j{8&+|V+1Y%SeYw&%EYkjD^sSW_YG1` z2O|SDP&ycboACCFzN+Ag5fifrwWO4b%&p}RZH=-#Ewt_&EJBH7wBEow4)hutgSgbk* z%ayGh96O7Akgw>8c|@R;7R)(%mna~WybCh&ZQK!YtA)?l+=^6~5k9^rHO-quwB^nt z(WmIQUW( ziuBahMV9rampuyMnoFB=!2}J{-hk~Tgv8^W9+Ei9{bsL#ChB%=H#vOXtY}K4NBR@& zm{LtRlJqv|072Z)DW(-~1uV4JRhWI*&88q^>h*)Ak0!dYwx+;$xSNBOx^F%JVj zSins*WY|SpDqdBL+rp*Uq`pB_Zo|p#@=SSHP0~<%T0k%6lK0H01SlR~4X)ZZc@Y+C zcK6SXfg7+lCS$Hu?#_&@zL^-fRh(lH{5kQzHtI0Cjh%UY%_>AfE#q&1MalCBZO7l~ zqz;Mx%M<0VSIpOFAG%EZ&P`~3uc_GO53a2HA64BXOq$BJ&n?&O@Ji zuyO!CF{X0d90p{+bZnU7c*rU34zKzD<)vJIORc!e4wNW<98&^bo5jhncp1`w`nCYB=v1`zCF(^fUT0=@+2a`#w&R z%cQ1CRTNiuCfZoO2AfX#OrdJOv<^gq_sc+_lQy9Cns2o6;tq~ltPS%`0UnU>kA3ullm#`z`X5E%B128uWuwt3lh5 z;Ud?Bt`+64`JcXrZW-HIDnUFhpm|$e`ll70o+dg$@Ld8dZ3HYWEdeyGI2u@E?-}zn@DMEl%=SzJk5Ei1%nmOa699!q0g$bQ08n5C0LM&T z@nZ|a$@V=0Iwdo!F?OyF(fmQPcqBz`5ok>t?5RsW6rOlKBjIP!EqKSl7s7}n$KGcW zZN6uLBng>sT~PLYZ&2CxkIrsgbS9j{rv7B+ZFjV397kW#YEf}VZF?7SeSSJUHeRP+ z>F0{Q#`z;Yio~TTnY4ZN&|w`}Ol4aH2eE>Fd4{3L-Siyx@aQx( z8Qdw$4x{8eUAn0xs2q>*-3_OTk3Afj^tge>rCc^;?4?si25Vf*p_trWvzZGp?a4E; zyE{LLzh4QbgP$`|tdiq~1n32*cZZ5a`iF$<)+~(gf=Hpf;#70!}}#>!0G6`==yG z2EEQA<78h@m6g~Qp;cMC zQZJB{L0|-Kc~HNruT`@Jose7UCo|<@=N6N@0}xVT9Ez*+kafI4p0UxSw>}(TN4y~A z`}4ok*Q?IS(dP8YoR~32#|jC{k4LW#s;?y5Xy1EzE>}qpdL(!nuje{0$bl%$v?-!D z^qfDHW>&m;UJhNnD1(CxH{oXXlc#*5hEzs+hOxGi~vnCCabv!AV*~QHrvr`7mK&SyMJ< zSP;O~VA0hgefR6Lh!EN7EwS9xzqhRt1~f1a$pMEGs6DyE<_c^sN1gf6FS$pweGGs4 z6BRRNzQwh%8XGnjU0LziF(Q4gi328|)=?X`MWvp?gk6T`$@h*5MDn&zuI^j+?|?sd zksqYGT{Phy`eM3%Yh&Jo>7#9p!ad_#C@+8Pk3ZO+e=YRCeWOyB`r{9>9*v8yxJzjU zUTO1nL&SL3lGDu3uoh;@a`Vz#`GcX%#O`lXqtB``INfBtI%_HGc22E^qgE=e`*Xe0 z+^&}o-LCm2Q>CptoFziX`a$IPi+?*$JbW$vGn4utqbzihN?4sBaiQ-kT3q**t@ zbxrN$FI;>_CsUR{w#}u@oc7GIE2{orIt`q*TCLomcQay`>8fX!MB1{6$5D`D0i-`+shZ&?XlUpM?$%>L=UC>iqMKb-369_81r zwTQIg>F+y3{$Eeax1EP?kpE~yz*|^~MJAIxqaIfngYcJ{4*i3s(@b~(c{L5B0Vos( zfB+N5x>4ATs!k$~QaO5A3N8+`i_;~?4gmtwVgBq-pu@68Dd-+#$EL5=|9hEET8}Y diff --git a/app/uat/release/output-metadata.json b/app/uat/release/output-metadata.json index 8b7cf73..b498057 100644 --- a/app/uat/release/output-metadata.json +++ b/app/uat/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 1, - "versionName": "1.00-uat", + "versionCode": 33, + "versionName": "2.13-uat", "outputFile": "app-uat-release.apk" } ], diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java b/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java index 942b6a1..f9feb9a 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/TerminalKeyUtil.java @@ -21,16 +21,8 @@ import com.utsmyanmar.paylibs.utils.LogUtil; public final class TerminalKeyUtil { public static final String TAG = TerminalKeyUtil.class.getSimpleName(); - - private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("B4D74774CC846CAFF6D1AAAC2EB79CFF".toUpperCase()); // KBZ UAT -// private static final byte[] main_key_usd_data = ByteUtil.hexStr2Bytes("3f4bcac6cc559ab12bbbc5a51118f3f5".toUpperCase()); // KBZ UAT -// private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("875f63741753d18811a3449090d1777b".toUpperCase()); -// private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("e121249099a677e8b7d4f6a9d49fe8d1".toUpperCase()); // MPU + private static final byte[] main_key_data = ByteUtil.hexStr2Bytes("".toUpperCase()); // KBZ PROD private static final byte[] work_key_data = new byte[16]; - - - - public static void initNexKey() { byte[] IPEKByte = ByteUtil.hexStr2Bytes("5A4CFF6DE93F0488926166F3317EFD2F"); // IPEK byte[] IPEKKCVByte = ByteUtil.hexStr2Bytes("1F0C18"); @@ -54,8 +46,8 @@ public final class TerminalKeyUtil { // int result = pinPad.dukptKeyInject(9, DukptKeyTypeEnum.IPEK,IPEKByte,16,KSNByte); // int result = pinPad.dukptKeyInject(9, DukptKeyTypeEnum.BDK,IPEKByte,16,ksn); - LogUtil.d(TAG, "save tmk key result: "+result); - LogUtil.d(TAG, "save tmk kcv: "+ByteUtil.bytes2HexStr(kcv)); +// LogUtil.d(TAG, "save tmk key result: "+result); +// LogUtil.d(TAG, "save tmk kcv: "+ByteUtil.bytes2HexStr(kcv)); // byte[] encryptedPIK = SystemParamsOperation.getInstance().getKeyPIK().get(0); // diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java index c8732f3..426b8a0 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java @@ -254,7 +254,8 @@ public class NetworkModule { } if (baseUrl.isEmpty()) { - baseUrl = "http://api-uat.kbzpay.com/payment/gateway/uat/"; +// baseUrl = "http://api-uat.kbzpay.com/payment/gateway/uat/"; //UAT + baseUrl = "https://api.kbzpay.com/payment/gateway/"; //Prod } return new Retrofit.Builder() .baseUrl(baseUrl) @@ -310,8 +311,8 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) { // char[] password = "test123".toCharArray(); -// String refundBaseUrl = "https://api.kbzpay.com:8008/payment/gateway/"; - String refundBaseUrl = "https://api-uat.kbzpay.com:18008/payment/gateway/uat/"; + String refundBaseUrl = "https://api.kbzpay.com:8008/payment/gateway/"; +// String refundBaseUrl = "https://api-uat.kbzpay.com:18008/payment/gateway/uat/"; // String IpAddress = SystemParamsOperation.getInstance().getSecHostIpAddress(); @@ -325,7 +326,7 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) { String pass = SystemParamsOperation.getInstance().getCertificatePassword(); if (TextUtils.isEmpty(pass)) { - pass = "test123"; + pass = ""; } char[] password = pass.toCharArray(); diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java b/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java index c361087..55d8cb8 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java @@ -3,15 +3,10 @@ package com.utsmyanmar.baselib.network; import com.utsmyanmar.baselib.network.model.KPayQRQueryRequest; import com.utsmyanmar.baselib.network.model.KPayQRRequest; import com.utsmyanmar.baselib.network.model.KPayQRResponse; -import com.utsmyanmar.baselib.network.model.MMQRStatusResponse; -import com.utsmyanmar.baselib.network.model.WaveQRRequest; -import com.utsmyanmar.baselib.network.model.WaveQRResponse; -import com.utsmyanmar.baselib.network.model.WaveStatusRequest; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Body; import retrofit2.http.POST; -import retrofit2.http.Url; public interface KPayApiService { @@ -23,13 +18,13 @@ public interface KPayApiService { Observable checkStatus(@Body KPayQRQueryRequest.QRQueryRequest waveStatusRequest); - //this accept "url" bez this api start with https and other are http in uat - @POST - Observable closeOrder(@Url String url, @Body KPayQRRequest.CloseOrderRequest closeOrderRequest); + //this accepts "url" bez this api start with https and other are http in uat +// @POST +// Observable closeOrder(@Url String url, @Body KPayQRRequest.CloseOrderRequest closeOrderRequest); //this 2 is for production -// @POST("closeorder") -// Observable closeOrder(@Body KPayQRRequest.CloseOrderRequest closeOrderRequest); + @POST("closeorder") + Observable closeOrder(@Body KPayQRRequest.CloseOrderRequest closeOrderRequest); } diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java index f1de488..011203c 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java @@ -86,9 +86,9 @@ public class Repository { } public Observable qrCloseOrder(KPayQRRequest.CloseOrderRequest request){ - String url = "https://api-uat.kbzpay.com/payment/gateway/uat/closeorder"; //close this in prod - return kPayApiService.closeOrder(url, request); // this is for local -// return kPayApiService.closeOrder(request); //this is for prod +// String url = "https://api-uat.kbzpay.com/payment/gateway/uat/closeorder"; //close this in prod +// return kPayApiService.closeOrder(url, request); // this is for uat + return kPayApiService.closeOrder(request); //this is for prod } public Observable qrStatusCheck(KPayQRQueryRequest.QRQueryRequest request) { diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java index 5e4fb19..a1a5e22 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java @@ -39,13 +39,9 @@ public class SystemParamsSettings implements Serializable { private boolean manualEntryPinEnable = false; private boolean checkExpSwitch = false; - -// private String tmsAddress = "https://tms.smile-mm.com"; -// private String tmsAddress = "http://128.199.170.203"; - private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1"; -// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat - private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com/api/v1"; //for on prime -// private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat + + private String tmsAddress = "https://api-tms.kbzbank.com/sirius"; + private String ereceiptAddress = "https://api-tms.kbzbank.com/receipt"; private String binValues = "";