diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt
index 6e4154b1f7..4c3659efe3 100644
--- a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt
@@ -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)
}
})
diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt
index 2846911ac2..1baf7a4ab4 100644
--- a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuViewModel.kt
@@ -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 {
diff --git a/app/src/main/res/layout/activity_kaifu_patch.xml b/app/src/main/res/layout/activity_kaifu_patch.xml
index e830f15f6d..2a0aed0b21 100644
--- a/app/src/main/res/layout/activity_kaifu_patch.xml
+++ b/app/src/main/res/layout/activity_kaifu_patch.xml
@@ -114,6 +114,7 @@