1281228557
/
flutter_custom_calendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

创建configuration类，将配置的信息放到这里

Browse Source 
引入provider状态管理,避免深层嵌套传递信息
周视图和月视图，联动
增加日志输出类LogUtil，方便查看调试
增加example例子
性能优化
develop
xiaodong 5 years ago
parent 6d9d752d16
commit d0da3b9e90
6 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File

1
README.md
Unescape View File

@ -315,3 +315,4 @@ bool operator ==(Object other)|重写==方法，可以判断两个dateModel是
* 优化代码实现
* 继续写几个不同风格的Demo
* 支持手势操作
* 实现高度自适应

1
example/lib/main.dart
Unescape View File

@ -10,6 +10,7 @@ import 'progress_style_page.dart';
void main() {
// debugProfileBuildsEnabled=true;
// debugProfilePaintsEnabled=true;
// debugPrintRebuildDirtyWidgets=true;
runApp(MyApp());
}

13
lib/calendar_provider.dart
Unescape View File

@ -13,12 +13,23 @@ import 'package:flutter_custom_calendar/widget/month_view.dart';
* 目前的情况：只需要获取状态，不需要监听rebuild
*/
class CalendarProvider extends ChangeNotifier {
double _totalHeight; //当前月视图的整体高度
Set<DateModel> selectedDateList = new Set(); //被选中的日期,用于多选
DateModel _selectDateModel; //当前选中的日期，用于单选
ItemContainerState lastClickItemState;
DateModel _lastClickDateModel;
double get totalHeight => _totalHeight;
set totalHeight(double value) {
_totalHeight = value;
}
changeTotalHeight(double value) {
_totalHeight = value;
notifyListeners();
}
DateModel get lastClickDateModel =>
_lastClickDateModel; //保存最后点击的一个日期，用于周视图与月视图之间的切换和同步

8
lib/controller.dart
Unescape View File

@ -158,8 +158,8 @@ class CalendarController {
dateTime = dateTime.add(Duration(days: 7))) {
DateModel dateModel = DateModel.fromDateTime(dateTime);
weekList.add(dateModel);
print("nowTime.isBefore(dateTime)");
print("$nowTime,,,,$dateTime");
// print("nowTime.isBefore(dateTime)");
// print("$nowTime,,,,$dateTime");
if (nowTime.isAfter(dateTime)) {
temp++;
@ -230,7 +230,7 @@ class CalendarController {
calendarProvider.calendarConfiguration.monthController
.previousPage(duration: DEFAULT_DURATION, curve: Curves.ease);
calendarProvider.calendarConfiguration.monthChange(
monthList[currentIndex].year, monthList[currentIndex].month);
monthList[currentIndex-1].year, monthList[currentIndex-1].month);
DateModel temp = new DateModel();
temp.year = monthList[currentIndex].year;
temp.month = monthList[currentIndex].month;
@ -268,7 +268,7 @@ class CalendarController {
calendarProvider.calendarConfiguration.monthController
.nextPage(duration: DEFAULT_DURATION, curve: Curves.ease);
calendarProvider.calendarConfiguration.monthChange(
monthList[currentIndex].year, monthList[currentIndex].month);
monthList[currentIndex+1].year, monthList[currentIndex+1].month);
DateModel temp = new DateModel();
temp.year = monthList[currentIndex].year;
temp.month = monthList[currentIndex].month;

49
lib/widget/calendar_view.dart
Unescape View File

@ -124,27 +124,36 @@ class CalendarContainerState extends State<CalendarContainer>
});
}
widget.calendarController.addMonthChangeListener((year, month) {
if (widget.calendarController.calendarProvider.calendarConfiguration
.showMode !=
Constants.MODE_SHOW_ONLY_WEEK) {
//月份切换的时候，如果高度发生变化的话，需要setState使高度整体自适应
int lineCount = DateUtil.getMonthViewLineCount(year, month);
double newHeight = itemHeight * lineCount +
calendarProvider.calendarConfiguration.verticalSpacing *
(lineCount - 1);
if (totalHeight.toInt() != newHeight.toInt()) {
LogUtil.log(
TAG: this.runtimeType,
message: "totalHeight:$totalHeight,newHeight:$newHeight");
LogUtil.log(TAG: this.runtimeType, message: "月份视图高度发生变化");
setState(() {
totalHeight = newHeight;
});
}
// widget.calendarController.addMonthChangeListener((year, month) {
// if (widget.calendarController.calendarProvider.calendarConfiguration
// .showMode !=
// Constants.MODE_SHOW_ONLY_WEEK) {
// //月份切换的时候，如果高度发生变化的话，需要setState使高度整体自适应
// int lineCount = DateUtil.getMonthViewLineCount(year, month);
// double newHeight = itemHeight * lineCount +
// calendarProvider.calendarConfiguration.verticalSpacing *
// (lineCount - 1);
// if (totalHeight.toInt() != newHeight.toInt()) {
// LogUtil.log(
// TAG: this.runtimeType,
// message: "totalHeight:$totalHeight,newHeight:$newHeight");
//
// LogUtil.log(TAG: this.runtimeType, message: "月份视图高度发生变化");
// setState(() {
// totalHeight = newHeight;
// });
// }
// }
// });
//暂时先这样写死,提前计算布局的高度,不然会出现问题:a horizontal viewport was given an unlimited amount of I/flutter ( 6759): vertical space in which to expand.
itemHeight = calendarProvider.calendarConfiguration.itemSize ??
MediaQueryData.fromWindow(WidgetsBinding.instance.window).size.width /
7;
if (calendarProvider.totalHeight == null) {
calendarProvider.totalHeight = itemHeight * 6 +
calendarProvider.calendarConfiguration.verticalSpacing * (6 - 1);
}
});
}
@override

34
lib/widget/month_view_pager.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_calendar/calendar_provider.dart';
import 'package:flutter_custom_calendar/configuration.dart';
import 'package:flutter_custom_calendar/constants/constants.dart';
import 'package:flutter_custom_calendar/model/date_model.dart';
import 'package:flutter_custom_calendar/utils/LogUtil.dart';
import 'package:flutter_custom_calendar/utils/date_util.dart';
@ -17,10 +18,6 @@ class MonthViewPager extends StatefulWidget {
class _MonthViewPagerState extends State<MonthViewPager> {
CalendarProvider calendarProvider;
var totalHeight;
// PageController newPageController;
@override
void initState() {
LogUtil.log(TAG: this.runtimeType, message: "MonthViewPager initState");
@ -84,19 +81,22 @@ class _MonthViewPagerState extends State<MonthViewPager> {
}
//计算下高度，使PageView自适应高度
// double itemHeight = MediaQuery.of(context).size.width / 7;
//
// int lineCount =
// DateUtil.getMonthViewLineCount(dateModel.year, dateModel.month);
// double newHeight = itemHeight * lineCount +
// configuration.verticalSpacing * (lineCount - 1);
// if(totalHeight!=newHeight){
// totalHeight=newHeight;
// setState(() {
//
// });
// }
if (calendarProvider.calendarConfiguration.showMode !=
Constants.MODE_SHOW_ONLY_WEEK) {
//月份切换的时候，如果高度发生变化的话，需要setState使高度整体自适应
int lineCount =
DateUtil.getMonthViewLineCount(dateModel.year, dateModel.month);
double newHeight = (calendarProvider.calendarConfiguration.itemSize ??
MediaQuery.of(context).size.width / 7) *
lineCount +
calendarProvider.calendarConfiguration.verticalSpacing *
(lineCount - 1);
if (calendarProvider.totalHeight.toInt() != newHeight.toInt()) {
LogUtil.log(TAG: this.runtimeType, message: "月份视图高度发生变化");
calendarProvider.totalHeight = newHeight;
// calendarProvider.changeTotalHeight(newHeight);
}
}
},
controller: configuration.monthController,
itemBuilder: (context, index) {

Write Preview
Loading…
Cancel
Save