Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
73e13026
Commit
73e13026
authored
May 21, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add 服务端接口加appid公共参数
parent
2893fd7b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
AppConfig.kt
...onLib/Common/src/main/java/com/yidian/common/AppConfig.kt
+1
-1
HttpParamsUtils.kt
...n/src/main/java/com/yidian/common/http/HttpParamsUtils.kt
+1
-1
GetKSYunTokenBean.kt
...enghuoquan/newscontent/http/httpbean/GetKSYunTokenBean.kt
+1
-1
Ks3Core.kt
...java/com/yidian/shenghuoquan/newscontent/utils/Ks3Core.kt
+1
-3
No files found.
CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
View file @
73e13026
...
@@ -6,6 +6,7 @@ class AppConfig {
...
@@ -6,6 +6,7 @@ class AppConfig {
const
val
KUANGSHI_ALIVE_API_KEY
=
"32f9XIsReV4S15Ck_Sa3ky43XgAHUB9v"
const
val
KUANGSHI_ALIVE_API_KEY
=
"32f9XIsReV4S15Ck_Sa3ky43XgAHUB9v"
const
val
KUANGSHI_SECRET
=
"usZbQYdI4PQeXhMftsRfHK2msj0DmSIl"
const
val
KUANGSHI_SECRET
=
"usZbQYdI4PQeXhMftsRfHK2msj0DmSIl"
const
val
appid
=
"merchant-b"
//地铁项目
//地铁项目
...
@@ -18,7 +19,6 @@ class AppConfig {
...
@@ -18,7 +19,6 @@ class AppConfig {
const
val
SinaCallBackUrl
=
"https://api.weibo.com/oauth2/default.html"
const
val
SinaCallBackUrl
=
"https://api.weibo.com/oauth2/default.html"
const
val
FileProvider
=
"com.yidian.subway.provider"
const
val
FileProvider
=
"com.yidian.subway.provider"
const
val
appid
=
"metro"
const
val
cv
=
"1.0.0.7"
const
val
cv
=
"1.0.0.7"
const
val
version
=
"000100"
const
val
version
=
"000100"
const
val
distribution
=
"official"
const
val
distribution
=
"official"
...
...
CommonLib/Common/src/main/java/com/yidian/common/http/HttpParamsUtils.kt
View file @
73e13026
...
@@ -12,7 +12,7 @@ class HttpParamsUtils{
...
@@ -12,7 +12,7 @@ class HttpParamsUtils{
val
networkType
=
NetWorkUtils
.
getNetWorkType
(
YdBaseApplication
.
context
)
val
networkType
=
NetWorkUtils
.
getNetWorkType
(
YdBaseApplication
.
context
)
val
timeStamp
=
System
.
currentTimeMillis
()
val
timeStamp
=
System
.
currentTimeMillis
()
val
queryParamsMap
=
HashMap
<
String
,
String
>()
val
queryParamsMap
=
HashMap
<
String
,
String
>()
//
queryParamsMap["appid"] = AppConfig.appid
queryParamsMap
[
"appid"
]
=
AppConfig
.
appid
// queryParamsMap["cv"] = AppConfig.cv
// queryParamsMap["cv"] = AppConfig.cv
// queryParamsMap["version"] = AppConfig.version
// queryParamsMap["version"] = AppConfig.version
// queryParamsMap["distribution"] = AppConfig.distribution
// queryParamsMap["distribution"] = AppConfig.distribution
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/GetKSYunTokenBean.kt
View file @
73e13026
package
com.yidian.shenghuoquan.newscontent.http.httpbean
package
com.yidian.shenghuoquan.newscontent.http.httpbean
class
GetKSYunTokenBean
(
val
request
:
Request
,
val
response
:
Response
)
{
class
GetKSYunTokenBean
(
val
request
:
Request
,
val
response
:
Response
)
{
data class
Request
(
val
appid
:
String
,
val
tok
:
String
?)
data class
Request
(
val
tok
:
String
?)
data class
Response
(
val
token
:
String
)
data class
Response
(
val
token
:
String
)
}
}
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/Ks3Core.kt
View file @
73e13026
...
@@ -39,7 +39,6 @@ class Ks3Core private constructor() : AuthListener {
...
@@ -39,7 +39,6 @@ class Ks3Core private constructor() : AuthListener {
const
val
END_POINT
=
"ks3-cn-beijing.ksyun.com"
const
val
END_POINT
=
"ks3-cn-beijing.ksyun.com"
const
val
VIDEO_SUFFIX
=
".mp4"
const
val
VIDEO_SUFFIX
=
".mp4"
const
val
IMAGE_SUFFIX
=
".png"
const
val
IMAGE_SUFFIX
=
".png"
const
val
KSYUN_TOKEN_APPID
=
"merchant-b"
val
instance
:
Ks3Core
by
lazy
(
mode
=
LazyThreadSafetyMode
.
SYNCHRONIZED
)
{
val
instance
:
Ks3Core
by
lazy
(
mode
=
LazyThreadSafetyMode
.
SYNCHRONIZED
)
{
Ks3Core
()
Ks3Core
()
}
}
...
@@ -196,8 +195,7 @@ class Ks3Core private constructor() : AuthListener {
...
@@ -196,8 +195,7 @@ class Ks3Core private constructor() : AuthListener {
)
)
)
)
)
)
return
ApiService
.
getKSYunToken
(
GetKSYunTokenBean
.
Request
(
KSYUN_TOKEN_APPID
,
tok
))
return
ApiService
.
getKSYunToken
(
GetKSYunTokenBean
.
Request
(
tok
))
?.
result
?.
token
?.
result
?.
token
}
}
fun
addOnKs3UploadListener
(
listener
:
OnKs3UploadListener
)
{
fun
addOnKs3UploadListener
(
listener
:
OnKs3UploadListener
)
{
...
...
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