From 3061fada67cd79fec217c952a469fa38a6728f36 Mon Sep 17 00:00:00 2001 From: jbw1003 Date: 2019年1月15日 02:33:19 +0900 Subject: [PATCH 01/10] =?UTF-8?q?productUploadActivity=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=86=92=EC=9D=B4=EC=99=80?= =?UTF-8?q?=20=EC=84=B8=EB=A1=9C=EA=B0=80=20=EB=B0=94=EB=80=8C=EC=96=B4?= =?UTF-8?q?=EC=84=9C=20=EB=93=A4=EC=96=B4=EA=B0=80=EB=8D=98=20=ED=98=84?= =?UTF-8?q?=EC=83=81=20=EC=88=98=EC=A0=95.=20=EC=A7=81=EA=B1=B0=EB=9E=98?= =?UTF-8?q?=20=EC=8B=9C=20=EB=B0=B0=EC=86=A1=EB=B9=84=20=EC=97=86=EB=8A=94?= =?UTF-8?q?=20=EA=B2=83=EC=9C=BC=EB=A1=9C=20=EC=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../Activity/ProductPurchaseActivity.kt | 18 +++++++++++++++++ .../Activity/ProductUploadActivity.kt | 20 +++++++++---------- .../res/layout/activity_product_upload.xml | 4 ++-- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 889708a..289758b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 24 targetSdkVersion 28 versionCode 7 - versionName "1.6" + versionName "1.6.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductPurchaseActivity.kt b/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductPurchaseActivity.kt index 1cfde8f..421681d 100644 --- a/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductPurchaseActivity.kt +++ b/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductPurchaseActivity.kt @@ -44,6 +44,7 @@ class ProductPurchaseActivity : AppCompatActivity() { post_buy_container.visibility = View.VISIBLE post_description.visibility = View.VISIBLE direct_buy_container.visibility = View.GONE + setPostPrice() } catch (e: Exception) { } } @@ -55,6 +56,7 @@ class ProductPurchaseActivity : AppCompatActivity() { post_buy_container.visibility = View.GONE post_description.visibility = View.GONE direct_buy_container.visibility = View.VISIBLE + setPostPrice() } catch (e: Exception) { } } @@ -191,6 +193,22 @@ class ProductPurchaseActivity : AppCompatActivity() { finish() } } + + private fun setPostPrice(){ + val df = DecimalFormat("#,###") + val artworkPrice = intent.getIntExtra("price", 0) + val size = intent.getIntExtra("size", 0) + var postPrice : Int + if(!checkPost) postPrice = 0 + else if(artworkPrice> 150000) postPrice = 0 + else if(size < 2412) postPrice = 3000 + else if(size < 6609) postPrice =4000 + else postPrice = 5000 + var besongprice = postPrice.toString() +"원" + txt_post_price.text = besongprice + txt_purchase_price_total.text = df.format(artworkPrice * 1.1 + postPrice)+"원" + total_price_txt_bottom.text = df.format(artworkPrice * 1.1 + postPrice)+"원" + } } diff --git a/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductUploadActivity.kt b/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductUploadActivity.kt index 6b8b0c5..557572c 100644 --- a/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductUploadActivity.kt +++ b/app/src/main/java/com/artoo/sopt23/artoo_client_android/Activity/ProductUploadActivity.kt @@ -1,7 +1,6 @@ package com.artoo.sopt23.artoo_client_android.Activity import android.app.Activity -import android.content.ContentResolver import android.content.Intent import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -33,7 +32,6 @@ import retrofit2.Response import java.io.ByteArrayOutputStream import java.io.File import java.io.InputStream -import java.net.URL import java.util.ArrayList class ProductUploadActivity : AppCompatActivity() { @@ -153,10 +151,10 @@ class ProductUploadActivity : AppCompatActivity() { toast("작품명을 작성해주세요.") } else if(et_product_upload_product_detail.text.toString().trim().length == 0) { toast("작품 설명을 작성해주세요.") - } else if (et_product_upload_size_width.text.toString().trim().length == 0 || et_product_upload_size_depth.text.toString().trim().length == 0) { + } else if (et_product_upload_size_width.text.toString().trim().length == 0 || et_product_upload_size_height.text.toString().trim().length == 0) { toast("작품 크기의 가로, 세로는 필수값입니다.") } else if (et_product_upload_size_width.text.toString().toInt() < 0 || et_product_upload_size_width.text.toString().toInt()>=163 - || et_product_upload_size_depth.text.toString().toInt() < 0 || et_product_upload_size_depth.text.toString().toInt()>= 163) { + || et_product_upload_size_height.text.toString().toInt() < 0 || et_product_upload_size_height.text.toString().toInt()>= 163) { toast("작품의 최대 가로, 세로 길이는 163cm입니다.\n다시 입력해주세요.") } else if (et_product_upload_price.text.toString().trim().length == 0) { toast("작품의 가격을 입력해주세요.") @@ -336,7 +334,7 @@ class ProductUploadActivity : AppCompatActivity() { private fun getProductUploadResponse() { Log.d("*****ProductUploadActivity::getProductUploadResponse::", spn_product_upload_category.selectedItem.toString() + "::" + et_product_upload_product_year.text.toString() + "::" - + iv_product_upload_product_img.toString() + "::" + et_product_upload_size_depth.text.toString()) + + iv_product_upload_product_img.toString() + "::" + et_product_upload_size_height.text.toString()) //input_product_img val input_product_category = RequestBody.create(MediaType.parse("text/plain"), spn_product_upload_category.selectedItem.toString()) val input_product_format = RequestBody.create(MediaType.parse("text/plain"), spn_product_upload_format.selectedItem.toString()) @@ -353,16 +351,16 @@ class ProductUploadActivity : AppCompatActivity() { input_product_width = et_product_upload_size_width.text.toString().toInt() } - var input_product_depth = -1 - if (et_product_upload_size_depth.text.toString().isNotEmpty()) { - input_product_depth = et_product_upload_size_depth.text.toString().toInt() - } - var input_product_height = 1 if (et_product_upload_size_height.text.toString().isNotEmpty()) { input_product_height = et_product_upload_size_height.text.toString().toInt() } + var input_product_depth = -1 + if (et_product_upload_size_depth.text.toString().isNotEmpty()) { + input_product_depth = et_product_upload_size_depth.text.toString().toInt() + } + var input_product_price = -1 if(et_product_upload_price.text.toString().isNotEmpty()) { input_product_price = et_product_upload_price.text.toString().toInt() @@ -376,7 +374,7 @@ class ProductUploadActivity : AppCompatActivity() { val input_product_tip = RequestBody.create(MediaType.parse("text/plain"), et_product_upload_tip.text.toString()) if (input_product_img!=null && et_product_upload_price.text.toString().isNotEmpty() && et_product_upload_product_title.text.toString().isNotEmpty() && et_product_upload_product_year.text.toString().isNotEmpty() - && et_product_upload_size_width.text.toString().isNotEmpty() && et_product_upload_size_depth.text.toString().isNotEmpty() && spn_product_upload_category.selectedItemPosition>0 && + && et_product_upload_size_width.text.toString().isNotEmpty() && et_product_upload_size_height.text.toString().isNotEmpty() && spn_product_upload_category.selectedItemPosition>0 && spn_product_upload_format.selectedItemPosition>0 && spn_product_upload_license.selectedItemPosition>0) { val token = SharedPreferenceController.getAuthorization(this) val u_idx = SharedPreferenceController.getUserID(this) diff --git a/app/src/main/res/layout/activity_product_upload.xml b/app/src/main/res/layout/activity_product_upload.xml index f6d71dd..def5313 100644 --- a/app/src/main/res/layout/activity_product_upload.xml +++ b/app/src/main/res/layout/activity_product_upload.xml @@ -438,7 +438,7 @@ android:textColor="@color/colorBorder"/> Date: 2019年12月29日 16:19:56 +0900 Subject: [PATCH 02/10] Create README.md --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6c8c5d6 --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +### 아투 Artoo + +- 미술 인테리어에 대한 관심은 높지만 구매할 장소가 어딘지 모르시겠다면? 작가의 작품은 너무 비싸서 사지 못했다면? +Artoo에서 예비 작가들의 작품을 구매해 보세요! + +- 미대생 여러분, 작품을 판매할 장소의 부족과 늘어나는 작업량으로 작품이 쌓여만 가나요? 자신의 학교 안에서 밖에 하지 못하는 평가는 한정적이라고 생각 들지 않나요? +Artoo에 작품을 올리고 판매해보세요! + +------ + +### View + +![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png) +![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png) +![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png) +![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png) +![pic5](https://user-images.githubusercontent.com/41736866/71553683-02758900-2a57-11ea-8ac8-838fd72ff69a.png) + +------ + +### Development Environment + +- Kotlin +- Android Studio 3.4.0 From c56bd317755be3c898c2f139c242dfd4e0d2acc3 Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:22:02 +0900 Subject: [PATCH 03/10] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6c8c5d6..efdc81d 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ Artoo에 작품을 올리고 판매해보세요! ------ -### View +### Screenshots -![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png) +![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png){:width="30%"} ![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png) ![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png) ![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png) From ae5ea4d5cf959c068b43d5157732a5f8fdc517a8 Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:22:27 +0900 Subject: [PATCH 04/10] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index efdc81d..c2de23b 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ Artoo에 작품을 올리고 판매해보세요! ### Screenshots -![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png){:width="30%"} -![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png) -![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png) -![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png) -![pic5](https://user-images.githubusercontent.com/41736866/71553683-02758900-2a57-11ea-8ac8-838fd72ff69a.png) +![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png){:width="30%" height="30%"} +![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png){:width="30%" height="30%"} +![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png){:width="30%" height="30%"} +![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png){:width="30%" height="30%"} +![pic5](https://user-images.githubusercontent.com/41736866/71553683-02758900-2a57-11ea-8ac8-838fd72ff69a.png){:width="30%" height="30%"} ------ From 615bc5e915487906cef88d51a23de36f169bb4cc Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:23:14 +0900 Subject: [PATCH 05/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2de23b..d4d0a95 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Artoo에 작품을 올리고 판매해보세요! ### Screenshots -![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png){:width="30%" height="30%"} +![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png){: width="30%" height="30%"} ![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png){:width="30%" height="30%"} ![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png){:width="30%" height="30%"} ![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png){:width="30%" height="30%"} From a42002cc63300c89f322bd1af79947bc39c24ba1 Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:23:57 +0900 Subject: [PATCH 06/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4d0a95..8933413 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Artoo에 작품을 올리고 판매해보세요! ### Screenshots -![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png){: width="30%" height="30%"} +![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png =100x) ![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png){:width="30%" height="30%"} ![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png){:width="30%" height="30%"} ![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png){:width="30%" height="30%"} From 5167b7e0930425cddf7511aa2c3c3310e28a1c8a Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:26:49 +0900 Subject: [PATCH 07/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8933413..13a42b4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Artoo에 작품을 올리고 판매해보세요! ------ ### Screenshots - + ![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png =100x) ![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png){:width="30%" height="30%"} ![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png){:width="30%" height="30%"} From 4a18e1a89512239f6524d945417f7bbab64da1fa Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:27:10 +0900 Subject: [PATCH 08/10] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 13a42b4..5dfe4e5 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Artoo에 작품을 올리고 판매해보세요! ------ ### Screenshots - -![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png =100x) + +![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png) ![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png){:width="30%" height="30%"} ![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png){:width="30%" height="30%"} ![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png){:width="30%" height="30%"} From d5f5c01ea149cb73674570df3068bc0ca2f62a97 Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:27:30 +0900 Subject: [PATCH 09/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5dfe4e5..a578af3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Artoo에 작품을 올리고 판매해보세요! ------ ### Screenshots - + ![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png) ![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png){:width="30%" height="30%"} ![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png){:width="30%" height="30%"} From d2e03485d719bd9aecefe0ec1f42c44cd4acc4e2 Mon Sep 17 00:00:00 2001 From: Eumiing <41736866+jeongeum@users.noreply.github.com> Date: 2019年12月29日 16:28:22 +0900 Subject: [PATCH 10/10] Update README.md --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a578af3..0eab2ef 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,11 @@ Artoo에 작품을 올리고 판매해보세요! ------ ### Screenshots - -![pic1](https://user-images.githubusercontent.com/41736866/71553676-fd183e80-2a56-11ea-8877-865c8e40cfdf.png) -![pic2](https://user-images.githubusercontent.com/41736866/71553677-ff7a9880-2a56-11ea-9ca7-f3ed0ff245d2.png){:width="30%" height="30%"} -![pic3](https://user-images.githubusercontent.com/41736866/71553678-00132f00-2a57-11ea-83bf-04543c83e6f8.png){:width="30%" height="30%"} -![pic4](https://user-images.githubusercontent.com/41736866/71553681-01445c00-2a57-11ea-9536-a0efe511273f.png){:width="30%" height="30%"} -![pic5](https://user-images.githubusercontent.com/41736866/71553683-02758900-2a57-11ea-8ac8-838fd72ff69a.png){:width="30%" height="30%"} + + + + + ------

AltStyle によって変換されたページ (->オリジナル) /