diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> () { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9bf1daa..a4e1ec1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,4 +6,5 @@ #1D55C6 #F7F7F7 + #D8D8D8 \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9bf1daa..a4e1ec1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,4 +6,5 @@ #1D55C6 #F7F7F7 + #D8D8D8 \ 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 2ee5e0c..1fd3d23 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,6 +11,7 @@ 5dp 7dp 10dp + 15dp 20dp 25dp 30dp @@ -21,6 +22,7 @@ 60dp 65dp 75dp + 80dp 1px diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9bf1daa..a4e1ec1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,4 +6,5 @@ #1D55C6 #F7F7F7 + #D8D8D8 \ 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 2ee5e0c..1fd3d23 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,6 +11,7 @@ 5dp 7dp 10dp + 15dp 20dp 25dp 30dp @@ -21,6 +22,7 @@ 60dp 65dp 75dp + 80dp 1px diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index c5d5899..0000000 --- a/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FFFFFF - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9bf1daa..a4e1ec1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,4 +6,5 @@ #1D55C6 #F7F7F7 + #D8D8D8 \ 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 2ee5e0c..1fd3d23 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,6 +11,7 @@ 5dp 7dp 10dp + 15dp 20dp 25dp 30dp @@ -21,6 +22,7 @@ 60dp 65dp 75dp + 80dp 1px diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index c5d5899..0000000 --- a/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FFFFFF - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 092b3a2..57ca6ca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ 安全树 + 中国航天科工集团二院二〇三所 版权所有 + Copyright © 2023 – 2024 Casic. All rights reserved. \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt new file mode 100644 index 0000000..11ea965 --- /dev/null +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -0,0 +1,34 @@ +package com.casic.app.safetreecontroller.fragments + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.ViewGroup +import com.casic.app.safetreecontroller.BuildConfig +import com.casic.app.safetreecontroller.databinding.FragmentVersionManageBinding +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class VersionManageFragment : KotlinBaseFragment() { + override fun initEvent() { + binding.updateLayout.setOnClickListener { + + } + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + binding.versionView.text = "Version ${BuildConfig.VERSION_NAME}" + } + + override fun initViewBinding( + inflater: LayoutInflater, container: ViewGroup? + ): FragmentVersionManageBinding { + return FragmentVersionManageBinding.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/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 4b05170..24069d8 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,6 +18,7 @@ import com.casic.app.safetreecontroller.fragments.BaseSettingsFragment import com.casic.app.safetreecontroller.fragments.DeviceControllerFragment import com.casic.app.safetreecontroller.fragments.MethaneMonitorFragment +import com.casic.app.safetreecontroller.fragments.VersionManageFragment import com.casic.app.safetreecontroller.fragments.VoiceSettingsFragment import com.casic.app.safetreecontroller.service.ForegroundRunningService import com.casic.app.safetreecontroller.service.SocketConnectionService @@ -46,7 +47,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 options = arrayListOf("修改安全树视频相机IP地址", "修改安全树数据通信IP地址") private var clickTime: Long = 0 private var isRtspPlaying = false @@ -56,6 +57,7 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) + fragmentPages.add(VersionManageFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml new file mode 100644 index 0000000..ba9c309 --- /dev/null +++ b/app/src/main/res/drawable/ic_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3db0c9c..ee5f741 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ app:tabIndicatorColor="@color/mainThemeColor" app:tabIndicatorFullWidth="false" app:tabIndicatorHeight="3dp" - app:tabMode="fixed" + app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..03bac10 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9bf1daa..a4e1ec1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,4 +6,5 @@ #1D55C6 #F7F7F7 + #D8D8D8 \ 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 2ee5e0c..1fd3d23 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,6 +11,7 @@ 5dp 7dp 10dp + 15dp 20dp 25dp 30dp @@ -21,6 +22,7 @@ 60dp 65dp 75dp + 80dp 1px diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index c5d5899..0000000 --- a/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FFFFFF - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 092b3a2..57ca6ca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ 安全树 + 中国航天科工集团二院二〇三所 版权所有 + Copyright © 2023 – 2024 Casic. All rights reserved. \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..db3a21b --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file