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 580ffaa..2a9abe4 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 @@ -42,44 +42,42 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) - broadcastManager.addAction( - object : BroadcastReceiver() { - override fun onReceive(context: Context?, intent: Intent?) { - intent?.apply { - if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { - val wifiState = intent.getIntExtra( - WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN + broadcastManager.addAction(object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { + val wifiState = intent.getIntExtra( + WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN + ) + if (wifiState == WifiManager.WIFI_STATE_ENABLED) { + //WiFi已关闭 + binding.wifiNameView.text = "WiFi已关闭" + } + } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { + val net = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + intent.getParcelableExtra( + WifiManager.EXTRA_NETWORK_INFO, NetworkInfo::class.java ) - if (wifiState == WifiManager.WIFI_STATE_ENABLED) { - //WiFi已关闭 - binding.wifiNameView.text = "WiFi已关闭" - } - } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { - val net = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - intent.getParcelableExtra( - WifiManager.EXTRA_NETWORK_INFO, NetworkInfo::class.java - ) - } else { - intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO) - } + } else { + intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO) + } - if (net == null) { - "NetworkInfo is null".show(requireContext()) - return - } - if (net.isConnected) { - binding.wifiNameView.text = wifi.connectionInfo.ssid - .removePrefix("\"") - .removeSuffix("\"") - } else { - //WiFi断开 - binding.wifiNameView.text = "WiFi已断开" - } + if (net == null) { + "NetworkInfo is null".show(requireContext()) + return + } + if (net.isConnected) { + binding.wifiNameView.text = wifi.connectionInfo.ssid + .removePrefix("\"") + .removeSuffix("\"") + } else { + //WiFi断开 + binding.wifiNameView.text = "WiFi已断开" } } } - }, WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.NETWORK_STATE_CHANGED_ACTION - ) + } + }, WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.NETWORK_STATE_CHANGED_ACTION) } override fun initViewBinding( @@ -163,7 +161,7 @@ val list = data.split(",") binding.boardHostView.text = list[0] binding.boardMaskView.text = list[1] - binding.gatewayView.text = list[2].trim() + binding.gatewayView.text = list[2] } LocaleConstant.SERVER_CONFIG_RESPONSE_CODE -> { @@ -172,7 +170,7 @@ //分割数据 val list = data.split(",") binding.serverHostView.setText(list[0]) - binding.serverPortView.setText(list[1].trim()) + binding.serverPortView.setText(list[1]) } } return true @@ -180,7 +178,7 @@ override fun onResume() { super.onResume() - binding.wifiNameView.text = wifi.connectionInfo.ssid + binding.wifiNameView.text = wifi.connectionInfo.ssid.removePrefix("\"").removeSuffix("\"") } /** 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 580ffaa..2a9abe4 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 @@ -42,44 +42,42 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) - broadcastManager.addAction( - object : BroadcastReceiver() { - override fun onReceive(context: Context?, intent: Intent?) { - intent?.apply { - if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { - val wifiState = intent.getIntExtra( - WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN + broadcastManager.addAction(object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { + val wifiState = intent.getIntExtra( + WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN + ) + if (wifiState == WifiManager.WIFI_STATE_ENABLED) { + //WiFi已关闭 + binding.wifiNameView.text = "WiFi已关闭" + } + } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { + val net = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + intent.getParcelableExtra( + WifiManager.EXTRA_NETWORK_INFO, NetworkInfo::class.java ) - if (wifiState == WifiManager.WIFI_STATE_ENABLED) { - //WiFi已关闭 - binding.wifiNameView.text = "WiFi已关闭" - } - } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { - val net = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - intent.getParcelableExtra( - WifiManager.EXTRA_NETWORK_INFO, NetworkInfo::class.java - ) - } else { - intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO) - } + } else { + intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO) + } - if (net == null) { - "NetworkInfo is null".show(requireContext()) - return - } - if (net.isConnected) { - binding.wifiNameView.text = wifi.connectionInfo.ssid - .removePrefix("\"") - .removeSuffix("\"") - } else { - //WiFi断开 - binding.wifiNameView.text = "WiFi已断开" - } + if (net == null) { + "NetworkInfo is null".show(requireContext()) + return + } + if (net.isConnected) { + binding.wifiNameView.text = wifi.connectionInfo.ssid + .removePrefix("\"") + .removeSuffix("\"") + } else { + //WiFi断开 + binding.wifiNameView.text = "WiFi已断开" } } } - }, WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.NETWORK_STATE_CHANGED_ACTION - ) + } + }, WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.NETWORK_STATE_CHANGED_ACTION) } override fun initViewBinding( @@ -163,7 +161,7 @@ val list = data.split(",") binding.boardHostView.text = list[0] binding.boardMaskView.text = list[1] - binding.gatewayView.text = list[2].trim() + binding.gatewayView.text = list[2] } LocaleConstant.SERVER_CONFIG_RESPONSE_CODE -> { @@ -172,7 +170,7 @@ //分割数据 val list = data.split(",") binding.serverHostView.setText(list[0]) - binding.serverPortView.setText(list[1].trim()) + binding.serverPortView.setText(list[1]) } } return true @@ -180,7 +178,7 @@ override fun onResume() { super.onResume() - binding.wifiNameView.text = wifi.connectionInfo.ssid + binding.wifiNameView.text = wifi.connectionInfo.ssid.removePrefix("\"").removeSuffix("\"") } /** 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 543e622..e3548dc 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 @@ -136,7 +136,7 @@ val cpuTemperature = msg.obj as Float binding.cpuTemperatureView.text = "$cpuTemperature ℃" when (cpuTemperature) { - in 0f..40f -> { + in -10f..40f -> { binding.cpuTemperatureView.setTextColor(Color.BLACK) binding.cpuTemperatureView.typeface = Typeface.DEFAULT } 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 580ffaa..2a9abe4 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 @@ -42,44 +42,42 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) - broadcastManager.addAction( - object : BroadcastReceiver() { - override fun onReceive(context: Context?, intent: Intent?) { - intent?.apply { - if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { - val wifiState = intent.getIntExtra( - WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN + broadcastManager.addAction(object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.apply { + if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { + val wifiState = intent.getIntExtra( + WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN + ) + if (wifiState == WifiManager.WIFI_STATE_ENABLED) { + //WiFi已关闭 + binding.wifiNameView.text = "WiFi已关闭" + } + } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { + val net = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + intent.getParcelableExtra( + WifiManager.EXTRA_NETWORK_INFO, NetworkInfo::class.java ) - if (wifiState == WifiManager.WIFI_STATE_ENABLED) { - //WiFi已关闭 - binding.wifiNameView.text = "WiFi已关闭" - } - } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { - val net = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - intent.getParcelableExtra( - WifiManager.EXTRA_NETWORK_INFO, NetworkInfo::class.java - ) - } else { - intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO) - } + } else { + intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO) + } - if (net == null) { - "NetworkInfo is null".show(requireContext()) - return - } - if (net.isConnected) { - binding.wifiNameView.text = wifi.connectionInfo.ssid - .removePrefix("\"") - .removeSuffix("\"") - } else { - //WiFi断开 - binding.wifiNameView.text = "WiFi已断开" - } + if (net == null) { + "NetworkInfo is null".show(requireContext()) + return + } + if (net.isConnected) { + binding.wifiNameView.text = wifi.connectionInfo.ssid + .removePrefix("\"") + .removeSuffix("\"") + } else { + //WiFi断开 + binding.wifiNameView.text = "WiFi已断开" } } } - }, WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.NETWORK_STATE_CHANGED_ACTION - ) + } + }, WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.NETWORK_STATE_CHANGED_ACTION) } override fun initViewBinding( @@ -163,7 +161,7 @@ val list = data.split(",") binding.boardHostView.text = list[0] binding.boardMaskView.text = list[1] - binding.gatewayView.text = list[2].trim() + binding.gatewayView.text = list[2] } LocaleConstant.SERVER_CONFIG_RESPONSE_CODE -> { @@ -172,7 +170,7 @@ //分割数据 val list = data.split(",") binding.serverHostView.setText(list[0]) - binding.serverPortView.setText(list[1].trim()) + binding.serverPortView.setText(list[1]) } } return true @@ -180,7 +178,7 @@ override fun onResume() { super.onResume() - binding.wifiNameView.text = wifi.connectionInfo.ssid + binding.wifiNameView.text = wifi.connectionInfo.ssid.removePrefix("\"").removeSuffix("\"") } /** 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 543e622..e3548dc 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 @@ -136,7 +136,7 @@ val cpuTemperature = msg.obj as Float binding.cpuTemperatureView.text = "$cpuTemperature ℃" when (cpuTemperature) { - in 0f..40f -> { + in -10f..40f -> { binding.cpuTemperatureView.setTextColor(Color.BLACK) binding.cpuTemperatureView.typeface = Typeface.DEFAULT } 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 166e63c..75f26b2 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 @@ -170,13 +170,12 @@ if (bytes == null) { return } - Log.d(kTag, bytes.contentToString()) //根据帧头判断。不能直接转为ascii，因为有的协议返回的不是ascii，会报错 val dataHeadArray = bytes.copyOfRange(0, 7) if (dataHeadArray.contentEquals(byteArrayOf(71, 101, 116, 68, 97, 116, 97))) { //GetData val dataArray = bytes.copyOfRange(10, bytes.size) - val data = dataArray.toAsciiCode() + val data = dataArray.toAsciiCode().trim() val weakReferenceHandler = BaseSettingsFragment.weakReferenceHandler ?: return @@ -205,6 +204,8 @@ } } else if (dataHeadArray.contentEquals(byteArrayOf())) { //SetData TODO + Log.d(kTag, bytes.toAsciiCode().trim()) + when (Char(bytes[10].toInt())) { '2' -> { Log.d(kTag, "onMessageReceived: ${bytes.toAsciiCode()}")