Skip to content

Eun #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moongpom merged 4 commits into from
Aug 24, 2022
Merged

Eun #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cb2de4
버전카톡친구
moongpom Aug 23, 2022
8c52404
Merge branch 'develop' of https://github.com/UMC-Hackathon/MBTree_And…
moongpom Aug 23, 2022
ac39954
d
moongpom Aug 24, 2022
f82eea2
충돌 수정
moongpom Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion app/src/main/java/com/umc/project/mbtree/view/LetterPaper/LetterPaperGVAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import com.umc.project.mbtree.data.LetterPaper
import com.umc.project.mbtree.data.User
import com.umc.project.mbtree.databinding.ItemLetterPaperBinding
import com.umc.project.mbtree.databinding.ItemListBinding
import com.umc.project.mbtree.view.Login.NicknameActivity
import com.umc.project.mbtree.view.friend.FriendRVAdapter
import kotlinx.android.synthetic.main.item_letter_paper.view.*
import kotlinx.android.synthetic.main.item_mbti.view.*
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/umc/project/mbtree/view/Login/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

package com.umc.project.mbtree.view.Login

import android.content.ContentValues.TAG
Expand All @@ -13,6 +14,7 @@ import com.kakao.sdk.common.KakaoSdk
import com.kakao.sdk.common.model.AuthErrorCause
import com.kakao.sdk.user.UserApiClient
import com.umc.project.mbtree.R
import com.umc.project.mbtree.view.MainActivity

class LoginActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/umc/project/mbtree/view/Login/MbtiGVAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.umc.project.mbtree.view.Login


import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/umc/project/mbtree/view/Login/NicknameActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

package com.umc.project.mbtree.view.Login

import android.content.Intent
Expand All @@ -24,3 +25,4 @@ class NicknameActivity : AppCompatActivity() {
}
}


5 changes: 1 addition & 4 deletions app/src/main/java/com/umc/project/mbtree/view/tree/TreeResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ data class TreeResponse (
@SerializedName("code") val code: Int,
@SerializedName("message") val message: String,
@SerializedName("result") val result: List<Result>
)/*
data class TreeResult(
@SerializedName("tree") val tree: List<Result>
)*/
)
data class Result
(
@SerializedName("id") val id:Int,
Expand Down
68 changes: 68 additions & 0 deletions app/src/main/java/com/umc/project/mbtree/view/user/UserFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package com.umc.project.mbtree.view.user

import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.fragment.app.Fragment
import com.umc.project.mbtree.databinding.ActivityMainBinding.inflate
import com.umc.project.mbtree.databinding.FragmentFriendBinding
import com.umc.project.mbtree.databinding.FragmentMyletterBinding
import com.umc.project.mbtree.databinding.LockerLayoutBinding
import com.umc.project.mbtree.view.tree.RetrofitObject
import com.umc.project.mbtree.view.tree.contentResponse
import com.umc.project.mbtree.view.tree.contentService
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response

class UserFragment : Fragment() {

lateinit var binding:FragmentMyletterBinding
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View?
{

binding = FragmentMyletterBinding.inflate(inflater, container,false)
getMessageId()
// binding.letterContent.setText(.content)

return binding.root
}
private fun getMessageId() {
Log.v("eun test", "TreeFragment들어옴")
val retrofitService = RetrofitObject.getRetrofit().create(contentService::class.java)

Log.v("eun test", "retrofitService" + retrofitService.getMessageId(1))
Log.v("eun test", "TreeFragment들어옴 1")
retrofitService.getMessageId(1).enqueue(object : Callback<contentResponse> {

override fun onResponse(call: Call<contentResponse>, response: Response<contentResponse>) {
Log.e("eun test", "TreeFragment들어옴2")
var rLists = response.body()!!
Log.e("eun test", "TreeFragment들어옴 3"+rLists)
Log.d("mbtree test", "isSuccess: " + rLists.isSuccess)
Log.e("mbtree test", "code: " + rLists.code)
Log.v("mbtree test", "message: " + rLists.message)

//Expected BEGIN_OBJECT but was STRING
Log.v("eun test", "은영" + rLists.messageResult)


}

override fun onFailure(call: Call<contentResponse>, t: Throwable) {

Log.e("eun test", "TreeFragment오류남@@@@@@@@@@")
Log.d("mbtree test", t.message.toString())
}

})

}
}
19 changes: 19 additions & 0 deletions app/src/main/java/com/umc/project/mbtree/view/user/UserResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.umc.project.mbtree.view.user


import com.google.gson.annotations.SerializedName
import java.time.LocalDateTime
import java.util.UUID


data class TreeResponse (
@SerializedName("isSuccess") val isSuccess: Boolean,
@SerializedName("code") val code: Int,
@SerializedName("message") val message: String,
@SerializedName("result") val result: User
)
data class User
(
@SerializedName("id") val id:Int,
@SerializedName("content") val uuid: String,
)
4 changes: 4 additions & 0 deletions app/src/main/java/com/umc/project/mbtree/view/user/UserService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.umc.project.mbtree.view.user

interface UserService {
}