diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index da320a87..02d6f29d 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -72,6 +72,9 @@
IPv6 路由
向远程服务器转发 IPv6 流量
+ 网络流量
+ 发送:\t%1$s\t|\t接收:\t%2$s\n上传:\t%3$s\t|\t下载:\t%4$s
+
为影梭添加此配置文件?
扫描二维码
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 597957e6..ba72d186 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -12,6 +12,8 @@
NAT mode (deprecated)
Use NAT mode instead of VPN mode
NAT mode is disabled without root
+ Network Traffic
+ Send:\t%1$s\t|\tReceive:\t%2$s\nUpload:\t%3$s\t|\tDownload:\t%4$s
Server Settings
diff --git a/src/main/res/xml/pref_all.xml b/src/main/res/xml/pref_all.xml
index 637eebaa..82412e04 100644
--- a/src/main/res/xml/pref_all.xml
+++ b/src/main/res/xml/pref_all.xml
@@ -8,6 +8,8 @@
+
+
{
+ preferences.findPreference(Key.stat).setSummary(trafficStat)
+ })
+ }
+ }
+ }
+ timer = new Timer(true)
+ timer.schedule(task, TIMER_INTERVAL * 1000, TIMER_INTERVAL * 1000)
}
private def setPreferenceEnabled(enabled: Boolean) {
@@ -510,6 +530,12 @@ class Shadowsocks
override def onStop() {
super.onStop()
clearDialog()
+
+ // reset timer
+ if (timer != null) {
+ timer.cancel()
+ timer = null
+ }
}
override def onDestroy() {
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
index 52e11c9d..72bf9d7b 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
@@ -420,6 +420,8 @@ class ShadowsocksNatService extends Service with BaseService {
override def startRunner(c: Config) {
+ TrafficMonitor.reset()
+
config = c
// register close receiver
@@ -509,6 +511,8 @@ class ShadowsocksNatService extends Service with BaseService {
override def stopRunner() {
+ TrafficMonitor.reset()
+
// channge the state
changeState(State.STOPPING)
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
index 8b78ba7c..082cec64 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -144,6 +144,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
override def stopRunner() {
+ TrafficMonitor.reset()
+
if (vpnThread != null) {
vpnThread.stopThread()
vpnThread = null
@@ -217,6 +219,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
override def startRunner(c: Config) {
+ TrafficMonitor.reset()
+
vpnThread = new ShadowsocksVpnThread(this)
vpnThread.start()
diff --git a/src/main/scala/com/github/shadowsocks/utils/Constants.scala b/src/main/scala/com/github/shadowsocks/utils/Constants.scala
index 07b645fd..c207e08d 100644
--- a/src/main/scala/com/github/shadowsocks/utils/Constants.scala
+++ b/src/main/scala/com/github/shadowsocks/utils/Constants.scala
@@ -68,6 +68,7 @@ object Key {
val profiles = "profiles"
val isNAT = "isNAT"
val route = "route"
+ val stat = "stat"
val isRunning = "isRunning"
val isAutoConnect = "isAutoConnect"
diff --git a/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala b/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
index d26c236d..d3b7c478 100644
--- a/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
+++ b/src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
@@ -38,16 +38,16 @@ object TrafficMonitor {
}
}
- def updateTraffic() {
+ def update() {
val now = getTraffic
- txRate = ((now.tx - last.tx) / 1024 / (now.timestamp - last.timestamp))
- rxRate = ((now.rx - last.rx) / 1024 / (now.timestamp - last.timestamp))
+ txRate = (now.tx - last.tx) / (now.timestamp - last.timestamp)
+ rxRate = (now.rx - last.rx) / (now.timestamp - last.timestamp)
txTotal += (now.tx - last.tx) / 1024
rxTotal += (now.rx - last.rx) / 1024
last = now
}
- def resetTraffic() {
+ def reset() {
txRate = 0
rxRate = 0
txTotal = 0