diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt index b2214ca..afc2d05 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt @@ -23,7 +23,7 @@ class ChartActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String { - return getString(R.string.chart) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt index 1ad1d1d..7bf6cbd 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt @@ -47,7 +47,7 @@ class ChooseParamsActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.modify_params) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt index a451123..e086415 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt @@ -36,7 +36,7 @@ class CloudActivity : NoOptionsActivity() { private var uploadingVideo = AtomicBoolean(false) override fun getTopBarTitle(): String { - return getString(R.string.cloud) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt index fc2840c..a2a7df4 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt @@ -19,7 +19,7 @@ class GasListActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.gas_list) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt index 772ab62..d087e51 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt @@ -54,7 +54,7 @@ class HistoryVideoActivity : BaseActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.history_video) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt index 5e6116d..40b0190 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/LightSettingActivity.kt @@ -15,7 +15,7 @@ class LightSettingActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.light_setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt index b19595a..f345110 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt @@ -21,7 +21,7 @@ class NetSettingActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.net_setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt index 7709424..8d6baaa 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt @@ -60,7 +60,7 @@ class QueryDataActivity : BaseActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.query) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt index 299d612..b164d51 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorActivity.kt @@ -23,7 +23,7 @@ class SensorActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.sensor) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt index e8050ab..06b6d42 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt @@ -27,7 +27,7 @@ class SensorSettingActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.sensor_setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorThresholdSetActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorThresholdSetActivity.kt index 4a678be..affa2ce 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorThresholdSetActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorThresholdSetActivity.kt @@ -20,7 +20,7 @@ class SensorThresholdSetActivity : NoOptionsActivity() { var gasName = "" override fun getTopBarTitle(): String? { - return getString(R.string.sensor_threshold_setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SettingActivity.kt index f7a639c..3e35b13 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SettingActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SettingActivity.kt @@ -22,7 +22,7 @@ class SettingActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SpeedSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SpeedSettingActivity.kt index 498a869..0aacf6d 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SpeedSettingActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SpeedSettingActivity.kt @@ -16,7 +16,7 @@ class SpeedSettingActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.speed_setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt index e7d7e1e..f7c6769 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt @@ -24,7 +24,7 @@ class TimeSettingActivity : NoOptionsActivity() { private var changeTime = -1L; override fun getTopBarTitle(): String? { - return getString(R.string.time_setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt index 4fd2194..23138fa 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt @@ -41,7 +41,7 @@ class WarnDataActivity : BaseActivity() { } override fun getTopBarTitle(): String? { - return getString(R.string.warn_data) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt index 3b45a56..3d669a2 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt @@ -261,7 +261,7 @@ class GlobalMonitorActivity : NoOptionsActivity() { } override fun getTopBarTitle(): String { - return getString(R.string.wifi_setting) + return getString(R.string.back) } override fun generateContentView(): View { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 067fd35..55f3076 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ Watcher + 返回 设置 数据查询 报警记录