修改会员充值

app/src/main/AndroidManifest.xml

@@ -118,6 +118,11 @@
             android:name=".ui.manage.inventory.InventoryActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity
+            android:name=".ui.manage.user.UserActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageMenuActivity.java

@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.ui.manage.inventory.InventoryActivity;
 import com.xingdata.zzdpos.ui.manage.otherselect.OtherSelectActivity;
 import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
+import com.xingdata.zzdpos.ui.manage.user.UserActivity;
 import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -57,7 +58,7 @@ public class ManageMenuActivity extends AppCompatActivity {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 switch (marketingMenuAdapter.getData().get(position)) {
                     case C.MENU.MENU_MANAGER_OPER: {
-
+                        ActivityUtils.startActivity(ManageMenuActivity.this, UserActivity.class);
                     }
                     break;
                     case C.MENU.MENU_MANAGER_GOODS: {

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

+package com.xingdata.zzdpos.ui.manage.user;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.databinding.ActivityUserBinding;
+import com.xingdata.zzdpos.databinding.ActivityVipBinding;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Mscard;
+import com.xingdata.zzdpos.model.Oper;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Pay;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Sta;
+import com.xingdata.zzdpos.model.Ticket;
+import com.xingdata.zzdpos.model.Trule;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.dialog.PromptDialog;
+import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
+import com.xingdata.zzdpos.ui.vip.VipContract;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+import com.xingdata.zzdpos.view.ViewTools;
+
+import java.util.List;
+
+public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBinding> implements UserContract.View {
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_user;
+    }
+    @Override
+    public void initView() {
+        loadRootFragment(R.id.user_frame, mPresenter.userListFragment, true, false);
+    }
+    @Override
+    public void queryOperSus(Pager<Oper> operPager) {
+        mPresenter.userListFragment.queryOperSus(operPager);
+    }
+}

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

+package com.xingdata.zzdpos.ui.manage.user;
+
+import com.xingdata.zzdpos.base.BasePresenter;
+import com.xingdata.zzdpos.base.BaseView;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Mscard;
+import com.xingdata.zzdpos.model.Oper;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Pay;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Sta;
+import com.xingdata.zzdpos.model.Ticket;
+import com.xingdata.zzdpos.model.Trule;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.model.VipRechargeOrder;
+
+import java.util.List;
+
+
+public interface UserContract {
+
+    interface View extends BaseView {
+        void queryOperSus(Pager<Oper> operPager);
+    }
+
+    abstract class Presenter extends BasePresenter<View> {
+        public abstract void getUserList(String wd);
+    }
+}
\ No newline at end of file

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

+package com.xingdata.zzdpos.ui.manage.user;
+
+
+import com.xingdata.zzdpos.api.ApiFactory;
+import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
+
+public class UserPresenter extends UserContract.Presenter {
+   public UserListFragment userListFragment = new UserListFragment();
+    @Override
+    public void onAttached() {
+
+    }
+
+
+    @Override
+    public void getUserList(String wd) {
+        ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
+
+        },throwable -> {
+
+        });
+    }
+}

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

+package com.xingdata.zzdpos.ui.manage.user.adapter;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemUserListItemBinding;
+import com.xingdata.zzdpos.databinding.ItemVipListItemBinding;
+import com.xingdata.zzdpos.model.Oper;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.marketing.ms.model.User;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import java.util.List;
+
+/**
+ * Created by JM_DEV on 2017/12/25.
+ */
+
+public class UserListAdapter extends BaseAdapter<Oper, ItemUserListItemBinding> {
+    private Context mContext;
+
+    public UserListAdapter(Context mContext, @Nullable List<Oper> data) {
+        super(R.layout.item_user_list_item, data);
+        this.mContext = mContext;
+    }
+
+    @Override
+    protected void convert(ItemUserListItemBinding mViewBinding, Oper item) {
+    }
+}

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

+package com.xingdata.zzdpos.ui.manage.user.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import android.annotation.SuppressLint;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentUserListBinding;
+import com.xingdata.zzdpos.databinding.FragmentVipListBinding;
+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.model.Vip;
+import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
+import com.xingdata.zzdpos.ui.manage.user.adapter.UserListAdapter;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 店员管理界面
+ */
+public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserListBinding> {
+    private UserListAdapter adapter;
+    private List<Oper> opers = new ArrayList<>();
+    private List<Level> levels = null;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_user_list;
+    }
+
+    @Override
+    public void initView() {
+        adapter = new UserListAdapter(getActivity(), opers);
+        mViewBinding.userRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mViewBinding.userRecyclerView.setAdapter(adapter);
+        adapter.setOnItemClickListener((adapter, view, position) -> {
+
+        });
+        adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
+        adapter.setEnableLoadMore(true);
+
+        mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
+            getActivity().finish();
+        });
+        mViewBinding.setOnClickListener(view -> {
+            switch (view.getId()) {
+                case R.id.addUser:
+
+
+                    break;
+            }
+        });
+        onRefresh();
+    }
+
+    private void onLoadMore(){
+    }
+
+    public void onRefresh() {
+        mPresenter.getUserList(null);
+    }
+
+    public void queryOperSus(Pager<Oper> operPager) {
+        adapter.setNewData(operPager.getList());
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.vip;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.Gravity;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
 import com.blankj.utilcode.util.ToastUtils;
@@ -14,7 +15,6 @@ import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.model.VipRechangeOrder;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
@@ -160,7 +160,6 @@ public class VipPresenter extends VipContract.Presenter {
         RadioButton radioButton = new RadioButton(mContext);
 //        ArrayList<RadioButton> radioButtons = new ArrayList<>();
         radioButton.setTextSize(18);
-        radioButton.setHeight(168);
         radioButton.setTag(mscard.getCruleGradeNo());
         radioButton.setText("充：" + mscard.getCruleChargeAmt() / 100);
         radioButton.setButtonDrawable(null);

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java

@@ -12,6 +12,7 @@ import android.text.Spanned;
 import android.text.SpannedString;
 import android.text.TextWatcher;
 import android.text.style.AbsoluteSizeSpan;
+import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
@@ -45,6 +46,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
     private HashMap<String, Mscard> mscardHashMap = new HashMap<>();
     private PayAdapter mPayAdapter;
     private List<Pay> mPays = new ArrayList<>();
+    private int inWight;
 
     @Override
     public int getLayoutId() {
@@ -58,7 +60,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
         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.vipBalance.setText(getString(R.string.vip_balance_text, ConvertUtil.fenToYuan2(mVip.getAcctCbal())));
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
             pop();
         });
@@ -84,8 +86,19 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
                 mViewBinding.stealMoney.setText("");
             }
         });
+        ViewTreeObserver observer = mViewBinding.payMoneyLayout.getViewTreeObserver();
+        observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
+
+        {
+            @Override
+            public void onGlobalLayout() {
+                mViewBinding.payMoneyLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                ViewTreeObserver observer = mViewBinding.payMoneyLayout.getViewTreeObserver();
+                 inWight = mViewBinding.payMoneyLayout.getWidth();
+                mPresenter.initSettle();
+            }
+        });
 
-        mPresenter.initSettle();
 
 
     }
@@ -112,7 +125,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
         mscards.clear();
         mscards.addAll(mscardPager.getList());
 
-        layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, 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) {

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/user_frame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

+<?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:orientation="horizontal">
+            <include
+                android:id="@+id/title_search"
+                layout="@layout/title_search"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="@dimen/view_line_L5"
+            android:background="@color/line1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/user_count_title"
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="店员数量" />
+
+            <TextView
+                android:id="@+id/vip_count_add_today_title"
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="今日新增" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/vip_count"
+                style="@style/default_blacktext_bigstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textSize="22sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/vip_count_add_today"
+                style="@style/default_blacktext_bigstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textSize="22sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/addVipLinearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/addUser"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:onClick="@{onClickListener}"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_margin="5dp"
+                    android:background="@mipmap/add_bg" />
+
+                <TextView
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="添加店员"
+                    android:textColor="@color/deep_red"
+                    android:textSize="22sp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="@dimen/view_line_L5"
+            android:background="@color/line1" />
+
+        <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_recharge.xml

@@ -105,7 +105,6 @@
                         android:id="@+id/stealLayout"
                         android:layout_width="match_parent"
                         android:layout_height="50dp"
-                        android:layout_marginRight="10dp"
                         android:background="@drawable/selector_paymoney_radiobutton_bg"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:layout_margin="@dimen/all_margin"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@mipmap/img_boss" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/user_name"
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="张小萌" />
+
+                <TextView
+                    android:id="@+id/user_mobile"
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="13311556556" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/today_income"
+                    style="@style/default_gray_huanggaitext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Today_Income" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/all_margin"
+            android:layout_marginTop="@dimen/all_margin"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/vip_level_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="员工"
+                android:textColor="@color/black"
+                android:textSize="@dimen/detail_textview_size" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:background="@color/deep_red" />
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -466,6 +466,7 @@
     <string name="casher_name"> 姓名：%s</string>
     <string name="casher_mobile">手机：%s</string>
     <string name="casher_hit">店员名称/手机号</string>
+    <string name="Today_Income">今日收入 ￥%s</string>
     <string name="title_activity_restart_dialog">RestartDialog</string>
     <!--升级dialog-->
     <string name="upgrade_titile">系统升级</string>

app/src/main/res/values/styles.xml

@@ -44,6 +44,16 @@
         <item name="android:textSize">@dimen/detail_textview_size</item>
     </style>
 
+    <style name="default_gray_huanggaitext_smallstyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:padding">@dimen/sp_12</item>
+        <item name="android:textColor">@color/gray_huanggai</item>
+        <item name="android:textSize">@dimen/detail_textview_size</item>
+    </style>
+
     <style name="default_blacktext_nopadding_smallstyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>