diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 5285a9f..d5f8687 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -26,6 +26,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "告警查询" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 5285a9f..d5f8687 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -26,6 +26,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "告警查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index cf0c05f..df7c525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -40,6 +40,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "设备查询" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 5285a9f..d5f8687 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -26,6 +26,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "告警查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index cf0c05f..df7c525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -40,6 +40,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "设备查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 3272cfe..cac114d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_statistics override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "汇总统计" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 5285a9f..d5f8687 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -26,6 +26,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "告警查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index cf0c05f..df7c525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -40,6 +40,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "设备查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 3272cfe..cac114d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_statistics override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "汇总统计" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt index 1bc004a..d9dbe77 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt @@ -14,6 +14,7 @@ override fun initLayoutView(): Int = R.layout.activity_web override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "海洋石油工程有限公司" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 5285a9f..d5f8687 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -26,6 +26,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "告警查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index cf0c05f..df7c525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -40,6 +40,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "设备查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 3272cfe..cac114d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_statistics override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "汇总统计" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt index 1bc004a..d9dbe77 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt @@ -14,6 +14,7 @@ override fun initLayoutView(): Int = R.layout.activity_web override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "海洋石油工程有限公司" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 7a651be..34d3dbf 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_well_detail override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "井详情" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 5285a9f..d5f8687 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -26,6 +26,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "告警查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index cf0c05f..df7c525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -40,6 +40,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "设备查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 3272cfe..cac114d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_statistics override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "汇总统计" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt index 1bc004a..d9dbe77 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt @@ -14,6 +14,7 @@ override fun initLayoutView(): Int = R.layout.activity_web override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "海洋石油工程有限公司" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 7a651be..34d3dbf 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_well_detail override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "井详情" } diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml index 77d9ef6..e358e9e 100644 --- a/app/src/main/res/layout/activity_data_search.xml +++ b/app/src/main/res/layout/activity_data_search.xml @@ -1,6 +1,63 @@ - + android:layout_height="match_parent" + android:background="@color/mainBackColor" + android:orientation="vertical" + tools:context=".view.SearchDeviceActivity"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3832c68..413d019 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index b909fa1..198daf5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -43,6 +43,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt index c70e4c6..dcacf68 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceSearchResultActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search_result override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "查询结果" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 74fc2c4..1dea700 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_map override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "地图展示" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index 5285a9f..d5f8687 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -26,6 +26,7 @@ override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "告警查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index cf0c05f..df7c525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -40,6 +40,7 @@ override fun initLayoutView(): Int = R.layout.activity_device_search override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "设备查询" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt index 3272cfe..cac114d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/StatisticsActivity.kt @@ -36,6 +36,7 @@ override fun initLayoutView(): Int = R.layout.activity_statistics override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "汇总统计" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt index 1bc004a..d9dbe77 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt @@ -14,6 +14,7 @@ override fun initLayoutView(): Int = R.layout.activity_web override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "海洋石油工程有限公司" } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 7a651be..34d3dbf 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -21,6 +21,7 @@ override fun initLayoutView(): Int = R.layout.activity_well_detail override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "井详情" } diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml index 77d9ef6..e358e9e 100644 --- a/app/src/main/res/layout/activity_data_search.xml +++ b/app/src/main/res/layout/activity_data_search.xml @@ -1,6 +1,63 @@ - + android:layout_height="match_parent" + android:background="@color/mainBackColor" + android:orientation="vertical" + tools:context=".view.SearchDeviceActivity"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_base_title.xml b/app/src/main/res/layout/include_base_title.xml index b728478..156a597 100644 --- a/app/src/main/res/layout/include_base_title.xml +++ b/app/src/main/res/layout/include_base_title.xml @@ -10,8 +10,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_10" - android:background="@drawable/ic_left_white" - android:visibility="gone" /> + android:background="@drawable/ic_left_white" />