更新entity名称

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

@@ -7,7 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.databinding.ListItemRockBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
 import com.zmkg.coaloperation.utils.formatDecimalString
 
 class TunnelRoofLithologyAdapter(var list: MutableList<TunnelRoofLithologyEntity>) :

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

@@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingFaceBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.ui.tunneling.activity.TunnelingActivity
 import com.zmkg.coaloperation.ui.tunneling.activity.WorkingFaceRecordActivity
 import com.zmkg.coaloperation.utils.ScreenUtil

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

@@ -1,13 +1,12 @@
 package com.zmkg.coaloperation.adapter
 
-import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.zmkg.coaloperation.R
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 import androidx.core.graphics.toColorInt
 import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingFaceRecordBinding
 import com.zmkg.coaloperation.utils.gone

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

@@ -12,7 +12,7 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.bean.TunnelWorkingItem
 import com.zmkg.coaloperation.databinding.ListItemRockBinding
 import com.zmkg.coaloperation.databinding.ListItemTunnelWorkingItemBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
 import com.zmkg.coaloperation.utils.ScreenUtil
 import com.zmkg.coaloperation.utils.formatDecimalString
 

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

@@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.databinding.ItemRockNatureBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
 import com.zmkg.coaloperation.utils.formatDecimalString
 
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt

@@ -1,8 +1,8 @@
 package com.zmkg.coaloperation.bean
 
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 
 data class TunnelWorkingItem(
     var name: String? = "",

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt

@@ -1,14 +1,10 @@
 package com.zmkg.coaloperation.data.api
 
 import com.zmkg.coaloperation.data.bean.ApiResponse
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.retorfit.UrlConfig
 import com.zmkg.coaloperation.ui.home.bean.WaterLedgerBean
-import okhttp3.RequestBody
-import retrofit2.http.Body
 import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Path
 
 /**
  * 首页

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt

@@ -3,7 +3,7 @@ package com.zmkg.coaloperation.data.repository
 import com.zmkg.coaloperation.base.repository.BaseRepository
 import com.zmkg.coaloperation.data.api.HomeApi
 import com.zmkg.coaloperation.data.bean.ApiResponse
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.retorfit.RetrofitManager
 import com.zmkg.coaloperation.ui.home.bean.WaterLedgerBean
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/AppDatabase.kt

@@ -9,9 +9,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import com.zmkg.coaloperation.db.dao.TunnelRoofLithologyDao
 import com.zmkg.coaloperation.db.dao.TunnelWorkingFaceDao
 import com.zmkg.coaloperation.db.dao.TunnelWorkingFaceRecordDao
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 
 @Database(
     entities = [

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelRoofLithologyDao.kt

@@ -5,7 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
 
 @Dao
 interface TunnelRoofLithologyDao {

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceDao.kt

@@ -5,7 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 
 //import kotlinx.coroutines.flow.Flow
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt

@@ -5,8 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
 
 //import kotlinx.coroutines.flow.Flow
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/OtherEntity.kt

@@ -1,4 +0,0 @@
-package com.zmkg.coaloperation.db.entiry
-
-class OtherEntity {
-}

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/OtherEntity.kt

@@ -0,0 +1,4 @@
+package com.zmkg.coaloperation.db.entity
+
+class OtherEntity {
+}

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelRoofLithologyEntity.kt

@@ -1,4 +1,4 @@
-package com.zmkg.coaloperation.db.entiry.tunnel
+package com.zmkg.coaloperation.db.entity.tunnel
 
 import android.os.Parcelable
 import androidx.room.Entity

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelWorkingFaceEntity.kt

@@ -1,4 +1,4 @@
-package com.zmkg.coaloperation.db.entiry.tunnel
+package com.zmkg.coaloperation.db.entity.tunnel
 
 //import androidx.room.ColumnInfo
 import android.os.Parcelable

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelWorkingFaceRecordEntity.kt

@@ -1,10 +1,9 @@
-package com.zmkg.coaloperation.db.entiry.tunnel
+package com.zmkg.coaloperation.db.entity.tunnel
 
 import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.utils.DateTimeUtil
 import kotlinx.parcelize.Parcelize
 import java.time.LocalDateTime

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelRoofLithologyRepository.kt

@@ -1,7 +1,7 @@
 package com.zmkg.coaloperation.db.repository
 
 import com.zmkg.coaloperation.db.dao.TunnelRoofLithologyDao
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt

@@ -1,7 +1,7 @@
 package com.zmkg.coaloperation.db.repository
 
 import com.zmkg.coaloperation.db.dao.TunnelWorkingFaceRecordDao
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRepository.kt

@@ -1,7 +1,7 @@
 package com.zmkg.coaloperation.db.repository
 
 import com.zmkg.coaloperation.db.dao.TunnelWorkingFaceDao
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelRoofLithologyViewModel.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.zmkg.coaloperation.db.AppDatabase
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
 import com.zmkg.coaloperation.db.repository.TunnelRoofLithologyRepository
 import kotlinx.coroutines.launch
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.zmkg.coaloperation.db.AppDatabase
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 import com.zmkg.coaloperation.db.repository.TunnelWorkingFaceRecordRepository
 import kotlinx.coroutines.launch
 

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceViewModel.kt

@@ -4,11 +4,9 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.zmkg.coaloperation.db.AppDatabase
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.db.repository.TunnelWorkingFaceRepository
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class TunnelWorkingFaceViewModel(application: Application) : AndroidViewModel(application) {
     private val repository: TunnelWorkingFaceRepository

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/mining/MiningActivity.kt

@@ -0,0 +1,28 @@
+package com.zmkg.coaloperation.ui.mining
+
+import android.os.Bundle
+import android.view.View
+import com.zmkg.coaloperation.R
+import com.zmkg.coaloperation.base.BaseVMBActivity
+import com.zmkg.coaloperation.base.viewmodel.TestViewModel
+import com.zmkg.coaloperation.databinding.ActivityMiningBinding
+
+class MiningActivity :
+    BaseVMBActivity<TestViewModel, ActivityMiningBinding>(R.layout.activity_mining) {
+    override fun initView(savedInstanceState: Bundle?) {
+        TODO("Not yet implemented")
+    }
+
+    override fun initData() {
+        TODO("Not yet implemented")
+    }
+
+    override fun bindEvent() {
+        TODO("Not yet implemented")
+    }
+
+    override fun processClick(v: View?) {
+        TODO("Not yet implemented")
+    }
+
+}

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

@@ -10,7 +10,7 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.bean.WorkOption
 import com.zmkg.coaloperation.databinding.ActivityAddWorkingFaceBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceViewModel
 import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel
 import com.zmkg.coaloperation.utils.DateTimeUtil

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

@@ -12,8 +12,8 @@ import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.base.viewmodel.TestViewModel
 import com.zmkg.coaloperation.bean.TunnelWorkingItem
 import com.zmkg.coaloperation.databinding.ActivityAddWorkingFaceRecordBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel
 import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceRecordViewModel
 import com.zmkg.coaloperation.superfuntion.hideLoading

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

@@ -10,8 +10,8 @@ import com.zmkg.coaloperation.adapter.TunnelWorkingFaceAdapter
 import com.zmkg.coaloperation.adapter.TunnelWorkingFaceRecordAdapter
 import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.databinding.ActivityTunnelingBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceRecordViewModel
 import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceViewModel
 import com.zmkg.coaloperation.ui.tunneling.viewmodel.TunnelingViewModel

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

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.zmkg.coaloperation.adapter.TunnelWorkingItemAdapter
 import com.zmkg.coaloperation.bean.TunnelWorkingItem
 import com.zmkg.coaloperation.databinding.ActivityWorkingFaceDetailBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 

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

@@ -12,7 +12,7 @@ import com.zmkg.coaloperation.base.BaseVMBActivity
 import com.zmkg.coaloperation.base.viewmodel.TestViewModel
 import com.zmkg.coaloperation.bean.TunnelWorkingItem
 import com.zmkg.coaloperation.databinding.ActivityWorkingFaceRecordBinding
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel
 import com.zmkg.coaloperation.utils.DictUtils
 import com.zmkg.coaloperation.utils.formatDecimalString

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

@@ -6,8 +6,8 @@ import com.zmkg.coaloperation.R
 import com.zmkg.coaloperation.base.BaseVMBActivity
 import androidx.core.graphics.toColorInt
 import androidx.lifecycle.ViewModelProvider
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelRoofLithologyEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.db.viewmodel.TunnelRoofLithologyViewModel
 import com.zmkg.coaloperation.db.viewmodel.TunnelWorkingFaceRecordViewModel
 import com.zmkg.coaloperation.adapter.TunnelingRockNatureAdapter

coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt

@@ -2,7 +2,7 @@ package com.zmkg.coaloperation.ui.tunneling.viewmodel
 
 import com.zmkg.coaloperation.base.viewmodel.BaseViewModel
 import com.zmkg.coaloperation.data.repository.HomeRepository
-import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceEntity
+import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity
 import com.zmkg.coaloperation.superfuntion.handleRequest
 import com.zmkg.coaloperation.superfuntion.launch
 import kotlinx.coroutines.flow.MutableSharedFlow

coalMiningApp/app/src/main/res/layout/activity_mining.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+</layout>