Skip to content

T
TangKuPos
Commit 5b7df46d authored by 陈前's avatar 陈前
Browse files
Options

盘库还在调整

parent a365d131
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 67 deletions
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ 5b7df46d
......@@ -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 @ 5b7df46d
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/main/MainActivity.java
View file @ 5b7df46d
......@@ -210,9 +210,5 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
@Override
protected void onDestroy() {
ZX_PrintPOS.getInstance(this).Destory();
super.onDestroy();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @ 5b7df46d
......@@ -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 @ 5b7df46d
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 @ 5b7df46d
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/statistics/StatisticsDetailActivity.java
View file @ 5b7df46d
......@@ -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/res/layout/dialog_delete_inventory.xml 0 → 100644
View file @ 5b7df46d
<?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_inventory_add.xml
View file @ 5b7df46d
......@@ -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 @ 5b7df46d
<?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"-->
......@@ -81,14 +82,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
......@@ -96,18 +97,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
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