名称统一优化

coalMiningApp/app/src/main/AndroidManifest.xml

@@ -31,13 +31,13 @@
         <activity android:name=".ui.user.activity.CacheManageActivity" />
         <activity android:name=".ui.user.activity.AboutUsActivity" />
         <activity android:name=".ui.home.activity.GeologicalActivity" />
-        <activity android:name=".ui.tunneling.activity.WorkingFaceDetailActivity" />
-        <activity android:name=".ui.tunneling.activity.WorkingPointActivity" />
+        <activity android:name=".ui.tunneling.activity.WorkingFaceStatisticsActivity" />
+        <activity android:name=".ui.tunneling.activity.WorkingFaceRecordActivity" />
         <activity android:name=".ui.tunneling.activity.WorkingFaceDetail2Activity" />
-        <activity android:name=".ui.tunneling.activity.AddWorkingPointActivity"
+        <activity android:name=".ui.tunneling.activity.AddWorkingFaceRecordActivity"
             android:windowSoftInputMode="adjustPan"/>
         <activity android:name=".ui.tunneling.activity.TunnelingActivity" />
-        <activity android:name=".ui.tunneling.activity.WorkFaceActivity"
+        <activity android:name=".ui.tunneling.activity.AddWorkingFaceActivity"
             android:windowSoftInputMode="adjustPan" />
     </application>
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt

@@ -15,7 +15,7 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingFaceBinding
 import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.ui.tunneling.activity.TunnelingActivity
-import com.zmkg.coaloperation.ui.tunneling.activity.WorkingPointActivity
+import com.zmkg.coaloperation.ui.tunneling.activity.WorkingFaceRecordActivity
 import com.zmkg.coaloperation.utils.ScreenUtil
 import com.zmkg.coaloperation.utils.gone
 import com.zmkg.coaloperation.utils.toJsonString
@@ -81,10 +81,10 @@ class TunnelWorkingFaceAdapter(var list: MutableList<TunnelWorkingFaceEntity>) :
                         Log.d(TAG, "convert: ${item.records!![recordPosition].toJsonString()}")
                         context.let { ctx ->
                             if (ctx is TunnelingActivity) {
-                                ctx.toActivity(WorkingPointActivity::class.java, Bundle().apply {
-                                    putString(WorkingPointActivity.FACE_NAME, item.surfaceName)
+                                ctx.toActivity(WorkingFaceRecordActivity::class.java, Bundle().apply {
+                                    putString(WorkingFaceRecordActivity.FACE_NAME, item.surfaceName)
                                     putParcelable(
-                                        WorkingPointActivity.FACE_RECORD,
+                                        WorkingFaceRecordActivity.FACE_RECORD,
                                         item.records!![recordPosition]
                                     )
                                 })

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt

@@ -1,4 +1,4 @@
-package com.zmkg.coaloperation.ui.tunneling.adapter
+package com.zmkg.coaloperation.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -8,7 +8,6 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.databinding.ItemRockNatureBinding
 import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
 
-
 /**
  * 顶板岩性
  */
@@ -16,7 +15,7 @@ import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
 class TunnelingRockNatureAdapter(list: MutableList<TunnelRoofLithologyEntity>) :
     BaseQuickAdapter<TunnelRoofLithologyEntity, TunnelingRockNatureAdapter.VH>(R.layout.item_rock_nature, list) {
 
-    inner class VH(var binding: ItemRockNatureBinding):BaseViewHolder(binding.root)
+    inner class VH(var binding: ItemRockNatureBinding): BaseViewHolder(binding.root)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
         val binding = ItemRockNatureBinding.inflate(

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt

@@ -21,6 +21,7 @@ import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import androidx.core.view.isGone
 import com.zmkg.coaloperation.bean.WorkOption
+import com.zmkg.coaloperation.databinding.ActivityAddWorkingFaceBinding
 import com.zmkg.coaloperation.utils.DateTimeUtil
 import com.zmkg.coaloperation.utils.DictUtils
 import com.zmkg.coaloperation.utils.PickerUtil
@@ -33,8 +34,8 @@ import java.time.LocalDateTime
 /**
  * 工作面
  */
-class WorkFaceActivity :
-    BaseVMBActivity<TunnelingViewModel, ActivityWorkFaceBinding>(R.layout.activity_work_face) {
+class AddWorkingFaceActivity :
+    BaseVMBActivity<TunnelingViewModel, ActivityAddWorkingFaceBinding>(R.layout.activity_add_working_face) {
 
     companion object {
         private const val TAG = "WorkFaceActivity"

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceRecordActivity.kt

@@ -10,7 +10,7 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.adapter.TunnelRoofLithologyAdapter
 import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.base.viewmodel.TestViewModel
-import com.zmkg.coaloperation.databinding.ActivityAddWorkingPointBinding
+import com.zmkg.coaloperation.databinding.ActivityAddWorkingFaceRecordBinding
 import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
 import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel
@@ -29,8 +29,8 @@ import java.time.LocalDateTime
 /**
  * 开始记录
  */
-class AddWorkingPointActivity :
-    BaseVMBActivity<TestViewModel, ActivityAddWorkingPointBinding>(R.layout.activity_add_working_point) {
+class AddWorkingFaceRecordActivity :
+    BaseVMBActivity<TestViewModel, ActivityAddWorkingFaceRecordBinding>(R.layout.activity_add_working_face_record) {
 
     companion object {
         const val TAG = "AddWorkingPointActivity"

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt

@@ -43,8 +43,8 @@ class TunnelingActivity :
         TunnelWorkingFaceAdapter(workingFaceList).apply {
             setOnItemChildClickListener { _, view, position ->
                 if (view.id == R.id.llWorkingFace) {
-                    toActivity(WorkingFaceDetailActivity::class.java, Bundle().apply {
-                        putParcelable(WorkingFaceDetailActivity.FACE_DETAIL, workingFaceList[position])
+                    toActivity(WorkingFaceStatisticsActivity::class.java, Bundle().apply {
+                        putParcelable(WorkingFaceStatisticsActivity.FACE_DETAIL, workingFaceList[position])
                     })
                     return@setOnItemChildClickListener
                 }
@@ -59,16 +59,16 @@ class TunnelingActivity :
                     return@setOnItemChildClickListener
                 }
                 if (view.id == R.id.start_record) {
-                    toActivity(AddWorkingPointActivity::class.java, Bundle().apply {
+                    toActivity(AddWorkingFaceRecordActivity::class.java, Bundle().apply {
                         putLong(
-                            AddWorkingPointActivity.FACE_ID,
+                            AddWorkingFaceRecordActivity.FACE_ID,
                             workingFaceList[position].surfaceId
                         )
                         putString(
-                            AddWorkingPointActivity.FACE_NAME,
+                            AddWorkingFaceRecordActivity.FACE_NAME,
                             workingFaceList[position].surfaceName
                         )
-                        putInt(AddWorkingPointActivity.SHOW_TYPE, 0)
+                        putInt(AddWorkingFaceRecordActivity.SHOW_TYPE, 0)
                     })
                 }
             }
@@ -105,8 +105,8 @@ class TunnelingActivity :
 
     override fun bindEvent() {
         mBinding.toolbarLay.titleTvRight.setOnClickListener {
-            toActivity(WorkFaceActivity::class.java, Bundle().apply {
-                putString(WorkFaceActivity.WORK_FACE_TYPE, WorkFaceActivity.WorkFaceType.ADD.name)
+            toActivity(AddWorkingFaceActivity::class.java, Bundle().apply {
+                putString(AddWorkingFaceActivity.WORK_FACE_TYPE, AddWorkingFaceActivity.WorkFaceType.ADD.name)
             })
         }
     }

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetail2Activity.kt

@@ -50,10 +50,10 @@ class WorkingFaceDetail2Activity :
 
     override fun bindEvent() {
         mBinding.toolbarLay.titleTvRight.setOnClickListener {
-            toActivity(WorkFaceActivity::class.java, Bundle().apply {
-                putString(WorkFaceActivity.WORK_FACE_TYPE, WorkFaceActivity.WorkFaceType.EDIT.name)
+            toActivity(AddWorkingFaceActivity::class.java, Bundle().apply {
+                putString(AddWorkingFaceActivity.WORK_FACE_TYPE, AddWorkingFaceActivity.WorkFaceType.EDIT.name)
 //                putSerializable(WorkFaceActivity.FACE_WORK_DETAIL_DATA, detail)
-                putParcelable(WorkFaceActivity.FACE_WORK_DETAIL_DATA, detail)
+                putParcelable(AddWorkingFaceActivity.FACE_WORK_DETAIL_DATA, detail)
             })
         }
     }

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt

@@ -10,10 +10,8 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.adapter.WorkingItemAdapter
 import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.base.viewmodel.TestViewModel
-import com.zmkg.coaloperation.bean.RockItem
 import com.zmkg.coaloperation.bean.WorkingFaceItem
-import com.zmkg.coaloperation.databinding.ActivityWorkingPointBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.databinding.ActivityWorkingFaceRecordBinding
 import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel
 import com.zmkg.coaloperation.utils.DictUtils
@@ -24,8 +22,8 @@ import org.greenrobot.eventbus.ThreadMode
 /**
  * 查看（棋盘井）
  */
-class WorkingPointActivity :
-    BaseVMBActivity<TestViewModel, ActivityWorkingPointBinding>(R.layout.activity_working_point) {
+class WorkingFaceRecordActivity :
+    BaseVMBActivity<TestViewModel, ActivityWorkingFaceRecordBinding>(R.layout.activity_working_face_record) {
 
     companion object {
         const val TAG = "WorkingPointActivity"
@@ -49,10 +47,10 @@ class WorkingPointActivity :
         mBinding.toolbarLay.title = "查看详情"
         mBinding.toolbarLay.rightText = "修改"
         mBinding.toolbarLay.titleTvRight.setOnClickListener {
-            toActivity(AddWorkingPointActivity::class.java, Bundle().apply {
-                putInt(AddWorkingPointActivity.SHOW_TYPE, 1)
-                putString(AddWorkingPointActivity.FACE_NAME, faceName)
-                putParcelable(AddWorkingPointActivity.FACE_RECORD, faceRecord)
+            toActivity(AddWorkingFaceRecordActivity::class.java, Bundle().apply {
+                putInt(AddWorkingFaceRecordActivity.SHOW_TYPE, 1)
+                putString(AddWorkingFaceRecordActivity.FACE_NAME, faceName)
+                putParcelable(AddWorkingFaceRecordActivity.FACE_RECORD, faceRecord)
             })
         }
         mBinding.rvPointList.let {

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt

@@ -6,12 +6,12 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.base.BaseVMBActivity
 import androidx.core.graphics.toColorInt
 import androidx.lifecycle.ViewModelProvider
-import com.zmkg.coaloperation.databinding.ActivityWorkingFaceDetailBinding
 import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
 import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel
 import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceRecordViewModel
-import com.zmkg.coaloperation.ui.tunneling.adapter.TunnelingRockNatureAdapter
+import com.zmkg.coaloperation.adapter.TunnelingRockNatureAdapter
+import com.zmkg.coaloperation.databinding.ActivityWorkingFaceStatisticsBinding
 import com.zmkg.coaloperation.ui.tunneling.bean.FaceWorkDetailBean
 import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel
 import com.zmkg.coaloperation.utils.ScreenUtil
@@ -23,8 +23,8 @@ import kotlin.math.roundToInt
 /**
  * 工作面详情
  */
-class WorkingFaceDetailActivity :
-    BaseVMBActivity<TunnelingViewModel, ActivityWorkingFaceDetailBinding>(R.layout.activity_working_face_detail) {
+class WorkingFaceStatisticsActivity :
+    BaseVMBActivity<TunnelingViewModel, ActivityWorkingFaceStatisticsBinding>(R.layout.activity_working_face_statistics) {
 
     companion object {
         const val FACE_DETAIL = "faceDetail"

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeAdapter.kt

@@ -1,64 +0,0 @@
-//package com.zmkg.coaloperation.ui.tunneling.adapter
-//
-//import android.content.Intent
-//import android.view.View
-//import android.widget.ImageView
-//import android.widget.LinearLayout
-//import androidx.recyclerview.widget.RecyclerView
-//import com.chad.library.adapter.base.BaseQuickAdapter
-//import com.chad.library.adapter.base.viewholder.BaseViewHolder
-//import com.zmkg.coaloperation.R
-//import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeBean
-//import com.zmkg.coaloperation.ui.tunneling.activity.WorkingPointActivity
-//
-//
-///**
-// * 掘进首页列表
-// */
-//
-//class TunnelingHomeAdapter(var listener: (Int,String?)->Unit) : BaseQuickAdapter<TunnelingHomeBean, BaseViewHolder>(
-//    R.layout.item_geological_list
-//) {
-//
-//    override fun convert(holder: BaseViewHolder, item: TunnelingHomeBean) {
-//        val tunnelingHomeListAdapter: TunnelingHomeListAdapter by lazy { TunnelingHomeListAdapter().apply {
-//            setOnItemClickListener { adapter, view, position ->
-//                context.startActivity(Intent(context, WorkingPointActivity::class.java))
-//            }
-//        } }
-//
-//        val rvList = holder.getView<RecyclerView>(R.id.rv_content)
-//        val expand = holder.getView<ImageView>(R.id.expand)
-//        val recordLayout = holder.getView<LinearLayout>(R.id.record_layout)
-//
-//        holder.apply {
-//            setText(R.id.title, item.surfaceName)
-//            rvList.adapter = tunnelingHomeListAdapter
-//            tunnelingHomeListAdapter.setNewInstance(item.contentList?:mutableListOf())
-//        }
-//        expand.setOnClickListener {
-//            val imageView = it as ImageView
-//            if (imageView.tag.equals("0")) {//收起状态
-//                imageView.setImageResource(R.drawable.ic_arrow_down_white)
-//                recordLayout.visibility = View.VISIBLE
-//                imageView.tag = "1"
-//
-//                if (data[holder.absoluteAdapterPosition].contentList.isNullOrEmpty()) {
-////                    if (context is TunnelingActivity) {
-////                        (context as TunnelingActivity).getRecordList(holder.layoutPosition) {
-////                            tunnelingHomeListAdapter.notifyDataSetChanged()
-////                        }
-////                    }
-//                    listener.invoke(holder.absoluteAdapterPosition,data[holder.absoluteAdapterPosition].surfaceId)
-//                }
-//            } else {//展开状态
-//                imageView.setImageResource(R.drawable.ic_arrow_right_gray)
-//                recordLayout.visibility = View.GONE
-//                imageView.tag = "0"
-//            }
-//        }
-//    }
-//    init {
-//        addChildClickViewIds(R.id.start_record)
-//    }
-//}

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/adapter/TunnelingHomeListAdapter.kt

@@ -1,27 +0,0 @@
-//package com.zmkg.coaloperation.ui.tunneling.adapter
-//
-//import com.chad.library.adapter.base.BaseQuickAdapter
-//import com.chad.library.adapter.base.viewholder.BaseViewHolder
-//import com.zmkg.coaloperation.R
-//import com.zmkg.coaloperation.ui.tunneling.bean.TunnelingHomeItemBean
-//
-//
-///**
-// * 掘进首页点击出现的列表
-// */
-//
-//class TunnelingHomeListAdapter :
-//    BaseQuickAdapter<TunnelingHomeItemBean, BaseViewHolder>(R.layout.item_geological_list_content) {
-//
-//
-//    override fun convert(holder: BaseViewHolder, item: TunnelingHomeItemBean) {
-//        if (holder.absoluteAdapterPosition != 0) {
-//            holder.setGone(R.id.head, true)
-//        }
-//        holder.setText(R.id.time, item.workingDate)
-//            .setText(R.id.record, item.recordPerson)
-//
-//
-//    }
-//
-//}