From 7eabb1098c09fad079d2f2c28bb234b583a7b299 Mon Sep 17 00:00:00 2001 From: leafwai Date: Wed, 23 Mar 2022 17:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20SonarQube=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/databind/BindingAdapters.java | 2 +- .../com/gh/gamecenter/servers/add/AddKaiFuActivity.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 19fc45a56e..378758e7e4 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -122,7 +122,7 @@ public class BindingAdapters { for (int i = 0; i < list.size() + 1; i++) { // 1 is Title View inflate = LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_detail_item_row, null); KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate); - binding.getRoot().setBackgroundColor(isReadyPatch ? ExtensionsKt.toColor(R.color.theme) : ExtensionsKt.toColor(R.color.white)); + binding.getRoot().setBackgroundColor(isReadyPatch != null && isReadyPatch ? ExtensionsKt.toColor(R.color.theme) : ExtensionsKt.toColor(R.color.white)); binding.getRoot().setPadding(DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), i == list.size() ? DisplayUtils.dip2px(1) : 0); ServerCalendarEntity serverEntity = list.get(i - 1); binding.timeTv.setText(i == 0 ? "时间" : serverEntity.getFormatTime("HH:mm")); diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt index 8d23b95b2b..851cf29c64 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt @@ -92,8 +92,13 @@ class AddKaiFuActivity : ToolBarActivity() { } else if (view.id == R.id.kaifu_add_time) { showDataPicker { data: Date?, _ -> run { - data?.minutes = mPickerMinutes[data?.minutes ?: 0] - mViewModel?.calendarList!![position].setTime(if (data == null) 0 else data.time / 1000) + if (data == null) { + mViewModel?.calendarList!![position].setTime(0) + } else { + val cal = Calendar.getInstance().apply { time = data } + cal.set(Calendar.MINUTE, mPickerMinutes[cal.get(Calendar.MINUTE)]) + mViewModel?.calendarList!![position].setTime(cal.time.time / 1000) + } } } }