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
Expand all 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 ...@@ -84,8 +84,8 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
mViewBinding.rvShopItemList.addItemDecoration(new DividerItemDecoration(getActivity(), mViewBinding.rvShopItemList.addItemDecoration(new DividerItemDecoration(getActivity(),
DividerItemDecoration.VERTICAL)); DividerItemDecoration.VERTICAL));
mViewBinding.rvShopItemList.setAdapter(queryShopAdapter); mViewBinding.rvShopItemList.setAdapter(queryShopAdapter);
queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct // queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
(queryShopAdapter.getData().get(position))); // (queryShopAdapter.getData().get(position)));
editFragmentImgShopAdapter = new EditFragmentImgShopAdapter(R.layout editFragmentImgShopAdapter = new EditFragmentImgShopAdapter(R.layout
.item_bale_editfragment_img, listData); .item_bale_editfragment_img, listData);
...@@ -219,6 +219,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd ...@@ -219,6 +219,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
super.convert(helper, item); super.convert(helper, item);
ItemBaleEditBinding mItemViewBinding = (ItemBaleEditBinding) helper.mViewBinding; ItemBaleEditBinding mItemViewBinding = (ItemBaleEditBinding) helper.mViewBinding;
mItemViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
if (item.isEdit()) { if (item.isEdit()) {
mItemViewBinding.llUpDown.setVisibility(View.GONE); mItemViewBinding.llUpDown.setVisibility(View.GONE);
mItemViewBinding.llEdit.setVisibility(View.VISIBLE); 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 ...@@ -40,4 +40,9 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
public void queryOperSus(Pager<Oper> operPager) { public void queryOperSus(Pager<Oper> operPager) {
mPresenter.userListFragment.queryOperSus(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 ...@@ -72,7 +72,7 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
mViewBinding.setTodayAmt(ConvertUtil.fenToYuan(sta.getSaleAmt(), false)); mViewBinding.setTodayAmt(ConvertUtil.fenToYuan(sta.getSaleAmt(), false));
mViewBinding.setTodayOrder(String.valueOf(sta.getSaleCount())); mViewBinding.setTodayOrder(String.valueOf(sta.getSaleCount()));
mViewBinding.setTodayRecharge(ConvertUtil.fenToYuan(sta.getCardAmt(), false)); 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 { ...@@ -37,7 +37,7 @@ public class VipPresenter extends VipContract.Presenter {
public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment(); public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
public VipSearchFragment vipSearchFragment = new VipSearchFragment(); public VipSearchFragment vipSearchFragment = new VipSearchFragment();
public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment(); public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
public int inVipState=0; //1 充值 public int inVipState = 0; //1 充值
@Override @Override
public void onAttached() { public void onAttached() {
...@@ -198,18 +198,18 @@ public class VipPresenter extends VipContract.Presenter { ...@@ -198,18 +198,18 @@ public class VipPresenter extends VipContract.Presenter {
@Override @Override
public void fullVip(Vip vipOld, Long amtPay, Long amtSend) { public void fullVip(Vip vipOld, Long amtPay, Long amtSend) {
ApiFactory.Recard.fullVip(vipOld.getVipId(), amtPay, amtSend).subscribe(vip -> { ApiFactory.Recard.fullVip(vipOld.getVipId(), amtPay, amtSend).subscribe(vip -> {
VipRechargeOrder mVipRechangeOrdervip=vip.getRctrace(); VipRechargeOrder mVipRechangeOrdervip = vip.getRctrace();
mVipRechangeOrdervip.setCreateTime(vip.getUpdateTime()); mVipRechangeOrdervip.setCreateTime(vip.getUpdateTime());
mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal()); mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal()); mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
try { try {
ZX_PrintPOS.getInstance(App.instance).printSave(1,mVipRechangeOrdervip); ZX_PrintPOS.getInstance(App.instance).printSave(1, mVipRechangeOrdervip);
}catch (Exception e){ } catch (Exception e) {
ToastUtils.showShort("打印异常"); ToastUtils.showShort("打印异常");
} }
mView.rechangeSus(vip); mView.rechangeSus(vip);
}, throwable -> { }, 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 { ...@@ -24,7 +24,7 @@ public class ConvertUtil {
* @return 元 * @return 元
*/ */
public static String fenToYuan(Long fen) { public static String fenToYuan(Long fen) {
if (fen == null) return "0.0"; if (fen == null) return "0.00";
return String.valueOf((double) fen / 100); return String.valueOf((double) fen / 100);
} }
......
app/src/main/res/layout/activity_statistics_detail.xml
View file @ fb1878d7
...@@ -62,29 +62,29 @@ ...@@ -62,29 +62,29 @@
<Button <Button
android:id="@+id/btn_print" android:id="@+id/btn_print"
style="@style/button_passive" style="@style/button_passive"
android:layout_width="@dimen/layout_statistics_bottom_button_width" android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/layout_statistics_bottom_button_height" android:layout_height="@dimen/button1_height"
android:layout_marginStart="@dimen/all_margin_big_big"
android:stateListAnimator="@null" android:stateListAnimator="@null"
android:text="@string/settle_print_receipt" android:text="@string/settle_print_receipt"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="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" app:layout_constraintTop_toTopOf="parent"
tools:targetApi="lollipop" /> tools:targetApi="lollipop" />
<Button <Button
android:id="@+id/btn_return" android:id="@+id/btn_return"
style="@style/button_positive" style="@style/button_positive"
android:layout_width="@dimen/layout_statistics_bottom_button_width" android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/layout_statistics_bottom_button_height" android:layout_height="@dimen/button1_height"
android:layout_marginEnd="@dimen/all_margin_big_big"
android:stateListAnimator="@null" android:stateListAnimator="@null"
android:text="@string/pay_return" android:text="@string/pay_return"
android:gravity="center"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent" 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_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/all_margin_big_big" app:layout_goneMarginStart="@dimen/all_margin_big_big"
......
app/src/main/res/layout/dialog_base.xml
View file @ fb1878d7
...@@ -26,20 +26,19 @@ ...@@ -26,20 +26,19 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/gray_kongming" /> android:background="@color/gray_kongming" />
<LinearLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="2">
<Button <Button
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
style="@style/button_passive" style="@style/button_passive"
android:layout_width="0dp" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_margin="@dimen/all_padding" android:layout_margin="@dimen/all_padding"
android:layout_weight="1" android:gravity="center"
android:stateListAnimator="@null" android:stateListAnimator="@null"
android:text="@string/all_cancel" android:text="@string/all_cancel"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
...@@ -52,10 +51,10 @@ ...@@ -52,10 +51,10 @@
<Button <Button
android:id="@+id/btn_confirm" android:id="@+id/btn_confirm"
style="@style/button_positive" style="@style/button_positive"
android:layout_width="0dp" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_margin="@dimen/all_padding" android:layout_margin="@dimen/all_padding"
android:layout_weight="1" android:gravity="center"
android:stateListAnimator="@null" android:stateListAnimator="@null"
android:text="@string/all_confirm" android:text="@string/all_confirm"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
...@@ -65,7 +64,7 @@ ...@@ -65,7 +64,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:targetApi="lollipop" /> tools:targetApi="lollipop" />
</LinearLayout> </android.support.constraint.ConstraintLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/dialog_handover.xml
View file @ fb1878d7
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:text="￥9999" android:text="￥9999"
android:textColor="@color/red900" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_big" android:textSize="@dimen/handover_amt_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
android:paddingTop="@dimen/all_margin" android:paddingTop="@dimen/all_margin"
android:text="实收金额" android:text="实收金额"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -108,7 +109,7 @@ ...@@ -108,7 +109,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_date" android:text="@string/handover_date"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -116,7 +117,7 @@ ...@@ -116,7 +117,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_oper" android:text="@string/handover_oper"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_orderNum" android:text="@string/handover_orderNum"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_cash" android:text="@string/handover_cash"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_wechat" android:text="@string/handover_wechat"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_alipay" android:text="@string/handover_alipay"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -156,7 +157,7 @@ ...@@ -156,7 +157,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_bank" android:text="@string/handover_bank"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -164,95 +165,102 @@ ...@@ -164,95 +165,102 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/handover_vip" android:text="@string/handover_vip"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="right|center_vertical"
android:orientation="vertical"> android:orientation="vertical"
android:paddingEnd="@dimen/dp_4"
android:weightSum="8">
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{date}" android:text="@{date}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{operName}" android:text="@{operName}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{orderNum}" android:text="@{orderNum}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{cash}" android:text="@{cash}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{wechat}" android:text="@{wechat}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{alipay}" android:text="@{alipay}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{bank}" android:text="@{bank}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
<TextView <TextView
style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{vipPay}" android:text="@{vipPay}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_small" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_casher.xml
View file @ fb1878d7
...@@ -76,21 +76,12 @@ ...@@ -76,21 +76,12 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_padding" android:layout_marginBottom="@dimen/all_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline" /> 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> </android.support.constraint.ConstraintLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_ms_main.xml
View file @ fb1878d7
<layout> <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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -9,12 +9,7 @@ ...@@ -9,12 +9,7 @@
tools:context="com.example.administrator.tangkupos.CasherFragment"> tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout --> <!-- 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.support.design.widget.TabLayout
...@@ -22,29 +17,30 @@ ...@@ -22,29 +17,30 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="33dp" android:layout_height="33dp"
android:background="@color/white_caocao" android:background="@color/white_caocao"
app:layout_constraintTop_toTopOf="parent"
app:tabIndicatorColor="@color/red_lvzhi" app:tabIndicatorColor="@color/red_lvzhi"
app:tabIndicatorHeight="@dimen/view_line_L2" app:tabIndicatorHeight="@dimen/view_line_L2"
app:tabTextColor="@color/black_baozheng"> app:tabTextColor="@color/black_baozheng">
</android.support.design.widget.TabLayout> </android.support.design.widget.TabLayout>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/viewPager_data" android:id="@+id/viewPager_data"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:background="@color/gray" android:layout_below="@id/tab_layout"
app:layout_constraintBottom_toBottomOf="parent" android:layout_marginTop="-1dp"
app:layout_constraintEnd_toEndOf="parent" android:background="@color/gray">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tab_layout">
</android.support.v4.view.ViewPager> </android.support.v4.view.ViewPager>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" android:layout_above="@id/viewPager_data"
app:layout_constraintBottom_toBottomOf="@id/tab_layout" /> android:background="@color/gray_huanggai" />
</android.support.constraint.ConstraintLayout>
</RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_main.xml
View file @ fb1878d7
<layout> <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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -9,40 +9,36 @@ ...@@ -9,40 +9,36 @@
tools:context="com.example.administrator.tangkupos.CasherFragment"> tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout --> <!-- 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.support.design.widget.TabLayout
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="30dp" android:layout_height="30dp"
android:background="@drawable/singleline_white_gray" android:background="@color/white_caocao"
app:layout_constraintTop_toTopOf="parent"
app:tabIndicatorHeight="0dp" app:tabIndicatorHeight="0dp"
app:tabMinWidth="100dp" app:tabMinWidth="100dp"
app:tabMode="scrollable" app:tabMode="scrollable"
app:tabSelectedTextColor="#ff7a61" app:tabSelectedTextColor="#ff7a61"
app:tabTextColor="@color/gray_kongming"> app:tabTextColor="@color/gray_kongming" />
</android.support.design.widget.TabLayout>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/viewPager_data" android:id="@+id/viewPager_data"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:background="@color/gray" android:layout_below="@id/tab_layout"
app:layout_constraintBottom_toBottomOf="parent" android:layout_marginTop="-1dp"
app:layout_constraintEnd_toEndOf="parent" android:background="@color/gray">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tab_layout">
</android.support.v4.view.ViewPager> </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> </layout>
\ No newline at end of file
app/src/main/res/layout/item_bale_edit.xml
View file @ fb1878d7
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
android:layout_marginEnd="@dimen/all_margin" android:layout_marginEnd="@dimen/all_margin"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/white" android:background="@color/white"
android:onClick="@{onClick}"
android:src="@mipmap/but_reduce"/> android:src="@mipmap/but_reduce"/>
...@@ -138,6 +139,7 @@ ...@@ -138,6 +139,7 @@
android:layout_marginStart="@dimen/all_margin" android:layout_marginStart="@dimen/all_margin"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/white" android:background="@color/white"
android:onClick="@{onClick}"
android:src="@mipmap/but_add" android:src="@mipmap/but_add"
android:visibility="visible" android:visibility="visible"
tools:layout_editor_absoluteX="666dp" tools:layout_editor_absoluteX="666dp"
...@@ -185,9 +187,9 @@ ...@@ -185,9 +187,9 @@
android:id="@+id/btn_edit_ok" android:id="@+id/btn_edit_ok"
android:layout_width="55dp" android:layout_width="55dp"
android:layout_height="27dp" android:layout_height="27dp"
android:onClick="@{onClick}"
android:layout_marginStart="@dimen/all_margin" android:layout_marginStart="@dimen/all_margin"
android:background="@drawable/shape_black_solid_blue" android:background="@drawable/shape_black_solid_blue"
android:onClick="@{onClick}"
android:text="确定" android:text="确定"
android:textColor="@color/white" android:textColor="@color/white"
/> />
......
app/src/main/res/layout/item_bale_edit_query.xml
View file @ fb1878d7
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:gravity="left" android:gravity="left"
android:lines="2" android:lines="1"
android:maxLines="2" android:maxLines="1"
android:text="生日蛋糕组装礼盒带增补品啊是的那是代表开机速度卡角度看啦啦；等哈阿大大" android:text="生日蛋糕组装礼盒带增补品啊是的那是代表开机速度卡角度看啦啦；等哈阿大大"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
......
app/src/main/res/layout/view_ticket.xml
View file @ fb1878d7
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:text="￥9999" android:text="￥9999"
android:textColor="@color/red900" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_big" android:textSize="@dimen/handover_amt_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
android:paddingTop="@dimen/all_margin" android:paddingTop="@dimen/all_margin"
android:text="优惠券面值" android:text="优惠券面值"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -95,13 +96,13 @@ ...@@ -95,13 +96,13 @@
android:paddingEnd="@dimen/dp_4" android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4" android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:weightSum="2"> android:weightSum="10">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="7"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/ticket_detail_date" android:text="@string/ticket_detail_date"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
...@@ -118,37 +119,38 @@ ...@@ -118,37 +119,38 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/ticket_detail_no" android:text="@string/ticket_detail_no"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="3"
android:gravity="right" android:gravity="right"
android:orientation="vertical"> android:orientation="vertical"
android:weightSum="2">
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{date}" android:text="@{date}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui" />
android:textSize="@dimen/small_text_size" />
<TextView <TextView
style="@style/textView_body_small" style="@style/textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="right" android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@{orderNo}" android:text="@{orderNo}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui" />
android:textSize="@dimen/small_text_size" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/values/dimens.xml
View file @ fb1878d7
...@@ -232,6 +232,8 @@ ...@@ -232,6 +232,8 @@
<dimen name="button3_height">44dp</dimen> <dimen name="button3_height">44dp</dimen>
<dimen name="button3_marginHorizontal">16dp</dimen> <dimen name="button3_marginHorizontal">16dp</dimen>
<dimen name="button3_width">328dp</dimen> <dimen name="button3_width">328dp</dimen>
<!--交班-->
<dimen name="handover_amt_size">34sp</dimen>
</resources> </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