feat: refs #8175 updateLibraries
This commit is contained in:
parent
01aa6eaab6
commit
88ef5230f9
|
@ -44,7 +44,6 @@ class ExpeditionPalletDetailFragment(
|
||||||
override fun getLayoutId(): Int = R.layout.fragment_expedition_pallet_detail
|
override fun getLayoutId(): Int = R.layout.fragment_expedition_pallet_detail
|
||||||
|
|
||||||
override fun init() {
|
override fun init() {
|
||||||
println("ExpeditionPalletDetail")
|
|
||||||
customDialog = CustomDialog(requireContext())
|
customDialog = CustomDialog(requireContext())
|
||||||
binding.expeditionPalletDetailPallet.text =
|
binding.expeditionPalletDetailPallet.text =
|
||||||
buildString {
|
buildString {
|
||||||
|
|
|
@ -59,7 +59,6 @@ class ExpeditionPalletFragment(
|
||||||
override fun getLayoutId(): Int = R.layout.fragment_expedition_pallet
|
override fun getLayoutId(): Int = R.layout.fragment_expedition_pallet
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
println("ExpeditionPalletFragment")
|
|
||||||
mperror = MediaPlayer.create((activity as MainActivity), R.raw.error)
|
mperror = MediaPlayer.create((activity as MainActivity), R.raw.error)
|
||||||
mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
|
mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
@ -214,8 +213,6 @@ class ExpeditionPalletFragment(
|
||||||
if (mperror != null) mperror!!.start()
|
if (mperror != null) mperror!!.start()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
customDialogList.setValue("")
|
customDialogList.setValue("")
|
||||||
ma.hideKeyboard(customDialogList.getEditText())
|
ma.hideKeyboard(customDialogList.getEditText())
|
||||||
|
|
|
@ -71,7 +71,6 @@ class ExpeditionScanFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun init() {
|
override fun init() {
|
||||||
println("ExpeditionScanFragment")
|
|
||||||
customDialog = CustomDialog(requireContext())
|
customDialog = CustomDialog(requireContext())
|
||||||
customDialogList = CustomDialogList(requireContext())
|
customDialogList = CustomDialogList(requireContext())
|
||||||
customDialogTwoButtons = CustomDialogTwoButtons(requireContext())
|
customDialogTwoButtons = CustomDialogTwoButtons(requireContext())
|
||||||
|
@ -80,7 +79,11 @@ class ExpeditionScanFragment(
|
||||||
)
|
)
|
||||||
ma.hideBottomNavigation(View.GONE)
|
ma.hideBottomNavigation(View.GONE)
|
||||||
binding.mainToolbar.toolbarTitle.text =
|
binding.mainToolbar.toolbarTitle.text =
|
||||||
getString(R.string.expeditionInfo, itemExpeditionTruckVO?.eta.orEmpty(), itemExpeditionTruckVO?.description.orEmpty())
|
getString(
|
||||||
|
R.string.expeditionInfo,
|
||||||
|
itemExpeditionTruckVO?.eta.orEmpty(),
|
||||||
|
itemExpeditionTruckVO?.description.orEmpty()
|
||||||
|
)
|
||||||
setToolBar()
|
setToolBar()
|
||||||
setEvents()
|
setEvents()
|
||||||
viewModel.expeditionScanList(
|
viewModel.expeditionScanList(
|
||||||
|
@ -121,7 +124,6 @@ class ExpeditionScanFragment(
|
||||||
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun observeViewModel() {
|
override fun observeViewModel() {
|
||||||
with(viewModel) {
|
with(viewModel) {
|
||||||
loadExpeditionScanList.observe(viewLifecycleOwner) { event ->
|
loadExpeditionScanList.observe(viewLifecycleOwner) { event ->
|
||||||
|
|
Loading…
Reference in New Issue