From 71bf4632d7689957e4ebcaa0769a7eec8865a22d Mon Sep 17 00:00:00 2001 From: GaYoung Date: Mon, 21 Sep 2020 03:38:13 +0900 Subject: [PATCH] last --- app/src/main/AndroidManifest.xml | 1 - .../inventorybox/activity/HomePersonalActivity.kt | 5 +++-- .../inventorybox/activity/HomeProfileActivity.kt | 9 +++++---- .../example/inventorybox/activity/MainActivity.kt | 7 ++++++- .../inventorybox/activity/ServiceActivity.kt | 3 ++- .../inventorybox/network/RequestToServer.kt | 4 ++-- .../res/layout/activity_home_order_detail.xml | 5 +++-- .../main/res/layout/activity_home_order_edit.xml | 1 - app/src/main/res/layout/item_home_edit_memo.xml | 9 ++++++--- app/src/main/res/layout/item_home_orderlist.xml | 15 ++++++++++----- 10 files changed, 37 insertions(+), 22 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91483c4..f471d5d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -71,7 +71,6 @@ - diff --git a/app/src/main/java/com/example/inventorybox/activity/HomePersonalActivity.kt b/app/src/main/java/com/example/inventorybox/activity/HomePersonalActivity.kt index ed3bec9..c21e7a8 100644 --- a/app/src/main/java/com/example/inventorybox/activity/HomePersonalActivity.kt +++ b/app/src/main/java/com/example/inventorybox/activity/HomePersonalActivity.kt @@ -104,8 +104,9 @@ class HomePersonalActivity : AppCompatActivity() { ).customEnqueue( onSuccess = { Log.d("personal", "개인 정보 변경 성공") - val intent = Intent(this, MainActivity::class.java) - startActivity(intent) +// val intent = Intent(this, MainActivity::class.java) +// startActivity(intent) + finish() } ) } diff --git a/app/src/main/java/com/example/inventorybox/activity/HomeProfileActivity.kt b/app/src/main/java/com/example/inventorybox/activity/HomeProfileActivity.kt index 91bd4de..6f9ecce 100644 --- a/app/src/main/java/com/example/inventorybox/activity/HomeProfileActivity.kt +++ b/app/src/main/java/com/example/inventorybox/activity/HomeProfileActivity.kt @@ -151,10 +151,11 @@ class HomeProfileActivity : AppCompatActivity() { Log.d("profile request", "프로필 변경 실패") }, onSuccess = { - Log.d("profile request", "프로필 변경 성공") - Log.d("profile request", "${rqNickname}") - val intent = Intent(this, MainActivity::class.java) - startActivity(intent) +// Log.d("profile request", "프로필 변경 성공") +// Log.d("profile request", "${rqNickname}") +// val intent = Intent(this, MainActivity::class.java) +// startActivity(intent) + finish() }, onError = { Log.d("profile request", "에러") diff --git a/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt b/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt index 3c64e45..f6e5dc7 100644 --- a/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt +++ b/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt @@ -48,7 +48,7 @@ class MainActivity : AppCompatActivity() { // main_bottom_navigation.setItemIconSize(50) //하단바 아이콘 사이즈 //유저 개인 정보 가져오기 - getPersonal() +// getPersonal() //드로워 선택 drawerSelected() @@ -158,6 +158,11 @@ class MainActivity : AppCompatActivity() { ) } + override fun onStart() { + super.onStart() + getPersonal() + } + } diff --git a/app/src/main/java/com/example/inventorybox/activity/ServiceActivity.kt b/app/src/main/java/com/example/inventorybox/activity/ServiceActivity.kt index e9420c0..a9fa31d 100644 --- a/app/src/main/java/com/example/inventorybox/activity/ServiceActivity.kt +++ b/app/src/main/java/com/example/inventorybox/activity/ServiceActivity.kt @@ -17,7 +17,8 @@ class ServiceActivity : AppCompatActivity() { } service_term.setOnClickListener { - startActivity(Intent(this, ServiceTermActivity::class.java)) +// startActivity(Intent(this, ServiceTermActivity::class.java)) + startActivity(Intent(this, TermsConditionsActivity::class.java)) } service_privacy.setOnClickListener { diff --git a/app/src/main/java/com/example/inventorybox/network/RequestToServer.kt b/app/src/main/java/com/example/inventorybox/network/RequestToServer.kt index abedfa5..f802a0f 100644 --- a/app/src/main/java/com/example/inventorybox/network/RequestToServer.kt +++ b/app/src/main/java/com/example/inventorybox/network/RequestToServer.kt @@ -4,7 +4,6 @@ import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory object RequestToServer { - private val baseURL = "http//ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000" // private val baseURL = "ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000" val retrofit_kakao = Retrofit.Builder() .baseUrl("https://dapi.kakao.com") @@ -12,7 +11,8 @@ object RequestToServer { .build() val retrofit: Retrofit = Retrofit.Builder() - .baseUrl("http://ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000") +// .baseUrl("http://ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000") + .baseUrl("https://ec2.inventoryboxserver.com") .addConverterFactory(GsonConverterFactory.create()) .build() diff --git a/app/src/main/res/layout/activity_home_order_detail.xml b/app/src/main/res/layout/activity_home_order_detail.xml index a468892..a831ea2 100644 --- a/app/src/main/res/layout/activity_home_order_detail.xml +++ b/app/src/main/res/layout/activity_home_order_detail.xml @@ -79,8 +79,9 @@ diff --git a/app/src/main/res/layout/activity_home_order_edit.xml b/app/src/main/res/layout/activity_home_order_edit.xml index c4119c5..047ad49 100644 --- a/app/src/main/res/layout/activity_home_order_edit.xml +++ b/app/src/main/res/layout/activity_home_order_edit.xml @@ -53,7 +53,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="16dp" - android:layout_marginHorizontal="16dp" android:orientation="vertical" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:listitem="@layout/item_home_edit_memo" /> diff --git a/app/src/main/res/layout/item_home_edit_memo.xml b/app/src/main/res/layout/item_home_edit_memo.xml index 1fd4934..1276f8d 100644 --- a/app/src/main/res/layout/item_home_edit_memo.xml +++ b/app/src/main/res/layout/item_home_edit_memo.xml @@ -5,16 +5,19 @@ android:id="@+id/rv_home_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shadow"> + android:elevation="2dp" + android:layout_marginHorizontal="16dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:background="@drawable/graph_rec9_white"> diff --git a/app/src/main/res/layout/item_home_orderlist.xml b/app/src/main/res/layout/item_home_orderlist.xml index f2d0048..a2c1638 100644 --- a/app/src/main/res/layout/item_home_orderlist.xml +++ b/app/src/main/res/layout/item_home_orderlist.xml @@ -5,7 +5,11 @@ android:id="@+id/rv_home_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shadow"> + android:layout_marginHorizontal="16dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:elevation="2dp" + android:background="@drawable/graph_rec9_white"> @@ -25,7 +28,7 @@ android:layout_height="45dp" android:layout_gravity="center" android:layout_marginStart="17dp" - android:layout_marginTop="9dp" + android:layout_marginTop="15dp" android:layout_marginEnd="17dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -39,14 +42,16 @@ android:layout_gravity="center" android:layout_marginStart="29dp" android:layout_marginEnd="29dp" + android:layout_marginBottom="6dp" + android:layout_marginTop="4dp" android:fontFamily="@font/nanum_square_bold" android:gravity="center" android:text="우유" android:textColor="#414743" android:textSize="11sp" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/img_rv_product" />