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 index f23fe88..1d7e326 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/GeoPointMultiAdapter.kt +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/GeoPointMultiAdapter.kt @@ -3,15 +3,15 @@ package com.zmkg.coaloperation.adapter import android.view.LayoutInflater import android.widget.LinearLayout import androidx.core.view.updateLayoutParams +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView 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){ @@ -43,7 +43,13 @@ class GeoPointMultiAdapter(list: MutableList): } } - private fun loadUploadImage(holder: BaseViewHolder,item: GeoPointMultiItem) {} + private fun loadUploadImage(holder: BaseViewHolder,item: GeoPointMultiItem) { + val rvImageList = holder.itemView.findViewById(R.id.rvImageList) + rvImageList.let { + it.layoutManager = GridLayoutManager(it.context, 4, GridLayoutManager.VERTICAL, false) +// it.adapter = GeoPointImageAdapter + } + } private fun loadCalculateInfo(holder: BaseViewHolder,item: GeoPointMultiItem) {} 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 index 390a27f..ac5f19a 100644 --- 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 @@ -15,7 +15,7 @@ import com.zmkg.coaloperation.databinding.ActivityGeologicalPointBinding * 地质编录点新增 */ class AddGeologicalPointActivity : - BaseVMBActivity(R.layout.activity_geological_point) { + BaseVMBActivity(R.layout.activity_add_geological_point) { private val parentList: MutableList = mutableListOf( GeoPointParent(name = "已编录点"), diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/geologging/AddGeologicalPointFragment.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/geologging/AddGeologicalPointFragment.kt new file mode 100644 index 0000000..9dcdc75 --- /dev/null +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/geologging/AddGeologicalPointFragment.kt @@ -0,0 +1,42 @@ +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.GeoPointMultiAdapter +import com.zmkg.coaloperation.base.BaseVMBFragment +import com.zmkg.coaloperation.base.viewmodel.TestViewModel +import com.zmkg.coaloperation.bean.GeoPointMultiItem +import com.zmkg.coaloperation.databinding.FragmentAddGeologicalPointBinding + +class AddGeologicalPointFragment : + BaseVMBFragment(R.layout.fragment_add_geological_point) { + + private val geoPointList: MutableList = mutableListOf() + private val geoPointAdapter by lazy { + GeoPointMultiAdapter(geoPointList) + } + + override fun initView(root: View?, savedInstanceState: Bundle?) { + geoPointList.run { + add(GeoPointMultiItem(itemType = GeoPointMultiItem.TYPE_BASE_INFO)) + add(GeoPointMultiItem(itemType = GeoPointMultiItem.TYPE_LOGGING_INFO)) + add(GeoPointMultiItem(itemType = GeoPointMultiItem.TYPE_CALCULATE_INFO)) + add(GeoPointMultiItem(itemType = GeoPointMultiItem.TYPE_UPLOAD_IMAGE)) + } + mBinding.rvPointList.let { + it.layoutManager = LinearLayoutManager(it.context) + it.adapter = geoPointAdapter + } + } + + override fun bindEvent() { + + } + + override fun onClick(v: View?) { + + } + +} \ No newline at end of file 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 index 206dc36..ac758c5 100644 --- a/coalMiningApp/app/src/main/res/layout/activity_add_geological_point.xml +++ b/coalMiningApp/app/src/main/res/layout/activity_add_geological_point.xml @@ -17,29 +17,97 @@ android:id="@+id/toolbar_lay" layout="@layout/lay_title_right_bar" /> - - + android:layout_weight="1" /> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/coalMiningApp/app/src/main/res/layout/fragment_add_geological_point.xml b/coalMiningApp/app/src/main/res/layout/fragment_add_geological_point.xml new file mode 100644 index 0000000..21e4147 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/fragment_add_geological_point.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + \ 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 index 39e5a0e..6020dec 100644 --- 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 @@ -20,6 +20,7 @@ app:drawableStartCompat="@drawable/line_green" />