From 201a0779bf8d154eadb7c2c43746a8857c938859 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Tue, 16 Sep 2025 08:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0entity=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/TunnelRoofLithologyAdapter.kt | 2 +- .../adapter/TunnelWorkingFaceAdapter.kt | 2 +- .../adapter/TunnelWorkingFaceRecordAdapter.kt | 3 +- .../adapter/TunnelWorkingItemAdapter.kt | 2 +- .../adapter/TunnelingRockNatureAdapter.kt | 2 +- .../coaloperation/bean/TunnelWorkingItem.kt | 6 ++-- .../zmkg/coaloperation/data/api/HomeApi.kt | 6 +--- .../data/repository/HomeRepository.kt | 2 +- .../com/zmkg/coaloperation/db/AppDatabase.kt | 6 ++-- .../db/dao/TunnelRoofLithologyDao.kt | 2 +- .../db/dao/TunnelWorkingFaceDao.kt | 2 +- .../db/dao/TunnelWorkingFaceRecordDao.kt | 3 +- .../coaloperation/db/entiry/OtherEntity.kt | 4 --- .../coaloperation/db/entity/OtherEntity.kt | 4 +++ .../tunnel/TunnelRoofLithologyEntity.kt | 2 +- .../tunnel/TunnelWorkingFaceEntity.kt | 2 +- .../tunnel/TunnelWorkingFaceRecordEntity.kt | 3 +- .../TunnelRoofLithologyRepository.kt | 2 +- .../TunnelWorkingFaceRecordRepository.kt | 2 +- .../repository/TunnelWorkingFaceRepository.kt | 2 +- .../viewmodel/TunnelRoofLithologyViewModel.kt | 2 +- .../TunnelWorkingFaceRecordViewModel.kt | 2 +- .../viewmodel/TunnelWorkingFaceViewModel.kt | 4 +-- .../coaloperation/ui/mining/MiningActivity.kt | 28 +++++++++++++++++++ .../activity/AddWorkingFaceActivity.kt | 2 +- .../activity/AddWorkingFaceRecordActivity.kt | 4 +-- .../tunneling/activity/TunnelingActivity.kt | 4 +-- .../activity/WorkingFaceDetailActivity.kt | 2 +- .../activity/WorkingFaceRecordActivity.kt | 2 +- .../activity/WorkingFaceStatisticsActivity.kt | 4 +-- .../tunneling/viewmodel/TunnelingViewModel.kt | 2 +- .../src/main/res/layout/activity_mining.xml | 13 +++++++++ 32 files changed, 80 insertions(+), 48 deletions(-) delete mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/OtherEntity.kt create mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/OtherEntity.kt rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/{entiry => entity}/tunnel/TunnelRoofLithologyEntity.kt (96%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/{entiry => entity}/tunnel/TunnelWorkingFaceEntity.kt (98%) rename coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/{entiry => entity}/tunnel/TunnelWorkingFaceRecordEntity.kt (93%) create mode 100644 coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/mining/MiningActivity.kt create mode 100644 coalMiningApp/app/src/main/res/layout/activity_mining.xml diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelRoofLithologyAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelRoofLithologyAdapter.kt index 5339b82..bf8c361 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelRoofLithologyAdapter.kt +++ b/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) : diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt index d0f16f3..a7f3c5f 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceAdapter.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceRecordAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceRecordAdapter.kt index 50ba583..177e802 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingFaceRecordAdapter.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingItemAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingItemAdapter.kt index 36dbafa..0fdc119 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelWorkingItemAdapter.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt index 0327043..c31932c 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/adapter/TunnelingRockNatureAdapter.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt index cdefb6f..bd720eb 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/bean/TunnelWorkingItem.kt +++ b/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.entiry.tunnel.TunnelWorkingFaceEntity -import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity data class TunnelWorkingItem( var name: String? = "", diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt index 39f3cbd..78457d9 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/api/HomeApi.kt +++ b/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 /** * 首页 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt index f4a7cd6..fa827f5 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/data/repository/HomeRepository.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/AppDatabase.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/AppDatabase.kt index 7983871..d77faee 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/AppDatabase.kt +++ b/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.entiry.tunnel.TunnelWorkingFaceEntity -import com.zmkg.coaloperation.db.entiry.tunnel.TunnelWorkingFaceRecordEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity @Database( entities = [ diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelRoofLithologyDao.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelRoofLithologyDao.kt index 75c3330..02e9aa4 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelRoofLithologyDao.kt +++ b/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 { diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceDao.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceDao.kt index 84cb629..6c95670 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceDao.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt index edc19e7..db6d665 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/dao/TunnelWorkingFaceRecordDao.kt +++ b/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.entiry.tunnel.TunnelWorkingFaceRecordEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceRecordEntity //import kotlinx.coroutines.flow.Flow diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/OtherEntity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/OtherEntity.kt deleted file mode 100644 index e69f966..0000000 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/OtherEntity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.zmkg.coaloperation.db.entiry - -class OtherEntity { -} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/OtherEntity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/OtherEntity.kt new file mode 100644 index 0000000..c1e923a --- /dev/null +++ b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/OtherEntity.kt @@ -0,0 +1,4 @@ +package com.zmkg.coaloperation.db.entity + +class OtherEntity { +} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelRoofLithologyEntity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelRoofLithologyEntity.kt similarity index 96% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelRoofLithologyEntity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelRoofLithologyEntity.kt index 9da4cf2..bc789f0 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelRoofLithologyEntity.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceEntity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelWorkingFaceEntity.kt similarity index 98% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceEntity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelWorkingFaceEntity.kt index 308680e..dcdadef 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceEntity.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceRecordEntity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelWorkingFaceRecordEntity.kt similarity index 93% rename from coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceRecordEntity.kt rename to coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entity/tunnel/TunnelWorkingFaceRecordEntity.kt index bc95435..89c6643 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/entiry/tunnel/TunnelWorkingFaceRecordEntity.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelRoofLithologyRepository.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelRoofLithologyRepository.kt index f12068d..d347a71 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelRoofLithologyRepository.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt index 22002b2..3b9ce7c 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRecordRepository.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRepository.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRepository.kt index 923294f..9582a2b 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/repository/TunnelWorkingFaceRepository.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelRoofLithologyViewModel.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelRoofLithologyViewModel.kt index 8b27bf8..5903736 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelRoofLithologyViewModel.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt index 0058e46..dcbebcf 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceRecordViewModel.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceViewModel.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceViewModel.kt index dd3d45a..f8f1bbc 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/db/viewmodel/TunnelWorkingFaceViewModel.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/mining/MiningActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/mining/MiningActivity.kt new file mode 100644 index 0000000..865d8b3 --- /dev/null +++ b/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(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") + } + +} \ No newline at end of file diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt index 62627ce..fd8a110 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceActivity.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceRecordActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceRecordActivity.kt index 81ece71..e8e02f3 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/AddWorkingFaceRecordActivity.kt +++ b/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.entiry.tunnel.TunnelWorkingFaceRecordEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity +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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt index 99977b8..975a1c2 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/TunnelingActivity.kt +++ b/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.entiry.tunnel.TunnelWorkingFaceRecordEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelWorkingFaceEntity +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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt index ca01aef..b3f4490 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceDetailActivity.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt index 3595138..9098692 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceRecordActivity.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt index 1d98e18..6021ec1 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/activity/WorkingFaceStatisticsActivity.kt +++ b/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.entiry.tunnel.TunnelWorkingFaceEntity +import com.zmkg.coaloperation.db.entity.tunnel.TunnelRoofLithologyEntity +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 diff --git a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt b/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt index 872a91a..fd94f68 100644 --- a/coalMiningApp/app/src/main/java/com/zmkg/coaloperation/ui/tunneling/viewmodel/TunnelingViewModel.kt +++ b/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 diff --git a/coalMiningApp/app/src/main/res/layout/activity_mining.xml b/coalMiningApp/app/src/main/res/layout/activity_mining.xml new file mode 100644 index 0000000..58081c0 --- /dev/null +++ b/coalMiningApp/app/src/main/res/layout/activity_mining.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file