tuanta/sfm_app_final
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update ios config to use location

Browse Source
This commit is contained in:
anhtunz
2025-04-14 09:48:29 +07:00
parent 30ee4540ba
commit 345c554519
4 changed files with 12 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ios/Podfile
View File

@@ -9,58 +9,24 @@ post_install do |installer|
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
'$(inherited)', '$(inherited)',
## dart: PermissionGroup.calendar
# 'PERMISSION_EVENTS=1',
## dart: PermissionGroup.calendarFullAccess
# 'PERMISSION_EVENTS_FULL_ACCESS=1',
## dart: PermissionGroup.reminders
# 'PERMISSION_REMINDERS=1',
## dart: PermissionGroup.contacts
# 'PERMISSION_CONTACTS=1',
## dart: PermissionGroup.camera ## dart: PermissionGroup.camera
'PERMISSION_CAMERA=1', 'PERMISSION_CAMERA=1',
## dart: PermissionGroup.microphone
# 'PERMISSION_MICROPHONE=1',
## dart: PermissionGroup.speech
# 'PERMISSION_SPEECH_RECOGNIZER=1',
## dart: PermissionGroup.photos
# 'PERMISSION_PHOTOS=1',
## The 'PERMISSION_LOCATION' macro enables the `locationWhenInUse` and `locationAlways` permission. If ## The 'PERMISSION_LOCATION' macro enables the `locationWhenInUse` and `locationAlways` permission. If
## the application only requires `locationWhenInUse`, only specify the `PERMISSION_LOCATION_WHENINUSE` ## the application only requires `locationWhenInUse`, only specify the `PERMISSION_LOCATION_WHENINUSE`
## macro. ## macro.
## ##
## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse] ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
'PERMISSION_LOCATION=1', 'PERMISSION_LOCATION=0',
'PERMISSION_LOCATION_WHENINUSE=0', 'PERMISSION_LOCATION_WHENINUSE=1',
## dart: PermissionGroup.notification ## dart: PermissionGroup.notification
'PERMISSION_NOTIFICATIONS=1', 'PERMISSION_NOTIFICATIONS=1',
## dart: PermissionGroup.mediaLibrary
# 'PERMISSION_MEDIA_LIBRARY=1',
## dart: PermissionGroup.sensors
# 'PERMISSION_SENSORS=1',
## dart: PermissionGroup.bluetooth
# 'PERMISSION_BLUETOOTH=1',
## dart: PermissionGroup.appTrackingTransparency
# 'PERMISSION_APP_TRACKING_TRANSPARENCY=1',
## dart: PermissionGroup.criticalAlerts ## dart: PermissionGroup.criticalAlerts
'PERMISSION_CRITICAL_ALERTS=1', 'PERMISSION_CRITICAL_ALERTS=1',
## dart: PermissionGroup.criticalAlerts
'PERMISSION_ASSISTANT=1',
] ]
end end

12
ios/Runner/Info.plist
View File

@@ -28,14 +28,12 @@
<true/> <true/>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>Camera permission is required for barcode scanning.</string> <string>Camera permission is required for barcode scanning.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Always and when in use!</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Can I have location always?</string>
<key>NSLocationUsageDescription</key>
<string>Older devices need location.</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>Need location when in use</string> <string>Cần vị trí để hiển thị bản đồ hoặc tìm địa điểm gần bạn</string>
<key>NSUserNotificationsUsageDescription</key>
<string>Chúng tôi cần gửi thông báo khẩn cấp để cảnh báo về việc thiết bị phát hiện có cháy.</string>
<key>com.apple.developer.usernotifications.critical-alerts</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key> <key>UIApplicationSupportsIndirectInputEvents</key>
<true/> <true/>
<key>UIBackgroundModes</key> <key>UIBackgroundModes</key>

11
lib/feature/map/map_screen.dart
View File

@@ -234,9 +234,9 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
if (hasStateOne) { if (hasStateOne) {
return flameIcon; // flameIcon return flameIcon; // flameIcon
} else if (hasOtherState) { } else if (hasOtherState) {
return normalIcon; // normalIcon return offlineIcon; // normalIcon
} else { } else {
return offlineIcon; // offlineIcon return normalIcon; // offlineIcon
} }
} }
@@ -274,16 +274,13 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
if (response != "") { if (response != "") {
final data = jsonDecode(response); final data = jsonDecode(response);
List<dynamic> result = data['items']; List<dynamic> result = data['items'];
if(result.isNotEmpty){ if (result.isNotEmpty) {
devices.clear(); devices.clear();
final devicesList = Device.fromJsonDynamicList(result); final devicesList = Device.fromJsonDynamicList(result);
for (var device in devicesList) { for (var device in devicesList) {
devices.add(device); devices.add(device);
} }
}else{ } else {}
}
} }
} }

1
lib/feature/map/widget/on_tap_marker_widget.dart
View File

@@ -163,6 +163,7 @@ onTapMarker(
style: const ButtonStyle( style: const ButtonStyle(
backgroundColor: WidgetStatePropertyAll(Colors.red), backgroundColor: WidgetStatePropertyAll(Colors.red),
foregroundColor: WidgetStatePropertyAll(Colors.white), foregroundColor: WidgetStatePropertyAll(Colors.white),
iconColor: WidgetStatePropertyAll(Colors.white),
), ),
icon: IconConstants.instance icon: IconConstants.instance
.getMaterialIcon(Icons.fire_truck_outlined), .getMaterialIcon(Icons.fire_truck_outlined),