🔀 :: 3.7.0 배포

team-osj · May 26, 2024 · 6ffb198 · 6ffb198
2 parents a0f137b + 05849e8
commit 6ffb198
Show file tree

Hide file tree

Showing 16 changed files with 244 additions and 296 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -13,12 +13,12 @@ if (flutterRoot == null) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '25'
+    flutterVersionCode = '26'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '3.6.0'
+    flutterVersionName = '3.7.0'
 }
 
 def keystoreProperties = new Properties()

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -367,7 +367,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = Z25H7B85Z8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -376,7 +376,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.osj.lotura;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -507,7 +507,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = Z25H7B85Z8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -516,7 +516,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.osj.lotura;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -537,7 +537,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = Z25H7B85Z8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -546,7 +546,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.osj.lotura;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

diff --git a/lib/data/laundry/data_source/remote/remote_laundry_data_source.dart b/lib/data/laundry/data_source/remote/remote_laundry_data_source.dart
@@ -28,7 +28,7 @@ class RemoteLaundryDataSource {
   }
 
   Future<List<LaundryEntity>> getAllLaundryList() async {
-    final response = await http.get(Uri.parse("$baseurl/device_list"));
+    final response = await http.get(Uri.parse("$baseurl/device_list_boy"));
     if (response.statusCode != 200) {
       throw Exception(response.body);
     }

diff --git a/lib/data/laundry/dto/response/laundry_response.dart b/lib/data/laundry/dto/response/laundry_response.dart
@@ -24,7 +24,11 @@ class LaundryResponse {
     return LaundryEntity(
       id: id,
       state: CurrentState.values.elementAt(state),
-      deviceType: deviceType == "WASH" ? DeviceType.wash : DeviceType.dry,
+      deviceType: deviceType == "WASH"
+          ? DeviceType.wash
+          : deviceType == "DRY"
+              ? DeviceType.dry
+              : DeviceType.empty,
     );
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -108,6 +108,11 @@ enum DeviceType {
     text: "건조기",
     icon: LoturaIcons.dry,
     imagePath: "assets/dry_image.jpeg",
+  ),
+  empty(
+    text: "",
+    icon: Icons.abc,
+    imagePath: "",
   );
 
   final String text, imagePath;
@@ -120,21 +125,30 @@ enum DeviceType {
   });
 }
 
+enum Gender {
+  boy(text: "남자 세탁실"),
+  girl(text: "여자 세탁실");
+
+  const Gender({required this.text});
+
+  final String text;
+}
+
 enum RoomLocation {
   schoolSide(roomName: "남자 학교측 세탁실"),
   dormitorySide(roomName: "남자 기숙사측 세탁실"),
-  womanRoom(roomName: "여자 세탁실");
+  schoolGirlSide(roomName: "여자 기숙사측 세탁실");
 
   const RoomLocation({required this.roomName});
 
   final String roomName;
 }
 
-enum ButtonView {
-  image,
-  icon;
+enum LaundryRoomLayer {
+  first(icon: Icons.looks_one_outlined),
+  second(icon: Icons.looks_two_outlined);
 
-  Widget get triangle => this == ButtonView.image
-      ? const SizedBox.shrink()
-      : const Icon(LoturaIcons.triangleUp, color: Colors.grey);
+  const LaundryRoomLayer({required this.icon});
+
+  final IconData icon;
 }
diff --git a/lib/presentation/apply_page/ui/view/apply_page.dart b/lib/presentation/apply_page/ui/view/apply_page.dart
@@ -5,6 +5,7 @@ import 'package:lotura/main.dart';
 import 'package:lotura/presentation/apply_page/bloc/apply_bloc.dart';
 import 'package:lotura/presentation/apply_page/bloc/apply_model.dart';
 import 'package:lotura/presentation/apply_page/bloc/apply_state.dart';
+import 'package:lotura/presentation/apply_page/ui/widget/machine_card.dart';
 import 'package:lotura/presentation/notice_page/bloc/notice_bloc.dart';
 import 'package:lotura/presentation/notice_page/bloc/notice_event.dart';
 import 'package:lotura/presentation/notice_page/bloc/notice_model.dart';
@@ -13,7 +14,6 @@ import 'package:lotura/presentation/notice_page/ui/view/notice_page.dart';
 import 'package:lotura/presentation/setting_page/ui/view/setting_page.dart';
 import 'package:lotura/presentation/utils/lotura_colors.dart';
 import 'package:lotura/presentation/utils/lotura_icons.dart';
-import 'package:lotura/presentation/utils/machine_card.dart';
 
 class ApplyPage extends StatelessWidget {
   ApplyPage({super.key});
@@ -146,13 +146,6 @@ class ApplyPage extends StatelessWidget {
                                         deviceId: state.value
                                             .applyList[index * 2].deviceId,
                                         isEnableNotification: false,
-                                        isWoman: state
-                                                    .value
-                                                    .applyList[index * 2]
-                                                    .deviceId >
-                                                31
-                                            ? true
-                                            : false,
                                         deviceType: state.value
                                             .applyList[index * 2].deviceType,
                                         state: CurrentState.working),
@@ -163,14 +156,6 @@ class ApplyPage extends StatelessWidget {
                                                 .applyList[index * 2 + 1]
                                                 .deviceId,
                                             isEnableNotification: false,
-                                            isWoman: state
-                                                        .value
-                                                        .applyList[
-                                                            index * 2 + 1]
-                                                        .deviceId >
-                                                    31
-                                                ? true
-                                                : false,
                                             deviceType: state
                                                 .value
                                                 .applyList[index * 2 + 1]
@@ -180,8 +165,7 @@ class ApplyPage extends StatelessWidget {
                                             //리팩토링 꼭 하기
                                             deviceId: -1,
                                             isEnableNotification: false,
-                                            isWoman: true,
-                                            deviceType: DeviceType.dry,
+                                            deviceType: DeviceType.empty,
                                             state: CurrentState.working)
                                   ],
                                 ),

diff --git a/lib/presentation/utils/machine_card.dart → ...on/apply_page/ui/widget/machine_card.dart b/lib/presentation/utils/machine_card.dart → ...on/apply_page/ui/widget/machine_card.dart
@@ -1,20 +1,20 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart' as s;
+import 'package:lotura/main.dart';
 import 'package:lotura/presentation/utils/machine_widget.dart';
 
 class MachineCard extends MachineWidget {
   const MachineCard({
     super.key,
     required super.deviceId,
     required super.isEnableNotification,
-    required super.isWoman,
     required super.deviceType,
     required super.state,
   });
 
   @override
   Widget build(BuildContext context) {
-    return isEmptyContainer
+    return deviceType == DeviceType.empty
         ? Container(
             width: 170.0.r,
             padding: EdgeInsets.only(top: 10.0.r),
@@ -27,7 +27,7 @@ class MachineCard extends MachineWidget {
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 Image.asset(
-                  deviceType.imagePath,
+                  "assets/dry_image.jpeg",
                   width: 100.0.r,
                   height: 100.0.r,
                   color: Colors.transparent,
@@ -74,7 +74,7 @@ class MachineCard extends MachineWidget {
                     height: 100.0.r,
                   ),
                   Text(
-                    "${isWoman ? deviceId - 31 : deviceId}번 ${deviceType.text}",
+                    "$deviceId번 ${deviceType.text}",
                     textScaler: TextScaler.noScaling,
                     style: TextStyle(
                       fontSize: 20.0.sp,