Browse Source

update image picket version

master
daivph 5 years ago
parent
commit
692a219bf3
4 changed files with 31 additions and 22 deletions
  1. +4
    -3
      lib/custom_model/CropPlot.dart
  2. +21
    -17
      lib/presentation/custom_widgets/widget_media_helper.dart
  3. +5
    -1
      lib/presentation/screens/actions/nursery/sc_edit_action_nursery.dart
  4. +1
    -1
      pubspec.yaml

+ 4
- 3
lib/custom_model/CropPlot.dart View File

@@ -22,9 +22,9 @@ class CropPlot {
tbCropDTO = json['tbCropDTO'] != null
? new TbCropDTO.fromJson(json['tbCropDTO'])
: null;
if (json['activities'] != null) {
if (json['activityTimeline'] != null) {
activities = new List<Activities>();
json['activities'].forEach((v) {
json['activityTimeline'].forEach((v) {
activities.add(new Activities.fromJson(v));
});
}
@@ -42,7 +42,8 @@ class CropPlot {
data['tbCropDTO'] = this.tbCropDTO.toJson();
}
if (this.activities != null) {
data['activities'] = this.activities.map((v) => v.toJson()).toList();
data['activityTimeline'] =
this.activities.map((v) => v.toJson()).toList();
}
data['sowingDate'] = this.sowingDate;
data['soakSeedsTime'] = this.soakSeedsTime;

+ 21
- 17
lib/presentation/custom_widgets/widget_media_helper.dart View File

@@ -6,6 +6,7 @@ import 'package:farm_tpf/presentation/custom_widgets/shimmer_image.dart';
import 'package:farm_tpf/utils/const_color.dart';
import 'package:farm_tpf/utils/const_string.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:image_picker/image_picker.dart';
import 'package:video_player/video_player.dart';
@@ -24,14 +25,7 @@ class _WidgetMediaHelperState extends State<WidgetMediaHelper> {
String _retrieveDataError;

final ImagePicker _picker = ImagePicker();
List<ItemMediaVM> items = [
ItemMediaVM('http://lorempixel.com/640/480', true),
ItemMediaVM(
'https://s3.amazonaws.com/uifaces/faces/twitter/rickdt/128.jpg', true),
ItemMediaVM('http://lorempixel.com/640/480/food', true),
ItemMediaVM('http://lorempixel.com/640/480/animals', true),
ItemMediaVM('http://lorempixel.com/640/480/fashion', true),
];
List<ItemMediaVM> items = [];

@override
Widget build(BuildContext context) {
@@ -44,7 +38,7 @@ class _WidgetMediaHelperState extends State<WidgetMediaHelper> {
height: 4.0,
),
_buildListPoster(),
1 == 1
defaultTargetPlatform == TargetPlatform.android
? FutureBuilder<void>(
future: retrieveLostData(),
builder:
@@ -289,7 +283,14 @@ class _WidgetMediaHelperState extends State<WidgetMediaHelper> {
return retrieveError;
}
if (_imageFile != null) {
return Image.file(File(_imageFile.path), width: 100, height: 100);
var imageResult =
Image.file(File(_imageFile.path), width: 100, height: 100);
setState(() {
items.insert(0, ItemMediaVM(_imageFile.path, false, imageResult));
});
return Container(
child: Text("ok"),
);
} else if (_pickImageError != null) {
return Text(
'Pick image error: $_pickImageError',
@@ -414,12 +415,14 @@ class _WidgetItemMedia extends StatelessWidget {
Positioned(
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: ShimmerImage(
item.photo,
width: 93,
height: 124,
fit: BoxFit.cover,
),
child: item.image == null
? ShimmerImage(
item.photo,
width: 93,
height: 124,
fit: BoxFit.cover,
)
: Image.file(File(item.photo), width: 100, height: 100),
)),
Positioned(
top: -5,
@@ -441,6 +444,7 @@ class _WidgetItemMedia extends StatelessWidget {
class ItemMediaVM {
String photo;
bool isVideo;
Image image;

ItemMediaVM(this.photo, this.isVideo);
ItemMediaVM(this.photo, this.isVideo, this.image);
}

+ 5
- 1
lib/presentation/screens/actions/nursery/sc_edit_action_nursery.dart View File

@@ -1,6 +1,7 @@
import 'package:farm_tpf/custom_model/Nursery.dart';
import 'package:farm_tpf/data/repository/repository.dart';
import 'package:farm_tpf/models/index.dart';
import 'package:farm_tpf/presentation/custom_widgets/widget_media_helper.dart';
import 'package:farm_tpf/presentation/screens/actions/nursery/bloc/expansion_list_bloc.dart';
import 'package:farm_tpf/presentation/screens/resources/sc_resource_helper.dart';
import 'package:farm_tpf/utils/bloc/bloc/status_add_form_bloc.dart';
@@ -496,7 +497,10 @@ class _EditActionNurseryState extends State<EditActionNurseryScreen> {
height: 8.0,
),
_buildListAddWorker(),
Container(child: Text("Them hinh anh")),
SizedBox(
height: 8.0,
),
WidgetMediaHelper()
],
),
))))));

+ 1
- 1
pubspec.yaml View File

@@ -26,7 +26,7 @@ dependencies:
pattern_formatter: ^1.0.2
rxdart: ^0.23.0
barcode_scan: ^3.0.1
image_picker: ^0.6.2+3
image_picker: ^0.6.7+7
video_player: ^0.10.11+2
flutter_plugin_android_lifecycle: ^1.0.4
shimmer: ^1.1.1

Loading…
Cancel
Save