有课日期显示和状态

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>KulexiuForTeacher.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>22</integer>
 		</dict>
 	</dict>
 </dict>

KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -87,34 +87,18 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "E0C1263F-8FA9-46A8-BB40-062478B36981"
-            shouldBeEnabled = "Yes"
+            uuid = "B2934566-7B5F-48F1-96D1-35F84C376825"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "KulexiuForTeacher/Common/ThirdPart/FSCalendar/FSCalendarCell.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "270"
-            endingLineNumber = "270"
+            startingLineNumber = "257"
+            endingLineNumber = "257"
             landmarkName = "-colorForCurrentStateInDictionary:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "080FF14A-F403-4423-AA87-DBB74590AE5E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Common/ThirdPart/FSCalendar/FSCalendar.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1417"
-            endingLineNumber = "1417"
-            landmarkName = "-reloadDataForCell:atIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KulexiuForTeacher/KulexiuForTeacher/Common/ThirdPart/FSCalendar/FSCalendarAppearance.h

@@ -127,7 +127,10 @@ typedef NS_OPTIONS(NSUInteger, FSCalendarCaseOptions) {
  * highlight day text color
  */
 @property (strong, nonatomic) UIColor *titleHightlightColor;
-
+/**
+ * highlight background  color
+ */
+@property (strong, nonatomic) UIColor *backgoundHightlightColor;
 /**
  * The day text color for today in the calendar.
  */

KulexiuForTeacher/KulexiuForTeacher/Common/ThirdPart/FSCalendar/FSCalendarAppearance.m

@@ -47,6 +47,7 @@
         _backgroundColors[@(FSCalendarCellStateDisabled)]    = [UIColor clearColor];
         _backgroundColors[@(FSCalendarCellStatePlaceholder)] = [UIColor clearColor];
         _backgroundColors[@(FSCalendarCellStateToday)]       = FSCalendarStandardTodayColor;
+        _backgroundColors[@(FSCalendarCellStateHightlight)] = [UIColor clearColor];
         
         _titleColors = [NSMutableDictionary dictionaryWithCapacity:5];
         _titleColors[@(FSCalendarCellStateNormal)]      = [UIColor blackColor];
@@ -54,6 +55,7 @@
         _titleColors[@(FSCalendarCellStateDisabled)]    = [UIColor grayColor];
         _titleColors[@(FSCalendarCellStatePlaceholder)] = [UIColor lightGrayColor];
         _titleColors[@(FSCalendarCellStateToday)]       = [UIColor whiteColor];
+        _titleColors[@(FSCalendarCellStateHightlight)]  = [UIColor whiteColor];
         
         _subtitleColors = [NSMutableDictionary dictionaryWithCapacity:5];
         _subtitleColors[@(FSCalendarCellStateNormal)]      = [UIColor darkGrayColor];
@@ -186,6 +188,19 @@
     return _titleColors[@(FSCalendarCellStateHightlight)];
 }
 
+- (void)setBackgoundHightlightColor:(UIColor *)backgoundHightlightColor {
+    if (backgoundHightlightColor) {
+        _backgroundColors[@(FSCalendarCellStateHightlight)] = backgoundHightlightColor;
+    } else {
+        [_backgroundColors removeObjectForKey:@(FSCalendarCellStateHightlight)];
+    }
+    [self.calendar configureAppearance];
+}
+
+- (UIColor *)backgoundHightlightColor {
+    return _backgroundColors[@(FSCalendarCellStateHightlight)];
+}
+
 - (void)setTitleTodayColor:(UIColor *)color
 {
     if (color) {

KulexiuForTeacher/KulexiuForTeacher/Common/ThirdPart/FSCalendar/FSCalendarCell.m

@@ -285,6 +285,9 @@
     if (self.selected) {
         return self.preferredFillSelectionColor ?: [self colorForCurrentStateInDictionary:_appearance.backgroundColors];
     }
+    if (!self.dateIsToday && _isHightlight) {
+        return _appearance.backgroundColors[@(FSCalendarCellStateHightlight)];
+    }
     return self.preferredFillDefaultColor ?: [self colorForCurrentStateInDictionary:_appearance.backgroundColors];
 }
 
@@ -296,9 +299,6 @@
     if (!self.dateIsToday && _isHightlight) {
         return _appearance.titleColors[@(FSCalendarCellStateHightlight)];
     }
-    else if (!self.dateIsToday && _isHightlight == NO) {
-        return _appearance.titleColors[@(FSCalendarCellStateNormal)];
-    }
     else {
         return self.preferredTitleDefaultColor ?: [self colorForCurrentStateInDictionary:_appearance.titleColors];
 

KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m

@@ -46,6 +46,7 @@
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES;
     [self configUI];
+    [self loadCalendarInfo];
 }
 
 - (void)loadCalendarInfo {
@@ -154,6 +155,9 @@
     [self.calendar setScope:selectedScope animated:YES];
     NSString *imgName = selectedScope == FSCalendarScopeWeek ? @"arrow_down" : @"arrow_up";
     [self.calendarBottom.arrowImage setImage:[UIImage imageNamed:imgName]];
+#warning ---- 测试有课日期
+    self.calendar.highlightDates = [NSMutableArray arrayWithArray:@[@"2022-04-12 00:00:00",@"2022-04-15 00:00:00"]];
+    [self.calendar reloadData];
 }
 
 - (void)configCalendar {
@@ -169,9 +173,10 @@
     self.calendar.appearance.todaySelectionColor = THEMECOLOR;
     self.calendar.appearance.todayColor = [UIColor whiteColor];
     self.calendar.appearance.todayBorderColor = [UIColor whiteColor];
-    self.calendar.appearance.borderRadius = 0.1f;
+    self.calendar.appearance.borderRadius = 0.2f;
     self.calendar.appearance.borderDefaultColor = [UIColor whiteColor];
     self.calendar.appearance.titleHightlightColor = HexRGB(0x444444);
+    self.calendar.appearance.backgoundHightlightColor = HexRGB(0xffd7a6);
     self.calendar.appearance.subtitleFont = [UIFont systemFontOfSize:10.0f];
     self.calendar.appearance.subtitleOffset = CGPointMake(0, 3);
     self.calendar.appearance.subtitleTodayColor = HexRGB(0xff6363);
@@ -190,13 +195,15 @@
 }
 #pragma mark - FSCalendarDataSource
 - (NSString *)calendar:(FSCalendar *)calendar subtitleForDate:(NSDate *)date {
-//    if (calendar.highlightDates) {
-//        <#statements#>
-//    }
     // 判断有课的日期显示subtitle
-    return @"有课";
+    if ([calendar.highlightDates containsObject:date]) {
+        return @"有课";
+    }
+    return nil;
+    
     
 }
+
 #pragma mark - FSCalendarDelegate
 - (void)calendar:(FSCalendar *)calendar boundingRectWillChange:(CGRect)bounds animated:(BOOL)animated
 {

KulexiuForTeacher/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,132 +7,132 @@
 		<key>AFNetworking.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>26</integer>
 		</dict>
 		<key>Bugly.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>1</integer>
 		</dict>
 		<key>IQKeyboardManager.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>15</integer>
 		</dict>
 		<key>JCore.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>16</integer>
 		</dict>
 		<key>JPush.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>9</integer>
 		</dict>
 		<key>JXCategoryView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>21</integer>
 		</dict>
 		<key>JXPagingView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>2</integer>
 		</dict>
 		<key>MBProgressHUD.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>14</integer>
 		</dict>
 		<key>MJExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>20</integer>
 		</dict>
 		<key>MJRefresh.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>12</integer>
 		</dict>
 		<key>Masonry.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>7</integer>
 		</dict>
 		<key>Pods-KulexiuForTeacher.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>17</integer>
 		</dict>
 		<key>RSKImageCropper.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>10</integer>
 		</dict>
 		<key>Reachability.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>19</integer>
 		</dict>
 		<key>RongCloudIM.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>5</integer>
 		</dict>
 		<key>RongCloudRTC.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>11</integer>
 		</dict>
 		<key>SDWebImage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>25</integer>
 		</dict>
 		<key>SSZipArchive.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>6</integer>
 		</dict>
 		<key>SocketRocket.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>18</integer>
 		</dict>
 		<key>UMAPM.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>0</integer>
 		</dict>
 		<key>UMCommon.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>8</integer>
 		</dict>
 		<key>UMDevice.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>4</integer>
 		</dict>
 		<key>Whiteboard-Whiteboard.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>23</integer>
 		</dict>
 		<key>Whiteboard.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>13</integer>
 		</dict>
 		<key>YYModel.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>3</integer>
 		</dict>
 		<key>dsBridge.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>24</integer>
 		</dict>
 	</dict>
 </dict>