xt / Flutter-ReserveApp · Commits

Go to a project

Commit d38be8ef667b8fc96c9d000914d70380c0e6125b

Authored by “gaiyaguang”
2 parents 43956577 3b27d23d

合并

Inline Side-by-side
Showing 4 changed files with 15 additions and 37 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "150" 14 +def flutterVersionCode = "152"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '150' 16 + flutterVersionCode = '152'
17 } 17 }
18 18
19 -def flutterVersionName = "1.5.0" 19 +def flutterVersionName = "1.5.2"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '1.5.0' 21 + flutterVersionName = '1.5.2'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -34,7 +34,7 @@ Future<void> main() async { @@ -34,7 +34,7 @@ Future<void> main() async {
34 Routes.configureRoutes(router); 34 Routes.configureRoutes(router);
35 App.router = router; 35 App.router = router;
36 App.setupLocator(); 36 App.setupLocator();
37 - LogUtil.init(isDebug: true, tag: 'ONE_KEY'); 37 + LogUtil.init(isDebug: false, tag: 'ONE_KEY');
38 Provider.debugCheckInvalidValueType = null; 38 Provider.debugCheckInvalidValueType = null;
39 await initializeDateFormatting(); 39 await initializeDateFormatting();
40 Utils.changeStatusColor(); 40 Utils.changeStatusColor();
@@ -145,13 +145,8 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -145,13 +145,8 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
145 if (j == 145 if (j ==
146 _notebookDetailChangeModel.dateList.length - 1) { 146 _notebookDetailChangeModel.dateList.length - 1) {
147 String selectStr = 147 String selectStr =
148 - _notebookDetailChangeModel.dateList[2]['title'];  
149 - String timeNow = DateUtil.formatDate(  
150 - DateTime.now(),  
151 - );  
152 - String selectDate =  
153 - timeNow.replaceRange(5, 10, selectStr);  
154 - _calendWidget(DateUtil.getDateTime(selectDate)); 148 + _notebookDetailChangeModel.dateList[2]['title']+" 00:00:00";
  149 + _calendWidget(DateUtil.getDateTime(selectStr));
155 } 150 }
156 } 151 }
157 } 152 }
@@ -312,7 +307,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -312,7 +307,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
312 // _createDateText(day); 307 // _createDateText(day);
313 dateTime = day; 308 dateTime = day;
314 int dateTimeMill = day.millisecondsSinceEpoch; 309 int dateTimeMill = day.millisecondsSinceEpoch;
315 - String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'MM-dd'); 310 + String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'yyyy-MM-dd');
316 bool isThird = true; 311 bool isThird = true;
317 for (int i = 0; i < _notebookDetailChangeModel.dateList.length; i++) { 312 for (int i = 0; i < _notebookDetailChangeModel.dateList.length; i++) {
318 _notebookDetailChangeModel.dateList[i]['select'] = false; 313 _notebookDetailChangeModel.dateList[i]['select'] = false;
@@ -356,17 +351,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -356,17 +351,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
356 InkWell( 351 InkWell(
357 onTap: () async { 352 onTap: () async {
358 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 353 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
359 - //当前选中 月 日string  
360 - String mdStr = ''; 354 + String ymyStr = ""; //年月日
361 //今天 明天 其他天 355 //今天 明天 其他天
362 for (var item in _notebookDetailChangeModel.dateList) { 356 for (var item in _notebookDetailChangeModel.dateList) {
363 if (item['select'] == true) { 357 if (item['select'] == true) {
364 - mdStr = item['title']; 358 + ymyStr = item['title'];
365 } 359 }
366 } 360 }
367 - String timeNowYear =  
368 - DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
369 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
370 String timeStr = ymyStr + ' ' + "00:00:00"; 361 String timeStr = ymyStr + ' ' + "00:00:00";
371 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳 362 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
372 String ddateSolt = ''; 363 String ddateSolt = '';
@@ -691,18 +682,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -691,18 +682,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
691 tempMndList = _notebookDetailChangeModel.dailyMap[key]; 682 tempMndList = _notebookDetailChangeModel.dailyMap[key];
692 } 683 }
693 } 684 }
694 - //计算行数  
695 -  
696 - int line = 0;  
697 - int count = tempMndList.length;  
698 - if (count % 3 == 0) {  
699 - line = int.parse('${count / 3}');  
700 - } else {  
701 - line = (count / 3).ceil();  
702 - }  
703 - int height = 85 + 40 + 36 * line + (line - 1) * 15;  
704 final option = await showModalBottomSheet( 685 final option = await showModalBottomSheet(
705 context: context, 686 context: context,
  687 + isScrollControlled: true,
706 backgroundColor: Colors.white, 688 backgroundColor: Colors.white,
707 builder: (context) { 689 builder: (context) {
708 return StatefulBuilder(builder: (context, state) { 690 return StatefulBuilder(builder: (context, state) {
@@ -711,8 +693,8 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -711,8 +693,8 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
711 decoration: BoxDecoration( 693 decoration: BoxDecoration(
712 borderRadius: 694 borderRadius:
713 BorderRadius.circular(ScreenUtil().setWidth(10))), 695 BorderRadius.circular(ScreenUtil().setWidth(10))),
714 - height: ScreenUtil().setWidth(height * 2),  
715 child: Column( 696 child: Column(
  697 + mainAxisSize: MainAxisSize.min,
716 children: [ 698 children: [
717 InkWell( 699 InkWell(
718 onTap: () { 700 onTap: () {
@@ -741,10 +723,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -741,10 +723,9 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
741 fontWeight: FontWeight.bold, 723 fontWeight: FontWeight.bold,
742 color: MyColours.color_353535)), 724 color: MyColours.color_353535)),
743 ), 725 ),
744 - VEmptyView(40),  
745 Padding( 726 Padding(
746 padding: EdgeInsets.symmetric( 727 padding: EdgeInsets.symmetric(
747 - horizontal: ScreenUtil().setWidth(60)), 728 + horizontal: ScreenUtil().setWidth(60),vertical: ScreenUtil().setWidth(40)),
748 child: GridView.builder( 729 child: GridView.builder(
749 padding: 730 padding:
750 EdgeInsets.only(top: ScreenUtil().setWidth(20)), 731 EdgeInsets.only(top: ScreenUtil().setWidth(20)),
@@ -163,16 +163,13 @@ class Utils { @@ -163,16 +163,13 @@ class Utils {
163 163
164 /// 获取日期 今天 明天 后天等等 164 /// 获取日期 今天 明天 后天等等
165 static int getDdate(List dateList) { 165 static int getDdate(List dateList) {
166 - //当前选中 月 日string  
167 - String mdStr = ''; 166 + String ymyStr = ""; //年月日
168 //今天 明天 其他天 167 //今天 明天 其他天
169 for (var item in dateList) { 168 for (var item in dateList) {
170 if (item['select'] == true) { 169 if (item['select'] == true) {
171 - mdStr = item['title']; 170 + ymyStr = item['title'];
172 } 171 }
173 } 172 }
174 - String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
175 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
176 String timeStr = ymyStr + ' ' + "00:00:00"; 173 String timeStr = ymyStr + ' ' + "00:00:00";
177 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳 174 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
178 return ddate; 175 return ddate;