Skip to content

T
TangKuPos
Commit 085fb9fa authored by 姜敏's avatar 姜敏
Browse files
Options

修改优惠券列表

parent d87b7753
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 51 deletions
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java
View file @ 085fb9fa
......@@ -29,10 +29,10 @@ public class VipTruleAdapter extends BaseAdapter<Trule, ItemVipMscardItemBinding
@Override
protected void convert(ItemVipMscardItemBinding mViewBinding, Trule item) {
mViewBinding.truleName.setText(item.getTruleName());
mViewBinding.truleMoney.setText(ConvertUtil.fenToYuanNoZero(item.getTruleValAmt()));
mViewBinding.truleName.setText(ConvertUtil.fenToYuanNoZero(item.getTruleValAmt()));
mViewBinding.truleMoney.setText("满"+ConvertUtil.fenToYuanNoZero(item.getTruleValAmt())+"元使用");
mViewBinding.truleValidity.setText(mContext.getString(R.string.vip_mscard_period_of_validity, StringUtil.format(new Date(item.getTruleExp()), "yyyy.MM.dd"), StringUtil.format(new Date(item.getTruleExp()), "yyyy.MM.dd")));
mViewBinding.truleCondition.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()));
// mViewBinding.truleCondition.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()));
if (item.getTruleStatus().toString().equals("0")) {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.return_ticket_one);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.return_ticket_two);
......
app/src/main/res/layout/fragment_vip_mscard_list.xml
View file @ 085fb9fa
......@@ -125,6 +125,7 @@
<include layout="@layout/line_layout"/>
<android.support.v4.widget.SwipeRefreshLayout
android:layout_marginTop="@dimen/all_margin"
android:id="@+id/recharge_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
......
app/src/main/res/layout/item_vip_mscard_item.xml
View file @ 085fb9fa
......@@ -4,93 +4,79 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/all_margin"
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<RelativeLayout
android:id="@+id/trule_bg_left"
android:background="@mipmap/return_ticket_one"
android:orientation="vertical"
android:gravity="center_horizontal"
android:padding="5dp">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/return_ticket_one">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:orientation="horizontal">
<TextView
android:layout_marginRight="5dp"
android:layout_width="35dp"
android:layout_height="35dp"
android:background="@drawable/shape_white_oval"
android:gravity="center"
android:text="券"
android:textColor="@color/blue_mawu" />
style="@style/default_whitetext_no_margin_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="￥"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:id="@+id/trule_name"
style="@style/default_bartext_style"
style="@style/default_whitetext_no_margin_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
android:textSize="@dimen/text_primary_title_smile" />
</LinearLayout>
<TextView
android:id="@+id/trule_validity"
android:layout_weight="1"
android:gravity="center"
style="@style/textView_body_small"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/white" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/trule_bg_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/trule_bg_right"
android:background="@mipmap/return_ticket_two"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/trule_money"
android:layout_weight="1"
style="@style/default_bartext_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
android:layout_marginTop="@dimen/all_spacing"
android:layout_weight="1"
android:gravity="center"
android:textSize="@dimen/big_text_size" />
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/white" />
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<TextView
android:id="@+id/trule_validity"
style="@style/textView_body_small"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/all_spacing"
android:layout_weight="1"
android:id="@+id/trule_condition"
style="@style/default_bartext_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textSize="@dimen/detail_textview_size" />
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/dialog_inputPassWord_textsize_small" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/values/strings.xml
View file @ 085fb9fa
......@@ -454,7 +454,7 @@
<string name="adv_plan"> 本级标准：消费金额满 %s</string>
<string name="level_Number">共有 %s个会员等级</string>
<string name="vip_level_title">等级设置</string>
<string name="vip_mscard_period_of_validity">有效期：%s-%s</string>
<string name="vip_mscard_period_of_validity">期限：%s-%s</string>
<!--会员充值-->
<string name="vip_recharge_title">会员充值</string>
......
app/src/main/res/values/styles.xml
View file @ 085fb9fa
......@@ -72,6 +72,14 @@
<item name="android:textColor">@color/black</item>
<item name="android:textSize">@dimen/all_text_size</item>
</style>
<style name="default_whitetext_no_margin_smallstyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">35dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/all_text_size</item>
</style>
<style name="default_blacktext_margin_smallstyle">
<item name="android:layout_width">wrap_content</item>
......
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