Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS

Conflicts: vtm
2023-09-01 18:00:36 +08:00
parent 624460d546 34977af660
commit 8f9dc82353
147 changed files with 512 additions and 183 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -599,6 +599,7 @@ class MainViewModel @Inject constructor(
                                    DataCodeEnum.OMDB_TRAFFICLIGHT.code,//交通灯
                                    DataCodeEnum.OMDB_LANEINFO.code,//车信
                                    DataCodeEnum.OMDB_WARNINGSIGN.code,//危险信息
+                                    DataCodeEnum.OMDB_TOLLGATE.code,//收费站
                                    -> signList.add(
                                        signBean
                                    )
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
@@ -13,6 +13,7 @@ import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.AdapterSignBinding
 import com.navinfo.omqs.databinding.AdapterSignLaneinfoBinding
+import com.navinfo.omqs.databinding.AdapterSignTollgateBinding
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
 import com.navinfo.omqs.util.SignUtil
@@ -34,131 +35,180 @@ class SignAdapter(private var listener: OnSignAdapterClickListener?) :
    private var selectMoreInfoTag: String = ""

    override fun getItemViewType(position: Int): Int {
-        if (data.isNotEmpty() && data[position].renderEntity.code == "4601") {
+        if (data.isNotEmpty() && data[position].renderEntity.code == DataCodeEnum.OMDB_LANEINFO.code) {
            return 4601
+        } else if (data.isNotEmpty() && data[position].renderEntity.code == DataCodeEnum.OMDB_TOLLGATE.code) {
+            return 4023
        }
        return 0
    }


    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
-        return if (viewType == 4601) {
-            val viewBinding =
-                AdapterSignLaneinfoBinding.inflate(
+        return when (viewType) {
+            4601 -> {
+                val viewBinding =
+                    AdapterSignLaneinfoBinding.inflate(
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
+                    )
+                BaseViewHolder(viewBinding)
+            }
+            4023 -> {
+                val viewBinding = AdapterSignTollgateBinding.inflate(
                    LayoutInflater.from(parent.context),
                    parent,
                    false
                )
-            BaseViewHolder(viewBinding)
-        } else {
-            val viewBinding =
-                AdapterSignBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            BaseViewHolder(viewBinding)
+                BaseViewHolder(viewBinding)
+            }
+            else -> {
+                val viewBinding =
+                    AdapterSignBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+                BaseViewHolder(viewBinding)
+            }
        }
    }

    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
        val context = holder.viewBinding.root.context
        val item = data[position]
-        if (holder.viewBinding is AdapterSignBinding) {
-            val bd = holder.viewBinding
+        when (holder.viewBinding) {
+            is AdapterSignBinding -> {
+                val bd = holder.viewBinding

-            if (item.iconId != 0) {
-                if (item.renderEntity.code == DataCodeEnum.OMDB_WARNINGSIGN.code) {
-                    try {
-                        var typeCode = "${item.iconId}"
-                        while (typeCode.length < 5) {
-                            typeCode = "0${typeCode}"
+                if (item.iconId != 0) {
+                    if (item.renderEntity.code == DataCodeEnum.OMDB_WARNINGSIGN.code) {
+                        try {
+                            var typeCode = "${item.iconId}"
+                            while (typeCode.length < 5) {
+                                typeCode = "0${typeCode}"
+                            }
+                            val input =
+                                holder.viewBinding.root.context.assets.open("omdb/appendix/1105_${typeCode}_0.svg")
+                            if (input != null) {
+                                val bitmap =
+                                    AndroidSvgBitmap.getResourceBitmap(
+                                        input,
+                                        1.0f,
+                                        60.0f,
+                                        60,
+                                        60,
+                                        100
+                                    )
+                                input.close()
+                                val drawable = BitmapDrawable(
+                                    holder.viewBinding.root.context.resources,
+                                    bitmap
+                                )
+                                bd.signMainIconBg.setImageDrawable(drawable)
+                            }
+                        } catch (e: Exception) {
+                            Log.e("jingo", "警示信息没有${item.iconId} 这个SVG")
                        }
-                        val input =
-                            holder.viewBinding.root.context.assets.open("omdb/appendix/1105_${typeCode}_0.svg")
-                        if (input != null) {
-                            val bitmap =
-                                AndroidSvgBitmap.getResourceBitmap(input, 1.0f, 60.0f, 60, 60, 100)
-                            input.close()
-                            val drawable = BitmapDrawable(
-                                holder.viewBinding.root.context.resources,
-                                bitmap
-                            )
-                            bd.signMainIconBg.setImageDrawable(drawable)
-                        }
-                    } catch (e: Exception) {
-                        Log.e("jingo", "警示信息没有${item.iconId} 这个SVG")
+                    } else {
+                        bd.signMainIconBg.setImageResource(item.iconId)
+                    }
+                }
+
+                bd.signMainIcon.text = item.iconText
+                bd.signBottomText.text = item.name
+                //点击错误按钮
+                bd.signMainFastError.setOnClickListener {
+                    listener?.onErrorClick(item)
+                }
+                bd.signBottomRightText.text = item.bottomRightText
+                if (item.isMoreInfo) {
+                    bd.signMainInfo.visibility = View.VISIBLE
+                    bd.signMainInfo.setOnClickListener {
+                        listener?.onMoreInfoClick(selectMoreInfoTag, holder.tag, item)
+                        selectMoreInfoTag = holder.tag
                    }
                } else {
+                    bd.signMainInfo.visibility = View.GONE
+                }
+                bd.signSecondIcon.text = ""
+                if (item.renderEntity.code == DataCodeEnum.OMDB_SPEEDLIMIT.code) {
+                    val minSpeed = SignUtil.getSpeedLimitMinText(item.renderEntity)
+                    if (minSpeed != "0") {
+                        bd.signSecondIcon.text = minSpeed
+                    }
+                }
+                bd.signMainBg.setOnClickListener {
+                    listener?.onItemClick(item)
+                }
+            }
+            is AdapterSignLaneinfoBinding -> {
+                val bd = holder.viewBinding
+                bd.signMoreIconsLayout.removeAllViews()
+                bd.signBottomText.text = item.name
+                bd.signBottomRightText.text = item.distance.toString()
+                val list = SignUtil.getLineInfoIcons(item.renderEntity)
+                val lineViewS = View(context)
+                lineViewS.layoutParams = ViewGroup.LayoutParams(24, 80)
+                lineViewS.background = context.getDrawable(R.drawable.shape_vertical_dashed_line)
+                bd.signMoreIconsLayout.addView(lineViewS, lineViewS.layoutParams)
+                for (i in list.indices) {
+                    val laneInfo = list[i]
+                    val imageView = ImageView(context)
+                    val drawable = context.getDrawable(laneInfo.id)
+                    var color = when (laneInfo.type) {
+                        1 -> bd.root.resources.getColor(R.color.lane_info_1)
+                        2 -> bd.root.resources.getColor(R.color.lane_info_2)
+                        else -> bd.root.resources.getColor(R.color.white)
+                    }
+                    // 创建 PorterDuffColorFilter 对象
+                    val colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
+                    // 将 PorterDuffColorFilter 设置给 Drawable
+                    drawable!!.colorFilter = colorFilter
+                    // 将 Drawable 设置给 ImageView
+                    imageView.background = drawable
+                    // 将 ImageView 的颜色设置为红色
+                    imageView.setColorFilter(color, PorterDuff.Mode.SRC_IN)
+                    imageView.layoutParams = ViewGroup.LayoutParams(35, 100)
+                    bd.signMoreIconsLayout.addView(imageView, imageView.layoutParams)
+                    if (i < list.size - 1) {
+                        val lineView = View(context)
+                        lineView.layoutParams = ViewGroup.LayoutParams(24, 80)
+                        lineView.background =
+                            context.getDrawable(R.drawable.shape_vertical_dashed_line)
+                        bd.signMoreIconsLayout.addView(lineView, lineView.layoutParams)
+                    }
+                }
+                val lineViewE = View(context)
+                lineViewE.layoutParams = ViewGroup.LayoutParams(24, 80)
+                lineViewE.background = context.getDrawable(R.drawable.shape_vertical_dashed_line)
+                bd.signMoreIconsLayout.addView(lineViewE, lineViewE.layoutParams)
+                bd.root.setOnClickListener {
+                    listener?.onItemClick(item)
+                }
+            }
+            is AdapterSignTollgateBinding -> {
+                val bd = holder.viewBinding
+
+                if (item.iconId != 0) {
                    bd.signMainIconBg.setImageResource(item.iconId)
                }
-            }

-
-            bd.signMainIcon.text = item.iconText
-            bd.signBottomText.text = item.name
-            //点击错误按钮
-            bd.signMainFastError.setOnClickListener {
-                listener?.onErrorClick(item)
-            }
-            bd.signBottomRightText.text = item.bottomRightText
-            if (item.isMoreInfo) {
-                bd.signMainInfo.visibility = View.VISIBLE
-                bd.signMainInfo.setOnClickListener {
-                    listener?.onMoreInfoClick(selectMoreInfoTag, holder.tag, item)
-                    selectMoreInfoTag = holder.tag
+                bd.signBottomText.text = item.name
+                //点击错误按钮
+                bd.signMainFastError.setOnClickListener {
+                    listener?.onErrorClick(item)
                }
-            } else {
-                bd.signMainInfo.visibility = View.GONE
-            }
-            bd.signSecondIcon.text = ""
-            if (item.renderEntity.code == DataCodeEnum.OMDB_SPEEDLIMIT.code) {
-                val minSpeed = SignUtil.getSpeedLimitMinText(item.renderEntity)
-                if (minSpeed != "0") {
-                    bd.signSecondIcon.text = minSpeed
+                bd.signBottomRightText.text = item.bottomRightText
+                if (item.isMoreInfo) {
+                    bd.signMainInfo.visibility = View.VISIBLE
+                    bd.signMainInfo.setOnClickListener {
+                        listener?.onMoreInfoClick(selectMoreInfoTag, holder.tag, item)
+                        selectMoreInfoTag = holder.tag
+                    }
+                } else {
+                    bd.signMainInfo.visibility = View.GONE
                }
-            }
-            bd.signMainBg.setOnClickListener {
-                listener?.onItemClick(item)
-            }
-        } else if (holder.viewBinding is AdapterSignLaneinfoBinding) {
-            val bd = holder.viewBinding
-            bd.signMoreIconsLayout.removeAllViews()
-            bd.signBottomText.text = item.name
-            bd.signBottomRightText.text = item.distance.toString()
-            val list = SignUtil.getLineInfoIcons(item.renderEntity)
-            val lineViewS = View(context)
-            lineViewS.layoutParams = ViewGroup.LayoutParams(24, 80)
-            lineViewS.background = context.getDrawable(R.drawable.shape_vertical_dashed_line)
-            bd.signMoreIconsLayout.addView(lineViewS, lineViewS.layoutParams)
-            for (i in list.indices) {
-                val laneInfo = list[i]
-                val imageView = ImageView(context)
-                val drawable = context.getDrawable(laneInfo.id)
-                var color = when (laneInfo.type) {
-                    1 -> bd.root.resources.getColor(R.color.lane_info_1)
-                    2 -> bd.root.resources.getColor(R.color.lane_info_2)
-                    else -> bd.root.resources.getColor(R.color.white)
+                bd.signMainBg.setOnClickListener {
+                    listener?.onItemClick(item)
                }
-                // 创建 PorterDuffColorFilter 对象
-                val colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
-                // 将 PorterDuffColorFilter 设置给 Drawable
-                drawable!!.colorFilter = colorFilter
-                // 将 Drawable 设置给 ImageView
-                imageView.background = drawable
-                // 将 ImageView 的颜色设置为红色
-                imageView.setColorFilter(color, PorterDuff.Mode.SRC_IN)
-                imageView.layoutParams = ViewGroup.LayoutParams(35, 100)
-                bd.signMoreIconsLayout.addView(imageView, imageView.layoutParams)
-                if (i < list.size - 1) {
-                    val lineView = View(context)
-                    lineView.layoutParams = ViewGroup.LayoutParams(24, 80)
-                    lineView.background = context.getDrawable(R.drawable.shape_vertical_dashed_line)
-                    bd.signMoreIconsLayout.addView(lineView, lineView.layoutParams)
-                }
-            }
-            val lineViewE = View(context)
-            lineViewE.layoutParams = ViewGroup.LayoutParams(24, 80)
-            lineViewE.background = context.getDrawable(R.drawable.shape_vertical_dashed_line)
-            bd.signMoreIconsLayout.addView(lineViewE, lineViewE.layoutParams)
-            bd.root.setOnClickListener {
-                listener?.onItemClick(item)
            }
        }

--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt
@@ -74,6 +74,12 @@ class SignMoreInfoFragment : BaseFragment() {
                    binding.signInfoRecyclerview.adapter = adapter
                    adapter.refreshData(SignUtil.getIntersectionInfo(it))
                }
+                //收费站
+                DataCodeEnum.OMDB_TOLLGATE.code -> {
+                    val adapter = LaneBoundaryAdapter()
+                    binding.signInfoRecyclerview.adapter = adapter
+                    adapter.refreshData(SignUtil.getTollgateInfo(it))
+                }
                //电子眼
                DataCodeEnum.OMDB_ELECTRONICEYE.code -> {
                    val drawable = resources.getDrawable(R.drawable.icon_electronic_eye_left, null)