From 1769d52601c8b5d1235e7a3495bf17fcf4e9b16c Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Tue, 16 May 2023 20:40:02 +0530 Subject: [PATCH] fixed bug on display buypoints --- ios/Runner.xcodeproj/project.pbxproj | 67 ++++++++++--------- .../changepassword/change_password_page.dart | 2 +- .../destination_map/destination_map_page.dart | 1 + lib/pages/login/login_page.dart | 1 - lib/pages/login_popup/login_popup_page.dart | 1 - lib/pages/register/register_page.dart | 1 - lib/pages/search/search_binding.dart | 2 +- lib/pages/search/search_controller.dart | 2 +- lib/pages/search/search_page.dart | 2 +- lib/request.txt | 33 +++++++++ lib/services/action_service.dart | 3 +- lib/services/auth_service.dart | 13 ++-- lib/services/cat_service.dart | 12 +--- lib/services/destination_service.dart | 7 +- lib/services/external_service.dart | 7 +- lib/services/location_line_service.dart | 2 +- lib/services/location_polygon_service.dart | 2 +- lib/services/location_service.dart | 11 ++- lib/services/maxtrix_service.dart | 2 +- lib/services/perfecture_service.dart | 12 ++-- lib/services/reacking_service.dart | 2 +- lib/utils/string_values.dart | 2 +- lib/utils/text_util.dart | 1 + lib/widgets/bottom_sheet_new.dart | 1 + pubspec.lock | 4 +- 25 files changed, 108 insertions(+), 85 deletions(-) create mode 100644 lib/request.txt diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 25a9c3a..3f07a3d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -10,10 +10,10 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 7A1E181E5D112FB5F3DEF4AE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3EFC720B0C4147CE3CF58BF /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + EAFC0FFB27C8DC9071E67D5D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 853FC5087A11FEE54BE443C8 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -30,13 +30,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 13E5CD9612AF4CC8B90A74C3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 927AFF8A839E9E533D147E59 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 853FC5087A11FEE54BE443C8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -44,9 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 97E3BC3A3B281D91C83B77D2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - DD65EA52DB6CFBB8714C0EF7 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - F3EFC720B0C4147CE3CF58BF /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BEC4F75C6B655CA90D5B5E18 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + F1D3FD8F51C2EAF6C3A7EE25 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,7 +54,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7A1E181E5D112FB5F3DEF4AE /* Pods_Runner.framework in Frameworks */, + EAFC0FFB27C8DC9071E67D5D /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -64,9 +64,9 @@ 6C3C11D7BE49E5BED7989712 /* Pods */ = { isa = PBXGroup; children = ( - 927AFF8A839E9E533D147E59 /* Pods-Runner.debug.xcconfig */, - DD65EA52DB6CFBB8714C0EF7 /* Pods-Runner.release.xcconfig */, - 97E3BC3A3B281D91C83B77D2 /* Pods-Runner.profile.xcconfig */, + BEC4F75C6B655CA90D5B5E18 /* Pods-Runner.debug.xcconfig */, + 13E5CD9612AF4CC8B90A74C3 /* Pods-Runner.release.xcconfig */, + F1D3FD8F51C2EAF6C3A7EE25 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,7 +89,7 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 6C3C11D7BE49E5BED7989712 /* Pods */, - DFDAB6680E5021CC6A9E3E46 /* Frameworks */, + E6F2437A5B5AAF08D2998197 /* Frameworks */, ); sourceTree = ""; }; @@ -116,10 +116,10 @@ path = Runner; sourceTree = ""; }; - DFDAB6680E5021CC6A9E3E46 /* Frameworks */ = { + E6F2437A5B5AAF08D2998197 /* Frameworks */ = { isa = PBXGroup; children = ( - F3EFC720B0C4147CE3CF58BF /* Pods_Runner.framework */, + 853FC5087A11FEE54BE443C8 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -131,15 +131,15 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 4D66FC12F7DD5C71294E8D95 /* [CP] Check Pods Manifest.lock */, + 6B25D2836FC6A82461E36025 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 8340085CA329EF510409EEF4 /* [CP] Embed Pods Frameworks */, - 98C3810C530EA7CF0B7CC3E0 /* [CP] Copy Pods Resources */, + ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */, + FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -205,6 +205,7 @@ files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -213,7 +214,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 4D66FC12F7DD5C71294E8D95 /* [CP] Check Pods Manifest.lock */ = { + 6B25D2836FC6A82461E36025 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -235,7 +236,22 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 8340085CA329EF510409EEF4 /* [CP] Embed Pods Frameworks */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; + ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -252,22 +268,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; - 98C3810C530EA7CF0B7CC3E0 /* [CP] Copy Pods Resources */ = { + FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/lib/pages/changepassword/change_password_page.dart b/lib/pages/changepassword/change_password_page.dart index 3180ae7..262f8ee 100644 --- a/lib/pages/changepassword/change_password_page.dart +++ b/lib/pages/changepassword/change_password_page.dart @@ -18,7 +18,7 @@ class ChangePasswordPage extends StatelessWidget { backgroundColor: Colors.white, appBar: AppBar( elevation: 0, - brightness: Brightness.light, + backgroundColor: Colors.white, leading: IconButton( onPressed: (){ diff --git a/lib/pages/destination_map/destination_map_page.dart b/lib/pages/destination_map/destination_map_page.dart index 5c82126..e2c9f41 100644 --- a/lib/pages/destination_map/destination_map_page.dart +++ b/lib/pages/destination_map/destination_map_page.dart @@ -46,6 +46,7 @@ class DestinationMapPage extends StatelessWidget { int index = -1; for (int i = 0; i < destinationController.destinations.length; i++) { Destination d = destinationController.destinations[i]; + print("^^^^ ${d} ^^^^"); Marker m = Marker( point: LatLng(d.lat!, d.lon!), anchorPos: AnchorPos.align(AnchorAlign.center), diff --git a/lib/pages/login/login_page.dart b/lib/pages/login/login_page.dart index acc0134..f0d6ff6 100644 --- a/lib/pages/login/login_page.dart +++ b/lib/pages/login/login_page.dart @@ -18,7 +18,6 @@ class LoginPage extends StatelessWidget { backgroundColor: Colors.white, appBar: AppBar( elevation: 0, - brightness: Brightness.light, backgroundColor: Colors.white, leading: IconButton( onPressed: (){ diff --git a/lib/pages/login_popup/login_popup_page.dart b/lib/pages/login_popup/login_popup_page.dart index 5224c89..4e0796b 100644 --- a/lib/pages/login_popup/login_popup_page.dart +++ b/lib/pages/login_popup/login_popup_page.dart @@ -18,7 +18,6 @@ class LoginPopupPage extends StatelessWidget { backgroundColor: Colors.white, appBar: AppBar( elevation: 0, - brightness: Brightness.light, backgroundColor: Colors.white, leading: IconButton( onPressed: (){ diff --git a/lib/pages/register/register_page.dart b/lib/pages/register/register_page.dart index c436701..d02e2be 100644 --- a/lib/pages/register/register_page.dart +++ b/lib/pages/register/register_page.dart @@ -20,7 +20,6 @@ class RegisterPage extends StatelessWidget { backgroundColor: Colors.white, appBar: AppBar( elevation: 0, - brightness: Brightness.light, backgroundColor: Colors.white, leading: IconButton( onPressed: (){ diff --git a/lib/pages/search/search_binding.dart b/lib/pages/search/search_binding.dart index 09cde26..9b209ed 100644 --- a/lib/pages/search/search_binding.dart +++ b/lib/pages/search/search_binding.dart @@ -4,6 +4,6 @@ import 'package:rogapp/pages/search/search_controller.dart'; class SearchBinding extends Bindings { @override void dependencies() { - Get.put(SearchController()); + Get.put(SearchBarController()); } } diff --git a/lib/pages/search/search_controller.dart b/lib/pages/search/search_controller.dart index 281c470..b6f188a 100644 --- a/lib/pages/search/search_controller.dart +++ b/lib/pages/search/search_controller.dart @@ -5,7 +5,7 @@ import 'package:get/get_state_manager/get_state_manager.dart'; import 'package:rogapp/model/destination.dart'; import 'package:rogapp/pages/index/index_controller.dart'; -class SearchController extends GetxController { +class SearchBarController extends GetxController { List searchResults = [].obs; diff --git a/lib/pages/search/search_page.dart b/lib/pages/search/search_page.dart index efb43ef..d404527 100644 --- a/lib/pages/search/search_page.dart +++ b/lib/pages/search/search_page.dart @@ -10,7 +10,7 @@ import 'package:rogapp/widgets/bottom_sheet_new.dart'; class SearchPage extends StatelessWidget { SearchPage({Key? key}) : super(key: key); - SearchController searchController = Get.find(); + SearchBarController searchController = Get.find(); IndexController indexController = Get.find(); Image getImage(int index){ diff --git a/lib/request.txt b/lib/request.txt new file mode 100644 index 0000000..3c50a48 --- /dev/null +++ b/lib/request.txt @@ -0,0 +1,33 @@ +https://rogaining.sumasen.net/api/perf_main/ + +https://rogaining.sumasen.net/api/allgifuareas/?perf=9 + +https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE + +https://rogaining.sumasen.net/api/login/ + +https://rogaining.sumasen.net/api/userdetials?user_id=67 + +https://rogaining.sumasen.net/api/locsext/ + +https://rogaining.sumasen.net/api/inbound?rog=True&grp=各務原&ln1=136.80345200298189&la1=35.29461396815819&ln2=136.80345200298189&la2=35.50765110021806&ln3=136.96420197631517&la3=35.50765110021806&ln4=136.96420197631517&la4=35.29461396815819 + +https://rogaining.sumasen.net/api/cats/?ln1=136.80345200298189&la1=35.29461396815819&ln2=136.80345200298189&la2=35.50765110021806&ln3=136.96420197631517&la3=35.50765110021806&ln4=136.96420197631517&la4=35.29461396815819 + +https://natnats.mobilous.com/start_from_rogapp + +https://natnats.mobilous.com/checkin_from_rogapp + +https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=35.3997059, 136.8434708&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE + +https://natnats.mobilous.com/checkin_from_rogapp + +https://maps.googleapis.com/maps/api/directions/json?destination=35.3995266, 136.8436693&mode=walking&waypoints=optimize:false|&origin=35.3997059, 136.8434708&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE + +https://natnats.mobilous.com/goal_from_rogapp + +https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE + +https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE + +https://maps.googleapis.com/maps/api/directions/json?destination=&mode=walking&waypoints=optimize:false|&origin=&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE \ No newline at end of file diff --git a/lib/services/action_service.dart b/lib/services/action_service.dart index f6ccfaa..9fb1d2c 100644 --- a/lib/services/action_service.dart +++ b/lib/services/action_service.dart @@ -11,6 +11,7 @@ class ActionService{ String server_url = ConstValues.currentServer(); String url = "${server_url}/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}"; //String url = "http://localhost:8100/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}"; + print('++++++++${url}'); print("url is ------ ${url}"); final http.Response response = await http.get( Uri.parse(url), @@ -30,7 +31,7 @@ class ActionService{ List cats = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/useraction/?user_id=${user_id}&location_id=${location_id}'; - print("url is ------ ${url}"); + print('++++++++${url}'); //String url = 'http://localhost:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}'; final response = await http.get(Uri.parse(url), headers: { diff --git a/lib/services/auth_service.dart b/lib/services/auth_service.dart index 96d04db..3e31372 100644 --- a/lib/services/auth_service.dart +++ b/lib/services/auth_service.dart @@ -10,7 +10,7 @@ class AuthService{ Map changePassword = {}; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/change-password/'; - print('---- toekn is ${token} -----'); + print('++++++++${url}'); final http.Response response = await http.put( Uri.parse(url), headers: { @@ -35,7 +35,7 @@ class AuthService{ Map cats = {}; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/login/'; - print("------- in logged url ${url} ###### --------"); + print('++++++++${url}'); //String url = 'http://localhost:8100/api/login/'; final http.Response response = await http.post( Uri.parse(url), @@ -59,7 +59,7 @@ class AuthService{ Map cats = {}; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/register/'; - //String url = 'http://localhost:8100/api/register/'; + print('++++++++${url}'); final http.Response response = await http.post( Uri.parse(url), headers: { @@ -81,7 +81,7 @@ class AuthService{ Map cats = {}; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/delete-account/'; - //String url = 'http://localhost:8100/api/register/'; + print('++++++++${url}'); final http.Response response = await http.get( Uri.parse(url), headers: { @@ -101,10 +101,7 @@ class AuthService{ List cats = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/userdetials?user_id=${userid}'; - //String url = 'http://localhost:8100/api/userdetials?user_id=${userid}'; - - - //String url = 'http://container.intranet.sumasen.net:8100/api/cats/'; + print('++++++++${url}'); print("---- UserDetails url is ${url}"); final response = await http.get(Uri.parse(url), headers: { diff --git a/lib/services/cat_service.dart b/lib/services/cat_service.dart index d582f3d..50e54f3 100644 --- a/lib/services/cat_service.dart +++ b/lib/services/cat_service.dart @@ -11,11 +11,7 @@ class CatService{ List cats = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}'; - //String url = 'http://localhost:8100/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}'; - - - //String url = 'http://container.intranet.sumasen.net:8100/api/cats/'; - print("---- loadCats url is ${url}"); + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -34,11 +30,7 @@ class CatService{ List cats = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/catbycity/?${cityname}'; - //String url = 'http://localhost:8100/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}'; - - - //String url = 'http://container.intranet.sumasen.net:8100/api/cats/'; - print("---- loadCatByCity url is ${url}"); + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', diff --git a/lib/services/destination_service.dart b/lib/services/destination_service.dart index f3fb32d..e45f966 100644 --- a/lib/services/destination_service.dart +++ b/lib/services/destination_service.dart @@ -15,7 +15,7 @@ class DestinationService{ List cats = []; String server_url = ConstValues.currentServer(); String url = "${server_url}/api/destinations/?user_id=${user_id}"; - //String url = "http://localhost:8100/api/destinations/?user_id=${user_id}"; + print('++++++++${url}'); final http.Response response = await http.get( Uri.parse(url), headers: { @@ -33,7 +33,7 @@ class DestinationService{ Map cats = {}; String server_url = ConstValues.currentServer(); String url = "${server_url}/api/delete_destination/?dest_id=${dest_id}"; - //String url = "http://localhost:8100/api/delete_destination/?dest_id=${dest_id}"; + print('++++++++${url}'); final http.Response response = await http.get( Uri.parse(url), headers: { @@ -52,8 +52,7 @@ class DestinationService{ int cats = 0; String server_url = ConstValues.currentServer(); String url = "${server_url}/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}"; - print("---- url is ${url} -----"); - //String url = "http://localhost:8100/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}"; + print('++++++++${url}'); final http.Response response = await http.get( Uri.parse(url), headers: { diff --git a/lib/services/external_service.dart b/lib/services/external_service.dart index 3b28d2e..cabda6b 100644 --- a/lib/services/external_service.dart +++ b/lib/services/external_service.dart @@ -57,7 +57,7 @@ class ExternalService { } else { String url = 'https://natnats.mobilous.com/start_from_rogapp'; - //print('---- toekn is ${token} -----'); + print('++++++++${url}'); final http.Response response = await http.post( Uri.parse(url), headers: { @@ -82,6 +82,7 @@ class ExternalService { Future> makeCheckpoint(int user_id, String token, String checkin_time, String teamname, int cp, String eventcode, String imageurl) async { Map _res = {}; String url = 'https://natnats.mobilous.com/checkin_from_rogapp'; + print('++++++++${url}'); final IndexController indexController = Get.find(); if(imageurl != null){ @@ -232,7 +233,7 @@ class ExternalService { ); String url = 'https://natnats.mobilous.com/goal_from_rogapp'; - //print("---response is : ${response.statusCode}----"); + print('++++++++${url}'); if (response.statusCode == 201) { Map _res = json.decode(utf8.decode(response.bodyBytes)); print('----_res : ${_res} ----'); @@ -264,7 +265,7 @@ class ExternalService { static Future> usersEventCode(String teamcode, String password) async { Map _res = {}; String url = "https://natnats.mobilous.com/check_event_code?zekken_number=${teamcode}&password=${password}"; - print("url is ------ ${url}"); + print('++++++++${url}'); final http.Response response = await http.get( Uri.parse(url), headers: { diff --git a/lib/services/location_line_service.dart b/lib/services/location_line_service.dart index 6cadb4e..bc98e3a 100644 --- a/lib/services/location_line_service.dart +++ b/lib/services/location_line_service.dart @@ -10,7 +10,7 @@ class LocationLineService{ GeoJsonFeature? fs; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/location_line/'; - //String url = 'http://localhost:8100/api/location_line/'; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', diff --git a/lib/services/location_polygon_service.dart b/lib/services/location_polygon_service.dart index 84e8e04..3a583f5 100644 --- a/lib/services/location_polygon_service.dart +++ b/lib/services/location_polygon_service.dart @@ -11,7 +11,7 @@ class LocationPolygonervice{ String server_url = ConstValues.currentServer(); String url = '${server_url}/api/location_polygon/'; - //String url = 'http://localhost:8100/api/location_polygon/'; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', diff --git a/lib/services/location_service.dart b/lib/services/location_service.dart index 9194d4e..40b9d8a 100644 --- a/lib/services/location_service.dart +++ b/lib/services/location_service.dart @@ -61,7 +61,7 @@ class LocationService{ url = '${server_url}/api/inperf/?perf=' + perfecture; } } - print("----loadLocationsFor url --- ${url}"); + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -80,8 +80,7 @@ class LocationService{ List ext = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/locsext/'; - print("url is ${url}"); - //String url = 'http://localhost:8100/api/perfext/?sub_perf=' + id; + print('++++++++${url}'); final response = await http.post(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -126,7 +125,7 @@ class LocationService{ url = '${server_url}/api/insubperf?subperf=' + subperfecture; } } - print("----loadLocationsSubFor url --- ${url}"); + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -170,7 +169,7 @@ class LocationService{ url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}'; } } - print("----loadLocationsBound url --- ${url}"); + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -225,7 +224,7 @@ class LocationService{ url = '${server_url}/api/customarea?name=${name}'; } } - print("----loadCustomLocations url --- ${url}"); + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', diff --git a/lib/services/maxtrix_service.dart b/lib/services/maxtrix_service.dart index 421799c..8d6accd 100644 --- a/lib/services/maxtrix_service.dart +++ b/lib/services/maxtrix_service.dart @@ -54,7 +54,7 @@ class MatrixService{ Map cats = {}; String url = "https://maps.googleapis.com/maps/api/directions/json?destination=${destination}&mode=${_mode}&waypoints=${locs}&origin=${origin}&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE"; - print(url); + print('++++++++${url}'); final http.Response response = await http.get( Uri.parse(url), headers: { diff --git a/lib/services/perfecture_service.dart b/lib/services/perfecture_service.dart index 1e730a6..5fa099f 100644 --- a/lib/services/perfecture_service.dart +++ b/lib/services/perfecture_service.dart @@ -9,7 +9,7 @@ class PerfectureService{ List perfs = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/perf_main/'; - //String url = 'http://localhost:8100/api/perf_main/'; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -27,7 +27,7 @@ class PerfectureService{ List perfs = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/subperfinmain/?area=' + area; - //String url = 'http://localhost:8100/api/subperfinmain/?area=' + area; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -46,7 +46,7 @@ class PerfectureService{ List perfs = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/mainperfext/?perf=' + id; - //String url = 'http://localhost:8100/api/mainperfext/?perf=' + id; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -64,7 +64,7 @@ class PerfectureService{ List perfs = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/allgifuareas/?perf=' + perf; - //String url = 'http://localhost:8100/api/allgifuareas/?perf=' + perf; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -82,7 +82,7 @@ class PerfectureService{ List perfs = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/customareanames'; - //String url = 'http://localhost:8100/api/customareanames'; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', @@ -101,7 +101,7 @@ class PerfectureService{ List perfs = []; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/perfext/?sub_perf=' + id; - //String url = 'http://localhost:8100/api/perfext/?sub_perf=' + id; + print('++++++++${url}'); final response = await http.get(Uri.parse(url), headers: { 'Content-Type': 'application/json; charset=UTF-8', diff --git a/lib/services/reacking_service.dart b/lib/services/reacking_service.dart index 77697c2..15236ac 100644 --- a/lib/services/reacking_service.dart +++ b/lib/services/reacking_service.dart @@ -12,7 +12,7 @@ class TrackingService { Map cats = {}; String server_url = ConstValues.currentServer(); String url = '${server_url}/api/track/'; - //String url = 'http://localhost:8100/api/track/'; + print('++++++++${url}'); final geom = '{"type": "MULTIPOINT", "coordinates": [[${lon}, ${lat}]]}'; final http.Response response = await http.post( Uri.parse(url), diff --git a/lib/utils/string_values.dart b/lib/utils/string_values.dart index 58d5114..b3a6fa7 100644 --- a/lib/utils/string_values.dart +++ b/lib/utils/string_values.dart @@ -79,7 +79,7 @@ class StringValues extends Translations{ 'drawer_title':'ロゲイニング参加者はログイン するとチェックポイントが参照 できます', 'app_title': '旅行工程表', 'address':'住所', - 'email':'Eメール(ロゲではゼッケン番号)', + 'email':'Eメール', 'password':'パスワード', 'web':'ウェブ', 'wikipedia':'ウィキペディア', diff --git a/lib/utils/text_util.dart b/lib/utils/text_util.dart index e57aedb..4374da7 100644 --- a/lib/utils/text_util.dart +++ b/lib/utils/text_util.dart @@ -27,6 +27,7 @@ class TextUtils{ txt = txt + "{${dp.checkin_point.toString().replaceAll(regex, '')}}"; } if(dp.buy_point != null && dp.buy_point! > 0){ + print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^"); txt = txt + "[${dp.sub_loc_id}]"; } } diff --git a/lib/widgets/bottom_sheet_new.dart b/lib/widgets/bottom_sheet_new.dart index 2eb2911..ba5ecac 100644 --- a/lib/widgets/bottom_sheet_new.dart +++ b/lib/widgets/bottom_sheet_new.dart @@ -618,6 +618,7 @@ class BottomSheetNew extends GetView { series: 1, lat: pt.latitude, lon: pt.longitude, + sub_loc_id: indexController.currentFeature[0].properties!["sub_loc_id"], location_id: indexController.currentFeature[0].properties!["location_id"], list_order: 1, photos: indexController.currentFeature[0].properties!["photos"], diff --git a/pubspec.lock b/pubspec.lock index 0629a6a..16ea261 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -548,10 +548,10 @@ packages: dependency: "direct main" description: name: google_maps_webservice - sha256: "188bbb363adf1bc69c708029e315f383020c1caba8c5146176de1a6f6feb3524" + sha256: d0ae4e4508afd74a3f051565261a3cdbae59db29448f9b6e6beb5674545e1eb7 url: "https://pub.dev" source: hosted - version: "0.0.19" + version: "0.0.20-nullsafety.5" http: dependency: transitive description: