diff --git a/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonDetailResponse.kt b/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonDetailResponse.kt index 397db91..3aab1b0 100644 --- a/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonDetailResponse.kt +++ b/app/src/main/java/com/mobile/reconnect/data/model/report/MissingPersonDetailResponse.kt @@ -37,7 +37,6 @@ data class MissingPersonDetailResponse( "OTHER" -> "기타" else -> "알 수 없음" } - val nationalityLabel: String get() = when (nationality) { "DOMESTIC" -> "내국인" diff --git a/app/src/main/java/com/mobile/reconnect/data/model/report/ReportRequest.kt b/app/src/main/java/com/mobile/reconnect/data/model/report/ReportRequest.kt index b9e3a1e..d8f9fa4 100644 --- a/app/src/main/java/com/mobile/reconnect/data/model/report/ReportRequest.kt +++ b/app/src/main/java/com/mobile/reconnect/data/model/report/ReportRequest.kt @@ -18,7 +18,6 @@ data class ReportRequest( val surroundingImageUrls: List? = emptyList(), val additionalReport: String? = null ) - enum class ReportGender(val label: String) { // 성별 MALE("남자"), FEMALE("여자") diff --git a/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt b/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt index e43febd..57d6b90 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/ApiService.kt @@ -9,7 +9,6 @@ import retrofit2.http.POST import retrofit2.http.Path interface ApiService { - @POST("/reports") suspend fun createReport(@Body reportRequest: ReportRequest): Response diff --git a/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt b/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt index 5cce8b1..429f6ef 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/NetworkClient.kt @@ -63,5 +63,4 @@ object NetworkClient { return retrofit.create(ReportApi::class.java) } - } diff --git a/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt b/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt index 4e14628..fb79939 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/api/report/MissingPersonApi.kt @@ -7,6 +7,7 @@ import retrofit2.http.GET import retrofit2.http.Path import retrofit2.http.Query + interface MissingPersonApi { @GET("/api/missing_person") suspend fun getMissingPersons( diff --git a/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt b/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt index b638eb4..4189369 100644 --- a/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt +++ b/app/src/main/java/com/mobile/reconnect/data/network/api/report/ReportApi.kt @@ -6,12 +6,12 @@ import com.mobile.reconnect.data.network.ApiService import retrofit2.Response import javax.inject.Inject + class ReportApi @Inject constructor(private val apiService: ApiService) { suspend fun createReport(reportRequest: ReportRequest): Response { return apiService.createReport(reportRequest) } - suspend fun updateGender(missingPersonId: Long, gender: ReportGender): Response { return apiService.updateGender(missingPersonId, mapOf("gender" to gender)) } diff --git a/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt b/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt index 7645b45..8f61c4b 100644 --- a/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt +++ b/app/src/main/java/com/mobile/reconnect/data/repository/MissingPersonRepository.kt @@ -14,7 +14,6 @@ class MissingPersonRepository @Inject constructor( suspend fun getMissingPersons(sortBy: String, latitude: Double, longitude: Double): List { return missingPersonApi.getMissingPersons(sortBy, latitude, longitude) } - suspend fun getMissingPersonDetails(id: Long): MissingPersonDetailResponse { return missingPersonApi.getMissingPersonDetails(id) } diff --git a/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt b/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt index 0bdb928..755b549 100644 --- a/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt +++ b/app/src/main/java/com/mobile/reconnect/data/repository/ReportRepository.kt @@ -15,7 +15,6 @@ class ReportRepository @Inject constructor(private val api: ReportApi) { null // 네트워크 에러 처리 } } - suspend fun updateGender(missingPersonId: Long, gender: com.mobile.reconnect.data.model.ReportGender): Response? { return try { api.updateGender(missingPersonId, gender) diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt b/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt index 19cf237..7f6c755 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/ReportDetailFragment.kt @@ -49,7 +49,7 @@ class ReportDetailFragment : BaseFragment(R.layout. } private fun setupObservers() { - // 실종자 상세 정보 관찰 + // 실종자 상세 정보 viewModel.missingPersonDetail.observe(viewLifecycleOwner) { detail -> if (detail != null) { binding.missingPerson = detail diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt b/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt index 7506dea..d8acbfd 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/ReportFragment.kt @@ -24,6 +24,7 @@ class ReportFragment : BaseFragment(R.layout.fragment_rep binding.lifecycleOwner = viewLifecycleOwner binding.viewModel = viewModel + // RecyclerView 설정 setupRecyclerView() diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt b/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt index 727ad6e..c4cc9e6 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/ReportRegistrationFragment.kt @@ -18,6 +18,7 @@ class ReportRegistrationFragment : Fragment(R.layout.fragment_report_registratio super.onViewCreated(view, savedInstanceState) _binding = FragmentReportRegistrationBinding.bind(view) + // reportbtn 클릭 시 MyReportFragment로 이동 binding.reportbtn.setOnClickListener { findNavController().navigate(R.id.action_reportRegistrationFragment_to_myReportFragment) diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt b/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt index 9e06bd5..690f84e 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/adapter/MissingPersonAdapter.kt @@ -34,7 +34,6 @@ class MissingPersonAdapter( binding.root.setOnClickListener { onClick(item, it) } } } - companion object DiffCallback : DiffUtil.ItemCallback() { override fun areItemsTheSame( oldItem: MissingPersonListResponse, diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt index fb6948a..78bdb92 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/MissingPersonViewModel.kt @@ -54,7 +54,6 @@ class MissingPersonViewModel @Inject constructor( } } } - private fun updateCurrentTime() { viewModelScope.launch { while (true) { diff --git a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt index 3f6bb14..400b578 100644 --- a/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt +++ b/app/src/main/java/com/mobile/reconnect/ui/report/viewmodel/ReportRegistrationViewModel.kt @@ -29,7 +29,6 @@ class ReportRegistrationViewModel @Inject constructor( } } } - fun updateGender( missingPersonId: Long, gender: com.mobile.reconnect.data.model.ReportGender, // 올바른 타입 diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index 8b0c800..b610499 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -37,7 +37,6 @@ tools:layout_editor_absoluteX="22dp" tools:layout_editor_absoluteY="12dp" /> - +