Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
f0abbb73
Commit
f0abbb73
authored
Nov 18, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add TrafficMonitor to the main activity
parent
92e72830
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
48 additions
and
6 deletions
+48
-6
src/main/res/values-zh/strings.xml
src/main/res/values-zh/strings.xml
+3
-0
src/main/res/values/strings.xml
src/main/res/values/strings.xml
+2
-0
src/main/res/xml/pref_all.xml
src/main/res/xml/pref_all.xml
+2
-0
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+28
-2
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+4
-0
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+4
-0
src/main/scala/com/github/shadowsocks/utils/Constants.scala
src/main/scala/com/github/shadowsocks/utils/Constants.scala
+1
-0
src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
...n/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
+4
-4
No files found.
src/main/res/values-zh/strings.xml
View file @
f0abbb73
...
@@ -72,6 +72,9 @@
...
@@ -72,6 +72,9 @@
<string
name=
"ipv6"
>
IPv6 路由
</string>
<string
name=
"ipv6"
>
IPv6 路由
</string>
<string
name=
"ipv6_summary"
>
向远程服务器转发 IPv6 流量
</string>
<string
name=
"ipv6_summary"
>
向远程服务器转发 IPv6 流量
</string>
<string
name=
"stat"
>
网络流量
</string>
<string
name=
"stat_summary"
>
发送:\t%1$s\t|\t接收:\t%2$s\n上传:\t%3$s\t|\t下载:\t%4$s
</string>
<!-- profile -->
<!-- profile -->
<string
name=
"add_profile_dialog"
>
为影梭添加此配置文件?
</string>
<string
name=
"add_profile_dialog"
>
为影梭添加此配置文件?
</string>
<string
name=
"add_profile_methods_scan_qr_code"
>
扫描二维码
</string>
<string
name=
"add_profile_methods_scan_qr_code"
>
扫描二维码
</string>
...
...
src/main/res/values/strings.xml
View file @
f0abbb73
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
<string
name=
"nat"
>
NAT mode (deprecated)
</string>
<string
name=
"nat"
>
NAT mode (deprecated)
</string>
<string
name=
"nat_summary"
>
Use NAT mode instead of VPN mode
</string>
<string
name=
"nat_summary"
>
Use NAT mode instead of VPN mode
</string>
<string
name=
"nat_summary_no_root"
>
NAT mode is disabled without root
</string>
<string
name=
"nat_summary_no_root"
>
NAT mode is disabled without root
</string>
<string
name=
"stat"
>
Network Traffic
</string>
<string
name=
"stat_summary"
>
Send:\t%1$s\t|\tReceive:\t%2$s\nUpload:\t%3$s\t|\tDownload:\t%4$s
</string>
<!-- proxy category -->
<!-- proxy category -->
<string
name=
"proxy_cat"
>
Server Settings
</string>
<string
name=
"proxy_cat"
>
Server Settings
</string>
...
...
src/main/res/xml/pref_all.xml
View file @
f0abbb73
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
<intent
android:action=
"com.github.shadowsocks.ProfileManagerActivity"
/>
<intent
android:action=
"com.github.shadowsocks.ProfileManagerActivity"
/>
</Preference>
</Preference>
<Preference
android:key=
"stat"
android:title=
"@string/stat"
/>
</PreferenceCategory>
</PreferenceCategory>
<PreferenceCategory
<PreferenceCategory
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
f0abbb73
...
@@ -40,7 +40,7 @@ package com.github.shadowsocks
...
@@ -40,7 +40,7 @@ package com.github.shadowsocks
import
java.io.
{
FileOutputStream
,
IOException
,
InputStream
,
OutputStream
}
import
java.io.
{
FileOutputStream
,
IOException
,
InputStream
,
OutputStream
}
import
java.util
import
java.util
import
java.util.
Locale
import
java.util.
{
Locale
,
Timer
,
TimerTask
}
import
android.app.backup.BackupManager
import
android.app.backup.BackupManager
import
android.app.
{
Activity
,
ProgressDialog
}
import
android.app.
{
Activity
,
ProgressDialog
}
...
@@ -147,7 +147,7 @@ class Shadowsocks
...
@@ -147,7 +147,7 @@ class Shadowsocks
extends
AppCompatActivity
{
extends
AppCompatActivity
{
// Variables
// Variables
private
var
serviceStarted
=
false
var
serviceStarted
=
false
var
fab
:
FloatingActionButton
=
_
var
fab
:
FloatingActionButton
=
_
var
fabProgressCircle
:
FABProgressCircle
=
_
var
fabProgressCircle
:
FABProgressCircle
=
_
var
progressDialog
:
ProgressDialog
=
_
var
progressDialog
:
ProgressDialog
=
_
...
@@ -156,6 +156,8 @@ class Shadowsocks
...
@@ -156,6 +156,8 @@ class Shadowsocks
var
prepared
=
false
var
prepared
=
false
var
currentProfile
=
new
Profile
var
currentProfile
=
new
Profile
var
vpnEnabled
=
-
1
var
vpnEnabled
=
-
1
var
timer
:
Timer
=
null
val
TIMER_INTERVAL
=
1
// sec
// Services
// Services
var
currentServiceName
=
classOf
[
ShadowsocksNatService
].
getName
var
currentServiceName
=
classOf
[
ShadowsocksNatService
].
getName
...
@@ -465,6 +467,24 @@ class Shadowsocks
...
@@ -465,6 +467,24 @@ class Shadowsocks
// Check if current profile changed
// Check if current profile changed
if
(
ShadowsocksApplication
.
profileId
!=
currentProfile
.
id
)
reloadProfile
()
if
(
ShadowsocksApplication
.
profileId
!=
currentProfile
.
id
)
reloadProfile
()
// initialize timer
val
task
=
new
TimerTask
{
def
run
()
{
TrafficMonitor
.
update
()
val
pm
=
getSystemService
(
Context
.
POWER_SERVICE
).
asInstanceOf
[
PowerManager
]
if
(
pm
.
isScreenOn
)
{
val
trafficStat
=
getString
(
R
.
string
.
stat_summary
).
formatLocal
(
Locale
.
ENGLISH
,
TrafficMonitor
.
getTxRate
,
TrafficMonitor
.
getRxRate
,
TrafficMonitor
.
getTxTotal
,
TrafficMonitor
.
getRxTotal
)
handler
.
post
(()
=>
{
preferences
.
findPreference
(
Key
.
stat
).
setSummary
(
trafficStat
)
})
}
}
}
timer
=
new
Timer
(
true
)
timer
.
schedule
(
task
,
TIMER_INTERVAL
*
1000
,
TIMER_INTERVAL
*
1000
)
}
}
private
def
setPreferenceEnabled
(
enabled
:
Boolean
)
{
private
def
setPreferenceEnabled
(
enabled
:
Boolean
)
{
...
@@ -510,6 +530,12 @@ class Shadowsocks
...
@@ -510,6 +530,12 @@ class Shadowsocks
override
def
onStop
()
{
override
def
onStop
()
{
super
.
onStop
()
super
.
onStop
()
clearDialog
()
clearDialog
()
// reset timer
if
(
timer
!=
null
)
{
timer
.
cancel
()
timer
=
null
}
}
}
override
def
onDestroy
()
{
override
def
onDestroy
()
{
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
f0abbb73
...
@@ -420,6 +420,8 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -420,6 +420,8 @@ class ShadowsocksNatService extends Service with BaseService {
override
def
startRunner
(
c
:
Config
)
{
override
def
startRunner
(
c
:
Config
)
{
TrafficMonitor
.
reset
()
config
=
c
config
=
c
// register close receiver
// register close receiver
...
@@ -509,6 +511,8 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -509,6 +511,8 @@ class ShadowsocksNatService extends Service with BaseService {
override
def
stopRunner
()
{
override
def
stopRunner
()
{
TrafficMonitor
.
reset
()
// channge the state
// channge the state
changeState
(
State
.
STOPPING
)
changeState
(
State
.
STOPPING
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
f0abbb73
...
@@ -144,6 +144,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -144,6 +144,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
override
def
stopRunner
()
{
override
def
stopRunner
()
{
TrafficMonitor
.
reset
()
if
(
vpnThread
!=
null
)
{
if
(
vpnThread
!=
null
)
{
vpnThread
.
stopThread
()
vpnThread
.
stopThread
()
vpnThread
=
null
vpnThread
=
null
...
@@ -217,6 +219,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -217,6 +219,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
override
def
startRunner
(
c
:
Config
)
{
override
def
startRunner
(
c
:
Config
)
{
TrafficMonitor
.
reset
()
vpnThread
=
new
ShadowsocksVpnThread
(
this
)
vpnThread
=
new
ShadowsocksVpnThread
(
this
)
vpnThread
.
start
()
vpnThread
.
start
()
...
...
src/main/scala/com/github/shadowsocks/utils/Constants.scala
View file @
f0abbb73
...
@@ -68,6 +68,7 @@ object Key {
...
@@ -68,6 +68,7 @@ object Key {
val
profiles
=
"profiles"
val
profiles
=
"profiles"
val
isNAT
=
"isNAT"
val
isNAT
=
"isNAT"
val
route
=
"route"
val
route
=
"route"
val
stat
=
"stat"
val
isRunning
=
"isRunning"
val
isRunning
=
"isRunning"
val
isAutoConnect
=
"isAutoConnect"
val
isAutoConnect
=
"isAutoConnect"
...
...
src/main/scala/com/github/shadowsocks/utils/TrafficMonitor.scala
View file @
f0abbb73
...
@@ -38,16 +38,16 @@ object TrafficMonitor {
...
@@ -38,16 +38,16 @@ object TrafficMonitor {
}
}
}
}
def
update
Traffic
()
{
def
update
()
{
val
now
=
getTraffic
val
now
=
getTraffic
txRate
=
(
(
now
.
tx
-
last
.
tx
)
/
1024
/
(
now
.
timestamp
-
last
.
timestamp
)
)
txRate
=
(
now
.
tx
-
last
.
tx
)
/
(
now
.
timestamp
-
last
.
timestamp
)
rxRate
=
(
(
now
.
rx
-
last
.
rx
)
/
1024
/
(
now
.
timestamp
-
last
.
timestamp
)
)
rxRate
=
(
now
.
rx
-
last
.
rx
)
/
(
now
.
timestamp
-
last
.
timestamp
)
txTotal
+=
(
now
.
tx
-
last
.
tx
)
/
1024
txTotal
+=
(
now
.
tx
-
last
.
tx
)
/
1024
rxTotal
+=
(
now
.
rx
-
last
.
rx
)
/
1024
rxTotal
+=
(
now
.
rx
-
last
.
rx
)
/
1024
last
=
now
last
=
now
}
}
def
reset
Traffic
()
{
def
reset
()
{
txRate
=
0
txRate
=
0
rxRate
=
0
rxRate
=
0
txTotal
=
0
txTotal
=
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment