Skip to content

T
TangKuPos
Commit d3b97de8 authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java
#	app/src/main/res/layout/fragment_user_list.xml
parents ddd1dbb9 4152563f
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 74 deletions
.idea/gradle.xml
View file @ d3b97de8
......@@ -3,6 +3,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java
View file @ d3b97de8
......@@ -99,25 +99,6 @@ 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());
// });
// }
// public List<String> getOperLevelList() {
// ArrayList<String> operLevelList = new ArrayList<>();
// Iterator<Map.Entry<String, String>> iterator = operLevel.entrySet().iterator();
// while (iterator.hasNext()) {
// operLevelList.add(iterator.next().getKey());
// }
// return operLevelList.subList(0, operLevelList.size() - 1);
// }
/**
* 获取下拉列表
* @return
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java
View file @ d3b97de8
......@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.databinding.FragmentUserInfoEditBinding;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -36,9 +37,9 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
@Override
public void initView() {
if (oper == null) {
mViewBinding.infoTitle.tvTitle.setText("新增店员");
mViewBinding.infoTitle.tvTitle.setText(getString(R.string.user_tv_titleAdd));
} else {
mViewBinding.infoTitle.tvTitle.setText("编辑店员");
mViewBinding.infoTitle.tvTitle.setText(getString(R.string.user_tv_titleEdit));
mViewBinding.userName.setText(oper.getOperName());
mViewBinding.userName.setSelection(oper.getOperName().length());
mViewBinding.userPhone.setText(String.valueOf(oper.getOperMobile()));
......@@ -55,20 +56,24 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
Oper mOper = new Oper();
if (mViewBinding.userName.getText().length() == 0) {
ToastUtils.showShort(R.string.login_valid_data);
mViewBinding.userName.requestFocus();
// ToastUtils.showShort("店员名称不能为空");
return;
}
if (mViewBinding.userPhone.getText().length() == 0) {
ToastUtils.showShort(R.string.login_valid_data);
mViewBinding.userPhone.requestFocus();
// ToastUtils.showShort("店员帐号不能为空");
return;
}
if (mViewBinding.userPhone.getText().length() != 11) {
ToastUtils.showShort(R.string.login_valid_data);
mViewBinding.userPhone.requestFocus();
// ToastUtils.showShort("店员帐号长度必须11位");
return;
}
if (mViewBinding.userLevel.getText().length() == 0) {
ToastUtils.showShort(R.string.login_valid_data);
mViewBinding.userLevel.requestFocus();
// ToastUtils.showShort("店员等级不能为空");
return;
}
......@@ -108,7 +113,7 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
public void onOptionsSelect(int options1, int options2, int options3, View v) {
mViewBinding.userLevel.setText(strLevels.get(options1));
}
}).setTitleText(getString(R.string.all_select))
}).setTitleText(getString(R.string.user_tv_dialogTitle))
.setDividerColor(Color.BLACK)
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
.setContentTextSize(20)
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoFragment.java
View file @ d3b97de8
......@@ -32,7 +32,7 @@ public class UserInfoFragment extends BaseFragment<UserPresenter, FragmentUserIn
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("店员详情");
mViewBinding.infoTitle.tvTitle.setText(getString(R.string.user_tv_operDetail));
mViewBinding.userName.setText(oper.getOperName());
mViewBinding.userPhone.setText(String.valueOf(oper.getOperMobile()));
mViewBinding.userLevel.setText(mPresenter.getOperLevelName(oper.getOperLevel().toString()));
......@@ -68,27 +68,6 @@ public class UserInfoFragment extends BaseFragment<UserPresenter, FragmentUserIn
}
//
// /**
// * 弹出选择会员P
// */
// private void ShowPickerViewStoreAddress() {// 弹出选择器
// OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
// OptionsPickerView.OnOptionsSelectListener() {
// @Override
// public void onOptionsSelect(int options1, int options2, int options3, View v) {
// mViewBinding.userLevel.setText(mPresenter.getOperLevelList().get(options1));
// }
// }).setTitleText("请选择")
// .setDividerColor(Color.BLACK)
// .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
// .setContentTextSize(20)
// .build();
//
// pvOptions.setPicker(mPresenter.getOperLevelList());
// pvOptions.show();
// }
@Override
public boolean onBackPressedSupport() {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java
View file @ d3b97de8
......@@ -47,8 +47,8 @@ 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.tvTitle.setText(getString(R.string.user_tv_title));
mViewBinding.searchLayout.serchEditText.setHint(getString(R.string.user_tv_searchHint));
mViewBinding.titleLayout.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......@@ -61,16 +61,7 @@ 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;
// }
//
// break;
// case R.id.onBack:
// getActivity().finish();
// break;
}
});
mViewBinding.searchLayout.serchEditText.setOnClickListener(view -> {
......
app/src/main/res/layout/fragment_user_info.xml
View file @ d3b97de8
......@@ -41,7 +41,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:text="姓名：" />
android:text="@string/user_tv_name" />
<TextView
android:id="@+id/user_name"
......@@ -63,7 +63,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:text="帐号：" />
android:text="@string/user_tv_account" />
<TextView
android:id="@+id/user_phone"
......@@ -92,7 +92,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:text="级别：" />
android:text="@string/user_tv_level" />
<TextView
android:id="@+id/user_Level"
......
app/src/main/res/layout/fragment_user_info_edit.xml
View file @ d3b97de8
......@@ -47,7 +47,7 @@
android:layout_width="72dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="姓名：" />
android:text="@string/user_tv_name"/>
<EditText
android:id="@+id/user_name"
......@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:hint="请输入姓名" />
android:hint="@string/user_et_nameHint" />
</LinearLayout>
<include layout="@layout/line_layout_margin" />
......@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:maxLength="11"
android:text="帐号：" />
android:text="@string/user_tv_account" />
<EditText
android:id="@+id/user_phone"
......@@ -82,7 +82,7 @@
android:layout_height="wrap_content"
android:background="@null"
android:digits="0123456789"
android:hint="请输入手机号"
android:hint="@string/user_et_accountHint"
android:inputType="phone"
android:maxLength="11" />
......@@ -110,7 +110,7 @@
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="72dp"
android:layout_height="wrap_content"
android:text="级别：" />
android:text="@string/user_tv_level" />
<TextView
android:id="@+id/user_Level"
......@@ -129,7 +129,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin_left"
android:text="注：店员初始密码为000000"
android:text="@string/user_tv_toast"
android:textSize="@dimen/small_text_size" />
<RelativeLayout
......
app/src/main/res/layout/fragment_user_list.xml
View file @ d3b97de8
......@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="店员数量" />
android:text="@string/user_tv_operNum" />
<TextView
style="@style/default_blacktext_smallstyle"
......@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/member_today_cnt" />
android:text="@string/user_tv_todayAdd" />
</LinearLayout>
<LinearLayout
......@@ -128,7 +128,7 @@
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加店员"
android:text="@string/user_tv_titleAdd"
android:textColor="@color/deep_red" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_user_search_list.xml
View file @ d3b97de8
......@@ -33,7 +33,7 @@
style="@style/searchBarEditor"
android:layout_width="0dp"
android:imeOptions="actionSearch"
android:hint="请输入手机或者店员名称"
android:hint="@string/user_tv_searchHint"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search" />
......@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:onClick="@{onClickListener}"
android:text="搜索" />
android:text="@string/user_tv_search" />
</LinearLayout>
......
app/src/main/res/values-en/strings_chen.xml
View file @ d3b97de8
......@@ -3,6 +3,21 @@
<!--店员管理-->
<string name="user_toast_changeSuc">successfully updated</string>
<string name="user_toast_ifDeleteUser">Whether to delete the clerk？</string>
<string name="user_tv_name">name：</string>
<string name="user_et_nameHint"> </string>
<string name="user_tv_account">account：</string>
<string name="user_et_accountHint"> </string>
<string name="user_tv_level">level:</string>
<string name="user_tv_toast">The initial password of the clerk is 000000</string>
<string name="user_tv_titleAdd">New clerk</string>
<string name="user_tv_titleEdit">Edit clerk info</string>
<string name="user_tv_dialogTitle">Please select</string>
<string name="user_tv_operDetail">Clerk details</string>
<string name="user_tv_title">Clerk management</string>
<string name="user_tv_searchHint">Please enter your mobile number or clerk name</string>
<string name="user_tv_operNum">Number of clerk</string>
<string name="user_tv_todayAdd">Added today</string>
<string name="user_tv_search">search</string>
<!--商品管理-->
......
app/src/main/res/values-zh/strings_chen.xml
View file @ d3b97de8
......@@ -3,6 +3,22 @@
<!--店员管理-->
<string name="user_toast_changeSuc">修改成功</string>
<string name="user_toast_ifDeleteUser">确定是否删除店员？</string>
<string name="user_tv_name">姓名：</string>
<string name="user_et_nameHint">请输入姓名</string>
<string name="user_tv_account">帐号：</string>
<string name="user_et_accountHint">请输入手机号</string>
<string name="user_tv_level">级别:</string>
<string name="user_tv_toast">注：店员初始密码为000000</string>
<string name="user_tv_titleAdd">新增店员</string>
<string name="user_tv_titleEdit">编辑店员</string>
<string name="user_tv_dialogTitle">请选择</string>
<string name="user_tv_operDetail">店员详情</string>
<string name="user_tv_title">店员管理</string>
<string name="user_tv_searchHint">请输入手机号或者店员名称</string>
<string name="user_tv_operNum">店员数量</string>
<string name="user_tv_todayAdd">今日新增</string>
<string name="user_tv_search">搜索</string>
<!--商品管理-->
......
app/src/main/res/values/strings_chen.xml
View file @ d3b97de8
......@@ -3,6 +3,21 @@
<!--店员管理-->
<string name="user_toast_changeSuc">修改成功</string>
<string name="user_toast_ifDeleteUser">确定是否删除店员？</string>
<string name="user_tv_name">姓名：</string>
<string name="user_et_nameHint">请输入姓名</string>
<string name="user_tv_account">帐号：</string>
<string name="user_et_accountHint">请输入手机号</string>
<string name="user_tv_level">级别:</string>
<string name="user_tv_toast">注：店员初始密码为000000</string>
<string name="user_tv_titleAdd">新增店员</string>
<string name="user_tv_titleEdit">编辑店员</string>
<string name="user_tv_dialogTitle">请选择</string>
<string name="user_tv_operDetail">店员详情</string>
<string name="user_tv_title">店员管理</string>
<string name="user_tv_searchHint">请输入手机号或者店员名称</string>
<string name="user_tv_operNum">店员数量</string>
<string name="user_tv_todayAdd">今日新增</string>
<string name="user_tv_search">搜索</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