Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 bindPhone 相关接口 toRequestBody 时没有附带正确 body 的问题; 还原原生 settings 实现

Browse Source
This commit is contained in:
chenjuntao
2025-01-06 15:50:38 +08:00
parent d4bb3835cf
commit a5ca88729a
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -447,14 +447,14 @@ dependencies {
exclude group: 'androidx.swiperefreshlayout'
}
// implementation(project(':module_setting')) {
implementation(project(':module_setting')) {
exclude group: 'androidx.swiperefreshlayout'
}
// implementation(project(':module_setting_compose')) {
// exclude group: 'androidx.swiperefreshlayout'
// }
implementation(project(':module_setting_compose')) {
exclude group: 'androidx.swiperefreshlayout'
}
if (!gradle.ext.excludeOptionalModules || gradle.ext.enablePkg) {
implementation(project(':feature:pkg'))
}

10
module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/viewmodel/ComposeBindPhoneViewModel.kt
View File

@ -16,7 +16,9 @@ import com.gh.gamecenter.setting.compose.retrofit.RetrofitManager
import com.lightgame.utils.Utils
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.RequestBody
import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.ResponseBody
import org.json.JSONObject
import retrofit2.HttpException
@ -37,7 +39,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app
params["mobile"] = phoneNum
val jsonObject = JSONObject(params as Map<*, *>)
jsonObject.put("device", device)
val body: RequestBody = APPLICATION_JSON.toRequestBody()
val body: RequestBody = jsonObject.toString().toRequestBody(APPLICATION_JSON.toMediaTypeOrNull())
api.bindPhone(1, body)
.subscribeOn(Schedulers.io())
@ -88,7 +90,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app
}
val jsonObject = JSONObject(params as Map<*, *>)
jsonObject.put("device", device)
val body: RequestBody = APPLICATION_JSON.toRequestBody()
val body: RequestBody = jsonObject.toString().toRequestBody(APPLICATION_JSON.toMediaTypeOrNull())
api.bindPhone(2, body)
.subscribeOn(Schedulers.io())
@ -132,7 +134,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app
params["mobile"] = phoneNum
val jsonObject = JSONObject(params as Map<*, *>)
jsonObject.put("device", device)
val body: RequestBody = APPLICATION_JSON.toRequestBody()
val body: RequestBody = jsonObject.toString().toRequestBody(APPLICATION_JSON.toMediaTypeOrNull())
api.reBindPhone(1, body)
.subscribeOn(Schedulers.io())
@ -184,7 +186,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app
}
val jsonObject = JSONObject(params as Map<*, *>)
jsonObject.put("device", device)
val body: RequestBody = APPLICATION_JSON.toRequestBody()
val body: RequestBody = jsonObject.toString().toRequestBody(APPLICATION_JSON.toMediaTypeOrNull())
api.reBindPhone(2, body)
.subscribeOn(Schedulers.io())

4
settings.gradle
View File

@ -25,8 +25,8 @@ def coreModules = [
':module_core',
':module_common',
':module_login',
// ':module_setting',
':module_setting_compose',
':module_setting',
// ':module_setting_compose',
':ndownload',
':module_core_feature',
':libraries:LGLibrary',