diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 12a6941..9a20968 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -35,7 +35,7 @@ android:layout_weight="1" android:background="@null" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 12a6941..9a20968 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -35,7 +35,7 @@ android:layout_weight="1" android:background="@null" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/item_device_support_rv_l.xml b/app/src/main/res/layout/item_device_support_rv_l.xml index 35c59de..b7fd238 100644 --- a/app/src/main/res/layout/item_device_support_rv_l.xml +++ b/app/src/main/res/layout/item_device_support_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="校准检定设备｜环评实验室｜XT444" + android:text="校准检定设备【环评实验室】XT444" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="设备编号：gdzc202301290002" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 12a6941..9a20968 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -35,7 +35,7 @@ android:layout_weight="1" android:background="@null" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/item_device_support_rv_l.xml b/app/src/main/res/layout/item_device_support_rv_l.xml index 35c59de..b7fd238 100644 --- a/app/src/main/res/layout/item_device_support_rv_l.xml +++ b/app/src/main/res/layout/item_device_support_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="校准检定设备｜环评实验室｜XT444" + android:text="校准检定设备【环评实验室】XT444" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="设备编号：gdzc202301290002" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 12a6941..9a20968 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -35,7 +35,7 @@ android:layout_weight="1" android:background="@null" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/item_device_support_rv_l.xml b/app/src/main/res/layout/item_device_support_rv_l.xml index 35c59de..b7fd238 100644 --- a/app/src/main/res/layout/item_device_support_rv_l.xml +++ b/app/src/main/res/layout/item_device_support_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="校准检定设备｜环评实验室｜XT444" + android:text="校准检定设备【环评实验室】XT444" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="设备编号：gdzc202301290002" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_notice_rv_l.xml b/app/src/main/res/layout/item_notice_rv_l.xml index 40710f8..f46d00a 100644 --- a/app/src/main/res/layout/item_notice_rv_l.xml +++ b/app/src/main/res/layout/item_notice_rv_l.xml @@ -1,34 +1,35 @@ + android:padding="@dimen/dp_10"> - + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:src="@mipmap/default_avatar" /> - + @@ -42,9 +43,9 @@ android:id="@+id/noticeTitleView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="sans-serif-black" android:text="通知公告" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> @@ -63,6 +65,7 @@ android:layout_marginTop="@dimen/dp_3" android:singleLine="true" android:text="通知公告名称通知公告名称通知公告名称" + android:textColor="@color/gray" android:textSize="@dimen/sp_12" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 12a6941..9a20968 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -35,7 +35,7 @@ android:layout_weight="1" android:background="@null" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/item_device_support_rv_l.xml b/app/src/main/res/layout/item_device_support_rv_l.xml index 35c59de..b7fd238 100644 --- a/app/src/main/res/layout/item_device_support_rv_l.xml +++ b/app/src/main/res/layout/item_device_support_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="校准检定设备｜环评实验室｜XT444" + android:text="校准检定设备【环评实验室】XT444" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="设备编号：gdzc202301290002" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_notice_rv_l.xml b/app/src/main/res/layout/item_notice_rv_l.xml index 40710f8..f46d00a 100644 --- a/app/src/main/res/layout/item_notice_rv_l.xml +++ b/app/src/main/res/layout/item_notice_rv_l.xml @@ -1,34 +1,35 @@ + android:padding="@dimen/dp_10"> - + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:src="@mipmap/default_avatar" /> - + @@ -42,9 +43,9 @@ android:id="@+id/noticeTitleView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="sans-serif-black" android:text="通知公告" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> @@ -63,6 +65,7 @@ android:layout_marginTop="@dimen/dp_3" android:singleLine="true" android:text="通知公告名称通知公告名称通知公告名称" + android:textColor="@color/gray" android:textSize="@dimen/sp_12" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_staff_rv_l.xml b/app/src/main/res/layout/item_staff_rv_l.xml index 136f913..e345e26 100644 --- a/app/src/main/res/layout/item_staff_rv_l.xml +++ b/app/src/main/res/layout/item_staff_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="胡书琦｜环评实验室｜jlry202301290002" + android:text="胡书琦【环评实验室】jlry202301290002" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="证书编号：zs121223452" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 12a6941..9a20968 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -35,7 +35,7 @@ android:layout_weight="1" android:background="@null" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/item_device_support_rv_l.xml b/app/src/main/res/layout/item_device_support_rv_l.xml index 35c59de..b7fd238 100644 --- a/app/src/main/res/layout/item_device_support_rv_l.xml +++ b/app/src/main/res/layout/item_device_support_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="校准检定设备｜环评实验室｜XT444" + android:text="校准检定设备【环评实验室】XT444" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="设备编号：gdzc202301290002" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_notice_rv_l.xml b/app/src/main/res/layout/item_notice_rv_l.xml index 40710f8..f46d00a 100644 --- a/app/src/main/res/layout/item_notice_rv_l.xml +++ b/app/src/main/res/layout/item_notice_rv_l.xml @@ -1,34 +1,35 @@ + android:padding="@dimen/dp_10"> - + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:src="@mipmap/default_avatar" /> - + @@ -42,9 +43,9 @@ android:id="@+id/noticeTitleView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="sans-serif-black" android:text="通知公告" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> @@ -63,6 +65,7 @@ android:layout_marginTop="@dimen/dp_3" android:singleLine="true" android:text="通知公告名称通知公告名称通知公告名称" + android:textColor="@color/gray" android:textSize="@dimen/sp_12" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_staff_rv_l.xml b/app/src/main/res/layout/item_staff_rv_l.xml index 136f913..e345e26 100644 --- a/app/src/main/res/layout/item_staff_rv_l.xml +++ b/app/src/main/res/layout/item_staff_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="胡书琦｜环评实验室｜jlry202301290002" + android:text="胡书琦【环评实验室】jlry202301290002" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="证书编号：zs121223452" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> #FF3700B3 #FF03DAC5 #FF018786 + #FF000000 #FFFFFFFF - + #FF808080 + #FF09BB07 #008CFF #803d7eff - #555555 #F0F0F0 #CCCCCC #E4E4E4 - #09BB07 \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 7628b01..a515002 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -4,6 +4,7 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll @@ -135,6 +136,9 @@ } else { emptyView!!.hide() noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) noticeRecyclerView.adapter = noticeListAdapter noticeListAdapter.setOnItemClickListener(object : NoticeListAdapter.OnItemClickListener { diff --git a/app/src/main/res/drawable/bottom_text_color.xml b/app/src/main/res/drawable/bottom_text_color.xml index 98c9731..be4a8cd 100644 --- a/app/src/main/res/drawable/bottom_text_color.xml +++ b/app/src/main/res/drawable/bottom_text_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 91c08f6..8c6934c 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml index a592814..91c2557 100644 --- a/app/src/main/res/drawable/ic_mine.xml +++ b/app/src/main/res/drawable/ic_mine.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml index c5a4d5c..44e1c25 100644 --- a/app/src/main/res/drawable/ic_sample.xml +++ b/app/src/main/res/drawable/ic_sample.xml @@ -4,10 +4,10 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index bb65bcd..047eb19 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + app:tabSelectedTextColor="@color/black" /> + android:background="@color/black" /> diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 211f4d7..57327dd 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -22,7 +22,7 @@ app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/mainTextColor" /> + app:tabSelectedTextColor="@color/black" /> @@ -352,7 +352,7 @@ android:layout_marginStart="@dimen/dp_15" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_equipment_basic_information.xml b/app/src/main/res/layout/fragment_equipment_basic_information.xml index 4a3c1c7..fd99df2 100644 --- a/app/src/main/res/layout/fragment_equipment_basic_information.xml +++ b/app/src/main/res/layout/fragment_equipment_basic_information.xml @@ -309,7 +309,7 @@ android:layout_toEndOf="@id/t" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -331,7 +331,7 @@ android:layout_toEndOf="@id/tt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -353,7 +353,7 @@ android:layout_toEndOf="@id/ttt" android:gravity="center_vertical" android:text="@string/loading_value" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e8acef6..c391ba3 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -40,7 +40,7 @@ android:background="@null" android:hint="请输入关键字查询" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_14" /> @@ -109,7 +109,7 @@ android:layout_marginHorizontal="@dimen/dp_10" android:layout_weight="1" android:text="万用表已检定完成" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_12" /> diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml index db40bce..7554638 100644 --- a/app/src/main/res/layout/include_sample_top_layout.xml +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 12a6941..9a20968 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -35,7 +35,7 @@ android:layout_weight="1" android:background="@null" android:singleLine="true" - android:textColor="@color/mainTextColor" + android:textColor="@color/black" android:textColorHint="@color/hintColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/item_device_support_rv_l.xml b/app/src/main/res/layout/item_device_support_rv_l.xml index 35c59de..b7fd238 100644 --- a/app/src/main/res/layout/item_device_support_rv_l.xml +++ b/app/src/main/res/layout/item_device_support_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="校准检定设备｜环评实验室｜XT444" + android:text="校准检定设备【环评实验室】XT444" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="设备编号：gdzc202301290002" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_notice_rv_l.xml b/app/src/main/res/layout/item_notice_rv_l.xml index 40710f8..f46d00a 100644 --- a/app/src/main/res/layout/item_notice_rv_l.xml +++ b/app/src/main/res/layout/item_notice_rv_l.xml @@ -1,34 +1,35 @@ + android:padding="@dimen/dp_10"> - + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:src="@mipmap/default_avatar" /> - + @@ -42,9 +43,9 @@ android:id="@+id/noticeTitleView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="sans-serif-black" android:text="通知公告" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> @@ -63,6 +65,7 @@ android:layout_marginTop="@dimen/dp_3" android:singleLine="true" android:text="通知公告名称通知公告名称通知公告名称" + android:textColor="@color/gray" android:textSize="@dimen/sp_12" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_staff_rv_l.xml b/app/src/main/res/layout/item_staff_rv_l.xml index 136f913..e345e26 100644 --- a/app/src/main/res/layout/item_staff_rv_l.xml +++ b/app/src/main/res/layout/item_staff_rv_l.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:text="胡书琦｜环评实验室｜jlry202301290002" + android:text="胡书琦【环评实验室】jlry202301290002" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:text="证书编号：zs121223452" - android:textColor="@color/mainTextColor" + android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> #FF3700B3 #FF03DAC5 #FF018786 + #FF000000 #FFFFFFFF - + #FF808080 + #FF09BB07 #008CFF #803d7eff - #555555 #F0F0F0 #CCCCCC #E4E4E4 - #09BB07 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cc62392..42e8d73 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,7 +39,7 @@ match_parent center 135px - @color/mainTextColor + @color/black @dimen/sp_16 @@ -50,7 +50,7 @@ center_vertical @dimen/dp_10 @dimen/dp_10 - @color/mainTextColor + @color/black @dimen/sp_14 @@ -59,7 +59,7 @@ match_parent center_vertical @dimen/dp_125 - @color/mainTextColor + @color/black @color/hintColor @dimen/sp_14