diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index acba072..38b52d7 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -514,8 +514,8 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = ""; + CURRENT_PROJECT_VERSION = 20; + DEVELOPMENT_TEAM = 48V27SBR8J; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Syncrow; @@ -524,7 +524,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.2; PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -706,8 +706,8 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = ""; + CURRENT_PROJECT_VERSION = 20; + DEVELOPMENT_TEAM = 48V27SBR8J; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Syncrow; @@ -716,7 +716,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.2; PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -736,8 +736,8 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = ""; + CURRENT_PROJECT_VERSION = 20; + DEVELOPMENT_TEAM = 48V27SBR8J; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Syncrow; @@ -746,7 +746,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.2; PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index ac97ac1..a59299f 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,115 +1,115 @@ { "images" : [ { - "filename" : "logo-20@2x.png", + "filename" : "Syncrow Icon-20@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "logo-20@3x.png", + "filename" : "Syncrow Icon-20@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "logo-29.png", + "filename" : "Syncrow Icon-29.png", "idiom" : "iphone", "scale" : "1x", "size" : "29x29" }, { - "filename" : "logo-29@2x.png", + "filename" : "Syncrow Icon-29@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "logo-29@3x.png", + "filename" : "Syncrow Icon-29@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "logo-40@2x.png", + "filename" : "Syncrow Icon-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "logo-40@3x.png", + "filename" : "Syncrow Icon-40@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "logo-60@2x.png", + "filename" : "Syncrow Icon-60@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "logo-60@3x.png", + "filename" : "Syncrow Icon-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "filename" : "logo-20.png", + "filename" : "Syncrow Icon-20.png", "idiom" : "ipad", "scale" : "1x", "size" : "20x20" }, { - "filename" : "logo-20@2x 1.png", + "filename" : "Syncrow Icon-20@2x 1.png", "idiom" : "ipad", "scale" : "2x", "size" : "20x20" }, { - "filename" : "logo-29 1.png", + "filename" : "Syncrow Icon-29 1.png", "idiom" : "ipad", "scale" : "1x", "size" : "29x29" }, { - "filename" : "logo-29@2x 1.png", + "filename" : "Syncrow Icon-29@2x 1.png", "idiom" : "ipad", "scale" : "2x", "size" : "29x29" }, { - "filename" : "logo-40.png", + "filename" : "Syncrow Icon-40.png", "idiom" : "ipad", "scale" : "1x", "size" : "40x40" }, { - "filename" : "logo-40@2x 1.png", + "filename" : "Syncrow Icon-40@2x 1.png", "idiom" : "ipad", "scale" : "2x", "size" : "40x40" }, { - "filename" : "logo-76.png", + "filename" : "Syncrow Icon-76.png", "idiom" : "ipad", "scale" : "1x", "size" : "76x76" }, { - "filename" : "logo-76@2x.png", + "filename" : "Syncrow Icon-76@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "76x76" }, { - "filename" : "logo-83.5@2x.png", + "filename" : "Syncrow Icon-83.5@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "83.5x83.5" }, { - "filename" : "logo-1024.png", + "filename" : "Syncrow Icon-1024.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-1024.png new file mode 100644 index 0000000..076f903 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-1024.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20.png new file mode 100644 index 0000000..73e4ade Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@2x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@2x 1.png new file mode 100644 index 0000000..ba7adc7 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@2x 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@2x.png new file mode 100644 index 0000000..ba7adc7 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@3x.png new file mode 100644 index 0000000..be3275f Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29 1.png new file mode 100644 index 0000000..0a529fc Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29.png new file mode 100644 index 0000000..0a529fc Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@2x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@2x 1.png new file mode 100644 index 0000000..066af50 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@2x 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@2x.png new file mode 100644 index 0000000..066af50 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@3x.png new file mode 100644 index 0000000..d2ec659 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40.png new file mode 100644 index 0000000..ba7adc7 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@2x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@2x 1.png new file mode 100644 index 0000000..7c1cdcb Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@2x 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@2x.png new file mode 100644 index 0000000..7c1cdcb Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@3x.png new file mode 100644 index 0000000..bd0ae4c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-60@2x.png new file mode 100644 index 0000000..bd0ae4c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-60@3x.png new file mode 100644 index 0000000..682b8d8 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-76.png new file mode 100644 index 0000000..047ff85 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-76.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-76@2x.png new file mode 100644 index 0000000..dd495ce Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-83.5@2x.png new file mode 100644 index 0000000..84eaebd Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Syncrow Icon-83.5@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-1024.png deleted file mode 100644 index 20102d9..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-1024.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20.png deleted file mode 100644 index 03f60c3..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@2x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@2x 1.png deleted file mode 100644 index fe27f08..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@2x 1.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@2x.png deleted file mode 100644 index fe27f08..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@3x.png deleted file mode 100644 index 1d09d46..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-20@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29 1.png deleted file mode 100644 index 490fd47..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29 1.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29.png deleted file mode 100644 index 490fd47..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@2x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@2x 1.png deleted file mode 100644 index 90ce766..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@2x 1.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@2x.png deleted file mode 100644 index 90ce766..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@3x.png deleted file mode 100644 index b33e6bc..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-29@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40.png deleted file mode 100644 index fe27f08..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@2x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@2x 1.png deleted file mode 100644 index 240758a..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@2x 1.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png deleted file mode 100644 index 240758a..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@3x.png deleted file mode 100644 index dc30e8e..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-40@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-60@2x.png deleted file mode 100644 index dc30e8e..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-60@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png deleted file mode 100644 index dbaf1a7..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-76.png deleted file mode 100644 index 93043c1..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-76.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-76@2x.png deleted file mode 100644 index 92107f2..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-76@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-83.5@2x.png deleted file mode 100644 index 039243c..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/logo-83.5@2x.png and /dev/null differ diff --git a/lib/features/app_layout/bloc/home_cubit.dart b/lib/features/app_layout/bloc/home_cubit.dart index 6734c36..3e85cdc 100644 --- a/lib/features/app_layout/bloc/home_cubit.dart +++ b/lib/features/app_layout/bloc/home_cubit.dart @@ -11,10 +11,7 @@ import 'package:syncrow_app/features/app_layout/view/widgets/app_bar_home_dropdo import 'package:syncrow_app/features/auth/model/user_model.dart'; import 'package:syncrow_app/features/dashboard/view/dashboard_view.dart'; import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart'; -import 'package:syncrow_app/features/devices/model/device_model.dart'; import 'package:syncrow_app/features/devices/model/room_model.dart'; -import 'package:syncrow_app/features/devices/model/status_model.dart'; -import 'package:syncrow_app/features/devices/view/widgets/curtains/curtain_view.dart'; import 'package:syncrow_app/features/devices/view/widgets/devices_view_body.dart'; import 'package:syncrow_app/features/menu/view/menu_view.dart'; import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart'; @@ -22,10 +19,7 @@ import 'package:syncrow_app/features/scene/bloc/effective_period/effect_period_b import 'package:syncrow_app/features/scene/bloc/effective_period/effect_period_event.dart'; import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart'; import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart'; -import 'package:syncrow_app/features/scene/model/create_automation_model.dart'; import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart'; -import 'package:syncrow_app/features/scene/view/create_scene_view.dart'; -import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart'; import 'package:syncrow_app/features/scene/view/scene_view.dart'; import 'package:syncrow_app/generated/assets.dart'; import 'package:syncrow_app/navigation/navigation_service.dart'; @@ -33,10 +27,8 @@ import 'package:syncrow_app/navigation/routing_constants.dart'; import 'package:syncrow_app/services/api/devices_api.dart'; import 'package:syncrow_app/services/api/profile_api.dart'; import 'package:syncrow_app/services/api/spaces_api.dart'; -import 'package:syncrow_app/utils/helpers/custom_page_route.dart'; import 'package:syncrow_app/utils/helpers/snack_bar.dart'; import 'package:syncrow_app/utils/resource_manager/color_manager.dart'; -import 'package:syncrow_app/utils/resource_manager/constants.dart'; part 'home_state.dart'; @@ -161,7 +153,7 @@ class HomeCubit extends Cubit { } _sendSubscriptionId() async { - String? subscriptionId = OneSignal.User.pushSubscription.id ?? ''; + // String? subscriptionId = OneSignal.User.pushSubscription.id ?? ''; //TODO send the subscription id to BE } diff --git a/lib/features/devices/model/ceiling_sensor_model.dart b/lib/features/devices/model/ceiling_sensor_model.dart index 3fa6e87..ac6e1b0 100644 --- a/lib/features/devices/model/ceiling_sensor_model.dart +++ b/lib/features/devices/model/ceiling_sensor_model.dart @@ -28,15 +28,15 @@ class CeilingSensorModel { if (jsonList[i].code == 'presence_state') { _presenceState = jsonList[i].value ?? 'none'; } else if (jsonList[i].code == 'sensitivity') { - _sensitivity = jsonList[i].value ?? false; + _sensitivity = jsonList[i].value ?? 1; } else if (jsonList[i].code == 'checking_result') { - _checkingResult = jsonList[i].value ?? false; + _checkingResult = jsonList[i].value ?? ''; } else if (jsonList[i].code == 'presence_range') { - _presenceRange = jsonList[i].value ?? false; + _presenceRange = jsonList[i].value ?? 0; } else if (jsonList[i].code == 'sports_para') { - _sportsPara = jsonList[i].value ?? false; + _sportsPara = jsonList[i].value ?? 0; } else if (jsonList[i].code == 'body_movement') { - _bodyMovement = jsonList[i].value ?? false; + _bodyMovement = jsonList[i].value ?? ''; } } return CeilingSensorModel( diff --git a/lib/features/devices/model/wall_sensor_model.dart b/lib/features/devices/model/wall_sensor_model.dart index fa3594d..78dc9be 100644 --- a/lib/features/devices/model/wall_sensor_model.dart +++ b/lib/features/devices/model/wall_sensor_model.dart @@ -35,9 +35,9 @@ class WallSensorModel { if (jsonList[i].code == 'presence_state') { _presenceState = jsonList[i].value ?? 'none'; } else if (jsonList[i].code == 'far_detection') { - _farDetection = jsonList[i].value ?? false; + _farDetection = jsonList[i].value ?? 0; } else if (jsonList[i].code == 'presence_time') { - _presenceTime = jsonList[i].value ?? false; + _presenceTime = jsonList[i].value ?? 0; } else if (jsonList[i].code == 'motion_sensitivity_value') { _motionSensitivity = jsonList[i].value ?? 0; } else if (jsonList[i].code == 'motionless_sensitivity') { @@ -47,7 +47,7 @@ class WallSensorModel { } else if (jsonList[i].code == 'illuminance_value') { _illuminance = jsonList[i].value ?? 0; } else if (jsonList[i].code == 'indicator') { - _indicator = jsonList[i].value ?? 0; + _indicator = jsonList[i].value ?? false; } } return WallSensorModel(