diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index 9ca087f..ae7b340 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index 9ca087f..ae7b340 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> @@ -67,6 +68,5 @@ android:layout_height="match_parent" android:background="#F1F1F1" android:scaleType="centerCrop" - android:src="@mipmap/load_image_error" app:shapeAppearance="@style/RoundedStyle" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 46515b2..a3dc2fa 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.graphics.Color import android.os.Bundle import android.view.View import androidx.lifecycle.ViewModelProvider @@ -13,9 +12,8 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.isNetworkConnected import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -64,14 +62,14 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index 9ca087f..ae7b340 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> @@ -67,6 +68,5 @@ android:layout_height="match_parent" android:background="#F1F1F1" android:scaleType="centerCrop" - android:src="@mipmap/load_image_error" app:shapeAppearance="@style/RoundedStyle" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_work_site_rv_l.xml b/app/src/main/res/layout/item_work_site_rv_l.xml index 4ae1dd5..7eb4352 100644 --- a/app/src/main/res/layout/item_work_site_rv_l.xml +++ b/app/src/main/res/layout/item_work_site_rv_l.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_5" - android:background="@drawable/bg_stroke_layout_black" + android:background="@drawable/bg_stroke_layout_blue" android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index 9ca087f..ae7b340 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> @@ -67,6 +68,5 @@ android:layout_height="match_parent" android:background="#F1F1F1" android:scaleType="centerCrop" - android:src="@mipmap/load_image_error" app:shapeAppearance="@style/RoundedStyle" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_work_site_rv_l.xml b/app/src/main/res/layout/item_work_site_rv_l.xml index 4ae1dd5..7eb4352 100644 --- a/app/src/main/res/layout/item_work_site_rv_l.xml +++ b/app/src/main/res/layout/item_work_site_rv_l.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_5" - android:background="@drawable/bg_stroke_layout_black" + android:background="@drawable/bg_stroke_layout_blue" android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) } alarmAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else { @@ -138,9 +136,7 @@ } } binding.recyclerView.adapter = alarmAdapter - binding.recyclerView.addItemDecoration( - RecyclerViewItemDivider(0f, 130f.dp2px(this), Color.LTGRAY) - ) + binding.recyclerView.addItemDecoration(RecyclerViewItemOffsets(0, 1, 0, 1)) alarmAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, item: AlarmListModel.DataModel.RowsModel) { diff --git a/app/src/main/res/drawable/bg_stroke_layout_black.xml b/app/src/main/res/drawable/bg_stroke_layout_black.xml deleted file mode 100644 index 84ba984..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_black.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml index 26ddc25..3bc9de5 100644 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ b/app/src/main/res/drawable/bg_stroke_layout_blue.xml @@ -1,11 +1,8 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml new file mode 100644 index 0000000..26ddc25 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_blue_radius_5.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location_install.xml b/app/src/main/res/drawable/ic_location_install.xml index 7dc122c..1ed8478 100644 --- a/app/src/main/res/drawable/ic_location_install.xml +++ b/app/src/main/res/drawable/ic_location_install.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 7cf00a3..e309c27 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index 9ca087f..ae7b340 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> @@ -67,6 +68,5 @@ android:layout_height="match_parent" android:background="#F1F1F1" android:scaleType="centerCrop" - android:src="@mipmap/load_image_error" app:shapeAppearance="@style/RoundedStyle" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_work_site_rv_l.xml b/app/src/main/res/layout/item_work_site_rv_l.xml index 4ae1dd5..7eb4352 100644 --- a/app/src/main/res/layout/item_work_site_rv_l.xml +++ b/app/src/main/res/layout/item_work_site_rv_l.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_5" - android:background="@drawable/bg_stroke_layout_black" + android:background="@drawable/bg_stroke_layout_blue" android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:layout_height="@dimen/dp_2" + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> 1dp + 2dp 3dp 5dp 7dp