Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -1233,6 +1233,7 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
     }
 
     public static class Ver {

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

@@ -21,9 +21,12 @@ public interface UserContract {
 
     interface View extends BaseView {
         void queryOperSus(Pager<Oper> operPager);
+        void querySta(Sta sta);
     }
 
     abstract class Presenter extends BasePresenter<View> {
         public abstract void getUserList(String wd);
+        public abstract  void addUser(Oper oper);
+        public abstract  void querySta();
     }
 }
\ No newline at end of file

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

@@ -2,10 +2,12 @@ package com.xingdata.zzdpos.ui.manage.user;
 
 
 import com.xingdata.zzdpos.api.ApiFactory;
+import com.xingdata.zzdpos.model.Oper;
 import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
 
 public class UserPresenter extends UserContract.Presenter {
-   public UserListFragment userListFragment = new UserListFragment();
+    public UserListFragment userListFragment = new UserListFragment();
+
     @Override
     public void onAttached() {
 
@@ -15,9 +17,29 @@ public class UserPresenter extends UserContract.Presenter {
     @Override
     public void getUserList(String wd) {
         ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
+            mView.queryOperSus(operPager);
+        }, throwable -> {
+
+        });
+    }
+
+    @Override
+    public void addUser(Oper oper) {
+        ApiFactory.Oper.addOper(oper).subscribe(operPager -> {
+
+        }, throwable -> {
 
-        },throwable -> {
+        });
+    }
+
+    @Override
+    public void querySta() {
+        ApiFactory.Sta.querySta().subscribe(sta -> {
+
+        }, throwable -> {
 
         });
     }
+
+
 }

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

@@ -28,5 +28,10 @@ public class UserListAdapter extends BaseAdapter<Oper, ItemUserListItemBinding>
 
     @Override
     protected void convert(ItemUserListItemBinding mViewBinding, Oper item) {
+
+        mViewBinding.userName.setText(item.getOperName());
+        mViewBinding.userMobile.setText(String.valueOf(item.getOperMobile()));
+
+
     }
 }

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

@@ -53,6 +53,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
         });
         adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
         adapter.setEnableLoadMore(true);
+        adapter.loadMoreComplete();
 
         mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
             getActivity().finish();

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -25,8 +25,8 @@ public final class SystemUtil {
      * @return 设备型号
      */
     public static String getDeviceModel() {
-        return DeviceUtils.getModel();
-
+//        return DeviceUtils.getModel();
+        return "AECRC10";
     }