diff --git a/lib/mock_models/anouncement/anouncement_model.dart b/lib/mock_models/anouncement/anouncement_model.dart deleted file mode 100644 index f651068..0000000 --- a/lib/mock_models/anouncement/anouncement_model.dart +++ /dev/null @@ -1,28 +0,0 @@ -// Flutter imports: - -class AnouncementCardModel { - String title; - String date; - String body; - AnouncementCardModel(this.title, this.date, {this.body}); - - static List initList() { - return [ - AnouncementCardModel( - '关于国庆放假的通知和安排', - '2020-10-22 10:00', - body: ''' -各位同事: -深圳永成物业员工2016年国庆节放假通知如下10月1日至7日放假调休,共7天。10月8日(星期六)上班。调休期间,值班室至少三人,请各级主管自行安排。请将此消息转达给我们所有的同事、客户、供应商和任何有品要迅知的伙伴 - -祝全体员工度过一个欢乐样和的国庆节假日''', - ), - AnouncementCardModel( - '关于国庆放假的通知和安排', - '2020-10-22 10:00', - ), - AnouncementCardModel('关于中秋放假通知与工作安排', '2020-10-22 10:00'), - AnouncementCardModel('疫情期间对大家的表扬和鼓励', '2020-10-22 11:00'), - ]; - } -} diff --git a/lib/models/announce/announcement_detail_model.dart b/lib/models/announce/announcement_detail_model.dart index 965a1c4..f6b86cd 100644 --- a/lib/models/announce/announcement_detail_model.dart +++ b/lib/models/announce/announcement_detail_model.dart @@ -37,4 +37,14 @@ class AnnouncementDetailModel { data['imgUrls'] = this.imgUrls; return data; } + + AnnouncementDetailModel.zero() { + this.content = ''; + this.fileDocName = ''; + this.fileDocUrl = ''; + this.id = -1; + this.imgUrls = []; + this.releaseTime = ''; + this.title = ''; + } } diff --git a/lib/provider/anouncement_provider.dart b/lib/provider/anouncement_provider.dart index e60a339..e416cab 100644 --- a/lib/provider/anouncement_provider.dart +++ b/lib/provider/anouncement_provider.dart @@ -1,14 +1,15 @@ // Flutter imports: +import 'package:aku_community_manager/models/announce/announcement_detail_model.dart'; +import 'package:aku_community_manager/models/announce/announcement_list_model.dart'; import 'package:flutter/material.dart'; // Project imports: -import 'package:aku_community_manager/mock_models/anouncement/anouncement_model.dart'; class AnouncementProvider extends ChangeNotifier { - List _anouncementCardModel = - AnouncementCardModel.initList(); - List get anouncementCardModels => _anouncementCardModel; - addAnouncementCardModel(AnouncementCardModel model) { + List _anouncementCardModel = []; + List get anouncementCardModels => + _anouncementCardModel; + addAnouncementCardModel(AnnouncementListModel model) { _anouncementCardModel.insert(0, model); notifyListeners(); } diff --git a/lib/ui/home/announcement/All_anouncement.dart b/lib/ui/home/announcement/All_anouncement.dart index 2dfdc7f..429d44e 100644 --- a/lib/ui/home/announcement/All_anouncement.dart +++ b/lib/ui/home/announcement/All_anouncement.dart @@ -19,7 +19,6 @@ import 'package:get/get.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; -import 'package:aku_community_manager/mock_models/anouncement/anouncement_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/home/announcement/anouncement_details.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; @@ -44,9 +43,11 @@ class AllAnouncementState extends State { params: {'announcementId': model.id}); AnnouncementDetailModel detailModel = AnnouncementDetailModel.fromJson(baseModel.data); - Get.to(AnouncementDetails( - model: detailModel, - )); + Get.to( + AnouncementDetails( + model: detailModel, + ), + ); }, child: Container( color: Color(0xFFFFFFFF), @@ -116,7 +117,7 @@ class AllAnouncementState extends State { Widget _anouncementList( String date, - List cards, + List cards, ) { return Column( children: [ diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index b04dee0..f1a827b 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -431,10 +431,9 @@ class _HomePageState extends State { height: 172.w, child: Stack(children: [ CarouselSlider( - // items: _anouncementProvider.anouncementCardModels - // .map((e) => AllAnouncementState.anounceCard(e)) - // .toList(), - items: [], + items: _anouncementProvider.anouncementCardModels + .map((e) => AllAnouncementState.anounceCard(e)) + .toList(), options: CarouselOptions( viewportFraction: 1.0, aspectRatio: 686 / 172,