diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 9d0a48d..bb3bb5b 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -32,8 +32,8 @@ this.axisLeft.setDrawGridLines(false) //设置x轴上每个点对应的线 this.axisLeft.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1f) as Float - val limitLine = LimitLine(threshold, "阈值:${threshold}% VOL") + val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1) + val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%VOL") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 9d0a48d..bb3bb5b 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -32,8 +32,8 @@ this.axisLeft.setDrawGridLines(false) //设置x轴上每个点对应的线 this.axisLeft.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1f) as Float - val limitLine = LimitLine(threshold, "阈值:${threshold}% VOL") + val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1) + val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%VOL") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt index 6f09204..771ec2f 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -31,6 +31,7 @@ 5 to "五档", 6 to "最大音量" ) + private var currentIndex = 6 private var isVisibleToUser = false private var isGetVoiceValue = false private var isGetVoiceMode = false @@ -92,10 +93,20 @@ override fun initEvent() { binding.reduceVolumeButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.REDUCE_VOICE_CODE) + currentIndex-- + if (currentIndex < 0) { + currentIndex = 0 + } + binding.volumeValueView.text = valueToChineseMap[currentIndex] } binding.increaseVolumeButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.INCREASE_VOICE_CODE) + currentIndex++ + if (currentIndex > 6) { + currentIndex = 6 + } + binding.volumeValueView.text = valueToChineseMap[currentIndex] } binding.localeRadioButton.setOnClickListener { @@ -127,7 +138,8 @@ when (msg.what) { LocaleConstant.QUERY_VOICE_VALUE_RESPONSE_CODE -> { isGetVoiceValue = true - binding.volumeValueView.text = valueToChineseMap[msg.obj as Int] + currentIndex = msg.obj as Int + binding.volumeValueView.text = valueToChineseMap[currentIndex] } LocaleConstant.QUERY_VOICE_MODE_RESPONSE_CODE -> { @@ -159,10 +171,4 @@ } return true } - - override fun onResume() { - super.onResume() - //单独查询一次音量,防止用户从后台直接进去app界面而出现音量不准的问题 -// SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_VOICE_VALUE_CODE) - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 9d0a48d..bb3bb5b 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -32,8 +32,8 @@ this.axisLeft.setDrawGridLines(false) //设置x轴上每个点对应的线 this.axisLeft.setDrawZeroLine(true) //添加限制线 - val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1f) as Float - val limitLine = LimitLine(threshold, "阈值:${threshold}% VOL") + val threshold = SaveKeyValues.getValue(LocaleConstant.METHANE_DEFAULT_VALUE_KEY, 0.1) + val limitLine = LimitLine(threshold.toString().toFloat(), "阈值:${threshold}%VOL") limitLine.lineWidth = 1f limitLine.lineColor = Color.RED //允许在虚线模式下绘制(线段长度,分隔长度,偏移量) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt index 6f09204..771ec2f 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -31,6 +31,7 @@ 5 to "五档", 6 to "最大音量" ) + private var currentIndex = 6 private var isVisibleToUser = false private var isGetVoiceValue = false private var isGetVoiceMode = false @@ -92,10 +93,20 @@ override fun initEvent() { binding.reduceVolumeButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.REDUCE_VOICE_CODE) + currentIndex-- + if (currentIndex < 0) { + currentIndex = 0 + } + binding.volumeValueView.text = valueToChineseMap[currentIndex] } binding.increaseVolumeButton.setOnClickListener { SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.INCREASE_VOICE_CODE) + currentIndex++ + if (currentIndex > 6) { + currentIndex = 6 + } + binding.volumeValueView.text = valueToChineseMap[currentIndex] } binding.localeRadioButton.setOnClickListener { @@ -127,7 +138,8 @@ when (msg.what) { LocaleConstant.QUERY_VOICE_VALUE_RESPONSE_CODE -> { isGetVoiceValue = true - binding.volumeValueView.text = valueToChineseMap[msg.obj as Int] + currentIndex = msg.obj as Int + binding.volumeValueView.text = valueToChineseMap[currentIndex] } LocaleConstant.QUERY_VOICE_MODE_RESPONSE_CODE -> { @@ -159,10 +171,4 @@ } return true } - - override fun onResume() { - super.onResume() - //单独查询一次音量,防止用户从后台直接进去app界面而出现音量不准的问题 -// SocketConnectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.QUERY_VOICE_VALUE_CODE) - } } \ No newline at end of file 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 b7050b5..42736a1 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 @@ -141,7 +141,7 @@ override fun run() { tcpClient.sendMessage(CommandCreator.queryMethane()) // 每3s重复一次 -// weakReferenceHandler?.postDelayed(this, 3 * 1000L) + weakReferenceHandler?.postDelayed(this, 3 * 1000L) } } @@ -305,9 +305,7 @@ message.obj = bytes[10].toInt() weakReferenceHandler.sendMessage(message) } else { - //TODO 音量调整之后自动查询一次音量大小 - Thread.sleep(500) - tcpClient.sendMessage(CommandCreator.queryVoiceValue()) + Log.d(kTag, "onMessageReceived: 调节音量返回值不处理") } } }