diff --git a/README.md b/README.md new file mode 100644 index 0000000..0eab2ef --- /dev/null +++ b/README.md @@ -0,0 +1,23 @@ +### 아투 Artoo + +- 미술 인테리어에 대한 관심은 높지만 구매할 장소가 어딘지 모르시겠다면? 작가의 작품은 너무 비싸서 사지 못했다면? +Artoo에서 예비 작가들의 작품을 구매해 보세요! + +- 미대생 여러분, 작품을 판매할 장소의 부족과 늘어나는 작업량으로 작품이 쌓여만 가나요? 자신의 학교 안에서 밖에 하지 못하는 평가는 한정적이라고 생각 들지 않나요? +Artoo에 작품을 올리고 판매해보세요! + +------ + +### Screenshots + + + + + + +------ + +### Development Environment + +- Kotlin +- Android Studio 3.4.0 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"/>

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