diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index b75acb4..58f2670 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -1,22 +1,19 @@ package com.casic.br.operationsite.fragments import android.os.Bundle +import android.util.Log import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { + private val kTag = "AutoInspectionFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - private var selectedTree = "" override fun initViewBinding( inflater: LayoutInflater, container: ViewGroup? @@ -29,18 +26,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - if (RuntimeCache.treeIds.isEmpty()) { - "当前施工现场没有安全树".show(requireContext()) - return - } - selectedTree = RuntimeCache.treeIds.first() - val adapter = ArrayAdapter( - requireContext(), android.R.layout.simple_spinner_item, RuntimeCache.treeIds - ).apply { - setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) - } - binding.treeSpinner.adapter = adapter } override fun observeRequestState() { @@ -48,41 +34,11 @@ } override fun initEvent() { - binding.treeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedTree = RuntimeCache.treeIds[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - binding.addPointButton.setOnClickListener { - - - //0~360° - val horizontalAngle = binding.horizontalAngleView.text.toString().trim() - if (horizontalAngle.toDouble() < 0 || horizontalAngle.toDouble() > 360) { - "水平角度设置错误".show(requireContext()) - return@setOnClickListener - } - - //-30~90° - val verticalAngle = binding.verticalAngleView.text.toString().trim() - if (verticalAngle.toDouble() < -30 || verticalAngle.toDouble() > 90) { - "垂直角度设置错误".show(requireContext()) - return@setOnClickListener - } - deviceViewModel.addPoint( - selectedTree, - horizontalAngle, - verticalAngle, onLoading = {}, onSuccess = { + Log.d(kTag, "initEvent: $it") "添加成功".show(requireContext()) }, onFailed = { diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index b75acb4..58f2670 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -1,22 +1,19 @@ package com.casic.br.operationsite.fragments import android.os.Bundle +import android.util.Log import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { + private val kTag = "AutoInspectionFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - private var selectedTree = "" override fun initViewBinding( inflater: LayoutInflater, container: ViewGroup? @@ -29,18 +26,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - if (RuntimeCache.treeIds.isEmpty()) { - "当前施工现场没有安全树".show(requireContext()) - return - } - selectedTree = RuntimeCache.treeIds.first() - val adapter = ArrayAdapter( - requireContext(), android.R.layout.simple_spinner_item, RuntimeCache.treeIds - ).apply { - setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) - } - binding.treeSpinner.adapter = adapter } override fun observeRequestState() { @@ -48,41 +34,11 @@ } override fun initEvent() { - binding.treeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedTree = RuntimeCache.treeIds[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - binding.addPointButton.setOnClickListener { - - - //0~360° - val horizontalAngle = binding.horizontalAngleView.text.toString().trim() - if (horizontalAngle.toDouble() < 0 || horizontalAngle.toDouble() > 360) { - "水平角度设置错误".show(requireContext()) - return@setOnClickListener - } - - //-30~90° - val verticalAngle = binding.verticalAngleView.text.toString().trim() - if (verticalAngle.toDouble() < -30 || verticalAngle.toDouble() > 90) { - "垂直角度设置错误".show(requireContext()) - return@setOnClickListener - } - deviceViewModel.addPoint( - selectedTree, - horizontalAngle, - verticalAngle, onLoading = {}, onSuccess = { + Log.d(kTag, "initEvent: $it") "添加成功".show(requireContext()) }, onFailed = { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt index a52fbec..c826e89 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt @@ -2,5 +2,4 @@ object RuntimeCache { var projectId = "" - var treeIds = ArrayList() } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index b75acb4..58f2670 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -1,22 +1,19 @@ package com.casic.br.operationsite.fragments import android.os.Bundle +import android.util.Log import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { + private val kTag = "AutoInspectionFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - private var selectedTree = "" override fun initViewBinding( inflater: LayoutInflater, container: ViewGroup? @@ -29,18 +26,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - if (RuntimeCache.treeIds.isEmpty()) { - "当前施工现场没有安全树".show(requireContext()) - return - } - selectedTree = RuntimeCache.treeIds.first() - val adapter = ArrayAdapter( - requireContext(), android.R.layout.simple_spinner_item, RuntimeCache.treeIds - ).apply { - setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) - } - binding.treeSpinner.adapter = adapter } override fun observeRequestState() { @@ -48,41 +34,11 @@ } override fun initEvent() { - binding.treeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedTree = RuntimeCache.treeIds[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - binding.addPointButton.setOnClickListener { - - - //0~360° - val horizontalAngle = binding.horizontalAngleView.text.toString().trim() - if (horizontalAngle.toDouble() < 0 || horizontalAngle.toDouble() > 360) { - "水平角度设置错误".show(requireContext()) - return@setOnClickListener - } - - //-30~90° - val verticalAngle = binding.verticalAngleView.text.toString().trim() - if (verticalAngle.toDouble() < -30 || verticalAngle.toDouble() > 90) { - "垂直角度设置错误".show(requireContext()) - return@setOnClickListener - } - deviceViewModel.addPoint( - selectedTree, - horizontalAngle, - verticalAngle, onLoading = {}, onSuccess = { + Log.d(kTag, "initEvent: $it") "添加成功".show(requireContext()) }, onFailed = { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt index a52fbec..c826e89 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt @@ -2,5 +2,4 @@ object RuntimeCache { var projectId = "" - var treeIds = ArrayList() } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index ad1fd6c..db25c40 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -454,9 +454,6 @@ val allMarkerOptions = ArrayList() val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() - if (RuntimeCache.treeIds.isNotEmpty()) { - RuntimeCache.treeIds.clear() - } it.data.forEach { x -> val location = x.latestLocation if (location.gdLat.isNotBlank() && location.gdLng.isNotBlank()) { @@ -477,7 +474,6 @@ * */ if (x.deviceType == "1") { options.icon(BitmapDescriptorFactory.fromResource(R.mipmap.map_pin_tree)) - RuntimeCache.treeIds.add(x.id) } else if (x.deviceType == "6") { options.icon(BitmapDescriptorFactory.fromResource(R.mipmap.map_pin_device)) } diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt index b75acb4..58f2670 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt @@ -1,22 +1,19 @@ package com.casic.br.operationsite.fragments import android.os.Bundle +import android.util.Log import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.DeviceViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show class AutoInspectionFragment : KotlinBaseFragment() { + private val kTag = "AutoInspectionFragment" private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - private var selectedTree = "" override fun initViewBinding( inflater: LayoutInflater, container: ViewGroup? @@ -29,18 +26,7 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - if (RuntimeCache.treeIds.isEmpty()) { - "当前施工现场没有安全树".show(requireContext()) - return - } - selectedTree = RuntimeCache.treeIds.first() - val adapter = ArrayAdapter( - requireContext(), android.R.layout.simple_spinner_item, RuntimeCache.treeIds - ).apply { - setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) - } - binding.treeSpinner.adapter = adapter } override fun observeRequestState() { @@ -48,41 +34,11 @@ } override fun initEvent() { - binding.treeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, view: View?, position: Int, id: Long - ) { - selectedTree = RuntimeCache.treeIds[position] - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - - } - } - binding.addPointButton.setOnClickListener { - - - //0~360° - val horizontalAngle = binding.horizontalAngleView.text.toString().trim() - if (horizontalAngle.toDouble() < 0 || horizontalAngle.toDouble() > 360) { - "水平角度设置错误".show(requireContext()) - return@setOnClickListener - } - - //-30~90° - val verticalAngle = binding.verticalAngleView.text.toString().trim() - if (verticalAngle.toDouble() < -30 || verticalAngle.toDouble() > 90) { - "垂直角度设置错误".show(requireContext()) - return@setOnClickListener - } - deviceViewModel.addPoint( - selectedTree, - horizontalAngle, - verticalAngle, onLoading = {}, onSuccess = { + Log.d(kTag, "initEvent: $it") "添加成功".show(requireContext()) }, onFailed = { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt index a52fbec..c826e89 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/RuntimeCache.kt @@ -2,5 +2,4 @@ object RuntimeCache { var projectId = "" - var treeIds = ArrayList() } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index ad1fd6c..db25c40 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -454,9 +454,6 @@ val allMarkerOptions = ArrayList() val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() - if (RuntimeCache.treeIds.isNotEmpty()) { - RuntimeCache.treeIds.clear() - } it.data.forEach { x -> val location = x.latestLocation if (location.gdLat.isNotBlank() && location.gdLng.isNotBlank()) { @@ -477,7 +474,6 @@ * */ if (x.deviceType == "1") { options.icon(BitmapDescriptorFactory.fromResource(R.mipmap.map_pin_tree)) - RuntimeCache.treeIds.add(x.id) } else if (x.deviceType == "6") { options.icon(BitmapDescriptorFactory.fromResource(R.mipmap.map_pin_device)) } diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 50df033..46ecff2 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -12,8 +12,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/mainThemeColor" + app:tbv_right_image="@drawable/ic_connection" app:tbv_show_left_image="false" - app:tbv_show_right_image="false" + app:tbv_show_right_image="true" app:tbv_smaller_title="true" app:tbv_text="@string/app_name" />