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
d823de6c
Commit
d823de6c
authored
Feb 28, 2022
by
liusheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.解决webView界面下面ui黑块问题。2.添加接口返回401跳转登录的逻辑
parent
b48a1802
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
92 additions
and
42 deletions
+92
-42
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
app/src/main/java/com/ccwangluo/accelerator/ui/MainActivity.kt
...rc/main/java/com/ccwangluo/accelerator/ui/MainActivity.kt
+1
-0
app/src/main/java/com/ccwangluo/accelerator/ui/home/AccelertorFragment.kt
...a/com/ccwangluo/accelerator/ui/home/AccelertorFragment.kt
+11
-7
app/src/main/java/com/ccwangluo/accelerator/ui/web/AndroidInterface.kt
...java/com/ccwangluo/accelerator/ui/web/AndroidInterface.kt
+17
-11
app/src/main/java/com/ccwangluo/accelerator/ui/web/CommonWebViewFragment.kt
...com/ccwangluo/accelerator/ui/web/CommonWebViewFragment.kt
+8
-0
app/src/main/java/com/ccwangluo/accelerator/utils/LoginUtils.kt
...c/main/java/com/ccwangluo/accelerator/utils/LoginUtils.kt
+13
-8
app/src/main/java/com/ccwangluo/accelerator/utils/PhoneUtils.kt
...c/main/java/com/ccwangluo/accelerator/utils/PhoneUtils.kt
+6
-6
app/src/main/java/com/ccwangluo/accelerator/utils/http/HttpGo.kt
.../main/java/com/ccwangluo/accelerator/utils/http/HttpGo.kt
+25
-4
app/src/main/res/layout/fragment_mine.xml
app/src/main/res/layout/fragment_mine.xml
+1
-1
app/src/main/res/layout/fragment_news.xml
app/src/main/res/layout/fragment_news.xml
+1
-1
app/src/main/res/layout/fragment_quick.xml
app/src/main/res/layout/fragment_quick.xml
+1
-0
app/src/main/res/layout/fragment_webview.xml
app/src/main/res/layout/fragment_webview.xml
+1
-1
app/src/main/res/layout/item_dynamic.xml
app/src/main/res/layout/item_dynamic.xml
+2
-0
app/src/main/res/layout/item_news_game.xml
app/src/main/res/layout/item_news_game.xml
+2
-2
app/src/main/res/values/themes.xml
app/src/main/res/values/themes.xml
+1
-1
core/src/main/java/com/github/shadowsocks/http/HttpConfig.kt
core/src/main/java/com/github/shadowsocks/http/HttpConfig.kt
+1
-0
No files found.
app/src/main/AndroidManifest.xml
View file @
d823de6c
...
...
@@ -20,6 +20,7 @@
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.REQUEST_INSTALL_PACKAGES"
/>
<!-- 配置可查询包名, 配置测试游戏必须添加 添加 -->
<queries>
<package
android:name=
"com.tencent.mm"
/>
<package
android:name=
"com.tencent.mobileqq"
/>
...
...
app/src/main/java/com/ccwangluo/accelerator/ui/MainActivity.kt
View file @
d823de6c
...
...
@@ -53,6 +53,7 @@ class MainActivity() : XPageActivity(), TencentLocationListener {
private
var
mSensorManager
:
SensorManager
?
=
null
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
accelertorViewModel
=
ViewModelProvider
(
this
).
get
(
AccelertorViewModel
::
class
.
java
)
initPhoneUtils
()
...
...
app/src/main/java/com/ccwangluo/accelerator/ui/home/AccelertorFragment.kt
View file @
d823de6c
...
...
@@ -206,9 +206,11 @@ class AccelertorFragment : XPageFragment() {
}
if
(!
LoginUtils
.
hasToken
())
{
LoginUtils
.
login
(
this
,
{
context
?.
let
{
it1
->
LoginUtils
.
login
(
it1
,
{
})
}
return
@setOnClickListener
}
...
...
@@ -268,13 +270,15 @@ class AccelertorFragment : XPageFragment() {
LoginUtils
.
token
?.
let
{
openPage
(
CommonWebViewFragment
::
class
.
java
,
params
)
}
?:
let
{
LoginUtils
.
login
(
this
,
{
context
?.
let
{
it1
->
LoginUtils
.
login
(
it1
,
{
if
(
true
)
{
openPage
(
CommonWebViewFragment
::
class
.
java
,
params
)
}
})
}
}
}
override
fun
onResume
()
{
super
.
onResume
()
...
...
app/src/main/java/com/ccwangluo/accelerator/ui/web/AndroidInterface.kt
View file @
d823de6c
...
...
@@ -16,7 +16,9 @@ import com.xuexiang.xpage.base.XPageFragment
import
com.xuexiang.xutil.app.AppUtils
import
com.xuexiang.xutil.system.PermissionUtils
import
android.content.Intent
import
android.media.audiofx.BassBoost
import
android.net.Uri
import
android.provider.Settings
import
com.hjq.toast.ToastUtils
import
java.lang.Exception
import
android.util.DisplayMetrics
...
...
@@ -52,20 +54,22 @@ class AndroidInterface(val xPageFragment: XPageFragment, val agentWeb: AgentWeb)
params
.
putString
(
CommonWebViewFragment
.
WEBVIEW_URL_KEY
,
HttpConfig
.
UI_MAIN_URL
+
url
)
xPageFragment
.
openPage
(
CommonWebViewFragment
::
class
.
java
,
params
)
}
?:
let
{
LoginUtils
.
login
(
xPageFragment
)
{
xPageFragment
.
context
?.
let
{
it1
->
LoginUtils
.
login
(
it1
)
{
LoginUtils
.
token
?.
let
{
agentWeb
.
getJsAccessEntrace
()
.
quickCallJs
(
"userToken"
,
it
)
}
}
}
}
}
//打开系统设置
@JavascriptInterface
fun
openSysSetting
()
{
NetworkUtils
.
openWirelessSettings
()
xPageFragment
.
startActivity
(
Intent
(
Settings
.
ACTION_SETTINGS
));
}
@JavascriptInterface
...
...
@@ -77,13 +81,15 @@ class AndroidInterface(val xPageFragment: XPageFragment, val agentWeb: AgentWeb)
@JavascriptInterface
fun
login
(
callback
:
String
)
{
LoginUtils
.
login
(
xPageFragment
,
{
xPageFragment
.
context
?.
let
{
LoginUtils
.
login
(
it
,
{
if
(
it
)
{
agentWeb
.
getJsAccessEntrace
()
.
quickCallJs
(
callback
,
LoginUtils
.
token
)
}
})
}
}
/**
* 智能极限加速
...
...
app/src/main/java/com/ccwangluo/accelerator/ui/web/CommonWebViewFragment.kt
View file @
d823de6c
...
...
@@ -70,6 +70,14 @@ class CommonWebViewFragment : XPageFragment() {
}
override
fun
onHiddenChanged
(
hidden
:
Boolean
)
{
super
.
onHiddenChanged
(
hidden
)
}
override
fun
getUserVisibleHint
():
Boolean
{
return
super
.
getUserVisibleHint
()
}
override
fun
onPause
()
{
agentWeb
?.
getWebLifeCycle
()
?.
onPause
()
super
.
onPause
()
...
...
app/src/main/java/com/ccwangluo/accelerator/utils/LoginUtils.kt
View file @
d823de6c
package
com.ccwangluo.accelerator.utils
import
android.content.Context
import
android.content.Intent
import
android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import
androidx.lifecycle.lifecycleScope
import
com.ccwangluo.accelerator.model.LoginRes
import
com.ccwangluo.accelerator.model.UserProfile
...
...
@@ -12,6 +14,7 @@ import com.hjq.toast.ToastUtils
import
com.tencent.mmkv.MMKV
import
com.xuexiang.xpage.base.XPageFragment
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.withContext
import
java.util.*
...
...
@@ -99,12 +102,12 @@ object LoginUtils {
timer
?.
cancel
()
}
fun
login
(
xPageFragment
:
XPageFragmen
t
,
callBack
:
(
Boolean
)
->
Unit
)
{
PhoneUtils
.
openLoginAuth
(
xPageFragmen
t
)
{
b
,
s
->
fun
login
(
context
:
Contex
t
,
callBack
:
(
Boolean
)
->
Unit
)
{
PhoneUtils
.
openLoginAuth
(
contex
t
)
{
b
,
s
->
if
(
b
)
{
val
map
=
mutableMapOf
<
String
,
String
>()
map
.
put
(
"token"
,
s
)
xPageFragment
.
lifecycle
Scope
.
launch
(
Dispatchers
.
IO
)
{
Global
Scope
.
launch
(
Dispatchers
.
IO
)
{
val
res
=
HttpGo
.
postSync
<
LoginRes
>(
"/api/user/flash/login"
,
map
)
res
?.
let
{
if
(
it
.
code
==
200
)
{
...
...
@@ -125,11 +128,13 @@ object LoginUtils {
}
}
}
else
{
xPageFragment
.
startActivity
(
Intent
(
xPageFragment
.
context
,
val
intent
=
Intent
(
context
,
PhoneLoginActivity
::
class
.
java
)
intent
.
addFlags
(
FLAG_ACTIVITY_NEW_TASK
)
context
.
startActivity
(
intent
)
}
}
...
...
app/src/main/java/com/ccwangluo/accelerator/utils/PhoneUtils.kt
View file @
d823de6c
...
...
@@ -49,9 +49,9 @@ object PhoneUtils {
}
}
fun
openLoginAuth
(
xPageFragment
:
XPageFragmen
t
,
callback
:
(
Boolean
,
String
)
->
Unit
)
{
xPageFragment
.
context
?.
let
{
OneKeyLoginManager
.
getInstance
().
setAuthThemeConfig
(
getEConfig
(
it
,
xPageFragment
))
fun
openLoginAuth
(
context
:
Contex
t
,
callback
:
(
Boolean
,
String
)
->
Unit
)
{
context
?.
let
{
OneKeyLoginManager
.
getInstance
().
setAuthThemeConfig
(
getEConfig
(
it
))
OneKeyLoginManager
.
getInstance
().
openLoginAuth
(
false
,
{
code
,
result
->
...
...
@@ -69,7 +69,7 @@ object PhoneUtils {
}
}
fun
getEConfig
(
context
:
Context
,
xPageFragment
:
XPageFragment
):
ShanYanUIConfig
?
{
fun
getEConfig
(
context
:
Context
):
ShanYanUIConfig
?
{
/************************************SDK固有控件 */
//登录按钮背景
...
...
@@ -137,8 +137,8 @@ object PhoneUtils {
.
setLogBtnImgPath
(
context
.
resources
.
getDrawable
(
R
.
mipmap
.
login_btn_onekey
))
.
addCustomView
(
mOtherTv
,
true
,
false
)
{
context
,
view
->
xPageFragmen
t
.
startActivity
(
Intent
(
xPageFragment
.
context
,
)
{
context
,
view
->
contex
t
.
startActivity
(
Intent
(
context
,
PhoneLoginActivity
::
class
.
java
)
)
}
.
setPrivacyState
(
false
)
...
...
app/src/main/java/com/ccwangluo/accelerator/utils/http/HttpGo.kt
View file @
d823de6c
...
...
@@ -6,6 +6,7 @@ import com.github.shadowsocks.http.HttpConfig
import
com.google.gson.Gson
import
com.google.gson.reflect.TypeToken
import
com.hjq.toast.ToastUtils
import
com.xuexiang.xutil.XUtil
import
okhttp3.*
import
okhttp3.HttpUrl.Companion.toHttpUrl
import
okhttp3.MediaType.Companion.toMediaTypeOrNull
...
...
@@ -51,14 +52,19 @@ object HttpGo {
LoginUtils
.
token
?.
let
{
request
.
addHeader
(
"Authorization"
,
it
)
}
Timber
.
i
(
"======getSync.token:"
+
LoginUtils
.
token
)
Timber
.
i
(
"%s%s"
,
url
,
request
.
toString
())
val
call
=
okHttpClient
.
newCall
(
request
.
build
())
val
response
:
Response
=
call
.
execute
()
if
(
response
.
isSuccessful
)
{
val
type
=
object
:
TypeToken
<
BaseModel
<
T
>>()
{}.
type
val
string
=
response
.
body
?.
string
()
Timber
.
i
(
"%s%s"
,
url
,
string
.
toString
())
return
gson
.
fromJson
(
string
,
type
)
Timber
.
i
(
"========%s%s"
,
url
,
string
.
toString
())
val
result
:
BaseModel
<
T
>?
=
gson
.
fromJson
(
string
,
type
)
return
result
}
else
if
(
response
.
code
==
401
){
LoginUtils
.
clearToken
()
LoginUtils
.
login
(
XUtil
.
getContext
(),{})
}
else
{
ToastUtils
.
show
(
"网络错误"
)
}
...
...
@@ -85,14 +91,29 @@ object HttpGo {
LoginUtils
.
token
?.
let
{
request
.
addHeader
(
"Authorization"
,
it
)
}
Timber
.
i
(
"======postSync.token:"
+
LoginUtils
.
token
)
Timber
.
i
(
request
.
toString
())
val
call
=
okHttpClient
.
newCall
(
request
.
build
())
val
response
:
Response
=
call
.
execute
()
if
(
response
.
isSuccessful
)
{
val
string
=
response
.
body
?.
string
()
Timber
.
i
(
string
.
toString
())
Timber
.
i
(
"======postSync:"
+
string
.
toString
())
val
type
=
object
:
TypeToken
<
BaseModel
<
T
>>()
{}.
type
return
gson
.
fromJson
(
string
,
type
)
val
result
:
BaseModel
<
T
>?
=
gson
.
fromJson
(
string
,
type
)
result
?.
let
{
if
(
it
.
code
==
401
)
{
LoginUtils
.
clearToken
()
LoginUtils
.
login
(
XUtil
.
getContext
(),{})
}
}
return
result
}
else
if
(
response
.
code
==
401
){
LoginUtils
.
clearToken
()
LoginUtils
.
login
(
XUtil
.
getContext
(),{})
}
else
{
ToastUtils
.
show
(
"网络错误"
)
}
}
catch
(
e
:
java
.
lang
.
Exception
)
{
ToastUtils
.
show
(
"网络错误"
)
...
...
app/src/main/res/layout/fragment_mine.xml
View file @
d823de6c
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
>
<FrameLayout
android:layout_marginTop=
"
3
0dp"
android:layout_marginTop=
"0dp"
android:id=
"@+id/mine_webview"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
...
...
app/src/main/res/layout/fragment_news.xml
View file @
d823de6c
...
...
@@ -50,7 +50,7 @@
android:id=
"@+id/game_news_list"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"
21
dp"
android:layout_marginTop=
"
10
dp"
android:background=
"@color/white"
android:orientation=
"horizontal"
>
...
...
app/src/main/res/layout/fragment_quick.xml
View file @
d823de6c
...
...
@@ -67,6 +67,7 @@
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_marginTop=
"40dp"
android:layout_height=
"wrap_content"
>
...
...
app/src/main/res/layout/fragment_webview.xml
View file @
d823de6c
...
...
@@ -2,12 +2,12 @@
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#FFFFFF"
android:orientation=
"vertical"
>
<FrameLayout
android:layout_marginTop=
"30dp"
android:id=
"@+id/common_webview"
android:layout_marginBottom=
"50dp"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
...
...
app/src/main/res/layout/item_dynamic.xml
View file @
d823de6c
...
...
@@ -36,6 +36,8 @@
android:id=
"@+id/nickname"
android:layout_width=
"70.5dp"
android:layout_height=
"20dp"
android:singleLine=
"true"
android:ellipsize=
"end"
android:textColor=
"#FF000000"
android:textSize=
"14sp"
/>
...
...
app/src/main/res/layout/item_news_game.xml
View file @
d823de6c
...
...
@@ -9,8 +9,8 @@
<ImageView
android:id=
"@+id/plugin_img"
android:layout_width=
"4
8
dp"
android:layout_height=
"4
8
dp"
android:layout_width=
"4
2
dp"
android:layout_height=
"4
2
dp"
android:layout_gravity=
"center_horizontal"
android:background=
"@mipmap/game_download"
/>
...
...
app/src/main/res/values/themes.xml
View file @
d823de6c
...
...
@@ -23,7 +23,7 @@
<item
name=
"colorPrimaryDark"
>
@color/colorPrimary
</item>
<item
name=
"colorAccent"
>
@color/black
</item>
<item
name=
"android:windowTranslucentStatus"
>
true
</item>
<item
name=
"android:windowTranslucentNavigation"
>
tru
e
</item>
<item
name=
"android:windowTranslucentNavigation"
>
fals
e
</item>
<!-- <item name="android:background">@mipmap/splash</item>-->
<item
name=
"android:windowBackground"
>
@mipmap/win_bg
</item>
<item
name=
"android:windowDisablePreview"
>
true
</item>
...
...
core/src/main/java/com/github/shadowsocks/http/HttpConfig.kt
View file @
d823de6c
...
...
@@ -3,6 +3,7 @@ package com.github.shadowsocks.http
object
HttpConfig
{
//app后端
//val baseUrl = "http://10.16.1.98:9002"
val
baseUrl
=
"https://test-cc-tt-api.orangenet.org.cn"
//测试
// val baseUrl = "https://cc-tt-front.srccwl.com" //生产
...
...
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