diff --git a/lib/home.dart b/lib/home.dart index a06fa1e..db902a9 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -219,7 +219,7 @@ class _HomeState extends State { String Address = prefs.getString(keyClass.hostAddress); // await Future.delayed(Duration(milliseconds: 300)); util.showLoading(context,dissmissable: false); - var bUnits = await util.JsonDataPostRaw({}, "${Address??"https://asset.thamringroup.web.id"}/admin/getBisnisList"); + var bUnits = await util.JsonDataPostRaw({}, "${Address??"https://asset.thamringroup.web.id"}/admin/getBisnisList",timeout: true,duration: 5); Navigator.pop(context); if(bUnits["STATUS"]==1){ var selectedBisnis= bUnits["DATA"][0]["id"]; @@ -260,7 +260,7 @@ class _HomeState extends State { )); if(bisnisPicked??false){ util.showLoading(context,dissmissable: false); - var result = await util.JsonDataPostRaw({"bUnit":selectedBisnis}, "${Address??"https://asset.thamringroup.web.id"}/admin/getDbList"); + var result = await util.JsonDataPostRaw({"bUnit":selectedBisnis}, "${Address??"https://asset.thamringroup.web.id"}/admin/getrefDbList"); Navigator.pop(context); if(result['STATUS']==1){ bool isClear = await clearData(context); @@ -278,7 +278,7 @@ class _HomeState extends State { value: selected, items: new List>.from(result['DATA'].map((value){ String showText = value["name"]; - if(showText.length>30) showText = showText.substring(0,30); + if(showText.length>20) showText = showText.substring(0,20); return DropdownMenuItem( child: Text(showText), value: value["fullName"], @@ -341,7 +341,7 @@ class _HomeState extends State { } } else{ - await util.showToast("ERROR",bUnits['DATA']); + await util.showToast("ERROR",bUnits['DATA']??'not responding'); } }, child: Padding( @@ -530,7 +530,7 @@ class _HomeState extends State { ), ), Flexible( - flex: 1, + flex: 2, child: Container( padding: EdgeInsets.all(8), alignment: Alignment.bottomRight, diff --git a/lib/main.dart b/lib/main.dart index 2c43a3c..32d940a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,7 +7,6 @@ import 'package:image_picker/image_picker.dart'; import 'asset_details.dart'; import 'util/utils.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:fluttertoast/fluttertoast.dart'; final picker = ImagePicker(); diff --git a/lib/util/utils.dart b/lib/util/utils.dart index a71caa7..68dc986 100644 --- a/lib/util/utils.dart +++ b/lib/util/utils.dart @@ -18,7 +18,7 @@ class Util{ return {'STATUS':0,'DATA':e}; } } - JsonDataPostRaw(Map jsonData, String url,{timeout:false}) async{ + JsonDataPostRaw(Map jsonData, String url,{timeout:false,duration:10}) async{ const JsonDecoder decoder = const JsonDecoder(); try { var response; @@ -26,7 +26,7 @@ class Util{ response = await http.post( '$url', headers: {'Content-type': 'application/json'}, body: json.encode(jsonData)).timeout( - const Duration(seconds: 10)); + Duration(seconds: duration)); else response = await http.post( '$url', headers: {'Content-type': 'application/json'},