diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt index 467f3058..586b7b68 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt @@ -29,9 +29,11 @@ class LeftAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) : val title = data[position] bd.itemId.text = title if (selectTitle == title) { - bd.itemId.setBackgroundColor(holder.viewBinding.root.context.getColor(R.color.cv_gray_153)) + bd.itemId.setBackgroundResource(R.drawable.drawable_bg_tittle_blue_bg_4_radius) + bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.highFontColor)) } else { - bd.itemId.setBackgroundColor(holder.viewBinding.root.context.getColor(R.color.white)) + bd.itemId.setBackgroundResource(R.drawable.drawable_bg_white_bg_4_radius) + bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.black)) } bd.root.setOnClickListener { if (selectTitle != title) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt index 034d5787..43602e5d 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt @@ -28,10 +28,15 @@ class MiddleAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) val bd = holder.viewBinding as TextItemSelectBinding val title = data[position] bd.itemId.text = title + val layoutParams: ViewGroup.LayoutParams = holder.viewBinding.itemLayout.layoutParams + layoutParams.width = 115 + bd.itemLayout.layoutParams = layoutParams if (selectTitle == title) { - bd.itemId.setBackgroundColor(holder.viewBinding.root.context.getColor(R.color.cv_gray_153)) + bd.itemId.setBackgroundResource(R.drawable.drawable_bg_blue_bg_4_radius) + bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.white)) } else { - bd.itemId.setBackgroundColor(holder.viewBinding.root.context.getColor(R.color.white)) + bd.itemId.setBackgroundResource(R.drawable.drawable_bg_white_bg_4_radius) + bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.black)) } bd.root.setOnClickListener { if (selectTitle != title) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt index 042c1411..5b803b08 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt @@ -102,7 +102,8 @@ class PhenomenonFragment : //中间菜单 binding.phenomenonMiddleRecyclerview.setHasFixedSize(true) - binding.phenomenonMiddleRecyclerview.layoutManager = LinearLayoutManager(requireContext()) + binding.phenomenonMiddleRecyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) + binding.phenomenonMiddleRecyclerview.adapter = middleAdapter //中间侧菜单查询结果监听 viewModel.liveDataMiddleTypeList.observe(viewLifecycleOwner) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderDecoration.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderDecoration.kt index 8cf32e01..fd536bd0 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderDecoration.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderDecoration.kt @@ -5,15 +5,19 @@ import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.graphics.Rect +import android.os.Build import android.view.View +import androidx.annotation.RequiresApi import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ItemDecoration +import com.navinfo.omqs.R /** * 自定义装饰器(实现分组+吸顶效果) */ +@RequiresApi(Build.VERSION_CODES.M) class RightGroupHeaderDecoration(context: Context) : ItemDecoration() { //头部的高 private val mItemHeaderHeight: Int @@ -31,7 +35,7 @@ class RightGroupHeaderDecoration(context: Context) : ItemDecoration() { mTextPaddingLeft = dp2px(context, 6f) mTextRect = Rect() mItemHeaderPaint = Paint(Paint.ANTI_ALIAS_FLAG) - mItemHeaderPaint.color = Color.GRAY + mItemHeaderPaint.color = context.getColor(R.color.btn_bg_blue) mTextPaint = Paint(Paint.ANTI_ALIAS_FLAG) mTextPaint.textSize = 46f mTextPaint.color = Color.WHITE @@ -84,7 +88,6 @@ class RightGroupHeaderDecoration(context: Context) : ItemDecoration() { (view.top - 1).toFloat(), right.toFloat(), view.top.toFloat(), mLinePaint ) - } } } diff --git a/app/src/main/res/drawable/drawable_bg_blue_bg_4_radius.xml b/app/src/main/res/drawable/drawable_bg_blue_bg_4_radius.xml index cf3c0fea..36bc7a06 100644 --- a/app/src/main/res/drawable/drawable_bg_blue_bg_4_radius.xml +++ b/app/src/main/res/drawable/drawable_bg_blue_bg_4_radius.xml @@ -1,6 +1,6 @@ - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/drawable_bg_white_bg_4_radius.xml b/app/src/main/res/drawable/drawable_bg_white_bg_4_radius.xml new file mode 100644 index 00000000..c5e07a55 --- /dev/null +++ b/app/src/main/res/drawable/drawable_bg_white_bg_4_radius.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_item_high_bg.9.png b/app/src/main/res/drawable/icon_item_high_bg.9.png new file mode 100644 index 00000000..6dbdd625 Binary files /dev/null and b/app/src/main/res/drawable/icon_item_high_bg.9.png differ diff --git a/app/src/main/res/drawable/selector_bg_white_blue_bg_4_radius.xml b/app/src/main/res/drawable/selector_bg_white_blue_bg_4_radius.xml new file mode 100644 index 00000000..facbe9cb --- /dev/null +++ b/app/src/main/res/drawable/selector_bg_white_blue_bg_4_radius.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 071b3a81..18b5f885 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -133,7 +133,6 @@ app:layout_constraintRight_toRightOf="parent" tools:ignore="MissingConstraints"> - - - - + android:layout_height="match_parent"> + + + + + + - diff --git a/app/src/main/res/layout/text_item_select.xml b/app/src/main/res/layout/text_item_select.xml index 66dd87d4..7b161041 100644 --- a/app/src/main/res/layout/text_item_select.xml +++ b/app/src/main/res/layout/text_item_select.xml @@ -1,11 +1,20 @@ - + android:layout_height="wrap_content"> - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0df40610..db336623 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -163,7 +163,8 @@ #999999 #FF3B30 #108ee9 - #2631DD + #2631DD + #FFF5F7FE #000000 #d1d1d1 @@ -171,5 +172,6 @@ #999999 #797979 #595959 + #FF3266F1 #c1c1c1 \ 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 cfdcea11..990c9d56 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,7 +27,7 @@ @@ -46,7 +46,7 @@