Merge branch 'merge_latest_SIT' of https://hub.utsmyanmar.com/Kyaw_Min_Khant/KBZ-POS into merge_latest_SIT

This commit is contained in:
MooN 2025-12-24 15:17:20 +06:30
commit 5163ce2840
3 changed files with 76 additions and 60 deletions

View File

@ -28,6 +28,7 @@ import com.nexgo.downloadkey.downloadflow.DownloadFlow;
import com.nexgo.downloadkey.downloadflow.DownloadFlowProcessListener; import com.nexgo.downloadkey.downloadflow.DownloadFlowProcessListener;
import com.nexgo.downloadkey.downloadflow.DownloadFlowResultEntity; import com.nexgo.downloadkey.downloadflow.DownloadFlowResultEntity;
import com.nexgo.downloadkey.downloadflow.DownloadResult; import com.nexgo.downloadkey.downloadflow.DownloadResult;
import com.utsmyanmar.baselib.BaseApplication;
import com.utsmyanmar.baselib.repo.Repository; import com.utsmyanmar.baselib.repo.Repository;
import com.utsmyanmar.baselib.ui.AnimationDialog; import com.utsmyanmar.baselib.ui.AnimationDialog;
import com.utsmyanmar.checkxread.sdk.NexGoSDK; import com.utsmyanmar.checkxread.sdk.NexGoSDK;
@ -393,8 +394,11 @@ public class MainActivity extends AppCompatActivity implements
SystemParamsOperation.getInstance().setDownloadedParams(false); SystemParamsOperation.getInstance().setDownloadedParams(false);
handleAutoSettlementIntent(getIntent()); handleAutoSettlementIntent(getIntent());
} }
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);

View File

@ -23,6 +23,7 @@ import com.denzcoskun.imageslider.models.SlideModel;
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.MockData;
import com.utsmyanmar.baselib.BaseApplication;
import com.utsmyanmar.baselib.emv.EmvParamOperation; import com.utsmyanmar.baselib.emv.EmvParamOperation;
import com.utsmyanmar.baselib.fragment.DataBindingFragment; import com.utsmyanmar.baselib.fragment.DataBindingFragment;
@ -146,10 +147,19 @@ public class MainFragment extends DataBindingFragment {
delayFunctionCall(()-> { delayFunctionCall(()-> {
NexGoSDK.getInstance().cancelCheckCard(); NexGoSDK.getInstance().cancelCheckCard();
NexGoSDK.getInstance().closeReader(); NexGoSDK.getInstance().closeReader();
disableHomeButton();
}); });
} }
private void disableHomeButton(){
int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableHomeButton();
LogUtil.d(TAG,"Disable Home Button Result:"+result);
}
private void enableHomeButton(){
int result = BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton();
LogUtil.d(TAG,"Enable Home Button Result:"+result);
}
private void checkTerminalStatus() { private void checkTerminalStatus() {
if (!SystemParamsOperation.getInstance().isActive()) { if (!SystemParamsOperation.getInstance().isActive()) {
routeId = R.id.action_nav_main_to_disabledTerminalFragment; routeId = R.id.action_nav_main_to_disabledTerminalFragment;
@ -172,6 +182,8 @@ public class MainFragment extends DataBindingFragment {
} }

View File

@ -528,77 +528,77 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<!-- Exit Card --> <!-- Exit Card -->
<androidx.cardview.widget.CardView <!-- <androidx.cardview.widget.CardView-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:clickable="true" <!-- android:clickable="true"-->
android:foreground="?android:attr/selectableItemBackground" <!-- android:foreground="?android:attr/selectableItemBackground"-->
android:onClick="@{()->click.onClickExit()}" <!-- android:onClick="@{()->click.onClickExit()}"-->
app:cardBackgroundColor="@color/white" <!-- app:cardBackgroundColor="@color/white"-->
app:cardCornerRadius="16dp" <!-- app:cardCornerRadius="16dp"-->
app:cardElevation="2dp"> <!-- app:cardElevation="2dp">-->
<LinearLayout <!-- <LinearLayout-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:gravity="center_vertical" <!-- android:gravity="center_vertical"-->
android:orientation="horizontal" <!-- android:orientation="horizontal"-->
android:padding="20dp"> <!-- android:padding="20dp">-->
<androidx.cardview.widget.CardView <!-- <androidx.cardview.widget.CardView-->
android:layout_width="48dp" <!-- android:layout_width="48dp"-->
android:layout_height="48dp" <!-- android:layout_height="48dp"-->
android:layout_marginEnd="16dp" <!-- android:layout_marginEnd="16dp"-->
app:cardBackgroundColor="#F87171" <!-- app:cardBackgroundColor="#F87171"-->
app:cardCornerRadius="24dp" <!-- app:cardCornerRadius="24dp"-->
app:cardElevation="0dp"> <!-- app:cardElevation="0dp">-->
<ImageView <!-- <ImageView-->
android:layout_width="24dp" <!-- android:layout_width="24dp"-->
android:layout_height="24dp" <!-- android:layout_height="24dp"-->
android:layout_gravity="center" <!-- android:layout_gravity="center"-->
android:src="@drawable/ic_timeout" <!-- android:src="@drawable/ic_timeout"-->
app:tint="@color/white" /> <!-- app:tint="@color/white" />-->
</androidx.cardview.widget.CardView> <!-- </androidx.cardview.widget.CardView>-->
<LinearLayout <!-- <LinearLayout-->
android:layout_width="0dp" <!-- android:layout_width="0dp"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_weight="1" <!-- android:layout_weight="1"-->
android:orientation="vertical"> <!-- android:orientation="vertical">-->
<TextView <!-- <TextView-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:fontFamily="@font/rubik_medium" <!-- android:fontFamily="@font/rubik_medium"-->
android:text="@string/title_exit" <!-- android:text="@string/title_exit"-->
android:textColor="@color/colorTextTitle" <!-- android:textColor="@color/colorTextTitle"-->
android:textSize="18sp" <!-- android:textSize="18sp"-->
android:textStyle="bold" <!-- android:textStyle="bold"-->
tools:fontFamily="sans-serif-medium" /> <!-- tools:fontFamily="sans-serif-medium" />-->
<TextView <!-- <TextView-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_marginTop="2dp" <!-- android:layout_marginTop="2dp"-->
android:fontFamily="@font/rubik_regular" <!-- android:fontFamily="@font/rubik_regular"-->
android:text="Exit application" <!-- android:text="Exit application"-->
android:textColor="@color/colorTextContent" <!-- android:textColor="@color/colorTextContent"-->
android:textSize="14sp" <!-- android:textSize="14sp"-->
tools:fontFamily="sans-serif" /> <!-- tools:fontFamily="sans-serif" />-->
</LinearLayout> <!-- </LinearLayout>-->
<ImageView <!-- <ImageView-->
android:layout_width="20dp" <!-- android:layout_width="20dp"-->
android:layout_height="20dp" <!-- android:layout_height="20dp"-->
android:src="@drawable/ic_right_arrow" <!-- android:src="@drawable/ic_right_arrow"-->
app:tint="#F87171" /> <!-- app:tint="#F87171" />-->
</LinearLayout> <!-- </LinearLayout>-->
</androidx.cardview.widget.CardView> <!-- </androidx.cardview.widget.CardView>-->
</LinearLayout> </LinearLayout>