Merge pull request #55 from PLADI-ALM/fix/PDA-45-QA1

[PDA-45] QA 수정
PLADI-ALM · Dec 5, 2023 · 193fe51 · 193fe51
2 parents 79e05d4 + fe94814
commit 193fe51
Show file tree

Hide file tree

Showing 23 changed files with 342 additions and 214 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.003909">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000238">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000789">
+      <testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000109">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="148.642411">
+      <testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="104.87781">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="30.671689">
+      <testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="46.513868">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="4: slack" time="0.519376">
+      <testcase classname="fastlane.lanes" name="4: slack" time="0.544567">
 
       </testcase>
 

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -32,6 +32,13 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 7.8)
     - nanopb (< 2.30910.0, >= 2.30908.0)
   - Flutter (1.0.0)
+  - flutter_inappwebview (0.0.1):
+    - Flutter
+    - flutter_inappwebview/Core (= 0.0.1)
+    - OrderedSet (~> 5.0)
+  - flutter_inappwebview/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 5.0)
   - flutter_local_notifications (0.0.1):
     - Flutter
   - flutter_secure_storage (6.0.0):
@@ -67,6 +74,7 @@ PODS:
     - nanopb/encode (= 2.30909.1)
   - nanopb/decode (2.30909.1)
   - nanopb/encode (2.30909.1)
+  - OrderedSet (5.0.0)
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -79,6 +87,7 @@ DEPENDENCIES:
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
+  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
@@ -96,6 +105,7 @@ SPEC REPOS:
     - GoogleDataTransport
     - GoogleUtilities
     - nanopb
+    - OrderedSet
     - PromisesObjC
     - Toast
 
@@ -106,6 +116,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
+  flutter_inappwebview:
+    :path: ".symlinks/plugins/flutter_inappwebview/ios"
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_secure_storage:
@@ -128,13 +140,15 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 9387bf15abfc69a714f54e54f74a251264fdb79b
   FirebaseMessaging: 80b4a086d20ed4fd385a702f4bfa920e14f5064d
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
   GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
   GoogleUtilities: 202e7a9f5128accd11160fb9c19612de1911aa19
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
+  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196

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
@@ -476,7 +476,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;
@@ -505,7 +505,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				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 = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				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 = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = 643M65W7HH;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -669,7 +669,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;
@@ -703,7 +703,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;

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

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.000203">
+      <testcase classname="fastlane.lanes" name="00: default_platform" time="0.00054">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="01: match" time="18.529687">
+      <testcase classname="fastlane.lanes" name="01: match" time="440.936291">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000292">
+      <testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000263">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="03: get_certificates" time="1.987486">
+      <testcase classname="fastlane.lanes" name="03: get_certificates" time="4.333199">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="2.587708">
+      <testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="4.176982">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="05: cocoapods" time="3.107177">
+      <testcase classname="fastlane.lanes" name="05: cocoapods" time="2.177938">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.529863">
+      <testcase classname="fastlane.lanes" name="06: increment_version_number" time="2.910989">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="2.342366">
+      <testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="6.332043">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.257864">
+      <testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.210178">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="09: build_app" time="85.449201">
+      <testcase classname="fastlane.lanes" name="09: build_app" time="131.97139">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="296.106694">
+      <testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="469.96003">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="11: get_version_number" time="0.046858">
+      <testcase classname="fastlane.lanes" name="11: get_version_number" time="0.031575">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000257">
+      <testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000218">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="13: slack" time="0.477595">
+      <testcase classname="fastlane.lanes" name="13: slack" time="0.504566">
 
       </testcase>
 

diff --git a/lib/Model/model/booking/resource_model.dart b/lib/Model/model/booking/resource_model.dart
@@ -285,7 +285,7 @@ class AdminResourceBookingHistory {
   String responsibilityName;
   String responsibilityPhone;
   String? description;
-  String imgUrl;
+  String? imgUrl;
   List<ResourcesList> productList;
 
   AdminResourceBookingHistory({

diff --git a/lib/Model/model/booking/resource_model.g.dart b/lib/Model/model/booking/resource_model.g.dart
diff --git a/lib/Model/network/api_manager.dart b/lib/Model/network/api_manager.dart
@@ -29,7 +29,7 @@ class APIManager {
   ) async {
     setToken();
     // print('${await storage.read(key: accessTokenKey)}');
-    // print('${defaultOptions.headers}');
+    print('${defaultOptions.headers}');
 
     if (options != null && options.headers != null) {
       defaultOptions.headers!.addAll(options.headers!);
@@ -129,6 +129,7 @@ class APIManager {
   void deleteToken() {
     storage.delete(key: refreshTokenKey);
     storage.delete(key: accessTokenKey);
+    isAdmin = false;
   }
 
   Future<bool> checkToken() async {