Skip to content

T
TangKuPos
Commit 88c1b0d2 authored by 陈前's avatar 陈前
Browse files
Options

扫码

parent cc8f494c
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 64 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @ 88c1b0d2
......@@ -5,9 +5,11 @@ import android.content.Intent;
import android.view.MotionEvent;
import android.view.View;
import com.blankj.utilcode.constant.PermissionConstants;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.PermissionUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityInventoryBinding;
......@@ -71,6 +73,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override
public void showDateFragment() {
start(mManageDateFragment);
changeTitle(null, false);
}
@Override
......@@ -136,6 +139,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override
public void setInventoryCount(String s) {
changeTitle(null, true);
mInventoryFragment.setCount(s);
}
......@@ -166,6 +170,14 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override
public void changeTitle(String s, boolean b) {
if (s == null) {
if (b) {
mViewBinding.icTitle.getRoot().setVisibility(View.VISIBLE);
} else {
mViewBinding.icTitle.getRoot().setVisibility(View.GONE);
}
return;
}
mViewBinding.icTitle.tvTitle.setText(s);
if (b) {
mViewBinding.icTitle.ivRight.setImageResource(R.mipmap.but_sweep_yard);
......@@ -177,19 +189,30 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override
protected void myOnClickListener(View v) {
if (b) {
if (mScanFragment == null) {
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
mPresenter.getProductByBarcode(barcode);
PermissionUtils.permission(PermissionConstants.CAMERA).callback(new PermissionUtils.FullCallback() {
@Override
public void onGranted(List<String> permissionsGranted) {
if (mScanFragment == null) {
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
mPresenter.getProductByBarcode(barcode);
}
});
}
if (!mScanFragment.isAdded()) {
start(mScanFragment);
}
});
}
}
@Override
public void onDenied(List<String> permissionsDeniedForever, List<String>
permissionsDenied) {
}
})
.request();
if (!mScanFragment.isAdded()) {
start(mScanFragment);
}
} else {
mPresenter.clickDate();
......@@ -197,6 +220,8 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
}
});
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageDateFragment.java
View file @ 88c1b0d2
......@@ -71,6 +71,7 @@ public class ManageDateFragment extends BaseFragment<InventoryPresenter, Fragmen
mViewBinding.tvCancel.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.changeTitle(null, true);
pop();
}
});
......@@ -131,4 +132,10 @@ public class ManageDateFragment extends BaseFragment<InventoryPresenter, Fragmen
};
}
@Override
public boolean onBackPressedSupport() {
mPresenter.changeTitle(null, true);
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/OtherSelectActivity.java
View file @ 88c1b0d2
......@@ -9,8 +9,10 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.TextView;
import com.blankj.utilcode.constant.PermissionConstants;
import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.PermissionUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
......@@ -24,6 +26,8 @@ import com.xingdata.zzdpos.ui.scan.ScanFragment;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.List;
public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
ActivityOtherSelectBinding> implements OtherSelectContract.View {
......@@ -50,20 +54,35 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
mViewBinding.lyTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
if (mScanFragment == null) {
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
mOtherListFragment.search(barcode);
}
});
}
if (!mScanFragment.isAdded()) {
FragmentUtils.add(getSupportFragmentManager(), mScanFragment, mViewBinding
.fragmentContainer.getId(), false, true);
}
PermissionUtils.permission
(PermissionConstants.CAMERA)
.callback(new PermissionUtils.FullCallback() {
@Override
public void onGranted(List<String> permissionsGranted) {
if (mScanFragment == null) {
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
mOtherListFragment.search(barcode);
}
});
}
if (!mScanFragment.isAdded()) {
FragmentUtils.add(getSupportFragmentManager(), mScanFragment, mViewBinding
.fragmentContainer.getId(), false, true);
}
}
@Override
public void onDenied(List<String> permissionsDeniedForever, List<String>
permissionsDenied) {
}
})
.request();
}
});
......@@ -74,7 +93,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
mViewBinding.lyTitle.edTitle.clearFocus();
}
if (mScanFragment!=null&&mScanFragment.isAdded()) {
if (mScanFragment != null && mScanFragment.isAdded()) {
mScanFragment.pop();
return;
}
......@@ -99,7 +118,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
@Override
public void loadOssku(Pager<Ossku> osskuList, boolean isRefresh, String keyWord) {
if (mScanFragment!=null&&mScanFragment.isAdded()) {
if (mScanFragment != null && mScanFragment.isAdded()) {
mScanFragment.pop();
}
mOtherListFragment.setData(osskuList, isRefresh);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java
View file @ 88c1b0d2
......@@ -116,6 +116,7 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
}
private View getEmptyView(int resHint) {
View view = getLayoutInflater().inflate(R.layout.view_empty, null);
view.setBackgroundResource(R.color.gray_zhouyu);
((TextView) view.findViewById(R.id.tv_empty)).setText(resHint);
return view;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentActivity.java
View file @ 88c1b0d2
......@@ -4,8 +4,10 @@ package com.xingdata.zzdpos.ui.manage.replenishment;
import android.view.MotionEvent;
import android.view.View;
import com.blankj.utilcode.constant.PermissionConstants;
import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.PermissionUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding;
......@@ -44,19 +46,36 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
if (mScanFragment == null) {
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
mReplenishmentDetailFragment.scrollToItem(barcode);
}
});
}
if (!mScanFragment.isAdded()) {
start(mScanFragment);
}
PermissionUtils.permission
(PermissionConstants.CAMERA)
.callback(new PermissionUtils.FullCallback() {
@Override
public void onGranted(List<String> permissionsGranted) {
if (mScanFragment == null) {
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
mReplenishmentDetailFragment.scrollToItem(barcode);
}
});
}
if (!mScanFragment.isAdded()) {
start(mScanFragment);
}
}
@Override
public void onDenied(List<String> permissionsDeniedForever, List<String>
permissionsDenied) {
}
})
.request();
}
});
......@@ -69,7 +88,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
mViewBinding.icTitle.tvTitle.setText(R.string.replenishment_meun);
return;
}
if (mScanFragment!=null&&mScanFragment.isAdded()) {
if (mScanFragment != null && mScanFragment.isAdded()) {
mScanFragment.pop();
return;
}
......@@ -154,7 +173,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
@Override
public void popScan() {
if (mScanFragment!=null&&mScanFragment.isAdded()) {
if (mScanFragment != null && mScanFragment.isAdded()) {
mScanFragment.pop();
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentDetailAdapter.java
View file @ 88c1b0d2
......@@ -37,7 +37,7 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + "");
mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuCost(), false));
mViewBinding.tvStock.setText(item.getSkuStock() + "");
mViewBinding.tvStock.setText(item.getSkuStock() + item.getSpuUnitName());
if (item.getSkuCnt() != null) {
mViewBinding.etCount.setText(item.getSkuCnt() + "");
} else {
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ 88c1b0d2
......@@ -82,7 +82,7 @@
android:paddingTop="@dimen/all_padding"
android:text="供货方"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size"
android:textSize="@dimen/all_text_size_low"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
......@@ -221,16 +221,12 @@
android:drawableStart="@mipmap/icon_stores"
android:text="@{shopName}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintBottom_toBottomOf="@id/tv_shop_title"
app:layout_constraintEnd_toEndOf="@id/tv_shop_title"
app:layout_constraintTop_toTopOf="@id/tv_shop_title" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_slight_line_width"
android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="@id/tv_shop_title" />
<View
android:id="@+id/view_line_left_2"
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ 88c1b0d2
......@@ -49,6 +49,7 @@
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:padding="0dp"
android:text="12783163981789"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"
app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
......@@ -64,6 +65,7 @@
android:padding="@dimen/dp_4"
android:text="规格"
android:textSize="@dimen/all_text_size_small"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
......@@ -85,7 +87,7 @@
android:id="@+id/tv_rmb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="0dp"
android:text="@string/money_rmb"
android:textColor="@color/store_product_price"
android:textSize="@dimen/all_text_size_small"
......@@ -169,6 +171,7 @@
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="0dp"
android:text="0个"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_stock_hint"
......
app/src/main/res/layout/view_inventory_detail.xml
View file @ 88c1b0d2
......@@ -69,29 +69,22 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:text="@{date}"
android:textSize="@dimen/all_text_size_small" />
</LinearLayout>
<View
android:id="@+id/view_line_left"
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/lyt_main_bg"
android:elevation="@dimen/view_line_L050"
app:layout_constraintTop_toBottomOf="@id/img_user" />
<LinearLayout
android:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/view_line_height"
android:background="@color/lyt_main_bg"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@drawable/singleline_zhouyu_huanggai"
android:elevation="@dimen/view_line_L050"
android:orientation="horizontal"
android:weightSum="5"
app:layout_constraintTop_toBottomOf="@id/view_line_left">
app:layout_constraintTop_toBottomOf="@id/img_user">
<TextView
android:layout_width="0dp"
......@@ -151,8 +144,9 @@
android:id="@+id/ll_result"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:gravity="center_vertical|end"
android:orientation="horizontal"
android:padding="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
......@@ -162,7 +156,6 @@
android:id="@+id/tv_result_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:text="盘点结果:"
android:textColor="@color/black"
android:textSize="@dimen/small_text_size"
......@@ -173,6 +166,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding"
android:background="@drawable/yellow_radius_bg"
android:gravity="center"
android:paddingBottom="@dimen/dp_4"
......@@ -189,8 +183,9 @@
android:id="@+id/ll_num"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:gravity="center_vertical|start"
android:orientation="horizontal"
android:padding="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="@id/ll_result"
app:layout_constraintEnd_toStartOf="@id/ll_result"
app:layout_constraintHorizontal_weight="1"
......@@ -200,7 +195,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:text="盘点件数:"
android:textColor="@color/black"
android:textSize="@dimen/small_text_size"
......@@ -212,6 +206,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding"
android:padding="@dimen/dp_4"
android:text="@{sumNum}"
android:textColor="@color/black"
......
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