From 91271fbf8cb9d1fe5534983881d5ab134f194ff0 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Fri, 26 Sep 2025 18:29:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=BD=95=E7=82=B9=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/AndroidManifest.xml | 1 + .../adapter/GeoPointMultiAdapter.kt | 91 +++++++ .../com/zmkg/coaloperation/bean/OtherData.kt | 23 +- .../geologging/AddGeologicalPointActivity.kt | 64 +++++ .../main/res/drawable-xxhdpi/ic_add_image.png | Bin 0 -> 1885 bytes .../layout/activity_add_geological_point.xml | 45 ++++ .../list_item_point_base_horizontal.xml | 49 ++++ .../res/layout/list_item_point_base_info.xml | 40 +++ .../layout/list_item_point_base_vertical.xml | 61 +++++ .../layout/list_item_point_calculate_info.xml | 237 ++++++++++++++++++ .../main/res/layout/list_item_point_image.xml | 13 + .../layout/list_item_point_logging_info.xml | 147 +++++++++++ .../layout/list_item_point_logging_item.xml | 46 ++++ .../layout/list_item_point_upload_image.xml | 33 +++ 14 files changed, 849 insertions(+), 1 deletion(-) create mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/GeoPointMultiAdapter.kt create mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/geologging/AddGeologicalPointActivity.kt create mode 100644 coalMiningApp/app/src/main/res/drawable-xxhdpi/ic_add_image.png create mode 100644 coalMiningApp/app/src/main/res/layout/activity_add_geological_point.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_base_horizontal.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_base_info.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_base_vertical.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_calculate_info.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_image.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_logging_info.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_logging_item.xml create mode 100644 coalMiningApp/app/src/main/res/layout/list_item_point_upload_image.xml diff --git a/coalMiningApp/app/src/main/AndroidManifest.xml b/coalMiningApp/app/src/main/AndroidManifest.xml index 283d7a7..a80e8ae 100644 --- a/coalMiningApp/app/src/main/AndroidManifest.xml +++ b/coalMiningApp/app/src/main/AndroidManifest.xml @@ -68,6 +68,7 @@ + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/GeoPointMultiAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/GeoPointMultiAdapter.kt new file mode 100644 index 0000000..f23fe88 --- /dev/null +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/GeoPointMultiAdapter.kt @@ -0,0 +1,91 @@ +package com.zmkg.coaloperation.adapter + +import android.view.LayoutInflater +import android.widget.LinearLayout +import androidx.core.view.updateLayoutParams +import com.chad.library.adapter.base.BaseMultiItemQuickAdapter +import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.zmkg.coaloperation.R +import com.zmkg.coaloperation.bean.BaseItem +import com.zmkg.coaloperation.bean.GeoPointMultiItem +import com.zmkg.coaloperation.databinding.ListItemPointBaseHorizontalBinding +import com.zmkg.coaloperation.databinding.ListItemPointLoggingItemBinding +import com.zmkg.coaloperation.utils.gone +import com.zmkg.coaloperation.utils.visible + +class GeoPointMultiAdapter(list: MutableList): + BaseMultiItemQuickAdapter(list){ + + init { + addItemType(GeoPointMultiItem.TYPE_BASE_INFO, R.layout.list_item_point_base_info) + addItemType(GeoPointMultiItem.TYPE_LOGGING_INFO, R.layout.list_item_point_logging_info) + addItemType(GeoPointMultiItem.TYPE_CALCULATE_INFO, R.layout.list_item_point_calculate_info) + addItemType(GeoPointMultiItem.TYPE_UPLOAD_IMAGE, R.layout.list_item_point_upload_image) + } + + override fun convert( + holder: BaseViewHolder, + item: GeoPointMultiItem + ) { + when (holder.itemViewType) { + GeoPointMultiItem.TYPE_BASE_INFO->{ + loadBaseInfo(holder, item) + } + GeoPointMultiItem.TYPE_LOGGING_INFO->{ + loadLoggingInfo(holder, item) + } + GeoPointMultiItem.TYPE_CALCULATE_INFO->{ + loadCalculateInfo(holder, item) + } + GeoPointMultiItem.TYPE_UPLOAD_IMAGE->{ + loadUploadImage(holder, item) + } + } + } + + private fun loadUploadImage(holder: BaseViewHolder,item: GeoPointMultiItem) {} + + private fun loadCalculateInfo(holder: BaseViewHolder,item: GeoPointMultiItem) {} + + private fun loadLoggingInfo(holder: BaseViewHolder,item: GeoPointMultiItem) { + + } + + private fun loadBaseInfo(holder: BaseViewHolder,item: GeoPointMultiItem) { + val llBaseTop = holder.itemView.findViewById(R.id.llBaseTop) + val topList = mutableListOf( + BaseItem(name = "点号", value = "1#"), + BaseItem(name = "点距", value = "1#"), + BaseItem(name = "累距", value = "78.874"), + ) + val bottomList = mutableListOf( + BaseItem(name = "巷高", value = "2.855"), + BaseItem(name = "顶板", value = "1024.491"), + BaseItem(name = "底板", value = "1018.491"), + BaseItem(name = "巷顶煤厚", value = "0.15"), + ) + topList.forEach { + val itemBinding = ListItemPointBaseHorizontalBinding.inflate(LayoutInflater.from(context)) + itemBinding.run { + tvItemName.text = it.name + tvItemValue.text = it.value + } + llBaseTop.addView(itemBinding.root) + } + val llBaseBottom = holder.itemView.findViewById(R.id.llBaseBottom) + + bottomList.forEachIndexed {index, it -> + val itemBinding = ListItemPointBaseHorizontalBinding.inflate(LayoutInflater.from(context)) + itemBinding.run { + tvItemName.text = it.name + tvItemValue.text = it.value + } + itemBinding.root.updateLayoutParams { + width = 0 + height = LinearLayout.LayoutParams.MATCH_PARENT + weight = if (index == bottomList.size - 1) 1.24F else 1.0F + } + llBaseBottom.addView(itemBinding.root) + } + } +} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/OtherData.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/OtherData.kt index 5f964e6..f7a9371 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/OtherData.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/OtherData.kt @@ -1,5 +1,7 @@ package com.zmkg.coaloperation.bean +import com.chad.library.adapter.base.entity.MultiItemEntity + data class UserMenuBean( var menuName: String, var iconResId: Int, @@ -49,4 +51,23 @@ data class GeoPointItem( data class GeoPointParent( var name: String = "", var list: MutableList? = null -) \ No newline at end of file +) + +data class BaseItem( + var name: String = "", + var value: String = "" +) + +data class GeoPointMultiItem( + override val itemType: Int, + var pointName: String = "", + var pointDistance: String = "", + var totalDistance: String = "", +): MultiItemEntity { + companion object { + const val TYPE_BASE_INFO = 1 + const val TYPE_LOGGING_INFO = 2 + const val TYPE_CALCULATE_INFO = 3 + const val TYPE_UPLOAD_IMAGE = 4 + } +} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/geologging/AddGeologicalPointActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/geologging/AddGeologicalPointActivity.kt new file mode 100644 index 0000000..390a27f --- /dev/null +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/geologging/AddGeologicalPointActivity.kt @@ -0,0 +1,64 @@ +package com.zmkg.coaloperation.ui.geologging + +import android.os.Bundle +import android.view.View +import androidx.recyclerview.widget.LinearLayoutManager +import com.zmkg.coaloperation.R +import com.zmkg.coaloperation.adapter.GeoPointParentAdapter +import com.zmkg.coaloperation.base.BaseVMBActivity +import com.zmkg.coaloperation.base.viewmodel.TestViewModel +import com.zmkg.coaloperation.bean.GeoPointItem +import com.zmkg.coaloperation.bean.GeoPointParent +import com.zmkg.coaloperation.databinding.ActivityGeologicalPointBinding + +/** + * 地质编录点新增 + */ +class AddGeologicalPointActivity : + BaseVMBActivity(R.layout.activity_geological_point) { + + private val parentList: MutableList = mutableListOf( + GeoPointParent(name = "已编录点"), + GeoPointParent(name = "未编录点") + ) + private val parentAdapter by lazy { + GeoPointParentAdapter(parentList) + } + + override fun initView(savedInstanceState: Bundle?) { + mBinding.toolbarLay.title = "编录点" +// mBinding.toolbarLay.rightText = "新增工作面" + + val subList = mutableListOf( + GeoPointItem(isLogging = true, name = "1#", distance = "0", isChecked = true), + GeoPointItem(isLogging = true, name = "2#", distance = "24.252"), + GeoPointItem(isLogging = true, name = "3#", distance = "37.859"), + GeoPointItem(isLogging = true, name = "4#", distance = "43.123"), + GeoPointItem(isLogging = true, name = "5#", distance = "50.567"), + GeoPointItem(isLogging = true, name = "6#", distance = "60.567"), + GeoPointItem(isLogging = true, name = "7#", distance = "70.567") + ) + val subList2 = mutableListOf( + GeoPointItem(name = "1#", distance = "0"), + GeoPointItem(name = "2#", distance = "24.252"), + GeoPointItem(name = "3#", distance = "37.859"), + GeoPointItem(name = "4#", distance = "56.859"), + GeoPointItem(name = "5#", distance = "89.859") + ) + parentList[0].list = subList + parentList[1].list = subList2 + mBinding.rvPointParent.let { + it.layoutManager = LinearLayoutManager(this) + it.adapter = parentAdapter + } + } + + override fun initData() { + } + + override fun bindEvent() { + } + + override fun processClick(v: View?) { + } +} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/drawable-xxhdpi/ic_add_image.png b/coalMiningApp/app/src/main/res/drawable-xxhdpi/ic_add_image.png new file mode 100644 index 0000000000000000000000000000000000000000..2bf0f7bf5a36fdc59c7bdd56b418dbeac2a377ef GIT binary patch literal 1885 zcmV-j2cr0iP)~6Ox)v6UgK&%KB6@4fc3su`%QA81;h!2*oRca@*Gntjzoy=C4QahQo z(oSY}GD}79K`U5keep?!;s;a|YQYy#w2EK&g^GP}o5}UwZKq_ClWmeFX?A);4#}MR zKj)tO<~Fm*ane_5!`H+f1{GMgNZA48?dCBE9pt=kX^&~0mzPh^@*Rsw#+ObM|qpm zIz!}Bn+&F3dhS<>^i4X}0lSXxXDHe2%on6a!`Su<&(k%(HFovbmeqr~-M;qT@`qD( z^|0NV&C)TavenxDon6ECTYBjOr*7Y5>2KcVH12n5vA%gfP93kunUDLNIv(rPolA|` zLUp6FkM3&}@TgL|pZ)VUx+1Zin*bpso6S$&iK$S)9k3oDARPg*_#!|lyb4n1VL%oX zFadG}p`9NQy>KA}2*7a$@_M8RztEt--VaG)8!ROKzN9Op889i3L9AZ}9&-y{R0L4K z1i+LmG80uN{ho*aX(*HS85(Lt(V3yISSaQmk&0Z<3C^l=i5gB*b2bD#YJm}lr8h3 z$doY)RE_`~2v=}13OJk976(t2Oax{31$j>vC8@cc`b@rhv&=qxd0kFJ0h2*!=8Dyo zPO*566OabTHSCk&2CNkYObHBkfS{LtSdt`t1lXYfr0+wHiZ4Cc+mif>j^O0W=-(ba z0VjPW$EPgFj#*6DYxY*mKCdBJnFCmRk5AFw$&P90xsm0GY|T(Gfdcw8DhilTIA&Vb z?~zsDBM|}eBrEcsvl_sn)9F_F&^{=2;P%t{*fxAZO@`6{S8@$?=X7J@i`Xhc5)-qt zOd_!6Y{o)o>tZ8gy$|h*Rzp3+Vq#zUR5z>>Rww38-gjndm1C+HA02jMmHopEOsR9k z?#K2GUG153$K#T=)BsNUz?154-T_YIl^nmbmn&2^U~d`WD*$vAl>h;QBz6r!E?5l~0Mt$OQqprRlGqcFj zi*s;fDDgz60OM`K>yv<(i0BhkSeclJ7?xa+ICia!$;BxGqY|M{0FDqQmP!D|s6^=V z1f2Ajo)I2X;;F<$#F&wbiHI=+o-4iQDPpc5(dM6k0PLUDoXX;bHxY489+5VRiHMQn zbSD!N5#3A@^N4eB%%}z6^95M4EE;p)eUqL~L}XuM{e&G5I)VwI`!jSPRkJCv;?v^e z6A{_hSVgQJ6tI!viHO)iq}hi8PIJNYtu_HT=6B2!uw2j{h`H~+NT1JF7RgHOsMlN& zPryLPdRfs9_63C)527Oty~WZWZ|_yVVO!Vg3E0p}Pc!w2T%r0&PN{9rDU zXU!?KyGM)K>Qi=V>-XCud{mxIBGDI~8ryRj*cLN0w3fFyEr}W>YHb7{7ZXah z8hU9te{>2wmN^0Qn09mgh@q=WOIPo0>Ak;6G&S}7w{2Zr!~OW?7CO>KKmzc?^?TFe%q+4y*l=q+Sl zdb3-P*Y>P{y#j^b9{~Z_AE(eN0XQ@|e}Mw9KTe@l{{sL3|Np3S16BY400v1!K~w_( X%0-CYOY+CJ00000NkvXXu0mjfUFL&g literal 0 HcmV?d00001 diff --git a/coalMiningApp/app/src/main/res/layout/activity_add_geological_point.xml b/coalMiningApp/app/src/main/res/layout/activity_add_geological_point.xml new file mode 100644 index 0000000..206dc36 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/activity_add_geological_point.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_base_horizontal.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_base_horizontal.xml new file mode 100644 index 0000000..d69d6a5 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_base_horizontal.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_base_info.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_base_info.xml new file mode 100644 index 0000000..f8b4873 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_base_info.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_base_vertical.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_base_vertical.xml new file mode 100644 index 0000000..c248c7a --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_base_vertical.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_calculate_info.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_calculate_info.xml new file mode 100644 index 0000000..c2e8a09 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_calculate_info.xml @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_image.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_image.xml new file mode 100644 index 0000000..b2adff1 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_image.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_logging_info.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_logging_info.xml new file mode 100644 index 0000000..2233747 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_logging_info.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_logging_item.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_logging_item.xml new file mode 100644 index 0000000..d1a2837 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_logging_item.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/list_item_point_upload_image.xml b/coalMiningApp/app/src/main/res/layout/list_item_point_upload_image.xml new file mode 100644 index 0000000..39e5a0e --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/list_item_point_upload_image.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + \ No newline at end of file