Merge pull request #22 from farm-mate/fix/#19-writediary-xml

app/build.gradle

@@ -62,7 +62,7 @@ dependencies {
     //레트로핏 서버
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.google.android.gms:play-services-location:19.0.1'
+    implementation 'com.google.android.gms:play-services-location:21.0.1'
 
     //비동기
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
@@ -79,4 +79,7 @@ dependencies {
 
     //날씨
     implementation 'com.loopj.android:android-async-http:1.4.11'
+
+    // Calendar
+    implementation 'com.github.prolificinteractive:material-calendarview:1.4.3'
 }

app/src/main/AndroidManifest.xml

@@ -5,36 +5,42 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" android:required="true" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
+
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_launcher1"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".IntroActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <activity
-            android:name=".IntroActivity"
+            android:name=".MainActivity"
+            android:windowSoftInputMode="adjustPan"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
     </application>

app/src/main/java/com/example/farmmate1/ApiService.kt

@@ -1,36 +1,141 @@
 package com.example.farmmate1
 
-import com.example.farmmate1.data.TodoItem
-import com.example.farmmate1.network.ToDoListInterface
 import retrofit2.Call
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.*
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import com.example.farmmate1.api.SearchResponse
 
 interface ApiService {
-    @GET("plants")
-    fun getPlantList(): Call<List<Plant>>
-    // 서버에서 식물 정보를 가져오는 GET 요청을 정의
 
-    @POST("plants")
+    // 기기 등록
+    @POST("device")
     @Headers("Content-Type: application/json")
-    fun createPlant(@Body plant: Plant): Call<Plant>
+    fun saveDeviceInfo(@Body deviceInfo: DeviceInfo): Call<Void>
 
-    @GET("plants")
-    fun getPlant(): Call<Plant>
+    //-------------------------------------------------------------------------------
 
+    // 식물 전체 GET 요청
+    @GET("plant/device/{deviceId}")
+    fun getPlantList(@Path("deviceId") deviceId: String): Call<List<PlantGet>>
+    // 서버에서 식물 정보를 가져오는 GET 요청을 정의
 
-    @GET("history")
-    fun getHistoryList(): Call<List<History>>
-    // 서버에서 진단 결과를 가져오는 GET 요청을 정의
+    // 식물 POST 요청
+    @Multipart
+    @POST("plant")
+    fun postPlant(
+        @PartMap data: HashMap<String, RequestBody>,
+        @Part image: MultipartBody.Part? // 이미지 파일을 MultipartBody.Part로 전송
+    ): Call<PlantPost>
 
-    @POST("history")
-    @Headers("Content-Type: application/json")
-    fun saveResult(@Body history: History): Call<History>
+    // 식물 개별 GET 요청
+    @GET("plant/{plantUuid}")
+    fun getPlant(@Path("plantUuid") plantUuid: String?): Call<PlantGet>
+
+    // 식물 개별 PUT 요청
+    @Multipart
+    @PUT("plant/{plantUuid}")
+    fun editPlant(
+        @Path("plantUuid") plantUuid: String,
+        @PartMap data: HashMap<String, RequestBody>,
+        @Part image: MultipartBody.Part? // 이미지 파일을 MultipartBody.Part로 전송
+    ): Call<PlantPost>
+
+    // 북마크 POST 요청
+    @POST("plant/{plantUuid}/bookmark")
+    fun postBookmark(@Path("plantUuid")plantUuid: String): Call<Void>
+
+    // 식물 DELETE 요청
+    @DELETE("plant/{plantUuid}")
+    fun deletePlant(@Path("plantUuid")plantUuid: String?): Call<Void>
+
+    // 북마크 GET 요청
+    @GET("plant/device/{deviceId}/bookmark")
+    fun getBookmark(@Path("deviceId")deviceId: String): Call<List<PlantGet>>
+
+    //-------------------------------------------------------------------------------
+
+    // 일지 post 요청
+    @Multipart
+    @POST("diary")
+    fun postDiary(
+        //@Query("plant_uuid") plantUuid: String?,
+        //@Path("plantUuid") plantUuid: String,
+        @PartMap data: HashMap<String, RequestBody>,
+        @Part image: MultipartBody.Part? // 이미지 파일을 MultipartBody.Part로 전송
+    ): Call<DiaryPost>
+
+    // 일지 개별 GET 요청
+    @GET("diary/{diaryUuid}")
+    fun getDiary(@Path("diaryUuid") diaryUuid: String?): Call<DiaryGet>
+
+    // 모든 일지 GET 요청
+    @GET("diary")
+    //fun getDiaryList(@Query("plant.plant_name") plantName: String?): Call<List<DiaryGet>>
+    fun getDiaryList(): Call<List<DiaryGet>>
+
+    // 일지 개별 PUT 요청
+    @Multipart
+    @PUT("diary/{diaryUuid}")
+    fun editDiary(
+        @Path("diaryUuid") diaryUuid: String,
+        @PartMap data: HashMap<String, RequestBody>,
+        @Part image: MultipartBody.Part? // 이미지 파일을 MultipartBody.Part로 전송
+    ): Call<DiaryPost>
+
+    // 이미지를 포함하지 않은 PUT 요청
+    @Multipart
+    @PUT("diary/{diaryUuid}")
+    fun editDiaryWithoutImage(
+        @Path("diaryUuid") diaryUuid: String,
+        @PartMap data: HashMap<String, RequestBody>,
+    ): Call<DiaryPost>
+
+
+    // 일지 개별 DELETE 요청
+    @DELETE("diary/{diaryUuid}")
+    fun deleteDiary(@Path("diaryUuid")diaryUuid: String?): Call<Void>
+
+    //-------------------------------------------------------------------------------
+
+    // 진단 POST 요청
+    @Multipart
+    @POST("plant/diagnose")
+    fun postDiagnosis(
+        @Part("plantType") plantType: RequestBody,
+        @Part image: MultipartBody.Part
+    ): Call<DiagnosisResult>
+
+    // 진단 결과 저장 POST 요청
+    @POST("plant/diagnose/result")
+    fun postDiagnosisSave(@Body request: DiagnosisSaveRequest): Call<Void>
+
+    // 식물별 진단 결과 GET 요청
+    @GET("plant/diagnose/result/plant/{plantUuid}")
+    fun getSavedResult(@Path("plantUuid") plantUuid: String?): Call<List<History>>
+
+    // 개별 진단 결과 GET 요청
+    @GET("plant/diagnose/result/{plantDiseaseUuid}")
+    fun getResult(@Path("plantDiseaseUuid") plantDiseaseUuid: String?): Call<History>
+
+//-------------------------------------------------------------------------------
 
-    @GET("history")
-    fun getHistory(): Call<History>
+    @GET("service")
+    fun searchDiseases(
+        @Query("apiKey") apiKey: String,
+        @Query("serviceCode") serviceCode: String,
+        @Query("serviceType") serviceType: String,
+        @Query("cropName") cropName: String,
+        @Query("sickNameKor") sickNameKor: String,
+        @Query("displayCount") displayCount: Int,
+        @Query("startPoint") startPoint: Int
+    ): Call<SearchResponse>
 
+    @GET("service")
+    fun getDetail(
+        @Query("apiKey") apiKey: String,
+        @Query("serviceCode") serviceCode: String,
+        @Query("sickKey") sickKey: String
+    ): Call<SearchDetail>
 
 }

app/src/main/java/com/example/farmmate1/BookmarkAdapter.kt

@@ -0,0 +1,74 @@
+package com.example.farmmate1
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+
+class BookmarkAdapter(private val context: Context, private val bookmarkedPlants: List<PlantGet>) : BaseAdapter() {
+
+    override fun getCount(): Int {
+        return bookmarkedPlants.size
+    }
+
+    override fun getItem(position: Int): Any {
+        return bookmarkedPlants[position]
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+        val view: View = convertView ?: LayoutInflater.from(context).inflate(R.layout.list_item_bookmark, parent, false)
+
+        val plantNameTextView: TextView = view.findViewById(R.id.bookmark_list_item_name)
+        val plantTypeTextView: TextView = view.findViewById(R.id.bookmark_list_item_type)
+        val firstPlantingDateTextView: TextView = view.findViewById(R.id.bookmark_list_item_startdate)
+        val bookmarkImg = view.findViewById<ImageView>(R.id.bookmark_list_item_profile)
+
+        val plant = bookmarkedPlants[position]
+        plantNameTextView.text = plant.plant_name
+        plantTypeTextView.text = plant.plant_type
+        firstPlantingDateTextView.text = plant.first_planting_date
+
+        val imageUrl = plant.image_url
+        ImageLoaderTask(bookmarkImg).execute(imageUrl)
+
+        view.setOnClickListener {
+            // 해당 항목의 plant_uuid 가져오기
+            val plantUuid = plant.plant_uuid
+
+            // 다음 프래그먼트로 전환하기 위해 번들에 데이터 추가
+            val bundle = Bundle()
+            bundle.putString("plantUuid", plantUuid)
+
+            val plantInfoFragment = PlantInfoFragment()
+            plantInfoFragment.arguments = bundle
+//
+            // 다음 프래그먼트로 이동하고 번들에 담긴 데이터 전달
+            val transaction = (context as AppCompatActivity).supportFragmentManager.beginTransaction()
+            transaction.replace(R.id.main_fl, plantInfoFragment)
+            transaction.addToBackStack(null)
+            transaction.commit()
+
+//        parentFragmentManager
+//            requireActivity().supportFragmentManager
+//                .beginTransaction()
+//                .replace(R.id.main_fl, plantInfoFragment)
+//                .commit()
+
+//            val transaction = parentFragmentManager
+//                .beginTransaction()
+//                .replace(R.id.main_fl, diaryAddFragment)
+//            transaction.commit()
+        }
+
+        return view
+    }
+}

app/src/main/java/com/example/farmmate1/CustomMultipleDotSpan.kt

@@ -0,0 +1,71 @@
+package com.example.farmmate1
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.text.style.LineBackgroundSpan
+import android.util.Log
+
+class CustomMultipleDotSpan(private val radius: Float = DEFAULT_RADIUS, private val colors: IntArray) : LineBackgroundSpan {
+
+    companion object {
+        private const val DEFAULT_RADIUS = 5f
+    }
+
+//    override fun drawBackground(
+//        canvas: Canvas, paint: Paint, left: Int, right: Int, top: Int, baseline: Int, bottom: Int,
+//        charSequence: CharSequence, start: Int, end: Int, lineNum: Int
+//    ) {
+//        val total = if (colors.size > 3) 3 else colors.size
+//        var leftMost = (total - 1) * -12
+//
+//        for (i in 0 until total) {
+//            val oldColor = paint.color
+//            if (colors[i] != 0) {
+//                paint.color = colors[i]
+//            }
+//            canvas.drawCircle(((left + right) / 2 - leftMost).toFloat(), bottom + radius, radius, paint)
+//            paint.color = oldColor
+//            leftMost += 24
+//        }
+//    }
+override fun drawBackground(
+    canvas: Canvas, paint: Paint, left: Int, right: Int, top: Int, baseline: Int, bottom: Int,
+    charSequence: CharSequence, start: Int, end: Int, lineNum: Int
+) {
+    val total = colors.size
+    val centerX = (left + right) / 2 // 가운데 x 좌표
+
+    // 각 점 사이의 간격 계산
+    val interval: Float = if (total > 1) {
+        if (total % 2 == 0) { // 짝수인 경우
+            (right - left - radius * 2) / (total*3.3 - 1).toFloat()
+        } else { // 홀수인 경우
+            (right - left - radius * 2) / (total*2).toFloat()
+        }
+    } else {
+        0f
+    }
+
+    var currentX = centerX - (interval * (total - 1) / 2) // 첫 번째 점의 x 좌표 계산
+
+    for (i in 0 until total) {
+        val oldColor = paint.color
+        if (colors[i] != 0) {
+            paint.color = colors[i]
+        }
+
+        // 각 점의 x 좌표 계산
+        val x = currentX.toFloat()
+        Log.d("CustomMultipleDotSpan", "점 ${i + 1}의 x 좌표: $x")
+
+        canvas.drawCircle(x, bottom + radius, radius, paint) // 점 그리기
+        paint.color = oldColor
+
+        currentX += interval.toInt() // 다음 점으로 이동
+    }
+}
+
+
+
+
+}

app/src/main/java/com/example/farmmate1/DeviceInfo.kt

@@ -0,0 +1,3 @@
+package com.example.farmmate1
+
+data class DeviceInfo(val deviceId: String)