From 2df5854d978fbf901aedfc4e35764dbbdfcfe8c3 Mon Sep 17 00:00:00 2001 From: yejin Date: Sat, 18 Jul 2020 06:51:10 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../booster/bindingadapter/BindingAdapter.kt | 7 + .../booster/ui/bottomtap/BottomTabActivity.kt | 4 - .../booster/ui/fileStorage/FileAdapter.kt | 4 - .../ui/fileStorage/FileStorageActivity.kt | 1 + .../example/booster/ui/home/HomeFragment.kt | 54 +++-- .../booster/ui/myPage/MypageFragment.kt | 1 + .../booster/ui/orderDetail/OrderAdapter.kt | 9 +- .../booster/ui/payment/PaymentActivity.kt | 8 +- .../booster/ui/storeList/StoreListFragment.kt | 3 + .../main/res/layout/activity_file_storage.xml | 1 - app/src/main/res/layout/fragment_home.xml | 1 + app/src/main/res/layout/item_order_detail.xml | 189 +++++++++--------- 12 files changed, 158 insertions(+), 124 deletions(-) diff --git a/app/src/main/java/com/example/booster/bindingadapter/BindingAdapter.kt b/app/src/main/java/com/example/booster/bindingadapter/BindingAdapter.kt index f58feb58..a1d8fb0e 100644 --- a/app/src/main/java/com/example/booster/bindingadapter/BindingAdapter.kt +++ b/app/src/main/java/com/example/booster/bindingadapter/BindingAdapter.kt @@ -11,6 +11,7 @@ import android.widget.TextView import androidx.databinding.BindingAdapter import com.bumptech.glide.Glide import com.example.booster.R +import kotlinx.android.synthetic.main.my_file.view.* @BindingAdapter("changeCircleF") fun ImageView.changeCircleF(status : Int) { @@ -140,3 +141,9 @@ fun TextView.setBtnActive(close : Int?) { } } +@BindingAdapter("setFileName") +fun TextView.setFileName(name: String?){ + Log.e("setFileName -----> ", name) + setFileName(name!!.substring(0, name.length-4)) +} + diff --git a/app/src/main/java/com/example/booster/ui/bottomtap/BottomTabActivity.kt b/app/src/main/java/com/example/booster/ui/bottomtap/BottomTabActivity.kt index a3703cc1..cb4ed1c2 100644 --- a/app/src/main/java/com/example/booster/ui/bottomtap/BottomTabActivity.kt +++ b/app/src/main/java/com/example/booster/ui/bottomtap/BottomTabActivity.kt @@ -116,19 +116,15 @@ class BottomTabActivity : AppCompatActivity() { startActivity(intent) } else { bottom_vp!!.currentItem = tab.position - } } override fun onTabUnselected(tab: TabLayout.Tab) { - } override fun onTabReselected(tab: TabLayout.Tab) { - } }) - } fun click() { diff --git a/app/src/main/java/com/example/booster/ui/fileStorage/FileAdapter.kt b/app/src/main/java/com/example/booster/ui/fileStorage/FileAdapter.kt index b68a826d..e399c1f2 100644 --- a/app/src/main/java/com/example/booster/ui/fileStorage/FileAdapter.kt +++ b/app/src/main/java/com/example/booster/ui/fileStorage/FileAdapter.kt @@ -109,10 +109,6 @@ class FileAdapter( itemView.iv_file.onlyOneClickListener { fileRecyclerViewOnClickListener?.pdfviewer(file, bindingAdapterPosition) } - - - - } } diff --git a/app/src/main/java/com/example/booster/ui/fileStorage/FileStorageActivity.kt b/app/src/main/java/com/example/booster/ui/fileStorage/FileStorageActivity.kt index b7cb6a95..cfceff89 100644 --- a/app/src/main/java/com/example/booster/ui/fileStorage/FileStorageActivity.kt +++ b/app/src/main/java/com/example/booster/ui/fileStorage/FileStorageActivity.kt @@ -123,6 +123,7 @@ class FileStorageActivity : AppCompatActivity(), FileRecyclerViewOnClickListener intent.putExtra("order_idx", this.orderIdx) Log.e("orderidxfilesto", this.orderIdx.toString()) startActivity(intent) + finish() } } setClick() diff --git a/app/src/main/java/com/example/booster/ui/home/HomeFragment.kt b/app/src/main/java/com/example/booster/ui/home/HomeFragment.kt index 5c4f470e..d070040c 100644 --- a/app/src/main/java/com/example/booster/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/example/booster/ui/home/HomeFragment.kt @@ -1,5 +1,6 @@ package com.example.booster.ui.home +import android.animation.Animator import android.content.Intent import android.os.Bundle import android.util.Log @@ -18,7 +19,7 @@ import kotlinx.android.synthetic.main.fragment_home.* class HomeFragment : Fragment() { private lateinit var viewModel: HomeViewModel - lateinit var binding : FragmentHomeBinding + lateinit var binding: FragmentHomeBinding override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -33,17 +34,17 @@ class HomeFragment : Fragment() { override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) viewModel = ViewModelProviders.of(this).get(HomeViewModel::class.java) - + binding.vm = (this@HomeFragment).viewModel setClick() viewModel.getHome() - viewModel.homeRes.observe(requireActivity() , Observer { + viewModel.homeRes.observe(requireActivity(), Observer { frag_home_user_name.text = it.data.user_name when (it.data.home_state) { 0 -> { frag_home_lt.setAnimation("home_s8_1.json") frag_home_txt2.text = "인쇄를 시작해볼까요?" } - 1,2 -> { + 1, 2 -> { frag_home_lt.setAnimation("home_s8_2.json") frag_home_txt2.text = "인쇄 진행 중이에요." } @@ -54,8 +55,9 @@ class HomeFragment : Fragment() { } }) - binding.vm = (this@HomeFragment).viewModel - frag_home_lt.repeatCount = 2 +// setLottie() + + frag_home_lt.loop(true) frag_home_lt.playAnimation() parentFragmentManager.addOnBackStackChangedListener { @@ -65,26 +67,40 @@ class HomeFragment : Fragment() { } } + override fun onPause() { + super.onPause() + frag_home_lt.cancelAnimation() + } + override fun onResume() { super.onResume() viewModel.getHome() +// frag_home_lt.setAnimation("home_s8_1.json") + frag_home_lt.loop(true) frag_home_lt.playAnimation() -// Log.e("onResume", "실행") + Log.e("HomeFrag", "onResume") } -// override fun setUserVisibleHint(isVisibleToUser: Boolean) { -// super.setUserVisibleHint(isVisibleToUser) -// isVisible = isVisibleToUser -// -// // Make sure that fragment is currently visible -// if (!isVisible && isResumed) { -// // Call code when Fragment not visible -// } else if (isVisible && isResumed) { -// // Call code when Fragment becomes visible. -// } -// } + fun setLottie(){ + when (viewModel.homeRes.value!!.data.home_state) { + 0 -> { + frag_home_lt.setAnimation("home_s8_1.json") + frag_home_txt2.text = "인쇄를 시작해볼까요?" + } + 1, 2 -> { + frag_home_lt.setAnimation("home_s8_2.json") + frag_home_txt2.text = "인쇄 진행 중이에요." + } + else -> { + frag_home_lt.setAnimation("home_s8_3.json") + frag_home_txt2.text = "인쇄가 완료되었어요 :)" + } + } + frag_home_lt.repeatCount = 2 + frag_home_lt.playAnimation() + } - fun setClick(){ + fun setClick() { frag_home_btn_alert.onlyOneClickListener { val intent = Intent(activity, AlertActivity::class.java) startActivity(intent) diff --git a/app/src/main/java/com/example/booster/ui/myPage/MypageFragment.kt b/app/src/main/java/com/example/booster/ui/myPage/MypageFragment.kt index 54479b16..717993f2 100644 --- a/app/src/main/java/com/example/booster/ui/myPage/MypageFragment.kt +++ b/app/src/main/java/com/example/booster/ui/myPage/MypageFragment.kt @@ -80,6 +80,7 @@ class MypageFragment : Fragment() { override fun onResume() { super.onResume() + Log.e("mayPageFrag", "onResume") BoosterServiceImpl.service.getMyProfile() .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { diff --git a/app/src/main/java/com/example/booster/ui/orderDetail/OrderAdapter.kt b/app/src/main/java/com/example/booster/ui/orderDetail/OrderAdapter.kt index 3a8994d1..d9e17b0f 100644 --- a/app/src/main/java/com/example/booster/ui/orderDetail/OrderAdapter.kt +++ b/app/src/main/java/com/example/booster/ui/orderDetail/OrderAdapter.kt @@ -9,6 +9,8 @@ import com.bumptech.glide.Glide import com.example.booster.util.AnimationUtil import com.example.booster.R import com.example.booster.data.datasource.model.OrderOption +import com.example.booster.databinding.ItemOrderDetailBinding +import com.example.booster.databinding.ItemStoreListBinding import com.example.booster.listener.onlyOneClickListener import kotlinx.android.synthetic.main.item_order_detail.view.* @@ -20,10 +22,12 @@ class OrderAdapter(private val context: Context, var data = mutableListOf() var previousPostition = 0 private val animationUtil = AnimationUtil() + lateinit var binding : ItemOrderDetailBinding override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OrderDetailViewHolder { val view = LayoutInflater.from(context).inflate(R.layout.item_order_detail, parent, false) - return OrderDetailViewHolder(view, clickListener, clickImgListener) + binding = ItemOrderDetailBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return OrderDetailViewHolder(binding, view, clickListener, clickImgListener) } override fun getItemCount(): Int { @@ -32,6 +36,7 @@ class OrderAdapter(private val context: Context, override fun onBindViewHolder(holder: OrderDetailViewHolder, position: Int) { holder.bind(data[position]) + holder.binding.orderDetailRes = data[position] if(position > previousPostition ){ animationUtil.fade_out(holder.itemView) } @@ -40,7 +45,7 @@ class OrderAdapter(private val context: Context, } } -class OrderDetailViewHolder( view: View, +class OrderDetailViewHolder(val binding : ItemOrderDetailBinding, view: View, val clickListener: onClickOrderItemListener, val clickImgListener: onClickImgListener) : RecyclerView.ViewHolder(view){ diff --git a/app/src/main/java/com/example/booster/ui/payment/PaymentActivity.kt b/app/src/main/java/com/example/booster/ui/payment/PaymentActivity.kt index 68f0ecd2..4f63be6c 100644 --- a/app/src/main/java/com/example/booster/ui/payment/PaymentActivity.kt +++ b/app/src/main/java/com/example/booster/ui/payment/PaymentActivity.kt @@ -96,7 +96,6 @@ class PaymentActivity : AppCompatActivity() { //결제완료하고 주문현황 넘어가기 act_payment_btn_pay.setOnClickListener { - val jsonData = JSONObject() jsonData.put("order_comment", act_payment_et_req.text) @@ -114,12 +113,10 @@ class PaymentActivity : AppCompatActivity() { override fun onResponse(call: Call, response: Response) { if(response.isSuccessful){ - Success() + success() } } - }) - } act_payment_iv_back.setOnClickListener{ @@ -127,9 +124,10 @@ class PaymentActivity : AppCompatActivity() { } } - fun Success(){ + private fun success(){ val intent = Intent(this, BottomTabActivity::class.java) intent.putExtra("orderIdx", orderIdx) startActivity(intent) + finish() } } \ No newline at end of file diff --git a/app/src/main/java/com/example/booster/ui/storeList/StoreListFragment.kt b/app/src/main/java/com/example/booster/ui/storeList/StoreListFragment.kt index bb65ac6a..d7c5521a 100644 --- a/app/src/main/java/com/example/booster/ui/storeList/StoreListFragment.kt +++ b/app/src/main/java/com/example/booster/ui/storeList/StoreListFragment.kt @@ -23,6 +23,7 @@ import com.example.booster.ui.storeDetail.StoreDetailActivity import com.example.booster.ui.storeDetail.StoreDetailViewModel import com.example.booster.util.UserManager import com.google.android.material.appbar.AppBarLayout +import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_store_list.* import retrofit2.Call import retrofit2.Callback @@ -52,6 +53,7 @@ class StoreListFragment : Fragment() { override fun onResume() { super.onResume() univIdx?.let { viewModel.getStoreList(it) } + Log.e("stroeListFrag", "onResume") } override fun onActivityCreated(savedInstanceState: Bundle?) { @@ -141,6 +143,7 @@ class StoreListFragment : Fragment() { ) { //통신 성공 Log.e("putStoreFavRetrofit", response.body().toString()) + val data = response.body()!!.status if(data==201) { imageView.setImageResource(R.drawable.store_ic_active_star) diff --git a/app/src/main/res/layout/activity_file_storage.xml b/app/src/main/res/layout/activity_file_storage.xml index 4b68d7af..0e2eb340 100644 --- a/app/src/main/res/layout/activity_file_storage.xml +++ b/app/src/main/res/layout/activity_file_storage.xml @@ -240,7 +240,6 @@ android:fontFamily="@font/noto_sans_kr_medium" android:gravity="center_horizontal" android:lineSpacingExtra="-10sp" - android:onClick="onClick" android:paddingTop="11dp" android:paddingBottom="11dp" android:text="주문하기" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 336b74c0..355f9ce0 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -27,6 +27,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:lottie_autoPlay="true" + app:lottie_loop="true" app:lottie_repeatCount="2" /> - + xmlns:tools="http://schemas.android.com/tools"> - + - + - + - + android:layout_gravity="center_horizontal" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:background="@drawable/bg_ffffff_round" + android:elevation="1.5dp"> - + + - + + + + + + + app:layout_constraintEnd_toEndOf="parent"> - + + + - \ No newline at end of file + + \ No newline at end of file