专用控制网列表、信息接口修改

main
chenglifeng 7 months ago
parent 41665bb037
commit 9b7f8a4edf
  1. 2
      app/src/main/AndroidManifest.xml
  2. 53
      app/src/main/java/com/project/survey/logic/viewmodel/ControlNetViewModel.kt
  3. 34
      app/src/main/java/com/project/survey/model/ControlNetBean.kt
  4. 53
      app/src/main/java/com/project/survey/model/ControlNetworkBean.kt
  5. 49
      app/src/main/java/com/project/survey/model/ControlNetworkInfoBean.kt
  6. 44
      app/src/main/java/com/project/survey/network/Api.kt
  7. 33
      app/src/main/java/com/project/survey/ui/controlnet/ControlPointActivity.kt
  8. 47
      app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkListActivity.kt
  9. 27
      app/src/main/java/com/project/survey/ui/controlnet/adapter/ControlNetSpecialAdapter.kt
  10. 31
      app/src/main/java/com/project/survey/ui/controlnet/adapter/SpecialControlNetworkAdapter.kt
  11. 35
      app/src/main/java/com/project/survey/ui/controlnet/adapter/SpecialControlNetworkInfoAdapter.kt
  12. 4
      app/src/main/java/com/project/survey/ui/home/HomeFragment.kt
  13. 86
      app/src/main/res/layout/activity_special_control_network_list.xml
  14. 0
      app/src/main/res/layout/item_special_control_network.xml

@ -115,7 +115,7 @@
android:label="@string/head_control_network" android:label="@string/head_control_network"
android:windowSoftInputMode="adjustResize|stateHidden" /> android:windowSoftInputMode="adjustResize|stateHidden" />
<activity <activity
android:name=".ui.controlnet.ControlNetSpecialListActivity" android:name=".ui.controlnet.SpecialControlNetworkListActivity"
android:exported="true" android:exported="true"
android:label="@string/dedicated_control_network" android:label="@string/dedicated_control_network"
android:windowSoftInputMode="adjustResize|stateHidden" /> android:windowSoftInputMode="adjustResize|stateHidden" />

@ -4,10 +4,9 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import com.project.survey.constants.SPConstants import com.project.survey.constants.SPConstants
import com.project.survey.logic.bean.ListResult import com.project.survey.logic.bean.ListResult
import com.project.survey.logic.repository.GlobalRepository import com.project.survey.model.ControlNetworkBean
import com.project.survey.model.ApprovalBean
import com.project.survey.model.ControlNetBean
import com.project.survey.model.ControlNetCGBean import com.project.survey.model.ControlNetCGBean
import com.project.survey.model.ControlNetworkInfoBean
import com.project.survey.model.ProjectBean import com.project.survey.model.ProjectBean
import com.project.survey.network.RetrofitClient import com.project.survey.network.RetrofitClient
import com.project.survey.util.SPUtils import com.project.survey.util.SPUtils
@ -17,28 +16,48 @@ class ControlNetViewModel : BaseViewModel() {
val api = RetrofitClient.createApiService() val api = RetrofitClient.createApiService()
val controlNetListResponse: LiveData<ListResult<ControlNetBean>> val controlNetworkListResponse: LiveData<ListResult<ControlNetworkBean>>
get() = _controlNetListResponse get() = _controlNetworkListResponse
private val _controlNetListResponse = MutableLiveData<ListResult<ControlNetBean>>() private val _controlNetworkListResponse = MutableLiveData<ListResult<ControlNetworkBean>>()
/** /**
* 获取专用控制网列表 * 获取专用控制网列表
*/ */
fun fetchSpecialControlNetList(j_query: String, page: Int = 1, start: Int = 0) { fun fetchSpecialControlNetworkList(pageNum: Int = 1) {
launch { launch {
val currentProject = val currentProject =
SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java) SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java)
val res = val res = api.fetchSpecialControlNetworkList(currentProject?.BD_XMXX_ID ?: "", pageNum)
api.fetchSpecialControlNetList(
currentProject?.BD_XMXX_ID ?: "",
"BD_KZW",
"BD_KZW_ZY",
j_query,
page,
start = start
)
if (res.success) { if (res.success) {
_controlNetListResponse.postValue(res.data) _controlNetworkListResponse.postValue(res.data)
}
}
}
val controlNetworkInfoResponse: LiveData<ListResult<ControlNetworkInfoBean>>
get() = _controlNetworkInfoResponse
private val _controlNetworkInfoResponse = MutableLiveData<ListResult<ControlNetworkInfoBean>>()
/**
* 获取专用控制网信息
*/
fun fetchSpecialControlNetworkInfo(
controlNetworkName: String,
pointName: String? = null,
pageNum: Int = 1
) {
launch {
val currentProject =
SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java)
val res = api.fetchSpecialControlNetworkInfo(
currentProject?.BD_XMXX_ID ?: "",
controlNetworkName,
pointName,
pageNum
)
if (res.success) {
_controlNetworkInfoResponse.postValue(res.data)
} }
} }
} }

@ -1,34 +0,0 @@
package com.project.survey.model
import androidx.annotation.Keep
/**
* {
* "KZW_TYPE_CODE": "02",
* "SY_CREATEUSERID": "c1c843dd971f416da307f5fefa9d782e",
* "KZW_TYPE_NAME": "专用",
* "KZW_APPROVALSTATUS": "",
* "KZW_VERSION": "2024-09-2704",
* "SY_GROUP_COMPANY_ID": "",
* "KZW_MEASUREMENTLEVEL": "2",
* "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM",
* "KZW_FILE": "",
* "SY_CREATEUSERNAME": "zlh",
* "KZW_MEASUREMENTUNIT": "",
* "KZW_REMARK": "",
* "BD_KZW_ID": "14faecf400d74001ad37ca7b349e9de7",
* "SY_CREATETIME": "2024-09-27 15:36:26",
* "SY_ORG_ID": "systemdepartment",
* "": "2024-09-27",
* "KZW_LCMC": "专用控制网测试2",
* "KZW_MEASUREMENTUNIT_ID": "",
* "KZW_NAME": "专用",
* "BD_XMXX_ID": ""
* }
*/
@Keep
data class ControlNetBean(
val KZW_NAME:String,
val KZW_MEASUREMENTLEVEL:String,
val KZW_MEASUREMENTTIME:String
)

@ -0,0 +1,53 @@
package com.project.survey.model
import androidx.annotation.Keep
/**
* {
* "SY_MODIFYORGID": "XX5DVbDl1Jl7FDtJJtX",
* "KZW_TYPE_CODE": "02",
* "SY_MODIFYTIME": "2024-09-06 13:42:57",
* "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM",
* "$TABLE_CODE$": null,
* "SY_CREATEUSERNAME": "管理员",
* "BD_KZWZBCG_ID": "9db3f927274246f0913443e7c3fd4a61",
* "SY_ORDERINDEX": 2,
* "KZWZBCG_BZ": "125",
* "SY_MODIFYUSERID": "116d15ddbe62412aa32aafb5dc8f13bb",
* "SY_GROUP_COMPANY_NAME": "",
* "KZWZBCG_XCOORDINATE": "32",
* "SY_COMPANY_NAME": "某某公司",
* "BD_XMXX_ID": "123",
* "KZW_NAME": "专用",
* "SY_CREATEORGID": "XX5DVbDl1Jl7FDtJJtX",
* "SY_STATUS": "1",
* "SY_CREATEUSERID": "116d15ddbe62412aa32aafb5dc8f13bb",
* "KZW_TYPE_NAME": "",
* "SY_GROUP_COMPANY_ID": "",
* "SY_MODIFYORGNAME": "系统管理部",
* "BD_KZW_ID": "a67961a4b61441b19b27fc56572e7517",
* "SY_CREATEORGNAME": "系统管理部",
* "SY_CREATETIME": "2024-09-06 13:36:27",
* "SY_ORG_ID": "systemdepartment",
* "KZW_MEASUREMENTTIME": "",
* "KZWZBCG_YCOORDINATE": "12",
* "SY_MODIFYUSERNAME": "管理员",
* "KZWZBCG_HCOORDINATE": "56",
* "KZWZBCG_VERSION": "",
* "KZWZBCG_POINTNAME": "dmc"
* }
*/
@Keep
data class ControlNetworkBean(
val KZW_NAME: String, // 控制网名称
val KZW_TYPE_CODE: String, //控制网类型
val KZW_TYPE_NAME: String, //控制网类型_name
val KZW_MEASUREMENTTIME: String, // 施测时间
val KZWZBCG_POINTNAME: String, //点名称
val KZWZBCG_XCOORDINATE: String, //x
val KZWZBCG_YCOORDINATE: String, //y
val KZWZBCG_HCOORDINATE: String, //h
val KZWZBCG_BZ: String, //备注
)

@ -0,0 +1,49 @@
package com.project.survey.model
import androidx.annotation.Keep
/**
* {
* "values": {
* "SY_MODIFYORGID": null,
* "KZW_TYPE_CODE": "02",
* "SY_MODIFYTIME": null,
* "SY_COMPANY_ID": "V1R0gp2zJ3SvGFNvJdM",
* "SY_CREATEUSERNAME": "管理员",
* "BD_KZWZBCG_ID": "13365023de99403b9a07fdf8079d72c7",
* "SY_ORDERINDEX": 1,
* "KZWZBCG_BZ": "备注二",
* "SY_MODIFYUSERID": null,
* "SY_GROUP_COMPANY_NAME": "",
* "SY_COMPANY_NAME": "某某公司",
* "KZWZBCG_XCOORDINATE": "11.25",
* "BD_XMXX_ID": null,
* "KZW_NAME": "专用",
* "SY_CREATEORGID": "XX5DVbDl1Jl7FDtJJtX",
* "SY_STATUS": null,
* "SY_CREATEUSERID": "116d15ddbe62412aa32aafb5dc8f13bb",
* "KZW_TYPE_NAME": null,
* "SY_GROUP_COMPANY_ID": "",
* "SY_MODIFYORGNAME": null,
* "SY_CREATETIME": "2024-09-11",
* "SY_CREATEORGNAME": "系统管理部",
* "BD_KZW_ID": "53ed633f946545aa836160fd30f3c2a2",
* "SY_ORG_ID": "systemdepartment",
* "KZW_MEASUREMENTTIME": null,
* "KZWZBCG_YCOORDINATE": "21.56",
* "SY_MODIFYUSERNAME": null,
* "KZWZBCG_VERSION": null,
* "KZWZBCG_HCOORDINATE": "6.36",
* "KZWZBCG_POINTNAME": "点位二"
* },
* "tenantIdField": "SY_TENANT_ID",
* "tenantNameField": "SY_TENANT_NAME",
* "tableCode": null,
* "pkValue": null,
* "pkCode": null
* }
*/
@Keep
data class ControlNetworkInfoBean(
val values: ControlNetworkBean
)

@ -2,8 +2,9 @@ package com.project.survey.network
import com.project.survey.logic.bean.ListResult import com.project.survey.logic.bean.ListResult
import com.project.survey.model.ApprovalResponse import com.project.survey.model.ApprovalResponse
import com.project.survey.model.ControlNetBean import com.project.survey.model.ControlNetworkBean
import com.project.survey.model.ControlNetCGBean import com.project.survey.model.ControlNetCGBean
import com.project.survey.model.ControlNetworkInfoBean
import com.project.survey.model.LoginBean import com.project.survey.model.LoginBean
import com.project.survey.model.ProjectBean import com.project.survey.model.ProjectBean
import retrofit2.http.Field import retrofit2.http.Field
@ -106,21 +107,38 @@ interface Api {
/** /**
* 获取专用控制网列表 * 获取专用控制网列表
*/ */
@FormUrlEncoded @GET("je/controlnetwork/queryControlNetwork")
@POST("je/cloud/beiDou/load") suspend fun fetchSpecialControlNetworkList(
suspend fun fetchSpecialControlNetList(
@Header("projectId") projectId: String, @Header("projectId") projectId: String,
@Field("tableCode") tableCode: String, @Query("pageNum") pageNum: Int,
@Field("funcCode") funcCode: String, @Query("pageSize") pageSize: Int = 30
@Field("j_query") j_query: String, ): HttpResult<ListResult<ControlNetworkBean>>
@Field("page") page: Int, // @FormUrlEncoded
@Field("limit") limit: Int = 30, // @POST("je/cloud/beiDou/load")
@Field("start") start: Int = 0 // suspend fun fetchSpecialControlNetList(
): HttpResult<ListResult<ControlNetBean>> // @Header("projectId") projectId: String,
// @Field("tableCode") tableCode: String,
// @Field("funcCode") funcCode: String,
// @Field("j_query") j_query: String,
// @Field("page") page: Int,
// @Field("limit") limit: Int = 30,
// @Field("start") start: Int = 0
// ): HttpResult<ListResult<ControlNetBean>>
/**
* 根据条件查询控制网信息
*/
@GET("je/controlnetwork/queryControlNetworkInfoByName")
suspend fun fetchSpecialControlNetworkInfo(
@Header("projectId") projectId: String,
@Query("controlNetWorkName") controlNetWorkName: String, //当前控制网name
@Query("pointName") pointName: String? = null, //关键词,搜索用
@Query("pageNum") pageNum: Int,
@Query("pageSize") pageSize: Int = 30
): HttpResult<ListResult<ControlNetworkInfoBean>>
/** /**
* 获取专用控制网成果列表 * 获取首级控制网列表
* //获取首级控制网列表
*/ */
@FormUrlEncoded @FormUrlEncoded
@POST("je/common/load") @POST("je/common/load")

@ -2,12 +2,11 @@ package com.project.survey.ui.controlnet
import androidx.activity.viewModels import androidx.activity.viewModels
import com.project.survey.R import com.project.survey.R
import com.project.survey.databinding.ActivityControlNetListBinding
import com.project.survey.databinding.ActivityControlPointBinding import com.project.survey.databinding.ActivityControlPointBinding
import com.project.survey.extend.smartDismiss import com.project.survey.extend.smartDismiss
import com.project.survey.logic.viewmodel.ControlNetViewModel import com.project.survey.logic.viewmodel.ControlNetViewModel
import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.ui.base.BaseBindingActivity
import com.project.survey.ui.controlnet.adapter.ControlNetFirstAdapter import com.project.survey.ui.controlnet.adapter.SpecialControlNetworkInfoAdapter
import com.project.survey.util.ActivityNavUtil import com.project.survey.util.ActivityNavUtil
import com.project.survey.widget.decoration.TransparentDividerDecoration import com.project.survey.widget.decoration.TransparentDividerDecoration
import com.scwang.smart.refresh.layout.api.RefreshLayout import com.scwang.smart.refresh.layout.api.RefreshLayout
@ -20,8 +19,10 @@ class ControlPointActivity : BaseBindingActivity<ActivityControlPointBinding>(),
OnRefreshLoadMoreListener { OnRefreshLoadMoreListener {
companion object { companion object {
fun start() { fun start(controlNetworkName: String) {
ActivityNavUtil.startActivity<ControlPointActivity> { } ActivityNavUtil.startActivity<ControlPointActivity> {
putString("controlNetworkName", controlNetworkName)
}
} }
} }
@ -30,11 +31,13 @@ class ControlPointActivity : BaseBindingActivity<ActivityControlPointBinding>(),
private val viewModel: ControlNetViewModel by viewModels() private val viewModel: ControlNetViewModel by viewModels()
private val adapter by lazy { ControlNetFirstAdapter() } private val adapter by lazy { SpecialControlNetworkInfoAdapter() }
private var controlNetworkName = ""
private var searchValue = ""
private var currentPage = 1 private var currentPage = 1
private var start = 0
override fun initView() { override fun initView() {
controlNetworkName = intent.getStringExtra("controlNetworkName") ?: ""
immersionToolbar(mBinding.toolbar, "控制点详情") immersionToolbar(mBinding.toolbar, "控制点详情")
mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this) mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this)
@ -47,7 +50,7 @@ class ControlPointActivity : BaseBindingActivity<ActivityControlPointBinding>(),
viewModel.errorResponse.observe(this) { viewModel.errorResponse.observe(this) {
mBinding.smartRefreshLayout.smartDismiss() mBinding.smartRefreshLayout.smartDismiss()
} }
viewModel.controlNetCGListResponse.observe(this) { viewModel.controlNetworkInfoResponse.observe(this) {
mBinding.smartRefreshLayout.smartDismiss() mBinding.smartRefreshLayout.smartDismiss()
if (currentPage == 1) { if (currentPage == 1) {
adapter.submitList(it.rows) adapter.submitList(it.rows)
@ -56,7 +59,6 @@ class ControlPointActivity : BaseBindingActivity<ActivityControlPointBinding>(),
adapter.setStateViewLayout(this, R.layout.layout_no_data) adapter.setStateViewLayout(this, R.layout.layout_no_data)
} else { } else {
currentPage++ currentPage++
start += it.totalCount
} }
} else { } else {
if (it.rows.isEmpty()) { if (it.rows.isEmpty()) {
@ -64,24 +66,19 @@ class ControlPointActivity : BaseBindingActivity<ActivityControlPointBinding>(),
} else { } else {
adapter.addAll(it.rows) adapter.addAll(it.rows)
currentPage++ currentPage++
start += it.totalCount
} }
} }
} }
fetchData() fetchData()
} }
private fun fetchData(searchValue: String = "") { private fun fetchData() {
val query = if (searchValue.isBlank()) val query = searchValue.ifBlank { null }
"" viewModel.fetchSpecialControlNetworkInfo(controlNetworkName, query, currentPage)
else
"{\"custom\":[{\"type\":\"and\",\"value\":[{\"code\":\"KZWZBCG_POINTNAME\",\"cn\":\"and\",\"type\":\"like\",\"value\":\"${searchValue}\"}],\"cn\":\"and\"}],\"order\":[],\"_types\":[\"group\"]}"
viewModel.fetchSpecialControlNetCGList(query, currentPage, start)
} }
override fun onRefresh(refreshLayout: RefreshLayout) { override fun onRefresh(refreshLayout: RefreshLayout) {
currentPage = 1 currentPage = 1
start = 0
fetchData() fetchData()
} }
@ -91,9 +88,9 @@ class ControlPointActivity : BaseBindingActivity<ActivityControlPointBinding>(),
override fun initListener() { override fun initListener() {
mBinding.searchWidget.setOnEditorSearchListener { mBinding.searchWidget.setOnEditorSearchListener {
searchValue = it
currentPage = 1 currentPage = 1
start = 0 fetchData()
fetchData(it)
} }
} }

@ -2,15 +2,13 @@ package com.project.survey.ui.controlnet
import androidx.activity.viewModels import androidx.activity.viewModels
import com.project.survey.R import com.project.survey.R
import com.project.survey.constants.SPConstants import com.project.survey.databinding.ActivitySpecialControlNetworkListBinding
import com.project.survey.databinding.ActivityControlNetListBinding
import com.project.survey.extend.smartDismiss import com.project.survey.extend.smartDismiss
import com.project.survey.logic.viewmodel.ControlNetViewModel import com.project.survey.logic.viewmodel.ControlNetViewModel
import com.project.survey.model.ControlNetVersionBean import com.project.survey.model.ControlNetVersionBean
import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.ui.base.BaseBindingActivity
import com.project.survey.ui.controlnet.adapter.ControlNetSpecialAdapter import com.project.survey.ui.controlnet.adapter.SpecialControlNetworkAdapter
import com.project.survey.util.ActivityNavUtil import com.project.survey.util.ActivityNavUtil
import com.project.survey.util.SPUtils
import com.project.survey.widget.decoration.TransparentDividerDecoration import com.project.survey.widget.decoration.TransparentDividerDecoration
import com.scwang.smart.refresh.layout.api.RefreshLayout import com.scwang.smart.refresh.layout.api.RefreshLayout
import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
@ -18,28 +16,33 @@ import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
/** /**
* 专用控制网列表 * 专用控制网列表
*/ */
class ControlNetSpecialListActivity : BaseBindingActivity<ActivityControlNetListBinding>(), class SpecialControlNetworkListActivity :
OnRefreshLoadMoreListener { BaseBindingActivity<ActivitySpecialControlNetworkListBinding>(), OnRefreshLoadMoreListener {
companion object { companion object {
fun start() { fun start() {
ActivityNavUtil.startActivity<ControlNetSpecialListActivity> { } ActivityNavUtil.startActivity<SpecialControlNetworkListActivity> { }
} }
} }
override fun getBinding(): ActivityControlNetListBinding = override fun getBinding(): ActivitySpecialControlNetworkListBinding =
ActivityControlNetListBinding.inflate(layoutInflater) ActivitySpecialControlNetworkListBinding.inflate(layoutInflater)
private val viewModel: ControlNetViewModel by viewModels() private val viewModel: ControlNetViewModel by viewModels()
private val adapter by lazy { ControlNetSpecialAdapter() } private val adapter by lazy { SpecialControlNetworkAdapter() }
private var currentPage = 1 private var currentPage = 1
private var start = 0
override fun initView() { override fun initView() {
immersionToolbar(mBinding.toolbar, R.string.dedicated_control_network) immersionToolbar(mBinding.toolbar, R.string.dedicated_control_network)
initVersion() mBinding.spinner.setItems(
arrayListOf(
ControlNetVersionBean("版本一"),
ControlNetVersionBean("版本二"),
ControlNetVersionBean("版本三")
)
)
mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this) mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this)
mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this)) mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
@ -51,7 +54,7 @@ class ControlNetSpecialListActivity : BaseBindingActivity<ActivityControlNetList
viewModel.errorResponse.observe(this) { viewModel.errorResponse.observe(this) {
mBinding.smartRefreshLayout.smartDismiss() mBinding.smartRefreshLayout.smartDismiss()
} }
viewModel.controlNetListResponse.observe(this) { viewModel.controlNetworkListResponse.observe(this) {
mBinding.smartRefreshLayout.smartDismiss() mBinding.smartRefreshLayout.smartDismiss()
if (currentPage == 1) { if (currentPage == 1) {
adapter.submitList(it.rows) adapter.submitList(it.rows)
@ -60,7 +63,6 @@ class ControlNetSpecialListActivity : BaseBindingActivity<ActivityControlNetList
adapter.setStateViewLayout(this, R.layout.layout_no_data) adapter.setStateViewLayout(this, R.layout.layout_no_data)
} else { } else {
currentPage++ currentPage++
start += it.totalCount
} }
} else { } else {
if (it.rows.isEmpty()) { if (it.rows.isEmpty()) {
@ -68,7 +70,6 @@ class ControlNetSpecialListActivity : BaseBindingActivity<ActivityControlNetList
} else { } else {
adapter.addAll(it.rows) adapter.addAll(it.rows)
currentPage++ currentPage++
start += it.totalCount
} }
} }
} }
@ -77,12 +78,11 @@ class ControlNetSpecialListActivity : BaseBindingActivity<ActivityControlNetList
} }
private fun fetchData() { private fun fetchData() {
viewModel.fetchSpecialControlNetList("", currentPage, start) viewModel.fetchSpecialControlNetworkList(currentPage)
} }
override fun onRefresh(refreshLayout: RefreshLayout) { override fun onRefresh(refreshLayout: RefreshLayout) {
currentPage = 1 currentPage = 1
start = 0
fetchData() fetchData()
} }
@ -91,21 +91,12 @@ class ControlNetSpecialListActivity : BaseBindingActivity<ActivityControlNetList
} }
override fun initListener() { override fun initListener() {
adapter.setOnItemClickListener { _, _, position -> adapter.setOnItemClickListener { adapter, _, position ->
adapter.getItem(position)?.let { bean -> adapter.getItem(position)?.let { bean ->
ControlPointActivity.start() ControlPointActivity.start(bean.KZW_NAME)
} }
} }
} }
private fun initVersion() {
val versionList = mutableListOf<ControlNetVersionBean>()
versionList.add(ControlNetVersionBean("版本一"))
versionList.add(ControlNetVersionBean("版本二"))
versionList.add(ControlNetVersionBean("版本三"))
mBinding.spinner.setItems(versionList)
}
} }

@ -1,27 +0,0 @@
package com.project.survey.ui.controlnet.adapter
import android.content.Context
import android.view.ViewGroup
import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.project.survey.R
import com.project.survey.model.ControlNetBean
class ControlNetSpecialAdapter : BaseQuickAdapter<ControlNetBean, QuickViewHolder>() {
override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: ControlNetBean?) {
item?.let { bean ->
holder.setText(R.id.tvName, bean.KZW_NAME)
.setText(R.id.tvLevel, bean.KZW_MEASUREMENTLEVEL)
.setText(R.id.tvTime, bean.KZW_MEASUREMENTTIME)
}
}
override fun onCreateViewHolder(
context: Context,
parent: ViewGroup,
viewType: Int
): QuickViewHolder {
return QuickViewHolder(R.layout.item_control_net_special, parent)
}
}

@ -0,0 +1,31 @@
package com.project.survey.ui.controlnet.adapter
import android.content.Context
import android.view.ViewGroup
import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.project.survey.R
import com.project.survey.model.ControlNetworkBean
class SpecialControlNetworkAdapter : BaseQuickAdapter<ControlNetworkBean, QuickViewHolder>() {
override fun onBindViewHolder(
holder: QuickViewHolder,
position: Int,
item: ControlNetworkBean?
) {
if (item == null) return
holder.setText(R.id.tvName, item.KZW_NAME)
.setText(R.id.tvLevel, "") //TODO
.setText(R.id.tvTime, item.KZW_MEASUREMENTTIME)
}
override fun onCreateViewHolder(
context: Context,
parent: ViewGroup,
viewType: Int
): QuickViewHolder {
return QuickViewHolder(R.layout.item_special_control_network, parent)
}
}

@ -0,0 +1,35 @@
package com.project.survey.ui.controlnet.adapter
import android.content.Context
import android.view.ViewGroup
import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.project.survey.R
import com.project.survey.model.ControlNetworkInfoBean
class SpecialControlNetworkInfoAdapter :
BaseQuickAdapter<ControlNetworkInfoBean, QuickViewHolder>() {
override fun onBindViewHolder(
holder: QuickViewHolder,
position: Int,
item: ControlNetworkInfoBean?
) {
if (item == null) return
holder.setText(R.id.tvPointName, item.values.KZWZBCG_POINTNAME)
.setText(R.id.tvX, item.values.KZWZBCG_XCOORDINATE)
.setText(R.id.tvY, item.values.KZWZBCG_YCOORDINATE)
.setText(R.id.tvZ, item.values.KZWZBCG_HCOORDINATE)
.setText(R.id.tvTime, item.values.KZW_MEASUREMENTTIME)
.setText(R.id.tvRemark, item.values.KZWZBCG_BZ)
}
override fun onCreateViewHolder(
context: Context,
parent: ViewGroup,
viewType: Int
): QuickViewHolder {
return QuickViewHolder(R.layout.item_control_net_first, parent)
}
}

@ -12,7 +12,7 @@ import com.project.survey.model.ProjectBean
import com.project.survey.ui.approval.ApprovalActivity import com.project.survey.ui.approval.ApprovalActivity
import com.project.survey.ui.base.BaseBindingFragment import com.project.survey.ui.base.BaseBindingFragment
import com.project.survey.ui.controlnet.ControlNetFirstListActivity import com.project.survey.ui.controlnet.ControlNetFirstListActivity
import com.project.survey.ui.controlnet.ControlNetSpecialListActivity import com.project.survey.ui.controlnet.SpecialControlNetworkListActivity
import com.project.survey.ui.lofting.LoftingListActivity import com.project.survey.ui.lofting.LoftingListActivity
import com.project.survey.ui.pointmeasure.PointMeasureListActivity import com.project.survey.ui.pointmeasure.PointMeasureListActivity
import com.project.survey.util.SPUtils import com.project.survey.util.SPUtils
@ -71,7 +71,7 @@ class HomeFragment : BaseBindingFragment<FragmentHomeBinding>() {
} }
// 专用控制网 // 专用控制网
mBinding.itemControlNetSpecial.setOnClickNoRepeatListener { mBinding.itemControlNetSpecial.setOnClickNoRepeatListener {
ControlNetSpecialListActivity.start() SpecialControlNetworkListActivity.start()
} }
} }
} }

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- <include-->
<!-- android:id="@+id/ilToolBar"-->
<!-- layout="@layout/sh_toolbar" />-->
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="@color/transparent"
app:navigationIcon="@drawable/icon_toolbar_back"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:titleCentered="true"
app:titleTextAppearance="@style/ToolbarTextAppearance" />
<!-- <include-->
<!-- android:id="@+id/ilSearch"-->
<!-- layout="@layout/item_search_control_net" />-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/llSpinner"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_marginStart="16dp"
android:layout_marginTop="7dp"
android:background="@drawable/bg_search"
app:layout_constraintEnd_toStartOf="@id/searchWidget"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.project.survey.widget.materialspinner.MaterialSpinner
android:id="@+id/spinner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginVertical="7dp" />
</FrameLayout>
<View
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginTop="7dp"
android:background="@drawable/bg_search_shadow_2"
app:layout_constraintEnd_toEndOf="@id/llSpinner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/llSpinner" />
<com.project.survey.widget.SearchWidget
android:id="@+id/searchWidget"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintStart_toEndOf="@id/llSpinner"
app:layout_constraintTop_toTopOf="parent"
app:sw_hint="请输入控制网名称" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/smartRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/sw_12dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</LinearLayout>
Loading…
Cancel
Save