diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 3caf6b0..f42fc1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -127,9 +126,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 3caf6b0..f42fc1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -127,9 +126,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index a6da484..a87498f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 3caf6b0..f42fc1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -127,9 +126,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index a6da484..a87498f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index e3406b8..b395794 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -9,37 +9,39 @@ - + android:layout_height="0dp" + android:layout_weight="1" + android:background="@color/mainBackground"> - + - - - + android:layout_height="match_parent"> - - - - + android:layout_height="wrap_content" /> - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 3caf6b0..f42fc1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -127,9 +126,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index a6da484..a87498f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index e3406b8..b395794 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -9,37 +9,39 @@ - + android:layout_height="0dp" + android:layout_weight="1" + android:background="@color/mainBackground"> - + - - - + android:layout_height="match_parent"> - - - - + android:layout_height="wrap_content" /> - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8c36a56..6d75e40 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -9,37 +9,39 @@ - + android:layout_height="0dp" + android:layout_weight="1" + android:background="@color/mainBackground"> - + - - - + android:layout_height="match_parent"> - - - - + android:layout_height="wrap_content" /> - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 3caf6b0..f42fc1e 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -127,9 +126,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index a6da484..a87498f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) - trainRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) trainRecyclerView.adapter = meterageTrainAdapter meterageTrainAdapter.setOnItemClickListener(object : MeterageTrainAdapter.OnItemClickListener { diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index e3406b8..b395794 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -9,37 +9,39 @@ - + android:layout_height="0dp" + android:layout_weight="1" + android:background="@color/mainBackground"> - + - - - + android:layout_height="match_parent"> - - - - + android:layout_height="wrap_content" /> - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8c36a56..6d75e40 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -9,37 +9,39 @@ - + android:layout_height="0dp" + android:layout_weight="1" + android:background="@color/mainBackground"> - + - - - + android:layout_height="match_parent"> - - - - + android:layout_height="wrap_content" /> - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index abde980..f64a0dd 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -2,7 +2,10 @@ + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_white_radius_5">