Compare commits
2 Commits
eb400a2ee8
...
d9de201e88
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d9de201e88 | ||
|
|
951a520335 |
@ -1,6 +1,6 @@
|
||||
# Change log UAT
|
||||
|
||||
## [2.12] - 2026-05-06
|
||||
## [2.12] - 06-05-2026
|
||||
|
||||
- **Pinpad Sound Toggle**
|
||||
- Beep is ON by default
|
||||
@ -9,3 +9,10 @@
|
||||
- **Transaction Search**
|
||||
- Search now matches by both Trace No and RRN instead of Trace No only
|
||||
- Trace No uses partial match (`contains`), RRN uses exact match (`equals`)
|
||||
|
||||
## [2.31] - 22-05-2026
|
||||
- **Control Bar Disabled**
|
||||
- Control Bar disabled in normal status and could not be down to go settings
|
||||
- But can auto enable when password is correct in function tab
|
||||
- **Void Fixed**
|
||||
- Void transaction fixed
|
||||
@ -14,8 +14,8 @@ android {
|
||||
applicationId "com.utsmm.kbz"
|
||||
minSdk 24
|
||||
targetSdk 33
|
||||
versionCode 32
|
||||
versionName "2.12"
|
||||
versionCode 36
|
||||
versionName "2.31"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
|
||||
@ -440,6 +440,7 @@ public class MainActivity extends AppCompatActivity implements
|
||||
BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onStop(){
|
||||
super.onStop();
|
||||
|
||||
@ -135,6 +135,8 @@ public class MainFragment extends DataBindingFragment {
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableControlBar();
|
||||
LogUtil.d(TAG, "control bar result " + result);
|
||||
|
||||
setNavBarIconWithTitle(getResourceString(R.string.menu_dashboard));
|
||||
|
||||
|
||||
@ -20,6 +20,7 @@ import com.nexgo.downloadkey.downloadflow.DownloadFlow;
|
||||
import com.nexgo.downloadkey.downloadflow.DownloadFlowProcessListener;
|
||||
import com.nexgo.downloadkey.downloadflow.DownloadFlowResultEntity;
|
||||
import com.nexgo.downloadkey.downloadflow.DownloadResult;
|
||||
import com.utsmyanmar.baselib.BaseApplication;
|
||||
import com.utsmyanmar.baselib.emv.EmvParamOperation;
|
||||
import com.utsmyanmar.baselib.fragment.DataBindingFragment;
|
||||
import com.utsmyanmar.baselib.network.model.sirius.SiriusError;
|
||||
@ -117,6 +118,7 @@ public class SettingsFragment extends DataBindingFragment {
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
setToolBarTitleWithBackIcon("Settings");
|
||||
BaseApplication.getInstance().deviceEngine.getPlatform().enableControlBar();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -164,7 +164,7 @@ public class InputTraceNoFragment extends DataBindingFragment {
|
||||
|
||||
LogUtil.d(TAG,"transactions trace :"+payDetail.getVoucherNo());
|
||||
|
||||
if(POSUtil.getInstance().checkVoid(configTime,date,time)) {
|
||||
// if(POSUtil.getInstance().checkVoid(configTime,date,time)) {
|
||||
|
||||
if(payDetail.getIsCanceled()) {
|
||||
clearInputView();
|
||||
@ -193,7 +193,7 @@ public class InputTraceNoFragment extends DataBindingFragment {
|
||||
emvTransactionProcessViewModel.setPayDetail(payDetail);
|
||||
}
|
||||
safeNavigateToRouteId();
|
||||
}
|
||||
// }
|
||||
|
||||
} else {
|
||||
if (isEcr)
|
||||
|
||||
@ -231,7 +231,7 @@ public class SharedViewModel extends ViewModel {
|
||||
|
||||
public void setPrintReceiptMsg(String msg) { this.printReceiptMsg.setValue(msg);}
|
||||
public void postPrintReceiptMsg(String msg) { this.printReceiptMsg.postValue(msg);}
|
||||
public void setPrintStatus(PrintStatus printStatus) { this.printStatus.setValue(printStatus); }
|
||||
public void setPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); }
|
||||
public void postPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); }
|
||||
|
||||
public SingleLiveEvent<PrintStatus> getPrintStatus() { return this.printStatus; }
|
||||
|
||||
@ -2,9 +2,11 @@ package com.utsmm.kbz.ui.management;
|
||||
|
||||
import androidx.lifecycle.Observer;
|
||||
|
||||
import com.utsmyanmar.baselib.BaseApplication;
|
||||
import com.utsmyanmar.baselib.fragment.DataBindingFragment;
|
||||
import com.utsmyanmar.baselib.util.DataBindingConfig;
|
||||
import com.utsmyanmar.paylibs.model.PayDetail;
|
||||
import com.utsmyanmar.paylibs.utils.LogUtil;
|
||||
import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
|
||||
import com.utsmyanmar.paylibs.utils.enums.TransMenu;
|
||||
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
package com.utsmm.kbz.ui.navigation;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.provider.Settings;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
@ -186,6 +188,14 @@ public class NaviMainFragment extends DataBindingFragment {
|
||||
});
|
||||
}
|
||||
|
||||
public void onClickWifi(){
|
||||
try {
|
||||
Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
|
||||
startActivity(intent);
|
||||
} catch (Exception e) {
|
||||
LogUtil.e("NaviMainFragment", "error on going wifi");
|
||||
}
|
||||
}
|
||||
|
||||
public void onClickLogOff() {
|
||||
showLoadingDialog("Sending LogOff!");
|
||||
|
||||
24
app/src/main/res/drawable/ic_wifi.xml
Normal file
24
app/src/main/res/drawable/ic_wifi.xml
Normal file
@ -0,0 +1,24 @@
|
||||
<!--
|
||||
~ Copyright (C) 2026 The Android Open Source Project
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="800dp"
|
||||
android:height="800dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M12,19C11.448,19 11,19.448 11,20C11,20.552 11.448,21 12,21V19ZM12.01,21C12.563,21 13.01,20.552 13.01,20C13.01,19.448 12.563,19 12.01,19V21ZM14.691,17.04C15.099,17.412 15.732,17.382 16.103,16.973C16.475,16.565 16.445,15.932 16.037,15.561L14.691,17.04ZM18.054,13.34C18.463,13.712 19.095,13.682 19.467,13.273C19.838,12.865 19.808,12.232 19.4,11.861L18.054,13.34ZM7.964,15.561C7.555,15.932 7.525,16.565 7.897,16.973C8.269,17.382 8.901,17.412 9.31,17.04L7.964,15.561ZM4.601,11.861C4.192,12.232 4.162,12.865 4.534,13.273C4.905,13.682 5.538,13.712 5.946,13.34L4.601,11.861ZM12,21H12.01V19H12V21ZM12,16C13.037,16 13.979,16.393 14.691,17.04L16.037,15.561C14.972,14.592 13.554,14 12,14V16ZM12,11C14.332,11 16.455,11.885 18.054,13.34L19.4,11.861C17.447,10.084 14.849,9 12,9V11ZM9.31,17.04C10.021,16.393 10.964,16 12,16V14C10.447,14 9.029,14.592 7.964,15.561L9.31,17.04ZM5.946,13.34C7.546,11.885 9.668,11 12,11V9C9.151,9 6.554,10.084 4.601,11.861L5.946,13.34Z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
@ -358,6 +358,79 @@
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:clickable="true"
|
||||
android:foreground="?android:attr/selectableItemBackground"
|
||||
android:onClick="@{()->click.onClickWifi()}"
|
||||
app:cardBackgroundColor="@color/white"
|
||||
app:cardCornerRadius="16dp"
|
||||
app:cardElevation="2dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:padding="20dp">
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
app:cardBackgroundColor="@color/colorPrimary"
|
||||
app:cardCornerRadius="24dp"
|
||||
app:cardElevation="0dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_wifi"
|
||||
app:tint="@color/white" />
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/rubik_medium"
|
||||
android:text="@string/title_wifi"
|
||||
android:textColor="@color/colorTextTitle"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
tools:fontFamily="sans-serif-medium" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:fontFamily="@font/rubik_regular"
|
||||
android:text="Go to Wifi setting"
|
||||
android:textColor="@color/colorTextContent"
|
||||
android:textSize="14sp"
|
||||
tools:fontFamily="sans-serif" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:src="@drawable/ic_right_arrow"
|
||||
app:tint="@color/colorPrimary" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- System Management Section -->
|
||||
|
||||
@ -361,6 +361,7 @@
|
||||
<string name="txt_trans_not_found">NO TRANSACTIONS FOUND</string>
|
||||
<string name="alert_sound_title">Alert Sound</string>
|
||||
<string name="title_echo">Echo Test</string>
|
||||
<string name="title_wifi">WIFI</string>
|
||||
<string name="txt_processing_card">Processing card, please wait...</string>
|
||||
<string name="txt_processing_refund">Processing refund, please wait...</string>
|
||||
<string name="title_processing_card">Processing Card</string>
|
||||
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user