message center

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.0.2",
+  "flutterSdkVersion": "2.8.0",
   "flavors": {}
 }

android/app/build.gradle

@@ -51,8 +51,8 @@ android {
         versionName flutterVersionName
         manifestPlaceholders = [
         JPUSH_PKGNAME : applicationId,
-        JPUSH_APPKEY : "00e20fef79ee804d5c9abb54", 
+        JPUSH_APPKEY : "5f42cbb15abcdda6f8aeb925",
-        JPUSH_CHANNEL : "developer-default", 
+        JPUSH_CHANNEL : "developer-default",
         ]
 
     }
@@ -95,7 +95,7 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    //implementation 'com.amap.api:3dmap:latest.integration'
+    implementation 'com.amap.api:3dmap:latest.integration'
     implementation 'com.amap.api:location:5.2.0'
     implementation 'com.android.support:multidex:2.0.1'
 

ios/Runner/Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>小蜜蜂</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

lib/generated_plugin_registrant.dart

@@ -2,6 +2,7 @@
 // Generated file. Do not edit.
 //
 
+// ignore_for_file: directives_ordering
 // ignore_for_file: lines_longer_than_80_chars
 
 import 'package:device_info_plus_web/device_info_plus_web.dart';

lib/main.dart

@@ -10,7 +10,6 @@ import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 
@@ -19,11 +18,6 @@ void main() async {
   DeveloperUtil.setDev(!(buildType.contains('PRODUCT')));
   WidgetsFlutterBinding.ensureInitialized();
 
-  ///firebase crashlytics initalize
-  //await MainInitialize.initFirebase();
-  MainInitialize.initTheme();
-  MainInitialize.initWechat();
-  MainInitialize.initWebSocket();
   await MainInitialize.initJPush();
 
   runApp(MyApp());

lib/models/community_introduce/community_introduce_model.g.dart

@@ -7,14 +7,13 @@ part of 'community_introduce_model.dart';
 // **************************************************************************
 
 CommunityIontroduceModel _$CommunityIontroduceModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return CommunityIontroduceModel(
+    CommunityIontroduceModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-    content: json['content'] as String,
+      content: json['content'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    imgList: (json['imgList'] as List<dynamic>?)
+      imgList: (json['imgList'] as List<dynamic>?)
-        ?.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          ?.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}

lib/models/electronic_commerc/electronic_commerc_category_model.g.dart

@@ -7,9 +7,8 @@ part of 'electronic_commerc_category_model.dart';
 // **************************************************************************
 
 ElectronicCommercCategoryModel _$ElectronicCommercCategoryModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return ElectronicCommercCategoryModel(
+    ElectronicCommercCategoryModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-  );
+    );
-}

lib/models/electronic_commerc/electronic_commerc_detail_model.g.dart

@@ -7,15 +7,14 @@ part of 'electronic_commerc_detail_model.dart';
 // **************************************************************************
 
 ElectronicCommercDetailModel _$ElectronicCommercDetailModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return ElectronicCommercDetailModel(
+    ElectronicCommercDetailModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    title: json['title'] as String,
+      title: json['title'] as String,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    content: json['content'] as String,
+      content: json['content'] as String,
-    electronicCommerceCategoryName:
+      electronicCommerceCategoryName:
-        json['electronicCommerceCategoryName'] as String,
+          json['electronicCommerceCategoryName'] as String,
-    createName: json['createName'] as String,
+      createName: json['createName'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-  );
+    );
-}

lib/models/electronic_commerc/electronic_commerc_list_model.g.dart

@@ -7,13 +7,12 @@ part of 'electronic_commerc_list_model.dart';
 // **************************************************************************
 
 ElectronicCommercListModel _$ElectronicCommercListModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return ElectronicCommercListModel(
+    ElectronicCommercListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    title: json['title'] as String,
+      title: json['title'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    imgList: (json['imgList'] as List<dynamic>)
+      imgList: (json['imgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}

lib/models/express_package/express_package_list_model.g.dart

@@ -7,16 +7,15 @@ part of 'express_package_list_model.dart';
 // **************************************************************************
 
 ExpressPackageListModel _$ExpressPackageListModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return ExpressPackageListModel(
+    ExpressPackageListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    addresseeName: json['addresseeName'] as String,
+      addresseeName: json['addresseeName'] as String,
-    addresseeTel: json['addresseeTel'] as String,
+      addresseeTel: json['addresseeTel'] as String,
-    address: json['address'] as String,
+      address: json['address'] as String,
-    status: json['status'] as int,
+      status: json['status'] as int,
-    receiveDate: json['receiveDate'] as String?,
+      receiveDate: json['receiveDate'] as String?,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    placePosition: json['placePosition'] as String,
+      placePosition: json['placePosition'] as String,
-  );
+    );
-}

lib/models/facility/facility_appointment_model.g.dart

@@ -7,16 +7,15 @@ part of 'facility_appointment_model.dart';
 // **************************************************************************
 
 FacilityAppointmentModel _$FacilityAppointmentModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return FacilityAppointmentModel(
+    FacilityAppointmentModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    facilitiesName: json['facilitiesName'] as String,
+      facilitiesName: json['facilitiesName'] as String,
-    status: json['status'] as int,
+      status: json['status'] as int,
-    address: json['address'] as String,
+      address: json['address'] as String,
-    appointmentStartDate: json['appointmentStartDate'] as String,
+      appointmentStartDate: json['appointmentStartDate'] as String,
-    appointmentEndDate: json['appointmentEndDate'] as String,
+      appointmentEndDate: json['appointmentEndDate'] as String,
-    nullifyReason: json['nullifyReason'] as String?,
+      nullifyReason: json['nullifyReason'] as String?,
-    useEndDate: json['useEndDate'] as String?,
+      useEndDate: json['useEndDate'] as String?,
-  );
+    );
-}

lib/models/facility/facility_order_date_list_model.g.dart

@@ -7,11 +7,10 @@ part of 'facility_order_date_list_model.dart';
 // **************************************************************************
 
 FacilityOrderDateListModel _$FacilityOrderDateListModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return FacilityOrderDateListModel(
+    FacilityOrderDateListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    appointmentStartDate: json['appointmentStartDate'] as String,
+      appointmentStartDate: json['appointmentStartDate'] as String,
-    appointmentEndDate: json['appointmentEndDate'] as String,
+      appointmentEndDate: json['appointmentEndDate'] as String,
-    appointmentName: json['appointmentName'] as String,
+      appointmentName: json['appointmentName'] as String,
-  );
+    );
-}

lib/models/facility/facility_type_detail_model.g.dart

@@ -7,9 +7,8 @@ part of 'facility_type_detail_model.dart';
 // **************************************************************************
 
 FacilityTypeDetailModel _$FacilityTypeDetailModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return FacilityTypeDetailModel(
+    FacilityTypeDetailModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-  );
+    );
-}

lib/models/facility/facility_type_model.g.dart

@@ -6,15 +6,14 @@ part of 'facility_type_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-FacilityTypeModel _$FacilityTypeModelFromJson(Map<String, dynamic> json) {
+FacilityTypeModel _$FacilityTypeModelFromJson(Map<String, dynamic> json) =>
-  return FacilityTypeModel(
+    FacilityTypeModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-    openStartDate: json['openStartDate'] as String,
+      openStartDate: json['openStartDate'] as String,
-    openEndDate: json['openEndDate'] as String,
+      openEndDate: json['openEndDate'] as String,
-    num_: json['num'] as int,
+      num_: json['num'] as int,
-    imgUrls: (json['imgUrls'] as List<dynamic>?)
+      imgUrls: (json['imgUrls'] as List<dynamic>?)
-        ?.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          ?.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}

lib/models/house/lease_detail_model.g.dart

@@ -6,41 +6,40 @@ part of 'lease_detail_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-LeaseDetailModel _$LeaseDetailModelFromJson(Map<String, dynamic> json) {
+LeaseDetailModel _$LeaseDetailModelFromJson(Map<String, dynamic> json) =>
-  return LeaseDetailModel(
+    LeaseDetailModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    name: json['name'] as String,
+      name: json['name'] as String,
-    sex: json['sex'] as int,
+      sex: json['sex'] as int,
-    idCard: json['idCard'] as String,
+      idCard: json['idCard'] as String,
-    roomName: json['roomName'] as String,
+      roomName: json['roomName'] as String,
-    type: json['type'] as int,
+      type: json['type'] as int,
-    estateType: json['estateType'] as String,
+      estateType: json['estateType'] as String,
-    estateStructure: json['estateStructure'] as String,
+      estateStructure: json['estateStructure'] as String,
-    constructionArea: json['constructionArea'] as num,
+      constructionArea: json['constructionArea'] as num,
-    indoorArea: json['indoorArea'] as num,
+      indoorArea: json['indoorArea'] as num,
-    rentStandard: json['rentStandard'] as num,
+      rentStandard: json['rentStandard'] as num,
-    margin: json['margin'] as num,
+      margin: json['margin'] as num,
-    marginPayDate: json['marginPayDate'] as String?,
+      marginPayDate: json['marginPayDate'] as String?,
-    leaseDateStart: json['leaseDateStart'] as String,
+      leaseDateStart: json['leaseDateStart'] as String,
-    leaseDateEnd: json['leaseDateEnd'] as String,
+      leaseDateEnd: json['leaseDateEnd'] as String,
-    imgUrls: (json['imgUrls'] as List<dynamic>?)
+      imgUrls: (json['imgUrls'] as List<dynamic>?)
-        ?.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          ?.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    status: json['status'] as int,
+      status: json['status'] as int,
-    reviewerName: json['reviewerName'] as String?,
+      reviewerName: json['reviewerName'] as String?,
-    auditDate: json['auditDate'] as String?,
+      auditDate: json['auditDate'] as String?,
-    createName: json['createName'] as String,
+      createName: json['createName'] as String,
-    emergencyContact: json['emergencyContact'] as String?,
+      emergencyContact: json['emergencyContact'] as String?,
-    emergencyContactNumber: json['emergencyContactNumber'] as String?,
+      emergencyContactNumber: json['emergencyContactNumber'] as String?,
-    correspondenceAddress: json['correspondenceAddress'] as String?,
+      correspondenceAddress: json['correspondenceAddress'] as String?,
-    workUnits: json['workUnits'] as String?,
+      workUnits: json['workUnits'] as String?,
-    payBank: json['payBank'] as String?,
+      payBank: json['payBank'] as String?,
-    bankAccountName: json['bankAccountName'] as String?,
+      bankAccountName: json['bankAccountName'] as String?,
-    bankAccount: json['bankAccount'] as String?,
+      bankAccount: json['bankAccount'] as String?,
-    takeDate: json['takeDate'] as String?,
+      takeDate: json['takeDate'] as String?,
-    notMeterRentDate: json['notMeterRentDate'] as String?,
+      notMeterRentDate: json['notMeterRentDate'] as String?,
-    requiredRent: json['requiredRent'] as num?,
+      requiredRent: json['requiredRent'] as num?,
-    depositRefundReviewRemake: json['depositRefundReviewRemake'] as String?,
+      depositRefundReviewRemake: json['depositRefundReviewRemake'] as String?,
-  );
+    );
-}

lib/models/house/lease_echo_model.g.dart

@@ -6,11 +6,10 @@ part of 'lease_echo_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-LeaseEchoModel _$LeaseEchoModelFromJson(Map<String, dynamic> json) {
+LeaseEchoModel _$LeaseEchoModelFromJson(Map<String, dynamic> json) =>
-  return LeaseEchoModel(
+    LeaseEchoModel(
-    name: json['name'] as String?,
+      name: json['name'] as String?,
-    sex: json['sex'] as num?,
+      sex: json['sex'] as num?,
-    tel: json['tel'] as String,
+      tel: json['tel'] as String,
-    idNumber: json['idNumber'] as String?,
+      idNumber: json['idNumber'] as String?,
-  );
+    );
-}

lib/models/house/lease_fee_list_model.g.dart

@@ -6,12 +6,11 @@ part of 'lease_fee_list_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-LeaseFeeListModel _$LeaseFeeListModelFromJson(Map<String, dynamic> json) {
+LeaseFeeListModel _$LeaseFeeListModelFromJson(Map<String, dynamic> json) =>
-  return LeaseFeeListModel(
+    LeaseFeeListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    price: json['price'] as num,
+      price: json['price'] as num,
-    payStatus: json['payStatus'] as int,
+      payStatus: json['payStatus'] as int,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    type: json['type'] as int,
+      type: json['type'] as int,
-  );
+    );
-}

lib/models/house/lease_list_model.g.dart

@@ -6,12 +6,11 @@ part of 'lease_list_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-LeaseListModel _$LeaseListModelFromJson(Map<String, dynamic> json) {
+LeaseListModel _$LeaseListModelFromJson(Map<String, dynamic> json) =>
-  return LeaseListModel(
+    LeaseListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    roomName: json['roomName'] as String,
+      roomName: json['roomName'] as String,
-    type: json['type'] as int,
+      type: json['type'] as int,
-    estateType: json['estateType'] as String,
+      estateType: json['estateType'] as String,
-    status: json['status'] as int,
+      status: json['status'] as int,
-  );
+    );
-}

lib/models/house_keeping/house_keeping_list_model.g.dart

@@ -7,33 +7,32 @@ part of 'house_keeping_list_model.dart';
 // **************************************************************************
 
 HouseKeepingListModel _$HouseKeepingListModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return HouseKeepingListModel(
+    HouseKeepingListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    proposerName: json['proposerName'] as String,
+      proposerName: json['proposerName'] as String,
-    proposerTel: json['proposerTel'] as String,
+      proposerTel: json['proposerTel'] as String,
-    roomName: json['roomName'] as String,
+      roomName: json['roomName'] as String,
-    type: json['type'] as int,
+      type: json['type'] as int,
-    content: json['content'] as String,
+      content: json['content'] as String,
-    status: json['status'] as int,
+      status: json['status'] as int,
-    completion: json['completion'] as int?,
+      completion: json['completion'] as int?,
-    processDescription: json['processDescription'] as String?,
+      processDescription: json['processDescription'] as String?,
-    handlerName: json['handlerName'] as String?,
+      handlerName: json['handlerName'] as String?,
-    handlerTel: json['handlerTel'] as String?,
+      handlerTel: json['handlerTel'] as String?,
-    handlingTime: json['handlingTime'] as String?,
+      handlingTime: json['handlingTime'] as String?,
-    handlerImgList: (json['handlerImgList'] as List<dynamic>)
+      handlerImgList: (json['handlerImgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    payFee: (json['payFee'] as num?)?.toDouble(),
+      payFee: (json['payFee'] as num?)?.toDouble(),
-    evaluation: json['evaluation'] as int?,
+      evaluation: json['evaluation'] as int?,
-    evaluationContent: json['evaluationContent'] as String?,
+      evaluationContent: json['evaluationContent'] as String?,
-    evaluationTime: json['evaluationTime'] as String?,
+      evaluationTime: json['evaluationTime'] as String?,
-    evaluationImgList: (json['evaluationImgList'] as List<dynamic>)
+      evaluationImgList: (json['evaluationImgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    submitImgList: (json['submitImgList'] as List<dynamic>)
+      submitImgList: (json['submitImgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}

lib/models/house_keeping/house_keeping_process_model.g.dart

@@ -7,14 +7,13 @@ part of 'house_keeping_process_model.dart';
 // **************************************************************************
 
 HouseKeepingProcessModel _$HouseKeepingProcessModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return HouseKeepingProcessModel(
+    HouseKeepingProcessModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    housekeepingServiceId: json['housekeepingServiceId'] as int,
+      housekeepingServiceId: json['housekeepingServiceId'] as int,
-    operationDate: json['operationDate'] as String,
+      operationDate: json['operationDate'] as String,
-    operationType: json['operationType'] as int,
+      operationType: json['operationType'] as int,
-    opName: json['operator'] as int,
+      opName: json['operator'] as int,
-    operatorType: json['operatorType'] as int,
+      operatorType: json['operatorType'] as int,
-    operatorContent: json['operatorContent'] as String,
+      operatorContent: json['operatorContent'] as String,
-  );
+    );
-}

lib/models/life_pay/life_pay_list_model.g.dart

@@ -6,15 +6,14 @@ part of 'life_pay_list_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-LifePayListModel _$LifePayListModelFromJson(Map<String, dynamic> json) {
+LifePayListModel _$LifePayListModelFromJson(Map<String, dynamic> json) =>
-  return LifePayListModel(
+    LifePayListModel(
-    years: json['years'] as int,
+      years: json['years'] as int,
-    paymentNum: json['paymentNum'] as int,
+      paymentNum: json['paymentNum'] as int,
-    dailyPaymentTypeVos: (json['dailyPaymentTypeVos'] as List<dynamic>)
+      dailyPaymentTypeVos: (json['dailyPaymentTypeVos'] as List<dynamic>)
-        .map((e) => DailyPaymentTypeVos.fromJson(e as Map<String, dynamic>))
+          .map((e) => DailyPaymentTypeVos.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}
 
 Map<String, dynamic> _$LifePayListModelToJson(LifePayListModel instance) =>
     <String, dynamic>{
@@ -24,15 +23,14 @@ Map<String, dynamic> _$LifePayListModelToJson(LifePayListModel instance) =>
           instance.dailyPaymentTypeVos.map((e) => e.toJson()).toList(),
     };
 
-DailyPaymentTypeVos _$DailyPaymentTypeVosFromJson(Map<String, dynamic> json) {
+DailyPaymentTypeVos _$DailyPaymentTypeVosFromJson(Map<String, dynamic> json) =>
-  return DailyPaymentTypeVos(
+    DailyPaymentTypeVos(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-    detailedVoList: (json['detailedVoList'] as List<dynamic>)
+      detailedVoList: (json['detailedVoList'] as List<dynamic>)
-        .map((e) => DetailedVoList.fromJson(e as Map<String, dynamic>))
+          .map((e) => DetailedVoList.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}
 
 Map<String, dynamic> _$DailyPaymentTypeVosToJson(
         DailyPaymentTypeVos instance) =>
@@ -42,16 +40,15 @@ Map<String, dynamic> _$DailyPaymentTypeVosToJson(
       'detailedVoList': instance.detailedVoList.map((e) => e.toJson()).toList(),
     };
 
-DetailedVoList _$DetailedVoListFromJson(Map<String, dynamic> json) {
+DetailedVoList _$DetailedVoListFromJson(Map<String, dynamic> json) =>
-  return DetailedVoList(
+    DetailedVoList(
-    groupId: json['groupId'] as int,
+      groupId: json['groupId'] as int,
-    paymentPrice: json['paymentPrice'] as num,
+      paymentPrice: json['paymentPrice'] as num,
-    overdueFine: json['overdueFine'] as num,
+      overdueFine: json['overdueFine'] as num,
-    detailsVoList: (json['detailsVoList'] as List<dynamic>)
+      detailsVoList: (json['detailsVoList'] as List<dynamic>)
-        .map((e) => DetailsVoList.fromJson(e as Map<String, dynamic>))
+          .map((e) => DetailsVoList.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}
 
 Map<String, dynamic> _$DetailedVoListToJson(DetailedVoList instance) =>
     <String, dynamic>{
@@ -61,24 +58,23 @@ Map<String, dynamic> _$DetailedVoListToJson(DetailedVoList instance) =>
       'detailsVoList': instance.detailsVoList.map((e) => e.toJson()).toList(),
     };
 
-DetailsVoList _$DetailsVoListFromJson(Map<String, dynamic> json) {
+DetailsVoList _$DetailsVoListFromJson(Map<String, dynamic> json) =>
-  return DetailsVoList(
+    DetailsVoList(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    month: json['month'] as String,
+      month: json['month'] as String,
-    costPrice: json['costPrice'] as num,
+      costPrice: json['costPrice'] as num,
-    paidPrice: json['paidPrice'] as num,
+      paidPrice: json['paidPrice'] as num,
-    totalPrice: json['totalPrice'] as num,
+      totalPrice: json['totalPrice'] as num,
-    beginDate: json['beginDate'] as String,
+      beginDate: json['beginDate'] as String,
-    endDate: json['endDate'] as String,
+      endDate: json['endDate'] as String,
-    unitPriceType: json['unitPriceType'] as String,
+      unitPriceType: json['unitPriceType'] as String,
-    number: json['num'] as int,
+      number: json['num'] as int,
-    paymentPrice: json['paymentPrice'] as num,
+      paymentPrice: json['paymentPrice'] as num,
-    status: json['status'] as int,
+      status: json['status'] as int,
-    rate: json['rate'] as num,
+      rate: json['rate'] as num,
-    paymentTerm: json['paymentTerm'] as String,
+      paymentTerm: json['paymentTerm'] as String,
-    overdueFine: json['overdueFine'] as num,
+      overdueFine: json['overdueFine'] as num,
-  );
+    );
-}
 
 Map<String, dynamic> _$DetailsVoListToJson(DetailsVoList instance) =>
     <String, dynamic>{

lib/models/life_pay/life_pay_record_model.g.dart

@@ -6,16 +6,15 @@ part of 'life_pay_record_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-LifePayRecordModel _$LifePayRecordModelFromJson(Map<String, dynamic> json) {
+LifePayRecordModel _$LifePayRecordModelFromJson(Map<String, dynamic> json) =>
-  return LifePayRecordModel(
+    LifePayRecordModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    chargesTemplateDetailName: json['chargesTemplateDetailName'] as String,
+      chargesTemplateDetailName: json['chargesTemplateDetailName'] as String,
-    roomName: json['roomName'] as String,
+      roomName: json['roomName'] as String,
-    years: json['years'] as String,
+      years: json['years'] as String,
-    paidPrice: json['paidPrice'] as num,
+      paidPrice: json['paidPrice'] as num,
-    createName: json['createName'] as String,
+      createName: json['createName'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    payType: json['payType'] as int,
+      payType: json['payType'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-  );
+    );
-}

lib/models/life_pay/share_pay_list_model.g.dart

@@ -6,18 +6,19 @@ part of 'share_pay_list_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SharePayListModel _$SharePayListModelFromJson(Map<String, dynamic> json) {
+SharePayListModel _$SharePayListModelFromJson(Map<String, dynamic> json) =>
-  return SharePayListModel(
+    SharePayListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    months: json['months'] as String,
+      months: json['months'] as String,
-    type: json['type'] as int,
+      type: json['type'] as int,
-    num: json['num'] as int,
+      num: json['num'] as int,
-    total: (json['total'] as num).toDouble(),
+      total: (json['total'] as num).toDouble(),
-    appMeterShareDetailsVos: (json['appMeterShareDetailsVos'] as List<dynamic>)
+      appMeterShareDetailsVos:
-        .map((e) => AppMeterShareDetailsVos.fromJson(e as Map<String, dynamic>))
+          (json['appMeterShareDetailsVos'] as List<dynamic>)
-        .toList(),
+              .map((e) =>
-  );
+                  AppMeterShareDetailsVos.fromJson(e as Map<String, dynamic>))
-}
+              .toList(),
+    );
 
 Map<String, dynamic> _$SharePayListModelToJson(SharePayListModel instance) =>
     <String, dynamic>{
@@ -30,20 +31,19 @@ Map<String, dynamic> _$SharePayListModelToJson(SharePayListModel instance) =>
     };
 
 AppMeterShareDetailsVos _$AppMeterShareDetailsVosFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return AppMeterShareDetailsVos(
+    AppMeterShareDetailsVos(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    houseArea: (json['houseArea'] as num).toDouble(),
+      houseArea: (json['houseArea'] as num).toDouble(),
-    amountPayable: (json['amountPayable'] as num).toDouble(),
+      amountPayable: (json['amountPayable'] as num).toDouble(),
-    paidAmount: (json['paidAmount'] as num).toDouble(),
+      paidAmount: (json['paidAmount'] as num).toDouble(),
-    remainingUnpaidAmount: (json['remainingUnpaidAmount'] as num).toDouble(),
+      remainingUnpaidAmount: (json['remainingUnpaidAmount'] as num).toDouble(),
-    status: json['status'] as int,
+      status: json['status'] as int,
-    rate: (json['rate'] as num).toDouble(),
+      rate: (json['rate'] as num).toDouble(),
-    paymentPeriod: json['paymentPeriod'] as String,
+      paymentPeriod: json['paymentPeriod'] as String,
-    paymentTime: json['paymentTime'] as String?,
+      paymentTime: json['paymentTime'] as String?,
-    lateFree: (json['lateFree'] as num).toDouble(),
+      lateFree: (json['lateFree'] as num).toDouble(),
-  );
+    );
-}
 
 Map<String, dynamic> _$AppMeterShareDetailsVosToJson(
         AppMeterShareDetailsVos instance) =>

lib/models/life_pay/share_pay_record_model.g.dart

@@ -6,16 +6,15 @@ part of 'share_pay_record_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SharePayRecordModel _$SharePayRecordModelFromJson(Map<String, dynamic> json) {
+SharePayRecordModel _$SharePayRecordModelFromJson(Map<String, dynamic> json) =>
-  return SharePayRecordModel(
+    SharePayRecordModel(
-    payPrice: (json['payPrice'] as num).toDouble(),
+      payPrice: (json['payPrice'] as num).toDouble(),
-    paymentTime: json['paymentTime'] as String,
+      paymentTime: json['paymentTime'] as String,
-    payType: json['payType'] as int,
+      payType: json['payType'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    months: json['months'] as String,
+      months: json['months'] as String,
-    effectiveTimeStart: json['effectiveTimeStart'] as String,
+      effectiveTimeStart: json['effectiveTimeStart'] as String,
-    effectiveTimeEnd: json['effectiveTimeEnd'] as String,
+      effectiveTimeEnd: json['effectiveTimeEnd'] as String,
-    shareUnitPrice: (json['shareUnitPrice'] as num).toDouble(),
+      shareUnitPrice: (json['shareUnitPrice'] as num).toDouble(),
-    indoorArea: (json['indoorArea'] as num).toDouble(),
+      indoorArea: (json['indoorArea'] as num).toDouble(),
-  );
+    );
-}

lib/models/manage/fix_report/fix_detail_model.g.dart

@@ -6,63 +6,58 @@ part of 'fix_detail_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-FixDetailModel _$FixDetailModelFromJson(Map<String, dynamic> json) {
+FixDetailModel _$FixDetailModelFromJson(Map<String, dynamic> json) =>
-  return FixDetailModel(
+    FixDetailModel(
-    appReportRepairVo: AppReportRepairVo.fromJson(
+      appReportRepairVo: AppReportRepairVo.fromJson(
-        json['appReportRepairVo'] as Map<String, dynamic>),
+          json['appReportRepairVo'] as Map<String, dynamic>),
-    appProcessRecordVo: (json['appProcessRecordVo'] as List<dynamic>)
+      appProcessRecordVo: (json['appProcessRecordVo'] as List<dynamic>)
-        .map((e) => AppProcessRecordVo.fromJson(e as Map<String, dynamic>))
+          .map((e) => AppProcessRecordVo.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    appMaintenanceResultVo: json['appMaintenanceResultVo'] == null
+      appMaintenanceResultVo: json['appMaintenanceResultVo'] == null
-        ? null
+          ? null
-        : AppMaintenanceResultVo.fromJson(
+          : AppMaintenanceResultVo.fromJson(
-            json['appMaintenanceResultVo'] as Map<String, dynamic>),
+              json['appMaintenanceResultVo'] as Map<String, dynamic>),
-    appDispatchListVo: json['appDispatchListVo'] == null
+      appDispatchListVo: json['appDispatchListVo'] == null
-        ? null
+          ? null
-        : AppDispatchListVo.fromJson(
+          : AppDispatchListVo.fromJson(
-            json['appDispatchListVo'] as Map<String, dynamic>),
+              json['appDispatchListVo'] as Map<String, dynamic>),
-  );
+    );
-}
 
-AppReportRepairVo _$AppReportRepairVoFromJson(Map<String, dynamic> json) {
+AppReportRepairVo _$AppReportRepairVoFromJson(Map<String, dynamic> json) =>
-  return AppReportRepairVo(
+    AppReportRepairVo(
-    roomName: json['roomName'] as String,
+      roomName: json['roomName'] as String,
-    id: json['id'] as int,
+      id: json['id'] as int,
-    type: json['type'] as int,
+      type: json['type'] as int,
-    status: json['status'] as int,
+      status: json['status'] as int,
-    reportDetail: json['reportDetail'] as String,
+      reportDetail: json['reportDetail'] as String,
-    imgUrls: (json['imgUrls'] as List<dynamic>)
+      imgUrls: (json['imgUrls'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}
 
-AppProcessRecordVo _$AppProcessRecordVoFromJson(Map<String, dynamic> json) {
+AppProcessRecordVo _$AppProcessRecordVoFromJson(Map<String, dynamic> json) =>
-  return AppProcessRecordVo(
+    AppProcessRecordVo(
-    operationDate: json['operationDate'] as String,
+      operationDate: json['operationDate'] as String,
-    operationType: json['operationType'] as int,
+      operationType: json['operationType'] as int,
-  );
+    );
-}
 
-AppDispatchListVo _$AppDispatchListVoFromJson(Map<String, dynamic> json) {
+AppDispatchListVo _$AppDispatchListVoFromJson(Map<String, dynamic> json) =>
-  return AppDispatchListVo(
+    AppDispatchListVo(
-    code: json['code'] as String,
+      code: json['code'] as String,
-    orderDate: json['orderDate'] as String,
+      orderDate: json['orderDate'] as String,
-    type: json['type'] as int,
+      type: json['type'] as int,
-    operatorName: json['operatorName'] as String,
+      operatorName: json['operatorName'] as String,
-    distributorName: json['distributorName'] as String,
+      distributorName: json['distributorName'] as String,
-  );
+    );
-}
 
 AppMaintenanceResultVo _$AppMaintenanceResultVoFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return AppMaintenanceResultVo(
+    AppMaintenanceResultVo(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    laborCost: json['laborCost'] as num?,
+      laborCost: json['laborCost'] as num?,
-    materialCost: json['materialCost'] as num?,
+      materialCost: json['materialCost'] as num?,
-    totalCost: json['totalCost'] as num?,
+      totalCost: json['totalCost'] as num?,
-    imgUrls: (json['imgUrls'] as List<dynamic>)
+      imgUrls: (json['imgUrls'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}

lib/models/market/goods_detail_model.g.dart

@@ -6,27 +6,26 @@ part of 'goods_detail_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-GoodsDetailModel _$GoodsDetailModelFromJson(Map<String, dynamic> json) {
+GoodsDetailModel _$GoodsDetailModelFromJson(Map<String, dynamic> json) =>
-  return GoodsDetailModel(
+    GoodsDetailModel(
-    json['id'] as int,
+      json['id'] as int,
-    json['recommend'] as String,
+      json['recommend'] as String,
-    json['title'] as String,
+      json['title'] as String,
-    (json['sellingPrice'] as num).toDouble(),
+      (json['sellingPrice'] as num).toDouble(),
-    (json['markingPrice'] as num).toDouble(),
+      (json['markingPrice'] as num).toDouble(),
-    json['categoryName'] as String,
+      json['categoryName'] as String,
-    json['subscribeNum'] as int,
+      json['subscribeNum'] as int,
-    json['detail'] as String,
+      json['detail'] as String,
-    json['arrivalTime'] as String?,
+      json['arrivalTime'] as String?,
-    (json['goodsImgList'] as List<dynamic>)
+      (json['goodsImgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    json['supplierId'] as int,
+      json['supplierId'] as int,
-    json['supplierName'] as String,
+      json['supplierName'] as String,
-    json['supplierTel'] as String,
+      json['supplierTel'] as String,
-    json['supplierAddress'] as String?,
+      json['supplierAddress'] as String?,
-    (json['supplierImgList'] as List<dynamic>)
+      (json['supplierImgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    json['isSubscribe'] as int,
+      json['isSubscribe'] as int,
-  );
+    );
-}

lib/models/market/goods_item.g.dart

@@ -6,16 +6,14 @@ part of 'goods_item.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-GoodsItem _$GoodsItemFromJson(Map<String, dynamic> json) {
+GoodsItem _$GoodsItemFromJson(Map<String, dynamic> json) => GoodsItem(
-  return GoodsItem(
+      id: json['id'] as int,
-    id: json['id'] as int,
+      title: json['title'] as String,
-    title: json['title'] as String,
+      recommend: json['recommend'] as String,
-    recommend: json['recommend'] as String,
+      sellingPrice: json['sellingPrice'] as num,
-    sellingPrice: json['sellingPrice'] as num,
+      markingPrice: json['markingPrice'] as num,
-    markingPrice: json['markingPrice'] as num,
+      subscribeNum: json['subscribeNum'] as int,
-    subscribeNum: json['subscribeNum'] as int,
+      imgList: (json['imgList'] as List<dynamic>)
-    imgList: (json['imgList'] as List<dynamic>)
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .toList(),
-        .toList(),
+    );
-  );
-}

lib/models/market/market_category_model.g.dart

@@ -6,12 +6,11 @@ part of 'market_category_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-MarketCategoryModel _$MarketCategoryModelFromJson(Map<String, dynamic> json) {
+MarketCategoryModel _$MarketCategoryModelFromJson(Map<String, dynamic> json) =>
-  return MarketCategoryModel(
+    MarketCategoryModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-    imgList: (json['imgList'] as List<dynamic>)
+      imgList: (json['imgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}

lib/models/market/order/my_order_list_model.g.dart

@@ -6,34 +6,33 @@ part of 'my_order_list_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-MyOrderListModel _$MyOrderListModelFromJson(Map<String, dynamic> json) {
+MyOrderListModel _$MyOrderListModelFromJson(Map<String, dynamic> json) =>
-  return MyOrderListModel(
+    MyOrderListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    goodsId: json['goodsId'] as int,
+      goodsId: json['goodsId'] as int,
-    goodsName: json['goodsName'] as String,
+      goodsName: json['goodsName'] as String,
-    backType: json['backType'] as int?,
+      backType: json['backType'] as int?,
-    goodsImgList: (json['goodsImgList'] as List<dynamic>)
+      goodsImgList: (json['goodsImgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    sellingPrice: (json['sellingPrice'] as num).toDouble(),
+      sellingPrice: (json['sellingPrice'] as num).toDouble(),
-    markingPrice: (json['markingPrice'] as num?)?.toDouble(),
+      markingPrice: (json['markingPrice'] as num?)?.toDouble(),
-    num: json['num'] as int,
+      num: json['num'] as int,
-    supplierName: json['supplierName'] as String,
+      supplierName: json['supplierName'] as String,
-    levelOneCategory: json['levelOneCategory'] as String,
+      levelOneCategory: json['levelOneCategory'] as String,
-    levelTwoCategory: json['levelTwoCategory'] as String,
+      levelTwoCategory: json['levelTwoCategory'] as String,
-    status: json['status'] as int,
+      status: json['status'] as int,
-    sendDate: json['sendDate'] as String?,
+      sendDate: json['sendDate'] as String?,
-    sendDetail: json['sendDetail'] as String?,
+      sendDetail: json['sendDetail'] as String?,
-    arrivalDate: json['arrivalDate'] as String?,
+      arrivalDate: json['arrivalDate'] as String?,
-    receivingDate: json['receivingDate'] as String?,
+      receivingDate: json['receivingDate'] as String?,
-    backDate: json['backDate'] as String?,
+      backDate: json['backDate'] as String?,
-    backReason: json['backReason'] as String?,
+      backReason: json['backReason'] as String?,
-    reason: json['reason'] as String?,
+      reason: json['reason'] as String?,
-    score: json['score'] as int?,
+      score: json['score'] as int?,
-    evaluationDate: json['evaluationDate'] as String?,
+      evaluationDate: json['evaluationDate'] as String?,
-    evaluationReason: json['evaluationReason'] as String?,
+      evaluationReason: json['evaluationReason'] as String?,
-    createDate: json['createDate'] as String?,
+      createDate: json['createDate'] as String?,
-    arrivalTime: json['arrivalTime'] as String,
+      arrivalTime: json['arrivalTime'] as String,
-  );
+    );
-}

lib/models/market/order/order_detail_model.g.dart

@@ -6,34 +6,33 @@ part of 'order_detail_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-OrderDetailModel _$OrderDetailModelFromJson(Map<String, dynamic> json) {
+OrderDetailModel _$OrderDetailModelFromJson(Map<String, dynamic> json) =>
-  return OrderDetailModel(
+    OrderDetailModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    goodsId: json['goodsId'] as int,
+      goodsId: json['goodsId'] as int,
-    goodsName: json['goodsName'] as String,
+      goodsName: json['goodsName'] as String,
-    backType: json['backType'] as int?,
+      backType: json['backType'] as int?,
-    goodsImgList: (json['goodsImgList'] as List<dynamic>)
+      goodsImgList: (json['goodsImgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    sellingPrice: json['sellingPrice'] as num?,
+      sellingPrice: json['sellingPrice'] as num?,
-    markingPrice: json['markingPrice'] as num?,
+      markingPrice: json['markingPrice'] as num?,
-    count: json['num'] as int,
+      count: json['num'] as int,
-    supplierId: json['supplierId'] as int?,
+      supplierId: json['supplierId'] as int?,
-    supplierName: json['supplierName'] as String?,
+      supplierName: json['supplierName'] as String?,
-    levelOneCategory: json['levelOneCategory'] as String?,
+      levelOneCategory: json['levelOneCategory'] as String?,
-    levelTwoCategory: json['levelTwoCategory'] as String?,
+      levelTwoCategory: json['levelTwoCategory'] as String?,
-    status: json['status'] as int?,
+      status: json['status'] as int?,
-    sendDate: json['sendDate'] as String?,
+      sendDate: json['sendDate'] as String?,
-    sendDetail: json['sendDetail'] as String?,
+      sendDetail: json['sendDetail'] as String?,
-    arrivalDate: json['arrivalDate'] as String?,
+      arrivalDate: json['arrivalDate'] as String?,
-    receivingDate: json['receivingDate'] as String?,
+      receivingDate: json['receivingDate'] as String?,
-    backDate: json['backDate'] as String?,
+      backDate: json['backDate'] as String?,
-    backReason: json['backReason'] as String?,
+      backReason: json['backReason'] as String?,
-    score: json['score'] as String?,
+      score: json['score'] as String?,
-    evaluationDate: json['evaluationDate'] as String?,
+      evaluationDate: json['evaluationDate'] as String?,
-    evaluationReason: json['evaluationReason'] as String?,
+      evaluationReason: json['evaluationReason'] as String?,
-    arrivalTime: json['arrivalTime'] as String?,
+      arrivalTime: json['arrivalTime'] as String?,
-    createDate: json['createDate'] as String?,
+      createDate: json['createDate'] as String?,
-  );
+    );
-}

lib/models/market/shop_car/shop_car_list_model.g.dart

@@ -6,18 +6,17 @@ part of 'shop_car_list_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-ShopCarListModel _$ShopCarListModelFromJson(Map<String, dynamic> json) {
+ShopCarListModel _$ShopCarListModelFromJson(Map<String, dynamic> json) =>
-  return ShopCarListModel(
+    ShopCarListModel(
-    id: json['id'] as int?,
+      id: json['id'] as int?,
-    skuName: json['skuName'] as String?,
+      skuName: json['skuName'] as String?,
-    mainPhoto: json['mainPhoto'] as String?,
+      mainPhoto: json['mainPhoto'] as String?,
-    status: json['status'] as int?,
+      status: json['status'] as int?,
-    shopStatus: json['shopStatus'] as int?,
+      shopStatus: json['shopStatus'] as int?,
-    sellPrice: (json['sellPrice'] as num?)?.toDouble(),
+      sellPrice: (json['sellPrice'] as num?)?.toDouble(),
-    discountPrice: (json['discountPrice'] as num?)?.toDouble(),
+      discountPrice: (json['discountPrice'] as num?)?.toDouble(),
-    unit: json['unit'] as String?,
+      unit: json['unit'] as String?,
-    kind: json['kind'] as int?,
+      kind: json['kind'] as int?,
-    weight: (json['weight'] as num?)?.toDouble(),
+      weight: (json['weight'] as num?)?.toDouble(),
-    num: json['num'] as int?,
+      num: json['num'] as int?,
-  );
+    );
-}

lib/models/message/announce_list_model.dart

@@ -0,0 +1,41 @@
+import 'package:flustars/flustars.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'announce_list_model.g.dart';
+
+@JsonSerializable()
+class AnnounceListModel {
+  final int id;
+  final String date;
+  final String title;
+  final String content;
+
+  String get month {
+    var date = DateUtil.getDateTime(this.date);
+    return date!.year.toString() + '年' + date.month.toString() + '月';
+  }
+
+  factory AnnounceListModel.fromJson(Map<String, dynamic> json) =>
+      _$AnnounceListModelFromJson(json);
+
+  const AnnounceListModel({
+    required this.id,
+    required this.date,
+    required this.title,
+    required this.content,
+  });
+
+  AnnounceListModel copyWith({
+    int? id,
+    String? date,
+    String? title,
+    String? content,
+  }) {
+    return AnnounceListModel(
+      id: id ?? this.id,
+      date: date ?? this.date,
+      title: title ?? this.title,
+      content: content ?? this.content,
+    );
+  }
+}

lib/models/message/announce_list_model.g.dart

@@ -0,0 +1,15 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'announce_list_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+AnnounceListModel _$AnnounceListModelFromJson(Map<String, dynamic> json) =>
+    AnnounceListModel(
+      id: json['id'] as int,
+      date: json['date'] as String,
+      title: json['title'] as String,
+      content: json['content'] as String,
+    );

lib/models/message/reply_list_model.dart

@@ -0,0 +1,27 @@
+import 'package:aku_new_community/model/common/img_model.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'reply_list_model.g.dart';
+
+@JsonSerializable()
+class ReplyListModel {
+  final int id;
+  final String name;
+  final String date;
+  final String content;
+  final ImgModel img;
+  final String title;
+  final ImgModel pic;
+  factory ReplyListModel.fromJson(Map<String, dynamic> json) =>
+      _$ReplyListModelFromJson(json);
+
+  const ReplyListModel({
+    required this.id,
+    required this.name,
+    required this.date,
+    required this.content,
+    required this.img,
+    required this.title,
+    required this.pic,
+  });
+}

lib/models/message/reply_list_model.g.dart

@@ -0,0 +1,18 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'reply_list_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ReplyListModel _$ReplyListModelFromJson(Map<String, dynamic> json) =>
+    ReplyListModel(
+      id: json['id'] as int,
+      name: json['name'] as String,
+      date: json['date'] as String,
+      content: json['content'] as String,
+      img: ImgModel.fromJson(json['img'] as Map<String, dynamic>),
+      title: json['title'] as String,
+      pic: ImgModel.fromJson(json['pic'] as Map<String, dynamic>),
+    );

lib/models/new_renovation/new_renovation_list_model.g.dart

@@ -7,40 +7,38 @@ part of 'new_renovation_list_model.dart';
 // **************************************************************************
 
 NewRenovationListModel _$NewRenovationListModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return NewRenovationListModel(
+    NewRenovationListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    roomName: json['roomName'] as String,
+      roomName: json['roomName'] as String,
-    status: json['status'] as int,
+      status: json['status'] as int,
-    constructionUnit: json['constructionUnit'] as String,
+      constructionUnit: json['constructionUnit'] as String,
-    director: json['director'] as String,
+      director: json['director'] as String,
-    directorTel: json['directorTel'] as String,
+      directorTel: json['directorTel'] as String,
-    expectedBegin: json['expectedBegin'] as String,
+      expectedBegin: json['expectedBegin'] as String,
-    expectedEnd: json['expectedEnd'] as String,
+      expectedEnd: json['expectedEnd'] as String,
-    actualBegin: json['actualBegin'] as String?,
+      actualBegin: json['actualBegin'] as String?,
-    actualEnd: json['actualEnd'] as String?,
+      actualEnd: json['actualEnd'] as String?,
-    rejectReason: json['rejectReason'] as String?,
+      rejectReason: json['rejectReason'] as String?,
-    reviewerName: json['reviewerName'] as String?,
+      reviewerName: json['reviewerName'] as String?,
-    auditDate: json['auditDate'] as String?,
+      auditDate: json['auditDate'] as String?,
-    trackerName: json['trackerName'] as String?,
+      trackerName: json['trackerName'] as String?,
-    applicationCheckDate: json['applicationCheckDate'] as String?,
+      applicationCheckDate: json['applicationCheckDate'] as String?,
-    isQualified: json['isQualified'] as int?,
+      isQualified: json['isQualified'] as int?,
-    createName: json['createName'] as String,
+      createName: json['createName'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    checkVoList: (json['checkVoList'] as List<dynamic>)
+      checkVoList: (json['checkVoList'] as List<dynamic>)
-        .map((e) =>
+          .map((e) => e == null
-            e == null ? null : CheckVoList.fromJson(e as Map<String, dynamic>))
+              ? null
-        .toList(),
+              : CheckVoList.fromJson(e as Map<String, dynamic>))
-  );
+          .toList(),
-}
+    );
 
-CheckVoList _$CheckVoListFromJson(Map<String, dynamic> json) {
+CheckVoList _$CheckVoListFromJson(Map<String, dynamic> json) => CheckVoList(
-  return CheckVoList(
+      id: json['id'] as int,
-    id: json['id'] as int,
+      decorationNewId: json['decorationNewId'] as int,
-    decorationNewId: json['decorationNewId'] as int,
+      detail: json['detail'] as String,
-    detail: json['detail'] as String,
+      isQualified: json['isQualified'] as int,
-    isQualified: json['isQualified'] as int,
+      createName: json['createName'] as String,
-    createName: json['createName'] as String,
+      createDate: json['createDate'] as String,
-    createDate: json['createDate'] as String,
+    );
-  );
-}

lib/models/news/news_category_model.g.dart

@@ -6,9 +6,8 @@ part of 'news_category_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-NewsCategoryModel _$NewsCategoryModelFromJson(Map<String, dynamic> json) {
+NewsCategoryModel _$NewsCategoryModelFromJson(Map<String, dynamic> json) =>
-  return NewsCategoryModel(
+    NewsCategoryModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-  );
+    );
-}

lib/models/news/news_detail_model.g.dart

@@ -6,14 +6,13 @@ part of 'news_detail_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-NewsDetailModel _$NewsDetailModelFromJson(Map<String, dynamic> json) {
+NewsDetailModel _$NewsDetailModelFromJson(Map<String, dynamic> json) =>
-  return NewsDetailModel(
+    NewsDetailModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    code: json['code'] as String,
+      code: json['code'] as String,
-    title: json['title'] as String,
+      title: json['title'] as String,
-    content: json['content'] as String,
+      content: json['content'] as String,
-    newsCategoryName: json['newsCategoryName'] as String,
+      newsCategoryName: json['newsCategoryName'] as String,
-    createName: json['createName'] as String,
+      createName: json['createName'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-  );
+    );
-}

lib/models/news/news_item_model.g.dart

@@ -6,13 +6,12 @@ part of 'news_item_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-NewsItemModel _$NewsItemModelFromJson(Map<String, dynamic> json) {
+NewsItemModel _$NewsItemModelFromJson(Map<String, dynamic> json) =>
-  return NewsItemModel(
+    NewsItemModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    title: json['title'] as String,
+      title: json['title'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-    imgList: (json['imgList'] as List<dynamic>)
+      imgList: (json['imgList'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-  );
+    );
-}

lib/models/pay/pay_model.g.dart

@@ -6,26 +6,23 @@ part of 'pay_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-PayModel _$PayModelFromJson(Map<String, dynamic> json) {
+PayModel _$PayModelFromJson(Map<String, dynamic> json) => PayModel(
-  return PayModel(
+      aliPayTradeAppPayResponse: AliPayTradeAppPayResponse.fromJson(
-    aliPayTradeAppPayResponse: AliPayTradeAppPayResponse.fromJson(
+          json['alipay_trade_app_pay_response'] as Map<String, dynamic>),
-        json['alipay_trade_app_pay_response'] as Map<String, dynamic>),
+      sign: json['sign'] as String,
-    sign: json['sign'] as String,
+      signType: json['sign_type'] as String,
-    signType: json['sign_type'] as String,
+    );
-  );
-}
 
 AliPayTradeAppPayResponse _$AliPayTradeAppPayResponseFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return AliPayTradeAppPayResponse(
+    AliPayTradeAppPayResponse(
-    code: json['code'] as String,
+      code: json['code'] as String,
-    msg: json['msg'] as String,
+      msg: json['msg'] as String,
-    appId: json['app_id'] as String,
+      appId: json['app_id'] as String,
-    outTradeNo: json['out_trade_no'] as String,
+      outTradeNo: json['out_trade_no'] as String,
-    tradeNo: json['trade_no'] as String,
+      tradeNo: json['trade_no'] as String,
-    totalAmount: json['total_amount'] as String,
+      totalAmount: json['total_amount'] as String,
-    sellerId: json['seller_id'] as String,
+      sellerId: json['seller_id'] as String,
-    charset: json['charset'] as String,
+      charset: json['charset'] as String,
-    timestamp: json['timestamp'] as String,
+      timestamp: json['timestamp'] as String,
-  );
+    );
-}

lib/models/search/search_model.g.dart

@@ -6,17 +6,15 @@ part of 'search_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SearchModel _$SearchModelFromJson(Map<String, dynamic> json) {
+SearchModel _$SearchModelFromJson(Map<String, dynamic> json) => SearchModel(
-  return SearchModel(
+      activityVoList: (json['activityVoList'] as List<dynamic>)
-    activityVoList: (json['activityVoList'] as List<dynamic>)
+          .map((e) => e == null
-        .map((e) => e == null
+              ? null
-            ? null
+              : ActivityItemModel.fromJson(e as Map<String, dynamic>))
-            : ActivityItemModel.fromJson(e as Map<String, dynamic>))
+          .toList(),
-        .toList(),
+      gambitVoList: (json['gambitVoList'] as List<dynamic>)
-    gambitVoList: (json['gambitVoList'] as List<dynamic>)
+          .map((e) => e == null
-        .map((e) => e == null
+              ? null
-            ? null
+              : CommunityTopicModel.fromJson(e as Map<String, dynamic>))
-            : CommunityTopicModel.fromJson(e as Map<String, dynamic>))
+          .toList(),
-        .toList(),
+    );
-  );
-}

lib/models/service_browse/service_browse_list_mode.g.dart

@@ -7,11 +7,10 @@ part of 'service_browse_list_mode.dart';
 // **************************************************************************
 
 ServiceBrowseListModel _$ServiceBrowseListModelFromJson(
-    Map<String, dynamic> json) {
+        Map<String, dynamic> json) =>
-  return ServiceBrowseListModel(
+    ServiceBrowseListModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    name: json['name'] as String,
+      name: json['name'] as String,
-    content: json['content'] as String,
+      content: json['content'] as String,
-    createDate: json['createDate'] as String,
+      createDate: json['createDate'] as String,
-  );
+    );
-}

lib/models/user/passed_house_list_model.g.dart

@@ -6,14 +6,14 @@ part of 'passed_house_list_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-PassedHouseListModel _$PassedHouseListModelFromJson(Map<String, dynamic> json) {
+PassedHouseListModel _$PassedHouseListModelFromJson(
-  return PassedHouseListModel(
+        Map<String, dynamic> json) =>
-    id: json['id'] as int,
+    PassedHouseListModel(
-    estateId: json['estateId'] as int,
+      id: json['id'] as int,
-    roomName: json['roomName'] as String,
+      estateId: json['estateId'] as int,
-    type: json['type'] as int,
+      roomName: json['roomName'] as String,
-    effectiveTimeStart: json['effectiveTimeStart'] as String?,
+      type: json['type'] as int,
-    effectiveTimeEnd: json['effectiveTimeEnd'] as String?,
+      effectiveTimeStart: json['effectiveTimeStart'] as String?,
-    sysLeaseId: json['sysLeaseId'] as int?,
+      effectiveTimeEnd: json['effectiveTimeEnd'] as String?,
-  );
+      sysLeaseId: json['sysLeaseId'] as int?,
-}
+    );

lib/models/user/user_info_model.g.dart

@@ -6,16 +6,15 @@ part of 'user_info_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-UserInfoModel _$UserInfoModelFromJson(Map<String, dynamic> json) {
+UserInfoModel _$UserInfoModelFromJson(Map<String, dynamic> json) =>
-  return UserInfoModel(
+    UserInfoModel(
-    id: json['id'] as int,
+      id: json['id'] as int,
-    imgUrls: (json['imgUrls'] as List<dynamic>)
+      imgUrls: (json['imgUrls'] as List<dynamic>)
-        .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
+          .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
-        .toList(),
+          .toList(),
-    name: json['name'] as String?,
+      name: json['name'] as String?,
-    nickName: json['nickName'] as String,
+      nickName: json['nickName'] as String,
-    tel: json['tel'] as String,
+      tel: json['tel'] as String,
-    sex: json['sex'] as int?,
+      sex: json['sex'] as int?,
-    birthday: json['birthday'] as String?,
+      birthday: json['birthday'] as String?,
-  );
+    );
-}

lib/pages/event_activity/voting_detail_page.dart

@@ -15,7 +15,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class VotingDetailPage extends StatefulWidget {
   final int? id;

lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart

@@ -1,6 +1,5 @@
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/animated/animated_scale.dart';
 import 'package:flutter/material.dart';
 
 class CommonRadio<T> extends StatefulWidget {
@@ -46,6 +45,7 @@ class _CommonRadioState extends State<CommonRadio> {
             opacity: _selected ? 1 : 0,
             child: AnimatedScale(
               scale: _selected ? 1 : 0,
+              duration: Duration(milliseconds: 500),
               child: Container(
                 height: smallSize,
                 width: smallSize,

lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart

@@ -5,7 +5,6 @@ import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/model/manager/article_borrow_detail_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/animated/animated_scale.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/radio_button.dart';
 import 'package:flutter/material.dart';
@@ -105,6 +104,7 @@ class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
           opacity: allSelect ? 1 : 0,
           child: AnimatedScale(
             scale: allSelect ? 1 : 0,
+            duration: Duration(milliseconds: 500),
             child: Container(
               height: 24.w,
               width: 24.w,

lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart

@@ -6,7 +6,6 @@ import 'package:aku_new_community/model/manager/article_return_list_model.dart';
 import 'package:aku_new_community/pages/goods_manage_page/borrow/borrow_examine_page.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/animated/animated_scale.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/radio_button.dart';
 import 'package:bot_toast/bot_toast.dart';
@@ -98,6 +97,7 @@ class _ReturnGoodsDetailPageState extends State<ReturnGoodsDetailPage> {
           opacity: allSelect ? 1 : 0,
           child: AnimatedScale(
             scale: allSelect ? 1 : 0,
+            duration: Duration(milliseconds: 500),
             child: Container(
               height: 24.w,
               width: 24.w,

lib/pages/message_center_page/announce/announce_card.dart

@@ -0,0 +1,85 @@
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/extensions/widget_list_ext.dart';
+import 'package:aku_new_community/models/message/announce_list_model.dart';
+import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
+import 'package:flustars/flustars.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class AnnounceCard extends StatelessWidget {
+  final ListDateModel modelList;
+  final int index;
+  const AnnounceCard({
+    Key? key,
+    required this.modelList,
+    required this.index,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          padding: EdgeInsets.symmetric(horizontal: 32.w),
+          alignment: Alignment.centerLeft,
+          width: double.infinity,
+          height: 98.w,
+          child: modelList.month.text.size(36.sp).black.make(),
+        ),
+        ...modelList.models
+            .map((e) => _card(e))
+            .toList()
+            .sepWidget(separate: 10.heightBox)
+      ],
+    );
+  }
+
+  Widget _card(AnnounceListModel model) {
+    return Container(
+      color: Colors.white,
+      padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          '${DateUtil.formatDateStr(model.date, format: 'dd日 HH:mm')}'
+              .text
+              .size(28.sp)
+              .color(ktextSubColor)
+              .make(),
+          32.w.heightBox,
+          '${model.title}'.text.size(36.sp).black.bold.make(),
+          32.w.heightBox,
+          '${model.content}'.text.size(28.sp).color(ktextSubColor).make(),
+          40.w.heightBox,
+          Container(
+            height: 72.w,
+            decoration: BoxDecoration(
+              border: Border(
+                top: BorderSide(
+                  color: Color(0xFF000000).withOpacity(0.06),
+                ),
+              ),
+            ),
+            child: InkWell(
+              onTap: () {},
+              child: Row(
+                children: [
+                  '查看详情'.text.size(24.w).color(ktextSubColor).make(),
+                  Spacer(),
+                  Icon(
+                    CupertinoIcons.chevron_down,
+                    size: 20.w,
+                  )
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/message_center_page/announce/announce_view.dart

@@ -0,0 +1,190 @@
+import 'package:aku_new_community/models/message/announce_list_model.dart';
+import 'package:aku_new_community/pages/message_center_page/announce/announce_card.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:scroll_to_index/scroll_to_index.dart';
+
+class ListDateModel {
+  final String month;
+  final int index;
+  final List<AnnounceListModel> models;
+
+  ListDateModel(this.month, this.models, this.index);
+}
+
+class AnnounceView extends StatefulWidget {
+  const AnnounceView({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  _AnnounceViewState createState() => _AnnounceViewState();
+}
+
+class _AnnounceViewState extends State<AnnounceView> {
+  EasyRefreshController _refreshController = EasyRefreshController();
+  late AutoScrollController _autoScrollController;
+
+  List<ListDateModel> _modelLists = [];
+  String _headMonth = '';
+
+  void monthListDepart(List<AnnounceListModel> models) {
+    for (var item in models) {
+      var index =
+          _modelLists.indexWhere((element) => element.month == item.month);
+      if (index >= 0) {
+        _modelLists[index].models.add(item.copyWith());
+      } else {
+        _modelLists.insert(_modelLists.length,
+            ListDateModel(item.month, [item.copyWith()], _modelLists.length));
+      }
+    }
+  }
+
+  @override
+  void initState() {
+    _autoScrollController = AutoScrollController(
+      viewportBoundaryGetter: () =>
+          Rect.fromLTRB(0, 0, 0, MediaQuery.of(context).padding.top + 130.w),
+      axis: Axis.vertical,
+    );
+
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _refreshController.dispose();
+    _autoScrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        // Offstage(
+        //   offstage: _modelLists.isEmpty,
+        //   child: Container(
+        //     padding: EdgeInsets.symmetric(horizontal: 32.w),
+        //     width: double.infinity,
+        //     color: Color(0xFFF9F9F9),
+        //     height: 98.w,
+        //     child: Row(
+        //       children: [
+        //         '$_headMonth'.text.size(36.sp).color(ktextPrimary).bold.make(),
+        //         20.w.widthBox,
+        //         _popupMenuButton(),
+        //       ],
+        //     ),
+        //   ),
+        // ),
+        Flexible(
+          child: EasyRefresh(
+            firstRefresh: true,
+            header: MaterialHeader(),
+            footer: MaterialFooter(),
+            scrollController: _autoScrollController,
+            onRefresh: () async {
+              _modelLists.clear();
+              monthListDepart([
+                AnnounceListModel(
+                    date: '2020-10-11 12:00:00',
+                    id: 1,
+                    content: 'aaaaaa',
+                    title: '11111'),
+                AnnounceListModel(
+                    date: '2020-10-11 12:00:00',
+                    id: 2,
+                    content: 'bbbbbbb',
+                    title: '222222'),
+                AnnounceListModel(
+                    date: '2020-11-11 12:00:00',
+                    id: 3,
+                    content: 'cccccccc',
+                    title: '33333'),
+                AnnounceListModel(
+                    date: '2020-11-11 12:00:00',
+                    id: 4,
+                    content: 'ddddddd',
+                    title: '44444'),
+                AnnounceListModel(
+                    date: '2020-12-11 12:00:00',
+                    id: 5,
+                    content: 'eeeeeee',
+                    title: '555555'),
+                AnnounceListModel(
+                    date: '2020-11-11 12:00:00',
+                    id: 5,
+                    content: 'eeeeeee',
+                    title: '555555'),
+              ]);
+              if (_modelLists.isNotEmpty) {
+                _headMonth = _modelLists[0].month;
+              }
+              setState(() {});
+            },
+            onLoad: () async {},
+            child: _modelLists.isEmpty
+                ? Container()
+                : ListView.separated(
+                    shrinkWrap: true,
+                    controller: _autoScrollController,
+                    itemBuilder: (context, index) {
+                      return AutoScrollTag(
+                        key: ValueKey(index),
+                        index: index,
+                        controller: _autoScrollController,
+                        child: AnnounceCard(
+                          modelList: _modelLists[index],
+                          index: index,
+                        ),
+                      );
+                    },
+                    separatorBuilder: (_, index) => SizedBox(),
+                    // Container(
+                    //   padding: EdgeInsets.symmetric(horizontal: 32.w),
+                    //   alignment: Alignment.centerLeft,
+                    //   width: double.infinity,
+                    //   height: 98.w,
+                    //   child: _modelLists[index + 1]
+                    //       .month
+                    //       .text
+                    //       .size(36.sp)
+                    //       .black
+                    //       .make(),
+                    // ),
+                    itemCount: _modelLists.length),
+          ),
+        ),
+      ],
+    );
+  }
+
+  PopupMenuButton _popupMenuButton() {
+    return PopupMenuButton(
+      child: Icon(
+        CupertinoIcons.arrowtriangle_down_fill,
+        size: 24.w,
+      ),
+      itemBuilder: (context) {
+        return List.generate(
+            _modelLists.length,
+            (index) => PopupMenuItem(
+                  child: Text(_modelLists[index].month),
+                  value: _modelLists[index].index,
+                ));
+      },
+      onSelected: (value) {
+        _headMonth = _modelLists[value].month;
+        print(value);
+        _autoScrollController.scrollToIndex(value,
+            preferPosition: AutoScrollPosition.end);
+        setState(() {});
+      },
+    );
+  }
+}

lib/pages/message_center_page/message_center_page.dart

@@ -1,15 +1,11 @@
-import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
-import 'package:aku_new_community/pages/message_center_page/comment_message/comment_message_page.dart';
+import 'package:aku_new_community/pages/message_center_page/reply/replay_view.dart';
-import 'package:aku_new_community/pages/message_center_page/system_message/system_message_page.dart';
+import 'package:aku_new_community/pages/message_center_page/thumbs_up/thumbs_up_view.dart';
-import 'package:aku_new_community/provider/app_provider.dart';
-import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:badges/badges.dart';
+import 'package:aku_new_community/widget/buttons/all_select_button.dart';
+import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
 
 class MessageCenterPage extends StatefulWidget {
   MessageCenterPage({Key? key}) : super(key: key);
@@ -18,8 +14,23 @@ class MessageCenterPage extends StatefulWidget {
   _MessageCenterPageState createState() => _MessageCenterPageState();
 }
 
-class _MessageCenterPageState extends State<MessageCenterPage> {
+class _MessageCenterPageState extends State<MessageCenterPage>
+    with TickerProviderStateMixin {
   EasyRefreshController _refreshController = EasyRefreshController();
+  List<String> _tabs = ['回复我的', '收到的赞', '通知公告'];
+  late final TabController _tabController;
+  bool inEdit = false;
+
+  @override
+  void initState() {
+    _tabController = TabController(length: _tabs.length, vsync: this);
+    _tabController.addListener(() {
+      if (_tabController.indexIsChanging) {
+        setState(() {});
+      }
+    });
+    super.initState();
+  }
 
   @override
   void dispose() {
@@ -27,101 +38,37 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
     super.dispose();
   }
 
-  Widget _buildCard({
-    required String path,
-    required String title,
-    required String content,
-    int? count,
-    VoidCallback? onTap,
-  }) {
-    return InkWell(
-      onTap: onTap,
-      child: Container(
-        padding: EdgeInsets.fromLTRB(28.w, 32.w, 28.w, 20.w),
-        child: Row(
-          children: [
-            SizedBox(
-                width: 90.w,
-                height: 90.w,
-                child: Badge(
-                  child: Image.asset(path),
-                  showBadge: count != 0,
-                  elevation: 0,
-                  position: BadgePosition.topEnd(top: 8.w, end: 8.w),
-                )),
-            15.w.widthBox,
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                title.text.black.bold.size(32.sp).make(),
-                5.w.heightBox,
-                (content).text.black.size(28.sp).make(),
-              ],
-            ).expand()
-          ],
-        ),
-      ),
-    ).material(color: Colors.transparent);
-  }
-
   @override
   Widget build(BuildContext context) {
-    AppProvider appProvider = Provider.of<AppProvider>(context);
     return BeeScaffold(
-        title: '消息中心',
+      title: '消息',
-        actions: [
+      actions: [
-          MaterialButton(
+        // MaterialButton(
-            onPressed: () async {
+        //   onPressed: () async {
-              await NetUtil().dio!.get(API.message.allRead);
+        //     setState(() {});
-              _refreshController.callRefresh();
+        //   },
-              setState(() {});
+        //   child: '${inEdit ? '取消' : '编辑'}'.text.size(28.sp).black.make(),
-            },
+        //   padding: EdgeInsets.symmetric(horizontal: 32.w),
-            child: '全部已读'.text.size(28.sp).black.make(),
+        // ),
-            padding: EdgeInsets.symmetric(horizontal: 32.w),
+      ],
-          ),
+      appBarBottom: BeeTabBar(
+        controller: _tabController,
+        tabs: _tabs,
+      ),
+      body: TabBarView(
+        children: [
+          ReplayView(),
+          ThumbsUpView(),
+          AnnounceView(),
         ],
-        body: EasyRefresh(
+        controller: _tabController,
-          header: MaterialHeader(),
+      ),
-          firstRefresh: true,
+      bottomNavi: Offstage(
-          controller: _refreshController,
+          offstage: !inEdit,
-          onRefresh: () async {
+          child: AllSelectButton(
-            appProvider.getMessageCenter();
+            onPressed: () {},
-          },
+            selected: true,
-          child: Column(
+          )),
-            children: [
+    );
-              _buildCard(
-                path: R.ASSETS_ICONS_SYSTEM_NOTICE_PNG,
-                title: '系统通知',
-                content: appProvider.messageCenterModel.sysTitle ?? '无系统通知消息',
-                count: appProvider.messageCenterModel.sysCount ?? 0,
-                onTap: () async {
-                  await NetUtil().dio!.get(API.message.allReadComment);
-                  await Get.to(() => SystemMessagePage());
-                  _refreshController.callRefresh();
-                  setState(() {});
-                },
-              ),
-              _buildCard(
-                path: R.ASSETS_ICONS_COMMENT_NOTICE_PNG,
-                title: '评论通知',
-                content:
-                    appProvider.messageCenterModel.commentTitle ?? '无评论通知消息',
-                count: appProvider.messageCenterModel.commentCount ?? 0,
-                onTap: () async {
-                  await NetUtil().dio!.get(API.message.allReadComment);
-                  await Get.to(() => CommentMessagePage());
-                  _refreshController.callRefresh();
-                  setState(() {});
-                },
-              ),
-              // _buildCard(
-              //   path: R.ASSETS_ICONS_SHOP_NOTICE_PNG,
-              //   title: '商城通知',
-              //   content: '',
-              //   count: 0,
-              // )
-            ],
-          ),
-        ));
   }
 }

lib/pages/message_center_page/reply/replay_view.dart

@@ -0,0 +1,46 @@
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class ReplayView extends StatefulWidget {
+  const ReplayView({Key? key}) : super(key: key);
+
+  @override
+  _ReplayViewState createState() => _ReplayViewState();
+}
+
+class _ReplayViewState extends State<ReplayView> {
+  EasyRefreshController _refreshController = EasyRefreshController();
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _refreshController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BeeListView(
+        path: API.host,
+        controller: _refreshController,
+        convert: (json) {
+          return [];
+        },
+        builder: (items) {
+          return ListView.separated(
+              itemBuilder: (context, index) {
+                return Container();
+              },
+              separatorBuilder: (_, __) => 20.w.heightBox,
+              itemCount: items.length);
+        });
+  }
+}

lib/pages/message_center_page/reply/reply_card.dart

@@ -0,0 +1,54 @@
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/models/message/reply_list_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class ReplyCard extends StatelessWidget {
+  final ReplyListModel model;
+
+  const ReplyCard({Key? key, required this.model}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 48.w),
+      child: Row(
+        children: [
+          ClipOval(
+            child: Image.network(
+              API.image(model.img.url),
+              width: 100.w,
+              height: 100.w,
+            ),
+          ),
+          24.w.widthBox,
+          SizedBox(
+            width: 350.w,
+            child: Column(
+              children: [
+                model.title.text.size(26.sp).black.bold.make(),
+                model.content.text
+                    .size(24.sp)
+                    .color(ktextSubColor)
+                    .maxLines(1)
+                    .ellipsis
+                    .make(),
+                model.date.text.size(24.sp).color(ktextSubColor).make(),
+              ],
+            ),
+          ),
+          ClipRRect(
+            borderRadius: BorderRadius.circular(9.w),
+            child: Image.network(
+              API.image(model.pic.url),
+              width: 128.w,
+              height: 128.w,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart

@@ -0,0 +1,51 @@
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/gen/assets.gen.dart';
+import 'package:aku_new_community/models/message/reply_list_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class thumbs_up_card extends StatelessWidget {
+  final ReplyListModel model;
+
+  const thumbs_up_card({Key? key, required this.model}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 48.w),
+      child: Row(
+        children: [
+          ClipOval(
+            child: Image.network(
+              API.image(model.img.url),
+              width: 100.w,
+              height: 100.w,
+            ),
+          ),
+          24.w.widthBox,
+          SizedBox(
+            width: 350.w,
+            child: Column(
+              children: [
+                model.name.text.size(26.sp).black.bold.make(),
+                Assets.icons.communityLikeIs
+                    .image(width: 28.w, height: 28.w, fit: BoxFit.contain),
+                model.date.text.size(24.sp).color(ktextSubColor).make(),
+              ],
+            ),
+          ),
+          ClipRRect(
+            borderRadius: BorderRadius.circular(9.w),
+            child: Image.network(
+              API.image(model.pic.url),
+              width: 128.w,
+              height: 128.w,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart

@@ -0,0 +1,39 @@
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class ThumbsUpView extends StatefulWidget {
+  const ThumbsUpView({Key? key}) : super(key: key);
+
+  @override
+  _ThumbsUpViewState createState() => _ThumbsUpViewState();
+}
+
+class _ThumbsUpViewState extends State<ThumbsUpView> {
+  EasyRefreshController _refreshController = EasyRefreshController();
+
+  @override
+  void dispose() {
+    _refreshController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BeeListView(
+        path: API.host,
+        controller: _refreshController,
+        convert: (json) => [],
+        builder: (items) {
+          return ListView.separated(
+              itemBuilder: (context, index) {
+                return Container();
+              },
+              separatorBuilder: (_, __) => 20.w.heightBox,
+              itemCount: items.length);
+        });
+  }
+}

lib/pages/one_alarm/widget/alarm_page.dart

@@ -62,6 +62,8 @@ class _AlarmPageState extends State<AlarmPage> {
         alignment: Alignment.topCenter,
         children: [
           AMapWidget(
+            privacyStatement: AMapPrivacyStatement(
+                hasContains: true, hasShow: true, hasAgree: true),
             onMapCreated: (controller) {
               final appProvider =
                   Provider.of<AppProvider>(context, listen: false);

lib/pages/sign/login_page.dart

@@ -0,0 +1,62 @@
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/widget/bee_scaffold.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class LoginPage extends StatefulWidget {
+  const LoginPage({Key? key}) : super(key: key);
+
+  @override
+  _LoginPageState createState() => _LoginPageState();
+}
+
+class _LoginPageState extends State<LoginPage> {
+  @override
+  Widget build(BuildContext context) {
+    return BeeScaffold(
+      body: Column(
+        children: [
+          '登录解锁更多功能'.text.size(36.sp).color(ktextPrimary).bold.make(),
+          144.w.heightBox,
+          Column(
+            children: [
+              '${'154793018'}'.text.size(36.sp).color(ktextPrimary).bold.make(),
+              40.w.heightBox,
+              MaterialButton(
+                onPressed: () {},
+                elevation: 0,
+                height: 45.w,
+                minWidth: 256.w,
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(60.w)),
+                child: '本机号码一键登录'.text.size(32.sp).black.bold.make(),
+              )
+            ],
+          ),
+          Spacer(),
+          RichText(
+              text: TextSpan(
+                  style: TextStyle(
+                    fontSize: 24.sp,
+                    color: ktextSubColor,
+                  ),
+                  text: '注册/登记即代表同意',
+                  children: [
+                WidgetSpan(
+                    child: InkWell(
+                  onTap: () {
+                    //TODO:跳转隐私政策
+                  },
+                  child: '《小蜜蜂隐私政策及用户协议》'
+                      .text
+                      .size(24.sp)
+                      .color(Color(0xFF5096F1))
+                      .make(),
+                )),
+              ])),
+        ],
+      ),
+    );
+  }
+}

lib/pages/sign/sign_up/sign_up_verify_page.dart

@@ -6,7 +6,6 @@ import 'package:aku_new_community/utils/headers.dart';
 import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class SignUpVerifyPage extends StatefulWidget {
   SignUpVerifyPage({Key? key}) : super(key: key);

lib/pages/splash/splash_page.dart

@@ -10,6 +10,7 @@ import 'package:aku_new_community/provider/user_provider.dart';
 import 'package:aku_new_community/utils/developer_util.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/hive_store.dart';
+import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
@@ -90,7 +91,6 @@ class _SplashPageState extends State<SplashPage> {
 
           // ),
           actions: [
-
             CupertinoDialogAction(
               child: Text('拒绝'),
               onPressed: () => Get.back(result: false),
@@ -116,7 +116,6 @@ class _SplashPageState extends State<SplashPage> {
 
     Future.delayed(Duration(milliseconds: 0), () async {
       await _originOp();
-
       var agreement = await HiveStore.appBox?.get('agreement') ?? false;
       if (!agreement) {
         var result = await _showLoginVerify();
@@ -133,6 +132,8 @@ class _SplashPageState extends State<SplashPage> {
         await Permission.locationWhenInUse.request();
       }
       await _initOp();
+      AMapFlutterLocation.updatePrivacyShow(true, true);
+      AMapFlutterLocation.updatePrivacyAgree(true);
       MainInitialize.initTheme();
       MainInitialize.initWechat();
       MainInitialize.initWebSocket();

lib/pages/tab_navigator.dart

@@ -13,7 +13,6 @@ import 'package:aku_new_community/utils/websocket/web_socket_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
 import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';

lib/widget/buttons/all_select_button.dart

@@ -0,0 +1,51 @@
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class AllSelectButton extends StatelessWidget {
+  final VoidCallback onPressed;
+  final Color? backColor;
+  final bool selected;
+  final Widget? indent;
+
+  const AllSelectButton(
+      {Key? key,
+      required this.onPressed,
+      this.backColor,
+      required this.selected,
+      this.indent})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedContainer(
+      height: 40.w,
+      width: 40.w,
+      decoration: BoxDecoration(
+        color: (backColor ?? kPrimaryColor).withOpacity(selected ? 1 : 0),
+        border: Border.all(
+          color: backColor != null
+              ? Color(0xFFBBBBBB)
+              : (selected ? kPrimaryColor : Color(0xFF979797)),
+          width: 3.w,
+        ),
+        borderRadius: BorderRadius.circular(20.w),
+      ),
+      duration: Duration(milliseconds: 300),
+      curve: Curves.easeInOutCubic,
+      alignment: Alignment.center,
+      child: AnimatedOpacity(
+        duration: Duration(milliseconds: 500),
+        curve: Curves.easeInOutCubic,
+        opacity: selected ? 1 : 0,
+        child: indent ??
+            Icon(
+              CupertinoIcons.checkmark,
+              color: Colors.white,
+              size: 28.w,
+            ),
+      ),
+    );
+  }
+}

lib/widget/buttons/radio_button.dart

@@ -1,6 +1,5 @@
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/animated/animated_scale.dart';
 import 'package:flutter/material.dart';
 
 class BeeRadio<T> extends StatefulWidget {
@@ -41,6 +40,7 @@ class _BeeRadioState extends State<BeeRadio> {
         opacity: _selected ? 1 : 0,
         child: AnimatedScale(
           scale: _selected ? 1 : 0,
+          duration: Duration(milliseconds: 500),
           child: Container(
             height: 24.w,
             width: 24.w,

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "22.0.0"
+    version: "31.0.0"
   advance_pdf_viewer:
     dependency: "direct main"
     description:
@@ -21,28 +21,28 @@ packages:
       name: amap_flutter_base
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   amap_flutter_location:
     dependency: "direct main"
     description:
       name: amap_flutter_location
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   amap_flutter_map:
     dependency: "direct main"
     description:
       name: amap_flutter_map
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.1"
+    version: "2.8.0"
   animated_text_kit:
     dependency: "direct main"
     description:
@@ -70,7 +70,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.2"
   auto_size_text_pk:
     dependency: transitive
     description:
@@ -189,14 +189,14 @@ packages:
       name: characters
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -232,6 +232,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
+  color:
+    dependency: transitive
+    description:
+      name: color
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.0"
   common_utils:
     dependency: transitive
     description:
@@ -274,6 +281,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
+  dartx:
+    dependency: transitive
+    description:
+      name: dartx
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.8.0"
   decimal:
     dependency: transitive
     description:
@@ -419,6 +433,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.1"
+  flutter_gen_core:
+    dependency: transitive
+    description:
+      name: flutter_gen_core
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.1.3"
+  flutter_gen_runner:
+    dependency: "direct dev"
+    description:
+      name: flutter_gen_runner
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.1.3"
   flutter_highlight:
     dependency: transitive
     description:
@@ -659,16 +687,16 @@ packages:
       name: json_annotation
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.1"
+    version: "4.4.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.1.4"
+    version: "6.1.3"
   logger:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: logger
       url: "https://pub.flutter-io.cn"
@@ -687,14 +715,14 @@ packages:
       name: matcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   mime:
     dependency: transitive
     description:
@@ -970,6 +998,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.27.1"
+  scroll_to_index:
+    dependency: "direct main"
+    description:
+      name: scroll_to_index
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.1"
   share:
     dependency: "direct main"
     description:
@@ -1072,7 +1107,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sp_util:
     dependency: transitive
     description:
@@ -1142,7 +1177,14 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.3"
+  time:
+    dependency: transitive
+    description:
+      name: time
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.0"
   timing:
     dependency: transitive
     description:
@@ -1233,7 +1275,7 @@ packages:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   velocity_x:
     dependency: "direct main"
     description:
@@ -1298,5 +1340,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=2.0.0"

pubspec.yaml

@@ -61,8 +61,6 @@ dependencies:
   #本地化存储
   hive: ^2.0.4
   hive_flutter: ^1.0.0
-  #调试信息
-  logger: ^1.0.0
   #刷新组件
   flutter_easyrefresh: ^2.2.1
   #随机昵称
@@ -83,9 +81,9 @@ dependencies:
   #角标
   badges: ^2.0.0-nullsafety.1
   #高德地图相关
-  amap_flutter_map: ^2.0.1
+  amap_flutter_map: ^3.0.0
-  amap_flutter_location: ^2.0.0
+  amap_flutter_location: ^3.0.0
-  amap_flutter_base: ^2.0.0
+  amap_flutter_base: ^3.0.0
   #动态文字
   animated_text_kit: ^4.2.1
   #分享功能
@@ -109,6 +107,8 @@ dependencies:
   flutter_swiper_null_safety: ^1.0.2
   #划动组件
   carousel_slider: ^4.0.0-nullsafety.0
+  #跳转索引列表
+  scroll_to_index: ^2.1.1
 
 
 dev_dependencies:
@@ -121,10 +121,11 @@ dev_dependencies:
   grinder: ^0.9.0
   flutter_native_splash: ^1.1.8+4
   #model自动生成
-  json_serializable: ^4.1.1
+  json_serializable: ^6.1.3
   build_runner: ^2.0.2
   yaml: ^3.1.0
   pub_semver: ^2.0.0
+  flutter_gen_runner: ^4.1.3
 
 flutter:
   uses-material-design: true

tool/_project_manage.dart

@@ -36,14 +36,29 @@ void gitPush() {
 
 @Task('build runner')
 void gen() async {
-  await Pub.runAsync(
+  await runAsync(
-    'build_runner',
+    'fvm',
-    arguments: ['build'],
+    arguments: [
+      'flutter',
+      'pub',
+      'run',
+      'build_runner',
+      'build',
+    ],
   );
 }
 
 @Task('build runner clean')
 void genClean() async {
-  await Pub.runAsync('build_runner',
+  await runAsync(
-      arguments: ['build', '--delete-conflicting-outputs']);
+    'fvm',
+    arguments: [
+      'flutter',
+      'pub',
+      'run',
+      'build_runner',
+      'build',
+      '--delete-conflicting-outputs'
+    ],
+  );
 }

tool/config.dart

@@ -1,6 +1,6 @@
 class Config {
   ///用户根目录
-  static const String homeDir = '/users/datang';
+  static const String homeDir = '/users/zhangmeng';
 
   ///包名
   static const String packageName = 'aku_new_community';
@@ -11,9 +11,9 @@ class Config {
 
   ///测试包文件夹
   static String get apkDevDir =>
-      '/users/datang/team/bee/app/aku_new_community/dev';
+      '/users/zhangmeng/team/bee/app/aku_new_community/dev';
 
   ///正式包文件夹
   static String get apkDir =>
-      '/users/datang/team/bee/app/aku_new_community/release';
+      '/users/zhangmeng/team/bee/app/aku_new_community/release';
 }