Commit 89089164 authored by zhang_z's avatar zhang_z

提交代码;

parent b2ba6988
package com.xingdata.zzdpos.model; package com.xingdata.zzdpos.model;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.xingdata.zzdpos.base.BaseBean;
import io.realm.annotations.Ignore; import io.realm.annotations.Ignore;
import io.realm.annotations.Index; import io.realm.annotations.Index;
import com.xingdata.zzdpos.base.BaseBean;
public class Vip implements BaseBean { public class Vip implements BaseBean {
...@@ -100,9 +100,9 @@ public class Vip implements BaseBean { ...@@ -100,9 +100,9 @@ public class Vip implements BaseBean {
public Vip(int vipDefDiscount) { public Vip(int vipDefDiscount) {
this.vipDefDiscount = vipDefDiscount; this.vipDefDiscount = vipDefDiscount;
this.vipName = "会员"; this.vipName = "会员";
this.vipMobile = 13500000000L; this.vipMobile = 0L;
this.acctCbal = 100000L; this.acctCbal = 0L;
this.boundCbal = 100L; this.boundCbal = 0L;
} }
......
...@@ -114,7 +114,8 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -114,7 +114,8 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override @Override
public void selectVip(Vip vip) { public void selectVip(Vip vip) {
mView.loadVip(vip); mVip = vip;
mView.loadVip(mVip);
} }
@Override @Override
......
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
<import type="android.view.View" />
<variable <variable
name="defualtVip" name="defualtVip"
type="boolean" /> type="boolean" />
...@@ -86,7 +89,7 @@ ...@@ -86,7 +89,7 @@
android:id="@+id/iv_level" android:id="@+id/iv_level"
android:layout_width="@dimen/settle_vip_level" android:layout_width="@dimen/settle_vip_level"
android:layout_height="@dimen/settle_vip_level" android:layout_height="@dimen/settle_vip_level"
android:visibility="@{defualtVip ? 8 : 0}" android:visibility="@{defualtVip?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="@id/iv_head" app:layout_constraintBottom_toBottomOf="@id/iv_head"
app:layout_constraintRight_toRightOf="@id/iv_head" app:layout_constraintRight_toRightOf="@id/iv_head"
app:roundAsCircle="true" /> app:roundAsCircle="true" />
...@@ -96,7 +99,7 @@ ...@@ -96,7 +99,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin" android:layout_marginStart="@dimen/all_margin"
android:orientation="vertical" android:orientation="vertical"
android:visibility="@{defualtVip ? 8 : 0}" android:visibility="@{defualtVip?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/iv_head" app:layout_constraintLeft_toRightOf="@id/iv_head"
app:layout_constraintTop_toBottomOf="parent"> app:layout_constraintTop_toBottomOf="parent">
...@@ -123,7 +126,7 @@ ...@@ -123,7 +126,7 @@
android:text="@string/settle_select_vip" android:text="@string/settle_select_vip"
android:textColor="@color/black_zhangfei" android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
android:visibility="@{defualtVip ? 0 : 8}" android:visibility="@{defualtVip?View.VISIBLE:View.GONE}"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/iv_head" app:layout_constraintLeft_toRightOf="@id/iv_head"
app:layout_constraintTop_toBottomOf="parent" /> app:layout_constraintTop_toBottomOf="parent" />
...@@ -135,7 +138,7 @@ ...@@ -135,7 +138,7 @@
android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}" android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}"
android:textColor="@color/black_zhangfei" android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" android:textSize="@dimen/all_caption_size"
android:visibility="@{defualtVip ? 8 : 0}" android:visibility="@{defualtVip?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_arrow" app:layout_constraintRight_toLeftOf="@id/iv_arrow"
app:layout_constraintTop_toBottomOf="parent" /> app:layout_constraintTop_toBottomOf="parent" />
...@@ -317,7 +320,6 @@ ...@@ -317,7 +320,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="end" android:gravity="end"
android:text="¥40.0"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" android:textSize="@dimen/all_sub_title_size"
android:textStyle="bold" /> android:textStyle="bold" />
......
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