From f9a2bae9a9ab9284bc95ff5ac47d9de121f3d361 Mon Sep 17 00:00:00 2001 From: Akira Date: Sat, 10 Aug 2024 09:11:29 +0900 Subject: [PATCH] =?UTF-8?q?version=204.8.17=20--=20=E3=82=AB=E3=83=AC?= =?UTF-8?q?=E3=83=B3=E3=83=80=E3=83=BC=E3=81=A7=E4=BB=8A=E6=97=A5=E4=BB=A5?= =?UTF-8?q?=E9=99=8D=E3=81=97=E3=81=8B=E9=81=B8=E3=81=B9=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 24 +++++++++---------- lib/pages/camera/camera_page.dart | 6 ++--- .../destination/destination_controller.dart | 2 +- lib/pages/entry/entry_detail_page.dart | 7 ++++-- lib/pages/entry/event_entries_controller.dart | 1 + lib/widgets/bottom_sheet_new.dart | 4 ++-- pubspec.yaml | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 3da5346..3a4e5c6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -398,11 +398,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 494; + CURRENT_PROJECT_VERSION = 497; DEVELOPMENT_TEAM = UMNEWT25JR; ENABLE_BITCODE = NO; - FLUTTER_BUILD_NAME = 4.8.14; - FLUTTER_BUILD_NUMBER = 494; + FLUTTER_BUILD_NAME = 4.8.17; + FLUTTER_BUILD_NUMBER = 497; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness"; @@ -411,7 +411,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.8.14; + MARKETING_VERSION = 4.8.17; PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -539,11 +539,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 494; + CURRENT_PROJECT_VERSION = 497; DEVELOPMENT_TEAM = UMNEWT25JR; ENABLE_BITCODE = NO; - FLUTTER_BUILD_NAME = 4.8.14; - FLUTTER_BUILD_NUMBER = 494; + FLUTTER_BUILD_NAME = 4.8.17; + FLUTTER_BUILD_NUMBER = 497; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness"; @@ -552,7 +552,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.8.14; + MARKETING_VERSION = 4.8.17; PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -571,11 +571,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 494; + CURRENT_PROJECT_VERSION = 497; DEVELOPMENT_TEAM = UMNEWT25JR; ENABLE_BITCODE = NO; - FLUTTER_BUILD_NAME = 4.8.14; - FLUTTER_BUILD_NUMBER = 494; + FLUTTER_BUILD_NAME = 4.8.17; + FLUTTER_BUILD_NUMBER = 497; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness"; @@ -584,7 +584,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.8.14; + MARKETING_VERSION = 4.8.17; PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/lib/pages/camera/camera_page.dart b/lib/pages/camera/camera_page.dart index a277bb3..a4ccaa1 100644 --- a/lib/pages/camera/camera_page.dart +++ b/lib/pages/camera/camera_page.dart @@ -363,7 +363,7 @@ class CameraPage extends StatelessWidget { ], ); - } else if (destinationController.isInRog.value && + } else if ((destinationController.isInRog.value || (destination.buy_point != null && destination.buy_point! > 0)) && dbDest?.checkedin != null && destination.cp != -1 && dbDest?.checkedin == true) { @@ -403,7 +403,7 @@ class CameraPage extends StatelessWidget { ], ); - } else if (destinationController.isInRog.value && + } else if ((destinationController.isInRog.value || (destination.buy_point != null && destination.buy_point! > 0)) && dbDest?.checkedin != null && destination.cp != -1 && destination.use_qr_code == true && @@ -507,7 +507,7 @@ class CameraPage extends StatelessWidget { //}else if(destination.use_qr_code){ // return QRCodeScannerPage(destination: destination); - } else if (destinationController.isInRog.value) { + } else if (destinationController.isInRog.value || (destination.buy_point != null && destination.buy_point! > 0)) { // isInRogがtrueの場合は、カメラページのUIを構築します。 // AppBarには、目的地の情報を表示します。 // ボディには、目的地の画像、タグ、アクションボタンを表示します。 diff --git a/lib/pages/destination/destination_controller.dart b/lib/pages/destination/destination_controller.dart index 7345970..0db04a6 100644 --- a/lib/pages/destination/destination_controller.dart +++ b/lib/pages/destination/destination_controller.dart @@ -825,7 +825,7 @@ class DestinationController extends GetxController { //print("is rog ---- ${is_in_rog.value} ----"); if (d.hidden_location != null && d.hidden_location == 0 && - isInRog.value == true && + (isInRog.value == true || (d.buy_point != null && d.buy_point! > 0)) && d.cp != -1 && d.cp != 0 && d.cp != -2) { chekcs = 3; photos.clear(); diff --git a/lib/pages/entry/entry_detail_page.dart b/lib/pages/entry/entry_detail_page.dart index 73e1577..bd61db1 100644 --- a/lib/pages/entry/entry_detail_page.dart +++ b/lib/pages/entry/entry_detail_page.dart @@ -89,10 +89,13 @@ class EntryDetailPage extends GetView { ? tz.TZDateTime.from(controller.selectedDate.value!, tz.getLocation('Asia/Tokyo')) : (now.isAfter(eventStart) ? now : eventStart); + // 選択可能な最初の日付を設定（今日かイベント開始日のうち、より後の日付） + final tz.TZDateTime firstDate = now.isAfter(eventStart) ? now : eventStart; + final DateTime? picked = await showDatePicker( context: context, - initialDate: initialDate, - firstDate: eventStart, + initialDate: initialDate.isAfter(firstDate) ? initialDate : firstDate, + firstDate: firstDate, lastDate: eventEnd, ); if (picked != null) { diff --git a/lib/pages/entry/event_entries_controller.dart b/lib/pages/entry/event_entries_controller.dart index c86f90c..d91abe2 100644 --- a/lib/pages/entry/event_entries_controller.dart +++ b/lib/pages/entry/event_entries_controller.dart @@ -102,6 +102,7 @@ class EventEntriesController extends GetxController { await _apiService.updateUserInfo(userid,entry); + _indexController.currentUser[0]["user"]["event_date"] = entryDate; // 追加2024-8-9 _indexController.currentUser[0]["user"]["event_code"] = entry.event.eventName; _indexController.currentUser[0]["user"]["team_name"] = entry.team.teamName; _indexController.currentUser[0]["user"]["group"] = entry.team.category.categoryName; diff --git a/lib/widgets/bottom_sheet_new.dart b/lib/widgets/bottom_sheet_new.dart index e738270..cd1005e 100644 --- a/lib/widgets/bottom_sheet_new.dart +++ b/lib/widgets/bottom_sheet_new.dart @@ -382,7 +382,7 @@ class BottomSheetNew extends GetView { ? "in_game".tr : isAlreadyCheckedIn == true ? "in_game".tr - : destinationController.isInRog.value == true + : (destinationController.isInRog.value == true || (destination.buy_point != null && destination.buy_point! > 0)) ? "checkin".tr : "rogaining_not_started".tr, style: TextStyle(color: Theme.of(context).colorScheme.onSecondary), @@ -564,7 +564,7 @@ class BottomSheetNew extends GetView { mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ //checkin or remove checkin - destinationController.isInRog.value == true + (destinationController.isInRog.value == true || (destination.buy_point != null && destination.buy_point! > 0)) && (distanceToDest <= destinationController.getForcedChckinDistance(destination) || destination.checkin_radious==-1 ) && destination.cp != 0 && destination.cp != -1 && destination.cp != -2 diff --git a/pubspec.yaml b/pubspec.yaml index 528516a..98f02f4 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: 4.8.14+494 +version: 4.8.17+497 environment: sdk: ">=3.2.0 <4.0.0"