diff --git a/app/build.gradle b/app/build.gradle index 645873b..86f828d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1020 - versionName "1.0.2.0" + versionCode 1030 + versionName "1.0.3.0" } buildTypes { diff --git a/app/build.gradle b/app/build.gradle index 645873b..86f828d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1020 - versionName "1.0.2.0" + versionCode 1030 + versionName "1.0.3.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index c3ead82..e73f60e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,10 +49,10 @@ const val SERVER_BASE_URL = "http://111.198.10.15:22006" //一体机DeviceMonitor程序TCP Server IP地址 - const val GAS_BASE_IP = "192.168.10.142" + const val GAS_BASE_IP = "192.168.10.139" //一体机算法程序IP地址 - const val AI_BASE_IP = "192.168.10.141" + const val AI_BASE_IP = "192.168.10.139" const val AI_BASE_URL = "http://${AI_BASE_IP}:5000" const val RTSP_URL = "rtsp://192.168.10.137:554" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" diff --git a/app/build.gradle b/app/build.gradle index 645873b..86f828d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1020 - versionName "1.0.2.0" + versionCode 1030 + versionName "1.0.3.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index c3ead82..e73f60e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,10 +49,10 @@ const val SERVER_BASE_URL = "http://111.198.10.15:22006" //一体机DeviceMonitor程序TCP Server IP地址 - const val GAS_BASE_IP = "192.168.10.142" + const val GAS_BASE_IP = "192.168.10.139" //一体机算法程序IP地址 - const val AI_BASE_IP = "192.168.10.141" + const val AI_BASE_IP = "192.168.10.139" const val AI_BASE_URL = "http://${AI_BASE_IP}:5000" const val RTSP_URL = "rtsp://192.168.10.137:554" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 34b9b5f..159d3e2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -54,6 +55,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + ActivityStackManager.addActivity(this) + weakReferenceHandler = WeakReferenceHandler(this) startService(Intent(this, TcpMessageService::class.java)) diff --git a/app/build.gradle b/app/build.gradle index 645873b..86f828d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1020 - versionName "1.0.2.0" + versionCode 1030 + versionName "1.0.3.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index c3ead82..e73f60e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,10 +49,10 @@ const val SERVER_BASE_URL = "http://111.198.10.15:22006" //一体机DeviceMonitor程序TCP Server IP地址 - const val GAS_BASE_IP = "192.168.10.142" + const val GAS_BASE_IP = "192.168.10.139" //一体机算法程序IP地址 - const val AI_BASE_IP = "192.168.10.141" + const val AI_BASE_IP = "192.168.10.139" const val AI_BASE_URL = "http://${AI_BASE_IP}:5000" const val RTSP_URL = "rtsp://192.168.10.137:554" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 34b9b5f..159d3e2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -54,6 +55,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + ActivityStackManager.addActivity(this) + weakReferenceHandler = WeakReferenceHandler(this) startService(Intent(this, TcpMessageService::class.java)) diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index d93d41f..79de32c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -75,6 +75,10 @@ alarmViewModel.changeAlarmState("", state) } + binding.restartVideoButton.setOnClickListener { + binding.rtspPlayerView.startPlayLogic() + } + binding.clearVideoRegionButton.setOnClickListener { binding.regionView.clearRoutePath() } @@ -114,10 +118,10 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - ActivityStackManager.finishActivity(DisclosureActivity::class.java) - ActivityStackManager.finishActivity(EnvironmentActivity::class.java) - ActivityStackManager.finishActivity(SuppliesActivity::class.java) + constructionCheckViewModel.setCurrentPhase("stop") + // navigatePageTo() + ActivityStackManager.finishAllActivity() navigatePageTo() finish() } diff --git a/app/build.gradle b/app/build.gradle index 645873b..86f828d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1020 - versionName "1.0.2.0" + versionCode 1030 + versionName "1.0.3.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index c3ead82..e73f60e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,10 +49,10 @@ const val SERVER_BASE_URL = "http://111.198.10.15:22006" //一体机DeviceMonitor程序TCP Server IP地址 - const val GAS_BASE_IP = "192.168.10.142" + const val GAS_BASE_IP = "192.168.10.139" //一体机算法程序IP地址 - const val AI_BASE_IP = "192.168.10.141" + const val AI_BASE_IP = "192.168.10.139" const val AI_BASE_URL = "http://${AI_BASE_IP}:5000" const val RTSP_URL = "rtsp://192.168.10.137:554" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 34b9b5f..159d3e2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -54,6 +55,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + ActivityStackManager.addActivity(this) + weakReferenceHandler = WeakReferenceHandler(this) startService(Intent(this, TcpMessageService::class.java)) diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index d93d41f..79de32c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -75,6 +75,10 @@ alarmViewModel.changeAlarmState("", state) } + binding.restartVideoButton.setOnClickListener { + binding.rtspPlayerView.startPlayLogic() + } + binding.clearVideoRegionButton.setOnClickListener { binding.regionView.clearRoutePath() } @@ -114,10 +118,10 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - ActivityStackManager.finishActivity(DisclosureActivity::class.java) - ActivityStackManager.finishActivity(EnvironmentActivity::class.java) - ActivityStackManager.finishActivity(SuppliesActivity::class.java) + constructionCheckViewModel.setCurrentPhase("stop") + // navigatePageTo() + ActivityStackManager.finishAllActivity() navigatePageTo() finish() } diff --git a/app/src/main/res/drawable/bg_stroke_layout.xml b/app/src/main/res/drawable/bg_stroke_layout.xml new file mode 100644 index 0000000..6730c4d --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 645873b..86f828d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ applicationId "com.casic.br.operationsite" minSdkVersion 23 targetSdkVersion 33 - versionCode 1020 - versionName "1.0.2.0" + versionCode 1030 + versionName "1.0.3.0" } buildTypes { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index c3ead82..e73f60e 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -49,10 +49,10 @@ const val SERVER_BASE_URL = "http://111.198.10.15:22006" //一体机DeviceMonitor程序TCP Server IP地址 - const val GAS_BASE_IP = "192.168.10.142" + const val GAS_BASE_IP = "192.168.10.139" //一体机算法程序IP地址 - const val AI_BASE_IP = "192.168.10.141" + const val AI_BASE_IP = "192.168.10.139" const val AI_BASE_URL = "http://${AI_BASE_IP}:5000" const val RTSP_URL = "rtsp://192.168.10.137:554" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt index 34b9b5f..159d3e2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkTaskActivity.kt @@ -21,6 +21,7 @@ import com.pengxh.kt.lite.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -54,6 +55,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + ActivityStackManager.addActivity(this) + weakReferenceHandler = WeakReferenceHandler(this) startService(Intent(this, TcpMessageService::class.java)) diff --git a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt index d93d41f..79de32c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/check/GuardiansActivity.kt @@ -75,6 +75,10 @@ alarmViewModel.changeAlarmState("", state) } + binding.restartVideoButton.setOnClickListener { + binding.rtspPlayerView.startPlayLogic() + } + binding.clearVideoRegionButton.setOnClickListener { binding.regionView.clearRoutePath() } @@ -114,10 +118,10 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - ActivityStackManager.finishActivity(DisclosureActivity::class.java) - ActivityStackManager.finishActivity(EnvironmentActivity::class.java) - ActivityStackManager.finishActivity(SuppliesActivity::class.java) + constructionCheckViewModel.setCurrentPhase("stop") + // navigatePageTo() + ActivityStackManager.finishAllActivity() navigatePageTo() finish() } diff --git a/app/src/main/res/drawable/bg_stroke_layout.xml b/app/src/main/res/drawable/bg_stroke_layout.xml new file mode 100644 index 0000000..6730c4d --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_environment.xml b/app/src/main/res/layout/activity_environment.xml index 1b6d504..414dd50 100644 --- a/app/src/main/res/layout/activity_environment.xml +++ b/app/src/main/res/layout/activity_environment.xml @@ -75,7 +75,7 @@ () + ActivityStackManager.finishAllActivity() navigatePageTo() finish() } diff --git a/app/src/main/res/drawable/bg_stroke_layout.xml b/app/src/main/res/drawable/bg_stroke_layout.xml new file mode 100644 index 0000000..6730c4d --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_environment.xml b/app/src/main/res/layout/activity_environment.xml index 1b6d504..414dd50 100644 --- a/app/src/main/res/layout/activity_environment.xml +++ b/app/src/main/res/layout/activity_environment.xml @@ -75,7 +75,7 @@