diff --git 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 index 4e927db6..03b46c3f 100644 --- 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 ) diff --git 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 index 4cfbd9a7..4a04a0b4 100644 --- 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) } } diff --git 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 index ce82a6aa..54de09fa 100644 --- 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) diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index 74b0b2f1..ec6b6c94 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -126,27 +126,9 @@ class SignUtil { //常规线限速 DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> "线限速" - DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code, - DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code, - DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code, - DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "道路属性" + DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "道路属性" - DataCodeEnum.OMDB_LINK_FORM1_1.code, - DataCodeEnum.OMDB_LINK_FORM1_2.code, - DataCodeEnum.OMDB_LINK_FORM1_3.code, - DataCodeEnum.OMDB_LINK_FORM2_1.code, - DataCodeEnum.OMDB_LINK_FORM2_2.code, - DataCodeEnum.OMDB_LINK_FORM2_3.code, - DataCodeEnum.OMDB_LINK_FORM2_4.code, - DataCodeEnum.OMDB_LINK_FORM2_5.code, - DataCodeEnum.OMDB_LINK_FORM2_6.code, - DataCodeEnum.OMDB_LINK_FORM2_7.code, - DataCodeEnum.OMDB_LINK_FORM2_8.code, - DataCodeEnum.OMDB_LINK_FORM2_9.code, - DataCodeEnum.OMDB_LINK_FORM2_10.code, - DataCodeEnum.OMDB_LINK_FORM2_11.code, - DataCodeEnum.OMDB_LINK_FORM2_12.code, - DataCodeEnum.OMDB_LINK_FORM2_13.code -> "道路形态" + DataCodeEnum.OMDB_LINK_FORM1_1.code, DataCodeEnum.OMDB_LINK_FORM1_2.code, DataCodeEnum.OMDB_LINK_FORM1_3.code, DataCodeEnum.OMDB_LINK_FORM2_1.code, DataCodeEnum.OMDB_LINK_FORM2_2.code, DataCodeEnum.OMDB_LINK_FORM2_3.code, DataCodeEnum.OMDB_LINK_FORM2_4.code, DataCodeEnum.OMDB_LINK_FORM2_5.code, DataCodeEnum.OMDB_LINK_FORM2_6.code, DataCodeEnum.OMDB_LINK_FORM2_7.code, DataCodeEnum.OMDB_LINK_FORM2_8.code, DataCodeEnum.OMDB_LINK_FORM2_9.code, DataCodeEnum.OMDB_LINK_FORM2_10.code, DataCodeEnum.OMDB_LINK_FORM2_11.code, DataCodeEnum.OMDB_LINK_FORM2_12.code, DataCodeEnum.OMDB_LINK_FORM2_13.code -> "道路形态" else -> DataCodeEnum.findTableNameByCode(data.code) } @@ -161,15 +143,20 @@ class SignUtil { val list = mutableListOf() when (data.code) { //可变线限速 - DataCodeEnum.OMDB_LINK_SPEEDLIMIT_VAR.code -> - list.addAll(getChangeLimitSpeedInfo(data)) + DataCodeEnum.OMDB_LINK_SPEEDLIMIT_VAR.code -> list.addAll( + getChangeLimitSpeedInfo( + data + ) + ) //常规点限速 - DataCodeEnum.OMDB_SPEEDLIMIT.code -> - list.addAll(getSpeedLimitMoreInfoText(data)) + DataCodeEnum.OMDB_SPEEDLIMIT.code -> list.addAll(getSpeedLimitMoreInfoText(data)) //条件点限速 - DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> - list.addAll(getConditionLimitMoreInfoText(data)) + DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> list.addAll( + getConditionLimitMoreInfoText( + data + ) + ) //到路线 DataCodeEnum.OMDB_RD_LINK.code -> { list.add( @@ -229,14 +216,12 @@ class SignUtil { DataCodeEnum.OMDB_RESTRICTION.code -> { list.add( TwoItemAdapterItem( - title = "linkIn", - text = "${data.properties["linkIn"]}" + title = "linkIn", text = "${data.properties["linkIn"]}" ) ) list.add( TwoItemAdapterItem( - title = "linkOut", - text = "${data.properties["linkOut"]}" + title = "linkOut", text = "${data.properties["linkOut"]}" ) ) } @@ -244,8 +229,7 @@ class SignUtil { DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> { list.add( TwoItemAdapterItem( - title = "功能等级", - text = "等级${data.properties["functionClass"]}" + title = "功能等级", text = "等级${data.properties["functionClass"]}" ) ) } @@ -257,20 +241,17 @@ class SignUtil { DataCodeEnum.OMDB_LANE_NUM.code -> { list.add( TwoItemAdapterItem( - title = "车道总数", - text = "${data.properties["laneNum"]}" + title = "车道总数", text = "${data.properties["laneNum"]}" ) ) list.add( TwoItemAdapterItem( - title = "顺方向车道数", - text = "${data.properties["laneS2e"]}" + title = "顺方向车道数", text = "${data.properties["laneS2e"]}" ) ) list.add( TwoItemAdapterItem( - title = "逆方向车道数", - text = "${data.properties["laneE2s"]}" + title = "逆方向车道数", text = "${data.properties["laneE2s"]}" ) ) var str = when (data.properties["laneClass"]) { @@ -284,8 +265,7 @@ class SignUtil { list.add( TwoItemAdapterItem( - title = "车道数等级", - text = str + title = "车道数等级", text = str ) ) } @@ -298,8 +278,7 @@ class SignUtil { } list.add( TwoItemAdapterItem( - title = "路口类型", - text = type + title = "路口类型", text = type ) ) } @@ -318,8 +297,7 @@ class SignUtil { } list.add( TwoItemAdapterItem( - title = "限制类型", - text = limitType + title = "限制类型", text = limitType ) ) val validPeriod = data.properties["validPeriod"] @@ -352,8 +330,7 @@ class SignUtil { if (endTime != null) { list.add( TwoItemAdapterItem( - title = "施工结束时间", - text = "${TimePeriodUtil.getTimePeriod(endTime)}" + title = "施工结束时间", text = "${TimePeriodUtil.getTimePeriod(endTime)}" ) ) } @@ -370,14 +347,13 @@ class SignUtil { title = "警示信息号码", text = "${data.properties["warningsignId"]}" ) ) - val direct = when (data.properties["direct"]) { - "2" -> "顺方向" - "3" -> "逆方向" - else -> "" - } list.add( TwoItemAdapterItem( - title = "作用方向", text = direct + title = "作用方向", text = when (data.properties["direct"]) { + "2" -> "顺方向" + "3" -> "逆方向" + else -> "" + } ) ) @@ -418,11 +394,234 @@ class SignUtil { ) ) } + DataCodeEnum.OMDB_OBJECT_STOPLOCATION.code -> { + list.add( + TwoItemAdapterItem( + title = "对象号码", text = "${data.properties["objectPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "宽度", text = "${data.properties["width"]}mm" + ) + ) + + list.add( + TwoItemAdapterItem( + title = "颜色", text = when (data.properties["color"]) { + "1" -> "白色" + "9" -> "其他" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "类型", text = when (data.properties["locationType"]) { + "1" -> "停止线" + "2" -> "停车让行线" + "3" -> "减速让行线" + "4" -> "虚拟停止线" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + } + //人行横道 + DataCodeEnum.OMDB_CROSS_WALK.code -> { + list.add( + TwoItemAdapterItem( + title = "对象号码", text = "${data.properties["objectPid"]}" + ) + ) + + list.add( + TwoItemAdapterItem( + title = "颜色", text = when (data.properties["color"]) { + "1" -> "白色" + "9" -> "其他" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + } + DataCodeEnum.OMDB_OBJECT_TEXT.code -> { + list.add( + TwoItemAdapterItem( + title = "对象号码", text = "${data.properties["objectPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "长度", text = "${data.properties["length"]}mm" + ) + ) + list.add( + TwoItemAdapterItem( + title = "宽度", text = "${data.properties["width"]}mm" + ) + ) + list.add( + TwoItemAdapterItem( + title = "颜色", text = when (data.properties["color"]) { + "0" -> "未验证" + "1" -> "白色" + "2" -> "黄色" + "3" -> "红色" + "4" -> "彩色" + "9" -> "其他" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "文字内容", text = "${data.properties["textString"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + } + } adapter.data = list return adapter } + /** + * 获取路口详细信息 + */ + fun getTollgateInfo(renderEntity: RenderEntity): List { + val list = mutableListOf() + list.add( + LaneBoundaryItem("linkPid", "${renderEntity.properties["linkPid"]}", null) + ) + list.add( + LaneBoundaryItem("收费站号码", "${renderEntity.properties["tollgatePid"]}", null) + ) + list.add( + LaneBoundaryItem( + "作用方向", when (renderEntity.properties["direct"]) { + "2" -> "顺方向" + "3" -> "逆方向" + else -> "" + }, null + ) + ) + + list.add( + LaneBoundaryItem( + "类型", when (renderEntity.properties["tollType"]) { + "0" -> "未调查" + "1" -> "领卡" + "2" -> "交卡付费" + "3" -> "固定收费(次费)" + "4" -> "交卡付费后再领卡" + "5" -> "交卡付费并代收固定费用" + "6" -> "验票(无票收费)值先保留" + "7" -> "领卡并代收固定费用" + "8" -> "持卡打标识不收费" + "9" -> "验票领卡" + "10" -> "交卡不收费" + "11" -> "无收费站建筑物结构但收费" + "12" -> "废弃或非收费通道" + else -> "" + }, null + ) + ) + list.add( + LaneBoundaryItem("地图代码", "${renderEntity.properties["backimageCode"]}", null) + ) + list.add( + LaneBoundaryItem("箭头代码", "${renderEntity.properties["arrowCode"]}", null) + ) + try { + val linkList = renderEntity.properties["tollinfoList"] + if (linkList != null && linkList != "" && linkList != "null") { + val itemList = mutableListOf() + val jsonArray = JSONArray(linkList) + for (i in 0 until jsonArray.length()) { + val arrayObject: JSONObject = jsonArray[i] as JSONObject + + // itemList.add(TwoItemAdapterItem("方向", direct)) + + try { + val stringBuffer = StringBuffer() + val cardType = arrayObject.getInt("cardType") + for (i in 2 downTo 0) { + val bit = (cardType shr i) and 1 + if (bit == 1) { + when (i) { + 0 -> stringBuffer.append("ETC ") + 1 -> stringBuffer.append("人工 ") + 2 -> stringBuffer.append("自助 ") + } + } + } + itemList.add( + TwoItemAdapterItem("领卡方式", stringBuffer.toString()) + ) + } catch (e: Exception) { + Log.e("jingo", "领卡方式 报错 ${e.message}") + } + try { + val stringBuffer = StringBuffer() + val passageType = arrayObject.getInt("passageType") + for (i in 2 downTo 0) { + val bit = (passageType shr i) and 1 + if (bit == 1) { + when (i) { + 0 -> stringBuffer.append("ETC ") + 1 -> stringBuffer.append("人工 ") + 2 -> stringBuffer.append("自助 ") + } + } + } + itemList.add( + TwoItemAdapterItem("领卡方式", stringBuffer.toString()) + ) + } catch (e: Exception) { + Log.e("jingo", "领卡方式 报错 ${e.message}") + } + } + list.add( + LaneBoundaryItem( + "车道信息", null, itemList + ) + ) + } + + } catch (e: Exception) { + + } + return list + } + /** * 获取路口详细信息 @@ -431,9 +630,7 @@ class SignUtil { val list = mutableListOf() list.add( LaneBoundaryItem( - "路口号码", - "${renderEntity.properties["intersectionPid"]}", - null + "路口号码", "${renderEntity.properties["intersectionPid"]}", null ) ) val type = when (renderEntity.properties["type"]) { @@ -464,9 +661,7 @@ class SignUtil { list.add( LaneBoundaryItem( - "车道标线序号${arrayObject.getInt("markSeqNum")}", - null, - itemList + "车道标线序号${arrayObject.getInt("markSeqNum")}", null, itemList ) ) } @@ -533,8 +728,7 @@ class SignUtil { itemList.add(TwoItemAdapterItem("车道标线颜色", markColor)) itemList.add( TwoItemAdapterItem( - "车道标线宽度(mm)", - "${arrayObject.getInt("markWidth")}" + "车道标线宽度(mm)", "${arrayObject.getInt("markWidth")}" ) ) @@ -548,15 +742,12 @@ class SignUtil { itemList.add(TwoItemAdapterItem("车道标线材质", markMaterial)) itemList.add( TwoItemAdapterItem( - "横向偏移(mm)", - "${arrayObject.getInt("lateralOffset")}" + "横向偏移(mm)", "${arrayObject.getInt("lateralOffset")}" ) ) list.add( LaneBoundaryItem( - "车道标线序号${arrayObject.getInt("markSeqNum")}", - null, - itemList + "车道标线序号${arrayObject.getInt("markSeqNum")}", null, itemList ) ) } @@ -577,6 +768,16 @@ class SignUtil { DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getConditionLimitText(data) //电子眼 DataCodeEnum.OMDB_ELECTRONICEYE.code -> data.properties["name"].toString() + //收费站 + DataCodeEnum.OMDB_TOLLGATE.code -> { + val tollinfoList = data.properties["tollinfoList"] + try { + val jsonArray = JSONArray(tollinfoList) + return "${jsonArray.length()}" + } catch (e: Exception) { + return "" + } + } else -> "" } } @@ -673,8 +874,7 @@ class SignUtil { val multiDigitized = data.properties["multiDigitized"] try { - if (multiDigitized?.toInt() == 1) - return "上下线" + if (multiDigitized?.toInt() == 1) return "上下线" } catch (e: Throwable) { } @@ -787,8 +987,16 @@ class SignUtil { //警示信息 DataCodeEnum.OMDB_WARNINGSIGN.code -> { val typeCode = data.properties["typeCode"] - if (typeCode != null) - return typeCode.toInt() + if (typeCode != null) return typeCode.toInt() + return 0 + } + //收费站 + DataCodeEnum.OMDB_TOLLGATE.code -> { + var backimageCode = data.properties["backimageCode"] + if (backimageCode != null) { + backimageCode = backimageCode.lowercase() + return getResId(backimageCode, R.drawable::class.java) + } return 0 } else -> 0 @@ -957,6 +1165,8 @@ class SignUtil { DataCodeEnum.OMDB_SPEEDLIMIT_COND.code, //电子眼 DataCodeEnum.OMDB_ELECTRONICEYE.code, + //收费站 + DataCodeEnum.OMDB_TOLLGATE.code, //警示信息 DataCodeEnum.OMDB_WARNINGSIGN.code -> true else -> false @@ -1008,8 +1218,7 @@ class SignUtil { if (dir != "") { list.add( TwoItemAdapterItem( - title = "作用方向", - text = dir + title = "作用方向", text = dir ) ) } @@ -1245,15 +1454,13 @@ class SignUtil { if (dir != "") { list.add( TwoItemAdapterItem( - title = "限速方向", - text = dir + title = "限速方向", text = dir ) ) } list.add( TwoItemAdapterItem( - title = "最高限速值(km/h)", - text = "${data.properties["maxSpeed"]}" + title = "最高限速值(km/h)", text = "${data.properties["maxSpeed"]}" ) ) var maxStr = when (data.properties["maxSpeedSource"]) { @@ -1271,15 +1478,13 @@ class SignUtil { if (maxStr != "") { list.add( TwoItemAdapterItem( - title = "最高限速来源", - text = maxStr + title = "最高限速来源", text = maxStr ) ) } list.add( TwoItemAdapterItem( - title = "最低限速值(km/h)", - text = "${data.properties["minSpeed"]}" + title = "最低限速值(km/h)", text = "${data.properties["minSpeed"]}" ) ) var minStr = when (data.properties["minSpeedSource"]) { @@ -1297,8 +1502,7 @@ class SignUtil { if (minStr != "") { list.add( TwoItemAdapterItem( - title = "最低限速来源", - text = minStr + title = "最低限速来源", text = minStr ) ) } @@ -1314,8 +1518,7 @@ class SignUtil { if (isLaneDependent != "") { list.add( TwoItemAdapterItem( - title = "是否车道依赖", - text = isLaneDependent + title = "是否车道依赖", text = isLaneDependent ) ) } diff --git a/app/src/main/res/drawable-xxhdpi/e00000000.png b/app/src/main/res/drawable-xxhdpi/e00000000.png new file mode 100644 index 00000000..676b6810 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00000000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00000100.png b/app/src/main/res/drawable-xxhdpi/e00000100.png new file mode 100644 index 00000000..9119cb92 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00000100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00001000.png b/app/src/main/res/drawable-xxhdpi/e00001000.png new file mode 100644 index 00000000..38e5f139 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00001000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00001100.png b/app/src/main/res/drawable-xxhdpi/e00001100.png new file mode 100644 index 00000000..a9f60e74 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00001100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00010000.png b/app/src/main/res/drawable-xxhdpi/e00010000.png new file mode 100644 index 00000000..e149aa89 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00010000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00010100.png b/app/src/main/res/drawable-xxhdpi/e00010100.png new file mode 100644 index 00000000..7bee2d48 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00010100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00011000.png b/app/src/main/res/drawable-xxhdpi/e00011000.png new file mode 100644 index 00000000..bda24db8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00011000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00011100.png b/app/src/main/res/drawable-xxhdpi/e00011100.png new file mode 100644 index 00000000..25ee827c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00011100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00100000.png b/app/src/main/res/drawable-xxhdpi/e00100000.png new file mode 100644 index 00000000..3122bfe3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00100000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00110000.png b/app/src/main/res/drawable-xxhdpi/e00110000.png new file mode 100644 index 00000000..cd827937 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00110000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00200000.png b/app/src/main/res/drawable-xxhdpi/e00200000.png new file mode 100644 index 00000000..26c077df Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00200000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00210000.png b/app/src/main/res/drawable-xxhdpi/e00210000.png new file mode 100644 index 00000000..a572b353 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00210000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00211000.png b/app/src/main/res/drawable-xxhdpi/e00211000.png new file mode 100644 index 00000000..425934e1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00211000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00300000.png b/app/src/main/res/drawable-xxhdpi/e00300000.png new file mode 100644 index 00000000..b32d21dc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00300000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00300100.png b/app/src/main/res/drawable-xxhdpi/e00300100.png new file mode 100644 index 00000000..934913eb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00300100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00301000.png b/app/src/main/res/drawable-xxhdpi/e00301000.png new file mode 100644 index 00000000..08d3b7f9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00301000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00301100.png b/app/src/main/res/drawable-xxhdpi/e00301100.png new file mode 100644 index 00000000..493ab94f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00301100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00310000.png b/app/src/main/res/drawable-xxhdpi/e00310000.png new file mode 100644 index 00000000..f41e3329 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00310000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00310100.png b/app/src/main/res/drawable-xxhdpi/e00310100.png new file mode 100644 index 00000000..05c95eb7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00310100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00311000.png b/app/src/main/res/drawable-xxhdpi/e00311000.png new file mode 100644 index 00000000..febb8897 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00311000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00311100.png b/app/src/main/res/drawable-xxhdpi/e00311100.png new file mode 100644 index 00000000..a9da8c82 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00311100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00400000.png b/app/src/main/res/drawable-xxhdpi/e00400000.png new file mode 100644 index 00000000..a367913a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00400000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00400010.png b/app/src/main/res/drawable-xxhdpi/e00400010.png new file mode 100644 index 00000000..071ff417 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00400010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00400100.png b/app/src/main/res/drawable-xxhdpi/e00400100.png new file mode 100644 index 00000000..54c3891d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00400100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00400110.png b/app/src/main/res/drawable-xxhdpi/e00400110.png new file mode 100644 index 00000000..1d58b169 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00400110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00401000.png b/app/src/main/res/drawable-xxhdpi/e00401000.png new file mode 100644 index 00000000..c5ca3f4a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00401000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00401010.png b/app/src/main/res/drawable-xxhdpi/e00401010.png new file mode 100644 index 00000000..69f0a557 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00401010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00401100.png b/app/src/main/res/drawable-xxhdpi/e00401100.png new file mode 100644 index 00000000..c38bd5df Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00401100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00401110.png b/app/src/main/res/drawable-xxhdpi/e00401110.png new file mode 100644 index 00000000..d3e47b69 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00401110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00410000.png b/app/src/main/res/drawable-xxhdpi/e00410000.png new file mode 100644 index 00000000..acb88955 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00410000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00410010.png b/app/src/main/res/drawable-xxhdpi/e00410010.png new file mode 100644 index 00000000..8f932665 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00410010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00410100.png b/app/src/main/res/drawable-xxhdpi/e00410100.png new file mode 100644 index 00000000..2114d96e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00410100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00410110.png b/app/src/main/res/drawable-xxhdpi/e00410110.png new file mode 100644 index 00000000..8978ac54 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00410110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00411000.png b/app/src/main/res/drawable-xxhdpi/e00411000.png new file mode 100644 index 00000000..1bc4f0e6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00411000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00411010.png b/app/src/main/res/drawable-xxhdpi/e00411010.png new file mode 100644 index 00000000..edb4f12b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00411010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00411100.png b/app/src/main/res/drawable-xxhdpi/e00411100.png new file mode 100644 index 00000000..1accf361 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00411100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00411110.png b/app/src/main/res/drawable-xxhdpi/e00411110.png new file mode 100644 index 00000000..55f392a1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00411110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500000.png b/app/src/main/res/drawable-xxhdpi/e00500000.png new file mode 100644 index 00000000..c88cdb14 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500001.png b/app/src/main/res/drawable-xxhdpi/e00500001.png new file mode 100644 index 00000000..ae4a40ca Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500010.png b/app/src/main/res/drawable-xxhdpi/e00500010.png new file mode 100644 index 00000000..c0bfb8ce Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500011.png b/app/src/main/res/drawable-xxhdpi/e00500011.png new file mode 100644 index 00000000..1cf1a6cd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500100.png b/app/src/main/res/drawable-xxhdpi/e00500100.png new file mode 100644 index 00000000..f9164732 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500101.png b/app/src/main/res/drawable-xxhdpi/e00500101.png new file mode 100644 index 00000000..d1a6368e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500110.png b/app/src/main/res/drawable-xxhdpi/e00500110.png new file mode 100644 index 00000000..e5a5c757 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00500111.png b/app/src/main/res/drawable-xxhdpi/e00500111.png new file mode 100644 index 00000000..9ccd3b9f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00500111.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501000.png b/app/src/main/res/drawable-xxhdpi/e00501000.png new file mode 100644 index 00000000..32a8389e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501001.png b/app/src/main/res/drawable-xxhdpi/e00501001.png new file mode 100644 index 00000000..09c61304 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501010.png b/app/src/main/res/drawable-xxhdpi/e00501010.png new file mode 100644 index 00000000..0808e6cf Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501011.png b/app/src/main/res/drawable-xxhdpi/e00501011.png new file mode 100644 index 00000000..d9adaca0 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501100.png b/app/src/main/res/drawable-xxhdpi/e00501100.png new file mode 100644 index 00000000..3b2065c2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501101.png b/app/src/main/res/drawable-xxhdpi/e00501101.png new file mode 100644 index 00000000..8276a3e7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501110.png b/app/src/main/res/drawable-xxhdpi/e00501110.png new file mode 100644 index 00000000..9e4b53b7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00501111.png b/app/src/main/res/drawable-xxhdpi/e00501111.png new file mode 100644 index 00000000..38428569 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00501111.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510000.png b/app/src/main/res/drawable-xxhdpi/e00510000.png new file mode 100644 index 00000000..362a8beb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510001.png b/app/src/main/res/drawable-xxhdpi/e00510001.png new file mode 100644 index 00000000..98f25178 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510010.png b/app/src/main/res/drawable-xxhdpi/e00510010.png new file mode 100644 index 00000000..969f57dd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510011.png b/app/src/main/res/drawable-xxhdpi/e00510011.png new file mode 100644 index 00000000..929d98b1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510100.png b/app/src/main/res/drawable-xxhdpi/e00510100.png new file mode 100644 index 00000000..8f512e52 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510101.png b/app/src/main/res/drawable-xxhdpi/e00510101.png new file mode 100644 index 00000000..8a60d0b3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510110.png b/app/src/main/res/drawable-xxhdpi/e00510110.png new file mode 100644 index 00000000..5144abb4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00510111.png b/app/src/main/res/drawable-xxhdpi/e00510111.png new file mode 100644 index 00000000..2760ff2c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00510111.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511000.png b/app/src/main/res/drawable-xxhdpi/e00511000.png new file mode 100644 index 00000000..76df8202 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511001.png b/app/src/main/res/drawable-xxhdpi/e00511001.png new file mode 100644 index 00000000..725ec786 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511010.png b/app/src/main/res/drawable-xxhdpi/e00511010.png new file mode 100644 index 00000000..f06b1ac8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511011.png b/app/src/main/res/drawable-xxhdpi/e00511011.png new file mode 100644 index 00000000..bfd43690 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511100.png b/app/src/main/res/drawable-xxhdpi/e00511100.png new file mode 100644 index 00000000..9b46e63c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511101.png b/app/src/main/res/drawable-xxhdpi/e00511101.png new file mode 100644 index 00000000..f69ba602 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511110.png b/app/src/main/res/drawable-xxhdpi/e00511110.png new file mode 100644 index 00000000..84115bab Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e00511111.png b/app/src/main/res/drawable-xxhdpi/e00511111.png new file mode 100644 index 00000000..c151c606 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e00511111.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01000000.png b/app/src/main/res/drawable-xxhdpi/e01000000.png new file mode 100644 index 00000000..89b41cb9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01000000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01000100.png b/app/src/main/res/drawable-xxhdpi/e01000100.png new file mode 100644 index 00000000..473fe278 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01000100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01001000.png b/app/src/main/res/drawable-xxhdpi/e01001000.png new file mode 100644 index 00000000..94145f78 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01001000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01001100.png b/app/src/main/res/drawable-xxhdpi/e01001100.png new file mode 100644 index 00000000..1ee7b83a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01001100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01010000.png b/app/src/main/res/drawable-xxhdpi/e01010000.png new file mode 100644 index 00000000..7db4da3d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01010000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01010100.png b/app/src/main/res/drawable-xxhdpi/e01010100.png new file mode 100644 index 00000000..3f069a39 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01010100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01011000.png b/app/src/main/res/drawable-xxhdpi/e01011000.png new file mode 100644 index 00000000..d80710dc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01011000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01011100.png b/app/src/main/res/drawable-xxhdpi/e01011100.png new file mode 100644 index 00000000..62649e15 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01011100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01100000.png b/app/src/main/res/drawable-xxhdpi/e01100000.png new file mode 100644 index 00000000..15440653 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01100000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01110000.png b/app/src/main/res/drawable-xxhdpi/e01110000.png new file mode 100644 index 00000000..908a1a6c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01110000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01200000.png b/app/src/main/res/drawable-xxhdpi/e01200000.png new file mode 100644 index 00000000..f6c14c34 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01200000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01201000.png b/app/src/main/res/drawable-xxhdpi/e01201000.png new file mode 100644 index 00000000..0e227160 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01201000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01210000.png b/app/src/main/res/drawable-xxhdpi/e01210000.png new file mode 100644 index 00000000..edf83404 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01210000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01211000.png b/app/src/main/res/drawable-xxhdpi/e01211000.png new file mode 100644 index 00000000..b587ed3d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01211000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01300000.png b/app/src/main/res/drawable-xxhdpi/e01300000.png new file mode 100644 index 00000000..af09cf29 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01300000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01300100.png b/app/src/main/res/drawable-xxhdpi/e01300100.png new file mode 100644 index 00000000..4d2976d3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01300100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01301000.png b/app/src/main/res/drawable-xxhdpi/e01301000.png new file mode 100644 index 00000000..43f1c565 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01301000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01301100.png b/app/src/main/res/drawable-xxhdpi/e01301100.png new file mode 100644 index 00000000..588956c9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01301100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01310000.png b/app/src/main/res/drawable-xxhdpi/e01310000.png new file mode 100644 index 00000000..b0fd332d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01310000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01310100.png b/app/src/main/res/drawable-xxhdpi/e01310100.png new file mode 100644 index 00000000..3215e10e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01310100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01311000.png b/app/src/main/res/drawable-xxhdpi/e01311000.png new file mode 100644 index 00000000..225720e9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01311000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01311100.png b/app/src/main/res/drawable-xxhdpi/e01311100.png new file mode 100644 index 00000000..7d1d7994 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01311100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01400000.png b/app/src/main/res/drawable-xxhdpi/e01400000.png new file mode 100644 index 00000000..fa4f0317 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01400000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01400010.png b/app/src/main/res/drawable-xxhdpi/e01400010.png new file mode 100644 index 00000000..b750b223 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01400010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01400100.png b/app/src/main/res/drawable-xxhdpi/e01400100.png new file mode 100644 index 00000000..e1fb1e31 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01400100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01400110.png b/app/src/main/res/drawable-xxhdpi/e01400110.png new file mode 100644 index 00000000..195081c1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01400110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01401000.png b/app/src/main/res/drawable-xxhdpi/e01401000.png new file mode 100644 index 00000000..b1b56336 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01401000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01401010.png b/app/src/main/res/drawable-xxhdpi/e01401010.png new file mode 100644 index 00000000..450480c9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01401010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01401100.png b/app/src/main/res/drawable-xxhdpi/e01401100.png new file mode 100644 index 00000000..fba89cd9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01401100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01401110.png b/app/src/main/res/drawable-xxhdpi/e01401110.png new file mode 100644 index 00000000..bdf230f7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01401110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01410000.png b/app/src/main/res/drawable-xxhdpi/e01410000.png new file mode 100644 index 00000000..25562373 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01410000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01410010.png b/app/src/main/res/drawable-xxhdpi/e01410010.png new file mode 100644 index 00000000..b68e961b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01410010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01410100.png b/app/src/main/res/drawable-xxhdpi/e01410100.png new file mode 100644 index 00000000..91110378 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01410100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01410110.png b/app/src/main/res/drawable-xxhdpi/e01410110.png new file mode 100644 index 00000000..f3bb59b8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01410110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01411000.png b/app/src/main/res/drawable-xxhdpi/e01411000.png new file mode 100644 index 00000000..975ccbc9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01411000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01411010.png b/app/src/main/res/drawable-xxhdpi/e01411010.png new file mode 100644 index 00000000..6e094be8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01411010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01411100.png b/app/src/main/res/drawable-xxhdpi/e01411100.png new file mode 100644 index 00000000..d9297c24 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01411100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01411110.png b/app/src/main/res/drawable-xxhdpi/e01411110.png new file mode 100644 index 00000000..5b29ed1d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01411110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500000.png b/app/src/main/res/drawable-xxhdpi/e01500000.png new file mode 100644 index 00000000..b7e6e247 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500001.png b/app/src/main/res/drawable-xxhdpi/e01500001.png new file mode 100644 index 00000000..39a5d5f7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500010.png b/app/src/main/res/drawable-xxhdpi/e01500010.png new file mode 100644 index 00000000..1e2f2b62 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500011.png b/app/src/main/res/drawable-xxhdpi/e01500011.png new file mode 100644 index 00000000..9dca24d8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500100.png b/app/src/main/res/drawable-xxhdpi/e01500100.png new file mode 100644 index 00000000..0d35c17a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500101.png b/app/src/main/res/drawable-xxhdpi/e01500101.png new file mode 100644 index 00000000..1c6f8dc4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500110.png b/app/src/main/res/drawable-xxhdpi/e01500110.png new file mode 100644 index 00000000..bb31282b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01500111.png b/app/src/main/res/drawable-xxhdpi/e01500111.png new file mode 100644 index 00000000..619e470c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01500111.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501000.png b/app/src/main/res/drawable-xxhdpi/e01501000.png new file mode 100644 index 00000000..4796db33 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501001.png b/app/src/main/res/drawable-xxhdpi/e01501001.png new file mode 100644 index 00000000..b6d63748 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501010.png b/app/src/main/res/drawable-xxhdpi/e01501010.png new file mode 100644 index 00000000..caa1a77a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501011.png b/app/src/main/res/drawable-xxhdpi/e01501011.png new file mode 100644 index 00000000..a7abcda8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501100.png b/app/src/main/res/drawable-xxhdpi/e01501100.png new file mode 100644 index 00000000..774667a1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501101.png b/app/src/main/res/drawable-xxhdpi/e01501101.png new file mode 100644 index 00000000..76e78301 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501110.png b/app/src/main/res/drawable-xxhdpi/e01501110.png new file mode 100644 index 00000000..af06f820 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01501111.png b/app/src/main/res/drawable-xxhdpi/e01501111.png new file mode 100644 index 00000000..ecf04017 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01501111.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510000.png b/app/src/main/res/drawable-xxhdpi/e01510000.png new file mode 100644 index 00000000..f62bce15 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510001.png b/app/src/main/res/drawable-xxhdpi/e01510001.png new file mode 100644 index 00000000..fc352c52 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510010.png b/app/src/main/res/drawable-xxhdpi/e01510010.png new file mode 100644 index 00000000..ae082bdf Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510011.png b/app/src/main/res/drawable-xxhdpi/e01510011.png new file mode 100644 index 00000000..84f8d92b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510100.png b/app/src/main/res/drawable-xxhdpi/e01510100.png new file mode 100644 index 00000000..131282c8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510101.png b/app/src/main/res/drawable-xxhdpi/e01510101.png new file mode 100644 index 00000000..105fd22d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510110.png b/app/src/main/res/drawable-xxhdpi/e01510110.png new file mode 100644 index 00000000..8e52318c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01510111.png b/app/src/main/res/drawable-xxhdpi/e01510111.png new file mode 100644 index 00000000..a75dc306 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01510111.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511000.png b/app/src/main/res/drawable-xxhdpi/e01511000.png new file mode 100644 index 00000000..52a821c2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511000.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511001.png b/app/src/main/res/drawable-xxhdpi/e01511001.png new file mode 100644 index 00000000..f5da2b8a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511001.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511010.png b/app/src/main/res/drawable-xxhdpi/e01511010.png new file mode 100644 index 00000000..99acd701 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511010.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511011.png b/app/src/main/res/drawable-xxhdpi/e01511011.png new file mode 100644 index 00000000..358cc9b4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511011.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511100.png b/app/src/main/res/drawable-xxhdpi/e01511100.png new file mode 100644 index 00000000..4f55b283 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511100.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511101.png b/app/src/main/res/drawable-xxhdpi/e01511101.png new file mode 100644 index 00000000..716d4109 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511101.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511110.png b/app/src/main/res/drawable-xxhdpi/e01511110.png new file mode 100644 index 00000000..5f00546e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511110.png differ diff --git a/app/src/main/res/drawable-xxhdpi/e01511111.png b/app/src/main/res/drawable-xxhdpi/e01511111.png new file mode 100644 index 00000000..a08fecc3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/e01511111.png differ diff --git a/app/src/main/res/layout/adapter_sign.xml b/app/src/main/res/layout/adapter_sign.xml index 0f459c0b..668abcff 100644 --- a/app/src/main/res/layout/adapter_sign.xml +++ b/app/src/main/res/layout/adapter_sign.xml @@ -47,7 +47,7 @@ android:layout_marginLeft="15dp" android:layout_marginBottom="5dp" android:gravity="center" - android:text="道路名" + android:text="要素名" android:textColor="@color/white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/adapter_sign_laneinfo.xml b/app/src/main/res/layout/adapter_sign_laneinfo.xml index 261a18f9..433ee36b 100644 --- a/app/src/main/res/layout/adapter_sign_laneinfo.xml +++ b/app/src/main/res/layout/adapter_sign_laneinfo.xml @@ -23,7 +23,7 @@ android:layout_marginLeft="15dp" android:layout_marginBottom="5dp" android:gravity="center" - android:text="道路名" + android:text="车信" android:textColor="@color/white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/adapter_sign_tollgate.xml b/app/src/main/res/layout/adapter_sign_tollgate.xml new file mode 100644 index 00000000..73119ea7 --- /dev/null +++ b/app/src/main/res/layout/adapter_sign_tollgate.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + \ No newline at end of file