Commit 73e13026 authored by yinjiacheng's avatar yinjiacheng

add 服务端接口加appid公共参数

parent 2893fd7b
...@@ -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"
......
...@@ -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
......
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)
} }
......
...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment