diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index ea2f59d..804c66b 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -437,6 +437,7 @@ public class MainActivity extends AppCompatActivity implements BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); // BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); } + @Override public void onStop(){ diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java index 3651273..9d157b3 100644 --- a/app/src/main/java/com/utsmm/kbz/MainFragment.java +++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java @@ -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)); diff --git a/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java b/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java index 43c422e..6154476 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/SettingsFragment.java @@ -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(); } diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java index f6b74bc..d2b5e45 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java @@ -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 getPrintStatus() { return this.printStatus; } diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java index f9c91e6..442a185 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java @@ -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; diff --git a/app/src/main/java/com/utsmm/kbz/ui/navigation/NaviMainFragment.java b/app/src/main/java/com/utsmm/kbz/ui/navigation/NaviMainFragment.java index 6ffd8df..ddbf34c 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/navigation/NaviMainFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/navigation/NaviMainFragment.java @@ -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!"); diff --git a/app/src/main/res/drawable/ic_wifi.xml b/app/src/main/res/drawable/ic_wifi.xml new file mode 100644 index 0000000..3c7b50f --- /dev/null +++ b/app/src/main/res/drawable/ic_wifi.xml @@ -0,0 +1,24 @@ + + + + diff --git a/app/src/main/res/layout/navi_main_layout.xml b/app/src/main/res/layout/navi_main_layout.xml index 2826727..4c6552d 100644 --- a/app/src/main/res/layout/navi_main_layout.xml +++ b/app/src/main/res/layout/navi_main_layout.xml @@ -358,6 +358,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df2e425..0ede47b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -361,6 +361,7 @@ NO TRANSACTIONS FOUND Alert Sound Echo Test + WIFI Processing card, please wait... Processing refund, please wait... Processing Card diff --git a/nexsdk-lib/nexgo-smartpos-sdk-v3.08.006_20241216.aar b/nexsdk-lib/nexgo-smartpos-sdk-v3.08.006_20241216.aar deleted file mode 100644 index 047ecfe..0000000 Binary files a/nexsdk-lib/nexgo-smartpos-sdk-v3.08.006_20241216.aar and /dev/null differ