From 8ac1e95d7f73138a9d0d2f0bed97f5641c552db3 Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Sat, 15 Oct 2022 14:31:25 +0800
Subject: [PATCH] refactor(history):refactor welcome code
---
.../com/zcshou/gogogo/HistoryActivity.java | 10 ++++----
app/src/main/res/values/strings.xml | 25 +++++++++++--------
app/src/main/res/xml/preferences_main.xml | 4 +--
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java b/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java
index 391a76f..4ca6ad7 100644
--- a/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java
+++ b/app/src/main/java/com/zcshou/gogogo/HistoryActivity.java
@@ -94,7 +94,7 @@ public class HistoryActivity extends BaseActivity {
.setPositiveButton("确定",
(dialog, which) -> {
if (deleteRecord(-1)) {
- GoUtils.DisplayToast(this,"删除成功!");
+ GoUtils.DisplayToast(this, getResources().getString(R.string.history_delete_ok));
updateRecordList();
}
})
@@ -164,7 +164,7 @@ public class HistoryActivity extends BaseActivity {
}
private void recordArchive() {
- final double limits = Double.parseDouble(sharedPreferences.getString("setting_pos_history", getResources().getString(R.string.setting_pos_history_default)));
+ final double limits = Double.parseDouble(sharedPreferences.getString("setting_pos_history", getResources().getString(R.string.history_expiration)));
final long weekSecond = (long) (limits * 24 * 60 * 60);
try {
@@ -233,7 +233,7 @@ public class HistoryActivity extends BaseActivity {
new int[]{R.id.LocationID, R.id.LocationText, R.id.TimeText, R.id.WGSLatLngText, R.id.BDLatLngText});
mRecordListView.setAdapter(simAdapt);
} else {
- GoUtils.DisplayToast(HistoryActivity.this,"未搜索到指定内容");
+ GoUtils.DisplayToast(HistoryActivity.this, getResources().getString(R.string.history_error_search));
SimpleAdapter simAdapt = new SimpleAdapter(
HistoryActivity.this.getBaseContext(),
mAllRecord,
@@ -272,7 +272,7 @@ public class HistoryActivity extends BaseActivity {
wgs84Latitude = latLngStr2[1].substring(latLngStr2[1].indexOf(':') + 1);
if (!MainActivity.showLocation(bd09Longitude, bd09Latitude, wgs84Longitude, wgs84Latitude)) {
- GoUtils.DisplayToast(this, "定位失败,请手动选取定位点");
+ GoUtils.DisplayToast(this, getResources().getString(R.string.history_error_location));
}
this.finish();
});
@@ -287,7 +287,7 @@ public class HistoryActivity extends BaseActivity {
boolean deleteRet = deleteRecord(Integer.parseInt(locID));
if (deleteRet) {
- GoUtils.DisplayToast(this,"删除成功!");
+ GoUtils.DisplayToast(this, getResources().getString(R.string.history_delete_ok));
updateRecordList();
}
})
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 90ac5d8..0338dc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,12 +41,18 @@
记录
关闭日志
历史记录有效期(天)
- 7
关于
版本号
开发者
系统
+
+ 暂无历史记录
+ 删除成功！
+ 7
+ 定位失败，请手动选取定位点
+ 未搜索到指定内容
+
显示摇杆
隐藏摇杆
@@ -61,16 +67,6 @@
位置检索失败，请检查 GPS 是否开启
搜索失败，请检查网络连接
-
- 新版本可用
- 立即下载
- 忽略一次
- 更新时间：
- 提交信息：
-
-
- 暂无历史记录
-
Open navigation drawer
Close navigation drawer
@@ -90,6 +86,13 @@
32:2F:E6:05:6C:2F:11:6D:CD:ED:AC:FF:23:02:5A:29:68:FD:45:D2;com.zcshou.gogogo
fb7YwlKY3ntx8hBDGMGLqX2FhlPkDMvv
+
+ 新版本可用
+ 立即下载
+ 忽略一次
+ 更新时间：
+ 提交信息：
+
搜索或点击地图位置
搜索或点击历史位置
diff --git a/app/src/main/res/xml/preferences_main.xml b/app/src/main/res/xml/preferences_main.xml
index 68b358b..c992abe 100644
--- a/app/src/main/res/xml/preferences_main.xml
+++ b/app/src/main/res/xml/preferences_main.xml
@@ -48,8 +48,8 @@