Skip to content

T
TangKuPos
Commit ed767994 authored by 王海's avatar 王海
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 86bad2c6 2d54ef12
Show whitespace changes
Inline Side-by-side
Showing with 728 additions and 346 deletions
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ ed767994
...@@ -1233,6 +1233,7 @@ public final class ApiFactory { ...@@ -1233,6 +1233,7 @@ public final class ApiFactory {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3)); .retryWhen(new RetryHelper(3));
} }
} }
public static class Ver { public static class Ver {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @ ed767994
...@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.ManagerFragment; ...@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.ManagerFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment;
import java.util.List; import java.util.List;
...@@ -32,9 +33,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -32,9 +33,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
private SkugrpFragment mSkugrpFragment = new SkugrpFragment(); private SkugrpFragment mSkugrpFragment = new SkugrpFragment();
private AddFragment mAddFragment = new AddFragment(); private AddFragment mAddFragment = new AddFragment();
private EditorFragment mEditorFragment = new EditorFragment();
private DetailFragment mDetailFragment = new DetailFragment(); private DetailFragment mDetailFragment = new DetailFragment();
private EditorFragment mEditorFragment = new EditorFragment();
private PriceFragment mPriceFragment = new PriceFragment(); private PriceFragment mPriceFragment = new PriceFragment();
private VipFragment mVipFragment = new VipFragment();
private LoadingDialog mLoadingDialog = new LoadingDialog(); private LoadingDialog mLoadingDialog = new LoadingDialog();
...@@ -48,9 +51,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -48,9 +51,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU); this.showTitleBarByTitleMode(C.TITLE_MODE.SKU);
this.loadRootFragment(R.id.f_sssku, mManagerFragment); this.loadRootFragment(R.id.f_sssku, mManagerFragment);
mViewBinding.btnBack.setOnClickListener(view -> { mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
getTopFragment().onBackPressedSupport();
});
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> { mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_SEARCH && !StringUtils.isEmpty(textView.getText())) { if (i == EditorInfo.IME_ACTION_SEARCH && !StringUtils.isEmpty(textView.getText())) {
KeyboardUtils.hideSoftInput(textView); KeyboardUtils.hideSoftInput(textView);
...@@ -58,12 +59,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -58,12 +59,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
} }
return false; return false;
}); });
mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> { mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> mPresenter.searchBarFocusChanged(b, C.TITLE_MODE.SKU));
mPresenter.searchBarFocusChanged(b, C.TITLE_MODE.SKU); mViewBinding.btnMenu.setOnClickListener(view -> mPresenter.clickSkuMenu());
});
mViewBinding.btnMenu.setOnClickListener(view -> {
mPresenter.clickSkuMenu();
});
} }
@Override @Override
...@@ -152,7 +149,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -152,7 +149,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN)); this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN));
break; break;
case C.SKU_EDITOR_MODE.UPDATE: case C.SKU_EDITOR_MODE.UPDATE:
mViewBinding.tvTitle.setText(R.string.sssku_update); mViewBinding.tvTitle.setText(R.string.sku_update);
this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UPDATE)); this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UPDATE));
break; break;
} }
...@@ -161,10 +158,17 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -161,10 +158,17 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
@Override @Override
public void showPriceFragment(Sssku sku) { public void showPriceFragment(Sssku sku) {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT); this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.sssku_update); mViewBinding.tvTitle.setText(R.string.sku_update_price);
this.start(mPriceFragment.setSssku(sku)); this.start(mPriceFragment.setSssku(sku));
} }
@Override
public void showVipFragment(Sssku sku) {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.sku_subtitle_vip);
this.start(mVipFragment.setSssku(sku));
}
@Override @Override
public void showDetailFragment(Sssku sku) { public void showDetailFragment(Sssku sku) {
...@@ -188,7 +192,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -188,7 +192,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
@Override @Override
public void backToEditFragment() { public void backToEditFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT); this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.sssku_update); mViewBinding.tvTitle.setText(R.string.sku_update);
this.pop(); this.pop();
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
View file @ ed767994
...@@ -102,12 +102,19 @@ public interface SsskuContract { ...@@ -102,12 +102,19 @@ public interface SsskuContract {
void showEditorFragment(Sssku sku, int editMode); void showEditorFragment(Sssku sku, int editMode);
/** /**
* 显示价格页面 * 显示价格编辑页面
* *
* @param sku 要编辑的商品 * @param sku 要编辑的商品
*/ */
void showPriceFragment(Sssku sku); void showPriceFragment(Sssku sku);
/**
* 显示会员编辑页面
*
* @param sku 要编辑的商品
*/
void showVipFragment(Sssku sku);
/** /**
* 显示详情页面 * 显示详情页面
* *
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @ ed767994
...@@ -142,7 +142,7 @@ public class SsskuPresenter extends SsskuContract.Presenter { ...@@ -142,7 +142,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
@Override @Override
public void clickEditVipSku(Sssku sssku) { public void clickEditVipSku(Sssku sssku) {
//TODO mView.showVipFragment(sssku);
} }
@Override @Override
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/VipFragment.java 0 → 100644
View file @ ed767994
package com.xingdata.zzdpos.ui.manage.sssku.fragment;
import android.view.View;
import android.widget.EditText;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSsskuVipBinding;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.InputFilters;
public class VipFragment extends BaseFragment<SsskuPresenter, FragmentSsskuVipBinding> {
private Sssku mSssku;
@Override
public int getLayoutId() {
return R.layout.fragment_sssku_vip;
}
@Override
public void initView() {
mViewBinding.ivPic.setImageURI(mSssku.getSpuImg());
mViewBinding.setSku(mSssku);
this.initVipView();
this.setVipViewBySssku();
mViewBinding.btnConfirm.setOnClickListener(view -> {
this.processSssku();
mPresenter.clickConfirm(mSssku, C.SKU_EDITOR_MODE.UPDATE);
});
}
/**
* 设置商品
*
* @param sssku 商品信息
*/
public VipFragment setSssku(Sssku sssku) {
this.mSssku = sssku;
return this;
}
/**
* 初始化价格
*/
private void initVipView() {
View.OnFocusChangeListener mOnFocusChangeListener = (view, b) -> {
if (view instanceof EditText) {
EditText editText = (EditText) view;
if (b && editText.getText().toString().equals("0.0")) {
editText.setText("");
} else if (!b && editText.getText().length() == 0) {
editText.setText("0.0");
}
}
};
mViewBinding.etPoint.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etPoint.setOnFocusChangeListener(mOnFocusChangeListener);
}
/**
* 根据商品设置价格页面
*/
private void setVipViewBySssku() {
mViewBinding.rgDis.check(mSssku.getSkuOffFlag() == null || mSssku.getSkuOffFlag() == 1 ? R.id.rb_dis_on : R.id.rb_dis_off);
if (mSssku.getSkuBoundAmt() == null) mSssku.setSkuBoundAmt(100L);
mViewBinding.etPoint.setText(ConvertUtil.fenToYuan(mSssku.getSkuBoundAmt()));
}
/**
* 处理商品
*/
private void processSssku() {
mSssku.setSkuOffFlag((byte) (mViewBinding.rbDisOff.isChecked() ? 0 : 1));
mSssku.setSkuBoundAmt(ConvertUtil.yuanToFen(mViewBinding.etPoint.getText().toString()));
mSssku.setCreateTime(null);
mSssku.setUpdateTime(null);
}
@Override
public boolean onBackPressedSupport() {
((SsskuActivity) getActivity()).backToDetailFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java
View file @ ed767994
...@@ -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/manage/user/UserContract.java
View file @ ed767994
...@@ -21,9 +21,12 @@ public interface UserContract { ...@@ -21,9 +21,12 @@ public interface UserContract {
interface View extends BaseView { interface View extends BaseView {
void queryOperSus(Pager<Oper> operPager); void queryOperSus(Pager<Oper> operPager);
void querySta(Sta sta);
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
public abstract void getUserList(String wd); public abstract void getUserList(String wd);
public abstract void addUser(Oper oper);
public abstract void querySta();
} }
} }
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java
View file @ ed767994
...@@ -2,10 +2,12 @@ package com.xingdata.zzdpos.ui.manage.user; ...@@ -2,10 +2,12 @@ package com.xingdata.zzdpos.ui.manage.user;
import com.xingdata.zzdpos.api.ApiFactory; import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment; import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
public class UserPresenter extends UserContract.Presenter { public class UserPresenter extends UserContract.Presenter {
public UserListFragment userListFragment = new UserListFragment(); public UserListFragment userListFragment = new UserListFragment();
@Override @Override
public void onAttached() { public void onAttached() {
...@@ -15,9 +17,29 @@ public class UserPresenter extends UserContract.Presenter { ...@@ -15,9 +17,29 @@ public class UserPresenter extends UserContract.Presenter {
@Override @Override
public void getUserList(String wd) { public void getUserList(String wd) {
ApiFactory.Oper.queryOper(wd).subscribe(operPager -> { ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
mView.queryOperSus(operPager);
}, throwable -> {
});
}
@Override
public void addUser(Oper oper) {
ApiFactory.Oper.addOper(oper).subscribe(operPager -> {
}, throwable -> {
},throwable -> { });
}
@Override
public void querySta() {
ApiFactory.Sta.querySta().subscribe(sta -> {
}, throwable -> {
}); });
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/adapter/UserListAdapter.java
View file @ ed767994
...@@ -28,5 +28,10 @@ public class UserListAdapter extends BaseAdapter<Oper, ItemUserListItemBinding> ...@@ -28,5 +28,10 @@ public class UserListAdapter extends BaseAdapter<Oper, ItemUserListItemBinding>
@Override @Override
protected void convert(ItemUserListItemBinding mViewBinding, Oper item) { protected void convert(ItemUserListItemBinding mViewBinding, Oper item) {
mViewBinding.userName.setText(item.getOperName());
mViewBinding.userMobile.setText(String.valueOf(item.getOperMobile()));
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java
View file @ ed767994
...@@ -53,6 +53,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi ...@@ -53,6 +53,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
}); });
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView); adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
adapter.setEnableLoadMore(true); adapter.setEnableLoadMore(true);
adapter.loadMoreComplete();
mViewBinding.titleSearch.onBack.setOnClickListener(view -> { mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
getActivity().finish(); getActivity().finish();
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsFragment.java
View file @ ed767994
...@@ -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 @ ed767994
...@@ -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 @ ed767994
...@@ -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/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ ed767994
...@@ -25,8 +25,8 @@ public final class SystemUtil { ...@@ -25,8 +25,8 @@ public final class SystemUtil {
* @return 设备型号 * @return 设备型号
*/ */
public static String getDeviceModel() { public static String getDeviceModel() {
return DeviceUtils.getModel(); // return DeviceUtils.getModel();
return "AECRC10";
} }
......
app/src/main/res/layout/activity_statistics_detail.xml
View file @ ed767994
...@@ -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 @ ed767994
...@@ -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 @ ed767994
...@@ -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/dialog_sssku_menu.xml
View file @ ed767994
...@@ -48,8 +48,7 @@ ...@@ -48,8 +48,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin" android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin" android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" android:background="@color/gray_kongming" />
android:visibility="gone" />
<TextView <TextView
android:id="@+id/tv_update_vip" android:id="@+id/tv_update_vip"
...@@ -59,8 +58,7 @@ ...@@ -59,8 +58,7 @@
android:gravity="center" android:gravity="center"
android:text="@string/sku_update_vip" android:text="@string/sku_update_vip"
android:textColor="@color/blue_mawu" android:textColor="@color/blue_mawu"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size" />
android:visibility="gone" />
</LinearLayout> </LinearLayout>
<TextView <TextView
......
app/src/main/res/layout/fragment_casher.xml
View file @ ed767994
...@@ -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 @ ed767994
<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 @ ed767994
<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/fragment_sssku_price.xml
View file @ ed767994
...@@ -109,9 +109,8 @@ ...@@ -109,9 +109,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing" android:layout_marginTop="@dimen/all_spacing"
android:layout_weight="1"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:orientation="vertical"> android:orientation="vertical">
...@@ -192,6 +191,11 @@ ...@@ -192,6 +191,11 @@
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<Button <Button
android:id="@+id/btn_confirm" android:id="@+id/btn_confirm"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_sssku_vip.xml 0 → 100644
View file @ ed767994
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<import type="com.xingdata.zzdpos.util.ConvertUtil" />
<variable
name="sku"
type="com.xingdata.zzdpos.model.Sssku" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:paddingTop="@dimen/all_margin">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginStart="@dimen/margin"
app:failureImage="@mipmap/icon_goods_default"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:placeholderImage="@mipmap/icon_goods_default"
app:roundedCornerRadius="@dimen/all_shape_radius" />
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:lines="2"
android:text="@{sku.spuName}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintLeft_toRightOf="@id/iv_pic"
app:layout_constraintRight_toRightOf="parent" />
<TextView
android:id="@+id/tv_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@drawable/shape_gray_r1"
android:padding="@dimen/all_spacing"
android:text="@{@string/sku_size+sku.spuUnitName}"
android:textSize="@dimen/all_caption_size"
app:layout_constraintBottom_toBottomOf="@id/ll_price"
app:layout_constraintLeft_toLeftOf="@id/tv_name" />
<LinearLayout
android:id="@+id/ll_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
app:layout_constraintRight_toRightOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/tv_name">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/money_rmb"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_caption_size"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{ConvertUtil.fenToYuan(sku.skuRetailPrice1)}"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_text_size"
android:textStyle="bold" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_pic" />
</android.support.constraint.ConstraintLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_subtitle_vip"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_vip_dis"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioGroup
android:id="@+id/rg_dis"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_dis_on"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:checked="true"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/all_yes"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioButton
android:id="@+id/rb_dis_off"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/all_no"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_point1"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3">
<EditText
android:id="@+id/et_point"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="numberDecimal"
android:labelFor="@+id/et_point"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/sku_point2"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<Button
android:id="@+id/btn_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@drawable/shape_red_r1"
android:foreground="?android:attr/selectableItemBackground"
android:text="@string/all_confirm"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_order_detail.xml
View file @ ed767994
...@@ -59,9 +59,8 @@ ...@@ -59,9 +59,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white_caocao" android:background="@color/white_caocao"
> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_amt_hint" android:id="@+id/tv_amt_hint"
...@@ -72,7 +71,8 @@ ...@@ -72,7 +71,8 @@
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" />
<TextView <TextView
android:id="@+id/tv_amt" android:id="@+id/tv_amt"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -80,11 +80,9 @@ ...@@ -80,11 +80,9 @@
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" />
/>
<View <View
...@@ -92,15 +90,14 @@ ...@@ -92,15 +90,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1" android:layout_height="@dimen/view_line_L1"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu" />
/>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" 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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -130,7 +127,7 @@ ...@@ -130,7 +127,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_date" android:text="@string/oder_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"
...@@ -138,7 +135,7 @@ ...@@ -138,7 +135,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_no" android:text="@string/oder_detail_no"
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"
...@@ -146,7 +143,7 @@ ...@@ -146,7 +143,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_oper" android:text="@string/oder_detail_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"
...@@ -154,7 +151,7 @@ ...@@ -154,7 +151,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_payType" android:text="@string/oder_detail_payType"
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"
...@@ -162,7 +159,7 @@ ...@@ -162,7 +159,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_goodsNum" android:text="@string/oder_detail_goodsNum"
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"
...@@ -170,7 +167,7 @@ ...@@ -170,7 +167,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_SumAmt" android:text="@string/oder_detail_SumAmt"
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"
...@@ -178,7 +175,7 @@ ...@@ -178,7 +175,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_discountAmt" android:text="@string/oder_detail_discountAmt"
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"
...@@ -186,96 +183,97 @@ ...@@ -186,96 +183,97 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_cutAmt" 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}" /> android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</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="3" android:layout_weight="3"
android:gravity="right" android:gravity="right"
android:orientation="vertical"> android:orientation="vertical"
android:weightSum="8">
<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" />
<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="@{operName}" android:text="@{operName}"
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="@{payType}" android:text="@{payType}"
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="@{goodsNum}" android:text="@{goodsNum}"
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="@{sumAmt}" android:text="@{sumAmt}"
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="@{disAmt}" android:text="@{disAmt}"
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="@{cutAmt}" android:text="@{cutAmt}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" /> android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout> </LinearLayout>
...@@ -300,7 +298,6 @@ ...@@ -300,7 +298,6 @@
android:background="@color/gray_zhouyu" /> android:background="@color/gray_zhouyu" />
<LinearLayout <LinearLayout
android:id="@+id/ll_goods_list" android:id="@+id/ll_goods_list"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/view_ticket.xml
View file @ ed767994
...@@ -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/layout/view_vip_recharge.xml
View file @ ed767994
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,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"
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,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" />
...@@ -112,13 +113,12 @@ ...@@ -112,13 +113,12 @@
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
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_date" android:text="@string/oder_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"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="@string/oder_detail_no" android:text="@string/oder_detail_no"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="会员名：" android:text="会员名："
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"
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="手机号：" android:text="手机号："
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"
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="收款金额：" android:text="收款金额："
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"
...@@ -168,77 +168,78 @@ ...@@ -168,77 +168,78 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:text="赠送金额：" android:text="赠送金额："
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="6">
<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" />
<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="@{vipName}" android:text="@{vipName}"
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="@{vipTel}" android:text="@{vipTel}"
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="@{payAmt}" android:text="@{payAmt}"
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="@{sendAmt}" android:text="@{sendAmt}"
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 @ ed767994
...@@ -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