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

修改开服解决数据同步问题(一条更改全部发生改变)

Browse Source
This commit is contained in:
kehaoyuan
2018-06-01 11:52:12 +08:00
parent d7833cd07f
commit 7af99a5ed5
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt
View File

@ -41,10 +41,16 @@ class PatchKaifuActivity : BaseActivity() {
if (!mBinding?.deleteBtn?.isChecked!! == !mBinding?.patchBtn?.isChecked!!) {
toast("请选择修改类型")
} else {
val patchName = mBinding?.patchName?.text.toString()
val patchRemark = mBinding?.patchRemark?.text.toString()
if (patchName.isNullOrEmpty()) {
toast("内名字不能为空")
return@setOnClickListener
}
if (mBinding?.patchBtn?.isChecked!!
&& mViewModel?.serverEntity?.getNote() == mViewModel?.originalEntity?.getNote()
&& mViewModel?.serverEntity?.getTime() == mViewModel?.originalEntity?.getTime()
&& mViewModel?.serverEntity?.remark == mViewModel?.originalEntity?.remark) {
&& mViewModel?.serverEntity?.getNote() == patchName
&& mViewModel?.serverEntity?.remark == patchRemark) {
toast("内容没有变化，不能提交")
return@setOnClickListener
}
@ -52,7 +58,7 @@ class PatchKaifuActivity : BaseActivity() {
, if (mBinding?.patchBtn?.isChecked!!) "确定修改开服信息吗？" else "确定删除开服信息吗？"
, "确定", "返回"
, DialogUtils.ConfirmListener {
mViewModel?.post(mBinding?.patchBtn?.isChecked!!)
mViewModel?.post(mBinding?.patchBtn?.isChecked!!, patchName, patchRemark)
}, null)
}
})

13
app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt
View File

@ -19,24 +19,19 @@ class PatchKaifuViewModel(application: Application) : AndroidViewModel(applicati
var serverEntity: KaiFuCalendarEntity? = null
var originalEntity = KaiFuCalendarEntity()
var gameId: String? = null
fun initData(serverEntity: KaiFuCalendarEntity, gameId: String) {
this.serverEntity = serverEntity
this.gameId = gameId
originalEntity.setTime(serverEntity.getTime())
originalEntity.setNote(serverEntity.getNote())
originalEntity.remark = serverEntity.remark
}
fun post(isPatch: Boolean) {
fun post(isPatch: Boolean, patchName: String, patchRemark: String) {
val observable = if (isPatch) {
val jsonObject = JSONObject()
jsonObject.put("note", serverEntity?.getNote())
jsonObject.put("remark", serverEntity?.remark)
jsonObject.put("note", patchName)
jsonObject.put("remark", patchRemark)
Utils.log("=====1111:::" + jsonObject.toString())
val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
apiService.patchKaifu(body, gameId, serverEntity!!.id)
} else {