Skip to content

Commit 5ad30fb

Browse files
committed
Update Simplified Chinese
1 parent 4bd9568 commit 5ad30fb

File tree

4 files changed

+30
-10
lines changed

4 files changed

+30
-10
lines changed

app/src/main/kotlin/cn/tongdun/android/activitys/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
1717
override fun getViewBinding(): ActivityMainBinding = ActivityMainBinding.inflate(layoutInflater)
1818

1919
override fun initData() {
20-
mTabList.add("Device id")
21-
mTabList.add("Device info")
20+
mTabList.add(getString(R.string.tab_title_device_id))
21+
mTabList.add(getString(R.string.tab_title_device_info))
2222
}
2323

2424
override fun initView() {

app/src/main/kotlin/cn/tongdun/android/fragments/DeviceInfoFragment.kt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import cn.tongdun.android.adapters.DeviceInfoItemAdapter
1414
import cn.tongdun.android.base.BaseFragment
1515
import cn.tongdun.mobrisk.TDRisk
1616
import cn.tongdun.mobrisk.providers.DeviceInfoProvider
17+
import com.trustdevice.android.R
1718
import com.trustdevice.android.databinding.FragmentDeviceInfoBinding
1819
import java.math.BigDecimal
1920
import java.math.RoundingMode
@@ -94,10 +95,11 @@ class DeviceInfoFragment : BaseFragment<FragmentDeviceInfoBinding>() {
9495
val availableStorage =
9596
deviceInfoProvider.getMemoryInfo().availableStorage / Math.pow(1024.0, 3.0)
9697
val useStorage = totalStorage - availableStorage
98+
val freeText = getString(R.string.free_text)
9799
val internalStorageInfo =
98100
String.format(Locale.US, "%.2fGB", useStorage) + " / " + String.format(
99101
Locale.US, "%.2fGB", totalStorage
100-
) + ", Free: " + String.format(Locale.US, "%.2fGB", availableStorage)
102+
) + ", ${freeText}: " + String.format(Locale.US, "%.2fGB", availableStorage)
101103

102104
tvInternalStorageInfo.text = internalStorageInfo
103105
val scale = 100 / totalStorage
@@ -110,15 +112,16 @@ class DeviceInfoFragment : BaseFragment<FragmentDeviceInfoBinding>() {
110112

111113
private fun initRAMView() {
112114
binding.memoryInfoLayout.apply {
113-
tvRamPath.text = "The state at the time of collection"
115+
tvRamPath.text = getString(R.string.memory_desc)
114116
val totalMemory = deviceInfoProvider.getMemoryInfo().totalMemory / Math.pow(1024.0, 3.0)
115117
val availableMemory =
116118
deviceInfoProvider.getMemoryInfo().availableMemory / Math.pow(1024.0, 3.0)
117119
val useMemory = totalMemory - availableMemory
120+
val freeText = getString(R.string.free_text)
118121
val internalStorageInfo =
119122
String.format(Locale.US, "%.2fGB", useMemory) + " / " + String.format(
120123
Locale.US, "%.2fGB", totalMemory
121-
) + ", Free: " + String.format(Locale.US, "%.2fGB", availableMemory)
124+
) + ", ${freeText}: " + String.format(Locale.US, "%.2fGB", availableMemory)
122125
tvRamInfo.text = internalStorageInfo
123126
val scale = 100 / totalMemory
124127
ramProgress.progress = (useMemory * scale).toInt()
@@ -130,17 +133,20 @@ class DeviceInfoFragment : BaseFragment<FragmentDeviceInfoBinding>() {
130133
private fun initBatteryView() {
131134
binding.batteryInfoLayout.apply {
132135
tvBatteryStatus.text = "(" + deviceInfoProvider.getBatteryInfo().status + ")"
136+
val totalCapacityText = getString(R.string.total_capacity_text)
133137
tvBatteryHealth.text =
134-
"total capacity: " + deviceInfoProvider.getBatteryInfo().TotalCapacity + "mAh"
138+
"${totalCapacityText}: " + deviceInfoProvider.getBatteryInfo().TotalCapacity + "mAh"
135139
val power = deviceInfoProvider.getBatteryInfo().level
136140

137141
batteryProgress.progress = power
138142
tvBatteryPower.text = "$power%"
139143
val temp = deviceInfoProvider.getBatteryInfo().temp
140144
val temperature = BigDecimal.valueOf((temp.toFloat() / 10).toDouble())
141145
.setScale(2, RoundingMode.HALF_UP).toDouble()
146+
val healthText = getString(R.string.health_text)
147+
val temperatureText = getString(R.string.temperature_text)
142148
tvBatteryInfo.text =
143-
"health: " + deviceInfoProvider.getBatteryInfo().health + ", temperature: " + temperature + ""
149+
"${healthText}: " + deviceInfoProvider.getBatteryInfo().health + ", ${temperatureText}: " + temperature + ""
144150
}
145151

146152
}

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<resources>
33
<string name="app_name">TrustDevice Fingerprint</string>
44
<string name="device_id_title">设备ID</string>
5-
<string name="android_id_title">安卓ID</string>
5+
<string name="android_id_title">Android ID</string>
66
<string name="risk_labels_title">风险标签</string>
77
<string name="gsf_id_title">谷歌服务框架ID</string>
88
<string name="gad_id_title">谷歌广告ID</string>
99
<string name="media_drm_id_title">数字版权管理ID</string>
10-
<string name="vb_meta_id_title">VB Meta ID</string>
10+
<string name="vb_meta_id_title">vbmeta摘要</string>
1111
<string name="setting_title">设置</string>
1212
<string name="internal_storage_title">内部存储</string>
1313
<string name="ram_title">运行内存</string>
@@ -18,4 +18,11 @@
1818
<string name="show_system_apps">显示系统应用</string>
1919
<string name="hide_system_apps">隐藏系统应用</string>
2020
<string name="sensor_list">传感器列表</string>
21+
<string name="tab_title_device_id">设备ID</string>
22+
<string name="tab_title_device_info">设备信息</string>
23+
<string name="memory_desc">实时的运行内存</string>
24+
<string name="free_text">剩余</string>
25+
<string name="total_capacity_text">总容量</string>
26+
<string name="health_text">健康状况</string>
27+
<string name="temperature_text">温度</string>
2128
</resources>

app/src/main/res/values/strings.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<string name="gsf_id_title">GSF ID</string>
77
<string name="gad_id_title">GAD ID</string>
88
<string name="media_drm_id_title">Media DRM ID</string>
9-
<string name="vb_meta_id_title">VMD ID</string>
9+
<string name="vb_meta_id_title">vbmetaDigest</string>
1010
<string name="setting_title">Settings</string>
1111
<string name="internal_storage_title">Internal Storage</string>
1212
<string name="ram_title">Random Access Memory</string>
@@ -17,4 +17,11 @@
1717
<string name="show_system_apps">show system apps</string>
1818
<string name="hide_system_apps">hide system apps</string>
1919
<string name="sensor_list">Sensor list</string>
20+
<string name="tab_title_device_id">Device id</string>
21+
<string name="tab_title_device_info">Device info</string>
22+
<string name="memory_desc">The state at the time of collection</string>
23+
<string name="free_text">Free</string>
24+
<string name="total_capacity_text">total capacity</string>
25+
<string name="health_text">health</string>
26+
<string name="temperature_text">temperature</string>
2027
</resources>

0 commit comments

Comments
 (0)