diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt index 81f921b..136f6ed 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -10,6 +10,7 @@ import android.os.Handler import android.os.Message import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -88,6 +89,14 @@ } + override fun setUserVisibleHint(isVisibleToUser: Boolean) { + super.setUserVisibleHint(isVisibleToUser) + if (isVisibleToUser) { + //查询主控板IP、子网掩码、网关IP + SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) + } + } + override fun initEvent() { binding.queryBoardConfigButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) @@ -115,6 +124,14 @@ override fun onResume() { super.onResume() binding.wifiNameView.text = wifi.connectionInfo.ssid + if (binding.boardHostView.text.isEmpty() || + binding.boardMaskView.text.isEmpty() || + binding.gatewayView.text.isEmpty() + ) { + binding.queryBoardConfigButton.visibility = View.VISIBLE + } else { + binding.queryBoardConfigButton.visibility = View.GONE + } } /** diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt index 81f921b..136f6ed 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -10,6 +10,7 @@ import android.os.Handler import android.os.Message import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -88,6 +89,14 @@ } + override fun setUserVisibleHint(isVisibleToUser: Boolean) { + super.setUserVisibleHint(isVisibleToUser) + if (isVisibleToUser) { + //查询主控板IP、子网掩码、网关IP + SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) + } + } + override fun initEvent() { binding.queryBoardConfigButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) @@ -115,6 +124,14 @@ override fun onResume() { super.onResume() binding.wifiNameView.text = wifi.connectionInfo.ssid + if (binding.boardHostView.text.isEmpty() || + binding.boardMaskView.text.isEmpty() || + binding.gatewayView.text.isEmpty() + ) { + binding.queryBoardConfigButton.visibility = View.VISIBLE + } else { + binding.queryBoardConfigButton.visibility = View.GONE + } } /** diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index 796a6a2..91adaa5 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -75,6 +75,9 @@ override fun setUserVisibleHint(isVisibleToUser: Boolean) { super.setUserVisibleHint(isVisibleToUser) this.isVisibleToUser = isVisibleToUser + if (isVisibleToUser) { + SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_CPU_TEMPERATURE_CODE) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt index 81f921b..136f6ed 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -10,6 +10,7 @@ import android.os.Handler import android.os.Message import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -88,6 +89,14 @@ } + override fun setUserVisibleHint(isVisibleToUser: Boolean) { + super.setUserVisibleHint(isVisibleToUser) + if (isVisibleToUser) { + //查询主控板IP、子网掩码、网关IP + SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) + } + } + override fun initEvent() { binding.queryBoardConfigButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) @@ -115,6 +124,14 @@ override fun onResume() { super.onResume() binding.wifiNameView.text = wifi.connectionInfo.ssid + if (binding.boardHostView.text.isEmpty() || + binding.boardMaskView.text.isEmpty() || + binding.gatewayView.text.isEmpty() + ) { + binding.queryBoardConfigButton.visibility = View.VISIBLE + } else { + binding.queryBoardConfigButton.visibility = View.GONE + } } /** diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index 796a6a2..91adaa5 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -75,6 +75,9 @@ override fun setUserVisibleHint(isVisibleToUser: Boolean) { super.setUserVisibleHint(isVisibleToUser) this.isVisibleToUser = isVisibleToUser + if (isVisibleToUser) { + SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_CPU_TEMPERATURE_CODE) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt index 8d718f9..1acc004 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt @@ -106,10 +106,6 @@ override fun onConnected() { ForegroundRunningService.weakReferenceHandler?.sendEmptyMessage(2024110501) - //查询一次激光芯片温度 - tcpClient.sendMessage(CommandCreator.createCpuTemperatureCommand()) - //查询主控板IP、子网掩码、网关IP - tcpClient.sendMessage(CommandCreator.createControlBoardConfigCommand()) //定时查询甲烷浓度 weakReferenceHandler?.post(methaneRunnable) } diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt index 81f921b..136f6ed 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -10,6 +10,7 @@ import android.os.Handler import android.os.Message import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -88,6 +89,14 @@ } + override fun setUserVisibleHint(isVisibleToUser: Boolean) { + super.setUserVisibleHint(isVisibleToUser) + if (isVisibleToUser) { + //查询主控板IP、子网掩码、网关IP + SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) + } + } + override fun initEvent() { binding.queryBoardConfigButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_BOARD_CONFIG_CODE) @@ -115,6 +124,14 @@ override fun onResume() { super.onResume() binding.wifiNameView.text = wifi.connectionInfo.ssid + if (binding.boardHostView.text.isEmpty() || + binding.boardMaskView.text.isEmpty() || + binding.gatewayView.text.isEmpty() + ) { + binding.queryBoardConfigButton.visibility = View.VISIBLE + } else { + binding.queryBoardConfigButton.visibility = View.GONE + } } /** diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index 796a6a2..91adaa5 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -75,6 +75,9 @@ override fun setUserVisibleHint(isVisibleToUser: Boolean) { super.setUserVisibleHint(isVisibleToUser) this.isVisibleToUser = isVisibleToUser + if (isVisibleToUser) { + SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_CPU_TEMPERATURE_CODE) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt index 8d718f9..1acc004 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt @@ -106,10 +106,6 @@ override fun onConnected() { ForegroundRunningService.weakReferenceHandler?.sendEmptyMessage(2024110501) - //查询一次激光芯片温度 - tcpClient.sendMessage(CommandCreator.createCpuTemperatureCommand()) - //查询主控板IP、子网掩码、网关IP - tcpClient.sendMessage(CommandCreator.createControlBoardConfigCommand()) //定时查询甲烷浓度 weakReferenceHandler?.post(methaneRunnable) } diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml index 919116a..96284a0 100644 --- a/app/src/main/res/layout/fragment_base_settings.xml +++ b/app/src/main/res/layout/fragment_base_settings.xml @@ -61,7 +61,8 @@ android:id="@+id/queryBoardConfigButton" android:layout_width="@dimen/dp_65" android:layout_height="@dimen/dp_45" - android:text="查询" /> + android:text="查询" + android:visibility="gone" />