Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -81,5 +81,7 @@ dependencies {
     compile 'com.github.ybq:Android-SpinKit:1.1.0'
     compile 'com.youth.banner:banner:1.4.10'
     compile 'cn.jzvd:jiaozivideoplayer:6.0.0'
+    compile 'me.dm7.barcodescanner:zxing:1.9.8'
+    compile 'com.google.zxing:core:3.3.1'
     compile(name: 'zx_print_library-debug', ext: 'aar')
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java

@@ -36,12 +36,14 @@ public class UserPresenter extends UserContract.Presenter {
 
 
     public String getOperLevelName(String strLevel) {
-        Iterator<Map.Entry<String, String>> iterator = operLevel.entrySet().iterator();
-        while (iterator.hasNext()) {
-            if (iterator.next().getValue().equals(strLevel))
-                return iterator.next().getKey();
+        Iterator it = operLevel.entrySet().iterator();
+        while (it.hasNext()) {
+            Map.Entry entity = (java.util.Map.Entry) it.next();
+            if (entity.getValue().equals(strLevel)) {
+                return entity.getKey().toString();
+            }
         }
-        return "";
+        return "未知";
     }
 
 
@@ -97,6 +99,6 @@ public class UserPresenter extends UserContract.Presenter {
         while (iterator.hasNext()) {
             operLevelList.add(iterator.next().getKey());
         }
-        return operLevelList;
+        return operLevelList.subList(0,operLevelList.size()-1);
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/dialog/UserMenuDialog.java

@@ -65,6 +65,8 @@ public class UserMenuDialog extends BaseSheetDialog<UserPresenter, DialogUserMen
                             }).show((BaseActivity) getActivity());
                     break;
             }
+
+            dismiss();
         });
 
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java

@@ -71,21 +71,21 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                     if (oper == null) {
                         oper = new Oper();
                     }
-                    if (mViewBinding.userLevel.getText().length()==0)
-                    {
-                        ToastUtils.showShort("会员等级不能为空");
+
+                    if (mViewBinding.userName.getText().length() == 0) {
+                        ToastUtils.showShort("会员名称不能为空");
                         return;
                     }
-                    if (mViewBinding.userPhone.getText().length()==0)
-                    {
+                    if (mViewBinding.userPhone.getText().length() == 0) {
                         ToastUtils.showShort("会员帐号不能为空");
                         return;
                     }
-                    if (mViewBinding.userName.getText().length()==0)
-                    {
-                        ToastUtils.showShort("会员名称不能为空");
+
+                    if (mViewBinding.userLevel.getText().length() == 0) {
+                        ToastUtils.showShort("会员等级不能为空");
                         return;
                     }
+
                     oper.setOperLevel(Byte.valueOf(mPresenter.operLevel.get(mViewBinding.userLevel.getText().toString())));
                     oper.setOperMobile(Long.parseLong(mViewBinding.userPhone.getText().toString()));
                     oper.setOperName(mViewBinding.userName.getText().toString());

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java

@@ -46,6 +46,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
     @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) -> {
@@ -80,6 +81,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
         adapter.setNewData(operPager.getList());
         adapter.setEnableLoadMore(false);
         adapter.loadMoreComplete();
+        mViewBinding.userRefresh.setRefreshing(false);
     }
 
 

app/src/main/res/layout/fragment_user_info_edit.xml

@@ -101,10 +101,6 @@
             android:layout_height="1dp"
             android:background="@color/line_bg" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
 
         <LinearLayout
             android:layout_width="match_parent"