1.1.5

feature-修改可选日期范围
wxw-9527 · Dec 28, 2022 · 9d1dc76 · 9d1dc76
1 parent a55b7b4
commit 9d1dc76
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git 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'
 }
 ```
diff --git 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
@@ -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()
-            }
         }
     }