diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index df5853a..81526a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -89,7 +89,7 @@ - + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index df5853a..81526a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -89,7 +89,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 81c86ec..025454a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1004 - versionName "1.0.0.4" + versionCode 1005 + versionName "1.0.0.5" } buildTypes { diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index df5853a..81526a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -89,7 +89,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 81c86ec..025454a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1004 - versionName "1.0.0.4" + versionCode 1005 + versionName "1.0.0.5" } buildTypes { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 535adf2..34dd043 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -326,6 +326,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -401,7 +405,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index df5853a..81526a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -89,7 +89,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 81c86ec..025454a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1004 - versionName "1.0.0.4" + versionCode 1005 + versionName "1.0.0.5" } buildTypes { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 535adf2..34dd043 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -326,6 +326,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -401,7 +405,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index d2454ea..d2d1502 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -265,6 +265,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -340,7 +344,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index df5853a..81526a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -89,7 +89,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 81c86ec..025454a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1004 - versionName "1.0.0.4" + versionCode 1005 + versionName "1.0.0.5" } buildTypes { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 535adf2..34dd043 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -326,6 +326,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -401,7 +405,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index d2454ea..d2d1502 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -265,6 +265,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -340,7 +344,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt index e9037c9..146a114 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -71,6 +72,33 @@ .setText(R.id.inspectTypeView, "类型:${item.type}") .setText(R.id.deviceCodeView, "设备:$deviceCode") .setText(R.id.inspectDateView, "时间:${item.createTime}") + .setOnClickListener(R.id.deleteView) { + AlertControlDialog.Builder() + .setContext(requireContext()) + .setTitle("提示") + .setMessage("确定删除此条事件记录吗?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onCancelClick() { + + } + + override fun onConfirmClick() { + lifecycleScope.launch(Dispatchers.Main) { + withContext(Dispatchers.IO) { + DataBaseManager.get.deleteEventById(item.taskId) + } + dataBeans.remove(item) + notifyItemRemoved(position) + notifyItemRangeChanged( + position, dataBeans.size - position + ) + } + } + }).build().show() + } } } binding.eventRecyclerView.adapter = eventListAdapter diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index df5853a..81526a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -89,7 +89,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 81c86ec..025454a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1004 - versionName "1.0.0.4" + versionCode 1005 + versionName "1.0.0.5" } buildTypes { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 535adf2..34dd043 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -326,6 +326,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -401,7 +405,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index d2454ea..d2d1502 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -265,6 +265,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -340,7 +344,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt index e9037c9..146a114 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -71,6 +72,33 @@ .setText(R.id.inspectTypeView, "类型:${item.type}") .setText(R.id.deviceCodeView, "设备:$deviceCode") .setText(R.id.inspectDateView, "时间:${item.createTime}") + .setOnClickListener(R.id.deleteView) { + AlertControlDialog.Builder() + .setContext(requireContext()) + .setTitle("提示") + .setMessage("确定删除此条事件记录吗?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onCancelClick() { + + } + + override fun onConfirmClick() { + lifecycleScope.launch(Dispatchers.Main) { + withContext(Dispatchers.IO) { + DataBaseManager.get.deleteEventById(item.taskId) + } + dataBeans.remove(item) + notifyItemRemoved(position) + notifyItemRangeChanged( + position, dataBeans.size - position + ) + } + } + }).build().show() + } } } binding.eventRecyclerView.adapter = eventListAdapter diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt index d95fd83..64093a7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt @@ -241,6 +241,21 @@ } } + /** + * 删除事件记录 + * */ + fun deleteEventById(id: String) { + val result = taskEventDao.queryBuilder().where( + TaskEventLocalBeanDao.Properties.TaskId.eq(id) + ).list() + if (!result.isNullOrEmpty()) { + result.forEach { + taskEventDao.delete(it) + } + //通知列表刷新 + QueryEventFragment.weakReferenceHandler.sendEmptyMessage(LocaleConstant.LOAD_EVENT) + } + } /** * 删除全部事件数据 diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..ce86a83 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index df5853a..81526a0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -89,7 +89,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 81c86ec..025454a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.birmm.inspect" minSdkVersion 23 targetSdkVersion 33 - versionCode 1004 - versionName "1.0.0.4" + versionCode 1005 + versionName "1.0.0.5" } buildTypes { diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index 535adf2..34dd043 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -326,6 +326,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -401,7 +405,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index d2454ea..d2d1502 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -265,6 +265,10 @@ }).build().show() } else { //搜索蓝牙 + if (!BLEManager.isBluetoothEnable()) { + BLEManager.openBluetooth(false) + return@setOnClickListener + } if (BLEManager.isDiscovery()) {//当前正在搜索设备... BLEManager.stopDiscoverDevice() } @@ -340,7 +344,9 @@ val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(requireContext()) sheetBuilder.setTitle("请选择要连接的设备") blueToothBeans.forEach { - sheetBuilder.addItem(it.bluetoothDevice.name) + if (it.bluetoothDevice.name.isNotEmpty()) { + sheetBuilder.addItem(it.bluetoothDevice.name) + } } sheetBuilder.setGravityCenter(true).setAddCancelBtn(true) .setOnSheetItemClickListener { dialog, _, position, _ -> diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt index e9037c9..146a114 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt @@ -19,6 +19,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.WeakReferenceHandler +import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -71,6 +72,33 @@ .setText(R.id.inspectTypeView, "类型:${item.type}") .setText(R.id.deviceCodeView, "设备:$deviceCode") .setText(R.id.inspectDateView, "时间:${item.createTime}") + .setOnClickListener(R.id.deleteView) { + AlertControlDialog.Builder() + .setContext(requireContext()) + .setTitle("提示") + .setMessage("确定删除此条事件记录吗?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onCancelClick() { + + } + + override fun onConfirmClick() { + lifecycleScope.launch(Dispatchers.Main) { + withContext(Dispatchers.IO) { + DataBaseManager.get.deleteEventById(item.taskId) + } + dataBeans.remove(item) + notifyItemRemoved(position) + notifyItemRangeChanged( + position, dataBeans.size - position + ) + } + } + }).build().show() + } } } binding.eventRecyclerView.adapter = eventListAdapter diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt b/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt index d95fd83..64093a7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/DataBaseManager.kt @@ -241,6 +241,21 @@ } } + /** + * 删除事件记录 + * */ + fun deleteEventById(id: String) { + val result = taskEventDao.queryBuilder().where( + TaskEventLocalBeanDao.Properties.TaskId.eq(id) + ).list() + if (!result.isNullOrEmpty()) { + result.forEach { + taskEventDao.delete(it) + } + //通知列表刷新 + QueryEventFragment.weakReferenceHandler.sendEmptyMessage(LocaleConstant.LOAD_EVENT) + } + } /** * 删除全部事件数据 diff --git a/app/src/main/res/layout/item_event_rv_l.xml b/app/src/main/res/layout/item_event_rv_l.xml index dd630d8..8f6e88b 100644 --- a/app/src/main/res/layout/item_event_rv_l.xml +++ b/app/src/main/res/layout/item_event_rv_l.xml @@ -25,15 +25,29 @@ android:layout_weight="1" android:orientation="vertical"> - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + +