[D-0] ocr api key 변경 및 xcconfig 통해 숨김 처리(506) + OCR 카메라 자동 초점 포커스 기능 …

…구현(510) (#72)

* fix: ocr-api-key 변경 및 .xcconfig를 통해 key 가져오기

* feat: OCR Camera 초점 조절 구현

.github/workflows/main.yml

@@ -46,6 +46,12 @@ jobs:
         env:
             KEYCHAIN_NAME: ${{ secrets.KEYCHAIN_NAME }}
             KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+
+      - name: Setting Xcconfig
+        run: | 
+          echo "NAVER_OCR_KEY = $NAVER_OCR_KEY" > Projects/App/Resources/APIKey.xcconfig
+        env:
+          NAVER_OCR_KEY: ${{secrets.NAVER_OCR_KEY}}
 
       - name: Tuist generate
         run: tuist generate

.gitignore

@@ -77,3 +77,4 @@ Moneymong.app.dSYM.zip
 *.ipa
 fastlane/report.xml
 fastlane/README.md
+Projects/App/Resources/APIKey.xcconfig

Projects/App/Project.swift

@@ -11,7 +11,11 @@ let project = Project(
       .marketingVersion("1.2.1")
       .swiftVersion("5.7")
       .currentProjectVersion("10")
-      .appleGenericVersioningSystem()
+      .appleGenericVersioningSystem(),
+    configurations: [
+      .debug(name: .debug, xcconfig: "Resources/APIKey.xcconfig"),
+      .release(name: .release, xcconfig: "Resources/APIKey.xcconfig")
+    ]
   ),
   targets: [
     Target(
@@ -35,6 +39,7 @@ let project = Project(
           ]
         ],
         "UIUserInterfaceStyle": "Light",
+        "NAVER_OCR_KEY": "$(NAVER_OCR_KEY)",
         "CFBundleShortVersionString": "$(MARKETING_VERSION)",
         "CFBundleVersion": "$(CURRENT_PROJECT_VERSION)",
         "UILaunchStoryboardName": "LaunchScreen",

Projects/Core/Core/Sources/Network/APIs/LedgerAPI/Repository/LedgerAPI.swift

@@ -22,7 +22,7 @@ extension LedgerAPI: TargetType {
   var baseURL: URL? {
     switch self {
     case .receiptOCR:
-      return try? "https://rgec3uf4w8.apigw.ntruss.com/custom/v1/27247/c8164e59014063109889b541dc736eeae7690fc5dd305dd0189e6e6ff95cd659/".asURL()
+      return try? "https://q527hvfohd.apigw.ntruss.com/custom/v1/34593/567a6406461afde2a1d5836d6df3ca9b71cbf451c76dc5df6d2a2bc3f16446f7/".asURL()
     default:
       return try? Config.base.asURL()
     }
@@ -109,9 +109,10 @@ extension LedgerAPI: TargetType {
     case .uploadImage: return ["Content-Type": "multipart/form-data"]
     case .deleteImage: return ["Content-Type": "application/json"]
     case .receiptOCR:
+      let key = Bundle.main.infoDictionary?["NAVER_OCR_KEY"] as? String
       return [
         "Content-Type": "multipart/form-data",
-        "X-OCR-SECRET": "WUdRdW9Ld0FobXRIaVRnYmNBY3NYVVhDdkhDR1lRcHQ="
+        "X-OCR-SECRET": key ?? ""
       ]
     default: return ["Content-Type": "application/json;charset=UTF-8"]
     }

Projects/Feature/Ledger/Sources/Scene/Ledger/Creaters/Scan/Components/CameraView.swift

@@ -42,8 +42,18 @@ final class CameraView: UIView {
   }
 
   func setupCamera() throws {
-    // 사용 가능한 카메라 중 후면 카메라를 선택
-    guard let backCamera = AVCaptureDevice.default(for: .video),
+    let deviceTypes: [AVCaptureDevice.DeviceType] = [
+      .builtInTripleCamera,  // 최신 프로 모델의 트리플 카메라
+      .builtInDualCamera,    // 듀얼 카메라 (프로 및 일부 비프로 모델)
+      .builtInWideAngleCamera // 광각 카메라 (단일 렌즈 카메라)
+    ]
+
+    // 사용 가능한 장치 중 후면 카메라와 일치하는 장치를 찾기
+    guard let backCamera = AVCaptureDevice.DiscoverySession(
+      deviceTypes: deviceTypes,
+      mediaType: .video,
+      position: .back
+    ).devices.first,
           let input = try? AVCaptureDeviceInput(device: backCamera) else {
       throw MoneyMongError.appError(.cameraAccess, errorMessage: "설정에서 카메라 접근을 허용해주세요!")
     }
@@ -63,12 +73,31 @@ final class CameraView: UIView {
     // 프리뷰 레이어 설정
     videoPreviewLayer.session = captureSession
 
+    // 자동 초점 조절
+    try configureCameraFocus(backCamera)
+
     // 세션 시작
     DispatchQueue.main.async {
       self.captureSession.startRunning()
     }
   }
 
+  private func configureCameraFocus(_ camera: AVCaptureDevice) throws {
+    try camera.lockForConfiguration()
+
+    // 연속 자동 초점 모드 설정
+    if camera.isFocusModeSupported(.continuousAutoFocus) {
+      camera.focusMode = .continuousAutoFocus
+    }
+
+    // 연속 자동 노출 모드 설정
+    if camera.isExposureModeSupported(.continuousAutoExposure) {
+      camera.exposureMode = .continuousAutoExposure
+    }
+
+    camera.unlockForConfiguration()
+  }
+
   var takePhoto: Binder<Void> {
     return Binder(self) { owner, _ in
       guard let delegate = owner.delegate else {

Projects/Feature/Ledger/Sources/Scene/Ledger/Creaters/Scan/ScanCreater/CreateOCRLedgerVC.swift

@@ -146,7 +146,8 @@ final class CreateOCRLedgerVC: UIViewController, View {
       .alignItems(.center)
       .justifyContent(.center)
       .height(deviceHeight * 0.175)
-    }
+    }.backgroundColor(.black)
+
     cameraView.addSubview(captureImageView)
     view.addSubview(topContainer)
     topContainer.addSubview(topGuideLine)

fastlane/Fastfile

@@ -41,6 +41,9 @@ platform :ios do
   # 테스트 플라이트 업로드
   desc "Push to TestFlight"
   lane :tf do |options|
+
+    ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
+
     # 앱스토어 커넥트 키 연결
     app_store_connect_api_key(
       key_id: "#{FASTLANE_API_KEY_ID}",