diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index cd8f984..1522919 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -3,128 +3,257 @@ /// FlutterGen /// ***************************************************** +// ignore_for_file: directives_ordering,unnecessary_import + import 'package:flutter/widgets.dart'; class $AssetsHomeGen { const $AssetsHomeGen(); + /// File path: assets/home/app_alarm.png AssetGenImage get appAlarm => const AssetGenImage('assets/home/app_alarm.png'); + + /// File path: assets/home/bee_task.png AssetGenImage get beeTask => const AssetGenImage('assets/home/bee_task.png'); + + /// File path: assets/home/clock_in_out.png AssetGenImage get clockInOut => const AssetGenImage('assets/home/clock_in_out.png'); + + /// File path: assets/home/device_alarm.png AssetGenImage get deviceAlarm => const AssetGenImage('assets/home/device_alarm.png'); + + /// File path: assets/home/facilities.png AssetGenImage get facilities => const AssetGenImage('assets/home/facilities.png'); + + /// File path: assets/home/fire_alarm.png AssetGenImage get fireAlarm => const AssetGenImage('assets/home/fire_alarm.png'); + + /// File path: assets/home/home_back.png AssetGenImage get homeBack => const AssetGenImage('assets/home/home_back.png'); + + /// File path: assets/home/home_head.png AssetGenImage get homeHead => const AssetGenImage('assets/home/home_head.png'); + + /// File path: assets/home/house_keeping.png AssetGenImage get houseKeeping => const AssetGenImage('assets/home/house_keeping.png'); + + /// File path: assets/home/hygienice.png AssetGenImage get hygienice => const AssetGenImage('assets/home/hygienice.png'); + + /// File path: assets/home/ic_Patrol.png AssetGenImage get icPatrol => const AssetGenImage('assets/home/ic_Patrol.png'); + + /// File path: assets/home/ic_activity.png AssetGenImage get icActivity => const AssetGenImage('assets/home/ic_activity.png'); + + /// File path: assets/home/ic_all.png AssetGenImage get icAll => const AssetGenImage('assets/home/ic_all.png'); + + /// File path: assets/home/ic_article.png AssetGenImage get icArticle => const AssetGenImage('assets/home/ic_article.png'); + + /// File path: assets/home/ic_borrow.png AssetGenImage get icBorrow => const AssetGenImage('assets/home/ic_borrow.png'); + + /// File path: assets/home/ic_decoration.png AssetGenImage get icDecoration => const AssetGenImage('assets/home/ic_decoration.png'); + + /// File path: assets/home/ic_facilities.png AssetGenImage get icFacilities => const AssetGenImage('assets/home/ic_facilities.png'); + + /// File path: assets/home/ic_greening.png AssetGenImage get icGreening => const AssetGenImage('assets/home/ic_greening.png'); + + /// File path: assets/home/ic_news.png AssetGenImage get icNews => const AssetGenImage('assets/home/ic_news.png'); + + /// File path: assets/home/ic_police.png AssetGenImage get icPolice => const AssetGenImage('assets/home/ic_police.png'); + + /// File path: assets/home/ic_scan.png AssetGenImage get icScan => const AssetGenImage('assets/home/ic_scan.png'); + + /// File path: assets/home/ic_search.png AssetGenImage get icSearch => const AssetGenImage('assets/home/ic_search.png'); + + /// File path: assets/home/ic_service.png AssetGenImage get icService => const AssetGenImage('assets/home/ic_service.png'); + + /// File path: assets/home/ic_visitors.png AssetGenImage get icVisitors => const AssetGenImage('assets/home/ic_visitors.png'); + + /// File path: assets/home/interview.png AssetGenImage get interview => const AssetGenImage('assets/home/interview.png'); + + /// File path: assets/home/key.png AssetGenImage get key => const AssetGenImage('assets/home/key.png'); + + /// File path: assets/home/message.png AssetGenImage get message => const AssetGenImage('assets/home/message.png'); + + /// File path: assets/home/nearby_pet.png AssetGenImage get nearbyPet => const AssetGenImage('assets/home/nearby_pet.png'); + + /// File path: assets/home/nearby_service.png AssetGenImage get nearbyService => const AssetGenImage('assets/home/nearby_service.png'); + + /// File path: assets/home/package.png AssetGenImage get package => const AssetGenImage('assets/home/package.png'); + + /// File path: assets/home/provide_aged.png AssetGenImage get provideAged => const AssetGenImage('assets/home/provide_aged.png'); + + /// File path: assets/home/rules.png AssetGenImage get rules => const AssetGenImage('assets/home/rules.png'); + + /// File path: assets/home/second_hand_market.png AssetGenImage get secondHandMarket => const AssetGenImage('assets/home/second_hand_market.png'); + + /// File path: assets/home/share_park.png AssetGenImage get sharePark => const AssetGenImage('assets/home/share_park.png'); + + /// File path: assets/home/shopping_mall.png AssetGenImage get shoppingMall => const AssetGenImage('assets/home/shopping_mall.png'); + + /// File path: assets/home/sos.png AssetGenImage get sos => const AssetGenImage('assets/home/sos.png'); } class $AssetsIconsGen { const $AssetsIconsGen(); + /// File path: assets/icons/alarm_clock.png AssetGenImage get alarmClock => const AssetGenImage('assets/icons/alarm_clock.png'); + + /// File path: assets/icons/camera.png AssetGenImage get camera => const AssetGenImage('assets/icons/camera.png'); + + /// File path: assets/icons/cancel_task.png AssetGenImage get cancelTask => const AssetGenImage('assets/icons/cancel_task.png'); + + /// File path: assets/icons/clock_circle.png AssetGenImage get clockCircle => const AssetGenImage('assets/icons/clock_circle.png'); + + /// File path: assets/icons/connect.png AssetGenImage get connect => const AssetGenImage('assets/icons/connect.png'); + + /// File path: assets/icons/copy.png AssetGenImage get copy => const AssetGenImage('assets/icons/copy.png'); + + /// File path: assets/icons/dissatisfied.png AssetGenImage get dissatisfied => const AssetGenImage('assets/icons/dissatisfied.png'); + + /// File path: assets/icons/edit.png AssetGenImage get edit => const AssetGenImage('assets/icons/edit.png'); + + /// File path: assets/icons/environment.png AssetGenImage get environment => const AssetGenImage('assets/icons/environment.png'); + + /// File path: assets/icons/examining.png AssetGenImage get examining => const AssetGenImage('assets/icons/examining.png'); + + /// File path: assets/icons/finish_order.png AssetGenImage get finishOrder => const AssetGenImage('assets/icons/finish_order.png'); + + /// File path: assets/icons/normal.png AssetGenImage get normal => const AssetGenImage('assets/icons/normal.png'); + + /// File path: assets/icons/pass.png AssetGenImage get pass => const AssetGenImage('assets/icons/pass.png'); + + /// File path: assets/icons/phone.png AssetGenImage get phone => const AssetGenImage('assets/icons/phone.png'); + + /// File path: assets/icons/phone_circle.png AssetGenImage get phoneCircle => const AssetGenImage('assets/icons/phone_circle.png'); + + /// File path: assets/icons/record.png AssetGenImage get record => const AssetGenImage('assets/icons/record.png'); + + /// File path: assets/icons/reject.png AssetGenImage get reject => const AssetGenImage('assets/icons/reject.png'); + + /// File path: assets/icons/reward.png AssetGenImage get reward => const AssetGenImage('assets/icons/reward.png'); + + /// File path: assets/icons/satisfied.png AssetGenImage get satisfied => const AssetGenImage('assets/icons/satisfied.png'); + + /// File path: assets/icons/tag.png AssetGenImage get tag => const AssetGenImage('assets/icons/tag.png'); + + /// File path: assets/icons/task_location.png AssetGenImage get taskLocation => const AssetGenImage('assets/icons/task_location.png'); + + /// File path: assets/icons/watch.png AssetGenImage get watch => const AssetGenImage('assets/icons/watch.png'); } class $AssetsInspectionGen { const $AssetsInspectionGen(); + /// File path: assets/inspection/ic_date.png AssetGenImage get icDate => const AssetGenImage('assets/inspection/ic_date.png'); + + /// File path: assets/inspection/ic_inspection_name.png AssetGenImage get icInspectionName => const AssetGenImage('assets/inspection/ic_inspection_name.png'); + + /// File path: assets/inspection/ic_pattern.png AssetGenImage get icPattern => const AssetGenImage('assets/inspection/ic_pattern.png'); + + /// File path: assets/inspection/ic_station.png AssetGenImage get icStation => const AssetGenImage('assets/inspection/ic_station.png'); + + /// File path: assets/inspection/ic_way.png AssetGenImage get icWay => const AssetGenImage('assets/inspection/ic_way.png'); + + /// File path: assets/inspection/ic_xunjian.png AssetGenImage get icXunjian => const AssetGenImage('assets/inspection/ic_xunjian.png'); + + /// File path: assets/inspection/inspection_station.png AssetGenImage get inspectionStation => const AssetGenImage('assets/inspection/inspection_station.png'); } @@ -132,72 +261,156 @@ class $AssetsInspectionGen { class $AssetsManageGen { const $AssetsManageGen(); + /// File path: assets/manage/add.png AssetGenImage get add => const AssetGenImage('assets/manage/add.png'); + + /// File path: assets/manage/address.png AssetGenImage get address => const AssetGenImage('assets/manage/address.png'); + + /// File path: assets/manage/article.png AssetGenImage get article => const AssetGenImage('assets/manage/article.png'); + + /// File path: assets/manage/borrow.png AssetGenImage get borrow => const AssetGenImage('assets/manage/borrow.png'); + + /// File path: assets/manage/check.png AssetGenImage get check => const AssetGenImage('assets/manage/check.png'); + + /// File path: assets/manage/circuit.png AssetGenImage get circuit => const AssetGenImage('assets/manage/circuit.png'); + + /// File path: assets/manage/clock.png AssetGenImage get clock => const AssetGenImage('assets/manage/clock.png'); + + /// File path: assets/manage/decoration.png AssetGenImage get decoration => const AssetGenImage('assets/manage/decoration.png'); + + /// File path: assets/manage/dingwei.png AssetGenImage get dingwei => const AssetGenImage('assets/manage/dingwei.png'); + + /// File path: assets/manage/estate.png AssetGenImage get estate => const AssetGenImage('assets/manage/estate.png'); + + /// File path: assets/manage/home.png AssetGenImage get home => const AssetGenImage('assets/manage/home.png'); + + /// File path: assets/manage/ic_announce.png AssetGenImage get icAnnounce => const AssetGenImage('assets/manage/ic_announce.png'); + + /// File path: assets/manage/ic_car.png AssetGenImage get icCar => const AssetGenImage('assets/manage/ic_car.png'); + + /// File path: assets/manage/ic_daofang.png AssetGenImage get icDaofang => const AssetGenImage('assets/manage/ic_daofang.png'); + + /// File path: assets/manage/ic_guoqi.png AssetGenImage get icGuoqi => const AssetGenImage('assets/manage/ic_guoqi.png'); + + /// File path: assets/manage/ic_image.png AssetGenImage get icImage => const AssetGenImage('assets/manage/ic_image.png'); + + /// File path: assets/manage/ic_renwu.png AssetGenImage get icRenwu => const AssetGenImage('assets/manage/ic_renwu.png'); + + /// File path: assets/manage/ic_time.png AssetGenImage get icTime => const AssetGenImage('assets/manage/ic_time.png'); + + /// File path: assets/manage/ic_wancheng.png AssetGenImage get icWancheng => const AssetGenImage('assets/manage/ic_wancheng.png'); + + /// File path: assets/manage/ic_weidao.png AssetGenImage get icWeidao => const AssetGenImage('assets/manage/ic_weidao.png'); + + /// File path: assets/manage/ic_zhuangxiu.png AssetGenImage get icZhuangxiu => const AssetGenImage('assets/manage/ic_zhuangxiu.png'); + + /// File path: assets/manage/ic_zuofei.png AssetGenImage get icZuofei => const AssetGenImage('assets/manage/ic_zuofei.png'); + + /// File path: assets/manage/info.png AssetGenImage get info => const AssetGenImage('assets/manage/info.png'); + + /// File path: assets/manage/key.png AssetGenImage get key => const AssetGenImage('assets/manage/key.png'); + + /// File path: assets/manage/location.png AssetGenImage get location => const AssetGenImage('assets/manage/location.png'); + + /// File path: assets/manage/lock.png AssetGenImage get lock => const AssetGenImage('assets/manage/lock.png'); + + /// File path: assets/manage/passed.png AssetGenImage get passed => const AssetGenImage('assets/manage/passed.png'); + + /// File path: assets/manage/police.png AssetGenImage get police => const AssetGenImage('assets/manage/police.png'); + + /// File path: assets/manage/rejected.png AssetGenImage get rejected => const AssetGenImage('assets/manage/rejected.png'); + + /// File path: assets/manage/remaining.png AssetGenImage get remaining => const AssetGenImage('assets/manage/remaining.png'); + + /// File path: assets/manage/security.png AssetGenImage get security => const AssetGenImage('assets/manage/security.png'); + + /// File path: assets/manage/status.png AssetGenImage get status => const AssetGenImage('assets/manage/status.png'); + + /// File path: assets/manage/submit_success.png AssetGenImage get submitSuccess => const AssetGenImage('assets/manage/submit_success.png'); + + /// File path: assets/manage/wall.png AssetGenImage get wall => const AssetGenImage('assets/manage/wall.png'); + + /// File path: assets/manage/warning.png AssetGenImage get warning => const AssetGenImage('assets/manage/warning.png'); + + /// File path: assets/manage/waterway.png AssetGenImage get waterway => const AssetGenImage('assets/manage/waterway.png'); + + /// File path: assets/manage/window.png AssetGenImage get window => const AssetGenImage('assets/manage/window.png'); } class $AssetsMessageGen { const $AssetsMessageGen(); + /// File path: assets/message/ic_area.png AssetGenImage get icArea => const AssetGenImage('assets/message/ic_area.png'); + + /// File path: assets/message/ic_people.png AssetGenImage get icPeople => const AssetGenImage('assets/message/ic_people.png'); + + /// File path: assets/message/ic_phone.png AssetGenImage get icPhone => const AssetGenImage('assets/message/ic_phone.png'); + + /// File path: assets/message/ic_pinglun.png AssetGenImage get icPinglun => const AssetGenImage('assets/message/ic_pinglun.png'); + + /// File path: assets/message/ic_star.png AssetGenImage get icStar => const AssetGenImage('assets/message/ic_star.png'); + + /// File path: assets/message/ic_tongzhi.png AssetGenImage get icTongzhi => const AssetGenImage('assets/message/ic_tongzhi.png'); } @@ -205,48 +418,89 @@ class $AssetsMessageGen { class $AssetsNewIconGen { const $AssetsNewIconGen(); + /// File path: assets/newIcon/avatar_placeholder.png AssetGenImage get avatarPlaceholder => const AssetGenImage('assets/newIcon/avatar_placeholder.png'); + + /// File path: assets/newIcon/splash.png AssetGenImage get splash => const AssetGenImage('assets/newIcon/splash.png'); } class $AssetsOutdoorGen { const $AssetsOutdoorGen(); + /// File path: assets/outdoor/ic_address.png AssetGenImage get icAddress => const AssetGenImage('assets/outdoor/ic_address.png'); + + /// File path: assets/outdoor/ic_chuhu.png AssetGenImage get icChuhu => const AssetGenImage('assets/outdoor/ic_chuhu.png'); + + /// File path: assets/outdoor/ic_goout.png AssetGenImage get icGoout => const AssetGenImage('assets/outdoor/ic_goout.png'); + + /// File path: assets/outdoor/ic_home.png AssetGenImage get icHome => const AssetGenImage('assets/outdoor/ic_home.png'); + + /// File path: assets/outdoor/ic_image.png AssetGenImage get icImage => const AssetGenImage('assets/outdoor/ic_image.png'); + + /// File path: assets/outdoor/ic_people.png AssetGenImage get icPeople => const AssetGenImage('assets/outdoor/ic_people.png'); + + /// File path: assets/outdoor/ic_phoneblue.png AssetGenImage get icPhoneblue => const AssetGenImage('assets/outdoor/ic_phoneblue.png'); + + /// File path: assets/outdoor/ic_time.png AssetGenImage get icTime => const AssetGenImage('assets/outdoor/ic_time.png'); + + /// File path: assets/outdoor/ic_transport.png AssetGenImage get icTransport => const AssetGenImage('assets/outdoor/ic_transport.png'); + + /// File path: assets/outdoor/ic_weight.png AssetGenImage get icWeight => const AssetGenImage('assets/outdoor/ic_weight.png'); + + /// File path: assets/outdoor/item2.png AssetGenImage get item2 => const AssetGenImage('assets/outdoor/item2.png'); + + /// File path: assets/outdoor/item3.png AssetGenImage get item3 => const AssetGenImage('assets/outdoor/item3.png'); + + /// File path: assets/outdoor/itme1.png AssetGenImage get itme1 => const AssetGenImage('assets/outdoor/itme1.png'); } class $AssetsStaticFixGen { const $AssetsStaticFixGen(); + /// File path: assets/static_fix/air1.png AssetGenImage get air1 => const AssetGenImage('assets/static_fix/air1.png'); + + /// File path: assets/static_fix/air2.png AssetGenImage get air2 => const AssetGenImage('assets/static_fix/air2.png'); + + /// File path: assets/static_fix/food.png AssetGenImage get food => const AssetGenImage('assets/static_fix/food.png'); + + /// File path: assets/static_fix/food2.png AssetGenImage get food2 => const AssetGenImage('assets/static_fix/food2.png'); + + /// File path: assets/static_fix/light1.png AssetGenImage get light1 => const AssetGenImage('assets/static_fix/light1.png'); + + /// File path: assets/static_fix/light2.png AssetGenImage get light2 => const AssetGenImage('assets/static_fix/light2.png'); + + /// File path: assets/static_fix/light3.png AssetGenImage get light3 => const AssetGenImage('assets/static_fix/light3.png'); } @@ -254,15 +508,30 @@ class $AssetsStaticFixGen { class $AssetsStaticTempGen { const $AssetsStaticTempGen(); + /// File path: assets/static_temp/drill.png AssetGenImage get drill => const AssetGenImage('assets/static_temp/drill.png'); + + /// File path: assets/static_temp/f1.webp AssetGenImage get f1 => const AssetGenImage('assets/static_temp/f1.webp'); + + /// File path: assets/static_temp/f2.webp AssetGenImage get f2 => const AssetGenImage('assets/static_temp/f2.webp'); + + /// File path: assets/static_temp/f3.webp AssetGenImage get f3 => const AssetGenImage('assets/static_temp/f3.webp'); + + /// File path: assets/static_temp/f4.webp AssetGenImage get f4 => const AssetGenImage('assets/static_temp/f4.webp'); + + /// File path: assets/static_temp/f5.webp AssetGenImage get f5 => const AssetGenImage('assets/static_temp/f5.webp'); + + /// File path: assets/static_temp/hammer.png AssetGenImage get hammer => const AssetGenImage('assets/static_temp/hammer.png'); + + /// File path: assets/static_temp/ladder.png AssetGenImage get ladder => const AssetGenImage('assets/static_temp/ladder.png'); } @@ -270,9 +539,14 @@ class $AssetsStaticTempGen { class $AssetsUserGen { const $AssetsUserGen(); + /// File path: assets/user/ic_kefu.png AssetGenImage get icKefu => const AssetGenImage('assets/user/ic_kefu.png'); + + /// File path: assets/user/ic_person.png AssetGenImage get icPerson => const AssetGenImage('assets/user/ic_person.png'); + + /// File path: assets/user/ic_setup.png AssetGenImage get icSetup => const AssetGenImage('assets/user/ic_setup.png'); } diff --git a/lib/gen/fonts.gen.dart b/lib/gen/fonts.gen.dart index 00c6094..69d5c31 100644 --- a/lib/gen/fonts.gen.dart +++ b/lib/gen/fonts.gen.dart @@ -3,8 +3,11 @@ /// FlutterGen /// ***************************************************** +// ignore_for_file: directives_ordering,unnecessary_import + class FontFamily { FontFamily._(); + /// Font family: Bebas static const String bebas = 'Bebas'; } diff --git a/lib/new_ui/new_home/new_home_page.dart b/lib/new_ui/new_home/new_home_page.dart index ba92e73..007ae15 100644 --- a/lib/new_ui/new_home/new_home_page.dart +++ b/lib/new_ui/new_home/new_home_page.dart @@ -91,21 +91,21 @@ class _NewHomePageState extends State { ), ), 24.w.widthBox, - SizedBox( - height: 40.w, - width: 40.w, - child: IconButton( - padding:EdgeInsets.zero, - onPressed: () { - Get.to(() => Message()); - }, - icon: Icon( - CupertinoIcons.bell, - size: 40.w, - ), - ), - ), - + //TODO：暂时隐藏 消息中心待做 + // SizedBox( + // height: 40.w, + // width: 40.w, + // child: IconButton( + // padding:EdgeInsets.zero, + // onPressed: () { + // Get.to(() => Message()); + // }, + // icon: Icon( + // CupertinoIcons.bell, + // size: 40.w, + // ), + // ), + // ) 24.w.widthBox, ], ), @@ -435,7 +435,7 @@ class _NewHomePageState extends State { borderRadius: BorderRadius.circular(4.w), ), child: - '${UserTool.userProvider.userInfoModel!.positionName}' + '${UserTool.userProvider.userInfoModel!.positionName??''}' .text .size(24.sp) .color(Colors.black.withOpacity(0.85)) diff --git a/lib/provider/message_provider.dart b/lib/provider/message_provider.dart index 17ac7de..745a978 100644 --- a/lib/provider/message_provider.dart +++ b/lib/provider/message_provider.dart @@ -1,4 +1,5 @@ import 'package:aku_new_community_manager/const/api.dart'; +import 'package:aku_new_community_manager/const/saas_api.dart'; import 'package:aku_new_community_manager/utils/network/net_util.dart'; import 'package:common_utils/common_utils.dart'; import 'package:dio/dio.dart'; @@ -36,7 +37,7 @@ class MessageProvider extends ChangeNotifier { } updateMessage() async { - Response response = await NetUtil().dio!.get(API.message.messageCenter); + Response response = await NetUtil().dio!.get(SAASAPI.message.messageList); if (response.data == null) return; _sysMessage = response.data['sysCount'] ?? 0; _commentMessage = response.data['commentCount'] ?? 0; diff --git a/lib/saas_models/login/community_model.g.dart b/lib/saas_models/login/community_model.g.dart index 2e34b47..1b55e04 100644 --- a/lib/saas_models/login/community_model.g.dart +++ b/lib/saas_models/login/community_model.g.dart @@ -2,6 +2,53 @@ part of 'community_model.dart'; +// ************************************************************************** +// TypeAdapterGenerator +// ************************************************************************** + +class CommunityModelAdapter extends TypeAdapter { + @override + final int typeId = 7; + + @override + CommunityModel read(BinaryReader reader) { + final numOfFields = reader.readByte(); + final fields = { + for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), + }; + return CommunityModel( + id: fields[0] as int, + name: fields[1] as String, + address: fields[2] as String, + addressDetails: fields[3] as String, + ); + } + + @override + void write(BinaryWriter writer, CommunityModel obj) { + writer + ..writeByte(4) + ..writeByte(0) + ..write(obj.id) + ..writeByte(1) + ..write(obj.name) + ..writeByte(2) + ..write(obj.address) + ..writeByte(3) + ..write(obj.addressDetails); + } + + @override + int get hashCode => typeId.hashCode; + + @override + bool operator ==(Object other) => + identical(this, other) || + other is CommunityModelAdapter && + runtimeType == other.runtimeType && + typeId == other.typeId; +} + // ************************************************************************** // JsonSerializableGenerator // ************************************************************************** diff --git a/lib/saas_models/user/user_info_model.dart b/lib/saas_models/user/user_info_model.dart index ddff59a..da8097a 100644 --- a/lib/saas_models/user/user_info_model.dart +++ b/lib/saas_models/user/user_info_model.dart @@ -21,11 +21,11 @@ class UserInfoModel extends Equatable { final String? lastLoginDate; final String? nickName; final String? address; - final String entryDate; + final String? entryDate; final String? remake; final List? imgList; final String communityName; - final String positionName; + final String? positionName; final int? workOrderJurisdiction; String get sexValue { diff --git a/lib/saas_models/user/user_info_model.g.dart b/lib/saas_models/user/user_info_model.g.dart index 2582ca9..980c27c 100644 --- a/lib/saas_models/user/user_info_model.g.dart +++ b/lib/saas_models/user/user_info_model.g.dart @@ -22,12 +22,12 @@ UserInfoModel _$UserInfoModelFromJson(Map json) => lastLoginDate: json['lastLoginDate'] as String?, nickName: json['nickName'] as String?, address: json['address'] as String?, - entryDate: json['entryDate'] as String, + entryDate: json['entryDate'] as String?, remake: json['remake'] as String?, imgList: (json['imgList'] as List?) ?.map((e) => ImgModel.fromJson(e as Map)) .toList(), communityName: json['communityName'] as String, - positionName: json['positionName'] as String, + positionName: json['positionName'] as String?, workOrderJurisdiction: json['workOrderJurisdiction'] as int?, ); diff --git a/pubspec.lock b/pubspec.lock index b6a3240..7036f2a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -618,13 +618,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3" meta: dependency: transitive description: @@ -965,7 +958,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.3" time: dependency: transitive description: