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 new file mode 100644 index 0000000..cb10d26 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -0,0 +1,39 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BaseSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentBaseSettingsBinding { + return FragmentBaseSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + 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 new file mode 100644 index 0000000..cb10d26 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -0,0 +1,39 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BaseSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentBaseSettingsBinding { + return FragmentBaseSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + 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/OtherSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt deleted file mode 100644 index a125f9e..0000000 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt +++ /dev/null @@ -1,39 +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.FragmentOtherSettingsBinding -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class OtherSettingsFragment : KotlinBaseFragment() { - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentOtherSettingsBinding { - return FragmentOtherSettingsBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } - - 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 new file mode 100644 index 0000000..cb10d26 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -0,0 +1,39 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BaseSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentBaseSettingsBinding { + return FragmentBaseSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + 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/OtherSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt deleted file mode 100644 index a125f9e..0000000 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt +++ /dev/null @@ -1,39 +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.FragmentOtherSettingsBinding -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class OtherSettingsFragment : KotlinBaseFragment() { - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentOtherSettingsBinding { - return FragmentOtherSettingsBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } - - 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/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt new file mode 100644 index 0000000..97095eb --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -0,0 +1,32 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentVoiceSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VoiceSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVoiceSettingsBinding { + return FragmentVoiceSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initEvent() { + + } +} \ 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 new file mode 100644 index 0000000..cb10d26 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -0,0 +1,39 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BaseSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentBaseSettingsBinding { + return FragmentBaseSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + 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/OtherSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt deleted file mode 100644 index a125f9e..0000000 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt +++ /dev/null @@ -1,39 +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.FragmentOtherSettingsBinding -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class OtherSettingsFragment : KotlinBaseFragment() { - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentOtherSettingsBinding { - return FragmentOtherSettingsBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } - - 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/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt new file mode 100644 index 0000000..97095eb --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -0,0 +1,32 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentVoiceSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VoiceSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVoiceSettingsBinding { + return FragmentVoiceSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initEvent() { + + } +} \ 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 bee5e67..4285122 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 @@ -9,16 +9,17 @@ import android.util.Log import android.view.KeyEvent import android.view.View -import android.widget.LinearLayout +import android.view.ViewGroup import androidx.fragment.app.Fragment import com.casic.app.safetreecontroller.R import com.casic.app.safetreecontroller.adapter.TabPageViewAdapter import com.casic.app.safetreecontroller.databinding.ActivityMainBinding import com.casic.app.safetreecontroller.extensions.handleGasConcentration 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.OtherSettingsFragment +import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.tcp.ConnectionState import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener import com.casic.app.safetreecontroller.tcp.TcpClient @@ -42,7 +43,7 @@ private val kTag = "MainActivity" private val context = this private val fragmentPages by lazy { ArrayList() } - private val pageTitles = arrayOf("云台控制", "甲烷数据", "其他设置") + private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置") private val tcpClient by lazy { TcpClient(this) } private val connectivityManager by lazy { getSystemService() } private val wifiManager by lazy { getSystemService()!! } @@ -51,7 +52,8 @@ init { fragmentPages.add(DeviceControllerFragment()) fragmentPages.add(MethaneDataFragment()) - fragmentPages.add(OtherSettingsFragment()) + fragmentPages.add(VoiceSettingsFragment()) + fragmentPages.add(BaseSettingsFragment()) } override fun handleMessage(msg: Message): Boolean { @@ -64,8 +66,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) + binding.viewPager.adapter = TabPageViewAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + binding.tabLayout.setupWithViewPager(binding.viewPager) + //动态设置rtspPlayerView宽高 - val rtspViewParams = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams + val rtspViewParams = binding.rtspPlayerView.layoutParams as ViewGroup.LayoutParams val videoWidth = getScreenWidth() val videoHeight = videoWidth * (9f / 16) rtspViewParams.width = videoWidth @@ -77,12 +84,6 @@ VideoPlayerManager.setGSYVideoPlayerOptions( binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL ) - - binding.viewPager.adapter = TabPageViewAdapter( - supportFragmentManager, fragmentPages, pageTitles - ) - //绑定 - binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt new file mode 100644 index 0000000..cb10d26 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/BaseSettingsFragment.kt @@ -0,0 +1,39 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentBaseSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class BaseSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentBaseSettingsBinding { + return FragmentBaseSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + 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/OtherSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt deleted file mode 100644 index a125f9e..0000000 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/OtherSettingsFragment.kt +++ /dev/null @@ -1,39 +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.FragmentOtherSettingsBinding -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class OtherSettingsFragment : KotlinBaseFragment() { - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentOtherSettingsBinding { - return FragmentOtherSettingsBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } - - 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/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt new file mode 100644 index 0000000..97095eb --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -0,0 +1,32 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.databinding.FragmentVoiceSettingsBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VoiceSettingsFragment : KotlinBaseFragment() { + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVoiceSettingsBinding { + return FragmentVoiceSettingsBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initEvent() { + + } +} \ 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 bee5e67..4285122 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 @@ -9,16 +9,17 @@ import android.util.Log import android.view.KeyEvent import android.view.View -import android.widget.LinearLayout +import android.view.ViewGroup import androidx.fragment.app.Fragment import com.casic.app.safetreecontroller.R import com.casic.app.safetreecontroller.adapter.TabPageViewAdapter import com.casic.app.safetreecontroller.databinding.ActivityMainBinding import com.casic.app.safetreecontroller.extensions.handleGasConcentration 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.OtherSettingsFragment +import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.tcp.ConnectionState import com.casic.app.safetreecontroller.tcp.ISocketConnectionListener import com.casic.app.safetreecontroller.tcp.TcpClient @@ -42,7 +43,7 @@ private val kTag = "MainActivity" private val context = this private val fragmentPages by lazy { ArrayList() } - private val pageTitles = arrayOf("云台控制", "甲烷数据", "其他设置") + private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础设置") private val tcpClient by lazy { TcpClient(this) } private val connectivityManager by lazy { getSystemService() } private val wifiManager by lazy { getSystemService()!! } @@ -51,7 +52,8 @@ init { fragmentPages.add(DeviceControllerFragment()) fragmentPages.add(MethaneDataFragment()) - fragmentPages.add(OtherSettingsFragment()) + fragmentPages.add(VoiceSettingsFragment()) + fragmentPages.add(BaseSettingsFragment()) } override fun handleMessage(msg: Message): Boolean { @@ -64,8 +66,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) + binding.viewPager.adapter = TabPageViewAdapter( + supportFragmentManager, fragmentPages, pageTitles + ) + binding.tabLayout.setupWithViewPager(binding.viewPager) + //动态设置rtspPlayerView宽高 - val rtspViewParams = binding.rtspPlayerView.layoutParams as LinearLayout.LayoutParams + val rtspViewParams = binding.rtspPlayerView.layoutParams as ViewGroup.LayoutParams val videoWidth = getScreenWidth() val videoHeight = videoWidth * (9f / 16) rtspViewParams.width = videoWidth @@ -77,12 +84,6 @@ VideoPlayerManager.setGSYVideoPlayerOptions( binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL ) - - binding.viewPager.adapter = TabPageViewAdapter( - supportFragmentManager, fragmentPages, pageTitles - ) - //绑定 - binding.tabLayout.setupWithViewPager(binding.viewPager) } override fun initEvent() { diff --git a/app/src/main/res/layout/fragment_base_settings.xml b/app/src/main/res/layout/fragment_base_settings.xml new file mode 100644 index 0000000..64d9a03 --- /dev/null +++ b/app/src/main/res/layout/fragment_base_settings.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +