diff --git a/SHAPEUP2022/.idea/misc.xml b/SHAPEUP2022/.idea/misc.xml
index 3b497a9..af4c588 100644
--- a/SHAPEUP2022/.idea/misc.xml
+++ b/SHAPEUP2022/.idea/misc.xml
@@ -7,6 +7,7 @@
+
@@ -16,6 +17,7 @@
+
@@ -39,6 +41,7 @@
+
diff --git a/SHAPEUP2022/app/src/main/AndroidManifest.xml b/SHAPEUP2022/app/src/main/AndroidManifest.xml
index 09f4802..1034af3 100644
--- a/SHAPEUP2022/app/src/main/AndroidManifest.xml
+++ b/SHAPEUP2022/app/src/main/AndroidManifest.xml
@@ -128,7 +128,7 @@
android:name=".common.YoutubeActivity"
android:exported="false" />
= MyApplication.networkServiceAuth.logout(
)
call?.enqueue(object : Callback {
override fun onResponse(call: Call, response: Response) {
+ if(!response.isSuccessful){
+ Log.d("mobileApp", "${response}")
+ }
if(response.isSuccessful){
Log.d("mobileApp", "$response ${response.body()}")
// 저장했던 preference clear
SaveSharedPreference.clearUserEmail(baseContext)
SaveSharedPreference.clearUserName(baseContext)
+ SaveSharedPreference.clearUserTested(baseContext)
+ SaveSharedPreference.clearUserID(baseContext)
// StartActivity로 이동
val intent = Intent(baseContext, TempMainActivity::class.java)
@@ -87,7 +94,7 @@ class MyPageActivity : AppCompatActivity() {
override fun onFailure(call: Call, t: Throwable) {
Log.d("mobileApp", "onFailure $t")
- Toast.makeText(baseContext, "토스트 메세지 띄우기 입니다.", Toast.LENGTH_SHORT).show()
+ Toast.makeText(baseContext, "로그아웃에 실패했습니다.", Toast.LENGTH_SHORT).show()
}
})
}
@@ -155,5 +162,15 @@ class MyPageActivity : AppCompatActivity() {
return inSampleSize
}
+ override fun onStart() {
+ super.onStart()
+ if(SaveSharedPreference.getFamliyID(this)!! == ""){ // familyID == ""
+ binding.noFamFamilyBtns.visibility = View.VISIBLE
+ binding.mypageFamilyList.visibility = View.GONE
+ } else{
+ binding.noFamFamilyBtns.visibility = View.GONE
+ binding.mypageFamilyList.visibility = View.VISIBLE
+ }
+ }
}
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/common/SaveSharedPreference.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/common/SaveSharedPreference.kt
index c10058b..99dbcf4 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/common/SaveSharedPreference.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/common/SaveSharedPreference.kt
@@ -10,6 +10,19 @@ public class SaveSharedPreference {
return PreferenceManager.getDefaultSharedPreferences(ctx)
}
+ // User의 tested
+ fun setUserTested(ctx: Context, tested: Boolean) {
+ val editor = getSharedPreferences(ctx)!!.edit()
+ editor.putBoolean("tested", tested)
+ editor.commit()
+ }
+ fun getUserTested(ctx: Context?): Boolean? { return getSharedPreferences(ctx!!)!!.getBoolean("tested", false) }
+ fun clearUserTested(ctx: Context?) {
+ val editor = getSharedPreferences(ctx!!)!!.edit()
+ editor.clear()
+ editor.commit()
+ }
+
// User의 email
fun setUserEmail(ctx: Context, email: String) {
val editor = getSharedPreferences(ctx)!!.edit()
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/SimulationActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/common/SimulationActivity.kt
similarity index 81%
rename from SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/SimulationActivity.kt
rename to SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/common/SimulationActivity.kt
index c2bd26e..ce211e7 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/SimulationActivity.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/common/SimulationActivity.kt
@@ -1,13 +1,15 @@
-package com.example.shape_up_2022.simulation
+package com.example.shape_up_2022.common
+import android.content.DialogInterface
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
-import com.example.shape_up_2022.common.MyPageActivity
+import androidx.appcompat.app.AlertDialog
+import com.example.shape_up_2022.R
import com.example.shape_up_2022.achieve.AchieveActivity
-import com.example.shape_up_2022.common.MainActivity
import com.example.shape_up_2022.databinding.SimulationMainBinding
+import com.example.shape_up_2022.simulation.*
import com.example.shape_up_2022.todo.TodoActivity
class SimulationActivity : AppCompatActivity() {
@@ -137,4 +139,29 @@ class SimulationActivity : AppCompatActivity() {
}
}
+
+ override fun onStart() {
+ super.onStart()
+
+
+ val eventHandler = object : DialogInterface.OnClickListener {
+ override fun onClick(p0: DialogInterface?, p1: Int) {
+ if(p1 == DialogInterface.BUTTON_POSITIVE) {
+ val intent = Intent(this@SimulationActivity, MainActivity::class.java)
+ startActivity(intent)
+ finish()
+ }
+ }
+ }
+ var builder = AlertDialog.Builder(this)
+ .setTitle("가족 그룹에 가입되어 있지 않은 사용자")
+ .setIcon(R.drawable.maltese)
+ .setMessage("가족 그룹에 먼저 가입해주세요.")
+ .setPositiveButton("확인", eventHandler)
+ .setCancelable(false)
+
+ if(SaveSharedPreference.getFamliyID(this)!! == ""){
+ builder.show()
+ }
+ }
}
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/MyApplication.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/MyApplication.kt
index 7f53bc5..1010dab 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/MyApplication.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/MyApplication.kt
@@ -23,7 +23,7 @@ class MyApplication: Application() {
var networkServiceAuth: NetworkServiceAuth
val retrofitAuth: Retrofit
get() = Retrofit.Builder()
- .baseUrl("http://ec2-13-124-250-65.ap-northeast-2.compute.amazonaws.com:5000/")
+ .baseUrl("http://192.168.219.108:5000/")
.addConverterFactory(GsonConverterFactory.create())
.build()
// "http://ec2-13-124-250-65.ap-northeast-2.compute.amazonaws.com:5000/"
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/NetworkServiceAuth.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/NetworkServiceAuth.kt
index c4009b4..a65cc74 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/NetworkServiceAuth.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/retrofit/NetworkServiceAuth.kt
@@ -28,6 +28,11 @@ interface NetworkServiceAuth {
@Body body: JoinFamilyReq,
): Call
+ @PUT("api/users/completeTest")
+ fun completeTest(
+ @Body body: CompleteTestReq,
+ ): Call
+
}
data class RegisterReq(val name: String, val email: String, val password: String)
@@ -43,3 +48,6 @@ data class AddFamilyRes(val success: String)
data class JoinFamilyReq(val familyCode: String, val email: String)
data class JoinFamilyRes(val success: String, val message: String)
+
+data class CompleteTestReq(val userID: String)
+data class CompleteTestRes(val success: String, val message: String)
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/TestActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/TestActivity.kt
index 5db04d6..f002846 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/TestActivity.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/TestActivity.kt
@@ -3,8 +3,15 @@ package com.example.shape_up_2022.simulation
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
import com.example.shape_up_2022.common.MainActivity
+import com.example.shape_up_2022.common.SaveSharedPreference
import com.example.shape_up_2022.databinding.ActivityTestBinding
+import com.example.shape_up_2022.retrofit.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
class TestActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
@@ -13,6 +20,12 @@ class TestActivity : AppCompatActivity() {
setContentView(binding.root)
binding.btnTestSkip.setOnClickListener {
+ // save Preference
+ SaveSharedPreference.setUserTested(baseContext, true)
+
+ // tested router
+ callCompleteTest()
+
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
finish()
@@ -20,4 +33,24 @@ class TestActivity : AppCompatActivity() {
}
+
+ private fun callCompleteTest(){
+ val call: Call = MyApplication.networkServiceAuth.completeTest(
+ CompleteTestReq(SaveSharedPreference.getUserID(this)!!)
+ )
+
+ call?.enqueue(object : Callback {
+ override fun onResponse(call: Call, response: Response) {
+ if(response.isSuccessful){
+ Log.d("mobileApp", "$response ${response.body()}")
+ Toast.makeText(baseContext, "성향 점검 테스트 성공!", Toast.LENGTH_SHORT).show()
+ }
+ }
+
+ override fun onFailure(call: Call, t: Throwable) {
+ Log.d("mobileApp", "onFailure $t")
+ Toast.makeText(baseContext, "성향 점검 테스트 실패!", Toast.LENGTH_SHORT).show()
+ }
+ })
+ }
}
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/todo/TodoActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/todo/TodoActivity.kt
index 1f2e09d..0aea12d 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/todo/TodoActivity.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/todo/TodoActivity.kt
@@ -7,11 +7,13 @@ import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.shape_up_2022.R
import com.example.shape_up_2022.common.MyPageActivity
-import com.example.shape_up_2022.simulation.SimulationActivity
+import com.example.shape_up_2022.common.SimulationActivity
import com.example.shape_up_2022.achieve.AchieveActivity
import com.example.shape_up_2022.adapter.TodoAdapter
import com.example.shape_up_2022.common.MainActivity
+import com.example.shape_up_2022.common.SaveSharedPreference
import com.example.shape_up_2022.data.TodoItem
import com.example.shape_up_2022.databinding.ActivityToDoBinding
import com.example.shape_up_2022.databinding.TodoAddBinding
@@ -123,4 +125,29 @@ class TodoActivity : AppCompatActivity() {
finish()
}
}
+
+ override fun onStart() {
+ super.onStart()
+
+
+ val eventHandler = object : DialogInterface.OnClickListener {
+ override fun onClick(p0: DialogInterface?, p1: Int) {
+ if(p1 == DialogInterface.BUTTON_POSITIVE) {
+ val intent = Intent(this@TodoActivity, MainActivity::class.java)
+ startActivity(intent)
+ finish()
+ }
+ }
+ }
+ var builder = androidx.appcompat.app.AlertDialog.Builder(this)
+ .setTitle("가족 그룹에 가입되어 있지 않은 사용자")
+ .setIcon(R.drawable.maltese)
+ .setMessage("가족 그룹에 먼저 가입해주세요.")
+ .setPositiveButton("확인", eventHandler)
+ .setCancelable(false)
+
+ if(SaveSharedPreference.getFamliyID(this)!! == ""){
+ builder.show()
+ }
+ }
}
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml b/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml
index b07ff93..e472079 100644
--- a/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml
+++ b/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml
@@ -85,7 +85,7 @@
app:layout_constraintTop_toBottomOf="@+id/linearLayout" />