[마이][Common] 나의 구매예약 구현

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/purchase/MyPurchaseHistoryFragment.java

@@ -54,10 +54,10 @@ public class MyPurchaseHistoryFragment extends FragmentBase<MyPurchaseHistoryPre
       @Override
       public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
         super.getItemOffsets(outRect, view, parent, state);
-        outRect.left = ResourceUtil.dpToPx(25);
-        outRect.right = ResourceUtil.dpToPx(25);
-        outRect.bottom = ResourceUtil.dpToPx(11);
-        outRect.top = ResourceUtil.dpToPx(11);
+        outRect.bottom = ResourceUtil.dpToPx(46);
+        outRect.top = ResourceUtil.dpToPx(38);
+        outRect.left = ResourceUtil.dpToPx(13);
+        outRect.right = ResourceUtil.dpToPx(13);
       }
     });
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/purchase/MyPurchaseHistoryViewHolder.java

@@ -3,7 +3,11 @@ package kr.co.zumo.app.lifeplus.view.screen.my.purchase;
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
@@ -18,11 +22,45 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
  */
 public class MyPurchaseHistoryViewHolder extends RecyclerView.ViewHolder {
 
-  public MyPurchaseHistoryViewHolder(Context context , View itemView) {
+  private ImageView imageViewThumbnail;
+  private TextView textViewProductName;
+  private TextView textViewOrderUpdate;
+  private ImageView imageViewOrderUpdate;
+  private TextView textViewProductDetail;
+  private TextView textViewOrderDate;
+  private TextView textViewPrice;
+  private TextView textViewOrderDetail;
+  private TextView textViewOrderNumber;
+
+
+  public MyPurchaseHistoryViewHolder(Context context, View itemView) {
     super(itemView);
+    imageViewThumbnail = itemView.findViewById(R.id.image_view_thumbnail);
+    textViewProductName = itemView.findViewById(R.id.text_view_product_name);
+    textViewOrderUpdate = itemView.findViewById(R.id.text_view_order_update);
+    imageViewOrderUpdate = itemView.findViewById(R.id.image_view_order_update);
+    textViewProductDetail = itemView.findViewById(R.id.text_view_product_detail);
+    textViewOrderDate = itemView.findViewById(R.id.text_view_order_date);
+    textViewPrice = itemView.findViewById(R.id.text_view_price);
+    textViewOrderDetail = itemView.findViewById(R.id.text_view_order_detail);
+    textViewOrderNumber = itemView.findViewById(R.id.text_view_order_number);
+
+
   }
 
-  public void init(IEventListener listener){
+  public void init(IEventListener listener) {
+    //주문정보 수정 클릭시
+    textViewOrderUpdate.setOnClickListener(view -> {listener.onEvent(new Event.Builder(Event.UPDATE).build());});
+    imageViewOrderUpdate.setOnClickListener(view -> {listener.onEvent(new Event.Builder(Event.UPDATE).build());});
+
+    imageViewThumbnail.setImageDrawable(itemView.getResources().getDrawable(R.drawable.img_my_reservation));
+    textViewProductName.setText("한화호텔&리조트");
+    textViewProductDetail.setText("지리산 프라자 호텔\n호텔더블스위트(2인)");
+    textViewOrderDate.setText("주문일 2018.06.30");
+    textViewPrice.setText("369,000원");
+    textViewOrderDetail.setText("배송중");
+    textViewOrderNumber.setText("주문번호 LPA1806301234");
+
 
   }
 }

app/src/main/res/layout/fragment_my_purchase_history.xml

@@ -8,6 +8,8 @@
 <android.support.v7.widget.RecyclerView
   android:id="@+id/recycler_view_purchase"
   android:clipToPadding="false"
+  android:paddingStart="25dp"
+  android:paddingEnd="25dp"
   android:layout_width="match_parent"
   android:layout_height="match_parent"/>
 </android.support.constraint.ConstraintLayout>

app/src/main/res/layout/my_purchase_history_view.xml

@@ -4,37 +4,34 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
-<android.support.constraint.ConstraintLayout
-  app:layout_constraintStart_toStartOf="parent"
-  app:layout_constraintEnd_toEndOf="parent"
+  android:layout_height="match_parent"
   android:background="@drawable/rectangle_border_ce5e5e5"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  app:layout_constraintEnd_toEndOf="parent"
+  app:layout_constraintStart_toStartOf="parent">
 
   <ImageView
-    android:id="@+id/image_view_purchase"
+    android:id="@+id/image_view_thumbnail"
     android:layout_width="0dp"
-    app:layout_constraintDimensionRatio="V, 311:231"
     android:layout_height="0dp"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintDimensionRatio="V, 311:231"
     app:layout_constraintEnd_toEndOf="parent"
-    android:src="@drawable/img_my_reservation"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    tools:src="@drawable/img_my_reservation"
     />
 
   <TextView
     android:id="@+id/text_view_product_name"
-    app:layout_constraintTop_toBottomOf="@+id/image_view_purchase"
-    android:layout_marginTop="27dp"
-    app:layout_constraintStart_toStartOf="parent"
-    android:layout_marginStart="25dp"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:textSize="12sp"
-    android:textColor="@color/C999999"
+    android:layout_marginStart="25dp"
+    android:layout_marginTop="27dp"
     android:lineSpacingExtra="4sp"
-    android:text="한화호텔&amp;리조트"
+    android:textColor="@color/C999999"
+    android:textSize="12sp"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/image_view_thumbnail"
+    tools:text="한화호텔&amp;리조트"
     />
 
   <TextView
@@ -46,14 +43,14 @@
     android:lineSpacingExtra="4sp"
     android:paddingTop="10dp"
     android:paddingBottom="10dp"
+    android:text="@string/order_info_update"
     android:textColor="@color/C666666"
     android:textSize="11sp"
-    app:layout_constraintEnd_toStartOf="@+id/image_view_link"
-    app:layout_constraintTop_toBottomOf="@+id/image_view_purchase"
-    tools:text="주문정보수정"/>
+    app:layout_constraintEnd_toStartOf="@+id/image_view_order_update"
+    app:layout_constraintTop_toBottomOf="@+id/image_view_thumbnail"/>
 
   <ImageView
-    android:id="@+id/image_view_link"
+    android:id="@+id/image_view_order_update"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginEnd="25dp"
@@ -65,7 +62,7 @@
     app:srcCompat="@drawable/icon_link_grey"/>
 
   <TextView
-    android:id="@+id/textView12"
+    android:id="@+id/text_view_product_detail"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="4dp"
@@ -74,22 +71,22 @@
     android:textSize="16sp"
     app:layout_constraintStart_toStartOf="@+id/text_view_product_name"
     app:layout_constraintTop_toBottomOf="@+id/text_view_product_name"
-    android:text="지리산 프라자 호텔\n호텔더블스위트(2인)"/>
+    tools:text="지리산 프라자 호텔\n호텔더블스위트(2인)"/>
 
   <TextView
-    android:id="@+id/textView13"
+    android:id="@+id/text_view_order_date"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_height="13dp"
     android:layout_marginTop="7dp"
     android:lineSpacingExtra="4sp"
     android:textColor="@color/C666666"
     android:textSize="11sp"
-    app:layout_constraintStart_toStartOf="@+id/textView12"
-    app:layout_constraintTop_toBottomOf="@+id/textView12"
-    android:text="주문일 2018.06.30"/>
+    app:layout_constraintStart_toStartOf="@+id/text_view_product_detail"
+    app:layout_constraintTop_toBottomOf="@+id/text_view_product_detail"
+    tools:text="주문일 2018.06.30"/>
 
   <TextView
-    android:id="@+id/textView14"
+    android:id="@+id/text_view_price"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="12dp"
@@ -97,11 +94,12 @@
     android:textColor="@color/C000000"
     android:textSize="15sp"
     android:textStyle="bold"
-    app:layout_constraintStart_toStartOf="@+id/textView13"
-    app:layout_constraintTop_toBottomOf="@+id/textView13"
-    android:text="369,000원"/>
+    app:layout_constraintStart_toStartOf="@+id/text_view_order_date"
+    app:layout_constraintTop_toBottomOf="@+id/text_view_order_date"
+    tools:text="369,000원"/>
 
   <TextView
+    android:id="@+id/text_view_order_detail"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="18dp"
@@ -109,19 +107,19 @@
     android:textColor="@color/C666666"
     android:textSize="10sp"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintStart_toStartOf="@+id/textView14"
-    android:text="배송중"/>
+    app:layout_constraintStart_toStartOf="@+id/text_view_price"
+    tools:text="배송중"/>
 
   <TextView
+    android:id="@+id/text_view_order_number"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginEnd="25dp"
     android:layout_marginBottom="18dp"
     android:lineSpacingExtra="4sp"
     android:textColor="@color/C999999"
-    android:textSize="10.4sp"
+    android:textSize="10sp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    android:text="주문번호 LPA1806301234"/>
-</android.support.constraint.ConstraintLayout>
+    tools:text="주문번호 LPA1806301234"/>
 </android.support.constraint.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -36,6 +36,7 @@
   <color name="CF13F15">#f13f15</color>
   <color name="CC4C4C4">#c4c4c4</color>
   <color name="C888888">#888888</color>
+  <color name="CF6F6F6">#f6f6f6</color>
 </resources>
 
   <!--opacity 설정-->

app/src/main/res/values/strings.xml

@@ -744,6 +744,8 @@
   <string name="go_faq"><b>문의할래요</b></string>
   <string name="app_review_write"><b>앱 평가 할래요</b></string>
 
+  <string name="order_info_update"><u>주분정보수정</u></string>
+
   <!-- 임의 추가 문자열 : 시작 -->
   <string name="undefined_error">알 수 없는 에러</string>
   <string name="undefined_list_type">데이터가 없습니다.</string>

app/src/product/java/kr/co/zumo/app/lifeplus/config/ProductNetworkConfig.java

@@ -56,6 +56,11 @@ public class ProductNetworkConfig implements INetworkConfig {
     return COOP_CODE;
   }
 
+  @Override
+  public String getCoopMyPage() {
+    return null;
+  }
+
   @Override
   public String getXecureUrl() {
     return XECURE_URL;