Skip to content

T
TangKuPos
Commit 14445939 authored by zhang_z's avatar zhang_z
Browse files
Options

使用优惠券UI改变;

parent 0693ed14
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 107 deletions
app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/TicketAdapter.java
View file @ 14445939
package com.xingdata.zzdpos.ui.settle.adapter; package com.xingdata.zzdpos.ui.settle.adapter;
import android.view.View;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter; import com.xingdata.zzdpos.base.BaseAdapter;
...@@ -20,14 +22,19 @@ public class TicketAdapter extends BaseAdapter<Ticket, ItemSettleTicketBinding> ...@@ -20,14 +22,19 @@ public class TicketAdapter extends BaseAdapter<Ticket, ItemSettleTicketBinding>
@Override @Override
protected void convert(ItemSettleTicketBinding mViewBinding, Ticket item) { protected void convert(ItemSettleTicketBinding mViewBinding, Ticket item) {
mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
ConvertUtil.fenToYuanNoPoint(item.getTicketValAmt())));
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money, mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
ConvertUtil.fenToYuanNoPoint(item.getTicketValAmt()))); ConvertUtil.fenToYuanNoPoint(item.getTicketValAmt())));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule, mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()))); ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date, mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())))); TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))));
mViewBinding.ivSelected.setImageResource(item.isSelected() ? R.mipmap.but_elect01 : R.mipmap.but_elect02);
if (item.isSelected()) {
mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect01_stroke);
mViewBinding.ivSelect.setVisibility(View.VISIBLE);
} else {
mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect02_stroke);
mViewBinding.ivSelect.setVisibility(View.GONE);
}
} }
} }
app/src/main/res/layout/item_settle_ticket.xml
View file @ 14445939
...@@ -11,123 +11,82 @@ ...@@ -11,123 +11,82 @@
</data> </data>
<android.support.constraint.ConstraintLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin" android:orientation="horizontal">
android:layout_marginStart="@dimen/all_margin"
android:foreground="?android:attr/selectableItemBackground">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin" android:orientation="horizontal">
android:baselineAligned="false"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_item" android:id="@+id/cl_item"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2.3"> android:layout_weight="1">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@mipmap/return_ticket_one" android:background="@mipmap/return_ticket_one" />
android:contentDescription="@null" />
<LinearLayout <LinearLayout
android:id="@+id/ll_top" android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="match_parent"
android:layout_height="0dp"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal">
android:padding="@dimen/all_padding"
app:layout_constraintBottom_toTopOf="@id/ll_bottom"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="4">
<ImageView <TextView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_marginTop="@dimen/all_spacing_min"
android:layout_weight="1.8" android:text="￥"
android:contentDescription="@null" android:textColor="@color/white"
android:src="@mipmap/bg_return_ticker_logo" /> android:textSize="@dimen/all_text_size_low"
android:textStyle="bold" />
<TextView <TextView
android:id="@+id/tv_ticket_money" android:id="@+id/tv_ticket_moneys"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="5"
android:gravity="center" android:gravity="center"
android:text="@string/tv_money" android:text="123.3"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/text_secondary_title" android:textSize="@dimen/text_primary_title_smile"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_top"
app:layout_constraintVertical_weight="2">
<TextView
android:id="@+id/tv_date"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/tv_date"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize" />
</LinearLayout>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_send" android:id="@+id/cl_send"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="2.3">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/return_ticket_two" android:background="@mipmap/return_ticket_two" />
android:contentDescription="@null" />
<TextView <TextView
android:id="@+id/tv_ticket_moneys" android:id="@+id/tv_rule"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:gravity="center" android:gravity="center"
android:text="@string/money" android:paddingTop="@dimen/all_spacing"
android:text="@string/tv_rule"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/text_primary_title_smile" android:textSize="@dimen/big_text_size"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/vw_line" app:layout_constraintBottom_toTopOf="@+id/vw_line"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<View <View
android:id="@+id/vw_line" android:id="@+id/vw_line"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -135,52 +94,36 @@ ...@@ -135,52 +94,36 @@
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1" android:background="@color/gray1"
app:layout_constraintBottom_toTopOf="@id/tv_rule" app:layout_constraintBottom_toTopOf="@id/tv_date"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_ticket_moneys" /> app:layout_constraintTop_toBottomOf="@+id/tv_rule"></View>
<TextView <TextView
android:id="@+id/tv_rule" android:id="@+id/tv_date"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="@string/tv_rule" android:paddingBottom="@dimen/all_spacing"
android:paddingLeft="@dimen/all_margin"
android:text="@string/tv_date"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/dialog_inputPassWord_textsize_small"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vw_line" /> app:layout_constraintTop_toBottomOf="@+id/vw_line" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</LinearLayout> </LinearLayout>
<com.facebook.drawee.view.SimpleDraweeView
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_gravity="center"
app:backgroundImage="@color/gray_zhouyu"
app:layout_constraintBottom_toBottomOf="@id/iv_selected"
app:layout_constraintLeft_toLeftOf="@id/iv_selected"
app:layout_constraintRight_toRightOf="@id/iv_selected"
app:layout_constraintTop_toTopOf="@id/iv_selected"
app:roundAsCircle="true" />
<ImageView <ImageView
android:id="@+id/iv_selected" android:id="@+id/iv_select"
android:layout_width="wrap_content" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="30dp"
android:layout_gravity="center" android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/all_margin_big" android:layout_marginRight="@dimen/all_margin"
android:layout_marginTop="@dimen/all_spacing" android:src="@mipmap/but_elect02_stroke"
android:contentDescription="@null" android:visibility="gone" />
android:padding="@dimen/view_line_L1" </RelativeLayout>
android:src="@mipmap/but_elect01"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</layout> </layout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment