sleepy.....

Booster-developer · Jul 17, 2020 · b6f7291 · b6f7291
1 parent 1c52cb4
commit b6f7291
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 35 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.booster"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"

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
@@ -14,6 +14,7 @@ import androidx.lifecycle.ViewModelProviders
 import com.example.booster.R
 import com.example.booster.databinding.FragmentHomeBinding
 import com.example.booster.listener.onlyOneClickListener
+import kotlinx.android.synthetic.main.activity_splash.*
 import kotlinx.android.synthetic.main.fragment_home.*
 
 
@@ -57,49 +58,28 @@ class HomeFragment : Fragment() {
 
 //        setLottie()
 
-        frag_home_lt.loop(true)
-        frag_home_lt.playAnimation()
-
-        parentFragmentManager.addOnBackStackChangedListener {
-            viewModel.getHome()
-            frag_home_lt.playAnimation()
-            Log.e("onResume", "실행")
-        }
+//        frag_home_lt.loop(true)
+//        frag_home_lt.playAnimation()
+//        frag_home_lt.run {
+//            loop(true)
+//            playAnimation()
+//        }
     }
 
     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("HomeFrag", "onResume")
     }
 
-    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() {
         frag_home_btn_alert.onlyOneClickListener {
             val intent = Intent(activity, AlertActivity::class.java)

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
@@ -51,7 +51,9 @@ class OrderDetailViewHolder(val binding : ItemOrderDetailBinding, view: View,
 
     fun bind(orderOption: OrderOption) {
         Glide.with(itemView.context).load(orderOption.file_thumbnail_path).into(itemView.iv_order_detail)
-        itemView.tv_order_detail_file_name.text = orderOption.file_name + "." + orderOption.file_extension
+
+        itemView.tv_order_detail_file_name.text = orderOption.file_name
+        itemView.tv_order_detail_file_pdf.text = "." + orderOption.file_extension
         itemView.tv_order_detail_file_price.text = orderOption.file_price.toString() + "원"
     }
     init {

diff --git a/app/src/main/java/com/example/booster/ui/orderList/OrderCancelFragment.kt b/app/src/main/java/com/example/booster/ui/orderList/OrderCancelFragment.kt
@@ -43,6 +43,46 @@ class OrderCancelFragment : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+//        viewModel = ViewModelProvider(this).get(OrderListViewModel::class.java)
+//        dialog_order_cancel_back.onlyOneClickListener {
+//            dismiss()
+//        }
+//
+//        val args = arguments
+//        val orderIdx = args?.getInt("idx")
+//
+//        dialog_order_cancel_cancel.onlyOneClickListener {
+//
+//            if (orderIdx != null) {
+//                requestToServer.service.deleteOrder(
+//                    orderIdx
+//                ).enqueue(object : Callback<DefaultData> {
+//                    override fun onFailure(call: Call<DefaultData>, t: Throwable) {
+//                        //통신 실패
+//                        Log.e("orderlistdelete", "통신 실패")
+//                    }
+//
+//                    override fun onResponse(
+//                        call: Call<DefaultData>,
+//                        response: Response<DefaultData>
+//                    ) {
+//                        if (response.isSuccessful) {
+//                            Log.e("주문 취소 성공", "주문 취소")
+//                            (requireParentFragment() as OrderListFragment).viewModel.getOrderList()
+//                            dismiss()
+//                        }
+//
+//                    }
+//
+//                })
+//            }
+//
+//            dismiss()
+//        }
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         viewModel = ViewModelProvider(this).get(OrderListViewModel::class.java)
         dialog_order_cancel_back.onlyOneClickListener {
             dismiss()
@@ -69,7 +109,7 @@ class OrderCancelFragment : DialogFragment() {
                         if (response.isSuccessful) {
                             Log.e("주문 취소 성공", "주문 취소")
                             (requireParentFragment() as OrderListFragment).viewModel.getOrderList()
-                            dismiss()
+//                            dismiss()
                         }
 
                     }

diff --git a/app/src/main/java/com/example/booster/ui/orderList/OrderListFragment.kt b/app/src/main/java/com/example/booster/ui/orderList/OrderListFragment.kt
@@ -63,7 +63,6 @@ class OrderListFragment : Fragment() {
         }
     }
 
-
     private fun initRv() {
         adapter = OrderListAdapter(requireContext(),
             object : OrderListViewHolder.onClickPickUpListener {
@@ -90,7 +89,6 @@ class OrderListFragment : Fragment() {
                 orderCancelDialog.show(childFragmentManager, "dialog")
 
             }
-
         })
 
         frag_order_condition_rv.adapter = adapter

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
@@ -147,11 +147,11 @@ class StoreListFragment : Fragment() {
                             val data = response.body()!!.status
                             if(data==201) {
                                 imageView.setImageResource(R.drawable.store_ic_active_star)
-                                univIdx?.let { viewModel.getStoreList(it) }
+//                                univIdx?.let { viewModel.getStoreList(it) }
                             }
                             else if (data==200) {
                                 imageView.setImageResource(R.drawable.store_ic_inactive_star)
-                                univIdx?.let { viewModel.getStoreList(it) }
+//                                univIdx?.let { viewModel.getStoreList(it) }
                             }
                         }