Skip to content

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

提交代码;

parent bc3d68ba
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 100 deletions
app/build.gradle
View file @ 6d43d8ca
......@@ -66,7 +66,7 @@ dependencies {
compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
compile 'io.reactivex.rxjava2:rxjava:2.1.5'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'com.alibaba:fastjson:1.2.39'
compile 'com.alibaba:fastjson:1.1.67.android'
compile 'com.blankj:utilcode:1.11.1'
compile 'com.facebook.fresco:fresco:1.5.0'
compile 'com.facebook.fresco:animated-gif:1.5.0'
......
app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
View file @ 6d43d8ca
......@@ -17,8 +17,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import io.realm.annotations.Ignore;
/**
* 订单
......@@ -505,7 +503,8 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
private Long createTime;
private Salepay salepay;
@Ignore
@JSONField(serialize = false)
private String PayName;
private List<Saledetail> saledetailList;
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/SkugrpFragment.java
View file @ 6d43d8ca
......@@ -54,7 +54,7 @@ public class SkugrpFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSk
public void loadSkugrps(List<Sskugrp> sskugrps) {
mSskugrps = sskugrps;
if (mSkugrpAdapter == null) return;
mSkugrpAdapter.notifyDataSetChanged();
mSkugrpAdapter.setNewData(mSskugrps);
mViewBinding.setVisibility(sskugrps.size() > 0 ? View.VISIBLE : View.INVISIBLE);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/VipFragment.java
View file @ 6d43d8ca
......@@ -40,10 +40,6 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
mPresenter.selectVip(mVipAdapter.getData().get(position));
this.pop();
});
mViewBinding.llNone.setOnClickListener(view -> {
mPresenter.selectVip(Vip.createDefault());
this.pop();
});
}
/**
......@@ -54,6 +50,10 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
public void loadVips(List<Vip> vips) {
mViewBinding.setEmpty(vips.size() == 0);
mVipAdapter.setNewData(vips);
if (vips.size() == 1) {
mPresenter.selectVip(vips.get(0));
this.pop();
}
}
......
app/src/main/res/layout/activity_ms.xml
View file @ 6d43d8ca
......@@ -47,7 +47,6 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:inputType="number"
android:labelFor="@+id/et_search"
......
app/src/main/res/layout/activity_settle.xml
View file @ 6d43d8ca
......@@ -45,7 +45,6 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:inputType="number"
android:labelFor="@+id/et_search"
......
app/src/main/res/layout/activity_sssku.xml
View file @ 6d43d8ca
......@@ -49,7 +49,6 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search"
......
app/src/main/res/layout/activity_store.xml
View file @ 6d43d8ca
......@@ -193,17 +193,15 @@
<TextView
android:id="@+id/tv_settle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/button2_width"
android:layout_height="@dimen/button2_height"
android:layout_marginEnd="@dimen/all_margin"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:gravity="center"
android:text="@string/store_btn_settle"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toTopOf="@id/fl_cart"
app:layout_constraintRight_toRightOf="@id/fl_cart"
app:layout_constraintTop_toBottomOf="@id/fl_cart" />
......
app/src/main/res/layout/fragment_pay_result.xml
View file @ 6d43d8ca
......@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_time"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_time"
......@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<LinearLayout
......@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_type"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_type"
......@@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<LinearLayout
......@@ -118,7 +118,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_count"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_count"
......@@ -126,7 +126,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<LinearLayout
......@@ -142,7 +142,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_order_amt"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_order_amt"
......@@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
......
app/src/main/res/layout/fragment_settle.xml
View file @ 6d43d8ca
......@@ -80,7 +80,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_vip"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="@dimen/list3_height"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground">
......@@ -336,30 +336,18 @@
android:paddingStart="@dimen/all_margin" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:background="@color/white_caocao"
android:gravity="center"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
......@@ -385,9 +373,24 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
android:background="@color/gray_huanggai" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:orientation="vertical"
android:visibility="@{defualtVip?View.GONE:View.VISIBLE}">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<LinearLayout
android:id="@+id/ll_ticket"
......@@ -563,16 +566,14 @@
<TextView
android:id="@+id/tv_settle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/button2_width"
android:layout_height="@dimen/button2_height"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:gravity="center"
android:text="@string/settle_btn_expand"
android:textColor="@color/white_caocao" />
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
......
app/src/main/res/layout/fragment_settle_vip.xml
View file @ 6d43d8ca
......@@ -18,49 +18,6 @@
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:layout_marginTop="@dimen/all_spacing"
android:background="@color/gray_huanggai" />
<LinearLayout
android:id="@+id/ll_none"
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/settle_vip_none"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@mipmap/but_elect02" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginBottom="@dimen/all_margin"
android:background="@color/gray_huanggai"
android:visibility="@{empty?View.GONE:View.VISIBLE}" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_vip"
......
app/src/main/res/layout/item_selector.xml
View file @ 6d43d8ca
......@@ -32,7 +32,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@{selected?@dimen/all_text_size:@dimen/all_body_size}" />
</FrameLayout>
......
app/src/main/res/layout/item_settle_vip.xml
View file @ 6d43d8ca
......@@ -20,7 +20,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_vip"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="@dimen/list3_height"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground">
......
app/src/main/res/values/dimens.xml
View file @ 6d43d8ca
......@@ -234,6 +234,15 @@
<dimen name="button3_height">44dp</dimen>
<dimen name="button3_marginHorizontal">16dp</dimen>
<dimen name="button3_width">328dp</dimen>
<dimen name="list1_height">48dp</dimen>
<dimen name="list2_height">56dp</dimen>
<dimen name="list3_height">72dp</dimen>
<dimen name="list4_height">90dp</dimen>
<dimen name="list5_height">100dp</dimen>
<!--交班-->
<dimen name="handover_amt_size">34sp</dimen>
......
app/src/main/res/values/strings.xml
View file @ 6d43d8ca
......@@ -88,7 +88,7 @@
<string name="cart_product_price">单价</string>
<string name="cart_product_amt">小计</string>
<string name="cart_count">总数:</string>
<string name="cart_amt">总计:</string>
<string name="cart_amt">总计</string>
<string name="cart_pay">应收:</string>
<string name="cart_dis">优惠:</string>
<string name="cart_dis_list">优惠项目:</string>
......@@ -562,7 +562,7 @@
<string name="settle_pay_order_amt">合计金额</string>
<string name="settle_retry">重新支付</string>
<string name="settle_complete">完成</string>
<string name="settle_auth_amt">总计</string>
<string name="settle_auth_amt">合计</string>
<string name="settle_ticket">优惠券</string>
<string name="settle_ticket_text">张可用</string>
<string name="settle_point">积分抵扣</string>
......
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