[PDA-44] fix: 비품 안나오는 오류 해결

PLADI-ALM · Dec 2, 2023 · 565bba0 · 565bba0
1 parent 24884c8
commit 565bba0
Show file tree

Hide file tree

Showing 15 changed files with 449 additions and 51 deletions.
diff --git a/android/fastlane/report.xml b/android/fastlane/report.xml
@@ -5,27 +5,27 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000251">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000247">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000106">
+      <testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000111">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="26.010473">
+      <testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="85.326768">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="54.367004">
+      <testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="69.30277">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="4: slack" time="0.525506">
+      <testcase classname="fastlane.lanes" name="4: slack" time="0.642038">
 
       </testcase>
 

diff --git a/asset/image/plus.svg b/asset/image/plus.svg
diff --git a/ios/Runner.app.dSYM.zip b/ios/Runner.app.dSYM.zip
diff --git a/ios/Runner.ipa b/ios/Runner.ipa
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -474,9 +474,9 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;
@@ -488,7 +488,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.pladi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.example.pladi";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.example.pladi";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -505,7 +505,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 643M65W7HH;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -524,7 +524,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 643M65W7HH;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -541,7 +541,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = 643M65W7HH;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -667,9 +667,9 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;
@@ -681,7 +681,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.pladi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.example.pladi";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.example.pladi";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -701,9 +701,9 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;
@@ -715,7 +715,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.pladi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.example.pladi";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.example.pladi";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

diff --git a/ios/fastlane/.env b/ios/fastlane/.env
@@ -1,4 +1,5 @@
 APP_IDENTIFIER="com.example.pladi"
 APPLE_ID="[email protected]"
+SLACK_WEBHOOK_URL="https://hooks.slack.com/services/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"
 FASTLANE_USER="fastlane"
 FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD="ilyo-rtji-kcfa-lqhg"
diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
@@ -5,72 +5,72 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="00: default_platform" time="0.000277">
+      <testcase classname="fastlane.lanes" name="00: default_platform" time="0.000314">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="01: match" time="40.280481">
+      <testcase classname="fastlane.lanes" name="01: match" time="56.695888">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000346">
+      <testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000249">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="03: get_certificates" time="5.188">
+      <testcase classname="fastlane.lanes" name="03: get_certificates" time="2.462685">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="6.356861">
+      <testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="2.679391">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="05: cocoapods" time="2.07861">
+      <testcase classname="fastlane.lanes" name="05: cocoapods" time="5.366936">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.242569">
+      <testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.230192">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="7.362247">
+      <testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="3.219043">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.213344">
+      <testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.439216">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="09: build_app" time="166.097439">
+      <testcase classname="fastlane.lanes" name="09: build_app" time="153.815825">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="352.645333">
+      <testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="369.314753">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="11: get_version_number" time="0.044982">
+      <testcase classname="fastlane.lanes" name="11: get_version_number" time="0.040473">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000239">
+      <testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000322">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="13: slack" time="0.600499">
+      <testcase classname="fastlane.lanes" name="13: slack" time="0.614326">
 
       </testcase>
 

diff --git a/lib/Model/model/equipment/equipment_list_model.dart b/lib/Model/model/equipment/equipment_list_model.dart
@@ -53,7 +53,7 @@ class EquipmentModel {
   String keeper;
   String? location;
   String name;
-  int quantity;
+  String quantity;
 
   EquipmentModel({
     required this.category,

diff --git a/lib/Model/model/equipment/equipment_list_model.g.dart b/lib/Model/model/equipment/equipment_list_model.g.dart
diff --git a/lib/Presenter/equipment/equipment_service.dart b/lib/Presenter/equipment/equipment_service.dart
@@ -1,7 +1,7 @@
 import 'package:frontend/Model/network/api_manager.dart';
 
 class EquipmentService {
-  final equipmentURL = '/equipments?size=100';
+  final equipmentURL = '/equipments?cond=';
 
   static final EquipmentService _equipmentService = EquipmentService._();
   EquipmentService._();
@@ -14,4 +14,10 @@ class EquipmentService {
         APIManager().request(RequestType.get, equipmentURL, null, null, null);
     return response;
   }
+
+  Future<dynamic> getEquipmentCategory() async {
+    final response =
+        APIManager().request(RequestType.get, equipmentURL, null, null, null);
+    return response;
+  }
 }
diff --git a/lib/View/equipment/component/equipment_cell.dart b/lib/View/equipment/component/equipment_cell.dart
@@ -28,34 +28,45 @@ class _EquipmentCellState extends State<EquipmentCell> {
         width: double.infinity,
         height: 120,
         decoration: ShapeDecoration(
-          color: const Color(0xFFF7F3FB),
+          color: const Color(0xFFFCFBFF),
           shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(10),
+            borderRadius: BorderRadius.circular(5.76),
           ),
+          shadows: const [
+            BoxShadow(
+              color: Color(0x517A7A7B),
+              blurRadius: 19.20,
+              offset: Offset(0, 7.68),
+              spreadRadius: 0,
+            )
+          ],
         ),
         margin: const EdgeInsets.only(top: 10),
         child: Row(
           children: [
             Container(
                 margin: const EdgeInsets.only(top: 14, left: 14, bottom: 14),
-                child: (widget.equipment.imgUrl == null)
-                    ? Image.asset('asset/image/pladi_icon.png')
-                    : Image.network(widget.equipment.imgUrl!,
-                        fit: BoxFit.fitWidth)),
+                child: SizedBox(
+                  width: 90,
+                  height: 90,
+                  child: (widget.equipment.imgUrl == null)
+                      ? Image.asset('asset/image/pladi_icon.png')
+                      : Image.network(widget.equipment.imgUrl!,
+                          fit: BoxFit.fitWidth),
+                )),
             Container(
               margin: const EdgeInsets.only(
                   top: 17, left: 10, bottom: 14, right: 10),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
                       Container(
                         alignment: Alignment.center,
                         width: 65,
-                        height: 30,
-                        padding: const EdgeInsets.symmetric(
-                            horizontal: 4.72, vertical: 1.18),
+                        height: 22,
                         decoration: ShapeDecoration(
                           color: const Color(0xFF640FAF),
                           shape: RoundedRectangleBorder(
@@ -84,21 +95,19 @@ class _EquipmentCellState extends State<EquipmentCell> {
                           fontSize: 15,
                           fontFamily: 'NanumSquare_ac',
                           fontWeight: FontWeight.w700,
-                          height: 0.10,
                           letterSpacing: 0.10,
                         ),
                       ),
                       const SizedBox(
                         width: 10,
                       ),
                       Text(
-                        widget.equipment.quantity.toString(),
+                        widget.equipment.quantity,
                         style: const TextStyle(
                           color: Color(0xFF717171),
                           fontSize: 13,
                           fontFamily: 'NanumSquare_ac',
                           fontWeight: FontWeight.w700,
-                          height: 0.14,
                           letterSpacing: 0.10,
                         ),
                       )
@@ -124,7 +133,6 @@ class _EquipmentCellState extends State<EquipmentCell> {
                           fontSize: 13,
                           fontFamily: 'NanumSquare_ac',
                           fontWeight: FontWeight.w700,
-                          height: 0.14,
                           letterSpacing: 0.10,
                         ),
                       )
@@ -152,7 +160,6 @@ class _EquipmentCellState extends State<EquipmentCell> {
                           fontSize: 13,
                           fontFamily: 'NanumSquare_ac',
                           fontWeight: FontWeight.w700,
-                          height: 0.14,
                           letterSpacing: 0.10,
                         ),
                       )