Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckyFarm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
LuckyFarm
Commits
4d615ad4
Commit
4d615ad4
authored
Nov 12, 2020
by
wangxuewei
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_ddcy_1.0.3' into develop_ddcy_1.0.3
parents
5536407c
732c01ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
17 deletions
+18
-17
SplashPresenter.kt
library/src/main/java/com/ym/library/net/SplashPresenter.kt
+17
-17
PhoneUtils.kt
library/src/main/java/com/ym/library/utils/PhoneUtils.kt
+1
-0
No files found.
library/src/main/java/com/ym/library/net/SplashPresenter.kt
View file @
4d615ad4
...
...
@@ -337,23 +337,23 @@ class SplashPresenter : SplashContract.Presenter {
val
md5
:
String
=
mNovelInitEntity
?.
md5
?:
""
val
lua
:
String
=
mNovelInitEntity
?.
lua
?:
""
if
(
lua
!=
null
&&
!
TextUtils
.
isEmpty
(
lua
))
{
Log
.
d
(
"lua"
,
"lua:---->"
+
lua
)
if
(!
TextUtils
.
isEmpty
(
md5
))
{
SettingPreference
.
saveMd5
(
md5
)
}
SettingPreference
.
saveSecDesc
(
lua
)
CesCore
.
getInstance
().
setData
(
lua
)
Constant
.
Param
.
env
=
CesCore
.
getInstance
().
Ckwork
(
SettingPreference
.
getAndroidId
())
Constant
.
Param
.
md5
=
SettingPreference
.
getMd5
()
}
else
{
val
lua
=
SettingPreference
.
getSecDesc
()
if
(!
TextUtils
.
isEmpty
(
lua
))
{
CesCore
.
getInstance
().
setData
(
lua
)
Constant
.
Param
.
env
=
CesCore
.
getInstance
().
Ckwork
(
SettingPreference
.
getAndroidId
())
}
}
//
if (lua != null && !TextUtils.isEmpty(lua)) {
//
Log.d("lua", "lua:---->" + lua)
//
if (!TextUtils.isEmpty(md5)) {
//
SettingPreference.saveMd5(md5)
//
}
//
SettingPreference.saveSecDesc(lua)
//
//
CesCore.getInstance().setData(lua)
//
Constant.Param.env = CesCore.getInstance().Ckwork(SettingPreference.getAndroidId())
//
Constant.Param.md5 = SettingPreference.getMd5()
//
} else {
//
val lua = SettingPreference.getSecDesc()
//
if (!TextUtils.isEmpty(lua)) {
//
CesCore.getInstance().setData(lua)
//
Constant.Param.env = CesCore.getInstance().Ckwork(SettingPreference.getAndroidId())
//
}
//
}
// deviceLogin()
// getUserInfo()
mView
.
jumpPage
()
...
...
library/src/main/java/com/ym/library/utils/PhoneUtils.kt
View file @
4d615ad4
...
...
@@ -702,6 +702,7 @@ object PhoneUtils {
val
params
=
addCommonParam
()
params
.
put
(
"appKey"
,
"faba1d018f76086"
)
params
.
put
(
"appLs"
,
Constant
.
appLs
)
params
.
put
(
"tgyz"
,
"1"
)
params
.
put
(
"gender"
,
SettingPreference
.
getGender
().
toString
())
for
(
i
in
0
until
request
.
url
().
querySize
())
{
...
...
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