diff --git a/lib/pages/camera/camera_page.dart b/lib/pages/camera/camera_page.dart index c36badd..3eedf42 100644 --- a/lib/pages/camera/camera_page.dart +++ b/lib/pages/camera/camera_page.dart @@ -94,7 +94,7 @@ class CameraPage extends StatelessWidget { primary: Colors.red ), onPressed: (){ - + print("##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######"); destinationController.makeCheckin(indexController.currentDestinationFeature[0], true, destinationController.photos[0].path); Get.back(); destinationController.rogaining_counted.value = true; diff --git a/lib/pages/destination/destination_controller.dart b/lib/pages/destination/destination_controller.dart index 37052fa..6c3d0d4 100644 --- a/lib/pages/destination/destination_controller.dart +++ b/lib/pages/destination/destination_controller.dart @@ -206,6 +206,7 @@ class DestinationController extends GetxController { if(checkin_radious >= distance && location_already_checked_in == false && is_in_rog.value == true){ if(auto_checkin){ if(!checking_in){ + print("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ make checkin ${d.sub_loc_id}@@@@@@@@@@@"); makeCheckin(d, true,""); if(d.cp != -1){ rogaining_counted.value =true; @@ -369,7 +370,7 @@ class DestinationController extends GetxController { for(final d in destinations){ - print("--- check checkin for--loc_id- ${d.location_id}----"); + print("--- check checkin for--loc_id- ${d.sub_loc_id}----"); double lat = d.lat!; double lon = d.lon!; @@ -430,7 +431,7 @@ class DestinationController extends GetxController { } void makeCheckin(Destination destination, bool action, String imageurl) async { - //print("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ressssss ${action}@@@@@@@@@@@"); + print("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ressssss ${destination.sub_loc_id}@@@@@@@@@@@"); DatabaseHelper db = DatabaseHelper.instance; List ddd = await db.getDestinationByLatLon(destination.lat!, destination.lon!); diff --git a/lib/pages/destination/destination_page.dart b/lib/pages/destination/destination_page.dart index dd3cc74..55bad16 100644 --- a/lib/pages/destination/destination_page.dart +++ b/lib/pages/destination/destination_page.dart @@ -193,7 +193,7 @@ class DestnationPage extends StatelessWidget { if(destinationController.is_gps_selected.value){ destinationController.chekcs = 0; destinationController.skip_gps = false; - destinationController.resetRogaining(); + //destinationController.resetRogaining(); } }, isSelected: [destinationController.is_gps_selected.value], diff --git a/lib/utils/text_util.dart b/lib/utils/text_util.dart index ea2afd3..725ec4e 100644 --- a/lib/utils/text_util.dart +++ b/lib/utils/text_util.dart @@ -28,7 +28,7 @@ class TextUtils{ } if(dp.buy_point != null && dp.buy_point! > 0){ print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^"); - txt = "${dp.sub_loc_id}"; + txt = "#${dp.cp.toString().replaceAll(regex, '')}(${dp.checkin_point.toString().replaceAll(regex, '')}+${dp.buy_point.toString().replaceAll(regex, '')})"; } } return txt; diff --git a/lib/widgets/bottom_sheet_new.dart b/lib/widgets/bottom_sheet_new.dart index 2a23004..10cdebf 100644 --- a/lib/widgets/bottom_sheet_new.dart +++ b/lib/widgets/bottom_sheet_new.dart @@ -607,7 +607,7 @@ class BottomSheetNew extends GetView { GeoJsonMultiPoint mp = indexController.currentFeature[0].geometry as GeoJsonMultiPoint; LatLng pt = LatLng(mp.geoSerie!.geoPoints[0].latitude, mp.geoSerie!.geoPoints[0].longitude); - //print("----- ${indexController.currentFeature[0].properties} -----"); + print("----- want to go sub location is ---- ${indexController.currentFeature[0].properties!["sub_loc_id"]} -----"); Destination dest = Destination( name: indexController.currentFeature[0].properties!["location_name"], diff --git a/pubspec.yaml b/pubspec.yaml index 94e3ae6..4fa69e3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.9+9 +version: 1.0.12+12 environment: sdk: ">=2.16.0 <3.0.0"