Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
#	app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
#	app/src/main/res/layout/fragment_bale_seach.xml
#	app/src/main/res/layout/fragment_bale_seach_shop.xml
parents aac01143 5b7df46d
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 217 deletions
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ 2407b06f
......@@ -18,6 +18,7 @@ import com.blankj.utilcode.util.ToastUtils;
import com.blankj.utilcode.util.Utils;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.wanjian.cockroach.Cockroach;
import com.xingdata.api.print.ZX_PrintPOS;
import com.xingdata.zzdpos.ui.exception.ErrorDialogActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.util.INI;
......@@ -168,4 +169,10 @@ public class App extends Application {
android.os.Process.killProcess(android.os.Process.myPid());
System.exit(1);
}
@Override
public void onTerminate() {
ZX_PrintPOS.getInstance(this).Destory();
super.onTerminate();
}
}
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
View file @ 2407b06f
package com.xingdata.zzdpos.base;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.databinding.DataBindingUtil;
......@@ -231,9 +233,10 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
return null;
}
public void setBtnName(String cancel, String OK) {
public BaseDialog setBtnName(String cancel, String OK) {
mBaseBinding.btnCancel.setText(cancel);
mBaseBinding.btnConfirm.setText(OK);
return this;
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @ 2407b06f
......@@ -33,7 +33,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
implements InventoryContract.View {
private InventoryFragment mInventoryFragment = new InventoryFragment();
private ManageDateFragment mManageDateFragment = new ManageDateFragment();
private InventoryAddFragment mInventoryAddFragment = new InventoryAddFragment();
private InventoryAddFragment mInventoryAddFragment;
;
LoadingDialog mLoadingDialog = new LoadingDialog();
private ScanFragment mScanFragment;
......@@ -56,7 +56,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
if (mInventoryAddFragment.isAdded()) {
if (mInventoryAddFragment != null && mInventoryAddFragment.isAdded()) {
mInventoryAddFragment.popThis();
return;
}
......@@ -146,7 +146,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override
public void openInventoryAddFragment(Cs cs) {
mInventoryAddFragment = new InventoryAddFragment();
mInventoryAddFragment.setCs(cs);
changeTitle("商品盘点", true);
start(mInventoryAddFragment);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/DeleteInventoryDialog.java 0 → 100644
View file @ 2407b06f
package com.xingdata.zzdpos.ui.manage.inventory.dialog;
import android.view.View;
import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.databinding.DialogDeleteInventoryBinding;
import com.xingdata.zzdpos.databinding.DialogHandoverBinding;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
/**
* 交班页面
*/
public class DeleteInventoryDialog extends BaseDialog<InventoryPresenter, DialogDeleteInventoryBinding> {
@Override
public int getLayoutId() {
return R.layout.dialog_delete_inventory;
}
@Override
public int getTitle() {
return -1;
}
@Override
public void initView() {
setBtnName("不删除", "删除");
// mViewBinding.tvDis.set
}
@Override
public void setOnCancelClick(View.OnClickListener onCancelClick) {
super.setOnCancelClick(onCancelClick);
}
@Override
public void setOnConfirmClick(View.OnClickListener onConfirmClick) {
super.setOnConfirmClick(onConfirmClick);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java
View file @ 2407b06f
package com.xingdata.zzdpos.ui.manage.inventory.fragment;
import android.graphics.drawable.Drawable;
import android.support.v4.app.FragmentActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.view.KeyEvent;
import android.view.View;
......@@ -22,6 +23,7 @@ import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryGoodsAdapter;
import com.xingdata.zzdpos.ui.manage.inventory.dialog.CsCartDialog;
import com.xingdata.zzdpos.ui.manage.inventory.dialog.DeleteInventoryDialog;
import com.xingdata.zzdpos.ui.scan.ScanFragment;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
......@@ -40,6 +42,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
private List<Sssku> topCsList = new ArrayList<>();
private InventoryGoodsAdapter mInventoryGoodsAdapter;
private CsCartDialog mCartDialog = new CsCartDialog();
DeleteInventoryDialog deleteInventoryDialog = new DeleteInventoryDialog();
/**
......@@ -57,15 +60,10 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
@Override
public void initView() {
initDialog();
initRecycler();
mViewBinding.setCartCount(0);
mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
if (mViewBinding.edTitle.getText().toString().length() != 0) {
mViewBinding.edTitle.setText("");
}
mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
......@@ -89,36 +87,45 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
mPresenter.exitInventoryAdd();
});
// mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// ZX_PrintPOS.getInstance(mContext).printInventory(1, mCs);
// }
// });
}
private void initDialog() {
deleteInventoryDialog.setOnConfirmClick(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.cancelInventoryAdd(mCs);
deleteInventoryDialog.dismiss();
}
});
deleteInventoryDialog.setOnCancelClick(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
deleteInventoryDialog.dismiss();
pop();
}
});
}
private void initRecycler() {
mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList);
mInventoryGoodsAdapter.setEmptyView(getEmptyView());
mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> {
if (bottomCsList.size() == 0) {
mPresenter.cancelInventoryAdd(mCs);
} else {
PromptDialog promptDialog = new PromptDialog();
promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
mPresenter.cancelInventoryAdd(mCs);
promptDialog.dismiss();
}, view1 -> {
promptDialog.dismiss();
pop();
}).setCancelables(false).show((BaseActivity) mContext);
}
PromptDialog delDialog = new PromptDialog();
delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
@Override
public void onClick(View view) {
adapter.getData().remove(position);
adapter.notifyDataSetChanged();
delDialog.dismiss();
}
}, new View.OnClickListener() {
@Override
public void onClick(View view) {
delDialog.dismiss();
}
}).setCancelables(false).show((BaseActivity) mContext);
return false;
});
mInventoryGoodsAdapter.setOnItemChildClickListener((adapter, view, position) -> {
......@@ -213,7 +220,6 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
@Override
public boolean onBackPressedSupport() {
popThis();
return true;
}
......@@ -222,18 +228,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
if (bottomCsList.size() == 0) {
mPresenter.cancelInventoryAdd(mCs);
} else {
PromptDialog promptDialog = new PromptDialog();
promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
mPresenter.cancelInventoryAdd(mCs);
promptDialog.dismiss();
}, view1 -> {
promptDialog.dismiss();
mPresenter.changeTitle("盘库记录", false);
pop();
}).setCancelables(false).show((BaseActivity) mContext);
deleteInventoryDialog.show((BaseActivity) getActivity());
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ 2407b06f
......@@ -207,11 +207,13 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
@Override
public void backToPaymentActivity() {
ActivityUtils.startActivity(this, MainActivity.class);
ActivityUtils.startActivity(this, PaymentActivity.class);
}
@Override
public void backToStoreActivity() {
ActivityUtils.startActivity(this, MainActivity.class);
ActivityUtils.startActivity(this, StoreActivity.class);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/TicketAdapter.java
View file @ 2407b06f
......@@ -22,12 +22,9 @@ public class TicketAdapter extends BaseAdapter<Ticket, ItemSettleTicketBinding>
@Override
protected void convert(ItemSettleTicketBinding mViewBinding, Ticket item) {
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
ConvertUtil.fenToYuanNoPoint(item.getTicketValAmt())));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))));
mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTicketValAmt()));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule, ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date, TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))));
if (item.isSelected()) {
mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect01_stroke);
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/PayResultFragment.java
View file @ 2407b06f
......@@ -11,6 +11,7 @@ import com.xingdata.zzdpos.ui.settle.SettlePresenter;
public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPayResultBinding> {
private boolean mResult;
private Saleorder mSaleorder;
private int mSettleMode;
@Override
public int getLayoutId() {
......@@ -41,6 +42,16 @@ public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPay
mViewBinding.btnContinue.setOnClickListener(view -> {
mPresenter.clickContinue();
});
switch (mSettleMode) {
case C.SETTLE_MODE.PAYMENT:
mViewBinding.setStrSettleMode("继续收款");
break;
case C.SETTLE_MODE.STORE:
mViewBinding.setStrSettleMode("继续开单");
break;
}
}
@Override
......@@ -79,14 +90,7 @@ public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPay
* @return this
*/
public PayResultFragment setSettleMode(int settleMode) {
switch (settleMode) {
case C.SETTLE_MODE.PAYMENT:
mViewBinding.setStrSettleMode("继续收款");
break;
case C.SETTLE_MODE.STORE:
mViewBinding.setStrSettleMode("继续开单");
break;
}
this.mSettleMode = settleMode;
return this;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ 2407b06f
......@@ -131,7 +131,12 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ZX_PrintPOS.getInstance(MainActivity.mainActivity).printInventory(1, cs);
try {
ZX_PrintPOS.getInstance(MainActivity.mainActivity).printInventory(1, cs);
} catch (Exception e) {
ToastUtils.showShort("打印异常");
}
mViewBinding.btnReturn.setEnabled(false);
mViewBinding.btnReturn.setText("已打印");
......@@ -164,11 +169,14 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
, false));
mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ZX_PrintPOS.getInstance(MainActivity.mainActivity).printSave(1, vipRechargeOrder);
try {
ZX_PrintPOS.getInstance(MainActivity.mainActivity).printSave(1, vipRechargeOrder);
} catch (Exception e) {
ToastUtils.showShort("打印异常");
}
mViewBinding.btnPrint.setEnabled(false);
mViewBinding.btnPrint.setText("已打印");
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ 2407b06f
......@@ -150,25 +150,26 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
if (radioButton.isChecked()) {
strVipLevle = radioButton.getTag() == null ? null : radioButton.getTag().toString();
radioButton.getPaint().setFakeBoldText(true);
radioButton.setTextSize(17);
radioButton.setTextSize(16);
vipListAdapter.setEnableLoadMore(true);
mPresenter.getVipList(0, strVipLevle);
} else {
radioButton.setTextSize(15);
radioButton.setTextSize(14);
radioButton.getPaint().setFakeBoldText(false);
}
}
@SuppressLint("ResourceAsColor")
private RadioButton addRadioButton(LinearLayout.LayoutParams layoutParams, Level level) {
RadioButton radioButton = new RadioButton(getActivity());
radioButton.setTextSize(15);
radioButton.setTextSize(14);
radioButton.setText(level.getVipLevelName());
radioButton.setTag(level.getVipLevel());
radioButton.setGravity(Gravity.CENTER);
radioButton.setButtonDrawable(null);
radioButton.getPaint().setFakeBoldText(true);
// radioButton.getPaint().setFakeBoldText(true);
radioButton.setBackgroundResource(R.drawable.checkbox_viplevel_bg);
radioButton.setTextColor(R.color.black_baozheng);
radioButton.setTextColor(getResources().getColor(R.color.black));
radioButton.setLayoutParams(layoutParams);
radioButton.setPadding(0, 40, 0, 40);
return radioButton;
......@@ -196,7 +197,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
// setVipLevel(levelPager.getList(), mViewBinding.vipLevelRadioGroup.findViewById(id).getTag().toString());
for (int i = 0; i < mViewBinding.vipLevelR.getChildCount(); i++) {
//动态设置按钮颜色
setRadioButtonChecked(id);
setRadioButtonChecked(mViewBinding.vipLevelR.getChildAt(i).getId());
}
});
if (levelPager.getList().size() != 0) {
......
app/src/main/java/com/xingdata/zzdpos/zxpay.java deleted 100644 → 0
View file @ aac01143
package com.xingdata.zzdpos;
public class zxpay {
static {
System.loadLibrary("jsonpay");
}
public static native String jsonpay(String string);
}
app/src/main/res/layout/activity_ms.xml
View file @ 2407b06f
......@@ -25,12 +25,13 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_padding"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
......
app/src/main/res/layout/activity_payment.xml
View file @ 2407b06f
......@@ -13,12 +13,13 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_padding"
android:src="@mipmap/back_white" />
<TextView
......
app/src/main/res/layout/activity_settle.xml
View file @ 2407b06f
......@@ -25,12 +25,13 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_padding"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
......
app/src/main/res/layout/activity_sssku.xml
View file @ 2407b06f
......@@ -29,12 +29,13 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
......@@ -83,7 +84,7 @@
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:padding="@dimen/all_padding"
android:src="@mipmap/click_down"
android:visibility="@{titleMode==6?View.VISIBLE:View.GONE}"
app:layout_constraintRight_toRightOf="parent" />
......
app/src/main/res/layout/activity_store.xml
View file @ 2407b06f
......@@ -45,12 +45,13 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_padding"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
......@@ -80,12 +81,15 @@
<ImageButton
android:id="@+id/btn_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/all_spacing"
android:background="@color/transparent"
android:contentDescription="@string/store_scan"
android:foreground="?android:attr/actionBarItemBackground"
android:paddingEnd="@dimen/all_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:src="@mipmap/but_sweep_yard"
android:visibility="@{titleMode>1?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf="parent"
......
app/src/main/res/layout/dialog_delete_inventory.xml 0 → 100644
View file @ 2407b06f
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="180dp"
android:background="@color/white_caocao"
android:gravity="end"
android:orientation="vertical"
android:paddingBottom="@dimen/all_margin">
<TextView
android:id="@+id/tv_dis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/all_margin"
android:text="暂不退出"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="退出前是否删除本次盘库记录"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_bale_edit.xml
View file @ 2407b06f
......@@ -28,20 +28,20 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_margin"
android:padding="@dimen/all_padding"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding"
android:gravity="center|left"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
......
app/src/main/res/layout/fragment_bale_index.xml
View file @ 2407b06f
......@@ -31,20 +31,20 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="?attr/actionBarSize"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_margin"
android:padding="@dimen/all_padding"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding"
android:gravity="center|left"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
......
app/src/main/res/layout/fragment_bale_seach.xml
View file @ 2407b06f
......@@ -49,9 +49,10 @@
<com.xingdata.zzdpos.view.SearchBar
android:id="@+id/v_search"
android:layout_width="0dp"
android:layout_height="0dp"
app:hint="@string/store_search_hint"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:gravity="center|left"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
......
app/src/main/res/layout/fragment_inventory_add.xml
View file @ 2407b06f
......@@ -35,7 +35,6 @@
android:hint="@string/other_select_edit_hint"
android:imeOptions="actionSearch"
android:inputType="number"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintTop_toTopOf="parent" />
......
app/src/main/res/layout/fragment_send_ticker_vip.xml
View file @ 2407b06f
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View"/>
<import type="android.view.View" />
<variable
name="empty"
type="boolean"/>
type="boolean" />
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
type="com.xingdata.zzdpos.util.OnClickListener" />
<variable
name="titleMode"
type="int"/>
type="int" />
</data>
<LinearLayout
......@@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"/>
android:background="@color/gray_huanggai" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
......@@ -38,15 +38,16 @@
<ImageButton
android:id="@+id/btn_back"
android:layout_width="@dimen/title_height"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_padding"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent"/>
app:layout_constraintLeft_toLeftOf="parent" />
<!--<LinearLayout-->
<!--android:layout_width="0dp"-->
......@@ -80,14 +81,14 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
<View
......@@ -95,18 +96,18 @@
android:layout_height="@dimen/all_line_width"
android:layout_marginBottom="@dimen/all_margin"
android:background="@color/gray_huanggai"
android:visibility="@{empty?View.GONE:View.VISIBLE}"/>
android:visibility="@{empty?View.GONE:View.VISIBLE}" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"/>
android:background="@color/gray_huanggai" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_vip"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_settle.xml
View file @ 2407b06f
......@@ -246,7 +246,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="start"
android:text="@string/cart_amt"
android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/fragment_settle_ticket.xml
View file @ 2407b06f
......@@ -66,16 +66,14 @@
<TextView
android:id="@+id/tv_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/button2_width"
android:layout_height="@dimen/button2_height"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:foreground="?android:attr/actionBarItemBackground"
android:gravity="center"
android:text="@string/all_confirm"
android:textColor="@color/white_caocao" />
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ 2407b06f
......@@ -59,11 +59,7 @@
android:hint="请输入姓名" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin_right"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -101,15 +97,12 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:layout_gravity="center_vertical"
android:layout_margin="@dimen/all_margin"
android:background="@mipmap/iv_vip" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -132,22 +125,22 @@
android:text="性别" />
<RadioGroup
android:gravity="center_vertical"
android:id="@+id/vip_sex"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="100dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:tag="1"
android:layout_marginRight="@dimen/all_margin_left"
android:text="男" />
<RadioButton
......@@ -162,16 +155,13 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"></include>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
......@@ -186,20 +176,16 @@
android:text="级别" />
<TextView
style="@style/default_blacktext_nopadding_smallstyle"
android:id="@+id/vip_discounts"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="match_parent"
android:layout_marginLeft="@dimen/sp_12"
android:gravity="center_vertical"
android:layout_marginRight="100dp"
android:drawableRight="@mipmap/ic_expand"
android:gravity="center_vertical"
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -218,16 +204,13 @@
android:id="@+id/vip_birthday"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="match_parent"
android:hint="请选择"
android:layout_marginLeft="21dp"
android:textSize="@dimen/all_body_size"
android:onClick="@{onClickListener}" />
android:hint="请选择"
android:onClick="@{onClickListener}"
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"></include>
<RelativeLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @ 2407b06f
......@@ -31,11 +31,6 @@
android:layout_height="wrap_content"
android:text="基本信息" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/gray_huanggai" />
<include layout="@layout/line_layout"></include>
<LinearLayout
......@@ -78,13 +73,7 @@
android:background="@null"
android:hint="请输入等级名称" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -123,10 +112,7 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -142,10 +128,7 @@
android:text="本级标准" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -179,12 +162,7 @@
android:text="天" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -223,7 +201,7 @@
android:layout_marginLeft="@dimen/all_margin_left"
android:text="元" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
<RelativeLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_vip_level_list.xml
View file @ 2407b06f
......@@ -59,11 +59,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" />
<include layout="@layout/line_layout"></include>
<RelativeLayout
......
app/src/main/res/layout/fragment_vip_list.xml
View file @ 2407b06f
......@@ -11,9 +11,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<include layout="@layout/title" android:id="@+id/title_layout"/>
<include
android:id="@+id/title_layout"
layout="@layout/title" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
......@@ -30,26 +34,30 @@
<ImageView
android:layout_width="50dp"
android:layout_height="match_parent"
android:background="@mipmap/swipe_card_bg" />
android:background="@mipmap/swipe_card_bg"
android:visibility="gone" />
<ImageView
android:id="@+id/onScan"
android:layout_width="50dp"
android:layout_height="match_parent"
android:background="@mipmap/scan_bg"
android:onClick="@{onClickListener}" />
android:onClick="@{onClickListener}"
android:visibility="gone" />
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="@dimen/all_margin_left"></View>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/white"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingTop="@dimen/all_margin_left">
<TextView
android:id="@+id/vip_count_title"
......@@ -74,7 +82,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingBottom="@dimen/all_margin_left">
<TextView
android:id="@+id/vip_count"
......@@ -83,6 +92,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="1111"
android:textSize="22sp"
android:textStyle="bold" />
......@@ -93,6 +103,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="1111"
android:textSize="22sp"
android:textStyle="bold" />
</LinearLayout>
......@@ -104,7 +115,7 @@
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_marginTop="10dp"
android:layout_marginTop="@dimen/all_margin_left"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
......@@ -138,10 +149,15 @@
<include layout="@layout/line_layout" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_margin_left"></View>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/all_margin_left"
android:layout_weight="1"
android:orientation="horizontal">
......@@ -158,6 +174,7 @@
android:orientation="vertical"></RadioGroup>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......
app/src/main/res/layout/fragment_vip_serch.xml
View file @ 2407b06f
......@@ -61,17 +61,18 @@
<EditText
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:hint="请输入手会员手机号"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="40dp"
android:layout_weight="1"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_text_size_small" />
<TextView
android:id="@+id/search_ImageButton"
style="@style/textView_body"
android:layout_width="60dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:onClick="@{OnClickListener}"
android:text="搜索" />
......
app/src/main/res/layout/item_settle_ticket.xml
View file @ 2407b06f
......@@ -14,7 +14,11 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_spacing">
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/item_vip_expense_item.xml
View file @ 2407b06f
......@@ -73,10 +73,8 @@
android:textColor="@color/black_likui" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout" />
</LinearLayout>
......
app/src/main/res/layout/item_vip_list_item.xml
View file @ 2407b06f
......@@ -4,6 +4,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
......@@ -13,10 +14,10 @@
android:orientation="horizontal">
<ImageView
android:layout_margin="@dimen/all_margin_left"
android:background="@mipmap/iv_vip"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin_left"
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="wrap_content"
......@@ -46,10 +47,8 @@
android:layout_height="wrap_content"
android:text="85折" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin_left"></include>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/line_layout_margin_left.xml 0 → 100644
View file @ 2407b06f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/gray_huanggai"
android:layout_marginLeft="@dimen/all_margin_left"
></LinearLayout>
\ No newline at end of file
app/src/main/res/layout/line_layout_margin_right.xml 0 → 100644
View file @ 2407b06f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/gray_huanggai"
android:layout_marginRight="@dimen/all_margin_left"
></LinearLayout>
\ No newline at end of file
app/src/main/res/layout/title_pop.xml
View file @ 2407b06f
......@@ -12,8 +12,11 @@
android:id="@+id/iv_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@mipmap/go_back"
android:padding="@dimen/all_padding" />
android:layout_alignParentLeft="true"
android:background="@color/transparent"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding"
android:src="@mipmap/go_back" />
<TextView
android:id="@+id/tv_title"
......@@ -29,8 +32,10 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:background="@mipmap/pop_menu"
android:padding="@dimen/all_padding" />
android:background="@color/transparent"
android:paddingEnd="@dimen/all_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:src="@mipmap/pop_menu" />
</RelativeLayout>
......
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