Skip to content

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

Merge remote-tracking branch 'origin/master'

parents a3c02d7f 6018a9db
Hide whitespace changes
Inline Side-by-side
Showing with 355 additions and 167 deletions
.idea/modules.xml
View file @ 744ebfb9
......@@ -3,8 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
<module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos2\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos2\TangKuPos.iml" />
<module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\TangKuPos2.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\TangKuPos2.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
......
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ 744ebfb9
......@@ -70,7 +70,7 @@ public class App extends Application {
.start();
// 初始化异常处理
initEx();
// initEx();
//初始化Fragment框架
initFragment();
......
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @ 744ebfb9
......@@ -9,6 +9,7 @@ import com.xingdata.zzdpos.base.BaseModel;
import com.xingdata.zzdpos.model.HandoverInfo;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
......@@ -68,7 +69,7 @@ public class DBFactory {
* @param skuGrpId 分组ID
* @return 商品List
*/
public static Observable<List<Sssku>> querySku(int pageNum, Long skuGrpId) {
public static Observable<Pager<Sssku>> querySku(int pageNum, Long skuGrpId) {
RealmQuery<Sssku> query = DB.getInstance().get(MainPresenter.class).where(Sssku.class);
//skuGrpId
......@@ -87,7 +88,7 @@ public class DBFactory {
* @param keyword 关键字
* @return 商品List
*/
public static Observable<List<Sssku>> querySku(int pageNum, String keyword) {
public static Observable<Pager<Sssku>> querySku(int pageNum, String keyword) {
RealmQuery<Sssku> query = DB.getInstance().get(MainPresenter.class).where(Sssku.class);
long _keyword = StringUtil.strToLong(keyword);
......@@ -112,12 +113,18 @@ public class DBFactory {
*
* @return 组合商品
*/
public static Observable<List<Ussku>> queryUSku() {
public static Observable<Pager<Ussku>> queryUSku() {
RealmQuery<Ussku> query = DB.getInstance().get(MainPresenter.class).where(Ussku.class);
query.equalTo("skuStatus", 0);
return Observable.just(query.findAll())
.flatMap(usskus -> Observable.just(getList(usskus)));
.flatMap(usskus -> {
Pager<Ussku> usskuPager = new Pager<>();
usskuPager.setFirstPage(true);
usskuPager.setLastPage(true);
usskuPager.setList(getList(usskus));
return Observable.just(usskuPager);
});
}
......@@ -262,22 +269,29 @@ public class DBFactory {
}
}
public static <E extends RealmModel> List<E> getLimitList(RealmResults<E> data, int offset,
int limit) {
public static <E extends RealmModel> Pager<E> getLimitList(RealmResults<E> data, int offset,
int limit) {
Pager<E> pager = new Pager<>();
pager.setTotalRow(data.size());
pager.setFirstPage(offset <= 1);
pager.setPageSize(data.size() / limit + 1);
List<E> obtainList = new ArrayList<>();
Realm realm = Realm.getDefaultInstance();
if (data.size() == 0) {
return obtainList;
return pager;
}
for (int i = offset * limit; i < offset * limit + limit; i++) {
if (i >= data.size()) {
pager.setLastPage(true);
break;
}
E temp = realm.copyFromRealm(data.get(i));
obtainList.add(temp);
}
realm.close();
return obtainList;
pager.setList(obtainList);
return pager;
}
public static <E extends RealmModel> List<E> getList(RealmResults<E> data) {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @ 744ebfb9
package com.xingdata.zzdpos.ui.manage.sssku;
import android.view.MotionEvent;
import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivitySsskuBinding;
import com.xingdata.zzdpos.model.Cor;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
......@@ -54,17 +52,10 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
public void initView() {
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
this.loadRootFragment(R.id.f_sssku, mManagerFragment);
mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_SEARCH && !StringUtils.isEmpty(textView.getText())) {
KeyboardUtils.hideSoftInput(textView);
mPresenter.searchSku(textView.getText().toString());
}
return false;
});
mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickScan(mViewBinding.getTitleMode()));
mViewBinding.btnMenu.setOnClickListener(view -> mPresenter.clickSkuMenu());
mViewBinding.vSearch.setOnSearchListener(keyword -> mPresenter.searchSku(keyword));
}
@Override
......@@ -77,7 +68,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
}
@Override
public void loadSkus(List<Sssku> skus, boolean isRefresh) {
public void loadSkus(Pager<Sssku> skus, boolean isRefresh) {
mManagerFragment.loadSkus(skus, isRefresh);
}
......@@ -105,7 +96,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
}
@Override
public void loadSearchResult(List<Sssku> skus, boolean isRefresh) {
public void loadSearchResult(Pager<Sssku> skus, boolean isRefresh) {
mSearchFragment.loadSkus(skus, isRefresh);
}
......@@ -128,18 +119,17 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
@Override
public void showSearchFragment(int searchType) {
if (mSearchFragment.isAdded()) return;
mViewBinding.etSearch.requestFocus();
KeyboardUtils.showSoftInput(mViewBinding.etSearch);
this.showTitleBarByTitleMode(searchType);
mViewBinding.vSearch.clear();
mViewBinding.vSearch.showSoftInput();
this.start(mSearchFragment.setKeyword("").setSearchType(searchType));
}
@Override
public void showSearchFragment(String keyword, int searchType) {
if (mSearchFragment.isAdded()) return;
mViewBinding.etSearch.requestFocus();
KeyboardUtils.showSoftInput(mViewBinding.etSearch);
this.showTitleBarByTitleMode(searchType);
mViewBinding.vSearch.setText(keyword);
this.start(mSearchFragment.setKeyword(keyword).setSearchType(searchType));
}
......@@ -162,7 +152,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
mScanFragment.setOnBackPressedListener(this::backToAddFragment);
break;
}
KeyboardUtils.hideSoftInput(mViewBinding.etSearch);
mViewBinding.vSearch.hideSoftInput();
this.start(mScanFragment);
}
......@@ -306,13 +296,13 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
private void showTitleBarByTitleMode(int titleMode) {
if (mViewBinding.getTitleMode() == titleMode) return;
mViewBinding.setTitleMode(titleMode);
mViewBinding.etSearch.setText("");
mViewBinding.vSearch.clear();
switch (titleMode) {
case C.TITLE_MODE.SKU:
mViewBinding.etSearch.setHint(R.string.sssku_search_hint);
mViewBinding.vSearch.setHint(getString(R.string.sssku_search_hint));
break;
case C.TITLE_MODE.PKG:
mViewBinding.etSearch.setHint(R.string.sssku_search_hint);
mViewBinding.vSearch.setHint(getString(R.string.sssku_search_hint));
break;
case C.TITLE_MODE.SKU_DETAIL:
break;
......@@ -323,7 +313,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
* 重置搜索栏
*/
private void resetSearchBar() {
mViewBinding.etSearch.setText("");
mViewBinding.vSearch.clear();
mViewBinding.clTitle.requestFocus();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
View file @ 744ebfb9
......@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.manage.sssku;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Cor;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
......@@ -26,7 +27,7 @@ public interface SsskuContract {
* @param skus 商品列表
* @param isRefresh 是否刷新列表
*/
void loadSkus(List<Sssku> skus, boolean isRefresh);
void loadSkus(Pager<Sssku> skus, boolean isRefresh);
/**
* 加载商品分组
......@@ -60,7 +61,7 @@ public interface SsskuContract {
* @param skus 商品列表
* @param isRefresh 是否刷新列表
*/
void loadSearchResult(List<Sssku> skus, boolean isRefresh);
void loadSearchResult(Pager<Sssku> skus, boolean isRefresh);
/**
* 加载供应商列表
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @ 744ebfb9
......@@ -307,7 +307,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
.subscribe(ssskuPager -> {
if (mPageNum == 0 && mSkuGrpId == 0L)
mView.loadSsskuCount(ssskuPager.getTotalRow());
mView.loadSkus(ssskuPager.getList(), mPageNum == 0);
mView.loadSkus(ssskuPager, mPageNum == 0);
})
);
}
......@@ -320,7 +320,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
mCompositeDisposable.add(
ApiFactory.Sssku.querySssku(mSearchPageNum, mKeyword)
.doOnSubscribe(subscription -> mView.dismissLoadingDialog())
.subscribe(ssskuPager -> mView.loadSearchResult(ssskuPager.getList(), mSearchPageNum == 0))
.subscribe(ssskuPager -> mView.loadSearchResult(ssskuPager, mSearchPageNum == 0))
);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/ManagerFragment.java
View file @ 744ebfb9
......@@ -10,6 +10,7 @@ import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSsskuManagerBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
......@@ -75,14 +76,14 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
* @param skus 商品信息
* @param isRefresh 是否需要刷新
*/
public void loadSkus(List<Sssku> skus, boolean isRefresh) {
public void loadSkus(Pager<Sssku> skus, boolean isRefresh) {
if (isRefresh) {
mSkuAdapter.isUseEmpty(true);
mSkuAdapter.setEnableLoadMore(true);
mViewBinding.srlSku.setRefreshing(false);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(false);
mSkuAdapter.setNewData(skus.getList());
} else if (skus.getList().size() > 0) mSkuAdapter.addData(skus.getList());
if (skus.isLastPage()) mSkuAdapter.loadMoreEnd(false);
else mSkuAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/SearchFragment.java
View file @ 744ebfb9
......@@ -10,13 +10,12 @@ import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSsskuSearchBinding;
import com.xingdata.zzdpos.model.Pager;
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.ui.marketing.ms.adapter.SkuAdapter;
import java.util.List;
public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSearchBinding> {
private int mSearchType;
......@@ -73,13 +72,13 @@ public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSe
* @param skus 商品
* @param isRefresh 是否刷新
*/
public void loadSkus(List<Sssku> skus, boolean isRefresh) {
public void loadSkus(Pager<Sssku> skus, boolean isRefresh) {
if (isRefresh) {
mSkuAdapter.isUseEmpty(true);
mSkuAdapter.setEnableLoadMore(true);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
mSkuAdapter.setNewData(skus.getList());
} else if (skus.getList().size() > 0) mSkuAdapter.addData(skus.getList());
if (skus.isLastPage()) mSkuAdapter.loadMoreEnd(isRefresh);
else mSkuAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java
View file @ 744ebfb9
......@@ -50,6 +50,11 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
mPresenter.userListFragment.delUserSus();
}
@Override
public void searchOperSus(Pager<Oper> operPager) {
mPresenter.userListSearchFragment.searchOperSus(operPager);
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
Global.clickHideKeyboard(ev, this);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserContract.java
View file @ 744ebfb9
......@@ -25,6 +25,7 @@ public interface UserContract {
void addSusSus(Oper oper);
void updateUserSus(Oper oper);
void delUserSus();
void searchOperSus(Pager<Oper> operPager);
}
abstract class Presenter extends BasePresenter<View> {
......@@ -33,6 +34,5 @@ public interface UserContract {
public abstract void querySta();
public abstract void updateUser(Oper oper);
public abstract void delUser(Oper oper);
public abstract void queryUser(String wd);
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java
View file @ 744ebfb9
......@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.ui.manage.user.dialog.UserMenuDialog;
import com.xingdata.zzdpos.ui.manage.user.fragment.UserInfoEditFragment;
import com.xingdata.zzdpos.ui.manage.user.fragment.UserInfoFragment;
import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
import com.xingdata.zzdpos.ui.manage.user.fragment.UserListSearchFragment;
import java.util.ArrayList;
import java.util.Iterator;
......@@ -21,6 +22,7 @@ public class UserPresenter extends UserContract.Presenter {
public UserInfoFragment userInfoFragment = new UserInfoFragment();
public LinkedHashMap<String, String> operLevel = new LinkedHashMap<>();//用户级别 1 员工 2主管 3 店长 9老板
public UserMenuDialog userMenuDialog = new UserMenuDialog();
public UserListSearchFragment userListSearchFragment = new UserListSearchFragment();
@Override
public void onAttached() {
......@@ -50,7 +52,12 @@ public class UserPresenter extends UserContract.Presenter {
@Override
public void getUserList(String wd) {
ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
mView.queryOperSus(operPager);
if (wd==null){
mView.queryOperSus(operPager);
}else {
mView.searchOperSus(operPager);
}
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
......@@ -92,14 +99,14 @@ public class UserPresenter extends UserContract.Presenter {
});
}
@Override
public void queryUser(String wd) {
ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
mView.queryOperSus(operPager);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
// @Override
// public void queryUser(String wd) {
// ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
// mView.queryOperSus(operPager);
// }, throwable -> {
// ToastUtils.showShort(throwable.getMessage());
// });
// }
public List<String> getOperLevelList() {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java
View file @ 744ebfb9
......@@ -37,7 +37,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
@Override
public void initView() {
adapter = new UserListAdapter(getActivity(), opers,mPresenter);
adapter = new UserListAdapter(getActivity(), opers, mPresenter);
mViewBinding.userRefresh.setOnRefreshListener(this::onRefresh);
mViewBinding.userRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.userRecyclerView.setAdapter(adapter);
......@@ -48,6 +48,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
adapter.setEnableLoadMore(false);
mViewBinding.titleLayout.tvTitle.setText("店员管理");
mViewBinding.searchLayout.serchEditText.setHint("请输入手机号或者店员名称");
mViewBinding.titleLayout.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......@@ -60,18 +61,21 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
mPresenter.userInfoEditFragment.setOper(null);
start(mPresenter.userInfoEditFragment);
break;
case R.id.userSearch:
if(mViewBinding.userSearch.getText().toString().length()==0){
ToastUtils.showShort("搜索条件不能为空");
return;
}
mPresenter.queryUser( mViewBinding.searchLayout.serchEditText.getText().toString().trim());
break;
// case R.id.userSearch:
// if(mViewBinding.userSearch.getText().toString().length()==0){
// ToastUtils.showShort("搜索条件不能为空");
// return;
// }
//
// break;
// case R.id.onBack:
// getActivity().finish();
// break;
}
});
mViewBinding.searchLayout.serchEditText.setOnClickListener(view -> {
start( mPresenter.userListSearchFragment);
});
onRefresh();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListSearchFragment.java 0 → 100644
View file @ 744ebfb9
package com.xingdata.zzdpos.ui.manage.user.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentUserListBinding;
import com.xingdata.zzdpos.databinding.FragmentUserSearchListBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
import com.xingdata.zzdpos.ui.manage.user.adapter.UserListAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
/**
* 店员管理界面
*/
public class UserListSearchFragment extends BaseFragment<UserPresenter, FragmentUserSearchListBinding> {
private UserListAdapter adapter;
private List<Oper> opers = new ArrayList<>();
@Override
public int getLayoutId() {
return R.layout.fragment_user_search_list;
}
@Override
public void initView() {
adapter = new UserListAdapter(getActivity(), opers, mPresenter);
mViewBinding.userRefresh.setOnRefreshListener(this::onRefresh);
mViewBinding.userRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.userRecyclerView.setAdapter(adapter);
adapter.setOnItemClickListener((adapter, view, position) -> {
mPresenter.userInfoFragment.setOper((Oper) adapter.getData().get(position));
start(mPresenter.userInfoFragment);
});
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
adapter.setEnableLoadMore(false);
mViewBinding.vipSearch.requestFocus();
mViewBinding.vipSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (EditorInfo.IME_ACTION_SEARCH == i) {
if (textView.getText().toString().trim().length() == 0) {
ToastUtils.showShort("搜索条件不能");
return true;
}
mPresenter.getUserList(textView.getText().toString().trim());
}
return false;
});
mViewBinding.ivBack.setOnClickListener(view -> {
pop();
});
onRefresh();
}
private void onLoadMore() {
}
public void onRefresh() {
mPresenter.getUserList(null);
mPresenter.querySta();
}
public void searchOperSus(Pager<Oper> operPager) {
adapter.setNewData(operPager.getList());
adapter.setEnableLoadMore(false);
adapter.loadMoreComplete();
mViewBinding.userRefresh.setRefreshing(false);
if (operPager.getTotalPage() == 0) {
ToastUtils.showShort("沒有搜索到店员信息");
}
}
@Override
public void onResume() {
super.onResume();
mViewBinding.vipSearch.setText("");
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
View file @ 744ebfb9
......@@ -2,9 +2,7 @@ package com.xingdata.zzdpos.ui.marketing.ms;
import android.view.MotionEvent;
import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
......@@ -12,6 +10,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.ActivityMsBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.AddFragment;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.EditorFragment;
......@@ -47,13 +46,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
this.loadRootFragment(R.id.f_ms, mManagerFragment);
mViewBinding.setTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_SEARCH) {
KeyboardUtils.hideSoftInput(textView);
mPresenter.clickSearchButton(textView.getText().toString());
}
return false;
});
mViewBinding.vSearch.setOnSearchListener(keyword -> mPresenter.clickSearchButton(keyword));
}
@Override
......@@ -66,7 +59,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
}
@Override
public void loadMss(List<Ms> mss, boolean isRefresh) {
public void loadMss(Pager<Ms> mss, boolean isRefresh) {
mManagerFragment.loadMss(mss, isRefresh);
}
......@@ -92,12 +85,15 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
@Override
public void showSearchFragment(int searchType) {
this.showTitleBarByTitleMode(searchType);
mViewBinding.vSearch.clear();
mViewBinding.vSearch.showSoftInput();
this.start(mSearchFragment.setKeyword("").setSearchType(searchType));
}
@Override
public void showSearchFragment(String keyword, int searchType) {
this.showTitleBarByTitleMode(searchType);
mViewBinding.vSearch.setText(keyword);
this.start(mSearchFragment.setKeyword(keyword).setSearchType(searchType));
}
......@@ -196,13 +192,13 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
private void showTitleBarByTitleMode(int titleMode) {
if (mViewBinding.getTitleMode() == titleMode) return;
mViewBinding.setTitleMode(titleMode);
mViewBinding.etSearch.setText("");
mViewBinding.vSearch.clear();
switch (titleMode) {
case C.TITLE_MODE.SKU:
mViewBinding.etSearch.setHint(R.string.ms_editor_type_gift_search_hint);
mViewBinding.vSearch.setHint(getString(R.string.ms_editor_type_gift_search_hint));
break;
case C.TITLE_MODE.GIFT:
mViewBinding.etSearch.setHint(R.string.ms_editor_type_gift_search_hint);
mViewBinding.vSearch.setHint(getString(R.string.ms_editor_type_gift_search_hint));
break;
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java
View file @ 744ebfb9
......@@ -4,6 +4,7 @@ import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
......@@ -24,7 +25,7 @@ interface MsContract {
/**
* 加载营销计划数据
*/
void loadMss(List<Ms> mss, boolean isRefresh);
void loadMss(Pager<Ms> mss, boolean isRefresh);
/**
* 显示添加页面
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
View file @ 744ebfb9
......@@ -219,7 +219,7 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
* 获取营销计划
*/
private void getMs() {
mCompositeDisposable.add(ApiFactory.Ms.query(mPageNum).subscribe(msPager -> mView.loadMss(msPager.getList(), mPageNum == 1)));
mCompositeDisposable.add(ApiFactory.Ms.query(mPageNum).subscribe(msPager -> mView.loadMss(msPager, mPageNum == 1)));
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java
View file @ 744ebfb9
......@@ -6,18 +6,16 @@ import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsManagerBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.adapter.MsAdapter;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import java.util.List;
public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManagerBinding> {
private MsAdapter mMsAdapter;
......@@ -65,14 +63,14 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
* @param mss 营销计划
* @param isRefresh 是否刷新
*/
public void loadMss(List<Ms> mss, boolean isRefresh) {
public void loadMss(Pager<Ms> mss, boolean isRefresh) {
if (isRefresh) {
mMsAdapter.isUseEmpty(true);
mMsAdapter.setEnableLoadMore(true);
mViewBinding.srlMs.setRefreshing(false);
mMsAdapter.setNewData(mss);
} else if (mss.size() > 0) mMsAdapter.addData(mss);
if (mss.size() <= C.PRODUCT.PAGE_SIZE) mMsAdapter.loadMoreEnd(isRefresh);
mMsAdapter.setNewData(mss.getList());
} else if (mss.getList().size() > 0) mMsAdapter.addData(mss.getList());
if (mss.isLastPage()) mMsAdapter.loadMoreEnd(isRefresh);
else mMsAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentPresenter.java
View file @ 744ebfb9
......@@ -9,7 +9,7 @@ public class PaymentPresenter extends PaymentContract.Presenter {
@Override
public void clickSettle(Long amt) {
if (amt > 99999999999L) {
mView.showMsg("金额不合法,请重新输入");
mView.showMsg("您填写的金额超出范围");
} else {
mView.showSettle(amt);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/view/InputerView.java
View file @ 744ebfb9
......@@ -62,7 +62,7 @@ public class InputerView<P extends BasePresenter> extends BaseFragment<P, ViewIn
}
String str = ((TextView) view).getText().toString();
//限制位数
if (str.matches("[0-9]+") && mValue.split("[.]").length > 1 && mValue.split("[.]")[1].length() == 2)
if (str.matches("[0-9]+") && ((!mValue.contains(".") && mValue.length() == 6) || (mValue.split("[.]").length > 1 && mValue.split("[.]")[1].length() == 2)))
return;
//限制小数点
if ((mValue.length() == 0 || mValue.contains(".")) && str.matches("[.]"))
......
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @ 744ebfb9
......@@ -18,6 +18,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.ActivityStoreBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sskugrp;
......@@ -82,7 +83,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
}
@Override
public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
public <Sku extends BaseSku> void loadSkus(Pager<Sku> skus, boolean isRefresh) {
mStoreFragment.loadSkus(skus, isRefresh);
}
......@@ -103,7 +104,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
}
@Override
public <Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh) {
public <Sku extends BaseSku> void loadSearchResult(Pager<Sku> skus, boolean isRefresh) {
mSearchFragment.loadSkus(skus, isRefresh);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreContract.java
View file @ 744ebfb9
......@@ -4,6 +4,7 @@ import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sskugrp;
......@@ -28,7 +29,7 @@ interface StoreContract {
* @param isRefresh 是否刷新列表
* @param <Sku> 商品类型
*/
<Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh);
<Sku extends BaseSku> void loadSkus(Pager<Sku> skus, boolean isRefresh);
/**
* 加载商品分组
......@@ -58,7 +59,7 @@ interface StoreContract {
* @param isRefresh 是否刷新列表
* @param <Sku> 商品类型
*/
<Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh);
<Sku extends BaseSku> void loadSearchResult(Pager<Sku> skus, boolean isRefresh);
/**
* 加载订单信息
......
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/SearchFragment.java
View file @ 744ebfb9
......@@ -14,11 +14,11 @@ import android.widget.TextView;
import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.FragmentStoreSearchBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.ui.store.adapter.SkuAdapter;
......@@ -83,13 +83,13 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe
* @param isRefresh 是否刷新
* @param <Sku> 商品类型
*/
public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
public <Sku extends BaseSku> void loadSkus(Pager<Sku> skus, boolean isRefresh) {
if (isRefresh) {
mSkuAdapter.isUseEmpty(true);
mSkuAdapter.setEnableLoadMore(true);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
mSkuAdapter.setNewData(skus.getList());
} else if (skus.getList().size() > 0) mSkuAdapter.addData(skus.getList());
if (skus.isLastPage()) mSkuAdapter.loadMoreEnd(false);
else mSkuAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
View file @ 744ebfb9
......@@ -21,6 +21,7 @@ import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.FragmentStoreBinding;
import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.ui.store.StorePresenter;
......@@ -210,14 +211,14 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
* @param isRefresh 是否刷新
* @param <Sku> 商品类型
*/
public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
public <Sku extends BaseSku> void loadSkus(Pager<Sku> skus, boolean isRefresh) {
if (isRefresh) {
mSkuAdapter.isUseEmpty(true);
mSkuAdapter.setEnableLoadMore(true);
mViewBinding.srlSku.setRefreshing(false);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(false);
mSkuAdapter.setNewData(skus.getList());
} else if (skus.getList().size() > 0) mSkuAdapter.addData(skus.getList());
if (skus.isLastPage()) mSkuAdapter.loadMoreEnd(false);
else mSkuAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ 744ebfb9
......@@ -100,7 +100,7 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override
public void rechangeSus(Vip v) {
ViewTools.toastSuss(this, "充值成功");
mPresenter.vipRechargeFragment.pop();
popTo(mPresenter.vipListFragment.getClass(),false);
mPresenter.vipListFragment.onRefresh();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipAddSucceedFragment.java
View file @ 744ebfb9
......@@ -38,21 +38,23 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
//继续添加
mViewBinding.vipAdd.setOnClickListener(view -> {
mPresenter.vipInfoEditFragment.setVip(null);
startWithPop(mPresenter.vipInfoEditFragment);
popTo(mPresenter.vipInfoEditFragment.getClass(),false);
// start(mPresenter.vipInfoEditFragment);
});
//充值
mViewBinding.vipRecharge.setOnClickListener(view -> {
mPresenter.vipRechargeFragment.setVip(mVip);
startWithPop(mPresenter.vipRechargeFragment);
start(mPresenter.vipRechargeFragment);
});
mViewBinding.vipSure.setOnClickListener(view -> {
mPresenter.vipListFragment.updateVipSus(null);
});
//返回强制出堆栈
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
popTo(mPresenter.vipListFragment.getClass(),false);
});
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ 744ebfb9
......@@ -235,7 +235,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
vipListAdapter.notifyDataSetChanged();
pageNumber = 0;
// ToastUtils.showShort("没有更多数据");
return;
// return;
}
vipListAdapter.addData(vipPager.getList());
pageNumber = vipPager.getPageNumber() + 1;
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java
View file @ 744ebfb9
......@@ -57,14 +57,15 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
@Override
public void initView() {
setMoney("0","0");
setMoney("0", "0");
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.tvTitle.setText("充值");
mViewBinding.vipBalance.setText(getString(R.string.vip_balance_text, ConvertUtil.fenToYuan2(mVip.getAcctCbal())));
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
// pop();
popTo(mPresenter.vipListFragment.getClass(), false);
});
mPresenter.getMscardList(mVip.getVipId());
mPayAdapter = new PayAdapter();
......@@ -96,24 +97,22 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
public void onGlobalLayout() {
mViewBinding.payMoneyLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
ViewTreeObserver observer = mViewBinding.payMoneyLayout.getViewTreeObserver();
inWight = mViewBinding.payMoneyLayout.getWidth();
inWight = mViewBinding.payMoneyLayout.getWidth();
mPresenter.initSettle();
}
});
}
@Override
public boolean onBackPressedSupport() {
pop();
popTo(mPresenter.vipListFragment.getClass(), false);
return true;
}
public void setVip(Vip mVip) {
this.mVip = mVip;
}
......@@ -124,8 +123,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
mscards.clear();
mscards.addAll(mscardPager.getList());
layoutParams = new LinearLayout.LayoutParams(inWight/3, LinearLayout.LayoutParams.MATCH_PARENT, 1);
layoutParams = new LinearLayout.LayoutParams(inWight / 3, LinearLayout.LayoutParams.MATCH_PARENT, 1);
layoutParams.setMargins(0, 0, 20, 0);
int mscardLength = 0;
if (mscards.size() <= 3) {
......@@ -141,6 +139,9 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
mViewBinding.payMoneyLayout.addView(radioButton);
}
if (mViewBinding.payMoneyLayout.getChildCount() != 0) {
mViewBinding.payMoneyLayout.setVisibility(View.VISIBLE);
}
String hintStr = "自定义金额";
SpannableString ss = new SpannableString(hintStr);
......@@ -157,10 +158,12 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
}
});
//输入监听
mViewBinding.stealMoney.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
......@@ -169,8 +172,11 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
@Override
public void afterTextChanged(Editable editable) {
if (mViewBinding.stealMoney.getText().length() == 0){
setMoney("0","0");
if (!mViewBinding.stealMoney.hasFocus()){
return;
}
if (mViewBinding.stealMoney.getText().length() == 0 ) {
setMoney("0", "0");
return;
}
......@@ -197,9 +203,9 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
*/
private void setMoney(String rechangeMoney, String sendMoney) {
mViewBinding.sendAmt.setText(sendMoney);
mViewBinding.rechargAMT.setText(rechangeMoney);
// mViewBinding.rechangeMoney.setText(rechangeMoney);
mViewBinding.recargeAccount.setText(ConvertUtil.fenToYuan2(ConvertUtil.yuanToFen(sendMoney) + ConvertUtil.yuanToFen(rechangeMoney)));
mViewBinding.rechargAMT.setText(rechangeMoney);
}
......
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ 744ebfb9
......@@ -29,7 +29,7 @@ public final class SystemUtil {
*/
public static String getDeviceModel() {
// return DeviceUtils.getModel();
return "MI5";
return "X990";
}
......@@ -58,7 +58,7 @@ public final class SystemUtil {
}
}
// return deviceSN;
return "5484965656";
return "5536bef2";
}
/**
......
app/src/main/java/com/xingdata/zzdpos/view/SearchBar.java
View file @ 744ebfb9
......@@ -63,6 +63,13 @@ public class SearchBar extends ConstraintLayout {
KeyboardUtils.showSoftInput(mViewBinding.etSearch);
}
/**
* 隐藏软键盘
*/
public void hideSoftInput() {
KeyboardUtils.hideSoftInput(mViewBinding.etSearch);
}
public SearchBar(Context context, AttributeSet attrs) {
super(context, attrs);
mViewBinding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.view_search_bar, this, true);
......
app/src/main/res/layout/activity_ms.xml
View file @ 744ebfb9
......@@ -33,25 +33,16 @@
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
<LinearLayout
<com.xingdata.zzdpos.view.SearchBar
android:id="@+id/v_search"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:visibility="@{titleMode>1?0:8}"
app:layout_constraintBottom_toTopOf="parent"
android:layout_height="0dp"
android:visibility="@{titleMode>1?View.VISIBLE:View.INVISIBLE}"
app:inputType="text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="parent">
<EditText
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search" />
</LinearLayout>
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
......
app/src/main/res/layout/activity_sssku.xml
View file @ 744ebfb9
......@@ -37,25 +37,16 @@
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
<LinearLayout
<com.xingdata.zzdpos.view.SearchBar
android:id="@+id/v_search"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?8:0}"
app:layout_constraintBottom_toTopOf="parent"
android:layout_height="0dp"
android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?View.GONE:View.VISIBLE}"
app:inputType="text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="parent">
<EditText
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search" />
</LinearLayout>
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
......@@ -65,7 +56,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||titleMode==9||titleMode==10?0:8}"
android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?View.VISIBLE:View.GONE}"
app:layout_constraintLeft_toRightOf="parent"
app:layout_constraintRight_toLeftOf="parent" />
......@@ -93,7 +84,7 @@
android:gravity="center"
android:padding="@dimen/all_margin"
android:src="@mipmap/click_down"
android:visibility="@{titleMode==6?0:8}"
android:visibility="@{titleMode==6?View.VISIBLE:View.GONE}"
app:layout_constraintRight_toRightOf="parent" />
<ImageButton
......
app/src/main/res/layout/fragment_user_list.xml
View file @ 744ebfb9
......@@ -13,15 +13,23 @@
android:layout_height="match_parent"
android:orientation="vertical">
<include
android:id="@+id/title_layout"
layout="@layout/title" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<include
android:id="@+id/title_layout"
layout="@layout/title" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:background="@drawable/up_down_line_white_bottom"
android:gravity="center_vertical"
android:orientation="horizontal">
<include
......@@ -30,6 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:id="@+id/userSearch"
style="@style/textView_body_small"
......
app/src/main/res/layout/fragment_user_search_list.xml 0 → 100644
View file @ 744ebfb9
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="android.view.View.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@drawable/up_down_line_white_bottom"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_back"
android:layout_width="wrap_content"
android:padding="@dimen/all_margin"
android:layout_height="wrap_content"
android:background="@mipmap/go_back" />
<EditText
android:id="@+id/vip_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:imeOptions="actionSearch"
android:hint="请输入手机或者店员名称"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search" />
</LinearLayout>
<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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/user_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/userRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @ 744ebfb9
......@@ -139,7 +139,7 @@
style="@style/default_blacktext_bigstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="晋级标准" />
android:text="本级标准" />
</LinearLayout>
<View
......
app/src/main/res/layout/fragment_vip_level_list.xml
View file @ 744ebfb9
......@@ -27,6 +27,7 @@
<LinearLayout
android:visibility="gone"
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="58dp"
......
app/src/main/res/layout/fragment_vip_recharge.xml
View file @ 744ebfb9
......@@ -95,6 +95,7 @@
android:layout_height="50dp"
android:layout_marginBottom="@dimen/all_margin"
android:gravity="center_vertical"
android:visibility="gone"
android:onCheckedChanged="@{onCheckedChangeListener}"
android:orientation="horizontal"></RadioGroup>
......@@ -126,7 +127,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@null"
android:digits="1234567890."
android:digits="1234567890"
android:inputType="phone"
android:maxLength="6"
android:onClick="@{onClickListener}"
......
app/src/main/res/layout/item_user_list_item.xml
View file @ 744ebfb9
......@@ -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
......@@ -87,9 +88,6 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/line_layout.xml
View file @ 744ebfb9
......@@ -2,5 +2,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/black_likui"
android:background="@color/gray_huanggai"
></LinearLayout>
\ No newline at end of file
app/src/main/res/layout/line_layout_margin.xml
View file @ 744ebfb9
......@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/line_bg"
android:background="@color/gray_huanggai"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
></LinearLayout>
\ No newline at end of file
app/src/main/res/layout/title_search.xml
View file @ 744ebfb9
......@@ -19,6 +19,7 @@
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:imeOptions="actionSearch"
android:layout_marginEnd="@dimen/all_padding"
android:drawablePadding="@dimen/all_padding"
android:hint="请输入手机号或会员姓名"
......
app/src/main/res/values/strings.xml
View file @ 744ebfb9
......@@ -451,7 +451,7 @@
<string name="tv_bale_edit_count"> 共 %s 件</string>
<string name="money">￥ %s </string>
<!--会员管理-->
<string name="adv_plan"> 晋级标准：消费金额满 %s</string>
<string name="adv_plan"> 本级标准：消费金额满 %s</string>
<string name="level_Number">共有 %s个会员等级</string>
<string name="vip_level_title">等级设置</string>
<string name="vip_mscard_period_of_validity">有效期：%s-%s</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