Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 9174bcd2 8c1fa464
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 14 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 32a34085
......@@ -583,6 +583,8 @@ public class C {
public static final int SKU_DETAIL = 6;
public static final int ADD_SKU = 7;
public static final int SKU_EDITOR = 8;
public static final int SKU_MANAGER = 9;
public static final int SKU_ADDER = 10;
}
public final class PAY_STATE {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @ 32a34085
......@@ -24,6 +24,7 @@ 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.SkugrpFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment;
import com.xingdata.zzdpos.ui.scan.ScanFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List;
......@@ -42,6 +43,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
private VipFragment mVipFragment = new VipFragment();
private LoadingDialog mLoadingDialog = new LoadingDialog();
private ScanFragment mScanFragment = new ScanFragment();
@Override
public int getLayoutId() {
......@@ -50,7 +52,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
@Override
public void initView() {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
this.loadRootFragment(R.id.f_sssku, mManagerFragment);
mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
......@@ -61,6 +63,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
}
return false;
});
mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickScan(mViewBinding.getTitleMode()));
mViewBinding.btnMenu.setOnClickListener(view -> mPresenter.clickSkuMenu());
}
......@@ -140,9 +143,31 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.start(mSearchFragment.setKeyword(keyword).setSearchType(searchType));
}
@Override
public void showScanFragment(int scanMode) {
switch (scanMode) {
case C.TITLE_MODE.SKU_MANAGER:
mScanFragment.setOnScanCompletedListener(barcode -> {
this.pop();
showSearchFragment(C.TITLE_MODE.SKU);
mPresenter.searchSku(barcode);
});
mScanFragment.setOnBackPressedListener(this::backToManagerFragment);
break;
case C.TITLE_MODE.SKU_ADDER:
mScanFragment.setOnScanCompletedListener(barcode -> {
this.pop();
mAddFragment.loadBarcode(barcode);
});
mScanFragment.setOnBackPressedListener(this::backToAddFragment);
break;
}
this.start(mScanFragment);
}
@Override
public void showAddFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_ADDER);
mViewBinding.tvTitle.setText(R.string.sssku_add);
this.start(mAddFragment);
}
......@@ -216,7 +241,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
@Override
public void backToManagerFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
mViewBinding.tvTitle.setText(R.string.sssku_title);
this.resetSearchBar();
this.pop();
......@@ -229,6 +254,14 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.pop();
}
@Override
public void backToAddFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_ADDER);
mViewBinding.tvTitle.setText(R.string.sssku_title);
this.resetSearchBar();
this.pop();
}
@Override
public void backToMenuActivity() {
mPresenter.doOnFinish();
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
View file @ 32a34085
......@@ -98,6 +98,13 @@ public interface SsskuContract {
*/
void showSearchFragment(String keyword, int searchType);
/**
* 显示扫描页面
*
* @param scanMode 扫描模式
*/
void showScanFragment(int scanMode);
/**
* 显示添加检查页面
*/
......@@ -157,6 +164,11 @@ public interface SsskuContract {
*/
void backToDetailFragment();
/**
* 返回添加页面
*/
void backToAddFragment();
/**
* 返回菜单页面
*/
......@@ -342,6 +354,13 @@ public interface SsskuContract {
*/
public abstract void clickSkuMenu();
/**
* 主页面 - 点击扫描按钮
*
* @param titleMode 标题模式
*/
public abstract void clickScan(int titleMode);
/**
* 主页面 - 关闭
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @ 32a34085
......@@ -218,7 +218,6 @@ public class SsskuPresenter extends SsskuContract.Presenter {
sssku1 -> {
mView.showMsg("添加成功");
isNeedSync = true;
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
mView.addSku(sssku1);
......@@ -245,7 +244,6 @@ public class SsskuPresenter extends SsskuContract.Presenter {
sssku1 -> {
mView.showMsg("添加成功");
isNeedSync = true;
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
mView.addSku(sssku1);
......@@ -266,6 +264,11 @@ public class SsskuPresenter extends SsskuContract.Presenter {
mView.showSkuMenuDialog();
}
@Override
public void clickScan(int titleMode) {
mView.showScanFragment(titleMode);
}
@Override
public void doOnFinish() {
if (!isNeedSync) return;
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/AddFragment.java
View file @ 32a34085
......@@ -63,6 +63,11 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
mSkuAdapter.setNewData(ssskus);
}
public void loadBarcode(String barcode) {
if (mViewBinding == null) return;
mViewBinding.etBarcode.setText(barcode);
}
@Override
public boolean onBackPressedSupport() {
((SsskuActivity) getActivity()).backToManagerFragment();
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java
View file @ 32a34085
package com.xingdata.zzdpos.ui.marketing.ms.fragment;
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
......@@ -40,6 +43,12 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
// set other
mViewBinding.llAdd.setOnClickListener(view -> mPresenter.clickAdd());
// set empty
@SuppressLint("InflateParams") View emptyView = getLayoutInflater().inflate(R.layout.view_empty, null);
((TextView) emptyView.findViewById(R.id.tv_empty)).setText(R.string.ms_empty_hint);
mMsAdapter.setEmptyView(emptyView);
mMsAdapter.isUseEmpty(false);
// init data
refreshMs();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ 32a34085
......@@ -155,9 +155,7 @@ public class SettlePresenter extends SettleContract.Presenter {
vips.add(vip);
mView.loadVips(vips);
},
throwable -> {
mView.loadVips(new ArrayList<>());
});
throwable -> mView.loadVips(new ArrayList<>()));
}
@Override
......@@ -319,9 +317,7 @@ public class SettlePresenter extends SettleContract.Presenter {
break;
}
},
throwable -> {
mView.showPayFailFragment(throwable, mSaleorder);
});
throwable -> mView.showPayFailFragment(throwable, mSaleorder));
}
@Override
......
app/src/main/res/layout/activity_sssku.xml
View file @ 32a34085
......@@ -6,6 +6,8 @@
<data>
<import type="android.view.View" />
<variable
name="titleMode"
type="int" />
......@@ -39,7 +41,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:visibility="@{titleMode==1||titleMode==6||titleMode==8?8:0}"
android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?8:0}"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent"
......@@ -63,7 +65,7 @@
android:text="@string/sssku_title"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
android:visibility="@{titleMode==1||titleMode==6||titleMode==8?0:8}"
android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?0:8}"
app:layout_constraintLeft_toRightOf="parent"
app:layout_constraintRight_toLeftOf="parent" />
......@@ -94,6 +96,16 @@
android:visibility="@{titleMode==6?0:8}"
app:layout_constraintRight_toRightOf="parent" />
<ImageButton
android:id="@+id/btn_scan"
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/store_scan"
android:src="@mipmap/but_sweep_yard"
android:visibility="@{titleMode==9||titleMode==10?View.VISIBLE:View.GONE}"
app:layout_constraintRight_toRightOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
......
app/src/main/res/layout/fragment_sssku_detail.xml
View file @ 32a34085
......@@ -133,6 +133,38 @@
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<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_barcode"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center_vertical"
android:text="@{ConvertUtil.longToString(sku.spuBarcode)}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
......
app/src/main/res/layout/view_type_gift.xml
View file @ 32a34085
......@@ -122,12 +122,21 @@
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/ms_editor_type_gift_text5"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
<EditText
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:layout_weight="1"
android:hint="@string/ms_editor_type_gift_search_hint"
android:inputType="text"
......
app/src/main/res/values/strings.xml
View file @ 32a34085
......@@ -329,7 +329,7 @@
<string name="ms_user_hint">营销计划功能限时免费使用 1 个月</string>
<string name="ms_count">共%s个营销计划</string>
<string name="ms_search_hint">请输入活动名称</string>
<string name="ms_empty_hint">没有搜到此计划\n请重新搜索，或点击添加按钮进行添加~</string>
<string name="ms_empty_hint">没有找到营销计划~</string>
<string name="ms_editor_title">管理-营销计划</string>
<string name="ms_editor_setting">设置营销计划</string>
<string name="ms_editor_subtitle_info">基本信息</string>
......@@ -369,6 +369,7 @@
<string name="ms_editor_type_gift_text2">元</string>
<string name="ms_editor_type_gift_text3">加</string>
<string name="ms_editor_type_gift_text4">1件</string>
<string name="ms_editor_type_gift_text5">换购</string>
<string name="ms_editor_type_gift_hint">条码:请扫码或输入条码</string>
<string name="ms_editor_type_gift_name">品名:</string>
<string name="ms_editor_type_gift_price">售价:</string>
......
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