Merge remote-tracking branch 'origin/ecr' into ecr

.idea/gradle.xml

@@ -13,7 +13,6 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/baselib" />
             <option value="$PROJECT_DIR$/ecr" />
-            <option value="$PROJECT_DIR$/ecr-service" />
             <option value="$PROJECT_DIR$/ecr-service-lib" />
             <option value="$PROJECT_DIR$/link-service-lib" />
             <option value="$PROJECT_DIR$/mpulib" />

app/build.gradle

@@ -204,7 +204,7 @@ dependencies {
 
     // ECR Dependencies - Modern ECR Client Library
 //    implementation project(path: ':ecr-client-lib')
-    implementation project(path: ':ecr-service-lib')
+//    implementation project(path: ':ecr-service-lib')
     
     // Core Libraries
     implementation project(path: ':paylibs')

app/src/main/java/com/utsmm/kbz/MainFragment.java

@@ -22,9 +22,11 @@ import com.denzcoskun.imageslider.constants.ScaleTypes;
 import com.denzcoskun.imageslider.models.SlideModel;
 import com.nexgo.oaf.apiv3.emv.AidEntity;
 import com.nexgo.oaf.apiv3.emv.CapkEntity;
-import com.pos.connection.bridge.binder.ECRConstant;
+//import com.pos.connection.bridge.binder.ECRConstant;
 
 import com.utsmm.kbz.util.MockData;
+//import com.utsmm.kbz.util.ecr.ModernECRFactory;
+//import com.utsmm.kbz.util.ecr.ModernECRManager;
 import com.utsmyanmar.baselib.BaseApplication;
 import com.utsmyanmar.baselib.emv.EmvParamOperation;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
@@ -301,8 +303,8 @@ public class MainFragment extends DataBindingFragment {
         if (checkECRServiceAppExistOrNot()) {
             // Initialize Modern ECR Manager
 //            modernECRManager.init();
-//
-//            // Observe navigation requests
+////
+////            // Observe navigation requests
 //            modernECRManager.getNavigationRequest().observe(getViewLifecycleOwner(), destinationId -> {
 //                if (destinationId != null) {
 //                    delayFunctionCall(() -> isRouteValidAndNavigateToRoute(destinationId));

baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java

@@ -276,7 +276,7 @@ public abstract class  EmvBaseViewModel extends BaseViewModel {
 
     private void initData() {
         try {
-            emvHandler = BaseApplication.getInstance().deviceEngine.getEmvHandler2("app2");
+                emvHandler = BaseApplication.getInstance().deviceEngine.getEmvHandler2("app2");
             if (emvHandler == null) {
                 LogUtil.e(TAG, "Failed to initialize EMV handler - emvHandler is null");
                 // Post error status to inform UI

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/KernelDataProcessUtil.java

@@ -2,7 +2,10 @@ package com.utsmyanmar.paylibs.utils.core_utils;
 
 import android.text.TextUtils;
 
+import com.nexgo.oaf.apiv3.emv.EmvDataSourceEnum;
+import com.nexgo.oaf.apiv3.emv.EmvHandler2;
 import com.utsmyanmar.paylibs.Constant;
+import com.utsmyanmar.paylibs.PayLibNex;
 import com.utsmyanmar.paylibs.model.BaseCardInfo;
 import com.utsmyanmar.paylibs.model.CardInfo;
 import com.utsmyanmar.paylibs.model.ICCardInfo;
@@ -670,43 +673,42 @@ public class KernelDataProcessUtil {
             }
 
             LogUtil.d(TAG,"9F6E data :"+hexStr);
-//            byte[] dataOut = new byte[1024];
-//
-//            try {
-//                int len = PayLibsUtils.getInstance().emvOptV2.getTlvList(AidlConstantsV2.EMV.TLVOpCode.OP_PAYWAVE, tagList, dataOut);
-//                if (len > 0) {
-//                    byte[] dataOutBytes = Arrays.copyOf(dataOut, len);
-//                    hexStr = ByteUtil.bytes2HexStr(dataOutBytes);
-//                    LogUtil.d(TAG, "get 9F6E Data :" + hexStr);
-//                    Map<String, TLV> map = TLVUtil.buildTLVMap(hexStr);
-//                    LogUtil.d(TAG, "get 9F6E Data :" + map);
-//
-//                } else {
-//                    LogUtil.e(TAG, "Get the data length of payWave is negative = " + len);
-//                }
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//
+            byte[] dataOut = new byte[1024];
+            EmvHandler2 emvHandler = PayLibNex.getInstance().deviceEngine.getEmvHandler2("app2");
+            try {
+
+                byte[] dateValue = emvHandler.getTlv(ByteUtil.hexStr2Bytes("9F6E"), EmvDataSourceEnum.FROM_CARD);
+                if (dateValue != null) {
+
+                    hexStr = ByteUtil.bytes2HexStr(dateValue);
+                    LogUtil.d(TAG, "get 9F6E Data :" + hexStr);
+
+
+                } else {
+                    LogUtil.e(TAG, "Get the data length of payWave is null = " );
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
 //            if (hexStr.equals("9F6E00")) {
 //                try {
-//                    int len = PayLibsUtils.getInstance().emvOptV2.getTlvList(AidlConstantsV2.EMV.TLVOpCode.OP_PAYPASS, tagList, dataOut);
-//                    if (len > 0) {
-//                        byte[] dataOutBytes = Arrays.copyOf(dataOut, len);
-//                        hexStr = ByteUtil.bytes2HexStr(dataOutBytes);
+//                    byte[] dateValue = emvHandler.getTlv(ByteUtil.hexStr2Bytes("9F6E"), EmvDataSourceEnum.FROM_CARD);
+//                    if (dateValue != null) {
+//                        hexStr = ByteUtil.bytes2HexStr(dateValue);
 //                        LogUtil.d(TAG, "get 9F6E Data :" + hexStr);
 //                        Map<String, TLV> map = TLVUtil.buildTLVMap(hexStr);
 //                        LogUtil.d(TAG, "get 9F6E Data :" + map);
 //
 //                    } else {
-//                        LogUtil.e(TAG, "Get the data length of payPass is negative = " + len);
+//                        LogUtil.e(TAG, "Get the data length of payPass is null = ");
 //                    }
 //                } catch (Exception e) {
 //                    e.printStackTrace();
 //                }
 //            }
-//            if (!hexStr.equals("9F6E00")) {
-//                f55WaveDataStr += hexStr;
+//            if (!hexStr.isEmpty()) {
+//                f55WaveDataStr += "9F6E04"+hexStr;
 //            }
             icCardInfo.setICC55(f55WaveDataStr);
             payDetail.setICC55(f55WaveDataStr);

settings.gradle

@@ -32,7 +32,7 @@ include ':baselib'
 include ':mpulib'
 
 //include ':ecr-client-lib'
-include ':ecr-service'
+//include ':ecr-service'
 include ':xpay'
 include ':ecr'
 include ':ecr-service-lib'