From e3b1e9aa764411e7a8df6c4fa37c4d4caf6d677d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AB=A0=E6=96=87=E8=BD=A9?= <12812285557@qq.com>
Date: Mon, 30 May 2022 10:31:51 +0800
Subject: [PATCH] fix bug

---
 .idea/workspace.xml            | 20 --------------------
 lib/model/date_model.dart      |  2 +-
 lib/utils/solar_term_util.dart | 14 +++++++-------
 lib/widget/month_view.dart     | 11 ++++++++++-
 lib/widget/week_view.dart      |  4 ++++
 5 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6a439a7..a9f4ef5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,31 +10,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="18463f0e-cf10-4ee2-975b-376476396e12" name="Default Changelist" comment="Default Changelist">
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/cache_data.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/cache_data.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/calendar_provider.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/calendar_provider.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/configuration.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/configuration.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/controller.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/model/date_model.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/model/date_model.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/LogUtil.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/LogUtil.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/date_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/date_util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/lunar_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/lunar_util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/math_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/math_util.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/utils/solar_term_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/solar_term_util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/widget/base_day_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/base_day_view.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/widget/base_week_bar.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/base_week_bar.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/widget/calendar_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/calendar_view.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/widget/default_week_bar.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/default_week_bar.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/widget/month_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/month_view.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/widget/month_view_pager.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/month_view_pager.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/widget/only_one_pointer_widget.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/only_one_pointer_widget.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/widget/week_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/week_view.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/widget/week_view_pager.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/week_view_pager.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/lib/model/date_model.dart b/lib/model/date_model.dart
index 05a80ff..326c60a 100644
--- a/lib/model/date_model.dart
+++ b/lib/model/date_model.dart
@@ -37,7 +37,7 @@ class DateModel {
   //公历节日
   String get gregorianFestival {
     String result = LunarUtil.gregorianFestival(month!, day);
-    if (result?.isNotEmpty == true) {
+    if (result.isNotEmpty == true) {
       return result;
     }
     return LunarUtil.getSpecialFestival(year, month!, day);
diff --git a/lib/utils/solar_term_util.dart b/lib/utils/solar_term_util.dart
index 8a91e09..4a36fe9 100644
--- a/lib/utils/solar_term_util.dart
+++ b/lib/utils/solar_term_util.dart
@@ -247,8 +247,8 @@ class SolarTermUtil {
    * @return 公历转儒略日, UTC=1表示原日期是UTC
    */
   static double toJulian(Time time, bool UTC) {
-    double y = time.year!; // 取出年月
-    double m = time.month!;
+    double y = time.year; // 取出年月
+    double m = time.month;
     double n = 0;
 
     if (m <= 2) {
@@ -256,7 +256,7 @@ class SolarTermUtil {
       y--;
     }
 
-    if (time.year! * 372 + time.month! * 31 + time.day >= 588829) {
+    if (time.year * 372 + time.month * 31 + time.day >= 588829) {
 // 判断是否为格里高利历日1582*372+10*31+15
       n = doubleFloor(y / 100);
       n = 2 - n + doubleFloor(n / 4); // 加百年闰
@@ -293,13 +293,13 @@ class SolarTermUtil {
     }
     A += 1524; // 向前移4年零2个月
     time.year = doubleFloor((A - 122.1) / 365.25); // 年
-    D = A - doubleFloor(365.25 * time.year!); // 去除整年日数后余下日数
+    D = A - doubleFloor(365.25 * time.year); // 去除整年日数后余下日数
     time.month = doubleFloor(D / 30.6001); // 月数
-    time.day = D - doubleFloor(time.month! * 30.6001); // 去除整月日数后余下日数
+    time.day = D - doubleFloor(time.month * 30.6001); // 去除整月日数后余下日数
     time.year -= 4716;
     time.month--;
-    if (time.month! > 12) time.month -= 12;
-    if (time.month! <= 2) time.year++;
+    if (time.month > 12) time.month -= 12;
+    if (time.month <= 2) time.year++;
 // 日的小数转为时分秒
     F *= 24;
     time.hour = doubleFloor(F);
diff --git a/lib/widget/month_view.dart b/lib/widget/month_view.dart
index a403f4e..937b46b 100644
--- a/lib/widget/month_view.dart
+++ b/lib/widget/month_view.dart
@@ -137,6 +137,11 @@ class _MonthViewState extends State<MonthView>
                 dateModel.isSelected = false;
               }
               break;
+          /// 单选
+            case null:
+
+              break;
+
           }
 
           return ItemContainer(
@@ -195,7 +200,7 @@ class ItemContainerState extends State<ItemContainer> {
         The following assertion was thrown while handling a gesture:
         setState() called after dispose()
      */
-    v ??= false;
+    // v ??= false;
     if (mounted) {
       setState(() {
         dateModel!.isSelected = v;
@@ -331,6 +336,10 @@ class ItemContainerState extends State<ItemContainer> {
               setState(() {});
             }
 
+            break;
+
+          case null:
+
             break;
         }
 
diff --git a/lib/widget/week_view.dart b/lib/widget/week_view.dart
index 324d1e0..b037700 100644
--- a/lib/widget/week_view.dart
+++ b/lib/widget/week_view.dart
@@ -98,6 +98,10 @@ class _WeekViewState extends State<WeekView> {
                 dateModel.isSelected = false;
               }
               break;
+
+            case null:
+
+              break;
           }
 
           return ItemContainer(