Skip to content

Commit 955a3c4

Browse files
committed
oem 版本的 http 请求取消包名的参数
Change-Id: Ia36cb5722221243d21b890d5d230160fbe4ffe9a
1 parent c8c8bb7 commit 955a3c4

File tree

1 file changed

+9
-3
lines changed
  • app/src/main/java/com/tencent/iot/explorer/link/kitlink/util

1 file changed

+9
-3
lines changed

app/src/main/java/com/tencent/iot/explorer/link/kitlink/util/HttpRequest.kt

+9-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class HttpRequest private constructor() {
6060
val param = HashMap<String, Any>()
6161
param["lang"] = Utils.getLang()
6262
param["Platform"] = "android"
63-
param["AppID"] = T.getContext().applicationInfo.packageName
63+
// param["AppID"] = T.getContext().applicationInfo.packageName
6464
return param
6565
}
6666

@@ -160,20 +160,22 @@ class HttpRequest private constructor() {
160160
* 登录后请求
161161
*/
162162
private fun tokenPost(param: HashMap<String, Any>, callback: MyCallback, reqCode: Int) {
163-
val json = JsonManager.toJson(param)
164163
if (TextUtils.isEmpty(App.data.getToken())) {//登录过期或未登录
165164
App.toLogin()
166165
return
167166
}
168167
val api:String
169168
val host:String
170169
if (!App.isOEMApp()) {// 公版&开源版
170+
param["AppID"] = T.getContext().applicationInfo.packageName
171171
host = STUDIO_BASE_URL_FOR_LOGINED
172172
api = "?uin=$ANDROID_ID"
173173
} else {// OEM版
174174
host = OEM_TOKEN_API
175175
api = ""
176176
}
177+
val json = JsonManager.toJson(param)
178+
177179
StringRequest.instance.postJson(host, api, json, object : Callback {
178180
override fun fail(msg: String?, reqCode: Int) {
179181
callback.fail(msg, reqCode)
@@ -208,6 +210,9 @@ class HttpRequest private constructor() {
208210
* 登录后请求
209211
*/
210212
private fun tokenAppCosAuth(param: HashMap<String, Any>, callback: MyCallback, reqCode: Int) {
213+
if (!App.isOEMApp()) {// 公版&开源版
214+
param["AppID"] = T.getContext().applicationInfo.packageName
215+
}
211216
val json = JsonManager.toJson(param)
212217
if (TextUtils.isEmpty(App.data.getToken())) {//登录过期或未登录
213218
App.toLogin()
@@ -233,7 +238,6 @@ class HttpRequest private constructor() {
233238
* 登录后请求
234239
*/
235240
private fun getH5tokenPost(param: HashMap<String, Any>, callback: MyCallback, reqCode: Int) {
236-
val json = JsonManager.toJson(param)
237241
if (TextUtils.isEmpty(App.data.getToken())) {//登录过期或未登录
238242
App.toLogin()
239243
return
@@ -242,12 +246,14 @@ class HttpRequest private constructor() {
242246
val api: String
243247
val host: String
244248
if (!App.isOEMApp()) {// 公版&开源版
249+
param["AppID"] = T.getContext().applicationInfo.packageName
245250
host = STUDIO_BASE_URL_FOR_LOGINED
246251
api = "?uin=$ANDROID_ID"
247252
} else {// OEM版
248253
host = OEM_TOKEN_API
249254
api = ""
250255
}
256+
val json = JsonManager.toJson(param)
251257

252258
StringRequest.instance.postJson(host, api, json, object : Callback {
253259
override fun fail(msg: String?, reqCode: Int) {

0 commit comments

Comments
 (0)