diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt deleted file mode 100644 index 58f2670..0000000 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.br.operationsite.fragments - -import android.os.Bundle -import android.util.Log -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.lifecycle.ViewModelProvider -import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.vm.DeviceViewModel -import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.show - -class AutoInspectionFragment : KotlinBaseFragment() { - - private val kTag = "AutoInspectionFragment" - private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentAutoInspectionBinding { - return FragmentAutoInspectionBinding.inflate(inflater, container, false) - } - - override fun setupTopBarLayout() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun observeRequestState() { - - } - - override fun initEvent() { - binding.addPointButton.setOnClickListener { - deviceViewModel.addPoint( - onLoading = {}, - onSuccess = { - Log.d(kTag, "initEvent: $it") - "添加成功".show(requireContext()) - }, - onFailed = { - it.show(requireContext()) - } - ) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt deleted file mode 100644 index 58f2670..0000000 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.br.operationsite.fragments - -import android.os.Bundle -import android.util.Log -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.lifecycle.ViewModelProvider -import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.vm.DeviceViewModel -import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.show - -class AutoInspectionFragment : KotlinBaseFragment() { - - private val kTag = "AutoInspectionFragment" - private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentAutoInspectionBinding { - return FragmentAutoInspectionBinding.inflate(inflater, container, false) - } - - override fun setupTopBarLayout() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun observeRequestState() { - - } - - override fun initEvent() { - binding.addPointButton.setOnClickListener { - deviceViewModel.addPoint( - onLoading = {}, - onSuccess = { - Log.d(kTag, "initEvent: $it") - "添加成功".show(requireContext()) - }, - onFailed = { - it.show(requireContext()) - } - ) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt index b2c369f..c1b3402 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt @@ -12,7 +12,6 @@ import com.casic.br.operationsite.adapter.TabPageViewAdapter import com.casic.br.operationsite.databinding.ActivityDeviceControlBinding import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.fragments.AutoInspectionFragment import com.casic.br.operationsite.fragments.BaseSettingsFragment import com.casic.br.operationsite.fragments.DeviceControllerFragment import com.casic.br.operationsite.fragments.MethaneMonitorFragment @@ -34,7 +33,7 @@ } private val fragmentPages by lazy { ArrayList() } - private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置", "巡检配置") + private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置") private var isRtspPlaying = false init { @@ -42,7 +41,6 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) - fragmentPages.add(AutoInspectionFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt deleted file mode 100644 index 58f2670..0000000 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.br.operationsite.fragments - -import android.os.Bundle -import android.util.Log -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.lifecycle.ViewModelProvider -import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.vm.DeviceViewModel -import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.show - -class AutoInspectionFragment : KotlinBaseFragment() { - - private val kTag = "AutoInspectionFragment" - private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentAutoInspectionBinding { - return FragmentAutoInspectionBinding.inflate(inflater, container, false) - } - - override fun setupTopBarLayout() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun observeRequestState() { - - } - - override fun initEvent() { - binding.addPointButton.setOnClickListener { - deviceViewModel.addPoint( - onLoading = {}, - onSuccess = { - Log.d(kTag, "initEvent: $it") - "添加成功".show(requireContext()) - }, - onFailed = { - it.show(requireContext()) - } - ) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt index b2c369f..c1b3402 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt @@ -12,7 +12,6 @@ import com.casic.br.operationsite.adapter.TabPageViewAdapter import com.casic.br.operationsite.databinding.ActivityDeviceControlBinding import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.fragments.AutoInspectionFragment import com.casic.br.operationsite.fragments.BaseSettingsFragment import com.casic.br.operationsite.fragments.DeviceControllerFragment import com.casic.br.operationsite.fragments.MethaneMonitorFragment @@ -34,7 +33,7 @@ } private val fragmentPages by lazy { ArrayList() } - private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置", "巡检配置") + private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置") private var isRtspPlaying = false init { @@ -42,7 +41,6 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) - fragmentPages.add(AutoInspectionFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 46ecff2..ee68878 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -40,7 +40,7 @@ app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> - diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt deleted file mode 100644 index 58f2670..0000000 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.br.operationsite.fragments - -import android.os.Bundle -import android.util.Log -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.lifecycle.ViewModelProvider -import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.vm.DeviceViewModel -import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.show - -class AutoInspectionFragment : KotlinBaseFragment() { - - private val kTag = "AutoInspectionFragment" - private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentAutoInspectionBinding { - return FragmentAutoInspectionBinding.inflate(inflater, container, false) - } - - override fun setupTopBarLayout() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun observeRequestState() { - - } - - override fun initEvent() { - binding.addPointButton.setOnClickListener { - deviceViewModel.addPoint( - onLoading = {}, - onSuccess = { - Log.d(kTag, "initEvent: $it") - "添加成功".show(requireContext()) - }, - onFailed = { - it.show(requireContext()) - } - ) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt index b2c369f..c1b3402 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt @@ -12,7 +12,6 @@ import com.casic.br.operationsite.adapter.TabPageViewAdapter import com.casic.br.operationsite.databinding.ActivityDeviceControlBinding import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.fragments.AutoInspectionFragment import com.casic.br.operationsite.fragments.BaseSettingsFragment import com.casic.br.operationsite.fragments.DeviceControllerFragment import com.casic.br.operationsite.fragments.MethaneMonitorFragment @@ -34,7 +33,7 @@ } private val fragmentPages by lazy { ArrayList() } - private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置", "巡检配置") + private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置") private var isRtspPlaying = false init { @@ -42,7 +41,6 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) - fragmentPages.add(AutoInspectionFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 46ecff2..ee68878 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -40,7 +40,7 @@ app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> - diff --git a/app/src/main/res/layout/fragment_auto_inspection.xml b/app/src/main/res/layout/fragment_auto_inspection.xml deleted file mode 100644 index 8a7dfbe..0000000 --- a/app/src/main/res/layout/fragment_auto_inspection.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt deleted file mode 100644 index 58f2670..0000000 --- a/app/src/main/java/com/casic/br/operationsite/fragments/AutoInspectionFragment.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.br.operationsite.fragments - -import android.os.Bundle -import android.util.Log -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.lifecycle.ViewModelProvider -import com.casic.br.operationsite.databinding.FragmentAutoInspectionBinding -import com.casic.br.operationsite.vm.DeviceViewModel -import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.show - -class AutoInspectionFragment : KotlinBaseFragment() { - - private val kTag = "AutoInspectionFragment" - private val deviceViewModel by lazy { ViewModelProvider(this)[DeviceViewModel::class.java] } - - override fun initViewBinding( - inflater: LayoutInflater, container: ViewGroup? - ): FragmentAutoInspectionBinding { - return FragmentAutoInspectionBinding.inflate(inflater, container, false) - } - - override fun setupTopBarLayout() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - - } - - override fun observeRequestState() { - - } - - override fun initEvent() { - binding.addPointButton.setOnClickListener { - deviceViewModel.addPoint( - onLoading = {}, - onSuccess = { - Log.d(kTag, "initEvent: $it") - "添加成功".show(requireContext()) - }, - onFailed = { - it.show(requireContext()) - } - ) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt index b2c369f..c1b3402 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt @@ -12,7 +12,6 @@ import com.casic.br.operationsite.adapter.TabPageViewAdapter import com.casic.br.operationsite.databinding.ActivityDeviceControlBinding import com.casic.br.operationsite.extensions.initImmersionBar -import com.casic.br.operationsite.fragments.AutoInspectionFragment import com.casic.br.operationsite.fragments.BaseSettingsFragment import com.casic.br.operationsite.fragments.DeviceControllerFragment import com.casic.br.operationsite.fragments.MethaneMonitorFragment @@ -34,7 +33,7 @@ } private val fragmentPages by lazy { ArrayList() } - private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置", "巡检配置") + private val pageTitles = arrayOf("相机控制", "激光监测", "语音设置", "基础配置") private var isRtspPlaying = false init { @@ -42,7 +41,6 @@ fragmentPages.add(MethaneMonitorFragment()) fragmentPages.add(VoiceSettingsFragment()) fragmentPages.add(BaseSettingsFragment()) - fragmentPages.add(AutoInspectionFragment()) } override fun handleMessage(msg: Message): Boolean { diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml index 46ecff2..ee68878 100644 --- a/app/src/main/res/layout/activity_device_control.xml +++ b/app/src/main/res/layout/activity_device_control.xml @@ -40,7 +40,7 @@ app:tabMode="auto" app:tabSelectedTextColor="@color/mainThemeColor" /> - diff --git a/app/src/main/res/layout/fragment_auto_inspection.xml b/app/src/main/res/layout/fragment_auto_inspection.xml deleted file mode 100644 index 8a7dfbe..0000000 --- a/app/src/main/res/layout/fragment_auto_inspection.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_controller.xml b/app/src/main/res/layout/fragment_device_controller.xml index 4709cb8..d2801eb 100644 --- a/app/src/main/res/layout/fragment_device_controller.xml +++ b/app/src/main/res/layout/fragment_device_controller.xml @@ -13,58 +13,104 @@ android:background="@drawable/bg_solid_layout_blue_10" android:gravity="center" android:paddingVertical="@dimen/dp_10" - app:ctrl_diameter="290dp" /> + app:ctrl_diameter="260dp" /> - + android:layout_height="wrap_content"> - - - + android:orientation="vertical"> - - + - + - + - + + - - + + + + + + + + + + + +