This commit is contained in:
Max Lv
2015-11-21 11:59:05 +08:00
parent e636b9f78e
commit ff23bae671
6 changed files with 46 additions and 8 deletions
@@ -239,7 +239,7 @@ object ConfigUtils {
val method = proxy(3).trim
new Config(config.isProxyApps, config.isBypassApps, config.isUdpDns, config.isAuth, config.isIpv6,
config.profileName, host, password, method, config.proxiedAppString, config.route, port, config.localPort)
config.profileName, host, password, method, config.proxiedAppString, config.route, port, config.localPort, 0)
}
def load(settings: SharedPreferences): Config = {
@@ -259,7 +259,9 @@ object ConfigUtils {
val localPort = settings.getInt(Key.localPort, 1984)
val proxiedAppString = settings.getString(Key.proxied, "")
val profileId = settings.getInt(Key.profileId, -1)
new Config(isProxyApps, isBypassApps, isUdpDns, isAuth, isIpv6, profileName, proxy, sitekey, encMethod,
proxiedAppString, route, remotePort, localPort)
proxiedAppString, route, remotePort, localPort, profileId)
}
}
@@ -18,6 +18,10 @@ object TrafficMonitor {
var txTotal: Long = 0
var rxTotal: Long = 0
// Kilo bytes for the last query
var txLast: Long = 0
var rxLast: Long = 0
def getTraffic(tx: Long, rx: Long): Traffic = {
new Traffic(tx, rx, System.currentTimeMillis())
}
@@ -42,6 +46,8 @@ object TrafficMonitor {
txRate = (now.tx - last.tx) * 1000 / delta
rxRate = (now.rx - last.rx) * 1000 / delta
}
txLast = now.tx - last.tx
rxLast = now.rx - last.rx
txTotal += now.tx - last.tx
rxTotal += now.rx - last.rx
last = now
@@ -108,8 +108,9 @@ class TrafficMonitorThread(service: BaseService) extends Thread {
val stat = new String(array, "UTF-8").split("\\|")
if (stat.length == 2) {
TrafficMonitor.update(stat(0).toLong, stat(1).toLong)
service.updateTraffic(TrafficMonitor.getTxRate, TrafficMonitor.getRxRate,
service.updateTrafficRate(TrafficMonitor.getTxRate, TrafficMonitor.getRxRate,
TrafficMonitor.getTxTotal, TrafficMonitor.getRxTotal)
service.updateTrafficTotal(TrafficMonitor.txLast, TrafficMonitor.rxLast)
}
output.write(0)