Skip to content

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

Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

parents 5177bca5 ed767994
Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 326 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java
View file @ fb1878d7
......@@ -84,8 +84,8 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
mViewBinding.rvShopItemList.addItemDecoration(new DividerItemDecoration(getActivity(),
DividerItemDecoration.VERTICAL));
mViewBinding.rvShopItemList.setAdapter(queryShopAdapter);
queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
(queryShopAdapter.getData().get(position)));
// queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
// (queryShopAdapter.getData().get(position)));
editFragmentImgShopAdapter = new EditFragmentImgShopAdapter(R.layout
.item_bale_editfragment_img, listData);
......@@ -219,6 +219,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
super.convert(helper, item);
ItemBaleEditBinding mItemViewBinding = (ItemBaleEditBinding) helper.mViewBinding;
mItemViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
if (item.isEdit()) {
mItemViewBinding.llUpDown.setVisibility(View.GONE);
mItemViewBinding.llEdit.setVisibility(View.VISIBLE);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java
View file @ fb1878d7
......@@ -40,4 +40,9 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
public void queryOperSus(Pager<Oper> operPager) {
mPresenter.userListFragment.queryOperSus(operPager);
}
@Override
public void querySta(Sta sta) {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsFragment.java
View file @ fb1878d7
......@@ -72,7 +72,7 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
mViewBinding.setTodayAmt(ConvertUtil.fenToYuan(sta.getSaleAmt(), false));
mViewBinding.setTodayOrder(String.valueOf(sta.getSaleCount()));
mViewBinding.setTodayRecharge(ConvertUtil.fenToYuan(sta.getCardAmt(), false));
mViewBinding.setTodayVipAdd(String.valueOf(sta.getVipCount()));
mViewBinding.setTodayVipAdd(String.valueOf(sta.getVipAddCount()));
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ fb1878d7
......@@ -37,7 +37,7 @@ public class VipPresenter extends VipContract.Presenter {
public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
public VipSearchFragment vipSearchFragment = new VipSearchFragment();
public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
public int inVipState=0; //1 充值
public int inVipState = 0; //1 充值
@Override
public void onAttached() {
......@@ -198,18 +198,18 @@ public class VipPresenter extends VipContract.Presenter {
@Override
public void fullVip(Vip vipOld, Long amtPay, Long amtSend) {
ApiFactory.Recard.fullVip(vipOld.getVipId(), amtPay, amtSend).subscribe(vip -> {
VipRechargeOrder mVipRechangeOrdervip=vip.getRctrace();
VipRechargeOrder mVipRechangeOrdervip = vip.getRctrace();
mVipRechangeOrdervip.setCreateTime(vip.getUpdateTime());
mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
try {
ZX_PrintPOS.getInstance(App.instance).printSave(1,mVipRechangeOrdervip);
}catch (Exception e){
ZX_PrintPOS.getInstance(App.instance).printSave(1, mVipRechangeOrdervip);
} catch (Exception e) {
ToastUtils.showShort("打印异常");
}
mView.rechangeSus(vip);
}, throwable -> {
mView.rechangeErr(vipOld, amtPay, amtSend,throwable.getMessage());
mView.rechangeErr(vipOld, amtPay, amtSend, throwable.getMessage());
});
}
......
app/src/main/java/com/xingdata/zzdpos/util/ConvertUtil.java
View file @ fb1878d7
......@@ -24,7 +24,7 @@ public class ConvertUtil {
* @return 元
*/
public static String fenToYuan(Long fen) {
if (fen == null) return "0.0";
if (fen == null) return "0.00";
return String.valueOf((double) fen / 100);
}
......
app/src/main/res/layout/activity_statistics_detail.xml
View file @ fb1878d7
......@@ -62,29 +62,29 @@
<Button
android:id="@+id/btn_print"
style="@style/button_passive"
android:layout_width="@dimen/layout_statistics_bottom_button_width"
android:layout_height="@dimen/layout_statistics_bottom_button_height"
android:layout_marginStart="@dimen/all_margin_big_big"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:stateListAnimator="@null"
android:text="@string/settle_print_receipt"
android:textSize="@dimen/all_text_size"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btn_confirm"
app:layout_constraintRight_toLeftOf="@id/btn_return"
app:layout_constraintTop_toTopOf="parent"
tools:targetApi="lollipop" />
<Button
android:id="@+id/btn_return"
style="@style/button_positive"
android:layout_width="@dimen/layout_statistics_bottom_button_width"
android:layout_height="@dimen/layout_statistics_bottom_button_height"
android:layout_marginEnd="@dimen/all_margin_big_big"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:stateListAnimator="@null"
android:text="@string/pay_return"
android:gravity="center"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_cancel"
app:layout_constraintLeft_toRightOf="@id/btn_print"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/all_margin_big_big"
......
app/src/main/res/layout/dialog_base.xml
View file @ fb1878d7
......@@ -26,20 +26,19 @@
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_kongming" />
<LinearLayout
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="horizontal"
android:weightSum="2">
android:orientation="horizontal">
<Button
android:id="@+id/btn_cancel"
style="@style/button_passive"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:layout_margin="@dimen/all_padding"
android:layout_weight="1"
android:gravity="center"
android:stateListAnimator="@null"
android:text="@string/all_cancel"
android:textSize="@dimen/all_text_size"
......@@ -52,10 +51,10 @@
<Button
android:id="@+id/btn_confirm"
style="@style/button_positive"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:layout_margin="@dimen/all_padding"
android:layout_weight="1"
android:gravity="center"
android:stateListAnimator="@null"
android:text="@string/all_confirm"
android:textSize="@dimen/all_text_size"
......@@ -65,7 +64,7 @@
app:layout_constraintTop_toTopOf="parent"
tools:targetApi="lollipop" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</LinearLayout>
......
app/src/main/res/layout/dialog_handover.xml
View file @ fb1878d7
......@@ -54,8 +54,8 @@
android:gravity="center"
android:singleLine="true"
android:text="￥9999"
android:textColor="@color/red900"
android:textSize="@dimen/all_text_size_big"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/handover_amt_size"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -70,6 +70,7 @@
android:paddingTop="@dimen/all_margin"
android:text="实收金额"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -108,7 +109,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_date"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -116,7 +117,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_oper"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -124,7 +125,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_orderNum"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -132,7 +133,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_cash"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -140,7 +141,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_wechat"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -148,7 +149,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_alipay"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -156,7 +157,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_bank"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -164,95 +165,102 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/handover_vip"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
android:gravity="right|center_vertical"
android:orientation="vertical"
android:paddingEnd="@dimen/dp_4"
android:weightSum="8">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{operName}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNum}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{cash}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{wechat}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{alipay}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{bank}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{vipPay}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_small" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_casher.xml
View file @ fb1878d7
......@@ -76,21 +76,12 @@
android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_padding"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_ms_main.xml
View file @ fb1878d7
<layout>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
......@@ -9,12 +9,7 @@
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout -->
<android.support.constraint.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.38" />
<android.support.design.widget.TabLayout
......@@ -22,29 +17,30 @@
android:layout_width="match_parent"
android:layout_height="33dp"
android:background="@color/white_caocao"
app:layout_constraintTop_toTopOf="parent"
app:tabIndicatorColor="@color/red_lvzhi"
app:tabIndicatorHeight="@dimen/view_line_L2"
app:tabTextColor="@color/black_baozheng">
</android.support.design.widget.TabLayout>
<android.support.v4.view.ViewPager
android:id="@+id/viewPager_data"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/gray"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tab_layout">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/tab_layout"
android:layout_marginTop="-1dp"
android:background="@color/gray">
</android.support.v4.view.ViewPager>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="@id/tab_layout" />
</android.support.constraint.ConstraintLayout>
android:layout_above="@id/viewPager_data"
android:background="@color/gray_huanggai" />
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_main.xml
View file @ fb1878d7
<layout>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
......@@ -9,40 +9,36 @@
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout -->
<android.support.constraint.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.38" />
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="@drawable/singleline_white_gray"
app:layout_constraintTop_toTopOf="parent"
android:background="@color/white_caocao"
app:tabIndicatorHeight="0dp"
app:tabMinWidth="100dp"
app:tabMode="scrollable"
app:tabSelectedTextColor="#ff7a61"
app:tabTextColor="@color/gray_kongming">
app:tabTextColor="@color/gray_kongming" />
</android.support.design.widget.TabLayout>
<android.support.v4.view.ViewPager
android:id="@+id/viewPager_data"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/gray"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tab_layout">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/tab_layout"
android:layout_marginTop="-1dp"
android:background="@color/gray">
</android.support.v4.view.ViewPager>
</android.support.constraint.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/viewPager_data"
android:background="@color/gray_huanggai" />
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_bale_edit.xml
View file @ fb1878d7
......@@ -109,6 +109,7 @@
android:layout_marginEnd="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/white"
android:onClick="@{onClick}"
android:src="@mipmap/but_reduce"/>
......@@ -138,6 +139,7 @@
android:layout_marginStart="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/white"
android:onClick="@{onClick}"
android:src="@mipmap/but_add"
android:visibility="visible"
tools:layout_editor_absoluteX="666dp"
......@@ -185,9 +187,9 @@
android:id="@+id/btn_edit_ok"
android:layout_width="55dp"
android:layout_height="27dp"
android:onClick="@{onClick}"
android:layout_marginStart="@dimen/all_margin"
android:background="@drawable/shape_black_solid_blue"
android:onClick="@{onClick}"
android:text="确定"
android:textColor="@color/white"
/>
......
app/src/main/res/layout/item_bale_edit_query.xml
View file @ fb1878d7
......@@ -48,8 +48,8 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="left"
android:lines="2"
android:maxLines="2"
android:lines="1"
android:maxLines="1"
android:text="生日蛋糕组装礼盒带增补品啊是的那是代表开机速度卡角度看啦啦；等哈阿大大"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size"
......
app/src/main/res/layout/view_order_detail.xml
View file @ fb1878d7
......@@ -59,9 +59,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white_caocao"
>
android:orientation="vertical">
<TextView
android:id="@+id/tv_amt_hint"
......@@ -72,7 +71,8 @@
android:paddingTop="@dimen/all_margin"
android:text="订单金额"
android:textColor="@color/black_baozheng"
/>
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_amt"
android:layout_width="match_parent"
......@@ -80,11 +80,9 @@
android:gravity="center"
android:singleLine="true"
android:text="￥9999"
android:textColor="@color/red900"
android:textSize="@dimen/all_text_size_big"
android:textStyle="bold"
/>
android:textColor="@color/black_baozheng"
android:textSize="@dimen/handover_amt_size"
android:textStyle="bold" />
<View
......@@ -92,15 +90,14 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_zhouyu"
/>
android:background="@color/gray_zhouyu" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
app:layout_constraintTop_toBottomOf="@id/view1"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/view1">
<LinearLayout
android:layout_width="match_parent"
......@@ -130,7 +127,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_date"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -138,7 +135,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_no"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -146,7 +143,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_oper"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -154,7 +151,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_payType"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -162,7 +159,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_goodsNum"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -170,7 +167,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_SumAmt"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -178,7 +175,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_discountAmt"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -186,96 +183,97 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_cutAmt"
android:textSize="@dimen/small_text_size"
android:textSize="@dimen/all_text_size_low"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="right"
android:orientation="vertical">
android:orientation="vertical"
android:weightSum="8">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{operName}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{payType}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{goodsNum}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{sumAmt}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{disAmt}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{cutAmt}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout>
......@@ -300,106 +298,105 @@
android:background="@color/gray_zhouyu" />
<LinearLayout
android:id="@+id/ll_goods_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_padding"
android:orientation="vertical"
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:visibility="gone">
<LinearLayout
android:id="@+id/ll_goods_list"
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_padding"
android:orientation="vertical"
android:background="@color/white_caocao"
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:visibility="gone">
android:paddingStart="@dimen/dp_4">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4">
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:maxLines="2"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="品名"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="5"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_count"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="数量"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_name"
app:layout_constraintRight_toLeftOf="@+id/tv_price"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_initial_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/gray"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tv_price"
app:layout_constraintLeft_toRightOf="@+id/tv_count"
app:layout_constraintRight_toLeftOf="@+id/tv_amt1"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/tv_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="单价"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_count"
app:layout_constraintRight_toLeftOf="@+id/tv_amt1"
app:layout_constraintTop_toBottomOf="@id/tv_initial_price" />
<TextView
android:id="@+id/tv_amt1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="小计"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_price"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
</LinearLayout>
android:maxLines="2"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="品名"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="5"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_count"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="数量"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_name"
app:layout_constraintRight_toLeftOf="@+id/tv_price"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_initial_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/gray"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tv_price"
app:layout_constraintLeft_toRightOf="@+id/tv_count"
app:layout_constraintRight_toLeftOf="@+id/tv_amt1"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/tv_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="单价"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_count"
app:layout_constraintRight_toLeftOf="@+id/tv_amt1"
app:layout_constraintTop_toBottomOf="@id/tv_initial_price" />
<TextView
android:id="@+id/tv_amt1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingBottom="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:text="小计"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_price"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/view_ticket.xml
View file @ fb1878d7
......@@ -47,8 +47,8 @@
android:gravity="center"
android:singleLine="true"
android:text="￥9999"
android:textColor="@color/red900"
android:textSize="@dimen/all_text_size_big"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/handover_amt_size"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -63,6 +63,7 @@
android:paddingTop="@dimen/all_margin"
android:text="优惠券面值"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -95,13 +96,13 @@
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:weightSum="2">
android:weightSum="10">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="7"
android:orientation="vertical">
<TextView
......@@ -110,7 +111,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/ticket_detail_date"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -118,37 +119,38 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/ticket_detail_no"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="right"
android:orientation="vertical">
android:orientation="vertical"
android:weightSum="2">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
</LinearLayout>
......
app/src/main/res/layout/view_vip_recharge.xml
View file @ fb1878d7
......@@ -56,7 +56,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/tv_amt"
android:layout_width="match_parent"
......@@ -64,8 +64,8 @@
android:gravity="center"
android:singleLine="true"
android:text="￥9999"
android:textColor="@color/red900"
android:textSize="@dimen/all_text_size_big"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/handover_amt_size"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -80,6 +80,7 @@
android:paddingTop="@dimen/all_margin"
android:text="会员充值"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -112,13 +113,12 @@
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:weightSum="2">
android:weightSum="10">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="7"
android:orientation="vertical">
<TextView
......@@ -127,7 +127,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_date"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -135,7 +135,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_no"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
......@@ -144,7 +144,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="会员名："
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -152,7 +152,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="手机号："
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -160,7 +160,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="收款金额："
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
......@@ -168,77 +168,78 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:text="赠送金额："
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/all_text_size_low" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="right"
android:orientation="vertical">
android:orientation="vertical"
android:weightSum="6">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{vipName}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{vipTel}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{payAmt}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{sendAmt}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textColor="@color/black_likui" />
</LinearLayout>
......
app/src/main/res/values/dimens.xml
View file @ fb1878d7
......@@ -232,6 +232,8 @@
<dimen name="button3_height">44dp</dimen>
<dimen name="button3_marginHorizontal">16dp</dimen>
<dimen name="button3_width">328dp</dimen>
<!--交班-->
<dimen name="handover_amt_size">34sp</dimen>
</resources>
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