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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
index 4285122..4fcfa29 100644
--- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
@@ -18,7 +18,7 @@
 import com.casic.app.safetreecontroller.extensions.initImmersionBar
 import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment
 import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment
-import com.casic.app.safetreecontroller.fragments.MethaneDataFragment
+import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment
 import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment
 import com.casic.app.safetreecontroller.tcp.ConnectionState
 import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener
@@ -43,7 +43,7 @@
     private val kTag = "MainActivity"
     private val context = this
     private val fragmentPages by lazy { ArrayList<Fragment>() }
-    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置")
+    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置")
     private val tcpClient by lazy { TcpClient(this) }
     private val connectivityManager by lazy { getSystemService<ConnectivityManager>() }
     private val wifiManager by lazy { getSystemService<WifiManager>()!! }
@@ -51,7 +51,7 @@
 
     init {
         fragmentPages.add(DeviceControllerFragment())
-        fragmentPages.add(MethaneDataFragment())
+        fragmentPages.add(MethaneMonitorFragment())
         fragmentPages.add(VoiceSettingsFragment())
         fragmentPages.add(BaseSettingsFragment())
     }

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
index 4285122..4fcfa29 100644
--- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
@@ -18,7 +18,7 @@
 import com.casic.app.safetreecontroller.extensions.initImmersionBar
 import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment
 import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment
-import com.casic.app.safetreecontroller.fragments.MethaneDataFragment
+import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment
 import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment
 import com.casic.app.safetreecontroller.tcp.ConnectionState
 import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener
@@ -43,7 +43,7 @@
     private val kTag = "MainActivity"
     private val context = this
     private val fragmentPages by lazy { ArrayList<Fragment>() }
-    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置")
+    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置")
     private val tcpClient by lazy { TcpClient(this) }
     private val connectivityManager by lazy { getSystemService<ConnectivityManager>() }
     private val wifiManager by lazy { getSystemService<WifiManager>()!! }
@@ -51,7 +51,7 @@
 
     init {
         fragmentPages.add(DeviceControllerFragment())
-        fragmentPages.add(MethaneDataFragment())
+        fragmentPages.add(MethaneMonitorFragment())
         fragmentPages.add(VoiceSettingsFragment())
         fragmentPages.add(BaseSettingsFragment())
     }
diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml
index 64d9a03..b3e8368 100644
--- a/app/src/main/res/layout/fragment_base_settings.xml
+++ b/app/src/main/res/layout/fragment_base_settings.xml
@@ -1,49 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:background="@color/mainBackColor"
         android:orientation="vertical">
 
         <LinearLayout
@@ -53,20 +16,65 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备编号"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
+                android:id="@+id/deviceCodeView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="@string/app_name"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="主控板参数配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:text="IP地址"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.3.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +84,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="子网掩码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                android:layout_weight="2.25"
+                android:text="0.0.0.0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -105,20 +109,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="网关地址"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.0.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -128,28 +134,132 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi名称"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
                 android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi密码"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="textPassword"
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="服务器配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器IP"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:text="111.198.18.188"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器端口"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="number"
+                android:padding="@dimen/dp_5"
+                android:text="8080"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/configurationButton"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:layout_margin="@dimen/dp_20"
+            android:text="下发配置" />
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
-</LinearLayout>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
index 4285122..4fcfa29 100644
--- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
@@ -18,7 +18,7 @@
 import com.casic.app.safetreecontroller.extensions.initImmersionBar
 import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment
 import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment
-import com.casic.app.safetreecontroller.fragments.MethaneDataFragment
+import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment
 import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment
 import com.casic.app.safetreecontroller.tcp.ConnectionState
 import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener
@@ -43,7 +43,7 @@
     private val kTag = "MainActivity"
     private val context = this
     private val fragmentPages by lazy { ArrayList<Fragment>() }
-    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置")
+    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置")
     private val tcpClient by lazy { TcpClient(this) }
     private val connectivityManager by lazy { getSystemService<ConnectivityManager>() }
     private val wifiManager by lazy { getSystemService<WifiManager>()!! }
@@ -51,7 +51,7 @@
 
     init {
         fragmentPages.add(DeviceControllerFragment())
-        fragmentPages.add(MethaneDataFragment())
+        fragmentPages.add(MethaneMonitorFragment())
         fragmentPages.add(VoiceSettingsFragment())
         fragmentPages.add(BaseSettingsFragment())
     }
diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml
index 64d9a03..b3e8368 100644
--- a/app/src/main/res/layout/fragment_base_settings.xml
+++ b/app/src/main/res/layout/fragment_base_settings.xml
@@ -1,49 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:background="@color/mainBackColor"
         android:orientation="vertical">
 
         <LinearLayout
@@ -53,20 +16,65 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备编号"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
+                android:id="@+id/deviceCodeView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="@string/app_name"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="主控板参数配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:text="IP地址"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.3.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +84,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="子网掩码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                android:layout_weight="2.25"
+                android:text="0.0.0.0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -105,20 +109,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="网关地址"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.0.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -128,28 +134,132 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi名称"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
                 android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi密码"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="textPassword"
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="服务器配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器IP"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:text="111.198.18.188"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器端口"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="number"
+                android:padding="@dimen/dp_5"
+                android:text="8080"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/configurationButton"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:layout_margin="@dimen/dp_20"
+            android:text="下发配置" />
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
-</LinearLayout>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_data.xml b/app/src/main/res/layout/fragment_methane_data.xml
deleted file mode 100644
index 573d4b5..0000000
--- a/app/src/main/res/layout/fragment_methane_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
-
-    <com.github.mikephil.charting.charts.LineChart
-        android:id="@+id/lineChart"
-        android:layout_width="match_parent"
-        android:layout_height="260dp" />
-</LinearLayout>
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
index 4285122..4fcfa29 100644
--- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
@@ -18,7 +18,7 @@
 import com.casic.app.safetreecontroller.extensions.initImmersionBar
 import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment
 import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment
-import com.casic.app.safetreecontroller.fragments.MethaneDataFragment
+import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment
 import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment
 import com.casic.app.safetreecontroller.tcp.ConnectionState
 import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener
@@ -43,7 +43,7 @@
     private val kTag = "MainActivity"
     private val context = this
     private val fragmentPages by lazy { ArrayList<Fragment>() }
-    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置")
+    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置")
     private val tcpClient by lazy { TcpClient(this) }
     private val connectivityManager by lazy { getSystemService<ConnectivityManager>() }
     private val wifiManager by lazy { getSystemService<WifiManager>()!! }
@@ -51,7 +51,7 @@
 
     init {
         fragmentPages.add(DeviceControllerFragment())
-        fragmentPages.add(MethaneDataFragment())
+        fragmentPages.add(MethaneMonitorFragment())
         fragmentPages.add(VoiceSettingsFragment())
         fragmentPages.add(BaseSettingsFragment())
     }
diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml
index 64d9a03..b3e8368 100644
--- a/app/src/main/res/layout/fragment_base_settings.xml
+++ b/app/src/main/res/layout/fragment_base_settings.xml
@@ -1,49 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:background="@color/mainBackColor"
         android:orientation="vertical">
 
         <LinearLayout
@@ -53,20 +16,65 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备编号"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
+                android:id="@+id/deviceCodeView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="@string/app_name"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="主控板参数配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:text="IP地址"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.3.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +84,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="子网掩码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                android:layout_weight="2.25"
+                android:text="0.0.0.0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -105,20 +109,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="网关地址"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.0.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -128,28 +134,132 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi名称"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
                 android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi密码"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="textPassword"
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="服务器配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器IP"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:text="111.198.18.188"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器端口"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="number"
+                android:padding="@dimen/dp_5"
+                android:text="8080"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/configurationButton"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:layout_margin="@dimen/dp_20"
+            android:text="下发配置" />
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
-</LinearLayout>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_data.xml b/app/src/main/res/layout/fragment_methane_data.xml
deleted file mode 100644
index 573d4b5..0000000
--- a/app/src/main/res/layout/fragment_methane_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
-
-    <com.github.mikephil.charting.charts.LineChart
-        android:id="@+id/lineChart"
-        android:layout_width="match_parent"
-        android:layout_height="260dp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml
new file mode 100644
index 0000000..b61114e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_methane_monitor.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光监测"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <RadioGroup
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/openRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="开启" />
+
+            <RadioButton
+                android:id="@+id/closeRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="关闭" />
+        </RadioGroup>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="报警阈值"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="更新" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光芯片温度"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="查询" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:background="@color/white"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_10"
+        android:text="当前燃气浓度：0% LEL"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16" />
+
+    <com.github.mikephil.charting.charts.LineChart
+        android:id="@+id/lineChart"
+        android:layout_width="match_parent"
+        android:layout_height="260dp"
+        android:layout_marginHorizontal="@dimen/dp_20" />
+</LinearLayout>
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
index 4285122..4fcfa29 100644
--- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
@@ -18,7 +18,7 @@
 import com.casic.app.safetreecontroller.extensions.initImmersionBar
 import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment
 import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment
-import com.casic.app.safetreecontroller.fragments.MethaneDataFragment
+import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment
 import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment
 import com.casic.app.safetreecontroller.tcp.ConnectionState
 import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener
@@ -43,7 +43,7 @@
     private val kTag = "MainActivity"
     private val context = this
     private val fragmentPages by lazy { ArrayList<Fragment>() }
-    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置")
+    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置")
     private val tcpClient by lazy { TcpClient(this) }
     private val connectivityManager by lazy { getSystemService<ConnectivityManager>() }
     private val wifiManager by lazy { getSystemService<WifiManager>()!! }
@@ -51,7 +51,7 @@
 
     init {
         fragmentPages.add(DeviceControllerFragment())
-        fragmentPages.add(MethaneDataFragment())
+        fragmentPages.add(MethaneMonitorFragment())
         fragmentPages.add(VoiceSettingsFragment())
         fragmentPages.add(BaseSettingsFragment())
     }
diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml
index 64d9a03..b3e8368 100644
--- a/app/src/main/res/layout/fragment_base_settings.xml
+++ b/app/src/main/res/layout/fragment_base_settings.xml
@@ -1,49 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:background="@color/mainBackColor"
         android:orientation="vertical">
 
         <LinearLayout
@@ -53,20 +16,65 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备编号"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
+                android:id="@+id/deviceCodeView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="@string/app_name"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="主控板参数配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:text="IP地址"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.3.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +84,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="子网掩码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                android:layout_weight="2.25"
+                android:text="0.0.0.0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -105,20 +109,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="网关地址"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.0.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -128,28 +134,132 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi名称"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
                 android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi密码"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="textPassword"
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="服务器配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器IP"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:text="111.198.18.188"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器端口"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="number"
+                android:padding="@dimen/dp_5"
+                android:text="8080"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/configurationButton"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:layout_margin="@dimen/dp_20"
+            android:text="下发配置" />
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
-</LinearLayout>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_data.xml b/app/src/main/res/layout/fragment_methane_data.xml
deleted file mode 100644
index 573d4b5..0000000
--- a/app/src/main/res/layout/fragment_methane_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
-
-    <com.github.mikephil.charting.charts.LineChart
-        android:id="@+id/lineChart"
-        android:layout_width="match_parent"
-        android:layout_height="260dp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml
new file mode 100644
index 0000000..b61114e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_methane_monitor.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光监测"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <RadioGroup
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/openRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="开启" />
+
+            <RadioButton
+                android:id="@+id/closeRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="关闭" />
+        </RadioGroup>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="报警阈值"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="更新" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光芯片温度"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="查询" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:background="@color/white"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_10"
+        android:text="当前燃气浓度：0% LEL"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16" />
+
+    <com.github.mikephil.charting.charts.LineChart
+        android:id="@+id/lineChart"
+        android:layout_width="match_parent"
+        android:layout_height="260dp"
+        android:layout_marginHorizontal="@dimen/dp_20" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_voice_settings.xml b/app/src/main/res/layout/fragment_voice_settings.xml
index 64d9a03..859bbed 100644
--- a/app/src/main/res/layout/fragment_voice_settings.xml
+++ b/app/src/main/res/layout/fragment_voice_settings.xml
@@ -8,36 +8,47 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
+        <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
             android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
+            android:text="设备音量"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/sp_16"
+            app:drawableEndCompat="@drawable/ic_audio" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:orientation="horizontal">
+
+            <com.google.android.material.slider.Slider
+                android:id="@+id/volumeSlider"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:value="20f"
+                android:valueFrom="0f"
+                android:valueTo="100f"
+                app:labelBehavior="gone" />
+
+            <TextView
+                android:id="@+id/volumeValueView"
+                android:layout_width="@dimen/dp_40"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="@dimen/dp_20"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
@@ -53,20 +64,34 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="语音模式"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/openRadioButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="本地" />
+
+                <RadioButton
+                    android:id="@+id/closeRadioButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="远程" />
+            </RadioGroup>
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +101,32 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="燃气报警"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="开启" />
+
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="关闭" />
+            </RadioGroup>
         </LinearLayout>
 
         <LinearLayout
@@ -105,51 +136,32 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备状态语音"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-        </LinearLayout>
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/itemLayoutHeight"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="开启" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_16" />
-
-            <com.pengxh.kt.lite.widget.DeleteEditText
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="关闭" />
+            </RadioGroup>
         </LinearLayout>
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
 </LinearLayout>
\ No newline at end of file

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
index 4285122..4fcfa29 100644
--- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
@@ -18,7 +18,7 @@
 import com.casic.app.safetreecontroller.extensions.initImmersionBar
 import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment
 import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment
-import com.casic.app.safetreecontroller.fragments.MethaneDataFragment
+import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment
 import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment
 import com.casic.app.safetreecontroller.tcp.ConnectionState
 import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener
@@ -43,7 +43,7 @@
     private val kTag = "MainActivity"
     private val context = this
     private val fragmentPages by lazy { ArrayList<Fragment>() }
-    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置")
+    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置")
     private val tcpClient by lazy { TcpClient(this) }
     private val connectivityManager by lazy { getSystemService<ConnectivityManager>() }
     private val wifiManager by lazy { getSystemService<WifiManager>()!! }
@@ -51,7 +51,7 @@
 
     init {
         fragmentPages.add(DeviceControllerFragment())
-        fragmentPages.add(MethaneDataFragment())
+        fragmentPages.add(MethaneMonitorFragment())
         fragmentPages.add(VoiceSettingsFragment())
         fragmentPages.add(BaseSettingsFragment())
     }
diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml
index 64d9a03..b3e8368 100644
--- a/app/src/main/res/layout/fragment_base_settings.xml
+++ b/app/src/main/res/layout/fragment_base_settings.xml
@@ -1,49 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:background="@color/mainBackColor"
         android:orientation="vertical">
 
         <LinearLayout
@@ -53,20 +16,65 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备编号"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
+                android:id="@+id/deviceCodeView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="@string/app_name"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="主控板参数配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:text="IP地址"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.3.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +84,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="子网掩码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                android:layout_weight="2.25"
+                android:text="0.0.0.0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -105,20 +109,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="网关地址"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.0.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -128,28 +134,132 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi名称"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
                 android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi密码"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="textPassword"
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="服务器配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器IP"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:text="111.198.18.188"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器端口"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="number"
+                android:padding="@dimen/dp_5"
+                android:text="8080"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/configurationButton"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:layout_margin="@dimen/dp_20"
+            android:text="下发配置" />
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
-</LinearLayout>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_data.xml b/app/src/main/res/layout/fragment_methane_data.xml
deleted file mode 100644
index 573d4b5..0000000
--- a/app/src/main/res/layout/fragment_methane_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
-
-    <com.github.mikephil.charting.charts.LineChart
-        android:id="@+id/lineChart"
-        android:layout_width="match_parent"
-        android:layout_height="260dp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml
new file mode 100644
index 0000000..b61114e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_methane_monitor.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光监测"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <RadioGroup
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/openRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="开启" />
+
+            <RadioButton
+                android:id="@+id/closeRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="关闭" />
+        </RadioGroup>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="报警阈值"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="更新" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光芯片温度"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="查询" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:background="@color/white"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_10"
+        android:text="当前燃气浓度：0% LEL"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16" />
+
+    <com.github.mikephil.charting.charts.LineChart
+        android:id="@+id/lineChart"
+        android:layout_width="match_parent"
+        android:layout_height="260dp"
+        android:layout_marginHorizontal="@dimen/dp_20" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_voice_settings.xml b/app/src/main/res/layout/fragment_voice_settings.xml
index 64d9a03..859bbed 100644
--- a/app/src/main/res/layout/fragment_voice_settings.xml
+++ b/app/src/main/res/layout/fragment_voice_settings.xml
@@ -8,36 +8,47 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
+        <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
             android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
+            android:text="设备音量"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/sp_16"
+            app:drawableEndCompat="@drawable/ic_audio" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:orientation="horizontal">
+
+            <com.google.android.material.slider.Slider
+                android:id="@+id/volumeSlider"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:value="20f"
+                android:valueFrom="0f"
+                android:valueTo="100f"
+                app:labelBehavior="gone" />
+
+            <TextView
+                android:id="@+id/volumeValueView"
+                android:layout_width="@dimen/dp_40"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="@dimen/dp_20"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
@@ -53,20 +64,34 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="语音模式"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/openRadioButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="本地" />
+
+                <RadioButton
+                    android:id="@+id/closeRadioButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="远程" />
+            </RadioGroup>
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +101,32 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="燃气报警"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="开启" />
+
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="关闭" />
+            </RadioGroup>
         </LinearLayout>
 
         <LinearLayout
@@ -105,51 +136,32 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备状态语音"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-        </LinearLayout>
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/itemLayoutHeight"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="开启" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_16" />
-
-            <com.pengxh.kt.lite.widget.DeleteEditText
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="关闭" />
+            </RadioGroup>
         </LinearLayout>
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bbeaca5..2ee5e0c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,7 +17,9 @@
     <dimen name="dp_40">40dp</dimen>
     <dimen name="dp_45">45dp</dimen>
     <dimen name="dp_50">50dp</dimen>
+    <dimen name="dp_55">55dp</dimen>
     <dimen name="dp_60">60dp</dimen>
+    <dimen name="dp_65">65dp</dimen>
     <dimen name="dp_75">75dp</dimen>
 
     <!--分割线-->

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 cb10d26..9dd80ae 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
@@ -27,13 +27,6 @@
     }
 
     override fun initEvent() {
-        binding.volumeSlider.addOnChangeListener { _, value, _ ->
-            binding.volumeValueView.text = value.toInt().toString()
-        }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
deleted file mode 100644
index cd47ba8..0000000
--- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneDataFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.casic.app.safetreecontroller.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.casic.app.safetreecontroller.databinding.FragmentMethaneDataBinding
-import com.pengxh.kt.lite.base.KotlinBaseFragment
-
-class MethaneDataFragment : KotlinBaseFragment<FragmentMethaneDataBinding>() {
-
-    override fun initEvent() {
-
-    }
-
-    override fun initOnCreate(savedInstanceState: Bundle?) {
-
-    }
-
-    override fun initViewBinding(
-        inflater: LayoutInflater, container: ViewGroup?
-    ): FragmentMethaneDataBinding {
-        return FragmentMethaneDataBinding.inflate(layoutInflater)
-    }
-
-    override fun observeRequestState() {
-
-    }
-
-    override fun setupTopBarLayout() {
-
-    }
-}
\ 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
new file mode 100644
index 0000000..e77f697
--- /dev/null
+++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt
@@ -0,0 +1,40 @@
+package com.casic.app.safetreecontroller.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.casic.app.safetreecontroller.databinding.FragmentMethaneMonitorBinding
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
+
+class MethaneMonitorFragment : KotlinBaseFragment<FragmentMethaneMonitorBinding>() {
+
+    override fun initEvent() {
+
+    }
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        //动态设置LineChart宽高
+        val rtspViewParams = binding.lineChart.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
+    }
+
+    override fun initViewBinding(
+        inflater: LayoutInflater, container: ViewGroup?
+    ): FragmentMethaneMonitorBinding {
+        return FragmentMethaneMonitorBinding.inflate(layoutInflater)
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+}
\ No newline at end of file
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 97095eb..c175caf 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
@@ -27,6 +27,13 @@
     }
 
     override fun initEvent() {
+        binding.volumeSlider.addOnChangeListener { _, value, _ ->
+            binding.volumeValueView.text = value.toInt().toString()
+        }
+    }
 
+    override fun onResume() {
+        super.onResume()
+        binding.volumeValueView.text = binding.volumeSlider.value.toInt().toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
index 4285122..4fcfa29 100644
--- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt
@@ -18,7 +18,7 @@
 import com.casic.app.safetreecontroller.extensions.initImmersionBar
 import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment
 import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment
-import com.casic.app.safetreecontroller.fragments.MethaneDataFragment
+import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment
 import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment
 import com.casic.app.safetreecontroller.tcp.ConnectionState
 import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener
@@ -43,7 +43,7 @@
     private val kTag = "MainActivity"
     private val context = this
     private val fragmentPages by lazy { ArrayList<Fragment>() }
-    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置")
+    private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置")
     private val tcpClient by lazy { TcpClient(this) }
     private val connectivityManager by lazy { getSystemService<ConnectivityManager>() }
     private val wifiManager by lazy { getSystemService<WifiManager>()!! }
@@ -51,7 +51,7 @@
 
     init {
         fragmentPages.add(DeviceControllerFragment())
-        fragmentPages.add(MethaneDataFragment())
+        fragmentPages.add(MethaneMonitorFragment())
         fragmentPages.add(VoiceSettingsFragment())
         fragmentPages.add(BaseSettingsFragment())
     }
diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml
index 64d9a03..b3e8368 100644
--- a/app/src/main/res/layout/fragment_base_settings.xml
+++ b/app/src/main/res/layout/fragment_base_settings.xml
@@ -1,49 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:background="@color/mainBackColor"
         android:orientation="vertical">
 
         <LinearLayout
@@ -53,20 +16,65 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备编号"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
+                android:id="@+id/deviceCodeView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="@string/app_name"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="主控板参数配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
                 android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:text="IP地址"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.3.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +84,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="子网掩码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                android:layout_weight="2.25"
+                android:text="0.0.0.0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -105,20 +109,22 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="网关地址"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:text="192.168.0.1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
 
         <LinearLayout
@@ -128,28 +134,132 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi名称"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
             <com.pengxh.kt.lite.widget.DeleteEditText
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
                 android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="WiFi密码"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="textPassword"
+                android:padding="@dimen/dp_5"
+                android:text="YTJ-0001-5G"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginVertical="@dimen/dp_5"
+            android:background="#CCC" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center_vertical"
+            android:text="服务器配置"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器IP"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:text="111.198.18.188"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/itemLayoutHeight"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="服务器端口"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_weight="2.25"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:inputType="number"
+                android:padding="@dimen/dp_5"
+                android:text="8080"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/configurationButton"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_55"
+            android:layout_margin="@dimen/dp_20"
+            android:text="下发配置" />
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
-</LinearLayout>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_data.xml b/app/src/main/res/layout/fragment_methane_data.xml
deleted file mode 100644
index 573d4b5..0000000
--- a/app/src/main/res/layout/fragment_methane_data.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
-    android:orientation="vertical">
-
-    <com.github.mikephil.charting.charts.LineChart
-        android:id="@+id/lineChart"
-        android:layout_width="match_parent"
-        android:layout_height="260dp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml
new file mode 100644
index 0000000..b61114e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_methane_monitor.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/mainBackColor"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光监测"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <RadioGroup
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/openRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="开启" />
+
+            <RadioButton
+                android:id="@+id/closeRadioButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="关闭" />
+        </RadioGroup>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="报警阈值"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="更新" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
+            android:layout_weight="1"
+            android:text="激光芯片温度"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.pengxh.kt.lite.widget.DeleteEditText
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_solid_layout_white_radius_5"
+                android:padding="@dimen/dp_5"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+
+            <Button
+                android:layout_width="@dimen/dp_65"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:text="查询" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:background="@color/white"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_10"
+        android:text="当前燃气浓度：0% LEL"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16" />
+
+    <com.github.mikephil.charting.charts.LineChart
+        android:id="@+id/lineChart"
+        android:layout_width="match_parent"
+        android:layout_height="260dp"
+        android:layout_marginHorizontal="@dimen/dp_20" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_voice_settings.xml b/app/src/main/res/layout/fragment_voice_settings.xml
index 64d9a03..859bbed 100644
--- a/app/src/main/res/layout/fragment_voice_settings.xml
+++ b/app/src/main/res/layout/fragment_voice_settings.xml
@@ -8,36 +8,47 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_30"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:src="@drawable/ic_audio" />
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/volumeSlider"
+        <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_20"
             android:layout_weight="1"
-            android:value="20f"
-            android:valueFrom="0f"
-            android:valueTo="100f"
-            app:labelBehavior="gone" />
-
-        <TextView
-            android:id="@+id/volumeValueView"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_20"
-            android:gravity="center"
-            android:text="0"
+            android:text="设备音量"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/sp_16"
+            app:drawableEndCompat="@drawable/ic_audio" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.25"
+            android:orientation="horizontal">
+
+            <com.google.android.material.slider.Slider
+                android:id="@+id/volumeSlider"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:value="20f"
+                android:valueFrom="0f"
+                android:valueTo="100f"
+                app:labelBehavior="gone" />
+
+            <TextView
+                android:id="@+id/volumeValueView"
+                android:layout_width="@dimen/dp_40"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="@dimen/dp_20"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
@@ -53,20 +64,34 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI名称"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="语音模式"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/openRadioButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="本地" />
+
+                <RadioButton
+                    android:id="@+id/closeRadioButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="远程" />
+            </RadioGroup>
         </LinearLayout>
 
         <LinearLayout
@@ -76,26 +101,32 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="WIFI密码"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="燃气报警"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/testWiFiButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="测试" />
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="开启" />
+
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="关闭" />
+            </RadioGroup>
         </LinearLayout>
 
         <LinearLayout
@@ -105,51 +136,32 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷推送地址"
+                android:layout_marginStart="@dimen/dp_20"
+                android:layout_weight="1"
+                android:text="设备状态语音"
                 android:textColor="@color/black"
                 android:textSize="@dimen/sp_16" />
 
-            <com.pengxh.kt.lite.widget.DeleteEditText
+            <RadioGroup
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
-        </LinearLayout>
+                android:layout_weight="2.25"
+                android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/itemLayoutHeight"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="开启" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_20"
-                android:text="甲烷报警阈值"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_16" />
-
-            <com.pengxh.kt.lite.widget.DeleteEditText
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_20"
-                android:layout_weight="1"
-                android:background="@drawable/bg_solid_layout_white_radius_5"
-                android:padding="@dimen/dp_5" />
+                <RadioButton
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="关闭" />
+            </RadioGroup>
         </LinearLayout>
     </LinearLayout>
-
-    <Button
-        android:id="@+id/configurationButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_30"
-        android:text="下发配置"
-        android:textSize="@dimen/sp_16" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bbeaca5..2ee5e0c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,7 +17,9 @@
     <dimen name="dp_40">40dp</dimen>
     <dimen name="dp_45">45dp</dimen>
     <dimen name="dp_50">50dp</dimen>
+    <dimen name="dp_55">55dp</dimen>
     <dimen name="dp_60">60dp</dimen>
+    <dimen name="dp_65">65dp</dimen>
     <dimen name="dp_75">75dp</dimen>
 
     <!--分割线-->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index fefc032..7d227df 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,6 +3,7 @@
     <style name="Base.Theme.SafeTreeController" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your light theme here. -->
         <item name="colorPrimary">@color/mainThemeColor</item>
+        <item name="colorAccent">@color/mainThemeColor</item>
     </style>
 
     <style name="Theme.SafeTreeController" parent="Base.Theme.SafeTreeController" />