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
38f8993c
Commit
38f8993c
authored
Mar 22, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加速修改模式切换2
parent
ceedf52f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
9 deletions
+12
-9
app/src/main/java/com/ccwangluo/accelerator/ui/home/AcceleratorFragment.kt
.../com/ccwangluo/accelerator/ui/home/AcceleratorFragment.kt
+2
-2
app/src/main/java/com/ccwangluo/accelerator/utils/AcceleratorUtils.kt
.../java/com/ccwangluo/accelerator/utils/AcceleratorUtils.kt
+2
-1
core/src/main/java/com/github/shadowsocks/bg/AuthManager.kt
core/src/main/java/com/github/shadowsocks/bg/AuthManager.kt
+7
-5
core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
.../main/java/com/github/shadowsocks/preference/DataStore.kt
+1
-1
No files found.
app/src/main/java/com/ccwangluo/accelerator/ui/home/AcceleratorFragment.kt
View file @
38f8993c
...
...
@@ -63,7 +63,7 @@ class AcceleratorFragment : XPageFragment() {
override
fun
initViews
()
{
acceleratorViewModel
.
netState
.
observe
(
this
,
{
if
(
it
.
preNetDelay
!=
-
1
)
{
//有网络
if
(
it
.
preNetDelay
!=
-
1
&&
state
==
BaseService
.
State
.
Connected
)
{
//有网络
binding
.
preDelay1
.
setText
(
it
.
preNetDelay
.
toString
())
binding
.
preDelay2
.
setText
(
it
.
preNetDelay
.
toString
())
...
...
@@ -77,7 +77,7 @@ class AcceleratorFragment : XPageFragment() {
binding
.
preDelay2Unit
.
visibility
=
View
.
GONE
}
if
(
it
.
accNetDelay
!=
-
1
)
{
if
(
it
.
accNetDelay
!=
-
1
&&
state
==
BaseService
.
State
.
Connected
)
{
binding
.
netDelay1
.
setText
(
it
.
accNetDelay
.
toString
())
binding
.
netDelay2
.
setText
(
it
.
accNetDelay
.
toString
())
binding
.
netDelay1Unit
.
visibility
=
View
.
VISIBLE
...
...
app/src/main/java/com/ccwangluo/accelerator/utils/AcceleratorUtils.kt
View file @
38f8993c
...
...
@@ -85,6 +85,8 @@ object AcceleratorUtils {
delay
(
1000
)
}
}
}
else
{
networkStatsListener
(
state
,
getAccTime
(),
netState
)
}
}
...
...
@@ -177,7 +179,6 @@ object AcceleratorUtils {
profile
.
password
=
"barfoo!"
profile
.
method
=
"none"
profile
.
beatsInterval
=
10
NetworkAdapter
.
initNetworks
(
context
)
withContext
(
Dispatchers
.
Main
)
{
ProfileManager
.
updateProfile
(
profile
)
connect
.
launch
(
null
)
...
...
core/src/main/java/com/github/shadowsocks/bg/AuthManager.kt
View file @
38f8993c
...
...
@@ -168,8 +168,10 @@ object AuthManager {
if
(
wifiLatencyList
.
size
==
5
)
{
val
wifiavg
=
wifiLatencyList
.
average
().
toInt
()
val
celavg
=
cellularLatencyList
.
average
().
toInt
()
if
(
wifiavg
>
celavg
&&
wifiavg
>
200
)
{
if
(
wifiavg
>
celavg
&&
wifiavg
>
200
&&
celavg
!=
-
1
)
{
NetworkAdapter
.
useCellular
(
Core
.
deviceStorage
)
}
else
if
(
celavg
>
wifiavg
&&
wifiavg
!=
-
1
)
{
NetworkAdapter
.
useWifi
(
Core
.
deviceStorage
)
}
wifiLatencyList
.
clear
()
cellularLatencyList
.
clear
()
...
...
@@ -190,14 +192,14 @@ object AuthManager {
isSmartAccOpen
// 根据用户设置测试延迟 ,过高时切换 connection.bindNetwork(NetworkMode.CELLULAR.code)
if
(
networkAutoSwitch
)
{
val
wifiLatency
:
Int
=
doTestLatency
(
DataStore
.
pingAccHost
,
DataStore
.
pingAccPort
,
"114.114.114.114"
,
53
,
NetworkAdapter
.
wifiNetwork
)
wifiLatencyList
.
add
(
wifiLatency
)
val
cellularLatency
:
Int
=
doTestLatency
(
DataStore
.
pingAccHost
,
DataStore
.
pingAccPort
,
"114.114.114.114"
,
53
,
NetworkAdapter
.
cellularNetwork
)
cellularLatencyList
.
add
(
cellularLatency
)
...
...
core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
View file @
38f8993c
...
...
@@ -120,7 +120,7 @@ object DataStore : OnPreferenceDataStoreChangeListener {
get
()
=
privateStore
.
getInt
(
Key
.
pingIntervalSec
)
?:
1
set
(
value
)
=
privateStore
.
putInt
(
Key
.
pingIntervalSec
,
value
)
var
pingTimeoutMillis
:
Int
get
()
=
privateStore
.
getInt
(
Key
.
pingTimeoutMillis
)
?:
2
00
get
()
=
privateStore
.
getInt
(
Key
.
pingTimeoutMillis
)
?:
10
00
set
(
value
)
=
privateStore
.
putInt
(
Key
.
pingTimeoutMillis
,
value
)
var
pingAccHost
:
String
get
()
=
privateStore
.
getString
(
Key
.
pingAccHost
)
?:
""
...
...
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