ecr tempo removed
This commit is contained in:
parent
bc3b2cbe4a
commit
f2e9ad1e92
@ -13,9 +13,6 @@
|
|||||||
</DropdownSelection>
|
</DropdownSelection>
|
||||||
<DialogSelection />
|
<DialogSelection />
|
||||||
</SelectionState>
|
</SelectionState>
|
||||||
<SelectionState runConfigName="ecr-service">
|
|
||||||
<option name="selectionMode" value="DROPDOWN" />
|
|
||||||
</SelectionState>
|
|
||||||
</selectionStates>
|
</selectionStates>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@ -13,7 +13,6 @@
|
|||||||
<option value="$PROJECT_DIR$/app" />
|
<option value="$PROJECT_DIR$/app" />
|
||||||
<option value="$PROJECT_DIR$/baselib" />
|
<option value="$PROJECT_DIR$/baselib" />
|
||||||
<option value="$PROJECT_DIR$/ecr" />
|
<option value="$PROJECT_DIR$/ecr" />
|
||||||
<option value="$PROJECT_DIR$/ecr-client-lib" />
|
|
||||||
<option value="$PROJECT_DIR$/ecr-service" />
|
<option value="$PROJECT_DIR$/ecr-service" />
|
||||||
<option value="$PROJECT_DIR$/ecr-service-lib" />
|
<option value="$PROJECT_DIR$/ecr-service-lib" />
|
||||||
<option value="$PROJECT_DIR$/link-service-lib" />
|
<option value="$PROJECT_DIR$/link-service-lib" />
|
||||||
|
|||||||
@ -203,7 +203,7 @@ dependencies {
|
|||||||
|
|
||||||
|
|
||||||
// ECR Dependencies - Modern ECR Client Library
|
// ECR Dependencies - Modern ECR Client Library
|
||||||
implementation project(path: ':ecr-client-lib')
|
// implementation project(path: ':ecr-client-lib')
|
||||||
implementation project(path: ':ecr-service-lib')
|
implementation project(path: ':ecr-service-lib')
|
||||||
|
|
||||||
// Core Libraries
|
// Core Libraries
|
||||||
|
|||||||
@ -80,8 +80,8 @@ import dagger.hilt.android.AndroidEntryPoint;
|
|||||||
import com.utsmyanmar.paylibs.utils.LogUtil;
|
import com.utsmyanmar.paylibs.utils.LogUtil;
|
||||||
import com.utsmyanmar.paylibs.utils.params.Params;
|
import com.utsmyanmar.paylibs.utils.params.Params;
|
||||||
|
|
||||||
import com.utsmm.kbz.util.ecr.ModernECRFactory;
|
//import com.utsmm.kbz.util.ecr.ModernECRFactory;
|
||||||
import com.utsmm.kbz.util.ecr.ModernECRManager;
|
//import com.utsmm.kbz.util.ecr.ModernECRManager;
|
||||||
import androidx.lifecycle.ViewModelProvider;
|
import androidx.lifecycle.ViewModelProvider;
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
@ -91,7 +91,7 @@ public class MainFragment extends DataBindingFragment {
|
|||||||
private SharedViewModel sharedViewModel;
|
private SharedViewModel sharedViewModel;
|
||||||
private MainViewModel mainViewModel;
|
private MainViewModel mainViewModel;
|
||||||
private TMSProcessViewModel tmsProcessViewModel;
|
private TMSProcessViewModel tmsProcessViewModel;
|
||||||
private ModernECRManager modernECRManager;
|
// private ModernECRManager modernECRManager;
|
||||||
private int routeId;
|
private int routeId;
|
||||||
private ImageSlider imgSlider;
|
private ImageSlider imgSlider;
|
||||||
private final ArrayList<SlideModel> imgList = new ArrayList<>();
|
private final ArrayList<SlideModel> imgList = new ArrayList<>();
|
||||||
@ -123,8 +123,8 @@ public class MainFragment extends DataBindingFragment {
|
|||||||
tmsProcessViewModel = getFragmentScopeViewModel(TMSProcessViewModel.class);
|
tmsProcessViewModel = getFragmentScopeViewModel(TMSProcessViewModel.class);
|
||||||
|
|
||||||
// Initialize ModernECRManager
|
// Initialize ModernECRManager
|
||||||
ModernECRFactory factory = new ModernECRFactory(requireContext(), sharedViewModel);
|
// ModernECRFactory factory = new ModernECRFactory(requireContext(), sharedViewModel);
|
||||||
modernECRManager = new ViewModelProvider(this, factory).get(ModernECRManager.class);
|
// modernECRManager = new ViewModelProvider(this, factory).get(ModernECRManager.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -246,10 +246,13 @@ public class MainFragment extends DataBindingFragment {
|
|||||||
}
|
}
|
||||||
sharedViewModel.setManualEntryStatus(SystemParamsOperation.getInstance().getManualEntryStatus());
|
sharedViewModel.setManualEntryStatus(SystemParamsOperation.getInstance().getManualEntryStatus());
|
||||||
|
|
||||||
|
queryAidCAPKList();
|
||||||
|
|
||||||
// generateMockQR();
|
// generateMockQR();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @param
|
* @param
|
||||||
*
|
*
|
||||||
@ -289,14 +292,14 @@ public class MainFragment extends DataBindingFragment {
|
|||||||
private void setUpECR() {
|
private void setUpECR() {
|
||||||
if (checkECRServiceAppExistOrNot()) {
|
if (checkECRServiceAppExistOrNot()) {
|
||||||
// Initialize Modern ECR Manager
|
// Initialize Modern ECR Manager
|
||||||
modernECRManager.init();
|
// modernECRManager.init();
|
||||||
|
//
|
||||||
// Observe navigation requests
|
// // Observe navigation requests
|
||||||
modernECRManager.getNavigationRequest().observe(getViewLifecycleOwner(), destinationId -> {
|
// modernECRManager.getNavigationRequest().observe(getViewLifecycleOwner(), destinationId -> {
|
||||||
if (destinationId != null) {
|
// if (destinationId != null) {
|
||||||
delayFunctionCall(() -> isRouteValidAndNavigateToRoute(destinationId));
|
// delayFunctionCall(() -> isRouteValidAndNavigateToRoute(destinationId));
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
|
|
||||||
showShortToast("ECR Service initialized");
|
showShortToast("ECR Service initialized");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -31,7 +31,7 @@ include ':paylibs'
|
|||||||
include ':baselib'
|
include ':baselib'
|
||||||
include ':mpulib'
|
include ':mpulib'
|
||||||
|
|
||||||
include ':ecr-client-lib'
|
//include ':ecr-client-lib'
|
||||||
include ':ecr-service'
|
include ':ecr-service'
|
||||||
include ':xpay'
|
include ':xpay'
|
||||||
include ':ecr'
|
include ':ecr'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user