diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 728f0b2..e558914 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 728f0b2..e558914 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,7 +34,7 @@ - + \ No newline at end of file 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 a54be3b..987ed24 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 @@ -42,12 +42,12 @@ weakReferenceHandler = WeakReferenceHandler(this) //动态设置LineChart宽高 - val rtspViewParams = binding.lineChart.layoutParams as ViewGroup.LayoutParams + val viewParams = binding.cardView.layoutParams as ViewGroup.LayoutParams val videoWidth = requireContext().getScreenWidth() - 40.dp2px(requireContext()) val videoHeight = videoWidth * (9f / 16) - rtspViewParams.width = videoWidth - rtspViewParams.height = videoHeight.toInt() - binding.lineChart.layoutParams = rtspViewParams + viewParams.width = videoWidth + viewParams.height = videoHeight.toInt() + binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 728f0b2..e558914 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,7 +34,7 @@ - + \ No newline at end of file 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 a54be3b..987ed24 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 @@ -42,12 +42,12 @@ weakReferenceHandler = WeakReferenceHandler(this) //动态设置LineChart宽高 - val rtspViewParams = binding.lineChart.layoutParams as ViewGroup.LayoutParams + val viewParams = binding.cardView.layoutParams as ViewGroup.LayoutParams val videoWidth = requireContext().getScreenWidth() - 40.dp2px(requireContext()) val videoHeight = videoWidth * (9f / 16) - rtspViewParams.width = videoWidth - rtspViewParams.height = videoHeight.toInt() - binding.lineChart.layoutParams = rtspViewParams + viewParams.width = videoWidth + viewParams.height = videoHeight.toInt() + binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index a52d491..f31f821 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -1,5 +1,6 @@ - + android:layout_marginHorizontal="@dimen/dp_20" + app:cardElevation="0dp"> + + + \ No newline at end of file