From 9d1dc762dd2592b4e8dce13d275860cd40238c3e Mon Sep 17 00:00:00 2001 From: xingwang Date: Wed, 28 Dec 2022 17:55:31 +0800 Subject: [PATCH] 1.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feature-修改可选日期范围 --- README.md | 2 +- app/build.gradle | 4 ++-- .../rouxinpai/arms/dialog/DateRangeDialog.kt | 18 ++++-------------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ab5c47d..23eeef3 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,6 @@ dependencyResolutionManagement { ```groovy dependencies { - implementation 'com.github.wxw-9527:MvpArms:1.1.2' + implementation 'com.github.wxw-9527:MvpArms:1.1.5' } ``` \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d2765f2..50d2ddd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.rouxinpai.demo" minSdk 21 targetSdk 33 - versionCode 114 - versionName "1.1.4" + versionCode 115 + versionName "1.1.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/arms/src/main/java/com/rouxinpai/arms/dialog/DateRangeDialog.kt b/arms/src/main/java/com/rouxinpai/arms/dialog/DateRangeDialog.kt index 78e0e37..fcf04d2 100644 --- a/arms/src/main/java/com/rouxinpai/arms/dialog/DateRangeDialog.kt +++ b/arms/src/main/java/com/rouxinpai/arms/dialog/DateRangeDialog.kt @@ -59,26 +59,16 @@ class DateRangeDialog( binding.btnClear.setOnClickListener(this) binding.btnCancel.setOnClickListener(this) binding.btnConfirm.setOnClickListener(this) - // 渲染界面 - binding.tvYearMonth.text = getString( - R.string.date_range__year_month, - binding.calendarView.curYear, - binding.calendarView.curMonth - ) - binding.calendarView.setRange( - 2020, 1, 1, - binding.calendarView.curYear, binding.calendarView.curMonth, binding.calendarView.curDay - ) + // 初始化界面 + val year = binding.calendarView.curYear + val month = binding.calendarView.curMonth + binding.tvYearMonth.text = getString(R.string.date_range__year_month, year, month) if (startCalendar != null && endCalendar != null) { binding.calendarView.setSelectStartCalendar(startCalendar) binding.calendarView.setSelectEndCalendar(endCalendar) binding.calendarView.post { binding.calendarView.scrollToSelectCalendar() } - } else { - binding.calendarView.post { - binding.calendarView.scrollToCurrent() - } } }